Compare commits
155 Commits
519094b3a0
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
28ba709adf | ||
|
|
6302489f3a | ||
|
|
7d3ef598de | ||
|
|
8fbd30e69f | ||
|
|
78dcc5a629 | ||
|
|
e5b492247c | ||
|
|
e3b7cc4f63 | ||
| 8ab55f411d | |||
| 02af59c37e | |||
| 0932c8ba75 | |||
| 4c9b9cd3d6 | |||
| 62c16c016d | |||
| f23a8a9712 | |||
| ec84eeeaa4 | |||
|
|
c8444d1d4e | ||
| ca0322137b | |||
| 2aef180ddb | |||
| 228e87868d | |||
| 3c73aa344a | |||
| 7e53b805ae | |||
| 1b5b0e28e3 | |||
|
|
7265b10870 | ||
|
|
f548462472 | ||
| 283bf2a956 | |||
| 3c52110a2f | |||
| cbb83d3dcd | |||
| 4a55143b8e | |||
|
|
cbf85165b7 | ||
|
|
fdfc5729ec | ||
| 8e69c96891 | |||
| caa26c729e | |||
| 55edfd771e | |||
| 97b86acfa8 | |||
| b6720d867d | |||
| a2ac1bcb3b | |||
| e61cf96c07 | |||
| c974de593a | |||
| 9bd3fb29e3 | |||
| 0a1e0982c2 | |||
| 3644c75304 | |||
| 774c9575d4 | |||
| a00cc84e48 | |||
| 6fa7fffa7f | |||
| 56eeb5dce3 | |||
| 7bfc362b1f | |||
|
|
0e07a5996a | ||
|
|
4b2afe13db | ||
| 9af4546a11 | |||
| 66bc5882af | |||
| e5dac3e731 | |||
| 24622d30cf | |||
| c4b3a09198 | |||
| 7a59c29e06 | |||
| 76342553ad | |||
| efcdee2109 | |||
| 37156c937a | |||
| 6e84953740 | |||
| b09961473e | |||
| ed9eacf33f | |||
| c1d641c20c | |||
| b95a61c532 | |||
| 079004c17d | |||
| 11ef4dfba6 | |||
| bbde060d11 | |||
| 0547bb5a02 | |||
| 771f5e8e9f | |||
| 58378851bb | |||
| ae50ba3b9f | |||
| d2508f6484 | |||
| aff9da2a60 | |||
|
|
e0ac21d141 | ||
| 8396b7aaea | |||
|
|
a331494fde | ||
|
|
e86cd5464e | ||
|
|
04b136117d | ||
|
|
5c87204ef6 | ||
| 35647d21bb | |||
|
|
51b39cee07 | ||
|
|
0bd1ad8a0e | ||
|
|
f2c7c78b64 | ||
|
|
2f23ffe482 | ||
|
|
9904fecbee | ||
| cb229c2a30 | |||
|
|
e5f2be616c | ||
|
|
2e9e378457 | ||
|
|
9fe0ee959f | ||
| 9adc5295f8 | |||
|
|
8047987935 | ||
|
|
2d77706013 | ||
|
|
c564844673 | ||
| 2adeca3b99 | |||
| bafd06162c | |||
| 8c404d4072 | |||
|
|
d27b5d7737 | ||
|
|
4df583e74b | ||
| 1ca9999f15 | |||
|
|
0cc35ce541 | ||
|
|
d7c02ee6c9 | ||
|
|
6b701658d1 | ||
| 2f1be8b0b7 | |||
| 82bc03b9fb | |||
| 3257a68407 | |||
|
|
6dfd275091 | ||
| 6c5250f9c2 | |||
| 912eb625f5 | |||
| 10e4a82e5b | |||
| ef267721fd | |||
|
|
1d35c36da6 | ||
| 3da0f284f3 | |||
| 23d4459406 | |||
| a4192659d1 | |||
| f200d90fc0 | |||
| 6c1bda50ce | |||
| 3535b94123 | |||
| 5da9d9f4e2 | |||
| e7c8d3fb9e | |||
| e872f24936 | |||
| d1c9710afe | |||
|
|
422aaa89d5 | ||
|
|
5103145d01 | ||
|
|
27c8ceb1db | ||
| d30712d0f6 | |||
| a56a65cc0d | |||
| 9c7bde206b | |||
|
|
1fa944f3c7 | ||
|
|
1492f16fdd | ||
| 042ca40998 | |||
| e4a1c34a6c | |||
|
|
ba79a2093b | ||
| 35bad4027d | |||
| 9af2d3e87e | |||
| e9ad1f0256 | |||
| 12cd35edff | |||
| 69c7cbf4d8 | |||
| 80b6dfb38d | |||
| 0f4386457d | |||
| 08a9be543e | |||
| 688fe05b1b | |||
| 2ff735e06a | |||
| 53eaac43e3 | |||
| f5dd474ba0 | |||
|
|
e4ead72d53 | ||
| fb13a5c484 | |||
| 1053d71d29 | |||
| 56dcbf5caa | |||
| dfe279bf37 | |||
| e3b769b24e | |||
|
|
8e19587a16 | ||
| d551cbe793 | |||
| 822091243e | |||
| bcee42d8c1 | |||
| 9165c2e5f4 | |||
| 8070e03496 | |||
| 43e3cce048 | |||
| bcdefb2779 |
5
.gitignore
vendored
5
.gitignore
vendored
@@ -18,6 +18,7 @@ coverage
|
|||||||
|
|
||||||
/cypress/videos/
|
/cypress/videos/
|
||||||
/cypress/screenshots/
|
/cypress/screenshots/
|
||||||
|
DebuggerCmd.md
|
||||||
|
|
||||||
# Editor directories and files
|
# Editor directories and files
|
||||||
.vscode/*
|
.vscode/*
|
||||||
@@ -27,10 +28,10 @@ coverage
|
|||||||
*.suo
|
*.suo
|
||||||
*.ntvs*
|
*.ntvs*
|
||||||
*.njsproj
|
*.njsproj
|
||||||
*.sln
|
|
||||||
*.sw?
|
*.sw?
|
||||||
|
prompt.md
|
||||||
*.tsbuildinfo
|
*.tsbuildinfo
|
||||||
|
|
||||||
# Generated Files
|
# Generated Files
|
||||||
*.sqlite
|
*.sqlite
|
||||||
|
components.d.ts
|
||||||
|
|||||||
10
.justfile
10
.justfile
@@ -15,11 +15,15 @@ clean:
|
|||||||
rm -rf "dist"
|
rm -rf "dist"
|
||||||
rm -rf "wwwroot"
|
rm -rf "wwwroot"
|
||||||
|
|
||||||
update:
|
update: update-node update-dotnet
|
||||||
npm install
|
|
||||||
dotnet restore ./server/server.csproj
|
|
||||||
git submodule update --init --remote --recursive
|
git submodule update --init --remote --recursive
|
||||||
|
|
||||||
|
update-node:
|
||||||
|
npm install
|
||||||
|
|
||||||
|
update-dotnet:
|
||||||
|
dotnet restore ./server/server.csproj
|
||||||
|
|
||||||
# 生成Restful API到网页客户端
|
# 生成Restful API到网页客户端
|
||||||
gen-api:
|
gen-api:
|
||||||
npm run gen-api
|
npm run gen-api
|
||||||
|
|||||||
48
FPGAWebLabServer.sln
Normal file
48
FPGAWebLabServer.sln
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
|
||||||
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
|
# Visual Studio Version 17
|
||||||
|
VisualStudioVersion = 17.0.31903.59
|
||||||
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "server", "server\server.csproj", "{F31D6A0D-0407-41CE-A67E-01B847488EFB}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "server.test", "server.test\server.test.csproj", "{CC274582-AC3C-4FD1-977C-96F1BC2760BD}"
|
||||||
|
EndProject
|
||||||
|
Global
|
||||||
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
Debug|x64 = Debug|x64
|
||||||
|
Debug|x86 = Debug|x86
|
||||||
|
Release|Any CPU = Release|Any CPU
|
||||||
|
Release|x64 = Release|x64
|
||||||
|
Release|x86 = Release|x86
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
|
{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
|
HideSolutionNode = FALSE
|
||||||
|
EndGlobalSection
|
||||||
|
EndGlobal
|
||||||
13
TODO.md
13
TODO.md
@@ -1,13 +0,0 @@
|
|||||||
# TODO
|
|
||||||
|
|
||||||
1. 后端HTTP视频流
|
|
||||||
|
|
||||||
640*480, RGB565
|
|
||||||
0x0000_0000 + 25800
|
|
||||||
|
|
||||||
|
|
||||||
2. 信号发生器界面导入.dat文件
|
|
||||||
3. 示波器后端交互、前端界面
|
|
||||||
4. 逻辑分析仪后端交互、前端界面
|
|
||||||
5. 前端重构
|
|
||||||
6. 数据库 —— 用户登录、板卡资源分配、板卡IP地址分配
|
|
||||||
77
components.d.ts
vendored
77
components.d.ts
vendored
@@ -1,77 +0,0 @@
|
|||||||
/* eslint-disable */
|
|
||||||
// @ts-nocheck
|
|
||||||
// Generated by unplugin-vue-components
|
|
||||||
// Read more: https://github.com/vuejs/core/pull/3399
|
|
||||||
// biome-ignore lint: disable
|
|
||||||
export {}
|
|
||||||
|
|
||||||
/* prettier-ignore */
|
|
||||||
declare module 'vue' {
|
|
||||||
export interface GlobalComponents {
|
|
||||||
Alert: typeof import('./src/components/Alert/Alert.vue')['default']
|
|
||||||
AlertDemo: typeof import('./src/components/AlertDemo.vue')['default']
|
|
||||||
BaseBoard: typeof import('./src/components/equipments/BaseBoard.vue')['default']
|
|
||||||
BaseInputField: typeof import('./src/components/InputField/BaseInputField.vue')['default']
|
|
||||||
Canvas: typeof import('./src/components/Canvas.vue')['default']
|
|
||||||
ChannelConfig: typeof import('./src/components/LogicAnalyzer/ChannelConfig.vue')['default']
|
|
||||||
CollapsibleSection: typeof import('./src/components/CollapsibleSection.vue')['default']
|
|
||||||
ComponentSelector: typeof import('./src/components/LabCanvas/ComponentSelector.vue')['default']
|
|
||||||
DDR: typeof import('./src/components/equipments/DDR.vue')['default']
|
|
||||||
DDS: typeof import('./src/components/equipments/DDS.vue')['default']
|
|
||||||
DDSPropertyEditor: typeof import('./src/components/equipments/DDSPropertyEditor.vue')['default']
|
|
||||||
DiagramCanvas: typeof import('./src/components/LabCanvas/DiagramCanvas.vue')['default']
|
|
||||||
Dialog: typeof import('./src/components/Dialog.vue')['default']
|
|
||||||
ETH: typeof import('./src/components/equipments/ETH.vue')['default']
|
|
||||||
FunctionBar: typeof import('./src/components/FunctionBar.vue')['default']
|
|
||||||
HDMI: typeof import('./src/components/equipments/HDMI.vue')['default']
|
|
||||||
IpInputField: typeof import('./src/components/InputField/IpInputField.vue')['default']
|
|
||||||
ItemList: typeof import('./src/components/LabCanvas/ItemList.vue')['default']
|
|
||||||
LabCanvas: typeof import('./src/components/LabCanvasNew/LabCanvas.vue')['default']
|
|
||||||
LabCanvasNew: typeof import('./src/components/LabCanvas/LabCanvasNew.vue')['default']
|
|
||||||
LabComponentsDrawer: typeof import('./src/components/LabCanvasNew/LabComponentsDrawer.vue')['default']
|
|
||||||
LabComponentsDrawerNew: typeof import('./src/components/LabCanvas/LabComponentsDrawerNew.vue')['default']
|
|
||||||
LogicalWaveFormDisplay: typeof import('./src/components/LogicAnalyzer/LogicalWaveFormDisplay.vue')['default']
|
|
||||||
LoginCard: typeof import('./src/components/LoginCard.vue')['default']
|
|
||||||
MarkdownRenderer: typeof import('./src/components/MarkdownRenderer.vue')['default']
|
|
||||||
MechanicalButton: typeof import('./src/components/equipments/MechanicalButton.vue')['default']
|
|
||||||
MotherBoard: typeof import('./src/components/equipments/MotherBoard.vue')['default']
|
|
||||||
MotherBoardCaps: typeof import('./src/components/equipments/MotherBoardCaps.vue')['default']
|
|
||||||
Navbar: typeof import('./src/components/Navbar.vue')['default']
|
|
||||||
PG2L100H_FBG676: typeof import('./src/components/equipments/PG2L100H_FBG676.vue')['default']
|
|
||||||
Pin: typeof import('./src/components/equipments/Pin.vue')['default']
|
|
||||||
PopButton: typeof import('./src/components/PopButton.vue')['default']
|
|
||||||
PortInputField: typeof import('./src/components/InputField/PortInputField.vue')['default']
|
|
||||||
PropertyEditor: typeof import('./src/components/PropertyEditor.vue')['default']
|
|
||||||
PropertyPanel: typeof import('./src/components/PropertyPanel.vue')['default']
|
|
||||||
RekaSplitterGroup: typeof import('reka-ui')['SplitterGroup']
|
|
||||||
RouterLink: typeof import('vue-router')['RouterLink']
|
|
||||||
RouterView: typeof import('vue-router')['RouterView']
|
|
||||||
ScrollAreaCorner: typeof import('reka-ui')['ScrollAreaCorner']
|
|
||||||
ScrollAreaRoot: typeof import('reka-ui')['ScrollAreaRoot']
|
|
||||||
ScrollAreaScrollbar: typeof import('reka-ui')['ScrollAreaScrollbar']
|
|
||||||
ScrollAreaThumb: typeof import('reka-ui')['ScrollAreaThumb']
|
|
||||||
ScrollAreaViewport: typeof import('reka-ui')['ScrollAreaViewport']
|
|
||||||
SD: typeof import('./src/components/equipments/SD.vue')['default']
|
|
||||||
SevenSegmentDisplay: typeof import('./src/components/equipments/SevenSegmentDisplay.vue')['default']
|
|
||||||
SFP: typeof import('./src/components/equipments/SFP.vue')['default']
|
|
||||||
Sidebar: typeof import('./src/components/Sidebar.vue')['default']
|
|
||||||
SMA: typeof import('./src/components/equipments/SMA.vue')['default']
|
|
||||||
SMT_LED: typeof import('./src/components/equipments/SMT_LED.vue')['default']
|
|
||||||
SplitterGroup: typeof import('reka-ui')['SplitterGroup']
|
|
||||||
SplitterPanel: typeof import('reka-ui')['SplitterPanel']
|
|
||||||
SplitterResizeHandle: typeof import('reka-ui')['SplitterResizeHandle']
|
|
||||||
Switch: typeof import('./src/components/equipments/Switch.vue')['default']
|
|
||||||
TabsContent: typeof import('reka-ui')['TabsContent']
|
|
||||||
TabsIndicator: typeof import('reka-ui')['TabsIndicator']
|
|
||||||
TabsList: typeof import('reka-ui')['TabsList']
|
|
||||||
TabsRoot: typeof import('reka-ui')['TabsRoot']
|
|
||||||
TabsTrigger: typeof import('reka-ui')['TabsTrigger']
|
|
||||||
ThemeControlButton: typeof import('./src/components/ThemeControlButton.vue')['default']
|
|
||||||
ThemeControlToggle: typeof import('./src/components/ThemeControlToggle.vue')['default']
|
|
||||||
TriggerSettings: typeof import('./src/components/LogicAnalyzer/TriggerSettings.vue')['default']
|
|
||||||
TutorialCarousel: typeof import('./src/components/TutorialCarousel.vue')['default']
|
|
||||||
UploadCard: typeof import('./src/components/UploadCard.vue')['default']
|
|
||||||
WaveformDisplay: typeof import('./src/components/Oscilloscope/WaveformDisplay.vue')['default']
|
|
||||||
Wire: typeof import('./src/components/equipments/Wire.vue')['default']
|
|
||||||
}
|
|
||||||
}
|
|
||||||
14
flake.nix
14
flake.nix
@@ -9,7 +9,10 @@
|
|||||||
forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
|
forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
config.permittedInsecurePackages = ["dotnet-sdk-6.0.428"];
|
config.permittedInsecurePackages = [
|
||||||
|
"dotnet-sdk-6.0.428"
|
||||||
|
"beekeeper-studio-5.2.9"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
in
|
in
|
||||||
@@ -21,8 +24,9 @@
|
|||||||
nodejs
|
nodejs
|
||||||
sqlite
|
sqlite
|
||||||
sqls
|
sqls
|
||||||
sql-studio
|
beekeeper-studio
|
||||||
zlib
|
zlib
|
||||||
|
bash
|
||||||
# Backend
|
# Backend
|
||||||
(dotnetCorePackages.combinePackages [
|
(dotnetCorePackages.combinePackages [
|
||||||
dotnetCorePackages.sdk_9_0
|
dotnetCorePackages.sdk_9_0
|
||||||
@@ -30,6 +34,8 @@
|
|||||||
dotnetCorePackages.sdk_8_0
|
dotnetCorePackages.sdk_8_0
|
||||||
])
|
])
|
||||||
nuget
|
nuget
|
||||||
|
mono
|
||||||
|
vlc
|
||||||
# msbuild
|
# msbuild
|
||||||
omnisharp-roslyn
|
omnisharp-roslyn
|
||||||
csharpier
|
csharpier
|
||||||
@@ -38,10 +44,10 @@
|
|||||||
typescript-language-server
|
typescript-language-server
|
||||||
];
|
];
|
||||||
shellHook = ''
|
shellHook = ''
|
||||||
export PATH=$PATH:
|
export PATH=$PATH:/home/sikongjueluo/.dotnet/tools
|
||||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${pkgs.zlib}/lib
|
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${pkgs.zlib}/lib
|
||||||
|
export DOTNET_ROOT=${pkgs.dotnetCorePackages.sdk_9_0}/share/dotnet
|
||||||
'';
|
'';
|
||||||
|
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
1295
package-lock.json
generated
1295
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -12,19 +12,22 @@
|
|||||||
"gen-api": "npx tsx scripts/GenerateWebAPI.ts"
|
"gen-api": "npx tsx scripts/GenerateWebAPI.ts"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@microsoft/signalr": "^9.0.6",
|
||||||
"@svgdotjs/svg.js": "^3.2.4",
|
"@svgdotjs/svg.js": "^3.2.4",
|
||||||
"@tanstack/vue-table": "^8.21.3",
|
"@tanstack/vue-table": "^8.21.3",
|
||||||
"@types/lodash": "^4.17.16",
|
"@types/lodash": "^4.17.16",
|
||||||
|
"@types/signalr": "^2.4.3",
|
||||||
"@vueuse/core": "^13.5.0",
|
"@vueuse/core": "^13.5.0",
|
||||||
"async-mutex": "^0.5.0",
|
"async-mutex": "^0.5.0",
|
||||||
|
"axios": "^1.11.0",
|
||||||
"echarts": "^5.6.0",
|
"echarts": "^5.6.0",
|
||||||
"highlight.js": "^11.11.1",
|
"highlight.js": "^11.11.1",
|
||||||
"konva": "^9.3.20",
|
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"log-symbols": "^7.0.0",
|
"log-symbols": "^7.0.0",
|
||||||
"lucide-vue-next": "^0.525.0",
|
"lucide-vue-next": "^0.525.0",
|
||||||
"marked": "^12.0.0",
|
"marked": "^12.0.0",
|
||||||
"mathjs": "^14.4.0",
|
"mathjs": "^14.4.0",
|
||||||
|
"md-editor-v3": "^5.8.4",
|
||||||
"pinia": "^3.0.1",
|
"pinia": "^3.0.1",
|
||||||
"reka-ui": "^2.3.1",
|
"reka-ui": "^2.3.1",
|
||||||
"ts-log": "^2.2.7",
|
"ts-log": "^2.2.7",
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,35 +1,42 @@
|
|||||||
import { spawn, exec, ChildProcess } from 'child_process';
|
import { spawn, exec, ChildProcess } from "child_process";
|
||||||
import { promisify } from 'util';
|
import { promisify } from "util";
|
||||||
import fetch from 'node-fetch';
|
import fetch from "node-fetch";
|
||||||
|
import * as fs from "fs";
|
||||||
|
|
||||||
const execAsync = promisify(exec);
|
const execAsync = promisify(exec);
|
||||||
|
|
||||||
// Windows 支持函数
|
// Windows 支持函数
|
||||||
function getCommand(command: string): string {
|
function getCommand(command: string): string {
|
||||||
// dotnet 在 Windows 上不需要 .cmd 后缀
|
// dotnet 在 Windows 上不需要 .cmd 后缀
|
||||||
if (command === 'dotnet') {
|
if (command === "dotnet") {
|
||||||
return 'dotnet';
|
return "dotnet";
|
||||||
}
|
}
|
||||||
return process.platform === 'win32' ? `${command}.cmd` : command;
|
return process.platform === "win32" ? `${command}.cmd` : command;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getSpawnOptions() {
|
function getSpawnOptions() {
|
||||||
return process.platform === 'win32' ? { stdio: 'pipe', shell: true } : { stdio: 'pipe' };
|
return process.platform === "win32"
|
||||||
|
? { stdio: "pipe", shell: true }
|
||||||
|
: { stdio: "pipe" };
|
||||||
}
|
}
|
||||||
|
|
||||||
async function waitForServer(url: string, maxRetries: number = 30, interval: number = 1000): Promise<boolean> {
|
async function waitForServer(
|
||||||
|
url: string,
|
||||||
|
maxRetries: number = 30,
|
||||||
|
interval: number = 1000,
|
||||||
|
): Promise<boolean> {
|
||||||
for (let i = 0; i < maxRetries; i++) {
|
for (let i = 0; i < maxRetries; i++) {
|
||||||
try {
|
try {
|
||||||
const response = await fetch(url);
|
const response = await fetch(url);
|
||||||
if (response.ok) {
|
if (response.ok) {
|
||||||
console.log('✓ Server is ready');
|
console.log("✓ Server is ready");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// Server not ready yet
|
// Server not ready yet
|
||||||
}
|
}
|
||||||
console.log(`Waiting for server... (${i + 1}/${maxRetries})`);
|
console.log(`Waiting for server... (${i + 1}/${maxRetries})`);
|
||||||
await new Promise(resolve => setTimeout(resolve, interval));
|
await new Promise((resolve) => setTimeout(resolve, interval));
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -39,32 +46,39 @@ let serverProcess: ChildProcess | null = null;
|
|||||||
let webProcess: ChildProcess | null = null;
|
let webProcess: ChildProcess | null = null;
|
||||||
|
|
||||||
async function startWeb(): Promise<ChildProcess> {
|
async function startWeb(): Promise<ChildProcess> {
|
||||||
console.log('Starting Vite frontend...');
|
console.log("Starting Vite frontend...");
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
const process = spawn(getCommand('npm'), ['run', 'dev'], getSpawnOptions() as any);
|
const process = spawn(
|
||||||
|
getCommand("npm"),
|
||||||
|
["run", "dev"],
|
||||||
|
getSpawnOptions() as any,
|
||||||
|
);
|
||||||
|
|
||||||
let webStarted = false;
|
let webStarted = false;
|
||||||
|
|
||||||
process.stdout?.on('data', (data) => {
|
process.stdout?.on("data", (data) => {
|
||||||
const output = data.toString();
|
const output = data.toString();
|
||||||
console.log(`Web: ${output}`);
|
console.log(`Web: ${output}`);
|
||||||
|
|
||||||
// 检查 Vite 是否已启动
|
// 检查 Vite 是否已启动
|
||||||
if ((output.includes('Local:') || output.includes('ready in')) && !webStarted) {
|
if (
|
||||||
|
(output.includes("Local:") || output.includes("ready in")) &&
|
||||||
|
!webStarted
|
||||||
|
) {
|
||||||
webStarted = true;
|
webStarted = true;
|
||||||
resolve(process);
|
resolve(process);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
process.stderr?.on('data', (data) => {
|
process.stderr?.on("data", (data) => {
|
||||||
console.error(`Web Error: ${data}`);
|
console.error(`Web Error: ${data}`);
|
||||||
});
|
});
|
||||||
|
|
||||||
process.on('error', (error) => {
|
process.on("error", (error) => {
|
||||||
reject(error);
|
reject(error);
|
||||||
});
|
});
|
||||||
|
|
||||||
process.on('exit', (code, signal) => {
|
process.on("exit", (code, signal) => {
|
||||||
console.log(`Web process exited with code ${code} and signal ${signal}`);
|
console.log(`Web process exited with code ${code} and signal ${signal}`);
|
||||||
if (!webStarted) {
|
if (!webStarted) {
|
||||||
reject(new Error(`Web process exited unexpectedly with code ${code}`));
|
reject(new Error(`Web process exited unexpectedly with code ${code}`));
|
||||||
@@ -77,45 +91,53 @@ async function startWeb(): Promise<ChildProcess> {
|
|||||||
// 超时处理
|
// 超时处理
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
if (!webStarted) {
|
if (!webStarted) {
|
||||||
reject(new Error('Web server failed to start within timeout'));
|
reject(new Error("Web server failed to start within timeout"));
|
||||||
}
|
}
|
||||||
}, 30000); // 30秒超时
|
}, 10000); // 10秒超时
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async function startServer(): Promise<ChildProcess> {
|
async function startServer(): Promise<ChildProcess> {
|
||||||
console.log('Starting .NET server...');
|
console.log("Starting .NET server...");
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
const process = spawn(getCommand('dotnet'), ['run', '--property:Configuration=Release'], {
|
const process = spawn(
|
||||||
cwd: 'server',
|
getCommand("dotnet"),
|
||||||
...getSpawnOptions()
|
["run", "--property:Configuration=Release"],
|
||||||
} as any);
|
{
|
||||||
|
cwd: "server",
|
||||||
|
...getSpawnOptions(),
|
||||||
|
} as any,
|
||||||
|
);
|
||||||
|
|
||||||
let serverStarted = false;
|
let serverStarted = false;
|
||||||
|
|
||||||
process.stdout?.on('data', (data) => {
|
process.stdout?.on("data", (data) => {
|
||||||
const output = data.toString();
|
const output = data.toString();
|
||||||
console.log(`Server: ${output}`);
|
console.log(`Server: ${output}`);
|
||||||
|
|
||||||
// 检查服务器是否已启动
|
// 检查服务器是否已启动
|
||||||
if (output.includes('Now listening on:') && !serverStarted) {
|
if (output.includes("Now listening on:") && !serverStarted) {
|
||||||
serverStarted = true;
|
serverStarted = true;
|
||||||
resolve(process);
|
resolve(process);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
process.stderr?.on('data', (data) => {
|
process.stderr?.on("data", (data) => {
|
||||||
console.error(`Server Error: ${data}`);
|
console.error(`Server Error: ${data}`);
|
||||||
});
|
});
|
||||||
|
|
||||||
process.on('error', (error) => {
|
process.on("error", (error) => {
|
||||||
reject(error);
|
reject(error);
|
||||||
});
|
});
|
||||||
|
|
||||||
process.on('exit', (code, signal) => {
|
process.on("exit", (code, signal) => {
|
||||||
console.log(`Server process exited with code ${code} and signal ${signal}`);
|
console.log(
|
||||||
|
`Server process exited with code ${code} and signal ${signal}`,
|
||||||
|
);
|
||||||
if (!serverStarted) {
|
if (!serverStarted) {
|
||||||
reject(new Error(`Server process exited unexpectedly with code ${code}`));
|
reject(
|
||||||
|
new Error(`Server process exited unexpectedly with code ${code}`),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -125,196 +147,208 @@ async function startServer(): Promise<ChildProcess> {
|
|||||||
// 超时处理
|
// 超时处理
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
if (!serverStarted) {
|
if (!serverStarted) {
|
||||||
reject(new Error('Server failed to start within timeout'));
|
reject(new Error("Server failed to start within timeout"));
|
||||||
}
|
}
|
||||||
}, 30000); // 30秒超时
|
}, 10000); // 10秒超时
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async function stopServer(): Promise<void> {
|
async function stopServer(): Promise<void> {
|
||||||
console.log('Stopping server...');
|
console.log("Stopping server...");
|
||||||
|
|
||||||
if (!serverProcess) {
|
if (!serverProcess) {
|
||||||
console.log('No server process to stop');
|
console.log("No server process to stop");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// 检查进程是否还存在
|
// 检查进程是否还存在
|
||||||
if (serverProcess.killed || serverProcess.exitCode !== null) {
|
if (serverProcess.killed || serverProcess.exitCode !== null) {
|
||||||
console.log('✓ Server process already terminated');
|
console.log("✓ Server process already terminated");
|
||||||
serverProcess = null;
|
serverProcess = null;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 发送 SIGTERM 信号
|
// 发送 SIGTERM 信号
|
||||||
const killed = serverProcess.kill('SIGTERM');
|
const killed = serverProcess.kill("SIGTERM");
|
||||||
if (!killed) {
|
if (!killed) {
|
||||||
console.warn('Failed to send SIGTERM to server process');
|
console.warn("Failed to send SIGTERM to server process");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 等待进程优雅退出
|
// 设置超时,如果 3 秒内没有退出则强制终止
|
||||||
const exitPromise = new Promise<void>((resolve) => {
|
|
||||||
if (serverProcess) {
|
|
||||||
serverProcess.on('exit', () => {
|
|
||||||
console.log('✓ Server stopped gracefully');
|
|
||||||
resolve();
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
resolve();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// 设置超时,如果 5 秒内没有退出则强制终止
|
|
||||||
const timeoutPromise = new Promise<void>((resolve) => {
|
const timeoutPromise = new Promise<void>((resolve) => {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
if (serverProcess && !serverProcess.killed && serverProcess.exitCode === null) {
|
if (
|
||||||
console.log('Force killing server process...');
|
serverProcess &&
|
||||||
serverProcess.kill('SIGKILL');
|
!serverProcess.killed &&
|
||||||
|
serverProcess.exitCode === null
|
||||||
|
) {
|
||||||
|
console.log("Force killing server process...");
|
||||||
|
serverProcess.kill("SIGKILL");
|
||||||
}
|
}
|
||||||
resolve();
|
resolve();
|
||||||
}, 5000);
|
}, 3000); // 减少超时时间到3秒
|
||||||
});
|
});
|
||||||
|
|
||||||
await Promise.race([exitPromise, timeoutPromise]);
|
await Promise.race([timeoutPromise]);
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.warn('Warning: Could not stop server process:', error);
|
console.warn("Warning: Could not stop server process:", error);
|
||||||
} finally {
|
} finally {
|
||||||
serverProcess = null;
|
serverProcess = null;
|
||||||
|
|
||||||
// 额外清理:确保没有遗留的 dotnet 进程
|
// 只有在进程可能没有正常退出时才执行清理
|
||||||
try {
|
// 移除自动清理逻辑,因为正常退出时不需要
|
||||||
if (process.platform === 'win32') {
|
|
||||||
// Windows: 使用 taskkill 清理进程
|
|
||||||
await execAsync('taskkill /F /IM dotnet.exe').catch(() => {
|
|
||||||
// 忽略错误,可能没有匹配的进程
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
// 只清理与我们项目相关的进程
|
|
||||||
await execAsync('pkill -f "dotnet.*run.*--property:Configuration=Release"').catch(() => {
|
|
||||||
// 忽略错误,可能没有匹配的进程
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} catch (cleanupError) {
|
|
||||||
// 忽略清理错误
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function stopWeb(): Promise<void> {
|
async function stopWeb(): Promise<void> {
|
||||||
console.log('Stopping web server...');
|
console.log("Stopping web server...");
|
||||||
|
|
||||||
if (!webProcess) {
|
if (!webProcess) {
|
||||||
console.log('No web process to stop');
|
console.log("No web process to stop");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// 检查进程是否还存在
|
// 检查进程是否还存在
|
||||||
if (webProcess.killed || webProcess.exitCode !== null) {
|
if (webProcess.killed || webProcess.exitCode !== null) {
|
||||||
console.log('✓ Web process already terminated');
|
console.log("✓ Web process already terminated");
|
||||||
webProcess = null;
|
webProcess = null;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 发送 SIGTERM 信号
|
// 发送 SIGTERM 信号
|
||||||
const killed = webProcess.kill('SIGTERM');
|
const killed = webProcess.kill("SIGTERM");
|
||||||
if (!killed) {
|
if (!killed) {
|
||||||
console.warn('Failed to send SIGTERM to web process');
|
console.warn("Failed to send SIGTERM to web process");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 等待进程优雅退出
|
// 设置超时,如果 3 秒内没有退出则强制终止
|
||||||
const exitPromise = new Promise<void>((resolve) => {
|
|
||||||
if (webProcess) {
|
|
||||||
webProcess.on('exit', () => {
|
|
||||||
console.log('✓ Web server stopped gracefully');
|
|
||||||
resolve();
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
resolve();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// 设置超时,如果 5 秒内没有退出则强制终止
|
|
||||||
const timeoutPromise = new Promise<void>((resolve) => {
|
const timeoutPromise = new Promise<void>((resolve) => {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
if (webProcess && !webProcess.killed && webProcess.exitCode === null) {
|
if (webProcess && !webProcess.killed && webProcess.exitCode === null) {
|
||||||
console.log('Force killing web process...');
|
console.log("Force killing web process...");
|
||||||
webProcess.kill('SIGKILL');
|
webProcess.kill("SIGKILL");
|
||||||
}
|
}
|
||||||
resolve();
|
resolve();
|
||||||
}, 5000);
|
}, 3000);
|
||||||
});
|
});
|
||||||
|
|
||||||
await Promise.race([exitPromise, timeoutPromise]);
|
await Promise.race([timeoutPromise]);
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.warn('Warning: Could not stop web process:', error);
|
console.warn("Warning: Could not stop web process:", error);
|
||||||
} finally {
|
} finally {
|
||||||
webProcess = null;
|
webProcess = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 额外清理:确保没有遗留的 npm/node 进程
|
async function postProcessApiClient(): Promise<void> {
|
||||||
|
console.log("Post-processing API client...");
|
||||||
try {
|
try {
|
||||||
if (process.platform === 'win32') {
|
const filePath = "src/APIClient.ts";
|
||||||
// Windows: 清理可能的 node 进程
|
|
||||||
await execAsync('taskkill /F /IM node.exe').catch(() => {
|
// 检查文件是否存在
|
||||||
// 忽略错误,可能没有匹配的进程
|
if (!fs.existsSync(filePath)) {
|
||||||
});
|
throw new Error(`API client file not found: ${filePath}`);
|
||||||
} else {
|
|
||||||
// 清理可能的 vite 进程
|
|
||||||
await execAsync('pkill -f "vite"').catch(() => {
|
|
||||||
// 忽略错误,可能没有匹配的进程
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} catch (cleanupError) {
|
|
||||||
// 忽略清理错误
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 读取文件内容
|
||||||
|
let content = fs.readFileSync(filePath, "utf8");
|
||||||
|
|
||||||
|
// 替换 ArgumentException 中的 message 属性声明
|
||||||
|
content = content.replace(
|
||||||
|
/(\s+)message!:\s*string;/g,
|
||||||
|
"$1declare message: string;",
|
||||||
|
);
|
||||||
|
content = content.replace(
|
||||||
|
"{ AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, CancelToken }",
|
||||||
|
"{ AxiosError, type AxiosInstance, type AxiosRequestConfig, type AxiosResponse, type CancelToken }",
|
||||||
|
);
|
||||||
|
|
||||||
|
// 写回文件
|
||||||
|
fs.writeFileSync(filePath, content, "utf8");
|
||||||
|
|
||||||
|
console.log("✓ API client post-processing completed");
|
||||||
|
} catch (error) {
|
||||||
|
throw new Error(`Failed to post-process API client: ${error}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function generateApiClient(): Promise<void> {
|
async function generateApiClient(): Promise<void> {
|
||||||
console.log('Generating API client...');
|
console.log("Generating API client...");
|
||||||
try {
|
try {
|
||||||
const npxCommand = getCommand('npx');
|
const url = "http://127.0.0.1:5000/GetAPIClientCode";
|
||||||
await execAsync(`${npxCommand} nswag openapi2tsclient /input:http://localhost:5000/swagger/v1/swagger.json /output:src/APIClient.ts`);
|
const response = await fetch(url);
|
||||||
console.log('✓ API client generated successfully');
|
if (!response.ok) {
|
||||||
|
throw new Error(
|
||||||
|
`Failed to fetch API client code: ${response.status} ${response.statusText}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const code = await response.text();
|
||||||
|
|
||||||
|
// 写入 APIClient.ts
|
||||||
|
const filePath = "src/APIClient.ts";
|
||||||
|
fs.writeFileSync(filePath, code, "utf8");
|
||||||
|
console.log("✓ API client code fetched and written successfully");
|
||||||
|
|
||||||
|
// 添加后处理步骤
|
||||||
|
await postProcessApiClient();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
throw new Error(`Failed to generate API client: ${error}`);
|
throw new Error(`Failed to generate API client: ${error}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function generateSignalRClient(): Promise<void> {
|
||||||
|
console.log("Generating SignalR TypeScript client...");
|
||||||
|
try {
|
||||||
|
const { stdout, stderr } = await execAsync(
|
||||||
|
"dotnet tsrts --project ./server/server.csproj --output ./src/utils/signalR",
|
||||||
|
);
|
||||||
|
if (stdout) console.log(stdout);
|
||||||
|
if (stderr) console.error(stderr);
|
||||||
|
console.log("✓ SignalR TypeScript client generated successfully");
|
||||||
|
} catch (error) {
|
||||||
|
throw new Error(`Failed to generate SignalR client: ${error}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function main(): Promise<void> {
|
async function main(): Promise<void> {
|
||||||
try {
|
try {
|
||||||
|
// Generate SignalR client
|
||||||
|
await generateSignalRClient();
|
||||||
|
console.log("✓ SignalR TypeScript client generated successfully");
|
||||||
|
|
||||||
// Start web frontend first
|
// Start web frontend first
|
||||||
await startWeb();
|
await startWeb();
|
||||||
console.log('✓ Frontend started');
|
console.log("✓ Frontend started");
|
||||||
|
|
||||||
// Wait a bit for frontend to fully initialize
|
// Wait a bit for frontend to fully initialize
|
||||||
await new Promise(resolve => setTimeout(resolve, 3000));
|
await new Promise((resolve) => setTimeout(resolve, 3000));
|
||||||
|
|
||||||
// Start server
|
// Start server
|
||||||
await startServer();
|
await startServer();
|
||||||
console.log('✓ Backend started');
|
console.log("✓ Backend started");
|
||||||
|
|
||||||
// Wait for server to be ready (给服务器额外时间完全启动)
|
// Wait for server to be ready (给服务器额外时间完全启动)
|
||||||
await new Promise(resolve => setTimeout(resolve, 2000));
|
await new Promise((resolve) => setTimeout(resolve, 2000));
|
||||||
|
|
||||||
// Check if swagger endpoint is available
|
// Check if swagger endpoint is available
|
||||||
const serverReady = await waitForServer('http://localhost:5000/swagger/v1/swagger.json');
|
const serverReady = await waitForServer(
|
||||||
|
"http://localhost:5000/swagger/v1/swagger.json",
|
||||||
|
);
|
||||||
|
|
||||||
if (!serverReady) {
|
if (!serverReady) {
|
||||||
throw new Error('Server failed to start within the expected time');
|
throw new Error("Server failed to start within the expected time");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate API client
|
// Generate API client
|
||||||
await generateApiClient();
|
await generateApiClient();
|
||||||
|
|
||||||
console.log('✓ API generation completed successfully');
|
console.log("✓ API generation completed successfully");
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('❌ Error:', error);
|
console.error("❌ Error:", error);
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
} finally {
|
} finally {
|
||||||
// Always try to stop processes in order: server first, then web
|
// Always try to stop processes in order: server first, then web
|
||||||
@@ -323,35 +357,73 @@ async function main(): Promise<void> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 改进的进程终止处理
|
// 改进的进程终止处理 - 添加防重复执行
|
||||||
|
let isCleaningUp = false;
|
||||||
|
|
||||||
const cleanup = async (signal: string) => {
|
const cleanup = async (signal: string) => {
|
||||||
|
if (isCleaningUp) {
|
||||||
|
console.log("Cleanup already in progress, ignoring signal");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
isCleaningUp = true;
|
||||||
console.log(`\nReceived ${signal}, cleaning up...`);
|
console.log(`\nReceived ${signal}, cleaning up...`);
|
||||||
await stopServer();
|
|
||||||
await stopWeb();
|
try {
|
||||||
|
await Promise.all([stopServer(), stopWeb()]);
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error during cleanup:", error);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 立即退出,不等待
|
||||||
process.exit(0);
|
process.exit(0);
|
||||||
};
|
};
|
||||||
|
|
||||||
process.on('SIGINT', () => cleanup('SIGINT'));
|
process.on("SIGINT", () => cleanup("SIGINT"));
|
||||||
process.on('SIGTERM', () => cleanup('SIGTERM'));
|
process.on("SIGTERM", () => cleanup("SIGTERM"));
|
||||||
|
|
||||||
// 处理未捕获的异常
|
// 处理未捕获的异常
|
||||||
process.on('uncaughtException', async (error) => {
|
process.on("uncaughtException", async (error) => {
|
||||||
console.error('❌ Uncaught exception:', error);
|
if (isCleaningUp) return;
|
||||||
await stopServer();
|
|
||||||
await stopWeb();
|
console.error("❌ Uncaught exception:", error);
|
||||||
|
isCleaningUp = true;
|
||||||
|
|
||||||
|
try {
|
||||||
|
await Promise.all([stopServer(), stopWeb()]);
|
||||||
|
} catch (cleanupError) {
|
||||||
|
console.error("Error during cleanup:", cleanupError);
|
||||||
|
}
|
||||||
|
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
process.on('unhandledRejection', async (reason, promise) => {
|
process.on("unhandledRejection", async (reason, promise) => {
|
||||||
console.error('❌ Unhandled rejection at:', promise, 'reason:', reason);
|
if (isCleaningUp) return;
|
||||||
await stopServer();
|
|
||||||
await stopWeb();
|
console.error("❌ Unhandled rejection at:", promise, "reason:", reason);
|
||||||
|
isCleaningUp = true;
|
||||||
|
|
||||||
|
try {
|
||||||
|
await Promise.all([stopServer(), stopWeb()]);
|
||||||
|
} catch (cleanupError) {
|
||||||
|
console.error("Error during cleanup:", cleanupError);
|
||||||
|
}
|
||||||
|
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
main().catch(async (error) => {
|
main().catch(async (error) => {
|
||||||
console.error('❌ Unhandled error:', error);
|
if (isCleaningUp) return;
|
||||||
await stopServer();
|
|
||||||
await stopWeb();
|
console.error("❌ Unhandled error:", error);
|
||||||
|
isCleaningUp = true;
|
||||||
|
|
||||||
|
try {
|
||||||
|
await Promise.all([stopServer(), stopWeb()]);
|
||||||
|
} catch (cleanupError) {
|
||||||
|
console.error("Error during cleanup:", cleanupError);
|
||||||
|
}
|
||||||
|
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
});
|
});
|
||||||
@@ -1,61 +0,0 @@
|
|||||||
using System.Buffers.Binary;
|
|
||||||
using Common;
|
|
||||||
|
|
||||||
namespace server.test;
|
|
||||||
|
|
||||||
public class CommonTest
|
|
||||||
{
|
|
||||||
[Fact]
|
|
||||||
public void ReverseBytesTest()
|
|
||||||
{
|
|
||||||
var rnd = new Random();
|
|
||||||
var bytesLen = 8;
|
|
||||||
var bytesArray = new byte[bytesLen];
|
|
||||||
rnd.NextBytes(bytesArray);
|
|
||||||
|
|
||||||
var rev2Bytes = new byte[] {
|
|
||||||
bytesArray[1],
|
|
||||||
bytesArray[0],
|
|
||||||
bytesArray[3],
|
|
||||||
bytesArray[2],
|
|
||||||
bytesArray[5],
|
|
||||||
bytesArray[4],
|
|
||||||
bytesArray[7],
|
|
||||||
bytesArray[6],
|
|
||||||
};
|
|
||||||
Assert.Equal(Number.ReverseBytes(bytesArray, 2).Value, rev2Bytes);
|
|
||||||
|
|
||||||
var rev4Bytes = new byte[] {
|
|
||||||
bytesArray[3],
|
|
||||||
bytesArray[2],
|
|
||||||
bytesArray[1],
|
|
||||||
bytesArray[0],
|
|
||||||
bytesArray[7],
|
|
||||||
bytesArray[6],
|
|
||||||
bytesArray[5],
|
|
||||||
bytesArray[4],
|
|
||||||
};
|
|
||||||
Assert.Equal(Number.ReverseBytes(bytesArray, 4).Value, rev4Bytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void ToBitTest()
|
|
||||||
{
|
|
||||||
Assert.Equal(true, Number.ToBit(0xFF, 3).Value);
|
|
||||||
Assert.Equal(false, Number.ToBit(0x00, 3).Value);
|
|
||||||
Assert.Equal(true, Number.ToBit(0xAA, 3).Value);
|
|
||||||
Assert.Equal(false, Number.ToBit(0xAA, 2).Value);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void ReverseBits()
|
|
||||||
{
|
|
||||||
Assert.Equal((byte)0x05, Common.Number.ReverseBits((byte)0xA0));
|
|
||||||
|
|
||||||
var bytesSrc = new byte[] { 0xAB, 0x00, 0x00, 0x01 };
|
|
||||||
var bytes = new byte[4];
|
|
||||||
for (int i = 0; i < 4; i++)
|
|
||||||
bytes[i] = Common.Number.ReverseBits(bytesSrc[i]);
|
|
||||||
Assert.Equal(new byte[] { 0xD5, 0x00, 0x00, 0x80 }, bytes);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
386
server.test/NumberTest.cs
Normal file
386
server.test/NumberTest.cs
Normal file
@@ -0,0 +1,386 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using Common;
|
||||||
|
|
||||||
|
namespace CommonTest;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 针对 Common.Number 的单元测试,覆盖所有公开方法
|
||||||
|
/// </summary>
|
||||||
|
public class NumberTest
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 测试 NumberToBytes 的正常与异常情况
|
||||||
|
/// </summary>
|
||||||
|
[Fact]
|
||||||
|
public void Test_NumberToBytes()
|
||||||
|
{
|
||||||
|
// 测试大端(isLowNumHigh=false)
|
||||||
|
var result1 = Number.NumberToBytes(0x12345678ABCDEF01, 8, false);
|
||||||
|
Assert.True(result1.IsSuccessful);
|
||||||
|
Assert.Equal(new byte[] { 0x12, 0x34, 0x56, 0x78, 0xAB, 0xCD, 0xEF, 0x01 }, result1.Value);
|
||||||
|
|
||||||
|
// 测试小端(isLowNumHigh=true)
|
||||||
|
var result2 = Number.NumberToBytes(0x12345678ABCDEF01, 8, true);
|
||||||
|
Assert.True(result2.IsSuccessful);
|
||||||
|
Assert.Equal(new byte[] { 0x01, 0xEF, 0xCD, 0xAB, 0x78, 0x56, 0x34, 0x12 }, result2.Value);
|
||||||
|
|
||||||
|
// 测试长度不足(4字节)
|
||||||
|
var result3 = Number.NumberToBytes(0x12345678, 4, false);
|
||||||
|
Assert.True(result3.IsSuccessful);
|
||||||
|
Assert.Equal(new byte[] { 0x12, 0x34, 0x56, 0x78 }, result3.Value);
|
||||||
|
|
||||||
|
// 测试超长
|
||||||
|
var result4 = Number.NumberToBytes(0x1, 9, false);
|
||||||
|
Assert.False(result4.IsSuccessful);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 测试 BytesToUInt64 的正常与异常情况,覆盖不同参数组合
|
||||||
|
/// </summary>
|
||||||
|
[Fact]
|
||||||
|
public void Test_BytesToUInt64()
|
||||||
|
{
|
||||||
|
// 正常大端(isLowNumHigh=false)
|
||||||
|
var bytes = new byte[] { 0x12, 0x34, 0x56, 0x78, 0xAB, 0xCD, 0xEF, 0x01 };
|
||||||
|
var result = Number.BytesToUInt64((byte[])bytes.Clone());
|
||||||
|
Assert.True(result.IsSuccessful);
|
||||||
|
Assert.Equal(0x12345678ABCDEF01UL, result.Value);
|
||||||
|
|
||||||
|
// 正常小端(isLowNumHigh=true)
|
||||||
|
var bytes2 = new byte[] { 0x01, 0xEF, 0xCD, 0xAB, 0x78, 0x56, 0x34, 0x12 };
|
||||||
|
var result2 = Number.BytesToUInt64((byte[])bytes2.Clone(), true);
|
||||||
|
Assert.True(result2.IsSuccessful);
|
||||||
|
Assert.Equal(0x12345678ABCDEF01UL, result2.Value);
|
||||||
|
|
||||||
|
// 长度不足8字节(numLength=4),大端
|
||||||
|
var bytes3 = new byte[] { 0x12, 0x34, 0x56, 0x78 };
|
||||||
|
var result3 = Number.BytesToUInt64((byte[])bytes3.Clone(), 0, 4, false);
|
||||||
|
Assert.True(result3.IsSuccessful);
|
||||||
|
Assert.Equal(0x1234567800000000UL, result3.Value);
|
||||||
|
|
||||||
|
// 长度不足8字节(numLength=4),小端
|
||||||
|
var bytes4 = new byte[] { 0x78, 0x56, 0x34, 0x12 };
|
||||||
|
var result4 = Number.BytesToUInt64((byte[])bytes4.Clone(), 0, 4, true);
|
||||||
|
Assert.True(result4.IsSuccessful);
|
||||||
|
Assert.Equal(0x12345678UL, result4.Value);
|
||||||
|
|
||||||
|
// numLength=0
|
||||||
|
var bytes5 = new byte[] { 0x12, 0x34, 0x56, 0x78 };
|
||||||
|
var result5 = Number.BytesToUInt64((byte[])bytes5.Clone(), 0, 0, false);
|
||||||
|
Assert.True(result5.IsSuccessful);
|
||||||
|
Assert.Equal(0UL, result5.Value);
|
||||||
|
|
||||||
|
// offset测试
|
||||||
|
var bytes6 = new byte[] { 0x00, 0x00, 0x12, 0x34, 0x56, 0x78, 0xAB, 0xCD, 0xEF, 0x01 };
|
||||||
|
var result6 = Number.BytesToUInt64(bytes6, 2, 8, false);
|
||||||
|
Assert.True(result6.IsSuccessful);
|
||||||
|
Assert.Equal(0x12345678ABCDEF01UL, result6.Value);
|
||||||
|
|
||||||
|
// numLength超限(>8),应返回异常
|
||||||
|
var bytes7 = new byte[9];
|
||||||
|
var result7 = Number.BytesToUInt64(bytes7, 0, 9, false);
|
||||||
|
Assert.False(result7.IsSuccessful);
|
||||||
|
|
||||||
|
// offset+numLength超限
|
||||||
|
var bytes8 = new byte[] { 0x01, 0x02, 0x03, 0x04 };
|
||||||
|
var result8 = Number.BytesToUInt64(bytes8, 2, 4, false);
|
||||||
|
Assert.True(result8.IsSuccessful);
|
||||||
|
Assert.Equal(0x0304000000000000UL, result8.Value);
|
||||||
|
|
||||||
|
// bytes长度不足offset+numLength
|
||||||
|
var bytes9 = new byte[] { 0x01, 0x02 };
|
||||||
|
var result9 = Number.BytesToUInt64(bytes9, 1, 2, true);
|
||||||
|
Assert.True(result9.IsSuccessful);
|
||||||
|
Assert.Equal(0x02UL, result9.Value);
|
||||||
|
|
||||||
|
// 空数组
|
||||||
|
var result10 = Number.BytesToUInt64(new byte[0], 0, 0, false);
|
||||||
|
Assert.True(result10.IsSuccessful);
|
||||||
|
Assert.Equal(0UL, result10.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 测试 BytesToUInt32 的正常与异常情况,覆盖不同参数组合
|
||||||
|
/// </summary>
|
||||||
|
[Fact]
|
||||||
|
public void Test_BytesToUInt32()
|
||||||
|
{
|
||||||
|
// 正常大端(isLowNumHigh=false)
|
||||||
|
var bytes = new byte[] { 0x12, 0x34, 0x56, 0x78 };
|
||||||
|
var result = Number.BytesToUInt32((byte[])bytes.Clone());
|
||||||
|
Assert.True(result.IsSuccessful);
|
||||||
|
Assert.Equal(0x12345678U, result.Value);
|
||||||
|
|
||||||
|
// 正常小端(isLowNumHigh=true)
|
||||||
|
var bytes2 = new byte[] { 0x78, 0x56, 0x34, 0x12 };
|
||||||
|
var result2 = Number.BytesToUInt32((byte[])bytes2.Clone(), true);
|
||||||
|
Assert.True(result2.IsSuccessful);
|
||||||
|
Assert.Equal(0x12345678U, result2.Value);
|
||||||
|
|
||||||
|
// 长度不足4字节(numLength=2),大端
|
||||||
|
var bytes3 = new byte[] { 0x12, 0x34 };
|
||||||
|
var result3 = Number.BytesToUInt32((byte[])bytes3.Clone(), 0, 2, false);
|
||||||
|
Assert.True(result3.IsSuccessful);
|
||||||
|
Assert.Equal(0x12340000U, result3.Value);
|
||||||
|
|
||||||
|
// 长度不足4字节(numLength=2),小端
|
||||||
|
var bytes4 = new byte[] { 0x34, 0x12 };
|
||||||
|
var result4 = Number.BytesToUInt32((byte[])bytes4.Clone(), 0, 2, true);
|
||||||
|
Assert.True(result4.IsSuccessful);
|
||||||
|
Assert.Equal(0x1234U, result4.Value);
|
||||||
|
|
||||||
|
// numLength=0
|
||||||
|
var bytes5 = new byte[] { 0x12, 0x34, 0x56, 0x78 };
|
||||||
|
var result5 = Number.BytesToUInt32((byte[])bytes5.Clone(), 0, 0, false);
|
||||||
|
Assert.True(result5.IsSuccessful);
|
||||||
|
Assert.Equal(0U, result5.Value);
|
||||||
|
|
||||||
|
// offset测试
|
||||||
|
var bytes6 = new byte[] { 0x00, 0x00, 0x12, 0x34, 0x56, 0x78 };
|
||||||
|
var result6 = Number.BytesToUInt32(bytes6, 2, 4, false);
|
||||||
|
Assert.True(result6.IsSuccessful);
|
||||||
|
Assert.Equal(0x12345678U, result6.Value);
|
||||||
|
|
||||||
|
// numLength超限(>4),应返回异常
|
||||||
|
var bytes7 = new byte[5];
|
||||||
|
var result7 = Number.BytesToUInt32(bytes7, 0, 5, false);
|
||||||
|
Assert.False(result7.IsSuccessful);
|
||||||
|
|
||||||
|
// offset+numLength超限
|
||||||
|
var bytes8 = new byte[] { 0x01, 0x02, 0x03, 0x04 };
|
||||||
|
var result8 = Number.BytesToUInt32(bytes8, 2, 2, false);
|
||||||
|
Assert.True(result8.IsSuccessful);
|
||||||
|
Assert.Equal(0x03040000U, result8.Value);
|
||||||
|
|
||||||
|
// bytes长度不足offset+numLength
|
||||||
|
var bytes9 = new byte[] { 0x01, 0x02 };
|
||||||
|
var result9 = Number.BytesToUInt32(bytes9, 1, 1, true);
|
||||||
|
Assert.True(result9.IsSuccessful);
|
||||||
|
Assert.Equal(0x02U, result9.Value);
|
||||||
|
|
||||||
|
// 空数组
|
||||||
|
var result10 = Number.BytesToUInt32(new byte[0], 0, 0, false);
|
||||||
|
Assert.True(result10.IsSuccessful);
|
||||||
|
Assert.Equal(0U, result10.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 测试 UInt32ArrayToBytes 的正常与异常情况
|
||||||
|
/// </summary>
|
||||||
|
[Fact]
|
||||||
|
public void Test_UInt32ArrayToBytes()
|
||||||
|
{
|
||||||
|
// 正常情况
|
||||||
|
var arr = new UInt32[] { 0x12345678, 0xABCDEF01 };
|
||||||
|
var result = Number.UInt32ArrayToBytes(arr);
|
||||||
|
Assert.True(result.IsSuccessful);
|
||||||
|
// BlockCopy 按小端序
|
||||||
|
Assert.Equal(new byte[] { 0x78, 0x56, 0x34, 0x12, 0x01, 0xEF, 0xCD, 0xAB }, result.Value);
|
||||||
|
|
||||||
|
// 空数组
|
||||||
|
var result2 = Number.UInt32ArrayToBytes(new UInt32[0]);
|
||||||
|
Assert.True(result2.IsSuccessful);
|
||||||
|
Assert.Empty(result2.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 测试 MultiBitsToBytes 和 MultiBitsToNumber (ulong)
|
||||||
|
/// </summary>
|
||||||
|
[Fact]
|
||||||
|
public void Test_MultiBitsToBytesAndNumber_Ulong()
|
||||||
|
{
|
||||||
|
// 合并两个比特段
|
||||||
|
var result = Number.MultiBitsToNumber(0b101UL, 3, 0b11UL, 2);
|
||||||
|
Assert.True(result.IsSuccessful);
|
||||||
|
Assert.Equal((ulong)0b10111, result.Value);
|
||||||
|
|
||||||
|
// 合并为字节数组
|
||||||
|
var bytesResult = Number.MultiBitsToBytes(0b101UL, 3, 0b11UL, 2);
|
||||||
|
Assert.True(bytesResult.IsSuccessful);
|
||||||
|
Assert.Equal(new byte[] { 0b10111 }, bytesResult.Value);
|
||||||
|
|
||||||
|
// 超过64位
|
||||||
|
var failResult = Number.MultiBitsToNumber(0xFFFFFFFFFFFFFFFF, 64, 1, 1);
|
||||||
|
Assert.False(failResult.IsSuccessful);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 测试 MultiBitsToNumber (uint)
|
||||||
|
/// </summary>
|
||||||
|
[Fact]
|
||||||
|
public void Test_MultiBitsToNumber_Uint()
|
||||||
|
{
|
||||||
|
var result = Number.MultiBitsToNumber(0b101U, 3, 0b11U, 2);
|
||||||
|
Assert.True(result.IsSuccessful);
|
||||||
|
Assert.Equal((uint)0b10111, result.Value);
|
||||||
|
|
||||||
|
// 超过64位
|
||||||
|
var failResult = Number.MultiBitsToNumber(uint.MaxValue, 64, 1, 1);
|
||||||
|
Assert.False(failResult.IsSuccessful);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 测试 BitsCheck (ulong)
|
||||||
|
/// </summary>
|
||||||
|
[Fact]
|
||||||
|
public void Test_BitsCheck_Ulong()
|
||||||
|
{
|
||||||
|
// 完全匹配
|
||||||
|
Assert.True(Number.BitsCheck(0b1101UL, 0b1101UL));
|
||||||
|
// 不匹配
|
||||||
|
Assert.False(Number.BitsCheck(0b1101UL, 0b1001UL));
|
||||||
|
// 掩码
|
||||||
|
Assert.True(Number.BitsCheck(0b1101UL, 0b1001UL, 0b1001UL));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 测试 BitsCheck (uint)
|
||||||
|
/// </summary>
|
||||||
|
[Fact]
|
||||||
|
public void Test_BitsCheck_Uint()
|
||||||
|
{
|
||||||
|
Assert.True(Number.BitsCheck(0b1011U, 0b1011U));
|
||||||
|
Assert.False(Number.BitsCheck(0b1011U, 0b1001U));
|
||||||
|
Assert.True(Number.BitsCheck(0b1011U, 0b1001U, 0b1001U));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 测试 ToBit
|
||||||
|
/// </summary>
|
||||||
|
[Fact]
|
||||||
|
public void Test_ToBit()
|
||||||
|
{
|
||||||
|
// 取第0位
|
||||||
|
var result = Number.ToBit(0b1010U, 0);
|
||||||
|
Assert.True(result.IsSuccessful);
|
||||||
|
Assert.False(result.Value);
|
||||||
|
|
||||||
|
// 取第1位
|
||||||
|
var result2 = Number.ToBit(0b1010U, 1);
|
||||||
|
Assert.True(result2.IsSuccessful);
|
||||||
|
Assert.True(result2.Value);
|
||||||
|
|
||||||
|
// 负数位置
|
||||||
|
var result3 = Number.ToBit(0b1010U, -1);
|
||||||
|
Assert.False(result3.IsSuccessful);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 测试 BitsToNumber
|
||||||
|
/// </summary>
|
||||||
|
[Fact]
|
||||||
|
public void Test_BitsToNumber()
|
||||||
|
{
|
||||||
|
// 5位BitArray
|
||||||
|
var bits = new BitArray(new bool[] { true, true, false, true, false }); // 0b01011
|
||||||
|
var result = Number.BitsToNumber(bits);
|
||||||
|
Assert.True(result.IsSuccessful);
|
||||||
|
Assert.Equal((uint)0b01011, result.Value);
|
||||||
|
|
||||||
|
// 超过32位
|
||||||
|
var bits2 = new BitArray(33);
|
||||||
|
Assert.Throws<ArgumentException>(() => Number.BitsToNumber(bits2));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 测试 StringToBytes
|
||||||
|
/// </summary>
|
||||||
|
[Fact]
|
||||||
|
public void Test_StringToBytes()
|
||||||
|
{
|
||||||
|
// 16进制字符串
|
||||||
|
var bytes = Number.StringToBytes("1234ABCD");
|
||||||
|
Assert.Equal(new byte[] { 0x12, 0x34, 0xAB, 0xCD }, bytes);
|
||||||
|
|
||||||
|
// 8位字符串
|
||||||
|
var bytes2 = Number.StringToBytes("01020304");
|
||||||
|
Assert.Equal(new byte[] { 0x01, 0x02, 0x03, 0x04 }, bytes2);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 测试 ReverseBytes
|
||||||
|
/// </summary>
|
||||||
|
[Fact]
|
||||||
|
public void Test_ReverseBytes()
|
||||||
|
{
|
||||||
|
// 步长为2
|
||||||
|
var src = new byte[] { 0x01, 0x02, 0x03, 0x04 };
|
||||||
|
var result = Number.ReverseBytes(src, 2);
|
||||||
|
Assert.True(result.IsSuccessful);
|
||||||
|
Assert.Equal(new byte[] { 0x02, 0x01, 0x04, 0x03 }, result.Value);
|
||||||
|
|
||||||
|
// 步长为4
|
||||||
|
var src2 = new byte[] { 0x01, 0x02, 0x03, 0x04 };
|
||||||
|
var result2 = Number.ReverseBytes(src2, 4);
|
||||||
|
Assert.True(result2.IsSuccessful);
|
||||||
|
Assert.Equal(new byte[] { 0x04, 0x03, 0x02, 0x01 }, result2.Value);
|
||||||
|
|
||||||
|
// 步长为1(无变化)
|
||||||
|
var src3 = new byte[] { 0x01, 0x02, 0x03, 0x04 };
|
||||||
|
var result3 = Number.ReverseBytes(src3, 1);
|
||||||
|
Assert.True(result3.IsSuccessful);
|
||||||
|
Assert.Equal(src3, result3.Value);
|
||||||
|
|
||||||
|
// 步长为0(异常)
|
||||||
|
var result4 = Number.ReverseBytes(src3, 0);
|
||||||
|
Assert.False(result4.IsSuccessful);
|
||||||
|
|
||||||
|
// 步长不能整除
|
||||||
|
var result5 = Number.ReverseBytes(src3, 3);
|
||||||
|
Assert.False(result5.IsSuccessful);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 测试 ReverseBits (byte)
|
||||||
|
/// </summary>
|
||||||
|
[Fact]
|
||||||
|
public void Test_ReverseBits_Byte()
|
||||||
|
{
|
||||||
|
// 0b00010010 -> 0b01001000
|
||||||
|
byte src = 0b00010010;
|
||||||
|
byte reversed = Number.ReverseBits(src);
|
||||||
|
Assert.Equal(0b01001000, reversed);
|
||||||
|
|
||||||
|
// 0b11110000 -> 0b00001111
|
||||||
|
Assert.Equal(0b00001111, Number.ReverseBits(0b11110000));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 测试 ReverseBits (byte[])
|
||||||
|
/// </summary>
|
||||||
|
[Fact]
|
||||||
|
public void Test_ReverseBits_ByteArray()
|
||||||
|
{
|
||||||
|
var src = new byte[] { 0b00010010, 0b11110000 };
|
||||||
|
var reversed = Number.ReverseBits(src);
|
||||||
|
Assert.Equal(new byte[] { 0b01001000, 0b00001111 }, reversed);
|
||||||
|
|
||||||
|
// 空数组
|
||||||
|
var reversed2 = Number.ReverseBits(new byte[0]);
|
||||||
|
Assert.Empty(reversed2);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 测试 GetLength
|
||||||
|
/// </summary>
|
||||||
|
[Fact]
|
||||||
|
public void Test_GetLength()
|
||||||
|
{
|
||||||
|
Assert.Equal(5, Number.GetLength(12345));
|
||||||
|
Assert.Equal(4, Number.GetLength(-123));
|
||||||
|
Assert.Equal(1, Number.GetLength(0));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 测试 IntPow
|
||||||
|
/// </summary>
|
||||||
|
[Fact]
|
||||||
|
public void Test_IntPow()
|
||||||
|
{
|
||||||
|
Assert.Equal(8, Number.IntPow(2, 3));
|
||||||
|
Assert.Equal(1, Number.IntPow(5, 0));
|
||||||
|
Assert.Equal(0, Number.IntPow(0, 5));
|
||||||
|
Assert.Equal(7, Number.IntPow(7, 1));
|
||||||
|
Assert.Equal(81, Number.IntPow(3, 4));
|
||||||
|
}
|
||||||
|
}
|
||||||
99
server.test/ProgressTrackerTest.cs
Normal file
99
server.test/ProgressTrackerTest.cs
Normal file
@@ -0,0 +1,99 @@
|
|||||||
|
using Microsoft.AspNetCore.SignalR;
|
||||||
|
using Moq;
|
||||||
|
using server.Hubs;
|
||||||
|
using server.Services;
|
||||||
|
|
||||||
|
public class ProgressTrackerTest
|
||||||
|
{
|
||||||
|
[Fact]
|
||||||
|
public void Test_ProgressReporter_Basic()
|
||||||
|
{
|
||||||
|
int reportedValue = -1;
|
||||||
|
var reporter = new ProgressReporter(async v => { reportedValue = v; await Task.CompletedTask; }, 0, 100, 10);
|
||||||
|
|
||||||
|
// Report
|
||||||
|
reporter.Report(50);
|
||||||
|
Assert.Equal(50, reporter.Progress);
|
||||||
|
Assert.Equal(ProgressStatus.InProgress, reporter.Status);
|
||||||
|
Assert.Equal(50, reportedValue);
|
||||||
|
|
||||||
|
// Increase by step
|
||||||
|
reporter.Increase();
|
||||||
|
Assert.Equal(60, reporter.Progress);
|
||||||
|
|
||||||
|
// Increase by value
|
||||||
|
reporter.Increase(20);
|
||||||
|
Assert.Equal(80, reporter.Progress);
|
||||||
|
|
||||||
|
// Finish
|
||||||
|
reporter.Finish();
|
||||||
|
Assert.Equal(ProgressStatus.Completed, reporter.Status);
|
||||||
|
Assert.Equal(100, reporter.Progress);
|
||||||
|
|
||||||
|
// Cancel
|
||||||
|
reporter = new ProgressReporter(async v => { reportedValue = v; await Task.CompletedTask; }, 0, 100, 10);
|
||||||
|
reporter.Cancel();
|
||||||
|
Assert.Equal(ProgressStatus.Canceled, reporter.Status);
|
||||||
|
Assert.Equal("User Cancelled", reporter.ErrorMessage);
|
||||||
|
|
||||||
|
// Error
|
||||||
|
reporter = new ProgressReporter(async v => { reportedValue = v; await Task.CompletedTask; }, 0, 100, 10);
|
||||||
|
reporter.Error("Test Error");
|
||||||
|
Assert.Equal(ProgressStatus.Failed, reporter.Status);
|
||||||
|
Assert.Equal("Test Error", reporter.ErrorMessage);
|
||||||
|
|
||||||
|
// CreateChild
|
||||||
|
var parent = new ProgressReporter(async v => { await Task.CompletedTask; }, 10, 100, 5);
|
||||||
|
var child = parent.CreateChild(50, 5);
|
||||||
|
Assert.Equal(ProgressStatus.Pending, child.Status);
|
||||||
|
Assert.NotNull(child);
|
||||||
|
|
||||||
|
// Child Increase
|
||||||
|
child.Increase();
|
||||||
|
Assert.Equal(ProgressStatus.InProgress, child.Status);
|
||||||
|
Assert.Equal(20, child.ProgressPercent);
|
||||||
|
Assert.Equal(20, parent.Progress);
|
||||||
|
|
||||||
|
// Child Complete
|
||||||
|
child.Finish();
|
||||||
|
Assert.Equal(ProgressStatus.Completed, child.Status);
|
||||||
|
Assert.Equal(100, child.ProgressPercent);
|
||||||
|
Assert.Equal(60, parent.Progress);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Test_ProgressTrackerService_Basic()
|
||||||
|
{
|
||||||
|
// Mock SignalR HubContext
|
||||||
|
var mockHubContext = new Mock<IHubContext<ProgressHub, IProgressReceiver>>();
|
||||||
|
var service = new ProgressTrackerService(mockHubContext.Object);
|
||||||
|
|
||||||
|
// CreateTask
|
||||||
|
var (taskId, reporter) = service.CreateTask();
|
||||||
|
Assert.NotNull(taskId);
|
||||||
|
Assert.NotNull(reporter);
|
||||||
|
|
||||||
|
// GetReporter
|
||||||
|
var optReporter = service.GetReporter(taskId);
|
||||||
|
Assert.True(optReporter.HasValue);
|
||||||
|
Assert.Equal(reporter, optReporter.Value);
|
||||||
|
|
||||||
|
// GetProgressStatus
|
||||||
|
var optStatus = service.GetProgressStatus(taskId);
|
||||||
|
Assert.True(optStatus.HasValue);
|
||||||
|
Assert.Equal(ProgressStatus.Pending, optStatus.Value);
|
||||||
|
|
||||||
|
// BindTask
|
||||||
|
var bindResult = service.BindTask(taskId, "conn1");
|
||||||
|
Assert.True(bindResult);
|
||||||
|
|
||||||
|
// CancelTask
|
||||||
|
var cancelResult = service.CancelTask(taskId);
|
||||||
|
Assert.True(cancelResult);
|
||||||
|
|
||||||
|
// After cancel, status should be Cancelled
|
||||||
|
var optStatus2 = service.GetProgressStatus(taskId);
|
||||||
|
Assert.True(optStatus2.HasValue);
|
||||||
|
Assert.Equal(ProgressStatus.Canceled, optStatus2.Value);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,138 +0,0 @@
|
|||||||
using System.Net;
|
|
||||||
using System.Text;
|
|
||||||
using Common;
|
|
||||||
using Xunit.Abstractions;
|
|
||||||
|
|
||||||
namespace server.test;
|
|
||||||
|
|
||||||
|
|
||||||
public class UDPServerTest
|
|
||||||
{
|
|
||||||
const string address = "127.0.0.1";
|
|
||||||
const int port = 33000;
|
|
||||||
private static readonly UDPServer udpServer = new UDPServer(port);
|
|
||||||
|
|
||||||
private readonly ITestOutputHelper output;
|
|
||||||
|
|
||||||
public UDPServerTest(ITestOutputHelper output)
|
|
||||||
{
|
|
||||||
this.output = output;
|
|
||||||
udpServer.Start();
|
|
||||||
}
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void UDPDataDeepClone()
|
|
||||||
{
|
|
||||||
var udpData = new UDPData()
|
|
||||||
{
|
|
||||||
DateTime = DateTime.Now,
|
|
||||||
Address = "127.0.0.1",
|
|
||||||
Port = 1234,
|
|
||||||
Data = new byte[] { 0xf0, 00, 00, 00 },
|
|
||||||
HasRead = false
|
|
||||||
};
|
|
||||||
var cloneUdpData = udpData.DeepClone();
|
|
||||||
|
|
||||||
Assert.Equal(udpData.DateTime, cloneUdpData.DateTime);
|
|
||||||
Assert.Equal(udpData.Address, cloneUdpData.Address);
|
|
||||||
Assert.Equal(udpData.Port, cloneUdpData.Port);
|
|
||||||
Assert.Equal(udpData.Data, cloneUdpData.Data);
|
|
||||||
Assert.Equal(udpData.HasRead, cloneUdpData.HasRead);
|
|
||||||
|
|
||||||
udpData.DateTime = DateTime.Now;
|
|
||||||
udpData.Address = "192.168.1.1";
|
|
||||||
udpData.Port = 33000;
|
|
||||||
udpData.Data = new byte[] { 0xFF, 00, 00, 00 };
|
|
||||||
udpData.HasRead = true;
|
|
||||||
|
|
||||||
Assert.NotNull(cloneUdpData.DateTime);
|
|
||||||
Assert.NotNull(cloneUdpData.Address);
|
|
||||||
Assert.NotNull(cloneUdpData.Port);
|
|
||||||
Assert.NotNull(cloneUdpData.Data);
|
|
||||||
Assert.NotNull(cloneUdpData.HasRead);
|
|
||||||
|
|
||||||
Assert.NotEqual(udpData.DateTime, cloneUdpData.DateTime);
|
|
||||||
Assert.NotEqual(udpData.Address, cloneUdpData.Address);
|
|
||||||
Assert.NotEqual(udpData.Port, cloneUdpData.Port);
|
|
||||||
Assert.NotEqual(udpData.Data, cloneUdpData.Data);
|
|
||||||
Assert.NotEqual(udpData.HasRead, cloneUdpData.HasRead);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(new object[] { new string[] { "Hello World!", "Hello Server!", "What is your problem?" } })]
|
|
||||||
public async Task UDPServerFindString(string[] textArray)
|
|
||||||
{
|
|
||||||
Assert.True(udpServer.IsRunning);
|
|
||||||
|
|
||||||
var serverEP = new IPEndPoint(IPAddress.Parse(address), port);
|
|
||||||
|
|
||||||
foreach (var text in textArray)
|
|
||||||
{
|
|
||||||
Assert.True(await UDPClientPool.SendStringAsync(serverEP, [text]));
|
|
||||||
var ret = await udpServer.FindDataAsync(address);
|
|
||||||
Assert.True(ret.HasValue);
|
|
||||||
var data = ret.Value;
|
|
||||||
Assert.Equal(address, data.Address);
|
|
||||||
Assert.Equal(text, Encoding.ASCII.GetString(data.Data));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(new object[] { new UInt32[] { 0xF0_00_00_00, 0xFF_00_00_00, 0xFF_FF_FF_FF } })]
|
|
||||||
public async Task UDPServerFindBytes(UInt32[] bytesArray)
|
|
||||||
{
|
|
||||||
Assert.True(udpServer.IsRunning);
|
|
||||||
|
|
||||||
var serverEP = new IPEndPoint(IPAddress.Parse(address), port);
|
|
||||||
|
|
||||||
foreach (var number in bytesArray)
|
|
||||||
{
|
|
||||||
Assert.True(await UDPClientPool.SendBytesAsync(serverEP, Number.NumberToBytes(number, 4).Value));
|
|
||||||
var ret = await udpServer.FindDataAsync(address);
|
|
||||||
Assert.True(ret.HasValue);
|
|
||||||
var data = ret.Value;
|
|
||||||
Assert.Equal(address, data.Address);
|
|
||||||
Assert.Equal(number, Number.BytesToUInt32(data.Data).Value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(new object[] { new UInt32[] { 0xF0_00_00_00, 0xF0_01_00_00 } })]
|
|
||||||
public async Task UDPServerWaitResp(UInt32[] bytesArray)
|
|
||||||
{
|
|
||||||
Assert.True(udpServer.IsRunning);
|
|
||||||
|
|
||||||
var serverEP = new IPEndPoint(IPAddress.Parse(address), port);
|
|
||||||
|
|
||||||
foreach (var number in bytesArray)
|
|
||||||
{
|
|
||||||
Assert.True(await UDPClientPool.SendBytesAsync(serverEP, Number.NumberToBytes(number, 4).Value));
|
|
||||||
|
|
||||||
var ret = await udpServer.WaitForAckAsync(address);
|
|
||||||
Assert.True(ret.IsSuccessful);
|
|
||||||
var data = ret.Value;
|
|
||||||
Assert.True(data.IsSuccessful);
|
|
||||||
Assert.Equal(number, Number.BytesToUInt32(data.ToBytes()).Value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(new object[] { new UInt64[] { 0x0F_00_00_00_01_02_02_02, 0x0F_01_00_00_FF_FF_FF_FF } })]
|
|
||||||
public async Task UDPServerWaitData(UInt64[] bytesArray)
|
|
||||||
{
|
|
||||||
Assert.True(udpServer.IsRunning);
|
|
||||||
|
|
||||||
var serverEP = new IPEndPoint(IPAddress.Parse(address), port);
|
|
||||||
|
|
||||||
foreach (var number in bytesArray)
|
|
||||||
{
|
|
||||||
Assert.True(await UDPClientPool.SendBytesAsync(serverEP, Number.NumberToBytes(number, 8).Value));
|
|
||||||
|
|
||||||
var ret = await udpServer.WaitForDataAsync(address);
|
|
||||||
Assert.True(ret.IsSuccessful);
|
|
||||||
var data = ret.Value;
|
|
||||||
Assert.True(data.IsSuccessful);
|
|
||||||
Assert.Equal((UInt64)number, Number.BytesToUInt64(data.ToBytes()).Value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -11,6 +11,7 @@
|
|||||||
<PackageReference Include="coverlet.collector" Version="6.0.2" />
|
<PackageReference Include="coverlet.collector" Version="6.0.2" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.4" />
|
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.4" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
|
||||||
|
<PackageReference Include="Moq" Version="4.20.72" />
|
||||||
<PackageReference Include="xunit" Version="2.9.2" />
|
<PackageReference Include="xunit" Version="2.9.2" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
|
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
3
server/.gitignore
vendored
3
server/.gitignore
vendored
@@ -1,5 +1,6 @@
|
|||||||
|
# Generate
|
||||||
obj
|
obj
|
||||||
bin
|
bin
|
||||||
bitstream
|
bitstream
|
||||||
bsdl
|
bsdl
|
||||||
|
data
|
||||||
|
|||||||
@@ -7,8 +7,11 @@ using Microsoft.IdentityModel.Tokens;
|
|||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NLog.Web;
|
using NLog.Web;
|
||||||
|
using NSwag;
|
||||||
|
using NSwag.CodeGeneration.TypeScript;
|
||||||
using NSwag.Generation.Processors.Security;
|
using NSwag.Generation.Processors.Security;
|
||||||
using server.Services;
|
using server.Services;
|
||||||
|
using TypedSignalR.Client.DevTools;
|
||||||
|
|
||||||
// Early init of NLog to allow startup and exception logging, before host is built
|
// Early init of NLog to allow startup and exception logging, before host is built
|
||||||
var logger = NLog.LogManager.Setup()
|
var logger = NLog.LogManager.Setup()
|
||||||
@@ -59,8 +62,42 @@ try
|
|||||||
IssuerSigningKey = new SymmetricSecurityKey(
|
IssuerSigningKey = new SymmetricSecurityKey(
|
||||||
Encoding.UTF8.GetBytes("my secret key 1234567890my secret key 1234567890")),
|
Encoding.UTF8.GetBytes("my secret key 1234567890my secret key 1234567890")),
|
||||||
};
|
};
|
||||||
options.Authority = "http://localhost:5000";
|
options.Authority = $"http://{Global.LocalHost}:5000";
|
||||||
options.RequireHttpsMetadata = false;
|
options.RequireHttpsMetadata = false;
|
||||||
|
|
||||||
|
// We have to hook the OnMessageReceived event in order to
|
||||||
|
// allow the JWT authentication handler to read the access
|
||||||
|
// token from the query string when a WebSocket or
|
||||||
|
// Server-Sent Events request comes in.
|
||||||
|
|
||||||
|
// Sending the access token in the query string is required when using WebSockets or ServerSentEvents
|
||||||
|
// due to a limitation in Browser APIs. We restrict it to only calls to the
|
||||||
|
// SignalR hub in this code.
|
||||||
|
// See https://docs.microsoft.com/aspnet/core/signalr/security#access-token-logging
|
||||||
|
// for more information about security considerations when using
|
||||||
|
// the query string to transmit the access token.
|
||||||
|
options.Events = new JwtBearerEvents
|
||||||
|
{
|
||||||
|
OnMessageReceived = context =>
|
||||||
|
{
|
||||||
|
var accessToken = context.Request.Query["access_token"];
|
||||||
|
|
||||||
|
// If the request is for our hub...
|
||||||
|
var path = context.HttpContext.Request.Path;
|
||||||
|
if (!string.IsNullOrEmpty(accessToken) && (
|
||||||
|
path.StartsWithSegments("/hubs/JtagHub") ||
|
||||||
|
path.StartsWithSegments("/hubs/ProgressHub") ||
|
||||||
|
path.StartsWithSegments("/hubs/DigitalTubesHub") ||
|
||||||
|
path.StartsWithSegments("/hubs/RotaryEncoderHub") ||
|
||||||
|
path.StartsWithSegments("/hubs/OscilloscopeHub")
|
||||||
|
))
|
||||||
|
{
|
||||||
|
// Read the token out of the query string
|
||||||
|
context.Token = accessToken;
|
||||||
|
}
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
};
|
||||||
});
|
});
|
||||||
// Add JWT Token Authorization Policy
|
// Add JWT Token Authorization Policy
|
||||||
builder.Services.AddAuthorization(options =>
|
builder.Services.AddAuthorization(options =>
|
||||||
@@ -68,7 +105,7 @@ try
|
|||||||
options.AddPolicy("Admin", policy =>
|
options.AddPolicy("Admin", policy =>
|
||||||
{
|
{
|
||||||
policy.RequireClaim(ClaimTypes.Role, new string[] {
|
policy.RequireClaim(ClaimTypes.Role, new string[] {
|
||||||
Database.User.UserPermission.Admin.ToString(),
|
Database.UserPermission.Admin.ToString(),
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -92,8 +129,17 @@ try
|
|||||||
.AllowAnyMethod()
|
.AllowAnyMethod()
|
||||||
.AllowAnyHeader()
|
.AllowAnyHeader()
|
||||||
);
|
);
|
||||||
|
options.AddPolicy("SignalR", policy => policy
|
||||||
|
.WithOrigins([$"http://{Global.LocalHost}:5173", "http://127.0.0.1:5173"])
|
||||||
|
.AllowAnyHeader()
|
||||||
|
.AllowAnyMethod()
|
||||||
|
.AllowCredentials()
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Use SignalR
|
||||||
|
builder.Services.AddSignalR();
|
||||||
|
|
||||||
// Add Swagger
|
// Add Swagger
|
||||||
builder.Services.AddSwaggerDocument(options =>
|
builder.Services.AddSwaggerDocument(options =>
|
||||||
{
|
{
|
||||||
@@ -129,10 +175,14 @@ try
|
|||||||
options.OperationProcessors.Add(new OperationSecurityScopeProcessor("Bearer"));
|
options.OperationProcessors.Add(new OperationSecurityScopeProcessor("Bearer"));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
// 添加 HTTP 视频流服务
|
// 添加 HTTP 视频流服务
|
||||||
builder.Services.AddSingleton<HttpVideoStreamService>();
|
builder.Services.AddSingleton<HttpVideoStreamService>();
|
||||||
builder.Services.AddHostedService(provider => provider.GetRequiredService<HttpVideoStreamService>());
|
builder.Services.AddHostedService(provider => provider.GetRequiredService<HttpVideoStreamService>());
|
||||||
|
builder.Services.AddSingleton<HttpHdmiVideoStreamService>();
|
||||||
|
builder.Services.AddHostedService(provider => provider.GetRequiredService<HttpHdmiVideoStreamService>());
|
||||||
|
|
||||||
|
// 添加进度跟踪服务
|
||||||
|
builder.Services.AddSingleton<ProgressTracker>();
|
||||||
|
|
||||||
// Application Settings
|
// Application Settings
|
||||||
var app = builder.Build();
|
var app = builder.Build();
|
||||||
@@ -165,6 +215,17 @@ try
|
|||||||
FileProvider = new PhysicalFileProvider(Path.Combine(Directory.GetCurrentDirectory(), "log")),
|
FileProvider = new PhysicalFileProvider(Path.Combine(Directory.GetCurrentDirectory(), "log")),
|
||||||
RequestPath = "/log"
|
RequestPath = "/log"
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Exam Files (实验静态资源)
|
||||||
|
if (Directory.Exists(Path.Combine(Directory.GetCurrentDirectory(), "exam")))
|
||||||
|
{
|
||||||
|
app.UseStaticFiles(new StaticFileOptions
|
||||||
|
{
|
||||||
|
FileProvider = new PhysicalFileProvider(Path.Combine(Directory.GetCurrentDirectory(), "exam")),
|
||||||
|
RequestPath = "/exam"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
app.MapFallbackToFile("index.html");
|
app.MapFallbackToFile("index.html");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -175,14 +236,61 @@ try
|
|||||||
app.UseAuthorization();
|
app.UseAuthorization();
|
||||||
|
|
||||||
// Swagger
|
// Swagger
|
||||||
app.UseOpenApi();
|
app.UseOpenApi(settings =>
|
||||||
|
{
|
||||||
|
settings.PostProcess = (document, httpRequest) =>
|
||||||
|
{
|
||||||
|
document.Servers.Clear();
|
||||||
|
document.Servers.Add(new NSwag.OpenApiServer { Url = $"http://{Global.LocalHost}:5000" });
|
||||||
|
};
|
||||||
|
});
|
||||||
app.UseSwaggerUi();
|
app.UseSwaggerUi();
|
||||||
|
|
||||||
|
// SignalR
|
||||||
|
app.UseWebSockets();
|
||||||
|
app.UseSignalRHubSpecification();
|
||||||
|
app.UseSignalRHubDevelopmentUI();
|
||||||
|
|
||||||
// Router
|
// Router
|
||||||
app.MapControllers();
|
app.MapControllers();
|
||||||
|
app.MapHub<server.Hubs.JtagHub>("/hubs/JtagHub");
|
||||||
|
app.MapHub<server.Hubs.ProgressHub>("/hubs/ProgressHub");
|
||||||
|
app.MapHub<server.Hubs.DigitalTubesHub>("/hubs/DigitalTubesHub");
|
||||||
|
app.MapHub<server.Hubs.RotaryEncoderHub>("/hubs/RotaryEncoderHub");
|
||||||
|
app.MapHub<server.Hubs.OscilloscopeHub>("/hubs/OscilloscopeHub");
|
||||||
|
|
||||||
// Setup Program
|
// Setup Program
|
||||||
MsgBus.Init();
|
MsgBus.Init();
|
||||||
|
var progressTracker = app.Services.GetRequiredService<ProgressTracker>();
|
||||||
|
MsgBus.SetProgressTracker(progressTracker);
|
||||||
|
|
||||||
|
// Generate API Client
|
||||||
|
app.MapGet("GetAPIClientCode", async (HttpContext context) =>
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var document = await OpenApiDocument.FromUrlAsync($"http://{Global.LocalHost}:5000/swagger/v1/swagger.json");
|
||||||
|
|
||||||
|
var settings = new TypeScriptClientGeneratorSettings
|
||||||
|
{
|
||||||
|
ClassName = "{controller}Client",
|
||||||
|
UseAbortSignal = false,
|
||||||
|
Template = TypeScriptTemplate.Axios,
|
||||||
|
TypeScriptGeneratorSettings = {
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
var generator = new TypeScriptClientGenerator(document, settings);
|
||||||
|
var code = generator.GenerateFile();
|
||||||
|
|
||||||
|
return Results.Text(code, "text/plain; charset=utf-8", Encoding.UTF8);
|
||||||
|
}
|
||||||
|
catch (Exception err)
|
||||||
|
{
|
||||||
|
logger.Error(err);
|
||||||
|
return Results.Problem(err.ToString());
|
||||||
|
}
|
||||||
|
}).RequireCors("Development");
|
||||||
|
|
||||||
app.Run();
|
app.Run();
|
||||||
}
|
}
|
||||||
@@ -203,4 +311,3 @@ finally
|
|||||||
// Close Program
|
// Close Program
|
||||||
MsgBus.Exit();
|
MsgBus.Exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
"commandName": "Project",
|
"commandName": "Project",
|
||||||
"dotnetRunMessages": true,
|
"dotnetRunMessages": true,
|
||||||
"launchBrowser": true,
|
"launchBrowser": true,
|
||||||
"applicationUrl": "http://localhost:5000",
|
"applicationUrl": "http://0.0.0.0:5000",
|
||||||
"environmentVariables": {
|
"environmentVariables": {
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development",
|
"ASPNETCORE_ENVIRONMENT": "Development",
|
||||||
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy"
|
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy"
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
"commandName": "Project",
|
"commandName": "Project",
|
||||||
"dotnetRunMessages": true,
|
"dotnetRunMessages": true,
|
||||||
"launchBrowser": true,
|
"launchBrowser": true,
|
||||||
"applicationUrl": "https://localhost:7278;http://localhost:5000",
|
"applicationUrl": "https://0.0.0.0:7278;http://0.0.0.0:5000",
|
||||||
"environmentVariables": {
|
"environmentVariables": {
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development",
|
"ASPNETCORE_ENVIRONMENT": "Development",
|
||||||
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy"
|
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy"
|
||||||
|
|||||||
@@ -11,11 +11,15 @@
|
|||||||
<SpaRoot>../</SpaRoot>
|
<SpaRoot>../</SpaRoot>
|
||||||
<SpaProxyServerUrl>http://localhost:5173</SpaProxyServerUrl>
|
<SpaProxyServerUrl>http://localhost:5173</SpaProxyServerUrl>
|
||||||
<SpaProxyLaunchCommand>npm run dev</SpaProxyLaunchCommand>
|
<SpaProxyLaunchCommand>npm run dev</SpaProxyLaunchCommand>
|
||||||
|
<NoWarn>CS1591</NoWarn>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="DotNext" Version="5.19.1" />
|
<PackageReference Include="ArpLookup" Version="2.0.3" />
|
||||||
<PackageReference Include="DotNext.Threading" Version="5.19.1" />
|
<PackageReference Include="DotNext" Version="5.23.0" />
|
||||||
|
<PackageReference Include="DotNext.Threading" Version="5.23.0" />
|
||||||
|
<PackageReference Include="FlashCap" Version="1.11.0" />
|
||||||
|
<PackageReference Include="H264Sharp" Version="1.6.0" />
|
||||||
<PackageReference Include="Honoo.IO.Hashing.Crc" Version="1.3.3" />
|
<PackageReference Include="Honoo.IO.Hashing.Crc" Version="1.3.3" />
|
||||||
<PackageReference Include="linq2db.AspNet" Version="5.4.1" />
|
<PackageReference Include="linq2db.AspNet" Version="5.4.1" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.7" />
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.7" />
|
||||||
@@ -26,8 +30,20 @@
|
|||||||
<PackageReference Include="NLog" Version="5.4.0" />
|
<PackageReference Include="NLog" Version="5.4.0" />
|
||||||
<PackageReference Include="NLog.Web.AspNetCore" Version="5.4.0" />
|
<PackageReference Include="NLog.Web.AspNetCore" Version="5.4.0" />
|
||||||
<PackageReference Include="NSwag.AspNetCore" Version="14.3.0" />
|
<PackageReference Include="NSwag.AspNetCore" Version="14.3.0" />
|
||||||
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
|
<PackageReference Include="NSwag.CodeGeneration.TypeScript" Version="14.4.0" />
|
||||||
|
<PackageReference Include="SharpRTSP" Version="1.8.2" />
|
||||||
|
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
|
||||||
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" />
|
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" />
|
||||||
|
<PackageReference Include="Tapper.Analyzer" Version="1.13.1">
|
||||||
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
|
<PrivateAssets>all</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="TypedSignalR.Client.DevTools" Version="1.2.4" />
|
||||||
|
<PackageReference Include="TypedSignalR.Client.TypeScript.Analyzer" Version="1.15.0">
|
||||||
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
|
<PrivateAssets>all</PrivateAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="TypedSignalR.Client.TypeScript.Attributes" Version="1.15.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
634
server/src/ArpClient.cs
Normal file
634
server/src/ArpClient.cs
Normal file
@@ -0,0 +1,634 @@
|
|||||||
|
using System.Diagnostics;
|
||||||
|
using System.Net.NetworkInformation;
|
||||||
|
using ArpLookup;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
using System.Net;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// ARP 记录管理静态类(跨平台支持)
|
||||||
|
/// </summary>
|
||||||
|
public static class ArpClient
|
||||||
|
{
|
||||||
|
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 读取所有 ARP 记录
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>ARP 记录列表</returns>
|
||||||
|
public static async Task<List<ArpEntry>> GetArpTableAsync()
|
||||||
|
{
|
||||||
|
var entries = new List<ArpEntry>();
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
string command = GetArpListCommand();
|
||||||
|
var result = await ExecuteCommandAsync(command);
|
||||||
|
if (result.IsSuccess)
|
||||||
|
{
|
||||||
|
var lines = result.Output.Split('\n', StringSplitOptions.RemoveEmptyEntries);
|
||||||
|
|
||||||
|
foreach (var line in lines)
|
||||||
|
{
|
||||||
|
var entry = ParseArpEntry(line);
|
||||||
|
if (entry != null)
|
||||||
|
{
|
||||||
|
entries.Add(entry);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
throw new Exception($"读取 ARP 表失败: {ex.Message}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return entries;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 动态更新指定 IP 的 ARP 记录
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="ipAddress">要更新的 IP 地址</param>
|
||||||
|
/// <returns>是否成功发送 Ping</returns>
|
||||||
|
public static async Task<bool> UpdateArpEntryAsync(string ipAddress)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(ipAddress))
|
||||||
|
throw new ArgumentException("IP 地址不能为空", nameof(ipAddress));
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var ret = await ArpClient.DeleteArpEntryAsync(ipAddress);
|
||||||
|
if (!ret)
|
||||||
|
{
|
||||||
|
logger.Error($"删除 ARP 记录失败: {ipAddress}");
|
||||||
|
}
|
||||||
|
|
||||||
|
PhysicalAddress? mac = await Arp.LookupAsync(IPAddress.Parse(ipAddress));
|
||||||
|
if (mac == null)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 添加 ARP 记录
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="ipAddress">IP 地址</param>
|
||||||
|
/// <param name="macAddress">MAC 地址</param>
|
||||||
|
/// <param name="interfaceName">网络接口名称(可选)</param>
|
||||||
|
/// <returns>是否成功</returns>
|
||||||
|
public static async Task<bool> AddArpEntryAsync(string ipAddress, string macAddress, string? interfaceName = null)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(ipAddress))
|
||||||
|
throw new ArgumentException("IP 地址不能为空", nameof(ipAddress));
|
||||||
|
|
||||||
|
if (string.IsNullOrWhiteSpace(macAddress))
|
||||||
|
throw new ArgumentException("MAC 地址不能为空", nameof(macAddress));
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// 格式化 MAC 地址以适配不同操作系统
|
||||||
|
string formattedMac = FormatMacAddress(macAddress);
|
||||||
|
string command = await GetArpAddCommandAsync(ipAddress, formattedMac, interfaceName);
|
||||||
|
var result = await ExecuteCommandAsync(command);
|
||||||
|
return result.IsSuccess;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
throw new Exception($"添加 ARP 记录失败: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 删除 ARP 记录
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="ipAddress">要删除的 IP 地址</param>
|
||||||
|
/// <param name="interfaceName">网络接口名称(可选)</param>
|
||||||
|
/// <returns>是否成功</returns>
|
||||||
|
public static async Task<bool> DeleteArpEntryAsync(string ipAddress, string? interfaceName = null)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(ipAddress))
|
||||||
|
throw new ArgumentException("IP 地址不能为空", nameof(ipAddress));
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
string command = GetArpDeleteCommand(ipAddress, interfaceName);
|
||||||
|
var result = await ExecuteCommandAsync(command);
|
||||||
|
return result.IsSuccess;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
throw new Exception($"删除 ARP 记录失败: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 清空所有 ARP 记录
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>是否成功</returns>
|
||||||
|
public static async Task<bool> ClearArpTableAsync()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
string command = GetArpClearCommand();
|
||||||
|
var result = await ExecuteCommandAsync(command);
|
||||||
|
return result.IsSuccess;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
throw new Exception($"清空 ARP 表失败: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 查询特定 IP 的 ARP 记录
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="ipAddress">IP 地址</param>
|
||||||
|
/// <returns>ARP 记录,如果不存在则返回 null</returns>
|
||||||
|
public static async Task<ArpEntry?> GetArpEntryAsync(string ipAddress)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(ipAddress))
|
||||||
|
throw new ArgumentException("IP 地址不能为空", nameof(ipAddress));
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
string command = GetArpQueryCommand(ipAddress);
|
||||||
|
var result = await ExecuteCommandAsync(command);
|
||||||
|
if (result.IsSuccess)
|
||||||
|
{
|
||||||
|
var lines = result.Output.Split('\n', StringSplitOptions.RemoveEmptyEntries);
|
||||||
|
foreach (var line in lines)
|
||||||
|
{
|
||||||
|
var entry = ParseArpEntry(line);
|
||||||
|
if (entry != null && entry.IpAddress == ipAddress)
|
||||||
|
{
|
||||||
|
return entry;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
throw new Exception($"查询 ARP 记录失败: {ex.Message}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取 ARP 列表命令
|
||||||
|
/// </summary>
|
||||||
|
private static string GetArpListCommand()
|
||||||
|
{
|
||||||
|
return "arp -a";
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取 ARP 添加命令
|
||||||
|
/// </summary>
|
||||||
|
private static async Task<string> GetArpAddCommandAsync(string ipAddress, string macAddress, string? interfaceName)
|
||||||
|
{
|
||||||
|
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrWhiteSpace(interfaceName))
|
||||||
|
{
|
||||||
|
// 通过 arp -a 获取接口索引
|
||||||
|
var interfaceIdx = await GetWindowsInterfaceIndexAsync(interfaceName);
|
||||||
|
if (interfaceIdx.HasValue)
|
||||||
|
{
|
||||||
|
return $"netsh -c i i add neighbors {interfaceIdx.Value} {ipAddress} {macAddress}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return $"arp -s {ipAddress} {macAddress}";
|
||||||
|
}
|
||||||
|
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
|
||||||
|
{
|
||||||
|
return string.IsNullOrWhiteSpace(interfaceName)
|
||||||
|
? $"arp -s {ipAddress} {macAddress}"
|
||||||
|
: $"arp -s {ipAddress} {macAddress} -i {interfaceName}";
|
||||||
|
}
|
||||||
|
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
|
||||||
|
{
|
||||||
|
return string.IsNullOrWhiteSpace(interfaceName)
|
||||||
|
? $"arp -s {ipAddress} {macAddress}"
|
||||||
|
: $"arp -s {ipAddress} {macAddress} ifscope {interfaceName}";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
throw new PlatformNotSupportedException("不支持的操作系统平台");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取 Windows 接口索引
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="interfaceIp">接口IP地址</param>
|
||||||
|
/// <returns>接口索引(十进制),如果未找到则返回null</returns>
|
||||||
|
private static async Task<int?> GetWindowsInterfaceIndexAsync(string interfaceIp)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var result = await ExecuteCommandAsync("arp -a");
|
||||||
|
if (!result.IsSuccess)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
var lines = result.Output.Split('\n', StringSplitOptions.RemoveEmptyEntries);
|
||||||
|
|
||||||
|
foreach (var line in lines)
|
||||||
|
{
|
||||||
|
// 匹配接口行格式: Interface: 172.6.1.5 --- 0xa
|
||||||
|
var interfacePattern = @"Interface:\s+(\d+\.\d+\.\d+\.\d+)\s+---\s+(0x[a-fA-F0-9]+)";
|
||||||
|
var match = Regex.Match(line, interfacePattern);
|
||||||
|
|
||||||
|
if (match.Success && match.Groups[1].Value == interfaceIp)
|
||||||
|
{
|
||||||
|
// 将十六进制索引转换为十进制
|
||||||
|
var hexIndex = match.Groups[2].Value;
|
||||||
|
// 去掉 "0x" 前缀
|
||||||
|
var hexValue = hexIndex.StartsWith("0x", StringComparison.OrdinalIgnoreCase)
|
||||||
|
? hexIndex.Substring(2)
|
||||||
|
: hexIndex;
|
||||||
|
|
||||||
|
if (int.TryParse(hexValue, System.Globalization.NumberStyles.HexNumber, null, out int decimalIndex))
|
||||||
|
{
|
||||||
|
logger.Debug($"找到接口 {interfaceIp} 的索引: {hexIndex} -> {decimalIndex}");
|
||||||
|
return decimalIndex;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.Warn($"未找到接口 {interfaceIp} 的索引");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, $"获取接口 {interfaceIp} 索引失败");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取 ARP 删除命令
|
||||||
|
/// </summary>
|
||||||
|
private static string GetArpDeleteCommand(string ipAddress, string? interfaceName)
|
||||||
|
{
|
||||||
|
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
|
||||||
|
{
|
||||||
|
return $"arp -d {ipAddress}";
|
||||||
|
}
|
||||||
|
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
|
||||||
|
{
|
||||||
|
return string.IsNullOrWhiteSpace(interfaceName)
|
||||||
|
? $"arp -d {ipAddress}"
|
||||||
|
: $"arp -d {ipAddress} -i {interfaceName}";
|
||||||
|
}
|
||||||
|
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
|
||||||
|
{
|
||||||
|
return string.IsNullOrWhiteSpace(interfaceName)
|
||||||
|
? $"arp -d {ipAddress}"
|
||||||
|
: $"arp -d {ipAddress} ifscope {interfaceName}";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
throw new PlatformNotSupportedException("不支持的操作系统平台");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取 ARP 清空命令
|
||||||
|
/// </summary>
|
||||||
|
private static string GetArpClearCommand()
|
||||||
|
{
|
||||||
|
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
|
||||||
|
{
|
||||||
|
return "arp -d *";
|
||||||
|
}
|
||||||
|
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
|
||||||
|
{
|
||||||
|
return "ip neigh flush all";
|
||||||
|
}
|
||||||
|
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
|
||||||
|
{
|
||||||
|
return "arp -d -a";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
throw new PlatformNotSupportedException("不支持的操作系统平台");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取 ARP 查询命令
|
||||||
|
/// </summary>
|
||||||
|
private static string GetArpQueryCommand(string ipAddress)
|
||||||
|
{
|
||||||
|
return $"arp -a {ipAddress}";
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 执行系统命令
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="command">命令</param>
|
||||||
|
/// <returns>命令执行结果</returns>
|
||||||
|
private static async Task<CommandResult> ExecuteCommandAsync(string command)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
ProcessStartInfo processInfo;
|
||||||
|
|
||||||
|
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
|
||||||
|
{
|
||||||
|
processInfo = new ProcessStartInfo
|
||||||
|
{
|
||||||
|
FileName = "cmd.exe",
|
||||||
|
Arguments = $"/c {command}",
|
||||||
|
RedirectStandardOutput = true,
|
||||||
|
RedirectStandardError = true,
|
||||||
|
UseShellExecute = false,
|
||||||
|
CreateNoWindow = true
|
||||||
|
};
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
processInfo = new ProcessStartInfo
|
||||||
|
{
|
||||||
|
FileName = "/bin/bash",
|
||||||
|
Arguments = $"-c \"{command}\"",
|
||||||
|
RedirectStandardOutput = true,
|
||||||
|
RedirectStandardError = true,
|
||||||
|
UseShellExecute = false,
|
||||||
|
CreateNoWindow = true
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.Debug($"Executing command: {processInfo.FileName} {processInfo.Arguments}");
|
||||||
|
|
||||||
|
using var process = new Process { StartInfo = processInfo };
|
||||||
|
process.Start();
|
||||||
|
|
||||||
|
var output = await process.StandardOutput.ReadToEndAsync();
|
||||||
|
var error = await process.StandardError.ReadToEndAsync();
|
||||||
|
|
||||||
|
await process.WaitForExitAsync();
|
||||||
|
|
||||||
|
logger.Debug($"Command output: {output}");
|
||||||
|
if (!string.IsNullOrWhiteSpace(error))
|
||||||
|
logger.Debug($"Command error: {error}");
|
||||||
|
logger.Debug($"Command exit code: {process.ExitCode}");
|
||||||
|
|
||||||
|
return new CommandResult
|
||||||
|
{
|
||||||
|
IsSuccess = process.ExitCode == 0,
|
||||||
|
Output = output,
|
||||||
|
Error = error,
|
||||||
|
ExitCode = process.ExitCode
|
||||||
|
};
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, $"Command execution failed: {command}");
|
||||||
|
return new CommandResult
|
||||||
|
{
|
||||||
|
IsSuccess = false,
|
||||||
|
Error = ex.Message,
|
||||||
|
ExitCode = -1
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 解析 ARP 记录行
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="line">ARP 记录行</param>
|
||||||
|
/// <returns>解析后的 ARP 记录</returns>
|
||||||
|
private static ArpEntry? ParseArpEntry(string line)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(line))
|
||||||
|
return null;
|
||||||
|
|
||||||
|
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
|
||||||
|
{
|
||||||
|
return ParseWindowsArpEntry(line);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return ParseUnixArpEntry(line);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 解析 Windows ARP 记录
|
||||||
|
/// </summary>
|
||||||
|
private static ArpEntry? ParseWindowsArpEntry(string line)
|
||||||
|
{
|
||||||
|
// 跳过空行和标题行
|
||||||
|
if (string.IsNullOrWhiteSpace(line) ||
|
||||||
|
line.Contains("Interface:") ||
|
||||||
|
line.Contains("Internet Address") ||
|
||||||
|
line.Contains("Physical Address") ||
|
||||||
|
line.Contains("Type"))
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Windows arp -a 输出格式: IP地址 物理地址 类型
|
||||||
|
// 示例: 172.6.0.1 e4-3a-6e-29-c3-5b dynamic
|
||||||
|
var pattern = @"^\s*(\d+\.\d+\.\d+\.\d+)\s+([a-fA-F0-9-]{17})\s+(\w+)\s*$";
|
||||||
|
var match = Regex.Match(line, pattern);
|
||||||
|
|
||||||
|
if (match.Success)
|
||||||
|
{
|
||||||
|
return new ArpEntry
|
||||||
|
{
|
||||||
|
IpAddress = match.Groups[1].Value,
|
||||||
|
MacAddress = FormatMacAddress(match.Groups[2].Value), // 格式化 MAC 地址
|
||||||
|
Type = match.Groups[3].Value
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 解析 Unix/Linux ARP 记录
|
||||||
|
/// </summary>
|
||||||
|
private static ArpEntry? ParseUnixArpEntry(string line)
|
||||||
|
{
|
||||||
|
// Unix/Linux arp -a 输出格式: hostname (ip) at mac [ether] PERM on interface
|
||||||
|
var pattern = @"(\S+)\s+\((\d+\.\d+\.\d+\.\d+)\)\s+at\s+([a-fA-F0-9:]{17})\s+\[(\w+)\]\s+(\w+)\s+on\s+(\S+)";
|
||||||
|
var match = Regex.Match(line, pattern);
|
||||||
|
|
||||||
|
if (match.Success)
|
||||||
|
{
|
||||||
|
return new ArpEntry
|
||||||
|
{
|
||||||
|
Hostname = match.Groups[1].Value,
|
||||||
|
IpAddress = match.Groups[2].Value,
|
||||||
|
MacAddress = FormatMacAddress(match.Groups[3].Value), // 格式化 MAC 地址
|
||||||
|
Type = match.Groups[5].Value,
|
||||||
|
Interface = match.Groups[6].Value
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// 匹配简单格式: ip mac interface
|
||||||
|
var simplePattern = @"(\d+\.\d+\.\d+\.\d+)\s+([a-fA-F0-9:]{17})\s+(\S+)";
|
||||||
|
var simpleMatch = Regex.Match(line, simplePattern);
|
||||||
|
|
||||||
|
if (simpleMatch.Success)
|
||||||
|
{
|
||||||
|
return new ArpEntry
|
||||||
|
{
|
||||||
|
IpAddress = simpleMatch.Groups[1].Value,
|
||||||
|
MacAddress = FormatMacAddress(simpleMatch.Groups[2].Value), // 格式化 MAC 地址
|
||||||
|
Interface = simpleMatch.Groups[3].Value
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 判断当前进程是否具有管理员(或 root)权限
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>如果有管理员权限返回 true,否则返回 false</returns>
|
||||||
|
public static bool IsAdministrator()
|
||||||
|
{
|
||||||
|
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
|
||||||
|
{
|
||||||
|
// Windows: 检查当前用户是否为管理员
|
||||||
|
using var identity = System.Security.Principal.WindowsIdentity.GetCurrent();
|
||||||
|
var principal = new System.Security.Principal.WindowsPrincipal(identity);
|
||||||
|
return principal.IsInRole(System.Security.Principal.WindowsBuiltInRole.Administrator);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Unix/Linux/macOS: 检查是否为 root 用户
|
||||||
|
return Environment.UserName == "root" || (Environment.GetEnvironmentVariable("USER") == "root");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 检查指定 IP 是否存在对应的 MAC,如果不存在则删除原有 ARP 记录并新增
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="ipAddress">IP 地址</param>
|
||||||
|
/// <param name="macAddress">MAC 地址</param>
|
||||||
|
/// <param name="interfaceName">网络接口名称(可选)</param>
|
||||||
|
/// <returns>是否成功</returns>
|
||||||
|
public static async Task<bool> CheckOrAddAsync(string ipAddress, string macAddress, string? interfaceName = null)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(ipAddress))
|
||||||
|
throw new ArgumentException("IP 地址不能为空", nameof(ipAddress));
|
||||||
|
if (string.IsNullOrWhiteSpace(macAddress))
|
||||||
|
throw new ArgumentException("MAC 地址不能为空", nameof(macAddress));
|
||||||
|
|
||||||
|
// 格式化 MAC 地址以适配不同操作系统
|
||||||
|
string formattedMac = FormatMacAddress(macAddress);
|
||||||
|
|
||||||
|
var entry = await GetArpEntryAsync(ipAddress);
|
||||||
|
if (entry != null && string.Equals(FormatMacAddress(entry.MacAddress), formattedMac, StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
// 已存在且 MAC 匹配,无需操作
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 若存在但 MAC 不匹配,先删除
|
||||||
|
if (entry != null)
|
||||||
|
{
|
||||||
|
await DeleteArpEntryAsync(ipAddress, interfaceName);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 新增 ARP 记录
|
||||||
|
var ret = await AddArpEntryAsync(ipAddress, formattedMac, interfaceName);
|
||||||
|
if (!ret) logger.Error($"添加 ARP 记录失败: {ipAddress} -> {formattedMac} on {interfaceName}");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 格式化 MAC 地址为指定平台格式
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="macAddress">原始 MAC 地址</param>
|
||||||
|
/// <returns>格式化后的 MAC 地址</returns>
|
||||||
|
public static string FormatMacAddress(string macAddress)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(macAddress))
|
||||||
|
return string.Empty;
|
||||||
|
|
||||||
|
var cleaned = macAddress.Replace("-", "").Replace(":", "").ToLowerInvariant();
|
||||||
|
if (cleaned.Length != 12)
|
||||||
|
return macAddress;
|
||||||
|
|
||||||
|
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
|
||||||
|
{
|
||||||
|
// Windows: XX-XX-XX-XX-XX-XX
|
||||||
|
return string.Join("-", Enumerable.Range(0, 6).Select(i => cleaned.Substring(i * 2, 2)));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Unix/Linux/macOS: xx:xx:xx:xx:xx:xx
|
||||||
|
return string.Join(":", Enumerable.Range(0, 6).Select(i => cleaned.Substring(i * 2, 2)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// ARP 记录条目
|
||||||
|
/// </summary>
|
||||||
|
public class ArpEntry
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// [TODO:description]
|
||||||
|
/// </summary>
|
||||||
|
public string Hostname { get; set; } = string.Empty;
|
||||||
|
/// <summary>
|
||||||
|
/// [TODO:description]
|
||||||
|
/// </summary>
|
||||||
|
public string IpAddress { get; set; } = string.Empty;
|
||||||
|
/// <summary>
|
||||||
|
/// [TODO:description]
|
||||||
|
/// </summary>
|
||||||
|
public string MacAddress { get; set; } = string.Empty;
|
||||||
|
/// <summary>
|
||||||
|
/// [TODO:description]
|
||||||
|
/// </summary>
|
||||||
|
public string Type { get; set; } = string.Empty;
|
||||||
|
/// <summary>
|
||||||
|
/// [TODO:description]
|
||||||
|
/// </summary>
|
||||||
|
public string Interface { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// [TODO:description]
|
||||||
|
/// </summary>
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return $"{IpAddress} -> {MacAddress} ({Interface})";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 命令执行结果
|
||||||
|
/// </summary>
|
||||||
|
public class CommandResult
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// [TODO:description]
|
||||||
|
/// </summary>
|
||||||
|
public bool IsSuccess { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// [TODO:description]
|
||||||
|
/// </summary>
|
||||||
|
public string Output { get; set; } = string.Empty;
|
||||||
|
/// <summary>
|
||||||
|
/// [TODO:description]
|
||||||
|
/// </summary>
|
||||||
|
public string Error { get; set; } = string.Empty;
|
||||||
|
/// <summary>
|
||||||
|
/// [TODO:description]
|
||||||
|
/// </summary>
|
||||||
|
public int ExitCode { get; set; }
|
||||||
|
}
|
||||||
22
server/src/Common/Global.cs
Normal file
22
server/src/Common/Global.cs
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
using System.Net;
|
||||||
|
using System.Net.Sockets;
|
||||||
|
|
||||||
|
public static class Global
|
||||||
|
{
|
||||||
|
|
||||||
|
public static readonly string LocalHost = "127.0.0.1";
|
||||||
|
public static readonly string DataPath = Path.Combine(Environment.CurrentDirectory, "data");
|
||||||
|
|
||||||
|
public static string GetLocalIPAddress()
|
||||||
|
{
|
||||||
|
var host = Dns.GetHostEntry(Dns.GetHostName());
|
||||||
|
foreach (var ip in host.AddressList)
|
||||||
|
{
|
||||||
|
if (ip.AddressFamily == AddressFamily.InterNetwork)
|
||||||
|
{
|
||||||
|
return ip.ToString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
throw new Exception("No network adapters with an IPv4 address in the system!");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -255,13 +255,222 @@ public class Image
|
|||||||
return Encoding.ASCII.GetBytes("\r\n");
|
return Encoding.ASCII.GetBytes("\r\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 将原始 JPEG 数据补全 JPEG 头部,生成完整的 JPEG 图片
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="jpegData">原始 JPEG 扫描数据(不含头尾)</param>
|
||||||
|
/// <param name="width">图像宽度</param>
|
||||||
|
/// <param name="height">图像高度</param>
|
||||||
|
/// <param name="quantizationTable">量化表数组(Y0-Y63, Cb0-Cb63, Cr0-Cr63,共192个值)</param>
|
||||||
|
/// <returns>完整的 JPEG 图片数据</returns>
|
||||||
|
public static Result<byte[]> CompleteJpegData(byte[] jpegData, int width, int height, uint[] quantizationTable)
|
||||||
|
{
|
||||||
|
if (jpegData == null)
|
||||||
|
return new(new ArgumentNullException(nameof(jpegData)));
|
||||||
|
|
||||||
|
if (width <= 0 || height <= 0)
|
||||||
|
return new(new ArgumentException("Width and height must be positive"));
|
||||||
|
|
||||||
|
if (quantizationTable == null || quantizationTable.Length != 192)
|
||||||
|
return new(new ArgumentException("Quantization table must contain exactly 192 values (64 Y + 64 Cb + 64 Cr)"));
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var jpegBytes = new List<byte>();
|
||||||
|
|
||||||
|
// SOI (Start of Image)
|
||||||
|
jpegBytes.AddRange(new byte[] { 0xFF, 0xD8 });
|
||||||
|
|
||||||
|
// APP0 段
|
||||||
|
jpegBytes.AddRange(new byte[] {
|
||||||
|
0xFF, 0xE0, // APP0 marker
|
||||||
|
0x00, 0x10, // Length (16 bytes)
|
||||||
|
0x4A, 0x46, 0x49, 0x46, 0x00, // "JFIF\0"
|
||||||
|
0x01, 0x01, // Version 1.1
|
||||||
|
0x00, // Units: 0 = no units
|
||||||
|
0x00, 0x01, // X density (1)
|
||||||
|
0x00, 0x01, // Y density (1)
|
||||||
|
0x00, // Thumbnail width
|
||||||
|
0x00 // Thumbnail height
|
||||||
|
});
|
||||||
|
|
||||||
|
// DQT (Define Quantization Table) - Y table
|
||||||
|
jpegBytes.AddRange(new byte[] { 0xFF, 0xDB }); // DQT marker
|
||||||
|
jpegBytes.AddRange(new byte[] { 0x00, 0x43 }); // Length (67 bytes)
|
||||||
|
jpegBytes.Add(0x00); // Table ID (0 = Y table)
|
||||||
|
|
||||||
|
// 添加Y量化表 (quantizationTable[0-63])
|
||||||
|
for (int i = 0; i < 64; i++)
|
||||||
|
{
|
||||||
|
jpegBytes.Add((byte)Math.Min(255, quantizationTable[i]));
|
||||||
|
}
|
||||||
|
|
||||||
|
// DQT (Define Quantization Table) - CbCr table
|
||||||
|
jpegBytes.AddRange(new byte[] { 0xFF, 0xDB }); // DQT marker
|
||||||
|
jpegBytes.AddRange(new byte[] { 0x00, 0x43 }); // Length (67 bytes)
|
||||||
|
jpegBytes.Add(0x01); // Table ID (1 = CbCr table)
|
||||||
|
|
||||||
|
// 添加Cb量化表 (quantizationTable[64-127]),但这里使用Cr表的数据作为CbCr共用
|
||||||
|
for (int i = 128; i < 192; i++) // 使用Cr量化表 (quantizationTable[128-191])
|
||||||
|
{
|
||||||
|
jpegBytes.Add((byte)Math.Min(255, quantizationTable[i]));
|
||||||
|
}
|
||||||
|
|
||||||
|
// SOF0 (Start of Frame)
|
||||||
|
jpegBytes.AddRange(new byte[] {
|
||||||
|
0xFF, 0xC0, // SOF0 marker
|
||||||
|
0x00, 0x11, // Length (17 bytes)
|
||||||
|
0x08, // Precision (8 bits)
|
||||||
|
(byte)((height >> 8) & 0xFF), (byte)(height & 0xFF), // Height
|
||||||
|
(byte)((width >> 8) & 0xFF), (byte)(width & 0xFF), // Width
|
||||||
|
0x03, // Number of components
|
||||||
|
0x01, 0x11, 0x00, // Y component
|
||||||
|
0x02, 0x11, 0x01, // Cb component
|
||||||
|
0x03, 0x11, 0x01 // Cr component
|
||||||
|
});
|
||||||
|
|
||||||
|
// DHT (Define Huffman Table) - DC Y table
|
||||||
|
jpegBytes.AddRange(new byte[] {
|
||||||
|
0xFF, 0xC4, // DHT marker
|
||||||
|
0x00, 0x1F, // Length
|
||||||
|
0x00, // Table class and ID (DC table 0)
|
||||||
|
// DC Y Huffman table
|
||||||
|
0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B
|
||||||
|
});
|
||||||
|
|
||||||
|
// DHT (Define Huffman Table) - AC Y table (简化版)
|
||||||
|
jpegBytes.AddRange(new byte[] {
|
||||||
|
0xFF, 0xC4, // DHT marker
|
||||||
|
0x00, 0xB5, // Length
|
||||||
|
0x10 // Table class and ID (AC table 0)
|
||||||
|
});
|
||||||
|
|
||||||
|
// AC Y Huffman table数据
|
||||||
|
jpegBytes.AddRange(new byte[] {
|
||||||
|
0x00, 0x02, 0x01, 0x03, 0x03, 0x02, 0x04, 0x03, 0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x01, 0x7D,
|
||||||
|
0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
|
||||||
|
0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xA1, 0x08, 0x23, 0x42, 0xB1, 0xC1, 0x15, 0x52, 0xD1, 0xF0,
|
||||||
|
0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0A, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x25, 0x26, 0x27, 0x28,
|
||||||
|
0x29, 0x2A, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
|
||||||
|
0x4A, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
|
||||||
|
0x6A, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
|
||||||
|
0x8A, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7,
|
||||||
|
0xA8, 0xA9, 0xAA, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xC2, 0xC3, 0xC4, 0xC5,
|
||||||
|
0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xE1, 0xE2,
|
||||||
|
0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8,
|
||||||
|
0xF9, 0xFA
|
||||||
|
});
|
||||||
|
|
||||||
|
// DHT (Define Huffman Table) - DC CbCr table
|
||||||
|
jpegBytes.AddRange(new byte[] {
|
||||||
|
0xFF, 0xC4, // DHT marker
|
||||||
|
0x00, 0x1F, // Length
|
||||||
|
0x01, // Table class and ID (DC table 1)
|
||||||
|
// DC CbCr Huffman table
|
||||||
|
0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B
|
||||||
|
});
|
||||||
|
|
||||||
|
// DHT (Define Huffman Table) - AC CbCr table
|
||||||
|
jpegBytes.AddRange(new byte[] {
|
||||||
|
0xFF, 0xC4, // DHT marker
|
||||||
|
0x00, 0xB5, // Length
|
||||||
|
0x11 // Table class and ID (AC table 1)
|
||||||
|
});
|
||||||
|
|
||||||
|
// AC CbCr Huffman table数据(与AC Y table相同)
|
||||||
|
jpegBytes.AddRange(new byte[] {
|
||||||
|
0x00, 0x02, 0x01, 0x03, 0x03, 0x02, 0x04, 0x03, 0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x01, 0x7D,
|
||||||
|
0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
|
||||||
|
0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xA1, 0x08, 0x23, 0x42, 0xB1, 0xC1, 0x15, 0x52, 0xD1, 0xF0,
|
||||||
|
0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0A, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x25, 0x26, 0x27, 0x28,
|
||||||
|
0x29, 0x2A, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
|
||||||
|
0x4A, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
|
||||||
|
0x6A, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
|
||||||
|
0x8A, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7,
|
||||||
|
0xA8, 0xA9, 0xAA, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xC2, 0xC3, 0xC4, 0xC5,
|
||||||
|
0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xE1, 0xE2,
|
||||||
|
0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8,
|
||||||
|
0xF9, 0xFA
|
||||||
|
});
|
||||||
|
|
||||||
|
// SOS (Start of Scan)
|
||||||
|
jpegBytes.AddRange(new byte[] {
|
||||||
|
0xFF, 0xDA, // SOS marker
|
||||||
|
0x00, 0x0C, // Length (12 bytes)
|
||||||
|
0x03, // Number of components
|
||||||
|
0x01, 0x00, // Y component, DC/AC table
|
||||||
|
0x02, 0x11, // Cb component, DC/AC table
|
||||||
|
0x03, 0x11, // Cr component, DC/AC table
|
||||||
|
0x00, 0x3F, 0x00 // Start of spectral, End of spectral, Ah/Al
|
||||||
|
});
|
||||||
|
|
||||||
|
// 添加原始 JPEG 扫描数据
|
||||||
|
jpegBytes.AddRange(jpegData);
|
||||||
|
|
||||||
|
// EOI (End of Image)
|
||||||
|
jpegBytes.AddRange(new byte[] { 0xFF, 0xD9 });
|
||||||
|
|
||||||
|
return jpegBytes.ToArray();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return new(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 从 JPEG 数据生成 MJPEG 帧数据
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="jpegData">完整的 JPEG 数据</param>
|
||||||
|
/// <param name="boundary">边界字符串(默认为"--boundary")</param>
|
||||||
|
/// <returns>MJPEG 帧数据</returns>
|
||||||
|
public static Result<(byte[] header, byte[] footer, byte[] data)> CreateMjpegFrameFromJpeg(
|
||||||
|
byte[] jpegData, string boundary = "--boundary")
|
||||||
|
{
|
||||||
|
if (jpegData == null)
|
||||||
|
return new(new ArgumentNullException(nameof(jpegData)));
|
||||||
|
|
||||||
|
// 验证是否为有效的 JPEG 数据
|
||||||
|
if (jpegData.Length < 4 || jpegData[0] != 0xFF || jpegData[1] != 0xD8)
|
||||||
|
{
|
||||||
|
return new(new ArgumentException("Invalid JPEG data: missing JPEG header"));
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var header = CreateMjpegFrameHeader(jpegData.Length, boundary);
|
||||||
|
var footer = CreateMjpegFrameFooter();
|
||||||
|
|
||||||
|
var totalLength = header.Length + jpegData.Length + footer.Length;
|
||||||
|
var frameData = new byte[totalLength];
|
||||||
|
|
||||||
|
var offset = 0;
|
||||||
|
Array.Copy(header, 0, frameData, offset, header.Length);
|
||||||
|
offset += header.Length;
|
||||||
|
|
||||||
|
Array.Copy(jpegData, 0, frameData, offset, jpegData.Length);
|
||||||
|
offset += jpegData.Length;
|
||||||
|
|
||||||
|
Array.Copy(footer, 0, frameData, offset, footer.Length);
|
||||||
|
|
||||||
|
return (header, footer, frameData);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
return new(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 创建完整的 MJPEG 帧数据
|
/// 创建完整的 MJPEG 帧数据
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="jpegData">JPEG数据</param>
|
/// <param name="jpegData">JPEG数据</param>
|
||||||
/// <param name="boundary">边界字符串(默认为"--boundary")</param>
|
/// <param name="boundary">边界字符串(默认为"--boundary")</param>
|
||||||
/// <returns>完整的MJPEG帧数据</returns>
|
/// <returns>完整的MJPEG帧数据</returns>
|
||||||
public static Result<byte[]> CreateMjpegFrame(byte[] jpegData, string boundary = "--boundary")
|
public static Result<(byte[] header, byte[] footer, byte[] data)> CreateMjpegFrame(
|
||||||
|
byte[] jpegData, string boundary = "--boundary")
|
||||||
{
|
{
|
||||||
if (jpegData == null)
|
if (jpegData == null)
|
||||||
return new(new ArgumentNullException(nameof(jpegData)));
|
return new(new ArgumentNullException(nameof(jpegData)));
|
||||||
@@ -283,7 +492,7 @@ public class Image
|
|||||||
|
|
||||||
Array.Copy(footer, 0, frameData, offset, footer.Length);
|
Array.Copy(footer, 0, frameData, offset, footer.Length);
|
||||||
|
|
||||||
return frameData;
|
return (header, footer, frameData);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ public class Number
|
|||||||
{
|
{
|
||||||
for (var i = 0; i < length; i++)
|
for (var i = 0; i < length; i++)
|
||||||
{
|
{
|
||||||
arr[length - 1 - i] = Convert.ToByte((num >> (i << 3)) & (0xFF));
|
arr[i] = Convert.ToByte((num >> (i << 3)) & (0xFF));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -78,6 +78,56 @@ public class Number
|
|||||||
return arr;
|
return arr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 二进制字节数组转成64bits整数
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="bytes">二进制字节数组</param>
|
||||||
|
/// <param name="offset">字节数组偏移量</param>
|
||||||
|
/// <param name="numLength">字节数组长度</param>
|
||||||
|
/// <param name="isLowNumHigh">是否高位在数组索引低</param>
|
||||||
|
/// <returns>整数</returns>
|
||||||
|
public static Result<UInt64> BytesToUInt64(byte[] bytes, int offset = 0, int numLength = 8, bool isLowNumHigh = false)
|
||||||
|
{
|
||||||
|
if (bytes.Length < offset)
|
||||||
|
{
|
||||||
|
return new(new ArgumentException($"The Length of bytes is less than offset"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (numLength > 8)
|
||||||
|
{
|
||||||
|
return new(new ArgumentException($"The Length of bytes is greater than 8"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (numLength <= 0) return 0;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
byte[] numBytes = new byte[8]; // 8字节
|
||||||
|
int copyLen = Math.Min(numLength, bytes.Length - offset);
|
||||||
|
|
||||||
|
if (isLowNumHigh)
|
||||||
|
{
|
||||||
|
// 小端:拷贝到低位
|
||||||
|
Buffer.BlockCopy(bytes, offset, numBytes, 0, copyLen);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// 大端:拷贝到高位
|
||||||
|
byte[] temp = new byte[copyLen];
|
||||||
|
Buffer.BlockCopy(bytes, offset, temp, 0, copyLen);
|
||||||
|
Array.Reverse(temp);
|
||||||
|
Buffer.BlockCopy(temp, 0, numBytes, 8 - copyLen, copyLen);
|
||||||
|
}
|
||||||
|
|
||||||
|
UInt64 num = BitConverter.ToUInt64(numBytes, 0);
|
||||||
|
return num;
|
||||||
|
}
|
||||||
|
catch (Exception error)
|
||||||
|
{
|
||||||
|
return new(error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 二进制字节数组转成64bits整数
|
/// 二进制字节数组转成64bits整数
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -86,34 +136,78 @@ public class Number
|
|||||||
/// <returns>整数</returns>
|
/// <returns>整数</returns>
|
||||||
public static Result<UInt64> BytesToUInt64(byte[] bytes, bool isLowNumHigh = false)
|
public static Result<UInt64> BytesToUInt64(byte[] bytes, bool isLowNumHigh = false)
|
||||||
{
|
{
|
||||||
if (bytes.Length > 8)
|
return BytesToUInt64(bytes, 0, 8, isLowNumHigh);
|
||||||
{
|
|
||||||
return new(new ArgumentException(
|
|
||||||
"Unsigned long number can't over 8 bytes(64 bits).",
|
|
||||||
nameof(bytes)
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
UInt64 num = 0;
|
/// <summary>
|
||||||
int len = bytes.Length;
|
/// 二进制字节数组转成64bits整数
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="bytes">二进制字节数组</param>
|
||||||
|
/// <returns>整数</returns>
|
||||||
|
public static Result<UInt64> BytesToUInt64(byte[] bytes)
|
||||||
|
{
|
||||||
|
return BytesToUInt64(bytes, 0, 8, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 二进制字节数组转成32bits整数
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="bytes">二进制字节数组</param>
|
||||||
|
/// <param name="offset">字节数组偏移量</param>
|
||||||
|
/// <param name="numLength">整形所占字节数组长度</param>
|
||||||
|
/// <param name="isLowNumHigh">是否高位在数组索引低</param>
|
||||||
|
/// <returns>整数</returns>
|
||||||
|
public static Result<UInt32> BytesToUInt32(byte[] bytes, int offset = 0, int numLength = 4, bool isLowNumHigh = false)
|
||||||
|
{
|
||||||
|
if (bytes.Length < offset)
|
||||||
|
{
|
||||||
|
return new(new ArgumentException($"The Length of bytes is less than offset"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (numLength > 4)
|
||||||
|
{
|
||||||
|
return new(new ArgumentException($"The Length of bytes is greater than 4"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (bytes.Length < offset)
|
||||||
|
{
|
||||||
|
return new(new ArgumentException($"The Length of bytes is less than offset"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (numLength > 4)
|
||||||
|
{
|
||||||
|
return new(new ArgumentException($"The Length of bytes is greater than 4"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (numLength <= 0) return 0;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
byte[] numBytes = new byte[4]; // 4字节
|
||||||
|
int copyLen = Math.Min(numLength, bytes.Length - offset);
|
||||||
|
if (copyLen < 0) copyLen = 0;
|
||||||
|
|
||||||
if (isLowNumHigh)
|
if (isLowNumHigh)
|
||||||
{
|
{
|
||||||
for (var i = 0; i < len; i++)
|
// 小端:拷贝到低位
|
||||||
|
if (copyLen > 0)
|
||||||
{
|
{
|
||||||
num += Convert.ToUInt64((UInt64)bytes[len - 1 - i] << (i << 3));
|
Buffer.BlockCopy(bytes, offset, numBytes, 0, copyLen);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
for (var i = 0; i < len; i++)
|
// 大端:拷贝到高位
|
||||||
|
if (copyLen > 0)
|
||||||
{
|
{
|
||||||
num += Convert.ToUInt64((UInt64)bytes[i] << ((int)(len - 1 - i) << 3));
|
byte[] temp = new byte[copyLen];
|
||||||
|
Buffer.BlockCopy(bytes, offset, temp, 0, copyLen);
|
||||||
|
Array.Reverse(temp);
|
||||||
|
Buffer.BlockCopy(temp, 0, numBytes, 4 - copyLen, copyLen);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
UInt32 num = BitConverter.ToUInt32(numBytes, 0);
|
||||||
return num;
|
return num;
|
||||||
}
|
}
|
||||||
catch (Exception error)
|
catch (Exception error)
|
||||||
@@ -130,41 +224,17 @@ public class Number
|
|||||||
/// <returns>整数</returns>
|
/// <returns>整数</returns>
|
||||||
public static Result<UInt32> BytesToUInt32(byte[] bytes, bool isLowNumHigh = false)
|
public static Result<UInt32> BytesToUInt32(byte[] bytes, bool isLowNumHigh = false)
|
||||||
{
|
{
|
||||||
if (bytes.Length > 4)
|
return BytesToUInt32(bytes, 0, 4, isLowNumHigh);
|
||||||
{
|
|
||||||
return new(new ArgumentException(
|
|
||||||
"Unsigned long number can't over 4 bytes(32 bits).",
|
|
||||||
nameof(bytes)
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
UInt32 num = 0;
|
/// <summary>
|
||||||
int len = bytes.Length;
|
/// 二进制字节数组转成32bits整数
|
||||||
|
/// </summary>
|
||||||
try
|
/// <param name="bytes">二进制字节数组</param>
|
||||||
|
/// <returns>整数</returns>
|
||||||
|
public static Result<UInt32> BytesToUInt32(byte[] bytes)
|
||||||
{
|
{
|
||||||
if (isLowNumHigh)
|
return BytesToUInt32(bytes, 0, 4, false);
|
||||||
{
|
|
||||||
for (var i = 0; i < len; i++)
|
|
||||||
{
|
|
||||||
num += Convert.ToUInt32((UInt32)bytes[len - 1 - i] << (i << 3));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
for (var i = 0; i < len; i++)
|
|
||||||
{
|
|
||||||
num += Convert.ToUInt32((UInt32)bytes[i] << ((int)(len - 1 - i) << 3));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return num;
|
|
||||||
}
|
|
||||||
catch (Exception error)
|
|
||||||
{
|
|
||||||
return new(error);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -333,10 +403,9 @@ public class Number
|
|||||||
|
|
||||||
for (int i = 0; i < srcBytesLen; i += distance)
|
for (int i = 0; i < srcBytesLen; i += distance)
|
||||||
{
|
{
|
||||||
var end = i + distance;
|
Buffer.BlockCopy(srcBytes, i, buffer, 0, distance);
|
||||||
buffer = srcBytes[i..end];
|
|
||||||
Array.Reverse(buffer);
|
Array.Reverse(buffer);
|
||||||
Array.Copy(buffer, 0, dstBytes, i, distance);
|
Buffer.BlockCopy(buffer, 0, dstBytes, i, distance);
|
||||||
}
|
}
|
||||||
|
|
||||||
return dstBytes;
|
return dstBytes;
|
||||||
@@ -367,4 +436,37 @@ public class Number
|
|||||||
}
|
}
|
||||||
return dstBytes;
|
return dstBytes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取数字的长度
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="number">数字</param>
|
||||||
|
/// <returns>数字的长度</returns>
|
||||||
|
public static int GetLength(int number)
|
||||||
|
{
|
||||||
|
// 将整数转换为字符串
|
||||||
|
string numberString = number.ToString();
|
||||||
|
|
||||||
|
// 返回字符串的长度
|
||||||
|
return numberString.Length;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 计算整形的幂
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="x">底数</param>
|
||||||
|
/// <param name="pow">幂</param>
|
||||||
|
/// <returns>计算结果</returns>
|
||||||
|
public static int IntPow(int x, int pow)
|
||||||
|
{
|
||||||
|
int ret = 1;
|
||||||
|
while (pow != 0)
|
||||||
|
{
|
||||||
|
if ((pow & 1) == 1)
|
||||||
|
ret *= x;
|
||||||
|
x *= x;
|
||||||
|
pow >>= 1;
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,4 +17,13 @@ public class String
|
|||||||
return new string(charArray);
|
return new string(charArray);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static string BytesToString(byte[] bytes, string separator = "")
|
||||||
|
{
|
||||||
|
return BitConverter.ToString(bytes).Replace("-", separator.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string BytesToBase64(byte[] bytes)
|
||||||
|
{
|
||||||
|
return Convert.ToBase64String(bytes);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using System.IdentityModel.Tokens.Jwt;
|
using System.IdentityModel.Tokens.Jwt;
|
||||||
|
using System.Net;
|
||||||
using System.Security.Claims;
|
using System.Security.Claims;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using Microsoft.AspNetCore.Authorization;
|
using Microsoft.AspNetCore.Authorization;
|
||||||
@@ -17,35 +18,56 @@ public class DataController : ControllerBase
|
|||||||
{
|
{
|
||||||
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
private readonly Database.UserManager _userManager = new();
|
||||||
|
|
||||||
|
// 固定的实验板IP,端口,MAC地址
|
||||||
|
private const string BOARD_IP = "169.254.109.0";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// [TODO:description]
|
/// 获取本机IP地址(优先选择与实验板同网段的IP)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class UserInfo
|
/// <returns>本机IP地址</returns>
|
||||||
|
private IPAddress GetLocalIPAddress()
|
||||||
{
|
{
|
||||||
/// <summary>
|
try
|
||||||
/// 用户的唯一标识符
|
{
|
||||||
/// </summary>
|
var boardIpSegments = BOARD_IP.Split('.').Take(3).ToArray();
|
||||||
public Guid ID { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
// 优先选择与实验板IP前三段相同的IP
|
||||||
/// 用户的名称
|
var sameSegmentIP = System.Net.NetworkInformation.NetworkInterface
|
||||||
/// </summary>
|
.GetAllNetworkInterfaces()
|
||||||
public required string Name { get; set; }
|
.Where(nic => nic.OperationalStatus == System.Net.NetworkInformation.OperationalStatus.Up
|
||||||
|
&& nic.NetworkInterfaceType != System.Net.NetworkInformation.NetworkInterfaceType.Loopback)
|
||||||
|
.SelectMany(nic => nic.GetIPProperties().UnicastAddresses)
|
||||||
|
.Where(addr => addr.Address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
|
||||||
|
.Select(addr => addr.Address)
|
||||||
|
.FirstOrDefault(addr =>
|
||||||
|
{
|
||||||
|
var segments = addr.ToString().Split('.');
|
||||||
|
return segments.Length == 4 &&
|
||||||
|
segments[0] == boardIpSegments[0] &&
|
||||||
|
segments[1] == boardIpSegments[1] &&
|
||||||
|
segments[2] == boardIpSegments[2];
|
||||||
|
});
|
||||||
|
|
||||||
/// <summary>
|
if (sameSegmentIP != null)
|
||||||
/// 用户的电子邮箱
|
return sameSegmentIP;
|
||||||
/// </summary>
|
|
||||||
public required string EMail { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
// 如果没有找到同网段的IP,返回第一个可用的IP
|
||||||
/// 用户关联的板卡ID
|
return System.Net.NetworkInformation.NetworkInterface
|
||||||
/// </summary>
|
.GetAllNetworkInterfaces()
|
||||||
public Guid BoardID { get; set; }
|
.Where(nic => nic.OperationalStatus == System.Net.NetworkInformation.OperationalStatus.Up
|
||||||
|
&& nic.NetworkInterfaceType != System.Net.NetworkInformation.NetworkInterfaceType.Loopback)
|
||||||
/// <summary>
|
.SelectMany(nic => nic.GetIPProperties().UnicastAddresses)
|
||||||
/// 用户绑定板子的过期时间
|
.Where(addr => addr.Address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
|
||||||
/// </summary>
|
.Select(addr => addr.Address)
|
||||||
public DateTime? BoardExpireTime { get; set; }
|
.FirstOrDefault() ?? IPAddress.Loopback;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "获取本机IP地址失败");
|
||||||
|
return IPAddress.Loopback;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -62,8 +84,7 @@ public class DataController : ControllerBase
|
|||||||
public IActionResult Login(string name, string password)
|
public IActionResult Login(string name, string password)
|
||||||
{
|
{
|
||||||
// 验证用户密码
|
// 验证用户密码
|
||||||
using var db = new Database.AppDataConnection();
|
var ret = _userManager.CheckUserPassword(name, password);
|
||||||
var ret = db.CheckUserPassword(name, password);
|
|
||||||
if (!ret.IsSuccessful) return StatusCode(StatusCodes.Status500InternalServerError, "数据库操作失败");
|
if (!ret.IsSuccessful) return StatusCode(StatusCodes.Status500InternalServerError, "数据库操作失败");
|
||||||
if (!ret.Value.HasValue) return BadRequest("用户名或密码错误");
|
if (!ret.Value.HasValue) return BadRequest("用户名或密码错误");
|
||||||
var user = ret.Value.Value;
|
var user = ret.Value.Value;
|
||||||
@@ -138,8 +159,7 @@ public class DataController : ControllerBase
|
|||||||
return Unauthorized("未找到用户名信息");
|
return Unauthorized("未找到用户名信息");
|
||||||
|
|
||||||
// Get User Info
|
// Get User Info
|
||||||
using var db = new Database.AppDataConnection();
|
var ret = _userManager.GetUserByName(userName);
|
||||||
var ret = db.GetUserByName(userName);
|
|
||||||
if (!ret.IsSuccessful)
|
if (!ret.IsSuccessful)
|
||||||
return StatusCode(StatusCodes.Status500InternalServerError, "数据库操作失败");
|
return StatusCode(StatusCodes.Status500InternalServerError, "数据库操作失败");
|
||||||
|
|
||||||
@@ -186,8 +206,7 @@ public class DataController : ControllerBase
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using var db = new Database.AppDataConnection();
|
var ret = _userManager.AddUser(name, email, password);
|
||||||
var ret = db.AddUser(name, email, password);
|
|
||||||
return Ok(ret);
|
return Ok(ret);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
@@ -207,7 +226,7 @@ public class DataController : ControllerBase
|
|||||||
[ProducesResponseType(typeof(Database.Board), StatusCodes.Status200OK)]
|
[ProducesResponseType(typeof(Database.Board), StatusCodes.Status200OK)]
|
||||||
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||||
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
public IActionResult GetAvailableBoard(int durationHours = 1)
|
public async ValueTask<IActionResult> GetAvailableBoard(int durationHours = 1)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -215,19 +234,24 @@ public class DataController : ControllerBase
|
|||||||
if (string.IsNullOrEmpty(userName))
|
if (string.IsNullOrEmpty(userName))
|
||||||
return Unauthorized("未找到用户名信息");
|
return Unauthorized("未找到用户名信息");
|
||||||
|
|
||||||
using var db = new Database.AppDataConnection();
|
var userRet = _userManager.GetUserByName(userName);
|
||||||
var userRet = db.GetUserByName(userName);
|
|
||||||
if (!userRet.IsSuccessful || !userRet.Value.HasValue)
|
if (!userRet.IsSuccessful || !userRet.Value.HasValue)
|
||||||
return BadRequest("用户不存在");
|
return BadRequest("用户不存在");
|
||||||
|
|
||||||
var user = userRet.Value.Value;
|
var user = userRet.Value.Value;
|
||||||
var expireTime = DateTime.UtcNow.AddHours(durationHours);
|
var expireTime = DateTime.UtcNow.AddHours(durationHours);
|
||||||
|
|
||||||
var boardOpt = db.GetAvailableBoard(user.ID, expireTime);
|
var boardOpt = _userManager.GetAvailableBoard(user.ID, expireTime);
|
||||||
if (!boardOpt.HasValue)
|
if (!boardOpt.HasValue)
|
||||||
return NotFound("没有可用的实验板");
|
return NotFound("没有可用的实验板");
|
||||||
|
|
||||||
return Ok(boardOpt.Value);
|
var boardInfo = boardOpt.Value;
|
||||||
|
if (!(await ArpClient.CheckOrAddAsync(boardInfo.IpAddr, boardInfo.MacAddr, GetLocalIPAddress().ToString())))
|
||||||
|
{
|
||||||
|
logger.Error($"无法配置ARP,实验板可能会无法连接");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(boardInfo);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -253,13 +277,12 @@ public class DataController : ControllerBase
|
|||||||
if (string.IsNullOrEmpty(userName))
|
if (string.IsNullOrEmpty(userName))
|
||||||
return Unauthorized("未找到用户名信息");
|
return Unauthorized("未找到用户名信息");
|
||||||
|
|
||||||
using var db = new Database.AppDataConnection();
|
var userRet = _userManager.GetUserByName(userName);
|
||||||
var userRet = db.GetUserByName(userName);
|
|
||||||
if (!userRet.IsSuccessful || !userRet.Value.HasValue)
|
if (!userRet.IsSuccessful || !userRet.Value.HasValue)
|
||||||
return BadRequest("用户不存在");
|
return BadRequest("用户不存在");
|
||||||
|
|
||||||
var user = userRet.Value.Value;
|
var user = userRet.Value.Value;
|
||||||
var result = db.UnbindUserFromBoard(user.ID);
|
var result = _userManager.UnbindUserFromBoard(user.ID);
|
||||||
return Ok(result > 0);
|
return Ok(result > 0);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
@@ -278,17 +301,23 @@ public class DataController : ControllerBase
|
|||||||
[ProducesResponseType(typeof(Database.Board), StatusCodes.Status200OK)]
|
[ProducesResponseType(typeof(Database.Board), StatusCodes.Status200OK)]
|
||||||
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||||
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
public IActionResult GetBoardByID(Guid id)
|
public async Task<IActionResult> GetBoardByID(Guid id)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using var db = new Database.AppDataConnection();
|
var ret = _userManager.GetBoardByID(id);
|
||||||
var ret = db.GetBoardByID(id);
|
|
||||||
if (!ret.IsSuccessful)
|
if (!ret.IsSuccessful)
|
||||||
return StatusCode(StatusCodes.Status500InternalServerError, "数据库操作失败");
|
return StatusCode(StatusCodes.Status500InternalServerError, "数据库操作失败");
|
||||||
if (!ret.Value.HasValue)
|
if (!ret.Value.HasValue)
|
||||||
return NotFound("未找到对应的实验板");
|
return NotFound("未找到对应的实验板");
|
||||||
return Ok(ret.Value.Value);
|
|
||||||
|
var boardInfo = ret.Value.Value;
|
||||||
|
if (!(await ArpClient.CheckOrAddAsync(boardInfo.IpAddr, boardInfo.MacAddr, GetLocalIPAddress().ToString())))
|
||||||
|
{
|
||||||
|
logger.Error($"无法配置ARP,实验板可能会无法连接");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(boardInfo);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -303,21 +332,16 @@ public class DataController : ControllerBase
|
|||||||
[Authorize("Admin")]
|
[Authorize("Admin")]
|
||||||
[HttpPost("AddBoard")]
|
[HttpPost("AddBoard")]
|
||||||
[EnableCors("Users")]
|
[EnableCors("Users")]
|
||||||
[ProducesResponseType(typeof(int), StatusCodes.Status200OK)]
|
[ProducesResponseType(typeof(Guid), StatusCodes.Status200OK)]
|
||||||
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
public IActionResult AddBoard(string name, string ipAddr, int port)
|
public IActionResult AddBoard(string name)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(name))
|
if (string.IsNullOrWhiteSpace(name))
|
||||||
return BadRequest("板子名称不能为空");
|
return BadRequest("板子名称不能为空");
|
||||||
if (string.IsNullOrWhiteSpace(ipAddr))
|
|
||||||
return BadRequest("IP地址不能为空");
|
|
||||||
if (port <= 0 || port > 65535)
|
|
||||||
return BadRequest("端口号不合法");
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using var db = new Database.AppDataConnection();
|
var ret = _userManager.AddBoard(name);
|
||||||
var ret = db.AddBoard(name, ipAddr, port);
|
|
||||||
return Ok(ret);
|
return Ok(ret);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
@@ -343,8 +367,7 @@ public class DataController : ControllerBase
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using var db = new Database.AppDataConnection();
|
var ret = _userManager.DeleteBoardByID(id);
|
||||||
var ret = db.DeleteBoardByID(id);
|
|
||||||
return Ok(ret);
|
return Ok(ret);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
@@ -366,8 +389,7 @@ public class DataController : ControllerBase
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using var db = new Database.AppDataConnection();
|
var boards = _userManager.GetAllBoard();
|
||||||
var boards = db.GetAllBoard();
|
|
||||||
return Ok(boards);
|
return Ok(boards);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
@@ -376,5 +398,106 @@ public class DataController : ControllerBase
|
|||||||
return StatusCode(StatusCodes.Status500InternalServerError, "获取失败,请稍后重试");
|
return StatusCode(StatusCodes.Status500InternalServerError, "获取失败,请稍后重试");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 更新板卡名称(管理员权限)
|
||||||
|
/// </summary>
|
||||||
|
[Authorize("Admin")]
|
||||||
|
[HttpPost("UpdateBoardName")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(int), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public IActionResult UpdateBoardName(Guid boardId, string newName)
|
||||||
|
{
|
||||||
|
if (boardId == Guid.Empty)
|
||||||
|
return BadRequest("板子Guid不能为空");
|
||||||
|
if (string.IsNullOrWhiteSpace(newName))
|
||||||
|
return BadRequest("新名称不能为空");
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var result = _userManager.UpdateBoardName(boardId, newName);
|
||||||
|
return Ok(result);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "更新板卡名称时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "更新失败,请稍后重试");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 更新板卡状态(管理员权限)
|
||||||
|
/// </summary>
|
||||||
|
[Authorize("Admin")]
|
||||||
|
[HttpPost("UpdateBoardStatus")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(int), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public IActionResult UpdateBoardStatus(Guid boardId, Database.BoardStatus newStatus)
|
||||||
|
{
|
||||||
|
if (boardId == Guid.Empty)
|
||||||
|
return BadRequest("板子Guid不能为空");
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var result = _userManager.UpdateBoardStatus(boardId, newStatus);
|
||||||
|
return Ok(result);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "更新板卡状态时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "更新失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[HttpPost("AddEmptyBoard")]
|
||||||
|
[EnableCors("Development")]
|
||||||
|
[ProducesResponseType(StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public IActionResult AddEmptyBoard()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var boardId = _userManager.AddBoard("Test");
|
||||||
|
var result = _userManager.UpdateBoardStatus(boardId, Database.BoardStatus.Available);
|
||||||
|
return Ok();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "新增板子时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "新增失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// [TODO:description]
|
||||||
|
/// </summary>
|
||||||
|
public class UserInfo
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 用户的唯一标识符
|
||||||
|
/// </summary>
|
||||||
|
public Guid ID { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 用户的名称
|
||||||
|
/// </summary>
|
||||||
|
public required string Name { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 用户的电子邮箱
|
||||||
|
/// </summary>
|
||||||
|
public required string EMail { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 用户关联的板卡ID
|
||||||
|
/// </summary>
|
||||||
|
public Guid BoardID { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 用户绑定板子的过期时间
|
||||||
|
/// </summary>
|
||||||
|
public DateTime? BoardExpireTime { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
468
server/src/Controllers/DebuggerController.cs
Normal file
468
server/src/Controllers/DebuggerController.cs
Normal file
@@ -0,0 +1,468 @@
|
|||||||
|
using Microsoft.AspNetCore.Authorization;
|
||||||
|
using Microsoft.AspNetCore.Cors;
|
||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using Peripherals.DebuggerClient;
|
||||||
|
|
||||||
|
namespace server.Controllers;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// FPGA调试器控制器,提供信号捕获、触发、数据读取等调试相关API
|
||||||
|
/// </summary>
|
||||||
|
[ApiController]
|
||||||
|
[Route("api/[controller]")]
|
||||||
|
[Authorize]
|
||||||
|
public class DebuggerController : ControllerBase
|
||||||
|
{
|
||||||
|
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
private readonly Database.UserManager _userManager = new();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取当前用户绑定的调试器实例
|
||||||
|
/// </summary>
|
||||||
|
private DebuggerClient? GetDebugger()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var userName = User.Identity?.Name;
|
||||||
|
if (string.IsNullOrEmpty(userName))
|
||||||
|
return null;
|
||||||
|
|
||||||
|
var userRet = _userManager.GetUserByName(userName);
|
||||||
|
if (!userRet.IsSuccessful || !userRet.Value.HasValue)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
var user = userRet.Value.Value;
|
||||||
|
if (user.BoardID == Guid.Empty)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
var boardRet = _userManager.GetBoardByID(user.BoardID);
|
||||||
|
if (!boardRet.IsSuccessful || !boardRet.Value.HasValue)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
var board = boardRet.Value.Value;
|
||||||
|
return new DebuggerClient(board.IpAddr, board.Port, 7);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "获取调试器实例时发生异常");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 设置指定信号线的捕获模式
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="wireNum">信号线编号(0~511)</param>
|
||||||
|
/// <param name="mode">捕获模式</param>
|
||||||
|
[HttpPost("SetMode")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
public async Task<IActionResult> SetMode(UInt32 wireNum, CaptureMode mode)
|
||||||
|
{
|
||||||
|
if (wireNum > 512)
|
||||||
|
{
|
||||||
|
return BadRequest($"最多只能建立512位信号线");
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var debugger = GetDebugger();
|
||||||
|
if (debugger == null)
|
||||||
|
return BadRequest("用户未绑定有效的实验板");
|
||||||
|
|
||||||
|
var result = await debugger.SetMode(wireNum, mode);
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"设置捕获模式失败: {result.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "设置捕获模式失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(result.Value);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "设置捕获模式时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "操作失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 为每个通道中的每根线设置捕获模式
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="config">调试器配置信息,包含所有通道的捕获模式设置</param>
|
||||||
|
[HttpPost("SetChannelsMode")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
public async Task<IActionResult> SetChannelsMode([FromBody] DebuggerConfig config)
|
||||||
|
{
|
||||||
|
if (config == null || config.channelConfigs == null)
|
||||||
|
return BadRequest("配置无效");
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var debugger = GetDebugger();
|
||||||
|
if (debugger == null)
|
||||||
|
return BadRequest("用户未绑定有效的实验板");
|
||||||
|
|
||||||
|
foreach (var channel in config.channelConfigs)
|
||||||
|
{
|
||||||
|
// 检查每个通道的配置
|
||||||
|
if (channel.wireWidth > 32 ||
|
||||||
|
channel.wireStartIndex > 32 ||
|
||||||
|
channel.wireStartIndex + channel.wireWidth > 32)
|
||||||
|
{
|
||||||
|
return BadRequest($"通道 {channel.name} 配置错误");
|
||||||
|
}
|
||||||
|
|
||||||
|
for (uint i = 0; i < channel.wireWidth; i++)
|
||||||
|
{
|
||||||
|
var result = await debugger.SetMode(channel.wireStartIndex * (channel.parentPort * 32) + i, channel.mode);
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"设置通道 {channel.name} 第 {i} 根线捕获模式失败: {result.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"设置通道 {channel.name} 第 {i} 根线捕获模式失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(true);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "为每个通道中的每根线设置捕获模式时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "操作失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 启动触发器,开始信号捕获
|
||||||
|
/// </summary>
|
||||||
|
[HttpPost("StartTrigger")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
public async Task<IActionResult> StartTrigger()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var debugger = GetDebugger();
|
||||||
|
if (debugger == null)
|
||||||
|
return BadRequest("用户未绑定有效的实验板");
|
||||||
|
|
||||||
|
var result = await debugger.StartTrigger();
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"启动触发器失败: {result.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "启动触发器失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(result.Value);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "启动触发器时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "操作失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 读取触发器状态标志
|
||||||
|
/// </summary>
|
||||||
|
[HttpGet("ReadFlag")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(byte), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
public async Task<IActionResult> ReadFlag()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var debugger = GetDebugger();
|
||||||
|
if (debugger == null)
|
||||||
|
return BadRequest("用户未绑定有效的实验板");
|
||||||
|
|
||||||
|
var result = await debugger.ReadFlag();
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"读取触发器状态标志失败: {result.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "读取触发器状态标志失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(result.Value);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "读取触发器状态标志时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "操作失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 清除触发器状态标志
|
||||||
|
/// </summary>
|
||||||
|
[HttpPost("ClearFlag")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
public async Task<IActionResult> ClearFlag()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var debugger = GetDebugger();
|
||||||
|
if (debugger == null)
|
||||||
|
return BadRequest("用户未绑定有效的实验板");
|
||||||
|
|
||||||
|
var result = await debugger.ClearFlag();
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"清除触发器状态标志失败: {result.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "清除触发器状态标志失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(result.Value);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "清除触发器状态标志时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "操作失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 读取捕获数据(等待触发完成后返回各通道采样数据)
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="config">调试器配置信息,包含采样深度、端口数、通道配置等</param>
|
||||||
|
/// <param name="cancellationToken">取消操作的令牌</param>
|
||||||
|
[HttpPost("ReadData")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(ChannelCaptureData[]), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
public async Task<IActionResult> ReadData([FromBody] DebuggerConfig config, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
// 检查每个通道的配置
|
||||||
|
foreach (var channel in config.channelConfigs)
|
||||||
|
{
|
||||||
|
if (channel.wireWidth > 32 ||
|
||||||
|
channel.wireStartIndex > 32 ||
|
||||||
|
channel.wireStartIndex + channel.wireWidth > 32)
|
||||||
|
{
|
||||||
|
return BadRequest($"通道 {channel.name} 配置错误");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var debugger = GetDebugger();
|
||||||
|
if (debugger == null)
|
||||||
|
return BadRequest("用户未绑定有效的实验板");
|
||||||
|
|
||||||
|
// 等待捕获标志位
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
cancellationToken.ThrowIfCancellationRequested();
|
||||||
|
var flagResult = await debugger.ReadFlag();
|
||||||
|
if (!flagResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"读取捕获标志失败: {flagResult.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "读取捕获标志失败");
|
||||||
|
}
|
||||||
|
if (flagResult.Value == 1)
|
||||||
|
{
|
||||||
|
var clearResult = await debugger.ClearFlag();
|
||||||
|
if (!clearResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"清除捕获标志失败: {clearResult.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "清除捕获标志失败");
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
await Task.Delay(500, cancellationToken);
|
||||||
|
}
|
||||||
|
|
||||||
|
var dataResult = await debugger.ReadData(config.totalPortNum);
|
||||||
|
if (!dataResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"读取捕获数据失败: {dataResult.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "读取捕获数据失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
var freshResult = await debugger.Refresh();
|
||||||
|
if (!freshResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"刷新调试器状态失败: {freshResult.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "刷新调试器状态失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
var rawData = dataResult.Value;
|
||||||
|
// logger.Debug($"rawData: {BitConverter.ToString(rawData)}");
|
||||||
|
int depth = (int)config.captureDepth;
|
||||||
|
int portDataLen = 4 * depth;
|
||||||
|
int portNum = (int)config.totalPortNum;
|
||||||
|
var channelDataList = new List<ChannelCaptureData>();
|
||||||
|
|
||||||
|
foreach (var channel in config.channelConfigs)
|
||||||
|
{
|
||||||
|
int port = (int)channel.parentPort;
|
||||||
|
int wireStart = (int)channel.wireStartIndex;
|
||||||
|
int wireWidth = (int)channel.wireWidth;
|
||||||
|
|
||||||
|
// 每个port的数据长度
|
||||||
|
int portOffset = port * portDataLen;
|
||||||
|
|
||||||
|
var channelUintArr = new UInt32[depth];
|
||||||
|
for (int i = 0; i < depth; i++)
|
||||||
|
{
|
||||||
|
// 取出该port的第i个采样点的4字节
|
||||||
|
int sampleOffset = portOffset + i * 4;
|
||||||
|
if (sampleOffset + 4 > rawData.Length)
|
||||||
|
{
|
||||||
|
logger.Error($"数据越界: port {port}, sample {i}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "数据越界");
|
||||||
|
}
|
||||||
|
var sampleBytes = rawData[sampleOffset..(sampleOffset + 4)];
|
||||||
|
UInt32 sample = Common.Number.BytesToUInt32(sampleBytes, true).Value;
|
||||||
|
// 提取wireWidth位
|
||||||
|
UInt32 mask = (wireWidth == 32) ? 0xFFFFFFFF : ((1u << wireWidth) - 1u);
|
||||||
|
channelUintArr[i] = (sample >> wireStart) & mask;
|
||||||
|
}
|
||||||
|
var channelBytes = new byte[4 * depth];
|
||||||
|
Buffer.BlockCopy(channelUintArr, 0, channelBytes, 0, channelBytes.Length);
|
||||||
|
// logger.Debug($"{channel.name} HexData: {BitConverter.ToString(channelBytes)}");
|
||||||
|
var base64 = Convert.ToBase64String(channelBytes);
|
||||||
|
channelDataList.Add(new ChannelCaptureData { name = channel.name, data = base64 });
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(channelDataList.ToArray());
|
||||||
|
}
|
||||||
|
catch (OperationCanceledException)
|
||||||
|
{
|
||||||
|
logger.Info("读取捕获数据请求被取消");
|
||||||
|
return StatusCode(StatusCodes.Status499ClientClosedRequest, "客户端已取消请求");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "读取捕获数据时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "操作失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 刷新调试器状态(重置采集状态等)
|
||||||
|
/// </summary>
|
||||||
|
[HttpPost("Refresh")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
public async Task<IActionResult> Refresh()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var debugger = GetDebugger();
|
||||||
|
if (debugger == null)
|
||||||
|
return BadRequest("用户未绑定有效的实验板");
|
||||||
|
|
||||||
|
var result = await debugger.Refresh();
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"刷新调试器状态失败: {result.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "刷新调试器状态失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(result.Value);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "刷新调试器状态时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "操作失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 表示单个信号通道的配置信息
|
||||||
|
/// </summary>
|
||||||
|
public class ChannelConfig
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 通道名称
|
||||||
|
/// </summary>
|
||||||
|
required public string name;
|
||||||
|
/// <summary>
|
||||||
|
/// 通道显示颜色(如前端波形显示用)
|
||||||
|
/// </summary>
|
||||||
|
required public string color;
|
||||||
|
/// <summary>
|
||||||
|
/// 通道信号线宽度(位数)
|
||||||
|
/// </summary>
|
||||||
|
required public UInt32 wireWidth;
|
||||||
|
/// <summary>
|
||||||
|
/// 信号线在父端口中的起始索引(bit)
|
||||||
|
/// </summary>
|
||||||
|
required public UInt32 wireStartIndex;
|
||||||
|
/// <summary>
|
||||||
|
/// 父端口编号
|
||||||
|
/// </summary>
|
||||||
|
required public UInt32 parentPort;
|
||||||
|
/// <summary>
|
||||||
|
/// 捕获模式(如上升沿、下降沿等)
|
||||||
|
/// </summary>
|
||||||
|
required public CaptureMode mode;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 调试器整体配置信息
|
||||||
|
/// </summary>
|
||||||
|
public class DebuggerConfig
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 时钟频率
|
||||||
|
/// </summary>
|
||||||
|
required public UInt32 clkFreq;
|
||||||
|
/// <summary>
|
||||||
|
/// 总端口数量
|
||||||
|
/// </summary>
|
||||||
|
required public UInt32 totalPortNum;
|
||||||
|
/// <summary>
|
||||||
|
/// 捕获深度(采样点数)
|
||||||
|
/// </summary>
|
||||||
|
required public UInt32 captureDepth;
|
||||||
|
/// <summary>
|
||||||
|
/// 触发器数量
|
||||||
|
/// </summary>
|
||||||
|
required public UInt32 triggerNum;
|
||||||
|
/// <summary>
|
||||||
|
/// 所有信号通道的配置信息
|
||||||
|
/// </summary>
|
||||||
|
required public ChannelConfig[] channelConfigs;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 单个通道的捕获数据
|
||||||
|
/// </summary>
|
||||||
|
public class ChannelCaptureData
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 通道名称
|
||||||
|
/// </summary>
|
||||||
|
required public string name;
|
||||||
|
/// <summary>
|
||||||
|
/// 通道捕获到的数据(Base64编码的UInt32数组)
|
||||||
|
/// </summary>
|
||||||
|
required public string data;
|
||||||
|
}
|
||||||
|
}
|
||||||
518
server/src/Controllers/ExamController.cs
Normal file
518
server/src/Controllers/ExamController.cs
Normal file
@@ -0,0 +1,518 @@
|
|||||||
|
using Microsoft.AspNetCore.Authorization;
|
||||||
|
using Microsoft.AspNetCore.Cors;
|
||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using DotNext;
|
||||||
|
using Database;
|
||||||
|
|
||||||
|
namespace server.Controllers;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 实验控制器
|
||||||
|
/// </summary>
|
||||||
|
[ApiController]
|
||||||
|
[Route("api/[controller]")]
|
||||||
|
public class ExamController : ControllerBase
|
||||||
|
{
|
||||||
|
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
private readonly ExamManager _examManager = new();
|
||||||
|
private readonly ResourceManager _resourceManager = new();
|
||||||
|
private readonly UserManager _userManager = new();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取所有实验列表
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>实验列表</returns>
|
||||||
|
[Authorize]
|
||||||
|
[HttpGet("list")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(ExamInfo[]), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public IActionResult GetExamList()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var exams = _examManager.GetAllExams();
|
||||||
|
|
||||||
|
var examInfos = exams.Select(exam => new ExamInfo(exam)).ToArray();
|
||||||
|
|
||||||
|
logger.Info($"成功获取实验列表,共 {examInfos.Length} 个实验");
|
||||||
|
return Ok(examInfos);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error($"获取实验列表时出错: {ex.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"获取实验列表失败: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 根据实验ID获取实验详细信息
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="examId">实验ID</param>
|
||||||
|
/// <returns>实验详细信息</returns>
|
||||||
|
[Authorize]
|
||||||
|
[HttpGet("{examId}")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(ExamInfo), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public IActionResult GetExam(string examId)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(examId))
|
||||||
|
return BadRequest("实验ID不能为空");
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var result = _examManager.GetExamByID(examId);
|
||||||
|
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"获取实验时出错: {result.Error.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"获取实验失败: {result.Error.Message}");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!result.Value.HasValue)
|
||||||
|
{
|
||||||
|
logger.Warn($"实验不存在: {examId}");
|
||||||
|
return NotFound($"实验 {examId} 不存在");
|
||||||
|
}
|
||||||
|
|
||||||
|
var exam = result.Value.Value;
|
||||||
|
var examInfo = new ExamInfo(exam);
|
||||||
|
|
||||||
|
logger.Info($"成功获取实验信息: {examId}");
|
||||||
|
return Ok(examInfo);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error($"获取实验 {examId} 时出错: {ex.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"获取实验失败: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 创建新实验
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="request">创建实验请求</param>
|
||||||
|
/// <returns>创建结果</returns>
|
||||||
|
[Authorize("Admin")]
|
||||||
|
[HttpPost("create")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(ExamInfo), StatusCodes.Status201Created)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status403Forbidden)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status409Conflict)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public IActionResult CreateExam([FromBody] ExamDto request)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(request.ID) || string.IsNullOrWhiteSpace(request.Name) || string.IsNullOrWhiteSpace(request.Description))
|
||||||
|
return BadRequest("实验ID、名称和描述不能为空");
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var result = _examManager.CreateExam(request.ID, request.Name, request.Description, request.Tags, request.Difficulty, request.IsVisibleToUsers);
|
||||||
|
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
if (result.Error.Message.Contains("已存在"))
|
||||||
|
return Conflict(result.Error.Message);
|
||||||
|
|
||||||
|
logger.Error($"创建实验时出错: {result.Error.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"创建实验失败: {result.Error.Message}");
|
||||||
|
}
|
||||||
|
|
||||||
|
var exam = result.Value;
|
||||||
|
var examInfo = new ExamInfo(exam);
|
||||||
|
|
||||||
|
logger.Info($"成功创建实验: {request.ID}");
|
||||||
|
return CreatedAtAction(nameof(GetExam), new { examId = request.ID }, examInfo);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error($"创建实验 {request.ID} 时出错: {ex.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"创建实验失败: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 更新实验信息
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="request">更新实验请求</param>
|
||||||
|
/// <returns>更新结果</returns>
|
||||||
|
[Authorize("Admin")]
|
||||||
|
[HttpPost("update")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(ExamInfo), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status403Forbidden)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public IActionResult UpdateExam([FromBody] ExamDto request)
|
||||||
|
{
|
||||||
|
var examId = request.ID;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// 首先检查实验是否存在
|
||||||
|
var existingExamResult = _examManager.GetExamByID(examId);
|
||||||
|
if (!existingExamResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"检查实验是否存在时出错: {existingExamResult.Error.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"检查实验失败: {existingExamResult.Error.Message}");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!existingExamResult.Value.HasValue)
|
||||||
|
{
|
||||||
|
logger.Warn($"要更新的实验不存在: {examId}");
|
||||||
|
return NotFound($"实验 {examId} 不存在");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 执行更新
|
||||||
|
var updateResult = _examManager.UpdateExam(
|
||||||
|
examId,
|
||||||
|
request.Name,
|
||||||
|
request.Description,
|
||||||
|
request.Tags,
|
||||||
|
request.Difficulty,
|
||||||
|
request.IsVisibleToUsers
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!updateResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"更新实验时出错: {updateResult.Error.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"更新实验失败: {updateResult.Error.Message}");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取更新后的实验信息并返回
|
||||||
|
var updatedExamResult = _examManager.GetExamByID(examId);
|
||||||
|
if (!updatedExamResult.IsSuccessful || !updatedExamResult.Value.HasValue)
|
||||||
|
{
|
||||||
|
logger.Error($"获取更新后的实验信息失败: {examId}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "更新成功但获取更新后信息失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
var updatedExam = updatedExamResult.Value.Value;
|
||||||
|
var examInfo = new ExamInfo(updatedExam);
|
||||||
|
|
||||||
|
logger.Info($"成功更新实验: {examId},更新记录数: {updateResult.Value}");
|
||||||
|
return Ok(examInfo);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error($"更新实验 {examId} 时出错: {ex.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"更新实验失败: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 提交作业
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="examId">实验ID</param>
|
||||||
|
/// <param name="file">提交的文件</param>
|
||||||
|
/// <returns>提交结果</returns>
|
||||||
|
[Authorize]
|
||||||
|
[HttpPost("commit/{examId}")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(ResourceInfo), StatusCodes.Status201Created)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public async Task<IActionResult> Commit(string examId, IFormFile file)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(examId))
|
||||||
|
return BadRequest("实验ID不能为空");
|
||||||
|
|
||||||
|
if (file == null || file.Length == 0)
|
||||||
|
return BadRequest("文件不能为空");
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// 获取当前用户信息
|
||||||
|
var userName = User.Identity?.Name;
|
||||||
|
if (string.IsNullOrEmpty(userName))
|
||||||
|
return Unauthorized("无法获取用户信息");
|
||||||
|
|
||||||
|
var userResult = _userManager.GetUserByName(userName);
|
||||||
|
if (!userResult.IsSuccessful || !userResult.Value.HasValue)
|
||||||
|
return Unauthorized("用户不存在");
|
||||||
|
|
||||||
|
var user = userResult.Value.Value;
|
||||||
|
|
||||||
|
// 检查实验是否存在
|
||||||
|
var examResult = _examManager.GetExamByID(examId);
|
||||||
|
if (!examResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"检查实验是否存在时出错: {examResult.Error.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"检查实验失败: {examResult.Error.Message}");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!examResult.Value.HasValue)
|
||||||
|
{
|
||||||
|
logger.Warn($"实验不存在: {examId}");
|
||||||
|
return NotFound($"实验 {examId} 不存在");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 读取文件内容
|
||||||
|
byte[] fileData;
|
||||||
|
using (var memoryStream = new MemoryStream())
|
||||||
|
{
|
||||||
|
await file.CopyToAsync(memoryStream);
|
||||||
|
fileData = memoryStream.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 提交作业
|
||||||
|
var commitResult = _resourceManager.AddResource(
|
||||||
|
user.ID, ResourceTypes.Compression, ResourcePurpose.Homework,
|
||||||
|
file.FileName, fileData, examId);
|
||||||
|
if (!commitResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"提交作业时出错: {commitResult.Error.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"提交作业失败: {commitResult.Error.Message}");
|
||||||
|
}
|
||||||
|
|
||||||
|
var commit = new ResourceInfo(commitResult.Value);
|
||||||
|
|
||||||
|
logger.Info($"用户 {userName} 成功提交实验 {examId} 的作业,Commit ID: {commit.ID}");
|
||||||
|
return CreatedAtAction(nameof(GetCommitsByExamId), new { examId = examId }, commit);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error($"提交实验 {examId} 作业时出错: {ex.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"提交作业失败: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取用户在指定实验中的提交记录
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="examId">实验ID</param>
|
||||||
|
/// <returns>提交记录列表</returns>
|
||||||
|
[Authorize]
|
||||||
|
[HttpGet("commits/{examId}")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(ResourceInfo[]), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public IActionResult GetCommitsByExamId(string examId)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(examId))
|
||||||
|
return BadRequest("实验ID不能为空");
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// 获取当前用户信息
|
||||||
|
var userName = User.Identity?.Name;
|
||||||
|
if (string.IsNullOrEmpty(userName))
|
||||||
|
return Unauthorized("无法获取用户信息");
|
||||||
|
|
||||||
|
var userResult = _userManager.GetUserByName(userName);
|
||||||
|
if (!userResult.IsSuccessful || !userResult.Value.HasValue)
|
||||||
|
return Unauthorized("用户不存在");
|
||||||
|
|
||||||
|
var user = userResult.Value.Value;
|
||||||
|
|
||||||
|
// 检查实验是否存在
|
||||||
|
var examResult = _examManager.GetExamByID(examId);
|
||||||
|
if (!examResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"检查实验是否存在时出错: {examResult.Error.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"检查实验失败: {examResult.Error.Message}");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!examResult.Value.HasValue)
|
||||||
|
{
|
||||||
|
logger.Warn($"实验不存在: {examId}");
|
||||||
|
return NotFound($"实验 {examId} 不存在");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取用户的提交记录
|
||||||
|
var commitsResult = _resourceManager.GetResourceListByType(
|
||||||
|
ResourceTypes.Compression, ResourcePurpose.Homework, examId);
|
||||||
|
if (!commitsResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"获取提交记录时出错: {commitsResult.Error.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"获取提交记录失败: {commitsResult.Error.Message}");
|
||||||
|
}
|
||||||
|
var commits = commitsResult.Value.Select(x => new ResourceInfo(x)).ToArray();
|
||||||
|
|
||||||
|
logger.Info($"成功获取用户 {userName} 在实验 {examId} 中的提交记录,共 {commits.Length} 条");
|
||||||
|
return Ok(commits);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error($"获取实验 {examId} 提交记录时出错: {ex.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"获取提交记录失败: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 删除提交记录
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="commitId">提交记录ID</param>
|
||||||
|
/// <returns>删除结果</returns>
|
||||||
|
[Authorize]
|
||||||
|
[HttpDelete("commit/{commitId}")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status403Forbidden)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public IActionResult DeleteCommit(Guid commitId)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// 获取当前用户信息
|
||||||
|
var userName = User.Identity?.Name;
|
||||||
|
if (string.IsNullOrEmpty(userName))
|
||||||
|
return Unauthorized("无法获取用户信息");
|
||||||
|
|
||||||
|
var userResult = _userManager.GetUserByName(userName);
|
||||||
|
if (!userResult.IsSuccessful || !userResult.Value.HasValue)
|
||||||
|
return Unauthorized("用户不存在");
|
||||||
|
|
||||||
|
var user = userResult.Value.Value;
|
||||||
|
|
||||||
|
// 检查是否是管理员
|
||||||
|
var isAdmin = user.Permission == UserPermission.Admin;
|
||||||
|
|
||||||
|
// 如果不是管理员,检查提交记录是否属于当前用户
|
||||||
|
if (!isAdmin)
|
||||||
|
{
|
||||||
|
var commitResult = _resourceManager.GetResourceById(commitId);
|
||||||
|
if (!commitResult.HasValue)
|
||||||
|
{
|
||||||
|
logger.Warn($"提交记录不存在: {commitId}");
|
||||||
|
return NotFound($"提交记录 {commitId} 不存在");
|
||||||
|
}
|
||||||
|
|
||||||
|
var commit = commitResult.Value;
|
||||||
|
if (commit.UserID != user.ID)
|
||||||
|
{
|
||||||
|
logger.Warn($"用户 {userName} 尝试删除不属于自己的提交记录: {commitId}");
|
||||||
|
return Forbid("您只能删除自己的提交记录");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 执行删除
|
||||||
|
var deleteResult = _resourceManager.DeleteResource(commitId);
|
||||||
|
if (!deleteResult)
|
||||||
|
{
|
||||||
|
logger.Warn($"提交记录不存在: {commitId}");
|
||||||
|
return NotFound($"提交记录 {commitId} 不存在");
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.Info($"用户 {userName} 成功删除提交记录: {commitId}");
|
||||||
|
return Ok($"提交记录 {commitId} 已成功删除");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error($"删除提交记录 {commitId} 时出错: {ex.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"删除提交记录失败: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 实验信息
|
||||||
|
/// </summary>
|
||||||
|
public class ExamInfo
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 实验的唯一标识符
|
||||||
|
/// </summary>
|
||||||
|
public string ID { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 实验名称
|
||||||
|
/// </summary>
|
||||||
|
public string Name { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 实验描述
|
||||||
|
/// </summary>
|
||||||
|
public string Description { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 实验创建时间
|
||||||
|
/// </summary>
|
||||||
|
public DateTime CreatedTime { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 实验最后更新时间
|
||||||
|
/// </summary>
|
||||||
|
public DateTime UpdatedTime { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 实验标签
|
||||||
|
/// </summary>
|
||||||
|
public string[] Tags { get; set; } = Array.Empty<string>();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 实验难度(1-5)
|
||||||
|
/// </summary>
|
||||||
|
public int Difficulty { get; set; } = 1;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 普通用户是否可见
|
||||||
|
/// </summary>
|
||||||
|
public bool IsVisibleToUsers { get; set; } = true;
|
||||||
|
|
||||||
|
public ExamInfo(Exam exam)
|
||||||
|
{
|
||||||
|
ID = exam.ID;
|
||||||
|
Name = exam.Name;
|
||||||
|
Description = exam.Description;
|
||||||
|
CreatedTime = exam.CreatedTime;
|
||||||
|
UpdatedTime = exam.UpdatedTime;
|
||||||
|
Tags = exam.GetTagsList();
|
||||||
|
Difficulty = exam.Difficulty;
|
||||||
|
IsVisibleToUsers = exam.IsVisibleToUsers;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 统一的实验数据传输对象
|
||||||
|
/// </summary>
|
||||||
|
public class ExamDto
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 实验的唯一标识符
|
||||||
|
/// </summary>
|
||||||
|
public required string ID { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 实验名称
|
||||||
|
/// </summary>
|
||||||
|
public required string Name { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 实验描述
|
||||||
|
/// </summary>
|
||||||
|
public required string Description { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 实验标签
|
||||||
|
/// </summary>
|
||||||
|
public string[] Tags { get; set; } = Array.Empty<string>();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 实验难度(1-5)
|
||||||
|
/// </summary>
|
||||||
|
public int Difficulty { get; set; } = 1;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 普通用户是否可见
|
||||||
|
/// </summary>
|
||||||
|
public bool IsVisibleToUsers { get; set; } = true;
|
||||||
|
}
|
||||||
90
server/src/Controllers/HdmiVideoStreamController.cs
Normal file
90
server/src/Controllers/HdmiVideoStreamController.cs
Normal file
@@ -0,0 +1,90 @@
|
|||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using Microsoft.AspNetCore.Cors;
|
||||||
|
using Microsoft.AspNetCore.Authorization;
|
||||||
|
using System.Security.Claims;
|
||||||
|
using server.Services;
|
||||||
|
|
||||||
|
namespace server.Controllers;
|
||||||
|
|
||||||
|
[ApiController]
|
||||||
|
[Route("api/[controller]")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
public class HdmiVideoStreamController : ControllerBase
|
||||||
|
{
|
||||||
|
private readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
private readonly HttpHdmiVideoStreamService _videoStreamService;
|
||||||
|
private readonly Database.UserManager _userManager = new();
|
||||||
|
|
||||||
|
public HdmiVideoStreamController(HttpHdmiVideoStreamService videoStreamService)
|
||||||
|
{
|
||||||
|
_videoStreamService = videoStreamService;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 管理员获取所有板子的 endpoints
|
||||||
|
[HttpGet("AllEndpoints")]
|
||||||
|
[Authorize("Admin")]
|
||||||
|
public ActionResult<List<HdmiVideoStreamEndpoint>> GetAllEndpoints()
|
||||||
|
{
|
||||||
|
var endpoints = _videoStreamService.GetAllVideoEndpoints();
|
||||||
|
if (endpoints == null)
|
||||||
|
return NotFound("No boards found.");
|
||||||
|
return Ok(endpoints);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 用户获取自己板子的 endpoint
|
||||||
|
[HttpGet("MyEndpoint")]
|
||||||
|
[Authorize]
|
||||||
|
public ActionResult<HdmiVideoStreamEndpoint> GetMyEndpoint()
|
||||||
|
{
|
||||||
|
var userName = User.FindFirstValue(ClaimTypes.Name);
|
||||||
|
if (string.IsNullOrEmpty(userName))
|
||||||
|
return Unauthorized("User name not found in claims.");
|
||||||
|
|
||||||
|
var userRet = _userManager.GetUserByName(userName);
|
||||||
|
if (!userRet.IsSuccessful || !userRet.Value.HasValue)
|
||||||
|
return NotFound("User not found.");
|
||||||
|
|
||||||
|
var user = userRet.Value.Value;
|
||||||
|
var boardId = user.BoardID;
|
||||||
|
if (boardId == Guid.Empty)
|
||||||
|
return NotFound("No board bound to this user.");
|
||||||
|
|
||||||
|
var boardRet = _userManager.GetBoardByID(boardId);
|
||||||
|
if (!boardRet.IsSuccessful || !boardRet.Value.HasValue)
|
||||||
|
return NotFound("Board not found.");
|
||||||
|
|
||||||
|
var endpoint = _videoStreamService.GetVideoEndpoint(boardId.ToString());
|
||||||
|
return Ok(endpoint);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 禁用指定板子的 HDMI 传输
|
||||||
|
[HttpPost("DisableHdmiTransmission")]
|
||||||
|
[Authorize]
|
||||||
|
public async Task<IActionResult> DisableHdmiTransmission()
|
||||||
|
{
|
||||||
|
var userName = User.FindFirstValue(ClaimTypes.Name);
|
||||||
|
if (string.IsNullOrEmpty(userName))
|
||||||
|
return Unauthorized("User name not found in claims.");
|
||||||
|
|
||||||
|
var userRet = _userManager.GetUserByName(userName);
|
||||||
|
if (!userRet.IsSuccessful || !userRet.Value.HasValue)
|
||||||
|
return NotFound("User not found.");
|
||||||
|
|
||||||
|
var user = userRet.Value.Value;
|
||||||
|
var boardId = user.BoardID;
|
||||||
|
if (boardId == Guid.Empty)
|
||||||
|
return NotFound("No board bound to this user.");
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await _videoStreamService.DisableHdmiTransmissionAsync(boardId.ToString());
|
||||||
|
return Ok($"HDMI transmission for board {boardId} disabled.");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, $"Failed to disable HDMI transmission for board {boardId}");
|
||||||
|
return StatusCode(500, $"Error disabling HDMI transmission: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
using Microsoft.AspNetCore.Authorization;
|
using Microsoft.AspNetCore.Authorization;
|
||||||
using Microsoft.AspNetCore.Cors;
|
using Microsoft.AspNetCore.Cors;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using Database;
|
||||||
|
using server.Services;
|
||||||
|
|
||||||
namespace server.Controllers;
|
namespace server.Controllers;
|
||||||
|
|
||||||
@@ -14,6 +16,10 @@ public class JtagController : ControllerBase
|
|||||||
{
|
{
|
||||||
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
private readonly ProgressTracker _tracker = MsgBus.ProgressTracker;
|
||||||
|
private readonly UserManager _userManager = new();
|
||||||
|
private readonly ResourceManager _resourceManager = new();
|
||||||
|
|
||||||
private const string BITSTREAM_PATH = "bitstream/Jtag";
|
private const string BITSTREAM_PATH = "bitstream/Jtag";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -112,116 +118,96 @@ public class JtagController : ControllerBase
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 上传比特流文件到服务器
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="address">目标设备地址</param>
|
|
||||||
/// <param name="file">比特流文件</param>
|
|
||||||
/// <returns>上传结果</returns>
|
|
||||||
[HttpPost("UploadBitstream")]
|
|
||||||
[EnableCors("Users")]
|
|
||||||
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
|
||||||
[ProducesResponseType(typeof(string), StatusCodes.Status400BadRequest)]
|
|
||||||
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
|
||||||
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
|
||||||
public async ValueTask<IResult> UploadBitstream(string address, IFormFile file)
|
|
||||||
{
|
|
||||||
logger.Info($"User {User.Identity?.Name} uploading bitstream for device {address}");
|
|
||||||
|
|
||||||
if (file == null || file.Length == 0)
|
|
||||||
{
|
|
||||||
logger.Warn($"User {User.Identity?.Name} attempted to upload empty file for device {address}");
|
|
||||||
return TypedResults.BadRequest("未选择文件");
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// 生成安全的文件名(避免路径遍历攻击)
|
|
||||||
var fileName = Path.GetRandomFileName();
|
|
||||||
var uploadsFolder = Path.Combine(Environment.CurrentDirectory, $"{BITSTREAM_PATH}/{address}");
|
|
||||||
|
|
||||||
// 如果存在文件,则删除原文件再上传
|
|
||||||
if (Directory.Exists(uploadsFolder))
|
|
||||||
{
|
|
||||||
Directory.Delete(uploadsFolder, true);
|
|
||||||
logger.Info($"User {User.Identity?.Name} removed existing bitstream folder for device {address}");
|
|
||||||
}
|
|
||||||
Directory.CreateDirectory(uploadsFolder);
|
|
||||||
|
|
||||||
var filePath = Path.Combine(uploadsFolder, fileName);
|
|
||||||
|
|
||||||
using (var stream = new FileStream(filePath, FileMode.Create))
|
|
||||||
{
|
|
||||||
await file.CopyToAsync(stream);
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.Info($"User {User.Identity?.Name} successfully uploaded bitstream for device {address}, file size: {file.Length} bytes");
|
|
||||||
return TypedResults.Ok(true);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
logger.Error(ex, $"User {User.Identity?.Name} failed to upload bitstream for device {address}");
|
|
||||||
return TypedResults.InternalServerError(ex);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 通过 JTAG 下载比特流文件到 FPGA 设备
|
/// 通过 JTAG 下载比特流文件到 FPGA 设备
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="address">JTAG 设备地址</param>
|
/// <param name="address">JTAG 设备地址</param>
|
||||||
/// <param name="port">JTAG 设备端口</param>
|
/// <param name="port">JTAG 设备端口</param>
|
||||||
/// <returns>下载结果</returns>
|
/// <param name="bitstreamId">比特流ID</param>
|
||||||
|
/// <param name="cancelToken">取消令牌</param>
|
||||||
|
/// <returns>进度跟踪TaskID</returns>
|
||||||
[HttpPost("DownloadBitstream")]
|
[HttpPost("DownloadBitstream")]
|
||||||
[EnableCors("Users")]
|
[EnableCors("Users")]
|
||||||
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
[ProducesResponseType(typeof(string), StatusCodes.Status200OK)]
|
||||||
[ProducesResponseType(typeof(string), StatusCodes.Status400BadRequest)]
|
[ProducesResponseType(typeof(string), StatusCodes.Status400BadRequest)]
|
||||||
[ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
|
[ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
|
||||||
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
public async ValueTask<IResult> DownloadBitstream(string address, int port)
|
public IResult DownloadBitstream(string address, int port, Guid bitstreamId, CancellationToken cancelToken)
|
||||||
{
|
{
|
||||||
logger.Info($"User {User.Identity?.Name} initiating bitstream download to device {address}:{port}");
|
logger.Info($"User {User.Identity?.Name} initiating bitstream download to device {address}:{port} using bitstream ID: {bitstreamId}");
|
||||||
|
|
||||||
// 检查文件
|
|
||||||
var fileDir = Path.Combine(Environment.CurrentDirectory, $"{BITSTREAM_PATH}/{address}");
|
|
||||||
if (!Directory.Exists(fileDir))
|
|
||||||
{
|
|
||||||
logger.Warn($"User {User.Identity?.Name} attempted to download non-existent bitstream for device {address}");
|
|
||||||
return TypedResults.BadRequest("Empty bitstream, Please upload it first");
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
// 读取文件
|
// 获取当前用户名
|
||||||
var filePath = Directory.GetFiles(fileDir)[0];
|
var username = User.Identity?.Name;
|
||||||
logger.Info($"User {User.Identity?.Name} reading bitstream file: {filePath}");
|
if (string.IsNullOrEmpty(username))
|
||||||
|
|
||||||
using (var fileStream = System.IO.File.Open(filePath, System.IO.FileMode.Open))
|
|
||||||
{
|
{
|
||||||
if (fileStream is null || fileStream.Length <= 0)
|
logger.Warn("Anonymous user attempted to download bitstream");
|
||||||
{
|
return TypedResults.Unauthorized();
|
||||||
logger.Warn($"User {User.Identity?.Name} found invalid bitstream file for device {address}");
|
|
||||||
return TypedResults.BadRequest("Wrong bitstream, Please upload it again");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.Info($"User {User.Identity?.Name} processing bitstream file of size: {fileStream.Length} bytes");
|
// 从数据库获取用户信息
|
||||||
|
var userResult = _userManager.GetUserByName(username);
|
||||||
|
if (!userResult.IsSuccessful || !userResult.Value.HasValue)
|
||||||
|
{
|
||||||
|
logger.Error($"User {username} not found in database");
|
||||||
|
return TypedResults.BadRequest("用户不存在");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 从数据库获取比特流
|
||||||
|
var user = userResult.Value.Value;
|
||||||
|
var resourceRet = _resourceManager.GetResourceById(bitstreamId);
|
||||||
|
|
||||||
|
if (!resourceRet.HasValue)
|
||||||
|
{
|
||||||
|
logger.Warn($"User {username} attempted to download non-existent bitstream ID: {bitstreamId}");
|
||||||
|
return TypedResults.BadRequest("比特流不存在");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 处理比特流数据
|
||||||
|
var resource = resourceRet.Value;
|
||||||
|
var bitstreamRet = _resourceManager.ReadBytesFromPath(resource.Path);
|
||||||
|
if (!bitstreamRet.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"User {username} failed to read bitstream file: {bitstreamRet.Error}");
|
||||||
|
return TypedResults.InternalServerError($"比特流读取失败: {bitstreamRet.Error?.Message}");
|
||||||
|
}
|
||||||
|
|
||||||
|
var fileBytes = bitstreamRet.Value;
|
||||||
|
if (fileBytes == null || fileBytes.Length == 0)
|
||||||
|
{
|
||||||
|
logger.Warn($"User {username} found empty bitstream data for ID: {bitstreamId}");
|
||||||
|
return TypedResults.BadRequest("比特流数据为空,请重新上传");
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.Info($"User {username} processing bitstream file of size: {fileBytes.Length} bytes");
|
||||||
|
|
||||||
|
// 定义进度跟踪
|
||||||
|
var taskId = _tracker.CreateTask(8000);
|
||||||
|
_tracker.AdvanceProgress(taskId, 10);
|
||||||
|
|
||||||
|
_ = Task.Run(async () =>
|
||||||
|
{
|
||||||
// 定义缓冲区大小: 32KB
|
// 定义缓冲区大小: 32KB
|
||||||
byte[] buffer = new byte[32 * 1024];
|
byte[] buffer = new byte[32 * 1024];
|
||||||
byte[] revBuffer = new byte[32 * 1024];
|
byte[] revBuffer = new byte[32 * 1024];
|
||||||
long totalBytesRead = 0;
|
long totalBytesProcessed = 0;
|
||||||
|
|
||||||
// 使用异步流读取文件
|
// 使用内存流处理文件
|
||||||
using (var memoryStream = new MemoryStream())
|
using (var inputStream = new MemoryStream(fileBytes))
|
||||||
|
using (var outputStream = new MemoryStream())
|
||||||
{
|
{
|
||||||
int bytesRead;
|
int bytesRead;
|
||||||
while ((bytesRead = await fileStream.ReadAsync(buffer, 0, buffer.Length)) > 0)
|
while ((bytesRead = await inputStream.ReadAsync(buffer, 0, buffer.Length)) > 0)
|
||||||
{
|
{
|
||||||
// 反转 32bits
|
// 反转 32bits
|
||||||
var retBuffer = Common.Number.ReverseBytes(buffer, 4);
|
var retBuffer = Common.Number.ReverseBytes(buffer, 4);
|
||||||
if (!retBuffer.IsSuccessful)
|
if (!retBuffer.IsSuccessful)
|
||||||
{
|
{
|
||||||
logger.Error($"User {User.Identity?.Name} failed to reverse bytes: {retBuffer.Error}");
|
logger.Error($"User {username} failed to reverse bytes: {retBuffer.Error}");
|
||||||
return TypedResults.InternalServerError(retBuffer.Error);
|
_tracker.FailProgress(taskId,
|
||||||
|
$"User {username} failed to reverse bytes: {retBuffer.Error}");
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
revBuffer = retBuffer.Value;
|
revBuffer = retBuffer.Value;
|
||||||
|
|
||||||
@@ -230,34 +216,39 @@ public class JtagController : ControllerBase
|
|||||||
revBuffer[i] = Common.Number.ReverseBits(revBuffer[i]);
|
revBuffer[i] = Common.Number.ReverseBits(revBuffer[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
await memoryStream.WriteAsync(revBuffer, 0, bytesRead);
|
await outputStream.WriteAsync(revBuffer, 0, bytesRead);
|
||||||
totalBytesRead += bytesRead;
|
totalBytesProcessed += bytesRead;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 将所有数据转换为字节数组(注意:如果文件非常大,可能不适合完全加载到内存)
|
// 获取处理后的数据
|
||||||
var fileBytes = memoryStream.ToArray();
|
var processedBytes = outputStream.ToArray();
|
||||||
logger.Info($"User {User.Identity?.Name} processed {totalBytesRead} bytes for device {address}");
|
logger.Info($"User {username} processed {totalBytesProcessed} bytes for device {address}");
|
||||||
|
|
||||||
|
_tracker.AdvanceProgress(taskId, 20);
|
||||||
|
|
||||||
// 下载比特流
|
// 下载比特流
|
||||||
var jtagCtrl = new Peripherals.JtagClient.Jtag(address, port);
|
var jtagCtrl = new Peripherals.JtagClient.Jtag(address, port);
|
||||||
var ret = await jtagCtrl.DownloadBitstream(fileBytes);
|
var ret = await jtagCtrl.DownloadBitstream(processedBytes, taskId);
|
||||||
|
|
||||||
if (ret.IsSuccessful)
|
if (ret.IsSuccessful)
|
||||||
{
|
{
|
||||||
logger.Info($"User {User.Identity?.Name} successfully downloaded bitstream to device {address}");
|
logger.Info($"User {username} successfully downloaded bitstream '{resource.ResourceName}' to device {address}");
|
||||||
return TypedResults.Ok(ret.Value);
|
_tracker.CompleteProgress(taskId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
logger.Error($"User {User.Identity?.Name} failed to download bitstream to device {address}: {ret.Error}");
|
logger.Error($"User {username} failed to download bitstream to device {address}: {ret.Error}");
|
||||||
return TypedResults.InternalServerError(ret.Error);
|
_tracker.FailProgress(taskId,
|
||||||
}
|
$"User {username} failed to download bitstream to device {address}: {ret.Error}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return TypedResults.Ok(taskId);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
logger.Error(ex, $"User {User.Identity?.Name} encountered exception while downloading bitstream to device {address}");
|
logger.Error(ex, $"User encountered exception while downloading bitstream to device {address}");
|
||||||
return TypedResults.InternalServerError(ex);
|
return TypedResults.InternalServerError(ex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,42 +15,7 @@ public class LogicAnalyzerController : ControllerBase
|
|||||||
{
|
{
|
||||||
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
/// <summary>
|
private readonly Database.UserManager _userManager = new();
|
||||||
/// 信号触发配置
|
|
||||||
/// </summary>
|
|
||||||
public class SignalTriggerConfig
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 信号索引 (0-7)
|
|
||||||
/// </summary>
|
|
||||||
public int SignalIndex { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 操作符
|
|
||||||
/// </summary>
|
|
||||||
public SignalOperator Operator { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 信号值
|
|
||||||
/// </summary>
|
|
||||||
public SignalValue Value { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 捕获配置
|
|
||||||
/// </summary>
|
|
||||||
public class CaptureConfig
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 全局触发模式
|
|
||||||
/// </summary>
|
|
||||||
public GlobalCaptureMode GlobalMode { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 信号触发配置列表
|
|
||||||
/// </summary>
|
|
||||||
public SignalTriggerConfig[] SignalConfigs { get; set; } = Array.Empty<SignalTriggerConfig>();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取逻辑分析仪实例
|
/// 获取逻辑分析仪实例
|
||||||
@@ -63,8 +28,7 @@ public class LogicAnalyzerController : ControllerBase
|
|||||||
if (string.IsNullOrEmpty(userName))
|
if (string.IsNullOrEmpty(userName))
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
using var db = new Database.AppDataConnection();
|
var userRet = _userManager.GetUserByName(userName);
|
||||||
var userRet = db.GetUserByName(userName);
|
|
||||||
if (!userRet.IsSuccessful || !userRet.Value.HasValue)
|
if (!userRet.IsSuccessful || !userRet.Value.HasValue)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
@@ -72,12 +36,12 @@ public class LogicAnalyzerController : ControllerBase
|
|||||||
if (user.BoardID == Guid.Empty)
|
if (user.BoardID == Guid.Empty)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
var boardRet = db.GetBoardByID(user.BoardID);
|
var boardRet = _userManager.GetBoardByID(user.BoardID);
|
||||||
if (!boardRet.IsSuccessful || !boardRet.Value.HasValue)
|
if (!boardRet.IsSuccessful || !boardRet.Value.HasValue)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
var board = boardRet.Value.Value;
|
var board = boardRet.Value.Value;
|
||||||
return new Analyzer(board.IpAddr, board.Port, 2);
|
return new Analyzer(board.IpAddr, board.Port, 11);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -208,8 +172,8 @@ public class LogicAnalyzerController : ControllerBase
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (signalIndex < 0 || signalIndex > 7)
|
if (signalIndex < 0 || signalIndex > 31)
|
||||||
return BadRequest("信号索引必须在0-7之间");
|
return BadRequest("信号索引必须在0-31之间");
|
||||||
|
|
||||||
var analyzer = GetAnalyzer();
|
var analyzer = GetAnalyzer();
|
||||||
if (analyzer == null)
|
if (analyzer == null)
|
||||||
@@ -231,6 +195,50 @@ public class LogicAnalyzerController : ControllerBase
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 设置深度、预采样深度、有效通道
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="capture_length">深度</param>
|
||||||
|
/// <param name="pre_capture_length">预采样深度</param>
|
||||||
|
/// <param name="channel_div">有效通道(0-[1],1-[2],2-[4],3-[8],4-[16],5-[32])</param>
|
||||||
|
/// <param name="clock_div">采样时钟分频系数</param>
|
||||||
|
/// <returns>操作结果</returns>
|
||||||
|
[HttpPost("SetCaptureParams")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
public async Task<IActionResult> SetCaptureParams(int capture_length, int pre_capture_length, AnalyzerChannelDiv channel_div, AnalyzerClockDiv clock_div)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
//DDR深度为 32'h01000000 - 32'h0FFFFFFF
|
||||||
|
if (capture_length < 0 || capture_length > 0x10000000 - 0x01000000)
|
||||||
|
return BadRequest("采样深度设置错误");
|
||||||
|
if (pre_capture_length < 0 || pre_capture_length >= capture_length)
|
||||||
|
return BadRequest("预采样深度必须小于捕获深度");
|
||||||
|
|
||||||
|
var analyzer = GetAnalyzer();
|
||||||
|
if (analyzer == null)
|
||||||
|
return BadRequest("用户未绑定有效的实验板");
|
||||||
|
|
||||||
|
var result = await analyzer.SetCaptureParams(capture_length, pre_capture_length, channel_div, clock_div);
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"设置深度、预采样深度、有效通道、时钟分频失败: {result.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "设置深度、预采样深度、有效通道、时钟分频失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(result.Value);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "设置深度、预采样深度、有效通道、时钟分频失败时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "操作失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 批量配置捕获参数
|
/// 批量配置捕获参数
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -264,8 +272,8 @@ public class LogicAnalyzerController : ControllerBase
|
|||||||
// 设置信号触发模式
|
// 设置信号触发模式
|
||||||
foreach (var signalConfig in config.SignalConfigs)
|
foreach (var signalConfig in config.SignalConfigs)
|
||||||
{
|
{
|
||||||
if (signalConfig.SignalIndex < 0 || signalConfig.SignalIndex > 7)
|
if (signalConfig.SignalIndex < 0 || signalConfig.SignalIndex > 31)
|
||||||
return BadRequest($"信号索引{signalConfig.SignalIndex}超出范围0-7");
|
return BadRequest($"信号索引{signalConfig.SignalIndex}超出范围0-31");
|
||||||
|
|
||||||
var signalResult = await analyzer.SetSignalTrigMode(
|
var signalResult = await analyzer.SetSignalTrigMode(
|
||||||
signalConfig.SignalIndex, signalConfig.Operator, signalConfig.Value);
|
signalConfig.SignalIndex, signalConfig.Operator, signalConfig.Value);
|
||||||
@@ -276,6 +284,14 @@ public class LogicAnalyzerController : ControllerBase
|
|||||||
$"设置信号{signalConfig.SignalIndex}触发模式失败");
|
$"设置信号{signalConfig.SignalIndex}触发模式失败");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// 设置深度、预采样深度、有效通道
|
||||||
|
var paramsResult = await analyzer.SetCaptureParams(
|
||||||
|
config.CaptureLength, config.PreCaptureLength, config.ChannelDiv, config.ClockDiv);
|
||||||
|
if (!paramsResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"设置深度、预采样深度、有效通道失败: {paramsResult.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "设置深度、预采样深度、有效通道失败");
|
||||||
|
}
|
||||||
|
|
||||||
return Ok(true);
|
return Ok(true);
|
||||||
}
|
}
|
||||||
@@ -330,7 +346,7 @@ public class LogicAnalyzerController : ControllerBase
|
|||||||
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
public async Task<IActionResult> GetCaptureData()
|
public async Task<IActionResult> GetCaptureData(int capture_length = 2048 * 32)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -338,7 +354,7 @@ public class LogicAnalyzerController : ControllerBase
|
|||||||
if (analyzer == null)
|
if (analyzer == null)
|
||||||
return BadRequest("用户未绑定有效的实验板");
|
return BadRequest("用户未绑定有效的实验板");
|
||||||
|
|
||||||
var result = await analyzer.ReadCaptureData();
|
var result = await analyzer.ReadCaptureData(capture_length);
|
||||||
if (!result.IsSuccessful)
|
if (!result.IsSuccessful)
|
||||||
{
|
{
|
||||||
logger.Error($"读取捕获数据失败: {result.Error}");
|
logger.Error($"读取捕获数据失败: {result.Error}");
|
||||||
@@ -355,4 +371,57 @@ public class LogicAnalyzerController : ControllerBase
|
|||||||
return StatusCode(StatusCodes.Status500InternalServerError, "操作失败,请稍后重试");
|
return StatusCode(StatusCodes.Status500InternalServerError, "操作失败,请稍后重试");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 信号触发配置
|
||||||
|
/// </summary>
|
||||||
|
public class SignalTriggerConfig
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 信号索引 (0-7)
|
||||||
|
/// </summary>
|
||||||
|
public int SignalIndex { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 操作符
|
||||||
|
/// </summary>
|
||||||
|
public SignalOperator Operator { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 信号值
|
||||||
|
/// </summary>
|
||||||
|
public SignalValue Value { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 捕获配置
|
||||||
|
/// </summary>
|
||||||
|
public class CaptureConfig
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 全局触发模式
|
||||||
|
/// </summary>
|
||||||
|
public GlobalCaptureMode GlobalMode { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 捕获深度
|
||||||
|
/// </summary>
|
||||||
|
public int CaptureLength { get; set; } = 2048 * 32;
|
||||||
|
/// <summary>
|
||||||
|
/// 预采样深度
|
||||||
|
/// </summary>
|
||||||
|
public int PreCaptureLength { get; set; } = 2048;
|
||||||
|
/// <summary>
|
||||||
|
/// 有效通道
|
||||||
|
/// </summary>
|
||||||
|
public AnalyzerChannelDiv ChannelDiv { get; set; } = AnalyzerChannelDiv.EIGHT;
|
||||||
|
/// <summary>
|
||||||
|
/// 时钟分频系数
|
||||||
|
/// </summary>
|
||||||
|
public AnalyzerClockDiv ClockDiv { get; set; } = AnalyzerClockDiv.DIV1;
|
||||||
|
/// <summary>
|
||||||
|
/// 信号触发配置列表
|
||||||
|
/// </summary>
|
||||||
|
public SignalTriggerConfig[] SignalConfigs { get; set; } = Array.Empty<SignalTriggerConfig>();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
776
server/src/Controllers/NetConfigController.cs
Normal file
776
server/src/Controllers/NetConfigController.cs
Normal file
@@ -0,0 +1,776 @@
|
|||||||
|
using System.Net;
|
||||||
|
using Microsoft.AspNetCore.Authorization;
|
||||||
|
using Microsoft.AspNetCore.Cors;
|
||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using Peripherals.NetConfigClient;
|
||||||
|
|
||||||
|
namespace server.Controllers;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 网络配置控制器(仅管理员权限)
|
||||||
|
/// </summary>
|
||||||
|
[ApiController]
|
||||||
|
[Route("api/[controller]")]
|
||||||
|
[Authorize("Admin")]
|
||||||
|
public class NetConfigController : ControllerBase
|
||||||
|
{
|
||||||
|
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
// 固定的实验板IP,端口,MAC地址
|
||||||
|
private const string BOARD_IP = "169.254.109.0";
|
||||||
|
private const int BOARD_PORT = 1234;
|
||||||
|
|
||||||
|
// 本机网络信息
|
||||||
|
private readonly IPAddress _localIP = IPAddress.Any;
|
||||||
|
private readonly byte[] _localMAC = new byte[6];
|
||||||
|
private readonly string _localIPString;
|
||||||
|
private readonly string _localMACString;
|
||||||
|
private readonly string _localInterface;
|
||||||
|
|
||||||
|
public NetConfigController()
|
||||||
|
{
|
||||||
|
// 初始化本机IP地址
|
||||||
|
_localIP = GetLocalIPAddress();
|
||||||
|
_localIPString = _localIP?.ToString() ?? "未知";
|
||||||
|
|
||||||
|
// 初始化本机MAC地址
|
||||||
|
_localMAC = GetLocalMACAddress();
|
||||||
|
_localMACString = _localMAC != null ? BitConverter.ToString(_localMAC).Replace("-", ":") : "未知";
|
||||||
|
|
||||||
|
// 获取本机网络接口名称
|
||||||
|
_localInterface = GetLocalNetworkInterface();
|
||||||
|
|
||||||
|
logger.Info($"NetConfigController 初始化完成 - 本机IP: {_localIPString}, 本机MAC: {_localMACString}, 接口: {_localInterface}");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取本机IP地址(优先选择与实验板同网段的IP)
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>本机IP地址</returns>
|
||||||
|
private IPAddress GetLocalIPAddress()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var boardIpSegments = BOARD_IP.Split('.').Take(3).ToArray();
|
||||||
|
|
||||||
|
// 优先选择与实验板IP前三段相同的IP
|
||||||
|
var sameSegmentIP = System.Net.NetworkInformation.NetworkInterface
|
||||||
|
.GetAllNetworkInterfaces()
|
||||||
|
.Where(nic => nic.OperationalStatus == System.Net.NetworkInformation.OperationalStatus.Up
|
||||||
|
&& nic.NetworkInterfaceType != System.Net.NetworkInformation.NetworkInterfaceType.Loopback)
|
||||||
|
.SelectMany(nic => nic.GetIPProperties().UnicastAddresses)
|
||||||
|
.Where(addr => addr.Address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
|
||||||
|
.Select(addr => addr.Address)
|
||||||
|
.FirstOrDefault(addr =>
|
||||||
|
{
|
||||||
|
var segments = addr.ToString().Split('.');
|
||||||
|
return segments.Length == 4 &&
|
||||||
|
segments[0] == boardIpSegments[0] &&
|
||||||
|
segments[1] == boardIpSegments[1] &&
|
||||||
|
segments[2] == boardIpSegments[2];
|
||||||
|
});
|
||||||
|
|
||||||
|
if (sameSegmentIP != null)
|
||||||
|
return sameSegmentIP;
|
||||||
|
|
||||||
|
// 如果没有找到同网段的IP,返回第一个可用的IP
|
||||||
|
return System.Net.NetworkInformation.NetworkInterface
|
||||||
|
.GetAllNetworkInterfaces()
|
||||||
|
.Where(nic => nic.OperationalStatus == System.Net.NetworkInformation.OperationalStatus.Up
|
||||||
|
&& nic.NetworkInterfaceType != System.Net.NetworkInformation.NetworkInterfaceType.Loopback)
|
||||||
|
.SelectMany(nic => nic.GetIPProperties().UnicastAddresses)
|
||||||
|
.Where(addr => addr.Address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
|
||||||
|
.Select(addr => addr.Address)
|
||||||
|
.FirstOrDefault() ?? IPAddress.Loopback;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "获取本机IP地址失败");
|
||||||
|
return IPAddress.Loopback;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取本机MAC地址
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>本机MAC地址字节数组</returns>
|
||||||
|
private byte[] GetLocalMACAddress()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
return System.Net.NetworkInformation.NetworkInterface
|
||||||
|
.GetAllNetworkInterfaces()
|
||||||
|
.Where(nic => nic.OperationalStatus == System.Net.NetworkInformation.OperationalStatus.Up
|
||||||
|
&& nic.NetworkInterfaceType != System.Net.NetworkInformation.NetworkInterfaceType.Loopback)
|
||||||
|
.Select(nic => nic.GetPhysicalAddress()?.GetAddressBytes())
|
||||||
|
.FirstOrDefault(bytes => bytes != null && bytes.Length == 6) ?? new byte[6];
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "获取本机MAC地址失败");
|
||||||
|
return new byte[6];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取本机网络接口名称
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>网络接口名称</returns>
|
||||||
|
private string GetLocalNetworkInterface()
|
||||||
|
{
|
||||||
|
return GetLocalIPAddress().ToString();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 初始化ARP记录
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>是否成功</returns>
|
||||||
|
private async Task<bool> InitializeArpAsync()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
return await ArpClient.UpdateArpEntryAsync(BOARD_IP);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "初始化ARP记录失败");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取主机IP地址
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>主机IP地址</returns>
|
||||||
|
[HttpGet("GetHostIP")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(string), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public async Task<IActionResult> GetHostIP()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!(await InitializeArpAsync()))
|
||||||
|
{
|
||||||
|
throw new Exception("无法配置ARP记录");
|
||||||
|
}
|
||||||
|
|
||||||
|
var netConfig = new NetConfig(BOARD_IP, BOARD_PORT, 0);
|
||||||
|
var result = await netConfig.GetHostIP();
|
||||||
|
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"获取主机IP失败: {result.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"获取失败: {result.Error}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(result.Value);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "获取主机IP时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "获取失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取板卡IP地址
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>板卡IP地址</returns>
|
||||||
|
[HttpGet("GetBoardIP")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(string), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public async Task<IActionResult> GetBoardIP()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!(await InitializeArpAsync()))
|
||||||
|
{
|
||||||
|
throw new Exception("无法配置ARP记录");
|
||||||
|
}
|
||||||
|
|
||||||
|
var netConfig = new NetConfig(BOARD_IP, BOARD_PORT, 0);
|
||||||
|
var result = await netConfig.GetBoardIP();
|
||||||
|
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"获取板卡IP失败: {result.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"获取失败: {result.Error}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(result.Value);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "获取板卡IP时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "获取失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取主机MAC地址
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>主机MAC地址</returns>
|
||||||
|
[HttpGet("GetHostMAC")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(string), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public async Task<IActionResult> GetHostMAC()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!(await InitializeArpAsync()))
|
||||||
|
{
|
||||||
|
throw new Exception("无法配置ARP记录");
|
||||||
|
}
|
||||||
|
|
||||||
|
var netConfig = new NetConfig(BOARD_IP, BOARD_PORT, 0);
|
||||||
|
var result = await netConfig.GetHostMAC();
|
||||||
|
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"获取主机MAC地址失败: {result.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"获取失败: {result.Error}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(result.Value);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "获取主机MAC地址时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "获取失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取板卡MAC地址
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>板卡MAC地址</returns>
|
||||||
|
[HttpGet("GetBoardMAC")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(string), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public async Task<IActionResult> GetBoardMAC()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!(await InitializeArpAsync()))
|
||||||
|
{
|
||||||
|
throw new Exception("无法配置ARP记录");
|
||||||
|
}
|
||||||
|
|
||||||
|
var netConfig = new NetConfig(BOARD_IP, BOARD_PORT, 0);
|
||||||
|
var result = await netConfig.GetBoardMAC();
|
||||||
|
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"获取板卡MAC地址失败: {result.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"获取失败: {result.Error}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(result.Value);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "获取板卡MAC地址时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "获取失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取所有网络配置信息
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>网络配置信息</returns>
|
||||||
|
[HttpGet("GetNetworkConfig")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(NetworkConfigDto), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public async Task<IActionResult> GetNetworkConfig()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!(await InitializeArpAsync()))
|
||||||
|
{
|
||||||
|
throw new Exception("无法配置ARP记录");
|
||||||
|
}
|
||||||
|
|
||||||
|
var netConfig = new NetConfig(BOARD_IP, BOARD_PORT, 0);
|
||||||
|
|
||||||
|
var hostIPResult = await netConfig.GetHostIP();
|
||||||
|
var boardIPResult = await netConfig.GetBoardIP();
|
||||||
|
var hostMACResult = await netConfig.GetHostMAC();
|
||||||
|
var boardMACResult = await netConfig.GetBoardMAC();
|
||||||
|
|
||||||
|
var config = new NetworkConfigDto
|
||||||
|
{
|
||||||
|
HostIP = hostIPResult.IsSuccessful ? hostIPResult.Value : "获取失败",
|
||||||
|
BoardIP = boardIPResult.IsSuccessful ? boardIPResult.Value : "获取失败",
|
||||||
|
HostMAC = hostMACResult.IsSuccessful ? hostMACResult.Value : "获取失败",
|
||||||
|
BoardMAC = boardMACResult.IsSuccessful ? boardMACResult.Value : "获取失败"
|
||||||
|
};
|
||||||
|
|
||||||
|
return Ok(config);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "获取网络配置信息时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "获取失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取本机所有网络接口信息
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>网络接口信息列表</returns>
|
||||||
|
[HttpGet("GetLocalNetworkInterfaces")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(List<NetworkInterfaceDto>), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public IActionResult GetLocalNetworkInterfaces()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var interfaces = System.Net.NetworkInformation.NetworkInterface
|
||||||
|
.GetAllNetworkInterfaces()
|
||||||
|
.Where(nic => nic.OperationalStatus == System.Net.NetworkInformation.OperationalStatus.Up
|
||||||
|
&& nic.NetworkInterfaceType != System.Net.NetworkInformation.NetworkInterfaceType.Loopback)
|
||||||
|
.Select(nic => new NetworkInterfaceDto
|
||||||
|
{
|
||||||
|
Name = nic.Name,
|
||||||
|
Description = nic.Description,
|
||||||
|
Type = nic.NetworkInterfaceType.ToString(),
|
||||||
|
Status = nic.OperationalStatus.ToString(),
|
||||||
|
IPAddresses = nic.GetIPProperties().UnicastAddresses
|
||||||
|
.Where(addr => addr.Address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
|
||||||
|
.Select(addr => addr.Address.ToString())
|
||||||
|
.ToList(),
|
||||||
|
MACAddress = nic.GetPhysicalAddress().ToString()
|
||||||
|
})
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
return Ok(interfaces);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "获取本机网络接口信息时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "获取失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 设置主机IP地址
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="hostIp">主机IP地址</param>
|
||||||
|
/// <returns>操作结果</returns>
|
||||||
|
[HttpPost("SetHostIP")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public async Task<IActionResult> SetHostIP(string hostIp)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(hostIp))
|
||||||
|
return BadRequest("主机IP地址不能为空");
|
||||||
|
|
||||||
|
if (!IPAddress.TryParse(hostIp, out var hostIpAddress))
|
||||||
|
return BadRequest("主机IP地址格式不正确");
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!(await InitializeArpAsync()))
|
||||||
|
{
|
||||||
|
throw new Exception("无法配置ARP记录");
|
||||||
|
}
|
||||||
|
|
||||||
|
var netConfig = new NetConfig(BOARD_IP, BOARD_PORT, 0);
|
||||||
|
var result = await netConfig.SetHostIP(hostIpAddress);
|
||||||
|
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"设置主机IP失败: {result.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"设置失败: {result.Error}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(result.Value);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "设置主机IP时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "设置失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 设置板卡IP地址
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="newBoardIp">新的板卡IP地址</param>
|
||||||
|
/// <returns>操作结果</returns>
|
||||||
|
[HttpPost("SetBoardIP")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public async Task<IActionResult> SetBoardIP(string newBoardIp)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(newBoardIp))
|
||||||
|
return BadRequest("新的板卡IP地址不能为空");
|
||||||
|
|
||||||
|
if (!IPAddress.TryParse(newBoardIp, out var newIpAddress))
|
||||||
|
return BadRequest("新的板卡IP地址格式不正确");
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!(await InitializeArpAsync()))
|
||||||
|
{
|
||||||
|
throw new Exception("无法配置ARP记录");
|
||||||
|
}
|
||||||
|
|
||||||
|
var netConfig = new NetConfig(BOARD_IP, BOARD_PORT, 0);
|
||||||
|
var result = await netConfig.SetBoardIP(newIpAddress);
|
||||||
|
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"设置板卡IP失败: {result.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"设置失败: {result.Error}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(result.Value);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "设置板卡IP时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "设置失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 设置板卡MAC地址
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="boardMac">板卡MAC地址(格式:AA:BB:CC:DD:EE:FF)</param>
|
||||||
|
/// <returns>操作结果</returns>
|
||||||
|
[HttpPost("SetBoardMAC")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public async Task<IActionResult> SetBoardMAC(string boardMac)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(boardMac))
|
||||||
|
return BadRequest("板卡MAC地址不能为空");
|
||||||
|
|
||||||
|
// 解析MAC地址
|
||||||
|
if (!TryParseMacAddress(boardMac, out var macBytes))
|
||||||
|
return BadRequest("MAC地址格式不正确,请使用格式:AA:BB:CC:DD:EE:FF");
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!(await InitializeArpAsync()))
|
||||||
|
{
|
||||||
|
throw new Exception("无法配置ARP记录");
|
||||||
|
}
|
||||||
|
// 创建网络配置客户端
|
||||||
|
var netConfig = new NetConfig(BOARD_IP, BOARD_PORT, 0);
|
||||||
|
var result = await netConfig.SetBoardMAC(macBytes);
|
||||||
|
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"设置板卡MAC地址失败: {result.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"设置失败: {result.Error}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(result.Value);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "设置板卡MAC地址时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "设置失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 设置主机MAC地址
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="hostMac">主机MAC地址(格式:AA:BB:CC:DD:EE:FF)</param>
|
||||||
|
/// <returns>操作结果</returns>
|
||||||
|
[HttpPost("SetHostMAC")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public async Task<IActionResult> SetHostMAC(string hostMac)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(hostMac))
|
||||||
|
return BadRequest("主机MAC地址不能为空");
|
||||||
|
|
||||||
|
// 解析MAC地址
|
||||||
|
if (!TryParseMacAddress(hostMac, out var macBytes))
|
||||||
|
return BadRequest("MAC地址格式不正确,请使用格式:AA:BB:CC:DD:EE:FF");
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!(await InitializeArpAsync()))
|
||||||
|
{
|
||||||
|
throw new Exception("无法配置ARP记录");
|
||||||
|
}
|
||||||
|
|
||||||
|
var netConfig = new NetConfig(BOARD_IP, BOARD_PORT, 0);
|
||||||
|
var result = await netConfig.SetHostMAC(macBytes);
|
||||||
|
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"设置主机MAC地址失败: {result.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"设置失败: {result.Error}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(result.Value);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "设置主机MAC地址时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "设置失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 自动获取本机IP地址并设置为实验板主机IP
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>操作结果</returns>
|
||||||
|
[HttpPost("UpdateHostIP")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public async Task<IActionResult> UpdateHostIP()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (_localIP == null)
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "无法获取本机IP地址");
|
||||||
|
|
||||||
|
if (!(await InitializeArpAsync()))
|
||||||
|
{
|
||||||
|
throw new Exception("无法配置ARP记录");
|
||||||
|
}
|
||||||
|
|
||||||
|
var netConfig = new NetConfig(BOARD_IP, BOARD_PORT, 0);
|
||||||
|
var result = await netConfig.SetHostIP(_localIP);
|
||||||
|
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"自动设置主机IP失败: {result.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"设置失败: {result.Error}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(result.Value);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "自动设置主机IP时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "设置失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 更新主机MAC地址
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>操作结果</returns>
|
||||||
|
[HttpPost("UpdateHostMAC")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public async Task<IActionResult> UpdateHostMAC()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (_localMAC == null || _localMAC.Length != 6)
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "无法获取本机MAC地址");
|
||||||
|
|
||||||
|
if (!(await InitializeArpAsync()))
|
||||||
|
{
|
||||||
|
throw new Exception("无法配置ARP记录");
|
||||||
|
}
|
||||||
|
|
||||||
|
var netConfig = new NetConfig(BOARD_IP, BOARD_PORT, 0);
|
||||||
|
var result = await netConfig.SetHostMAC(_localMAC);
|
||||||
|
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"设置主机MAC地址失败: {result.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"设置失败: {result.Error}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(result.Value);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "设置主机MAC地址时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "设置失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取本机网络信息
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>本机网络信息</returns>
|
||||||
|
[HttpGet("GetLocalNetworkInfo")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(object), StatusCodes.Status200OK)]
|
||||||
|
public IActionResult GetLocalNetworkInfo()
|
||||||
|
{
|
||||||
|
return Ok(new
|
||||||
|
{
|
||||||
|
LocalIP = _localIPString,
|
||||||
|
LocalMAC = _localMACString,
|
||||||
|
LocalInterface = _localInterface
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 解析MAC地址字符串为字节数组
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="macAddress">MAC地址字符串</param>
|
||||||
|
/// <param name="macBytes">解析后的字节数组</param>
|
||||||
|
/// <returns>是否解析成功</returns>
|
||||||
|
private static bool TryParseMacAddress(string macAddress, out byte[] macBytes)
|
||||||
|
{
|
||||||
|
macBytes = Array.Empty<byte>();
|
||||||
|
|
||||||
|
if (string.IsNullOrWhiteSpace(macAddress))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// 移除可能的分隔符并统一为冒号
|
||||||
|
var cleanMac = macAddress.Replace("-", ":").Replace(" ", "").ToUpper();
|
||||||
|
|
||||||
|
// 验证格式
|
||||||
|
if (cleanMac.Length != 17 || cleanMac.Count(c => c == ':') != 5)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
var parts = cleanMac.Split(':');
|
||||||
|
if (parts.Length != 6)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
macBytes = new byte[6];
|
||||||
|
for (int i = 0; i < 6; i++)
|
||||||
|
{
|
||||||
|
macBytes[i] = Convert.ToByte(parts[i], 16);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
macBytes = Array.Empty<byte>();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 网络配置数据传输对象
|
||||||
|
/// </summary>
|
||||||
|
public class NetworkConfigDto
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 主机IP地址
|
||||||
|
/// </summary>
|
||||||
|
public string? HostIP { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 板卡IP地址
|
||||||
|
/// </summary>
|
||||||
|
public string? BoardIP { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 主机MAC地址
|
||||||
|
/// </summary>
|
||||||
|
public string? HostMAC { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 板卡MAC地址
|
||||||
|
/// </summary>
|
||||||
|
public string? BoardMAC { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 网络配置操作结果
|
||||||
|
/// </summary>
|
||||||
|
public class NetworkConfigResult
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 主机IP设置结果
|
||||||
|
/// </summary>
|
||||||
|
public bool? HostIPResult { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 主机IP设置错误信息
|
||||||
|
/// </summary>
|
||||||
|
public string? HostIPError { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 板卡IP设置结果
|
||||||
|
/// </summary>
|
||||||
|
public bool? BoardIPResult { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 板卡IP设置错误信息
|
||||||
|
/// </summary>
|
||||||
|
public string? BoardIPError { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 主机MAC设置结果
|
||||||
|
/// </summary>
|
||||||
|
public bool? HostMACResult { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 主机MAC设置错误信息
|
||||||
|
/// </summary>
|
||||||
|
public string? HostMACError { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 板卡MAC设置结果
|
||||||
|
/// </summary>
|
||||||
|
public bool? BoardMACResult { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 板卡MAC设置错误信息
|
||||||
|
/// </summary>
|
||||||
|
public string? BoardMACError { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 网络接口信息数据传输对象
|
||||||
|
/// </summary>
|
||||||
|
public class NetworkInterfaceDto
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 网络接口名称
|
||||||
|
/// </summary>
|
||||||
|
public string Name { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 网络接口描述
|
||||||
|
/// </summary>
|
||||||
|
public string Description { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 网络接口类型
|
||||||
|
/// </summary>
|
||||||
|
public string Type { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 网络接口状态
|
||||||
|
/// </summary>
|
||||||
|
public string Status { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// IP地址列表
|
||||||
|
/// </summary>
|
||||||
|
public List<string> IPAddresses { get; set; } = new();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// MAC地址
|
||||||
|
/// </summary>
|
||||||
|
public string MACAddress { get; set; } = string.Empty;
|
||||||
|
}
|
||||||
413
server/src/Controllers/OscilloscopeController.cs
Normal file
413
server/src/Controllers/OscilloscopeController.cs
Normal file
@@ -0,0 +1,413 @@
|
|||||||
|
using Microsoft.AspNetCore.Authorization;
|
||||||
|
using Microsoft.AspNetCore.Cors;
|
||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using Peripherals.OscilloscopeClient;
|
||||||
|
using server.Hubs;
|
||||||
|
|
||||||
|
namespace server.Controllers;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 示波器API控制器 - 普通用户权限
|
||||||
|
/// </summary>
|
||||||
|
[ApiController]
|
||||||
|
[EnableCors("Development")]
|
||||||
|
[Route("api/[controller]")]
|
||||||
|
[Authorize]
|
||||||
|
public class OscilloscopeApiController : ControllerBase
|
||||||
|
{
|
||||||
|
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
private readonly Database.UserManager _userManager = new();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取示波器实例
|
||||||
|
/// </summary>
|
||||||
|
private OscilloscopeCtrl? GetOscilloscope()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var userName = User.Identity?.Name;
|
||||||
|
if (string.IsNullOrEmpty(userName))
|
||||||
|
return null;
|
||||||
|
|
||||||
|
var userRet = _userManager.GetUserByName(userName);
|
||||||
|
if (!userRet.IsSuccessful || !userRet.Value.HasValue)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
var user = userRet.Value.Value;
|
||||||
|
if (user.BoardID == Guid.Empty)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
var boardRet = _userManager.GetBoardByID(user.BoardID);
|
||||||
|
if (!boardRet.IsSuccessful || !boardRet.Value.HasValue)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
var board = boardRet.Value.Value;
|
||||||
|
return new OscilloscopeCtrl(board.IpAddr, board.Port);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "获取示波器实例时发生异常");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 初始化示波器
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="config">示波器配置</param>
|
||||||
|
/// <returns>操作结果</returns>
|
||||||
|
[HttpPost("Initialize")]
|
||||||
|
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
public async Task<IActionResult> Initialize([FromBody] OscilloscopeConfig config)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (config == null)
|
||||||
|
return BadRequest("配置参数不能为空");
|
||||||
|
|
||||||
|
if (config.HorizontalShift > 1023)
|
||||||
|
return BadRequest("水平偏移量必须在0-1023之间");
|
||||||
|
|
||||||
|
if (config.DecimationRate > 1023)
|
||||||
|
return BadRequest("抽样率必须在0-1023之间");
|
||||||
|
|
||||||
|
var oscilloscope = GetOscilloscope();
|
||||||
|
if (oscilloscope == null)
|
||||||
|
return BadRequest("用户未绑定有效的实验板");
|
||||||
|
|
||||||
|
// 首先关闭捕获
|
||||||
|
var stopResult = await oscilloscope.SetCaptureEnable(false);
|
||||||
|
if (!stopResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"关闭捕获失败: {stopResult.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "关闭捕获失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 设置触发电平
|
||||||
|
var levelResult = await oscilloscope.SetTriggerLevel(config.TriggerLevel);
|
||||||
|
if (!levelResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"设置触发电平失败: {levelResult.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "设置触发电平失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 设置触发边沿
|
||||||
|
var edgeResult = await oscilloscope.SetTriggerEdge(config.TriggerRisingEdge);
|
||||||
|
if (!edgeResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"设置触发边沿失败: {edgeResult.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "设置触发边沿失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 设置水平偏移量
|
||||||
|
var shiftResult = await oscilloscope.SetHorizontalShift(config.HorizontalShift);
|
||||||
|
if (!shiftResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"设置水平偏移量失败: {shiftResult.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "设置水平偏移量失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 设置抽样率
|
||||||
|
var rateResult = await oscilloscope.SetDecimationRate(config.DecimationRate);
|
||||||
|
if (!rateResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"设置抽样率失败: {rateResult.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "设置抽样率失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
// // 刷新RAM
|
||||||
|
// if (config.AutoRefreshRAM)
|
||||||
|
// {
|
||||||
|
// var refreshResult = await oscilloscope.RefreshRAM();
|
||||||
|
// if (!refreshResult.IsSuccessful)
|
||||||
|
// {
|
||||||
|
// logger.Error($"刷新RAM失败: {refreshResult.Error}");
|
||||||
|
// return StatusCode(StatusCodes.Status500InternalServerError, "刷新RAM失败");
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
// 设置捕获开关
|
||||||
|
var captureResult = await oscilloscope.SetCaptureEnable(config.CaptureEnabled);
|
||||||
|
if (!captureResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"设置捕获开关失败: {captureResult.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "设置捕获开关失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(true);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "初始化示波器时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "操作失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 启动捕获
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>操作结果</returns>
|
||||||
|
[HttpPost("StartCapture")]
|
||||||
|
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
public async Task<IActionResult> StartCapture()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var oscilloscope = GetOscilloscope();
|
||||||
|
if (oscilloscope == null)
|
||||||
|
return BadRequest("用户未绑定有效的实验板");
|
||||||
|
|
||||||
|
var result = await oscilloscope.SetCaptureEnable(true);
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"启动捕获失败: {result.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "启动捕获失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(result.Value);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "启动捕获时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "操作失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 停止捕获
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>操作结果</returns>
|
||||||
|
[HttpPost("StopCapture")]
|
||||||
|
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
public async Task<IActionResult> StopCapture()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var oscilloscope = GetOscilloscope();
|
||||||
|
if (oscilloscope == null)
|
||||||
|
return BadRequest("用户未绑定有效的实验板");
|
||||||
|
|
||||||
|
var result = await oscilloscope.SetCaptureEnable(false);
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"停止捕获失败: {result.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "停止捕获失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(result.Value);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "停止捕获时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "操作失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取示波器数据和状态
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>示波器数据和状态信息</returns>
|
||||||
|
[HttpGet("GetData")]
|
||||||
|
[ProducesResponseType(typeof(OscilloscopeDataResponse), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
public async Task<IActionResult> GetData()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var oscilloscope = GetOscilloscope();
|
||||||
|
if (oscilloscope == null)
|
||||||
|
return BadRequest("用户未绑定有效的实验板");
|
||||||
|
|
||||||
|
var freqResult = await oscilloscope.GetADFrequency();
|
||||||
|
var vppResult = await oscilloscope.GetADVpp();
|
||||||
|
var maxResult = await oscilloscope.GetADMax();
|
||||||
|
var minResult = await oscilloscope.GetADMin();
|
||||||
|
var waveformResult = await oscilloscope.GetWaveformData();
|
||||||
|
|
||||||
|
if (!freqResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"获取AD采样频率失败: {freqResult.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "获取AD采样频率失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!vppResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"获取AD采样幅度失败: {vppResult.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "获取AD采样幅度失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!maxResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"获取AD采样最大值失败: {maxResult.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "获取AD采样最大值失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!minResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"获取AD采样最小值失败: {minResult.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "获取AD采样最小值失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!waveformResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"获取波形数据失败: {waveformResult.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "获取波形数据失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
var response = new OscilloscopeDataResponse
|
||||||
|
{
|
||||||
|
AdFrequency = freqResult.Value,
|
||||||
|
AdVpp = vppResult.Value,
|
||||||
|
AdMax = maxResult.Value,
|
||||||
|
AdMin = minResult.Value,
|
||||||
|
WaveformData = Convert.ToBase64String(waveformResult.Value)
|
||||||
|
};
|
||||||
|
|
||||||
|
return Ok(response);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "获取示波器数据时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "操作失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 更新触发参数
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="level">触发电平(0-255)</param>
|
||||||
|
/// <param name="risingEdge">触发边沿(true为上升沿,false为下降沿)</param>
|
||||||
|
/// <returns>操作结果</returns>
|
||||||
|
[HttpPost("UpdateTrigger")]
|
||||||
|
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
public async Task<IActionResult> UpdateTrigger(byte level, bool risingEdge)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var oscilloscope = GetOscilloscope();
|
||||||
|
if (oscilloscope == null)
|
||||||
|
return BadRequest("用户未绑定有效的实验板");
|
||||||
|
|
||||||
|
// 设置触发电平
|
||||||
|
var levelResult = await oscilloscope.SetTriggerLevel(level);
|
||||||
|
if (!levelResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"设置触发电平失败: {levelResult.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "设置触发电平失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 设置触发边沿
|
||||||
|
var edgeResult = await oscilloscope.SetTriggerEdge(risingEdge);
|
||||||
|
if (!edgeResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"设置触发边沿失败: {edgeResult.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "设置触发边沿失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(true);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "更新触发参数时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "操作失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 更新采样参数
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="horizontalShift">水平偏移量(0-1023)</param>
|
||||||
|
/// <param name="decimationRate">抽样率(0-1023)</param>
|
||||||
|
/// <returns>操作结果</returns>
|
||||||
|
[HttpPost("UpdateSampling")]
|
||||||
|
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
public async Task<IActionResult> UpdateSampling(ushort horizontalShift, ushort decimationRate)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (horizontalShift > 1023)
|
||||||
|
return BadRequest("水平偏移量必须在0-1023之间");
|
||||||
|
|
||||||
|
if (decimationRate > 1023)
|
||||||
|
return BadRequest("抽样率必须在0-1023之间");
|
||||||
|
|
||||||
|
var oscilloscope = GetOscilloscope();
|
||||||
|
if (oscilloscope == null)
|
||||||
|
return BadRequest("用户未绑定有效的实验板");
|
||||||
|
|
||||||
|
// 设置水平偏移量
|
||||||
|
var shiftResult = await oscilloscope.SetHorizontalShift(horizontalShift);
|
||||||
|
if (!shiftResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"设置水平偏移量失败: {shiftResult.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "设置水平偏移量失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 设置抽样率
|
||||||
|
var rateResult = await oscilloscope.SetDecimationRate(decimationRate);
|
||||||
|
if (!rateResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"设置抽样率失败: {rateResult.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "设置抽样率失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(true);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "更新采样参数时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "操作失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 手动刷新RAM
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>操作结果</returns>
|
||||||
|
[HttpPost("RefreshRAM")]
|
||||||
|
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
public async Task<IActionResult> RefreshRAM()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var oscilloscope = GetOscilloscope();
|
||||||
|
if (oscilloscope == null)
|
||||||
|
return BadRequest("用户未绑定有效的实验板");
|
||||||
|
|
||||||
|
var result = await oscilloscope.RefreshRAM();
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"刷新RAM失败: {result.Error}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "刷新RAM失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(result.Value);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "刷新RAM时发生异常");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "操作失败,请稍后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
355
server/src/Controllers/ResourceController.cs
Normal file
355
server/src/Controllers/ResourceController.cs
Normal file
@@ -0,0 +1,355 @@
|
|||||||
|
using Microsoft.AspNetCore.Authorization;
|
||||||
|
using Microsoft.AspNetCore.Cors;
|
||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using DotNext;
|
||||||
|
using Database;
|
||||||
|
|
||||||
|
namespace server.Controllers;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 资源控制器 - 提供统一的资源管理API
|
||||||
|
/// </summary>
|
||||||
|
[ApiController]
|
||||||
|
[Route("api/[controller]")]
|
||||||
|
public class ResourceController : ControllerBase
|
||||||
|
{
|
||||||
|
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
private readonly UserManager _userManager = new();
|
||||||
|
private readonly ResourceManager _resourceManager = new();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 添加资源(文件上传)
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="request">添加资源请求</param>
|
||||||
|
/// <param name="file">资源文件</param>
|
||||||
|
/// <returns>添加结果</returns>
|
||||||
|
[Authorize]
|
||||||
|
[HttpPost]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(ResourceInfo), StatusCodes.Status201Created)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public async Task<IActionResult> AddResource([FromForm] AddResourceRequest request, IFormFile file)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(request.ResourceType) || file == null)
|
||||||
|
return BadRequest("资源类型、资源用途和文件不能为空");
|
||||||
|
|
||||||
|
// 模板资源需要管理员权限
|
||||||
|
if (request.ResourcePurpose == ResourcePurpose.Template && !User.IsInRole("Admin"))
|
||||||
|
return Forbid("只有管理员可以添加模板资源");
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// 获取当前用户ID
|
||||||
|
var userName = User.Identity?.Name;
|
||||||
|
if (string.IsNullOrEmpty(userName))
|
||||||
|
return Unauthorized("无法获取用户信息");
|
||||||
|
|
||||||
|
var userResult = _userManager.GetUserByName(userName);
|
||||||
|
if (!userResult.IsSuccessful || !userResult.Value.HasValue)
|
||||||
|
return Unauthorized("用户不存在");
|
||||||
|
|
||||||
|
var user = userResult.Value.Value;
|
||||||
|
|
||||||
|
// 读取文件数据
|
||||||
|
using var memoryStream = new MemoryStream();
|
||||||
|
await file.CopyToAsync(memoryStream);
|
||||||
|
var fileData = memoryStream.ToArray();
|
||||||
|
|
||||||
|
var result = _resourceManager.AddResource(
|
||||||
|
user.ID, request.ResourceType, request.ResourcePurpose,
|
||||||
|
file.FileName, fileData, request.ExamID);
|
||||||
|
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
if (result.Error.Message.Contains("不存在"))
|
||||||
|
return NotFound(result.Error.Message);
|
||||||
|
|
||||||
|
logger.Error($"添加资源时出错: {result.Error.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"添加资源失败: {result.Error.Message}");
|
||||||
|
}
|
||||||
|
|
||||||
|
var resourceInfo = new ResourceInfo(result.Value);
|
||||||
|
|
||||||
|
logger.Info($"成功添加资源: {request.ResourceType}/{request.ResourcePurpose}/{file.FileName} ID: {resourceInfo.ID}");
|
||||||
|
return CreatedAtAction(nameof(GetResourceById), new { resourceId = resourceInfo.ID }, resourceInfo);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error($"添加资源 {request.ResourceType}/{request.ResourcePurpose}/{file.FileName} 时出错: {ex.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"添加资源失败: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取资源列表
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="examId">实验ID(可选)</param>
|
||||||
|
/// <param name="resourceType">资源类型(可选)</param>
|
||||||
|
/// <param name="resourcePurpose">资源用途(可选)</param>
|
||||||
|
/// <returns>资源列表</returns>
|
||||||
|
[Authorize]
|
||||||
|
[HttpGet]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(ResourceInfo[]), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public IActionResult GetResourceList(
|
||||||
|
[FromQuery] string? examId = null,
|
||||||
|
[FromQuery] string? resourceType = null,
|
||||||
|
[FromQuery] ResourcePurpose? resourcePurpose = null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// 获取当前用户ID
|
||||||
|
var userName = User.Identity?.Name;
|
||||||
|
if (string.IsNullOrEmpty(userName))
|
||||||
|
return Unauthorized("无法获取用户信息");
|
||||||
|
|
||||||
|
var userResult = _userManager.GetUserByName(userName);
|
||||||
|
if (!userResult.IsSuccessful || !userResult.Value.HasValue)
|
||||||
|
return Unauthorized("用户不存在");
|
||||||
|
|
||||||
|
var user = userResult.Value.Value;
|
||||||
|
|
||||||
|
Result<List<Resource>> result;
|
||||||
|
// 管理员
|
||||||
|
if (user.Permission == UserPermission.Admin)
|
||||||
|
{
|
||||||
|
result = _resourceManager.GetFullResourceList(examId, resourceType, resourcePurpose);
|
||||||
|
}
|
||||||
|
// 用户
|
||||||
|
else if (resourcePurpose == ResourcePurpose.User)
|
||||||
|
{
|
||||||
|
result = _resourceManager.GetFullResourceList(examId, resourceType, resourcePurpose, user.ID);
|
||||||
|
}
|
||||||
|
// 模板
|
||||||
|
else if (resourcePurpose == ResourcePurpose.Template)
|
||||||
|
{
|
||||||
|
result = _resourceManager.GetFullResourceList(examId, resourceType, resourcePurpose);
|
||||||
|
}
|
||||||
|
// 其他
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// 这种情况下需要分别查询并合并结果
|
||||||
|
var userResourcesResult = _resourceManager.GetFullResourceList(
|
||||||
|
examId, resourceType, ResourcePurpose.User, user.ID);
|
||||||
|
var templateResourcesResult = _resourceManager.GetFullResourceList(
|
||||||
|
examId, resourceType, ResourcePurpose.Template, null);
|
||||||
|
|
||||||
|
if (!userResourcesResult.IsSuccessful || !templateResourcesResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"获取资源列表时出错");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, "获取资源列表失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
var allResources = userResourcesResult.Value.Concat(templateResourcesResult.Value)
|
||||||
|
.OrderByDescending(r => r.UploadTime);
|
||||||
|
var mergedResourceInfos = allResources.Select(r => new ResourceInfo(r)).ToArray();
|
||||||
|
|
||||||
|
logger.Info($"成功获取资源列表,共 {mergedResourceInfos.Length} 个资源");
|
||||||
|
return Ok(mergedResourceInfos);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"获取资源列表时出错: {result.Error.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"获取资源列表失败: {result.Error.Message}");
|
||||||
|
}
|
||||||
|
|
||||||
|
var resources = result.Value.Select(r => new ResourceInfo(r)).ToArray();
|
||||||
|
|
||||||
|
logger.Info($"成功获取资源列表,共 {resources.Length} 个资源");
|
||||||
|
return Ok(resources);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error($"获取资源列表时出错: {ex.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"获取资源列表失败: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 根据资源ID下载资源
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="resourceId">资源ID</param>
|
||||||
|
/// <returns>资源文件</returns>
|
||||||
|
[HttpGet("{resourceId}")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(FileResult), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public IActionResult GetResourceById(Guid resourceId)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var result = _resourceManager.GetResourceById(resourceId);
|
||||||
|
|
||||||
|
if (!result.HasValue)
|
||||||
|
{
|
||||||
|
logger.Warn($"资源不存在: {resourceId}");
|
||||||
|
return NotFound($"资源 {resourceId} 不存在");
|
||||||
|
}
|
||||||
|
|
||||||
|
var resource = result.Value;
|
||||||
|
logger.Info($"成功获取资源: {resourceId} ({resource.ResourceName})");
|
||||||
|
|
||||||
|
var dataRet = _resourceManager.ReadBytesFromPath(resource.Path);
|
||||||
|
if (!dataRet.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"读取资源数据时出错: {dataRet.Error.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"读取资源数据失败: {dataRet.Error.Message}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return File(dataRet.Value, resource.MimeType ?? "application/octet-stream", resource.ResourceName);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error($"获取资源 {resourceId} 时出错: {ex.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"获取资源失败: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 删除资源
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="resourceId">资源ID</param>
|
||||||
|
/// <returns>删除结果</returns>
|
||||||
|
[Authorize]
|
||||||
|
[HttpDelete("{resourceId}")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(StatusCodes.Status204NoContent)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status403Forbidden)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status404NotFound)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
|
||||||
|
public IActionResult DeleteResource(Guid resourceId)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// 获取当前用户信息
|
||||||
|
var userName = User.Identity?.Name;
|
||||||
|
if (string.IsNullOrEmpty(userName))
|
||||||
|
return Unauthorized("无法获取用户信息");
|
||||||
|
|
||||||
|
var userResult = _userManager.GetUserByName(userName);
|
||||||
|
if (!userResult.IsSuccessful || !userResult.Value.HasValue)
|
||||||
|
return Unauthorized("用户不存在");
|
||||||
|
|
||||||
|
var user = userResult.Value.Value;
|
||||||
|
|
||||||
|
// 先获取资源信息以验证权限
|
||||||
|
var resourceResult = _resourceManager.GetResourceById(resourceId);
|
||||||
|
|
||||||
|
if (!resourceResult.HasValue)
|
||||||
|
{
|
||||||
|
logger.Warn($"资源不存在: {resourceId}");
|
||||||
|
return NotFound($"资源 {resourceId} 不存在");
|
||||||
|
}
|
||||||
|
|
||||||
|
var resource = resourceResult.Value;
|
||||||
|
|
||||||
|
// 权限检查:管理员可以删除所有资源,普通用户只能删除自己的用户资源
|
||||||
|
if (!User.IsInRole("Admin"))
|
||||||
|
{
|
||||||
|
if (resource.Purpose == ResourcePurpose.Template)
|
||||||
|
return Forbid("普通用户不能删除模板资源");
|
||||||
|
|
||||||
|
if (resource.UserID != user.ID)
|
||||||
|
return Forbid("只能删除自己的资源");
|
||||||
|
}
|
||||||
|
|
||||||
|
var deleteResult = _resourceManager.DeleteResource(resourceId);
|
||||||
|
if (!deleteResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"删除资源时出错: {deleteResult.Error.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"删除资源失败: {deleteResult.Error.Message}");
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.Info($"成功删除资源: {resourceId} ({resource.ResourceName})");
|
||||||
|
return NoContent();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error($"删除资源 {resourceId} 时出错: {ex.Message}");
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, $"删除资源失败: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 资源信息类
|
||||||
|
/// </summary>
|
||||||
|
public class ResourceInfo
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 资源ID
|
||||||
|
/// </summary>
|
||||||
|
public Guid ID { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 资源名称
|
||||||
|
/// </summary>
|
||||||
|
public string Name { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 资源类型
|
||||||
|
/// </summary>
|
||||||
|
public string Type { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 资源用途(template/user)
|
||||||
|
/// </summary>
|
||||||
|
public ResourcePurpose Purpose { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 上传时间
|
||||||
|
/// </summary>
|
||||||
|
public DateTime UploadTime { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 所属实验ID(可选)
|
||||||
|
/// </summary>
|
||||||
|
public string? ExamID { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// MIME类型
|
||||||
|
/// </summary>
|
||||||
|
public string? MimeType { get; set; }
|
||||||
|
|
||||||
|
public ResourceInfo(Resource resource)
|
||||||
|
{
|
||||||
|
ID = resource.ID;
|
||||||
|
Name = resource.ResourceName;
|
||||||
|
Type = resource.ResourceType;
|
||||||
|
Purpose = resource.Purpose;
|
||||||
|
UploadTime = resource.UploadTime;
|
||||||
|
ExamID = resource.ExamID;
|
||||||
|
MimeType = resource.MimeType;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 添加资源请求类
|
||||||
|
/// </summary>
|
||||||
|
public class AddResourceRequest
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 资源类型
|
||||||
|
/// </summary>
|
||||||
|
public required string ResourceType { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 资源用途(template/user)
|
||||||
|
/// </summary>
|
||||||
|
public required ResourcePurpose ResourcePurpose { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 所属实验ID(可选)
|
||||||
|
/// </summary>
|
||||||
|
public string? ExamID { get; set; }
|
||||||
|
}
|
||||||
127
server/src/Controllers/SwitchController.cs
Normal file
127
server/src/Controllers/SwitchController.cs
Normal file
@@ -0,0 +1,127 @@
|
|||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using Microsoft.AspNetCore.Cors;
|
||||||
|
using Peripherals.SwitchClient;
|
||||||
|
|
||||||
|
namespace server.Controllers;
|
||||||
|
|
||||||
|
[ApiController]
|
||||||
|
[Route("api/[controller]")]
|
||||||
|
public class SwitchController : ControllerBase
|
||||||
|
{
|
||||||
|
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
private readonly Database.UserManager _userManager = new();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取示波器实例
|
||||||
|
/// </summary>
|
||||||
|
private SwitchCtrl? GetSwitchCtrl()
|
||||||
|
{
|
||||||
|
var userName = User.Identity?.Name;
|
||||||
|
if (string.IsNullOrEmpty(userName))
|
||||||
|
return null;
|
||||||
|
|
||||||
|
var userRet = _userManager.GetUserByName(userName);
|
||||||
|
if (!userRet.IsSuccessful || !userRet.Value.HasValue)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
var user = userRet.Value.Value;
|
||||||
|
if (user.BoardID == Guid.Empty)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
var boardRet = _userManager.GetBoardByID(user.BoardID);
|
||||||
|
if (!boardRet.IsSuccessful || !boardRet.Value.HasValue)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
var board = boardRet.Value.Value;
|
||||||
|
return new SwitchCtrl(board.IpAddr, board.Port, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 启用或禁用 Switch 外设
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="enable">是否启用</param>
|
||||||
|
/// <returns>操作结果</returns>
|
||||||
|
[HttpPost("enable")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
public async Task<IActionResult> SetEnable([FromQuery] bool enable)
|
||||||
|
{
|
||||||
|
var switchCtrl = GetSwitchCtrl();
|
||||||
|
if (switchCtrl == null)
|
||||||
|
return BadRequest("Can't get user or board info");
|
||||||
|
|
||||||
|
var result = await switchCtrl.SetEnable(enable);
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error(result.Error, "SetEnable failed");
|
||||||
|
return StatusCode(500, result.Error);
|
||||||
|
}
|
||||||
|
return Ok(result.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 控制指定编号的 Switch 开关
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="num">开关编号</param>
|
||||||
|
/// <param name="onOff">开/关</param>
|
||||||
|
/// <returns>操作结果</returns>
|
||||||
|
[HttpPost("switch")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(typeof(ArgumentException), StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
public async Task<IActionResult> SetSwitchOnOff([FromQuery] int num, [FromQuery] bool onOff)
|
||||||
|
{
|
||||||
|
if (num <= 0 || num > 6)
|
||||||
|
return BadRequest(new ArgumentException($"Switch num should be 1~5, instead of {num}"));
|
||||||
|
|
||||||
|
var switchCtrl = GetSwitchCtrl();
|
||||||
|
if (switchCtrl == null)
|
||||||
|
return BadRequest("Can't get user or board info");
|
||||||
|
|
||||||
|
var result = await switchCtrl.SetSwitchOnOff(num, onOff);
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error(result.Error, $"SetSwitchOnOff({num}, {onOff}) failed");
|
||||||
|
return StatusCode(500, result.Error);
|
||||||
|
}
|
||||||
|
return Ok(result.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 控制 Switch 开关
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="keyStatus">开关状态</param>
|
||||||
|
/// <returns>操作结果</returns>
|
||||||
|
[HttpPost("MultiSwitch")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(typeof(ArgumentException), StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
|
||||||
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
|
public async Task<IActionResult> SetMultiSwitchsOnOff(bool[] keyStatus)
|
||||||
|
{
|
||||||
|
if (keyStatus.Length == 0 || keyStatus.Length > 6) return BadRequest(
|
||||||
|
new ArgumentException($"Switch num should be 1~5, instead of {keyStatus.Length}"));
|
||||||
|
|
||||||
|
var switchCtrl = GetSwitchCtrl();
|
||||||
|
if (switchCtrl == null)
|
||||||
|
return BadRequest("Can't get user or board info");
|
||||||
|
|
||||||
|
for (int i = 0; i < keyStatus.Length; i++)
|
||||||
|
{
|
||||||
|
var result = await switchCtrl.SetSwitchOnOff(i + 1, keyStatus[i]);
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error(result.Error, $"SetSwitchOnOff({i}, {keyStatus[i]}) failed");
|
||||||
|
return StatusCode(500, result.Error);
|
||||||
|
}
|
||||||
|
if (!result.Value) return Ok(false);
|
||||||
|
}
|
||||||
|
return Ok(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,82 +1,81 @@
|
|||||||
using System.ComponentModel.DataAnnotations;
|
using System.ComponentModel.DataAnnotations;
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Microsoft.AspNetCore.Cors;
|
using Microsoft.AspNetCore.Cors;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using Microsoft.AspNetCore.Authorization;
|
||||||
|
using System.Security.Claims;
|
||||||
|
using DotNext;
|
||||||
|
using server.Services;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 视频流控制器,支持动态配置摄像头连接
|
/// 视频流控制器,支持动态配置摄像头连接
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[ApiController]
|
[ApiController]
|
||||||
|
[Authorize]
|
||||||
|
[EnableCors("Users")]
|
||||||
[Route("api/[controller]")]
|
[Route("api/[controller]")]
|
||||||
public class VideoStreamController : ControllerBase
|
public class VideoStreamController : ControllerBase
|
||||||
{
|
{
|
||||||
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
private readonly server.Services.HttpVideoStreamService _videoStreamService;
|
|
||||||
|
|
||||||
/// <summary>
|
private readonly HttpVideoStreamService _videoStreamService;
|
||||||
/// 摄像头配置请求模型
|
private readonly Database.UserManager _userManager = new();
|
||||||
/// </summary>
|
|
||||||
public class CameraConfigRequest
|
public class AvailableResolutionsResponse
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// 摄像头地址
|
|
||||||
/// </summary>
|
|
||||||
[Required]
|
|
||||||
[RegularExpression(@"^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", ErrorMessage = "请输入有效的IP地址")]
|
|
||||||
public string Address { get; set; } = "";
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 摄像头端口
|
|
||||||
/// </summary>
|
|
||||||
[Required]
|
|
||||||
[Range(1, 65535, ErrorMessage = "端口必须在1-65535范围内")]
|
|
||||||
public int Port { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 分辨率配置请求模型
|
|
||||||
/// </summary>
|
|
||||||
public class ResolutionConfigRequest
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 宽度
|
|
||||||
/// </summary>
|
|
||||||
[Required]
|
|
||||||
[Range(640, 1920, ErrorMessage = "宽度必须在640-1920范围内")]
|
|
||||||
public int Width { get; set; }
|
public int Width { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 高度
|
|
||||||
/// </summary>
|
|
||||||
[Required]
|
|
||||||
[Range(480, 1080, ErrorMessage = "高度必须在480-1080范围内")]
|
|
||||||
public int Height { get; set; }
|
public int Height { get; set; }
|
||||||
|
public string Name { get; set; } = string.Empty;
|
||||||
|
public string Value => $"{Width}x{Height}";
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 初始化HTTP视频流控制器
|
/// 初始化HTTP视频流控制器
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="videoStreamService">HTTP视频流服务</param>
|
/// <param name="videoStreamService">HTTP视频流服务</param>
|
||||||
public VideoStreamController(server.Services.HttpVideoStreamService videoStreamService)
|
public VideoStreamController(HttpVideoStreamService videoStreamService)
|
||||||
{
|
{
|
||||||
logger.Info("创建VideoStreamController,命名空间:{Namespace}", this.GetType().Namespace);
|
logger.Info("创建VideoStreamController,命名空间:{Namespace}", this.GetType().Namespace);
|
||||||
_videoStreamService = videoStreamService;
|
_videoStreamService = videoStreamService;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private Optional<string> TryGetBoardId()
|
||||||
|
{
|
||||||
|
var userName = User.FindFirstValue(ClaimTypes.Name);
|
||||||
|
if (string.IsNullOrEmpty(userName))
|
||||||
|
{
|
||||||
|
logger.Error("User name not found in claims.");
|
||||||
|
return Optional<string>.None;
|
||||||
|
}
|
||||||
|
|
||||||
|
var userRet = _userManager.GetUserByName(userName);
|
||||||
|
if (!userRet.IsSuccessful || !userRet.Value.HasValue)
|
||||||
|
{
|
||||||
|
logger.Error("User not found.");
|
||||||
|
return Optional<string>.None;
|
||||||
|
}
|
||||||
|
|
||||||
|
var user = userRet.Value.Value;
|
||||||
|
var boardId = user.BoardID;
|
||||||
|
if (boardId == Guid.Empty)
|
||||||
|
{
|
||||||
|
logger.Error("No board bound to this user.");
|
||||||
|
return Optional<string>.None;
|
||||||
|
}
|
||||||
|
|
||||||
|
return boardId.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取 HTTP 视频流服务状态
|
/// 获取 HTTP 视频流服务状态
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>服务状态信息</returns>
|
/// <returns>服务状态信息</returns>
|
||||||
[HttpGet("Status")]
|
[HttpGet("ServiceStatus")]
|
||||||
[EnableCors("Users")]
|
[ProducesResponseType(typeof(VideoStreamServiceStatus), StatusCodes.Status200OK)]
|
||||||
[ProducesResponseType(typeof(object), StatusCodes.Status200OK)]
|
|
||||||
[ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
|
[ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
|
||||||
public IResult GetStatus()
|
public IResult GetServiceStatus()
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
logger.Info("GetStatus方法被调用,控制器:{Controller},路径:api/VideoStream/Status", this.GetType().Name);
|
|
||||||
|
|
||||||
// 使用HttpVideoStreamService提供的状态信息
|
// 使用HttpVideoStreamService提供的状态信息
|
||||||
var status = _videoStreamService.GetServiceStatus();
|
var status = _videoStreamService.GetServiceStatus();
|
||||||
|
|
||||||
@@ -90,99 +89,17 @@ public class VideoStreamController : ControllerBase
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
[HttpGet("MyEndpoint")]
|
||||||
/// 获取 HTTP 视频流信息
|
[ProducesResponseType(typeof(VideoStreamEndpoint), StatusCodes.Status200OK)]
|
||||||
/// </summary>
|
|
||||||
/// <returns>流信息</returns>
|
|
||||||
[HttpGet("StreamInfo")]
|
|
||||||
[EnableCors("Users")]
|
|
||||||
[ProducesResponseType(typeof(object), StatusCodes.Status200OK)]
|
|
||||||
[ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
|
[ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
|
||||||
public IResult GetStreamInfo()
|
public IResult MyEndpoint()
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
logger.Info("获取 HTTP 视频流信息");
|
var boardId = TryGetBoardId().OrThrow(() => new Exception("Board ID not found"));
|
||||||
return TypedResults.Ok(new
|
var endpoint = _videoStreamService.GetVideoEndpoint(boardId);
|
||||||
{
|
|
||||||
frameRate = _videoStreamService.FrameRate,
|
|
||||||
frameWidth = _videoStreamService.FrameWidth,
|
|
||||||
frameHeight = _videoStreamService.FrameHeight,
|
|
||||||
format = "MJPEG",
|
|
||||||
htmlUrl = $"http://localhost:{_videoStreamService.ServerPort}/video-feed.html",
|
|
||||||
mjpegUrl = $"http://localhost:{_videoStreamService.ServerPort}/video-stream",
|
|
||||||
snapshotUrl = $"http://localhost:{_videoStreamService.ServerPort}/snapshot",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
logger.Error(ex, "获取 HTTP 视频流信息失败");
|
|
||||||
return TypedResults.InternalServerError(ex.Message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
return TypedResults.Ok(endpoint);
|
||||||
/// 配置摄像头连接参数
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="config">摄像头配置</param>
|
|
||||||
/// <returns>配置结果</returns>
|
|
||||||
[HttpPost("ConfigureCamera")]
|
|
||||||
[EnableCors("Users")]
|
|
||||||
[ProducesResponseType(typeof(object), StatusCodes.Status200OK)]
|
|
||||||
[ProducesResponseType(typeof(object), StatusCodes.Status400BadRequest)]
|
|
||||||
[ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
|
|
||||||
public async Task<IResult> ConfigureCamera([FromBody] CameraConfigRequest config)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
logger.Info("配置摄像头连接: {Address}:{Port}", config.Address, config.Port);
|
|
||||||
|
|
||||||
var success = await _videoStreamService.ConfigureCameraAsync(config.Address, config.Port);
|
|
||||||
|
|
||||||
if (success)
|
|
||||||
{
|
|
||||||
return TypedResults.Ok(new
|
|
||||||
{
|
|
||||||
success = true,
|
|
||||||
message = "摄像头配置成功",
|
|
||||||
cameraAddress = config.Address,
|
|
||||||
cameraPort = config.Port
|
|
||||||
});
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return TypedResults.BadRequest(new
|
|
||||||
{
|
|
||||||
success = false,
|
|
||||||
message = "摄像头配置失败",
|
|
||||||
cameraAddress = config.Address,
|
|
||||||
cameraPort = config.Port
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
logger.Error(ex, "配置摄像头连接失败");
|
|
||||||
return TypedResults.InternalServerError(ex.Message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 获取当前摄像头配置
|
|
||||||
/// </summary>
|
|
||||||
/// <returns>摄像头配置信息</returns>
|
|
||||||
[HttpGet("CameraConfig")]
|
|
||||||
[EnableCors("Users")]
|
|
||||||
[ProducesResponseType(typeof(object), StatusCodes.Status200OK)]
|
|
||||||
[ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
|
|
||||||
public IResult GetCameraConfig()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
logger.Info("获取摄像头配置");
|
|
||||||
var cameraStatus = _videoStreamService.GetCameraStatus();
|
|
||||||
|
|
||||||
return TypedResults.Ok(cameraStatus);
|
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -191,60 +108,34 @@ public class VideoStreamController : ControllerBase
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 控制 HTTP 视频流服务开关
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="enabled">是否启用服务</param>
|
|
||||||
/// <returns>操作结果</returns>
|
|
||||||
[HttpPost("SetEnabled")]
|
|
||||||
[EnableCors("Users")]
|
|
||||||
[ProducesResponseType(typeof(object), StatusCodes.Status200OK)]
|
|
||||||
[ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
|
|
||||||
public async Task<IResult> SetEnabled([FromQuery] bool enabled)
|
|
||||||
{
|
|
||||||
logger.Info("设置视频流服务开关: {Enabled}", enabled);
|
|
||||||
await _videoStreamService.SetEnable(enabled);
|
|
||||||
return TypedResults.Ok();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 测试 HTTP 视频流连接
|
/// 测试 HTTP 视频流连接
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>连接测试结果</returns>
|
/// <returns>连接测试结果</returns>
|
||||||
[HttpPost("TestConnection")]
|
[HttpPost("TestConnection")]
|
||||||
[EnableCors("Users")]
|
|
||||||
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||||
[ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
|
[ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
|
||||||
public async Task<IResult> TestConnection()
|
public async Task<IResult> TestConnection()
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
logger.Info("测试 HTTP 视频流连接");
|
var boardId = TryGetBoardId().OrThrow(() => new Exception("Board ID not found"));
|
||||||
|
var endpoint = _videoStreamService.GetVideoEndpoint(boardId);
|
||||||
|
|
||||||
// 尝试通过HTTP请求检查视频流服务是否可访问
|
// 尝试通过HTTP请求检查视频流服务是否可访问
|
||||||
bool isConnected = false;
|
bool isConnected = false;
|
||||||
using (var httpClient = new HttpClient())
|
using (var httpClient = new HttpClient())
|
||||||
{
|
{
|
||||||
httpClient.Timeout = TimeSpan.FromSeconds(2); // 设置较短的超时时间
|
httpClient.Timeout = TimeSpan.FromSeconds(2); // 设置较短的超时时间
|
||||||
var response = await httpClient.GetAsync($"http://localhost:{_videoStreamService.ServerPort}/");
|
var response = await httpClient.GetAsync(endpoint.MjpegUrl);
|
||||||
|
|
||||||
// 只要能连接上就认为成功,不管返回状态
|
// 只要能连接上就认为成功,不管返回状态
|
||||||
isConnected = response.IsSuccessStatusCode;
|
isConnected = response.IsSuccessStatusCode;
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.Info("测试摄像头连接");
|
var ret = await _videoStreamService.TestCameraConnection(boardId);
|
||||||
|
|
||||||
var (isSuccess, message) = await _videoStreamService.TestCameraConnectionAsync();
|
return TypedResults.Ok(ret);
|
||||||
|
|
||||||
return TypedResults.Ok(new
|
|
||||||
{
|
|
||||||
isConnected = isConnected,
|
|
||||||
success = isSuccess,
|
|
||||||
message = message,
|
|
||||||
cameraAddress = _videoStreamService.CameraAddress,
|
|
||||||
cameraPort = _videoStreamService.CameraPort,
|
|
||||||
timestamp = DateTime.Now
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -254,6 +145,25 @@ public class VideoStreamController : ControllerBase
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[HttpPost("SetVideoStreamEnable")]
|
||||||
|
[ProducesResponseType(typeof(string), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
|
||||||
|
public async Task<IActionResult> SetVideoStreamEnable(bool enable)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var boardId = TryGetBoardId().OrThrow(() => new ArgumentException("Board ID is required"));
|
||||||
|
|
||||||
|
await _videoStreamService.SetVideoStreamEnableAsync(boardId.ToString(), enable);
|
||||||
|
return Ok($"HDMI transmission for board {boardId} {enable.ToString()}.");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, $"Failed to disable HDMI transmission for board");
|
||||||
|
return StatusCode(500, $"Error disabling HDMI transmission: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 设置视频流分辨率
|
/// 设置视频流分辨率
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -268,16 +178,16 @@ public class VideoStreamController : ControllerBase
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
logger.Info($"设置视频流分辨率为 {request.Width}x{request.Height}");
|
var boardId = TryGetBoardId().OrThrow(() => new Exception("Board ID not found"));
|
||||||
|
|
||||||
var (isSuccess, message) = await _videoStreamService.SetResolutionAsync(request.Width, request.Height);
|
var ret = await _videoStreamService.SetResolutionAsync(boardId, request.Width, request.Height);
|
||||||
|
|
||||||
if (isSuccess)
|
if (ret.IsSuccessful && ret.Value)
|
||||||
{
|
{
|
||||||
return TypedResults.Ok(new
|
return TypedResults.Ok(new
|
||||||
{
|
{
|
||||||
success = true,
|
success = true,
|
||||||
message = message,
|
message = $"成功设置分辨率为 {request.Width}x{request.Height}",
|
||||||
width = request.Width,
|
width = request.Width,
|
||||||
height = request.Height,
|
height = request.Height,
|
||||||
timestamp = DateTime.Now
|
timestamp = DateTime.Now
|
||||||
@@ -288,7 +198,7 @@ public class VideoStreamController : ControllerBase
|
|||||||
return TypedResults.BadRequest(new
|
return TypedResults.BadRequest(new
|
||||||
{
|
{
|
||||||
success = false,
|
success = false,
|
||||||
message = message,
|
message = ret.Error?.ToString() ?? "未知错误",
|
||||||
timestamp = DateTime.Now
|
timestamp = DateTime.Now
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -300,84 +210,47 @@ public class VideoStreamController : ControllerBase
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 获取当前分辨率
|
|
||||||
/// </summary>
|
|
||||||
/// <returns>当前分辨率信息</returns>
|
|
||||||
[HttpGet("Resolution")]
|
|
||||||
[EnableCors("Users")]
|
|
||||||
[ProducesResponseType(typeof(object), StatusCodes.Status200OK)]
|
|
||||||
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
|
|
||||||
public IResult GetCurrentResolution()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
logger.Info("获取当前视频流分辨率");
|
|
||||||
|
|
||||||
var (width, height) = _videoStreamService.GetCurrentResolution();
|
|
||||||
|
|
||||||
return TypedResults.Ok(new
|
|
||||||
{
|
|
||||||
width = width,
|
|
||||||
height = height,
|
|
||||||
resolution = $"{width}x{height}",
|
|
||||||
timestamp = DateTime.Now
|
|
||||||
});
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
logger.Error(ex, "获取当前分辨率失败");
|
|
||||||
return TypedResults.InternalServerError($"获取当前分辨率失败: {ex.Message}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取支持的分辨率列表
|
/// 获取支持的分辨率列表
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>支持的分辨率列表</returns>
|
/// <returns>支持的分辨率列表</returns>
|
||||||
[HttpGet("SupportedResolutions")]
|
[HttpGet("SupportedResolutions")]
|
||||||
[EnableCors("Users")]
|
[EnableCors("Users")]
|
||||||
[ProducesResponseType(typeof(object), StatusCodes.Status200OK)]
|
[ProducesResponseType(typeof(AvailableResolutionsResponse[]), StatusCodes.Status200OK)]
|
||||||
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
|
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
|
||||||
public IResult GetSupportedResolutions()
|
public IResult GetSupportedResolutions()
|
||||||
{
|
{
|
||||||
try
|
// (640, 480, "640x480 (VGA)"),
|
||||||
|
// (960, 540, "960x540 (qHD)"),
|
||||||
|
// (1280, 720, "1280x720 (HD)"),
|
||||||
|
// (1280, 960, "1280x960 (SXGA)"),
|
||||||
|
// (1920, 1080, "1920x1080 (Full HD)")
|
||||||
|
return TypedResults.Ok(new AvailableResolutionsResponse[]
|
||||||
{
|
{
|
||||||
logger.Info("获取支持的分辨率列表");
|
new AvailableResolutionsResponse { Width = 640, Height = 480, Name = "640x480(VGA)" },
|
||||||
|
new AvailableResolutionsResponse { Width = 960, Height = 480, Name = "960x480(qHD)" },
|
||||||
var resolutions = _videoStreamService.GetSupportedResolutions();
|
new AvailableResolutionsResponse { Width = 1280, Height = 720, Name = "1280x720(HD)" },
|
||||||
|
new AvailableResolutionsResponse { Width = 1280, Height = 960, Name = "1280x960(SXGA)" },
|
||||||
return TypedResults.Ok(new
|
new AvailableResolutionsResponse { Width = 1920, Height = 1080, Name = "1920x1080(Full HD)" }
|
||||||
{
|
|
||||||
resolutions = resolutions.Select(r => new
|
|
||||||
{
|
|
||||||
width = r.Width,
|
|
||||||
height = r.Height,
|
|
||||||
name = r.Name,
|
|
||||||
value = $"{r.Width}x{r.Height}"
|
|
||||||
}),
|
|
||||||
timestamp = DateTime.Now
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
logger.Error(ex, "获取支持的分辨率列表失败");
|
|
||||||
return TypedResults.InternalServerError($"获取支持的分辨率列表失败: {ex.Message}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 初始化摄像头自动对焦功能
|
/// 初始化摄像头自动对焦功能
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>初始化结果</returns>
|
/// <returns>初始化结果</returns>
|
||||||
[HttpPost("InitAutoFocus")]
|
[HttpPost("InitAutoFocus")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(object), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(typeof(object), StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
|
||||||
public async Task<IResult> InitAutoFocus()
|
public async Task<IResult> InitAutoFocus()
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
logger.Info("收到初始化自动对焦请求");
|
var boardId = TryGetBoardId().OrThrow(() => new Exception("Board ID not found"));
|
||||||
|
|
||||||
var result = await _videoStreamService.InitAutoFocusAsync();
|
var result = await _videoStreamService.InitAutoFocusAsync(boardId);
|
||||||
|
|
||||||
if (result)
|
if (result)
|
||||||
{
|
{
|
||||||
@@ -412,13 +285,17 @@ public class VideoStreamController : ControllerBase
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>对焦结果</returns>
|
/// <returns>对焦结果</returns>
|
||||||
[HttpPost("AutoFocus")]
|
[HttpPost("AutoFocus")]
|
||||||
|
[EnableCors("Users")]
|
||||||
|
[ProducesResponseType(typeof(object), StatusCodes.Status200OK)]
|
||||||
|
[ProducesResponseType(typeof(object), StatusCodes.Status400BadRequest)]
|
||||||
|
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
|
||||||
public async Task<IResult> AutoFocus()
|
public async Task<IResult> AutoFocus()
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
logger.Info("收到执行自动对焦请求");
|
var boardId = TryGetBoardId().OrThrow(() => new Exception("Board ID not found"));
|
||||||
|
|
||||||
var result = await _videoStreamService.PerformAutoFocusAsync();
|
var result = await _videoStreamService.PerformAutoFocusAsync(boardId);
|
||||||
|
|
||||||
if (result)
|
if (result)
|
||||||
{
|
{
|
||||||
@@ -449,59 +326,55 @@ public class VideoStreamController : ControllerBase
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 执行一次自动对焦 (GET方式)
|
/// 配置摄像头连接参数
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>对焦结果</returns>
|
/// <returns>配置结果</returns>
|
||||||
[HttpGet("Focus")]
|
[HttpPost("ConfigureCamera")]
|
||||||
[EnableCors("Users")]
|
[EnableCors("Users")]
|
||||||
[ProducesResponseType(typeof(object), StatusCodes.Status200OK)]
|
[ProducesResponseType(typeof(object), StatusCodes.Status200OK)]
|
||||||
[ProducesResponseType(typeof(object), StatusCodes.Status400BadRequest)]
|
[ProducesResponseType(typeof(object), StatusCodes.Status400BadRequest)]
|
||||||
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
|
[ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
|
||||||
public async Task<IResult> Focus()
|
public async Task<IResult> ConfigureCamera()
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
logger.Info("收到执行一次对焦请求 (GET)");
|
var boardId = TryGetBoardId().OrThrow(() => new Exception("Board ID not found"));
|
||||||
|
|
||||||
// 检查摄像头是否已配置
|
var ret = await _videoStreamService.ConfigureCameraAsync(boardId);
|
||||||
if (!_videoStreamService.IsCameraConfigured())
|
|
||||||
{
|
|
||||||
logger.Warn("摄像头未配置,无法执行对焦");
|
|
||||||
return TypedResults.BadRequest(new
|
|
||||||
{
|
|
||||||
success = false,
|
|
||||||
message = "摄像头未配置,请先配置摄像头连接",
|
|
||||||
timestamp = DateTime.Now
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
var result = await _videoStreamService.PerformAutoFocusAsync();
|
if (ret)
|
||||||
|
|
||||||
if (result)
|
|
||||||
{
|
{
|
||||||
logger.Info("对焦执行成功");
|
return TypedResults.Ok(new { Message = "配置成功" });
|
||||||
return TypedResults.Ok(new
|
|
||||||
{
|
|
||||||
success = true,
|
|
||||||
message = "对焦执行成功",
|
|
||||||
timestamp = DateTime.Now
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
logger.Warn("对焦执行失败");
|
return TypedResults.BadRequest(new { Message = "配置失败" });
|
||||||
return TypedResults.BadRequest(new
|
|
||||||
{
|
|
||||||
success = false,
|
|
||||||
message = "对焦执行失败",
|
|
||||||
timestamp = DateTime.Now
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
logger.Error(ex, "执行对焦时发生异常");
|
logger.Error(ex, "配置摄像头连接失败");
|
||||||
return TypedResults.InternalServerError($"执行对焦失败: {ex.Message}");
|
return TypedResults.InternalServerError(ex.Message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 分辨率配置请求模型
|
||||||
|
/// </summary>
|
||||||
|
public class ResolutionConfigRequest
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 宽度
|
||||||
|
/// </summary>
|
||||||
|
[Required]
|
||||||
|
[Range(640, 1920, ErrorMessage = "宽度必须在640-1920范围内")]
|
||||||
|
public int Width { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 高度
|
||||||
|
/// </summary>
|
||||||
|
[Required]
|
||||||
|
[Range(480, 1080, ErrorMessage = "高度必须在480-1080范围内")]
|
||||||
|
public int Height { get; set; }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
98
server/src/Database/Connection.cs
Normal file
98
server/src/Database/Connection.cs
Normal file
@@ -0,0 +1,98 @@
|
|||||||
|
using DotNext;
|
||||||
|
using LinqToDB;
|
||||||
|
using LinqToDB.Data;
|
||||||
|
|
||||||
|
namespace Database;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 应用程序数据连接类,用于与数据库交互
|
||||||
|
/// </summary>
|
||||||
|
public class AppDataConnection : DataConnection
|
||||||
|
{
|
||||||
|
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
static readonly string DATABASE_FILEPATH = $"{Global.DataPath}/Database.sqlite";
|
||||||
|
|
||||||
|
static readonly LinqToDB.DataOptions options =
|
||||||
|
new LinqToDB.DataOptions().UseSQLite($"Data Source={DATABASE_FILEPATH}");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 用户表
|
||||||
|
/// </summary>
|
||||||
|
public ITable<User> UserTable => this.GetTable<User>();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// FPGA 板子表
|
||||||
|
/// </summary>
|
||||||
|
public ITable<Board> BoardTable => this.GetTable<Board>();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 实验表
|
||||||
|
/// </summary>
|
||||||
|
public ITable<Exam> ExamTable => this.GetTable<Exam>();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 资源表(统一管理实验资源、用户比特流等)
|
||||||
|
/// </summary>
|
||||||
|
public ITable<Resource> ResourceTable => this.GetTable<Resource>();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 初始化应用程序数据连接
|
||||||
|
/// </summary>
|
||||||
|
public AppDataConnection() : base(options)
|
||||||
|
{
|
||||||
|
var filePath = Path.GetDirectoryName(DATABASE_FILEPATH);
|
||||||
|
if (!string.IsNullOrEmpty(filePath) && !Directory.Exists(filePath))
|
||||||
|
{
|
||||||
|
Directory.CreateDirectory(filePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!Path.Exists(DATABASE_FILEPATH))
|
||||||
|
{
|
||||||
|
logger.Info($"数据库文件不存在,正在创建新数据库: {DATABASE_FILEPATH}");
|
||||||
|
LinqToDB.DataProvider.SQLite.SQLiteTools.CreateDatabase(DATABASE_FILEPATH);
|
||||||
|
this.CreateAllTables();
|
||||||
|
var user = new User()
|
||||||
|
{
|
||||||
|
Name = "Admin",
|
||||||
|
EMail = "selfconfusion@gmail.com",
|
||||||
|
Password = "12345678",
|
||||||
|
Permission = Database.UserPermission.Admin,
|
||||||
|
};
|
||||||
|
this.Insert(user);
|
||||||
|
logger.Info("默认管理员用户已创建");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logger.Info($"数据库连接已建立: {DATABASE_FILEPATH}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 创建所有数据库表
|
||||||
|
/// </summary>
|
||||||
|
public void CreateAllTables()
|
||||||
|
{
|
||||||
|
logger.Info("正在创建数据库表...");
|
||||||
|
this.CreateTable<User>();
|
||||||
|
this.CreateTable<Board>();
|
||||||
|
this.CreateTable<Exam>();
|
||||||
|
this.CreateTable<Resource>();
|
||||||
|
logger.Info("数据库表创建完成");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 删除所有数据库表
|
||||||
|
/// </summary>
|
||||||
|
public void DropAllTables()
|
||||||
|
{
|
||||||
|
logger.Warn("正在删除所有数据库表...");
|
||||||
|
this.DropTable<User>();
|
||||||
|
this.DropTable<Board>();
|
||||||
|
this.DropTable<Exam>();
|
||||||
|
this.DropTable<Resource>();
|
||||||
|
logger.Warn("所有数据库表已删除");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
149
server/src/Database/ExamManager.cs
Normal file
149
server/src/Database/ExamManager.cs
Normal file
@@ -0,0 +1,149 @@
|
|||||||
|
using DotNext;
|
||||||
|
using LinqToDB;
|
||||||
|
using LinqToDB.Data;
|
||||||
|
|
||||||
|
namespace Database;
|
||||||
|
|
||||||
|
public class ExamManager
|
||||||
|
{
|
||||||
|
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
private AppDataConnection _db = new();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 创建新实验
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="id">实验ID</param>
|
||||||
|
/// <param name="name">实验名称</param>
|
||||||
|
/// <param name="description">实验描述</param>
|
||||||
|
/// <param name="tags">实验标签</param>
|
||||||
|
/// <param name="difficulty">实验难度</param>
|
||||||
|
/// <param name="isVisibleToUsers">普通用户是否可见</param>
|
||||||
|
/// <returns>创建的实验</returns>
|
||||||
|
public Result<Exam> CreateExam(string id, string name, string description, string[]? tags = null, int difficulty = 1, bool isVisibleToUsers = true)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// 检查实验ID是否已存在
|
||||||
|
var existingExam = _db.ExamTable.Where(e => e.ID.ToString() == id).FirstOrDefault();
|
||||||
|
if (existingExam != null)
|
||||||
|
{
|
||||||
|
logger.Error($"实验ID已存在: {id}");
|
||||||
|
return new(new Exception($"实验ID已存在: {id}"));
|
||||||
|
}
|
||||||
|
|
||||||
|
var exam = new Exam
|
||||||
|
{
|
||||||
|
ID = id,
|
||||||
|
Name = name,
|
||||||
|
Description = description,
|
||||||
|
Difficulty = Math.Max(1, Math.Min(5, difficulty)),
|
||||||
|
IsVisibleToUsers = isVisibleToUsers,
|
||||||
|
CreatedTime = DateTime.Now,
|
||||||
|
UpdatedTime = DateTime.Now
|
||||||
|
};
|
||||||
|
|
||||||
|
if (tags != null)
|
||||||
|
{
|
||||||
|
exam.SetTagsList(tags);
|
||||||
|
}
|
||||||
|
|
||||||
|
_db.Insert(exam);
|
||||||
|
logger.Info($"新实验已创建: {id} ({name})");
|
||||||
|
return new(exam);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error($"创建实验时出错: {ex.Message}");
|
||||||
|
return new(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 更新实验信息
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="id">实验ID</param>
|
||||||
|
/// <param name="name">实验名称</param>
|
||||||
|
/// <param name="description">实验描述</param>
|
||||||
|
/// <param name="tags">实验标签</param>
|
||||||
|
/// <param name="difficulty">实验难度</param>
|
||||||
|
/// <param name="isVisibleToUsers">普通用户是否可见</param>
|
||||||
|
/// <returns>更新的记录数</returns>
|
||||||
|
public Result<int> UpdateExam(string id, string? name = null, string? description = null, string[]? tags = null, int? difficulty = null, bool? isVisibleToUsers = null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
int result = 0;
|
||||||
|
|
||||||
|
if (name != null)
|
||||||
|
{
|
||||||
|
result += _db.ExamTable.Where(e => e.ID.ToString() == id).Set(e => e.Name, name).Update();
|
||||||
|
}
|
||||||
|
if (description != null)
|
||||||
|
{
|
||||||
|
result += _db.ExamTable.Where(e => e.ID.ToString() == id).Set(e => e.Description, description).Update();
|
||||||
|
}
|
||||||
|
if (tags != null)
|
||||||
|
{
|
||||||
|
var tagsString = string.Join(",", tags.Where(tag => !string.IsNullOrWhiteSpace(tag)).Select(tag => tag.Trim()));
|
||||||
|
result += _db.ExamTable.Where(e => e.ID.ToString() == id).Set(e => e.Tags, tagsString).Update();
|
||||||
|
}
|
||||||
|
if (difficulty.HasValue)
|
||||||
|
{
|
||||||
|
result += _db.ExamTable.Where(e => e.ID.ToString() == id).Set(e => e.Difficulty, Math.Max(1, Math.Min(5, difficulty.Value))).Update();
|
||||||
|
}
|
||||||
|
if (isVisibleToUsers.HasValue)
|
||||||
|
{
|
||||||
|
result += _db.ExamTable.Where(e => e.ID.ToString() == id).Set(e => e.IsVisibleToUsers, isVisibleToUsers.Value).Update();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 更新时间
|
||||||
|
_db.ExamTable.Where(e => e.ID.ToString() == id).Set(e => e.UpdatedTime, DateTime.Now).Update();
|
||||||
|
|
||||||
|
logger.Info($"实验已更新: {id},更新记录数: {result}");
|
||||||
|
return new(result);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error($"更新实验时出错: {ex.Message}");
|
||||||
|
return new(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取所有实验信息
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>所有实验的数组</returns>
|
||||||
|
public Exam[] GetAllExams()
|
||||||
|
{
|
||||||
|
var exams = _db.ExamTable.OrderBy(e => e.ID).ToArray();
|
||||||
|
logger.Debug($"获取所有实验,共 {exams.Length} 个");
|
||||||
|
return exams;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 根据实验ID获取实验信息
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="examId">实验ID</param>
|
||||||
|
/// <returns>包含实验信息的结果,如果未找到则返回空</returns>
|
||||||
|
public Result<Optional<Exam>> GetExamByID(string examId)
|
||||||
|
{
|
||||||
|
var exams = _db.ExamTable.Where(exam => exam.ID.ToString() == examId).ToArray();
|
||||||
|
|
||||||
|
if (exams.Length > 1)
|
||||||
|
{
|
||||||
|
logger.Error($"数据库中存在多个相同ID的实验: {examId}");
|
||||||
|
return new(new Exception($"数据库中存在多个相同ID的实验: {examId}"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (exams.Length == 0)
|
||||||
|
{
|
||||||
|
logger.Info($"未找到ID对应的实验: {examId}");
|
||||||
|
return new(Optional<Exam>.None);
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.Debug($"成功获取实验信息: {examId}");
|
||||||
|
return new(exams[0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
350
server/src/Database/ResourceManager.cs
Normal file
350
server/src/Database/ResourceManager.cs
Normal file
@@ -0,0 +1,350 @@
|
|||||||
|
using DotNext;
|
||||||
|
using LinqToDB;
|
||||||
|
using LinqToDB.Data;
|
||||||
|
using System.Security.Cryptography;
|
||||||
|
|
||||||
|
namespace Database;
|
||||||
|
|
||||||
|
public class ResourceManager
|
||||||
|
{
|
||||||
|
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
private readonly AppDataConnection _db = new();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 根据文件扩展名获取MIME类型
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="extension">文件扩展名</param>
|
||||||
|
/// <param name="fileName">文件名(可选,用于特殊文件判断)</param>
|
||||||
|
/// <returns>MIME类型</returns>
|
||||||
|
private string GetMimeTypeFromExtension(string extension, string fileName = "")
|
||||||
|
{
|
||||||
|
// 特殊文件名处理
|
||||||
|
if (!string.IsNullOrEmpty(fileName) && fileName.Equals("diagram.json", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
return "application/json";
|
||||||
|
}
|
||||||
|
|
||||||
|
return extension.ToLowerInvariant() switch
|
||||||
|
{
|
||||||
|
".png" => "image/png",
|
||||||
|
".jpg" or ".jpeg" => "image/jpeg",
|
||||||
|
".gif" => "image/gif",
|
||||||
|
".bmp" => "image/bmp",
|
||||||
|
".svg" => "image/svg+xml",
|
||||||
|
".bit" => "application/octet-stream",
|
||||||
|
".sbit" => "application/octet-stream",
|
||||||
|
".bin" => "application/octet-stream",
|
||||||
|
".mcs" => "application/octet-stream",
|
||||||
|
".hex" => "text/plain",
|
||||||
|
".json" => "application/json",
|
||||||
|
".zip" => "application/zip",
|
||||||
|
".md" => "text/markdown",
|
||||||
|
_ => "application/octet-stream"
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 将二进制数据写入指定路径
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="path">目标文件路径</param>
|
||||||
|
/// <param name="data">要写入的二进制数据</param>
|
||||||
|
/// <returns>写入是否成功</returns>
|
||||||
|
public Result<bool> WriteBytesToPath(string path, byte[] data)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var filePath = Path.Combine(Global.DataPath, path);
|
||||||
|
var directory = Path.GetDirectoryName(filePath);
|
||||||
|
if (!string.IsNullOrEmpty(directory) && !Directory.Exists(directory))
|
||||||
|
{
|
||||||
|
Directory.CreateDirectory(directory);
|
||||||
|
}
|
||||||
|
File.WriteAllBytes(filePath, data);
|
||||||
|
logger.Info($"成功写入文件: {filePath},大小: {data.Length} bytes");
|
||||||
|
return new(true);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error($"写入文件时出错: {ex.Message}");
|
||||||
|
return new(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 从指定路径读取二进制数据
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="path">要读取的文件路径</param>
|
||||||
|
/// <returns>读取到的二进制数据</returns>
|
||||||
|
public Result<byte[]> ReadBytesFromPath(string path)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var filePath = Path.Combine(Global.DataPath, path);
|
||||||
|
if (!File.Exists(filePath))
|
||||||
|
{
|
||||||
|
logger.Error($"文件不存在: {filePath}");
|
||||||
|
return new(new Exception($"文件不存在: {filePath}"));
|
||||||
|
}
|
||||||
|
var data = File.ReadAllBytes(filePath);
|
||||||
|
logger.Info($"成功读取文件: {filePath},大小: {data.Length} bytes");
|
||||||
|
return new(data);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error($"读取文件时出错: {ex.Message}");
|
||||||
|
return new(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 添加资源
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="userId">上传用户ID</param>
|
||||||
|
/// <param name="resourceType">资源类型</param>
|
||||||
|
/// <param name="resourcePurpose">资源用途(template 或 user)</param>
|
||||||
|
/// <param name="resourceName">资源名称</param>
|
||||||
|
/// <param name="data">资源二进制数据</param>
|
||||||
|
/// <param name="examId">所属实验ID(可选)</param>
|
||||||
|
/// <param name="mimeType">MIME类型(可选,将根据文件扩展名自动确定)</param>
|
||||||
|
/// <returns>创建的资源</returns>
|
||||||
|
public Result<Resource> AddResource(
|
||||||
|
Guid userId, string resourceType, ResourcePurpose resourcePurpose,
|
||||||
|
string resourceName, byte[] data, string? examId = null, string? mimeType = null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// 验证用户是否存在
|
||||||
|
var user = _db.UserTable.Where(u => u.ID == userId).FirstOrDefault();
|
||||||
|
if (user == null)
|
||||||
|
{
|
||||||
|
logger.Error($"用户不存在: {userId}");
|
||||||
|
return new(new Exception($"用户不存在: {userId}"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 如果指定了实验ID,验证实验是否存在
|
||||||
|
if (!string.IsNullOrEmpty(examId))
|
||||||
|
{
|
||||||
|
var exam = _db.ExamTable.Where(e => e.ID.ToString() == examId).FirstOrDefault();
|
||||||
|
if (exam == null)
|
||||||
|
{
|
||||||
|
logger.Error($"实验不存在: {examId}");
|
||||||
|
return new(new Exception($"实验不存在: {examId}"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 验证资源用途
|
||||||
|
if (resourcePurpose != ResourcePurpose.Template &&
|
||||||
|
resourcePurpose != ResourcePurpose.User &&
|
||||||
|
resourcePurpose != ResourcePurpose.Homework)
|
||||||
|
{
|
||||||
|
logger.Error($"无效的资源用途: {resourcePurpose}");
|
||||||
|
return new(new Exception($"无效的资源用途: {resourcePurpose}"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 如果未指定MIME类型,根据文件扩展名自动确定
|
||||||
|
if (string.IsNullOrEmpty(mimeType))
|
||||||
|
{
|
||||||
|
var extension = Path.GetExtension(resourceName).ToLowerInvariant();
|
||||||
|
mimeType = GetMimeTypeFromExtension(extension, resourceName);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 计算数据的SHA256
|
||||||
|
var sha256Bytes = SHA256.HashData(data);
|
||||||
|
var sha256 = Common.String.BytesToBase64(sha256Bytes);
|
||||||
|
if (string.IsNullOrEmpty(sha256))
|
||||||
|
{
|
||||||
|
logger.Error($"SHA256计算失败");
|
||||||
|
return new(new Exception("SHA256计算失败"));
|
||||||
|
}
|
||||||
|
|
||||||
|
var duplicateResource = _db.ResourceTable.Where(r => r.SHA256 == sha256).FirstOrDefault();
|
||||||
|
if (duplicateResource != null && duplicateResource.ResourceName == resourceName)
|
||||||
|
{
|
||||||
|
logger.Info($"资源已存在: {resourceName}, ID: {duplicateResource.ID}, UserID: {duplicateResource.UserID}");
|
||||||
|
return duplicateResource;
|
||||||
|
}
|
||||||
|
|
||||||
|
var nowTime = DateTime.Now;
|
||||||
|
var resource = new Resource
|
||||||
|
{
|
||||||
|
UserID = userId,
|
||||||
|
ExamID = examId,
|
||||||
|
ResourceType = resourceType,
|
||||||
|
Purpose = resourcePurpose,
|
||||||
|
ResourceName = resourceName,
|
||||||
|
Path = duplicateResource == null ?
|
||||||
|
Path.Combine(resourceType, nowTime.ToString("yyyyMMddHH"), resourceName) :
|
||||||
|
duplicateResource.Path,
|
||||||
|
SHA256 = sha256,
|
||||||
|
MimeType = mimeType,
|
||||||
|
UploadTime = nowTime
|
||||||
|
};
|
||||||
|
|
||||||
|
var insertedId = _db.Insert(resource);
|
||||||
|
|
||||||
|
var writeRet = WriteBytesToPath(resource.Path, data);
|
||||||
|
if (writeRet.IsSuccessful && writeRet.Value)
|
||||||
|
{
|
||||||
|
logger.Info($"新资源已添加: {userId}/{resourceType}/{resourcePurpose}/{resourceName} ({data.Length} bytes)" +
|
||||||
|
(examId != null ? $" [实验: {examId}]" : "") + $" [ID: {resource.ID}]");
|
||||||
|
return new(resource);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_db.ResourceTable.Where(r => r.ID == resource.ID).Delete();
|
||||||
|
|
||||||
|
logger.Error($"写入资源文件时出错: {writeRet.Error}");
|
||||||
|
return new(new Exception(writeRet.Error?.ToString() ?? $"写入失败"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error($"添加资源时出错: {ex.Message}");
|
||||||
|
return new(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取资源信息列表(返回ID和名称)
|
||||||
|
/// <param name="resourceType">资源类型</param>
|
||||||
|
/// <param name="examId">实验ID(可选)</param>
|
||||||
|
/// <param name="resourcePurpose">资源用途(可选)</param>
|
||||||
|
/// <param name="userId">用户ID(可选)</param>
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>资源信息列表</returns>
|
||||||
|
public Result<Resource[]> GetResourceListByType(
|
||||||
|
string resourceType,
|
||||||
|
ResourcePurpose? resourcePurpose = null,
|
||||||
|
string? examId = null,
|
||||||
|
Guid? userId = null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var query = _db.ResourceTable.Where(r => r.ResourceType == resourceType);
|
||||||
|
|
||||||
|
if (examId != null)
|
||||||
|
{
|
||||||
|
query = query.Where(r => r.ExamID == examId);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (resourcePurpose != null)
|
||||||
|
{
|
||||||
|
query = query.Where(r => r.Purpose == resourcePurpose);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (userId != null)
|
||||||
|
{
|
||||||
|
query = query.Where(r => r.UserID == userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
var resources = query.ToArray();
|
||||||
|
|
||||||
|
logger.Info($"获取资源列表: {resourceType}" +
|
||||||
|
(examId != null ? $"/{examId}" : "") +
|
||||||
|
($"/{resourcePurpose.ToString()}") +
|
||||||
|
(userId != null ? $"/{userId}" : "") +
|
||||||
|
$",共 {resources.Length} 个资源");
|
||||||
|
return new(resources);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error($"获取资源列表时出错: {ex.Message}");
|
||||||
|
return new(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取完整的资源列表
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="examId">实验ID(可选)</param>
|
||||||
|
/// <param name="resourceType">资源类型(可选)</param>
|
||||||
|
/// <param name="resourcePurpose">资源用途(可选)</param>
|
||||||
|
/// <param name="userId">用户ID(可选)</param>
|
||||||
|
/// <returns>完整的资源对象列表</returns>
|
||||||
|
public Result<List<Resource>> GetFullResourceList(
|
||||||
|
string? examId = null,
|
||||||
|
string? resourceType = null,
|
||||||
|
ResourcePurpose? resourcePurpose = null,
|
||||||
|
Guid? userId = null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var query = _db.ResourceTable.AsQueryable();
|
||||||
|
|
||||||
|
if (examId != null)
|
||||||
|
{
|
||||||
|
query = query.Where(r => r.ExamID == examId);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (resourceType != null)
|
||||||
|
{
|
||||||
|
query = query.Where(r => r.ResourceType == resourceType);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (resourcePurpose != null)
|
||||||
|
{
|
||||||
|
query = query.Where(r => r.Purpose == resourcePurpose);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (userId != null)
|
||||||
|
{
|
||||||
|
query = query.Where(r => r.UserID == userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
var resources = query.OrderByDescending(r => r.UploadTime).ToList();
|
||||||
|
logger.Info($"获取完整资源列表" +
|
||||||
|
(examId != null ? $" [实验: {examId}]" : "") +
|
||||||
|
(resourceType != null ? $" [类型: {resourceType}]" : "") +
|
||||||
|
($" [用途: {resourcePurpose.ToString()}]") +
|
||||||
|
(userId != null ? $" [用户: {userId}]" : "") +
|
||||||
|
$",共 {resources.Count} 个资源");
|
||||||
|
return new(resources);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error($"获取完整资源列表时出错: {ex.Message}");
|
||||||
|
return new(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 根据资源ID获取资源
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="resourceId">资源ID</param>
|
||||||
|
/// <returns>资源数据</returns>
|
||||||
|
public Optional<Resource> GetResourceById(Guid resourceId)
|
||||||
|
{
|
||||||
|
var resource = _db.ResourceTable.Where(r => r.ID == resourceId).FirstOrDefault();
|
||||||
|
|
||||||
|
if (resource == null)
|
||||||
|
{
|
||||||
|
logger.Info($"未找到资源: {resourceId}");
|
||||||
|
return new(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.Info($"成功获取资源: {resourceId} ({resource.ResourceName})");
|
||||||
|
return new(resource);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 删除资源
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="resourceId">资源ID</param>
|
||||||
|
/// <returns>删除的记录数</returns>
|
||||||
|
public Result<int> DeleteResource(Guid resourceId)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var result = _db.ResourceTable.Where(r => r.ID == resourceId).Delete();
|
||||||
|
logger.Info($"资源已删除: {resourceId},删除记录数: {result}");
|
||||||
|
return new(result);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error($"删除资源时出错: {ex.Message}");
|
||||||
|
return new(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
352
server/src/Database/Type.cs
Normal file
352
server/src/Database/Type.cs
Normal file
@@ -0,0 +1,352 @@
|
|||||||
|
using DotNext;
|
||||||
|
using LinqToDB;
|
||||||
|
using LinqToDB.Mapping;
|
||||||
|
using Tapper;
|
||||||
|
|
||||||
|
namespace Database;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 用户权限枚举
|
||||||
|
/// </summary>
|
||||||
|
public enum UserPermission
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 管理员权限,可以管理用户和实验板
|
||||||
|
/// </summary>
|
||||||
|
Admin,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 普通用户权限,只能使用实验板
|
||||||
|
/// </summary>
|
||||||
|
Normal,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 用户类,表示用户信息
|
||||||
|
/// </summary>
|
||||||
|
public class User
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 用户的唯一标识符
|
||||||
|
/// </summary>
|
||||||
|
[PrimaryKey]
|
||||||
|
public Guid ID { get; set; } = Guid.NewGuid();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 用户的名称
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public required string Name { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 用户的电子邮箱
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public required string EMail { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 用户的密码(应该进行哈希处理)
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public required string Password { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 用户权限等级
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public required UserPermission Permission { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 绑定的实验板ID,如果未绑定则为空
|
||||||
|
/// </summary>
|
||||||
|
[Nullable]
|
||||||
|
public Guid BoardID { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 用户绑定板子的过期时间
|
||||||
|
/// </summary>
|
||||||
|
[Nullable]
|
||||||
|
public DateTime? BoardExpireTime { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// FPGA 板子状态枚举
|
||||||
|
/// </summary>
|
||||||
|
public enum BoardStatus
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 未启用状态,无法被使用
|
||||||
|
/// </summary>
|
||||||
|
Disabled,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 繁忙状态,正在被用户使用
|
||||||
|
/// </summary>
|
||||||
|
Busy,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 可用状态,可以被分配给用户
|
||||||
|
/// </summary>
|
||||||
|
Available,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// FPGA 板子类,表示板子信息
|
||||||
|
/// </summary>
|
||||||
|
public class Board
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// FPGA 板子的唯一标识符
|
||||||
|
/// </summary>
|
||||||
|
[PrimaryKey]
|
||||||
|
public Guid ID { get; set; } = Guid.NewGuid();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// FPGA 板子的名称
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public required string BoardName { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// FPGA 板子的IP地址
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public required string IpAddr { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// FPGA 板子的MAC地址
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public required string MacAddr { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// FPGA 板子的通信端口
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public int Port { get; set; } = 1234;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// FPGA 板子的当前状态
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public required BoardStatus Status { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 占用该板子的用户的唯一标识符
|
||||||
|
/// </summary>
|
||||||
|
[Nullable]
|
||||||
|
public Guid OccupiedUserID { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 占用该板子的用户的用户名
|
||||||
|
/// </summary>
|
||||||
|
[Nullable]
|
||||||
|
public string? OccupiedUserName { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// FPGA 板子的固件版本号
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public string FirmVersion { get; set; } = "1.0.0";
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 实验类,表示实验信息
|
||||||
|
/// </summary>
|
||||||
|
public class Exam
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 实验的唯一标识符
|
||||||
|
/// </summary>
|
||||||
|
[PrimaryKey]
|
||||||
|
public required string ID { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 实验名称
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public required string Name { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 实验描述
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public required string Description { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 实验创建时间
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public DateTime CreatedTime { get; set; } = DateTime.Now;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 实验最后更新时间
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public DateTime UpdatedTime { get; set; } = DateTime.Now;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 实验标签(以逗号分隔的字符串)
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public string Tags { get; set; } = "";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 实验难度(1-5,1为最简单)
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public int Difficulty { get; set; } = 1;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 普通用户是否可见
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public bool IsVisibleToUsers { get; set; } = true;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取标签列表
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>标签数组</returns>
|
||||||
|
public string[] GetTagsList()
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(Tags))
|
||||||
|
return Array.Empty<string>();
|
||||||
|
|
||||||
|
return Tags.Split(',', StringSplitOptions.RemoveEmptyEntries)
|
||||||
|
.Select(tag => tag.Trim())
|
||||||
|
.Where(tag => !string.IsNullOrEmpty(tag))
|
||||||
|
.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 设置标签列表
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="tags">标签数组</param>
|
||||||
|
public void SetTagsList(string[] tags)
|
||||||
|
{
|
||||||
|
Tags = string.Join(",", tags.Where(tag => !string.IsNullOrWhiteSpace(tag)).Select(tag => tag.Trim()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 资源类型枚举
|
||||||
|
/// </summary>
|
||||||
|
[TranspilationSource]
|
||||||
|
public static class ResourceTypes
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 图片资源类型
|
||||||
|
/// </summary>
|
||||||
|
public const string Images = "images";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Markdown文档资源类型
|
||||||
|
/// </summary>
|
||||||
|
public const string Markdown = "markdown";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 比特流文件资源类型
|
||||||
|
/// </summary>
|
||||||
|
public const string Bitstream = "bitstream";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 原理图资源类型
|
||||||
|
/// </summary>
|
||||||
|
public const string Diagram = "diagram";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 项目文件资源类型
|
||||||
|
/// </summary>
|
||||||
|
public const string Project = "project";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 压缩文件资源类型
|
||||||
|
/// </summary>
|
||||||
|
public const string Compression = "compression";
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum ResourcePurpose : int
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 模板资源,通常由管理员上传,供用户参考
|
||||||
|
/// </summary>
|
||||||
|
Template,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 用户上传的资源
|
||||||
|
/// </summary>
|
||||||
|
User,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 用户提交的作业
|
||||||
|
/// </summary>
|
||||||
|
Homework
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 资源类,统一管理实验资源、用户比特流等各类资源
|
||||||
|
/// </summary>
|
||||||
|
public class Resource
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 资源的唯一标识符
|
||||||
|
/// </summary>
|
||||||
|
[PrimaryKey]
|
||||||
|
public Guid ID { get; set; } = Guid.NewGuid();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 上传资源的用户ID
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public required Guid UserID { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 所属实验ID(可选,如果不属于特定实验则为空)
|
||||||
|
/// </summary>
|
||||||
|
[Nullable]
|
||||||
|
public string? ExamID { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 资源类型(images, markdown, bitstream, diagram, project等)
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public required string ResourceType { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 资源用途:template(模板)或 user(用户上传)
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public required ResourcePurpose Purpose { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 资源名称(包含文件扩展名)
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public required string ResourceName { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 资源路径(包含文件名和扩展名)
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public required string Path { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 资源SHA256哈希值
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public required string SHA256 { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 资源创建/上传时间
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public DateTime UploadTime { get; set; } = DateTime.Now;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 资源的MIME类型
|
||||||
|
/// </summary>
|
||||||
|
[NotNull]
|
||||||
|
public string MimeType { get; set; } = "application/octet-stream";
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,204 +1,14 @@
|
|||||||
using DotNext;
|
using DotNext;
|
||||||
using LinqToDB;
|
using LinqToDB;
|
||||||
using LinqToDB.Data;
|
using LinqToDB.Data;
|
||||||
using LinqToDB.Mapping;
|
|
||||||
|
|
||||||
namespace Database;
|
namespace Database;
|
||||||
|
|
||||||
/// <summary>
|
public class UserManager
|
||||||
/// 用户类,表示用户信息
|
|
||||||
/// </summary>
|
|
||||||
public class User
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 用户的唯一标识符
|
|
||||||
/// </summary>
|
|
||||||
[PrimaryKey]
|
|
||||||
public Guid ID { get; set; } = Guid.NewGuid();
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 用户的名称
|
|
||||||
/// </summary>
|
|
||||||
[NotNull]
|
|
||||||
public required string Name { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 用户的电子邮箱
|
|
||||||
/// </summary>
|
|
||||||
[NotNull]
|
|
||||||
public required string EMail { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 用户的密码(应该进行哈希处理)
|
|
||||||
/// </summary>
|
|
||||||
[NotNull]
|
|
||||||
public required string Password { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 用户权限等级
|
|
||||||
/// </summary>
|
|
||||||
[NotNull]
|
|
||||||
public required UserPermission Permission { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 绑定的实验板ID,如果未绑定则为空
|
|
||||||
/// </summary>
|
|
||||||
[Nullable]
|
|
||||||
public Guid BoardID { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 用户绑定板子的过期时间
|
|
||||||
/// </summary>
|
|
||||||
[Nullable]
|
|
||||||
public DateTime? BoardExpireTime { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 用户权限枚举
|
|
||||||
/// </summary>
|
|
||||||
public enum UserPermission
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 管理员权限,可以管理用户和实验板
|
|
||||||
/// </summary>
|
|
||||||
Admin,
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 普通用户权限,只能使用实验板
|
|
||||||
/// </summary>
|
|
||||||
Normal,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// FPGA 板子类,表示板子信息
|
|
||||||
/// </summary>
|
|
||||||
public class Board
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// FPGA 板子的唯一标识符
|
|
||||||
/// </summary>
|
|
||||||
[PrimaryKey]
|
|
||||||
public Guid ID { get; set; } = Guid.NewGuid();
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// FPGA 板子的名称
|
|
||||||
/// </summary>
|
|
||||||
[NotNull]
|
|
||||||
public required string BoardName { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// FPGA 板子的IP地址
|
|
||||||
/// </summary>
|
|
||||||
[NotNull]
|
|
||||||
public required string IpAddr { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// FPGA 板子的通信端口
|
|
||||||
/// </summary>
|
|
||||||
[NotNull]
|
|
||||||
public required int Port { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// FPGA 板子的当前状态
|
|
||||||
/// </summary>
|
|
||||||
[NotNull]
|
|
||||||
public required BoardStatus Status { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 占用该板子的用户的唯一标识符
|
|
||||||
/// </summary>
|
|
||||||
[Nullable]
|
|
||||||
public Guid OccupiedUserID { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 占用该板子的用户的用户名
|
|
||||||
/// </summary>
|
|
||||||
[Nullable]
|
|
||||||
public string? OccupiedUserName { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// FPGA 板子的固件版本号
|
|
||||||
/// </summary>
|
|
||||||
[NotNull]
|
|
||||||
public string FirmVersion { get; set; } = "1.0.0";
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// FPGA 板子状态枚举
|
|
||||||
/// </summary>
|
|
||||||
public enum BoardStatus
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 繁忙状态,正在被用户使用
|
|
||||||
/// </summary>
|
|
||||||
Busy,
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 可用状态,可以被分配给用户
|
|
||||||
/// </summary>
|
|
||||||
Available,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 应用程序数据连接类,用于与数据库交互
|
|
||||||
/// </summary>
|
|
||||||
public class AppDataConnection : DataConnection
|
|
||||||
{
|
{
|
||||||
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
static readonly string DATABASE_FILEPATH = $"{Environment.CurrentDirectory}/Database.sqlite";
|
private readonly AppDataConnection _db = new();
|
||||||
|
|
||||||
static readonly LinqToDB.DataOptions options =
|
|
||||||
new LinqToDB.DataOptions().UseSQLite($"Data Source={DATABASE_FILEPATH}");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 初始化应用程序数据连接
|
|
||||||
/// </summary>
|
|
||||||
public AppDataConnection() : base(options)
|
|
||||||
{
|
|
||||||
if (!Path.Exists(DATABASE_FILEPATH))
|
|
||||||
{
|
|
||||||
logger.Info($"数据库文件不存在,正在创建新数据库: {DATABASE_FILEPATH}");
|
|
||||||
LinqToDB.DataProvider.SQLite.SQLiteTools.CreateDatabase(DATABASE_FILEPATH);
|
|
||||||
this.CreateAllTables();
|
|
||||||
var user = new User()
|
|
||||||
{
|
|
||||||
Name = "Admin",
|
|
||||||
EMail = "selfconfusion@gmail.com",
|
|
||||||
Password = "12345678",
|
|
||||||
Permission = Database.User.UserPermission.Admin,
|
|
||||||
};
|
|
||||||
this.Insert(user);
|
|
||||||
logger.Info("默认管理员用户已创建");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
logger.Info($"数据库连接已建立: {DATABASE_FILEPATH}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 创建所有数据库表
|
|
||||||
/// </summary>
|
|
||||||
public void CreateAllTables()
|
|
||||||
{
|
|
||||||
logger.Info("正在创建数据库表...");
|
|
||||||
this.CreateTable<User>();
|
|
||||||
this.CreateTable<Board>();
|
|
||||||
logger.Info("数据库表创建完成");
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 删除所有数据库表
|
|
||||||
/// </summary>
|
|
||||||
public void DropAllTables()
|
|
||||||
{
|
|
||||||
logger.Warn("正在删除所有数据库表...");
|
|
||||||
this.DropTable<User>();
|
|
||||||
this.DropTable<Board>();
|
|
||||||
logger.Warn("所有数据库表已删除");
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 添加一个新的用户到数据库
|
/// 添加一个新的用户到数据库
|
||||||
@@ -214,9 +24,9 @@ public class AppDataConnection : DataConnection
|
|||||||
Name = name,
|
Name = name,
|
||||||
EMail = email,
|
EMail = email,
|
||||||
Password = password,
|
Password = password,
|
||||||
Permission = Database.User.UserPermission.Normal,
|
Permission = UserPermission.Normal,
|
||||||
};
|
};
|
||||||
var result = this.Insert(user);
|
var result = _db.Insert(user);
|
||||||
logger.Info($"新用户已添加: {name} ({email})");
|
logger.Info($"新用户已添加: {name} ({email})");
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@@ -228,7 +38,7 @@ public class AppDataConnection : DataConnection
|
|||||||
/// <returns>包含用户信息的结果,如果未找到或出错则返回相应状态</returns>
|
/// <returns>包含用户信息的结果,如果未找到或出错则返回相应状态</returns>
|
||||||
public Result<Optional<User>> GetUserByName(string name)
|
public Result<Optional<User>> GetUserByName(string name)
|
||||||
{
|
{
|
||||||
var user = this.UserTable.Where((user) => user.Name == name).ToArray();
|
var user = _db.UserTable.Where((user) => user.Name == name).ToArray();
|
||||||
|
|
||||||
if (user.Length > 1)
|
if (user.Length > 1)
|
||||||
{
|
{
|
||||||
@@ -253,7 +63,7 @@ public class AppDataConnection : DataConnection
|
|||||||
/// <returns>包含用户信息的结果,如果未找到或出错则返回相应状态</returns>
|
/// <returns>包含用户信息的结果,如果未找到或出错则返回相应状态</returns>
|
||||||
public Result<Optional<User>> GetUserByEMail(string email)
|
public Result<Optional<User>> GetUserByEMail(string email)
|
||||||
{
|
{
|
||||||
var user = this.UserTable.Where((user) => user.EMail == email).ToArray();
|
var user = _db.UserTable.Where((user) => user.EMail == email).ToArray();
|
||||||
|
|
||||||
if (user.Length > 1)
|
if (user.Length > 1)
|
||||||
{
|
{
|
||||||
@@ -279,7 +89,7 @@ public class AppDataConnection : DataConnection
|
|||||||
/// <returns>如果密码正确返回用户信息,否则返回空</returns>
|
/// <returns>如果密码正确返回用户信息,否则返回空</returns>
|
||||||
public Result<Optional<User>> CheckUserPassword(string name, string password)
|
public Result<Optional<User>> CheckUserPassword(string name, string password)
|
||||||
{
|
{
|
||||||
var ret = this.GetUserByName(name);
|
var ret = GetUserByName(name);
|
||||||
if (!ret.IsSuccessful)
|
if (!ret.IsSuccessful)
|
||||||
return new(ret.Error);
|
return new(ret.Error);
|
||||||
|
|
||||||
@@ -310,7 +120,7 @@ public class AppDataConnection : DataConnection
|
|||||||
public int BindUserToBoard(Guid userId, Guid boardId, DateTime expireTime)
|
public int BindUserToBoard(Guid userId, Guid boardId, DateTime expireTime)
|
||||||
{
|
{
|
||||||
// 获取用户信息
|
// 获取用户信息
|
||||||
var user = this.UserTable.Where(u => u.ID == userId).FirstOrDefault();
|
var user = _db.UserTable.Where(u => u.ID == userId).FirstOrDefault();
|
||||||
if (user == null)
|
if (user == null)
|
||||||
{
|
{
|
||||||
logger.Error($"未找到用户: {userId}");
|
logger.Error($"未找到用户: {userId}");
|
||||||
@@ -318,16 +128,16 @@ public class AppDataConnection : DataConnection
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 更新用户的板子绑定信息
|
// 更新用户的板子绑定信息
|
||||||
var userResult = this.UserTable
|
var userResult = _db.UserTable
|
||||||
.Where(u => u.ID == userId)
|
.Where(u => u.ID == userId)
|
||||||
.Set(u => u.BoardID, boardId)
|
.Set(u => u.BoardID, boardId)
|
||||||
.Set(u => u.BoardExpireTime, expireTime)
|
.Set(u => u.BoardExpireTime, expireTime)
|
||||||
.Update();
|
.Update();
|
||||||
|
|
||||||
// 更新板子的用户绑定信息
|
// 更新板子的用户绑定信息
|
||||||
var boardResult = this.BoardTable
|
var boardResult = _db.BoardTable
|
||||||
.Where(b => b.ID == boardId)
|
.Where(b => b.ID == boardId)
|
||||||
.Set(b => b.Status, Board.BoardStatus.Busy)
|
.Set(b => b.Status, BoardStatus.Busy)
|
||||||
.Set(b => b.OccupiedUserID, userId)
|
.Set(b => b.OccupiedUserID, userId)
|
||||||
.Set(b => b.OccupiedUserName, user.Name)
|
.Set(b => b.OccupiedUserName, user.Name)
|
||||||
.Update();
|
.Update();
|
||||||
@@ -344,11 +154,11 @@ public class AppDataConnection : DataConnection
|
|||||||
public int UnbindUserFromBoard(Guid userId)
|
public int UnbindUserFromBoard(Guid userId)
|
||||||
{
|
{
|
||||||
// 获取用户当前绑定的板子ID
|
// 获取用户当前绑定的板子ID
|
||||||
var user = this.UserTable.Where(u => u.ID == userId).FirstOrDefault();
|
var user = _db.UserTable.Where(u => u.ID == userId).FirstOrDefault();
|
||||||
Guid boardId = user?.BoardID ?? Guid.Empty;
|
Guid boardId = user?.BoardID ?? Guid.Empty;
|
||||||
|
|
||||||
// 清空用户的板子绑定信息
|
// 清空用户的板子绑定信息
|
||||||
var userResult = this.UserTable
|
var userResult = _db.UserTable
|
||||||
.Where(u => u.ID == userId)
|
.Where(u => u.ID == userId)
|
||||||
.Set(u => u.BoardID, Guid.Empty)
|
.Set(u => u.BoardID, Guid.Empty)
|
||||||
.Set(u => u.BoardExpireTime, (DateTime?)null)
|
.Set(u => u.BoardExpireTime, (DateTime?)null)
|
||||||
@@ -358,9 +168,9 @@ public class AppDataConnection : DataConnection
|
|||||||
int boardResult = 0;
|
int boardResult = 0;
|
||||||
if (boardId != Guid.Empty)
|
if (boardId != Guid.Empty)
|
||||||
{
|
{
|
||||||
boardResult = this.BoardTable
|
boardResult = _db.BoardTable
|
||||||
.Where(b => b.ID == boardId)
|
.Where(b => b.ID == boardId)
|
||||||
.Set(b => b.Status, Board.BoardStatus.Available)
|
.Set(b => b.Status, BoardStatus.Available)
|
||||||
.Set(b => b.OccupiedUserID, Guid.Empty)
|
.Set(b => b.OccupiedUserID, Guid.Empty)
|
||||||
.Set(b => b.OccupiedUserName, (string?)null)
|
.Set(b => b.OccupiedUserName, (string?)null)
|
||||||
.Update();
|
.Update();
|
||||||
@@ -371,25 +181,61 @@ public class AppDataConnection : DataConnection
|
|||||||
return userResult + boardResult;
|
return userResult + boardResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 自动分配一个未被占用的IP地址
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>分配的IP地址字符串</returns>
|
||||||
|
public string AllocateIpAddr()
|
||||||
|
{
|
||||||
|
var usedIps = _db.BoardTable.Select(b => b.IpAddr).ToArray();
|
||||||
|
for (int i = 1; i <= 254; i++)
|
||||||
|
{
|
||||||
|
string ip = $"169.254.109.{i}";
|
||||||
|
if (!usedIps.Contains(ip))
|
||||||
|
return ip;
|
||||||
|
}
|
||||||
|
throw new Exception("没有可用的IP地址");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 自动分配一个未被占用的MAC地址
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>分配的MAC地址字符串</returns>
|
||||||
|
public string AllocateMacAddr()
|
||||||
|
{
|
||||||
|
var usedMacs = _db.BoardTable.Select(b => b.MacAddr).ToArray();
|
||||||
|
// 以 02-00-00-xx-xx-xx 格式分配,02 表示本地管理地址
|
||||||
|
for (int i = 1; i <= 0xFFFFFF; i++)
|
||||||
|
{
|
||||||
|
string mac = $"02-00-00-{(i >> 16) & 0xFF:X2}-{(i >> 8) & 0xFF:X2}-{i & 0xFF:X2}";
|
||||||
|
if (!usedMacs.Contains(mac))
|
||||||
|
return mac;
|
||||||
|
}
|
||||||
|
throw new Exception("没有可用的MAC地址");
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 添加一块新的 FPGA 板子到数据库
|
/// 添加一块新的 FPGA 板子到数据库
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="name">FPGA 板子的名称</param>
|
/// <param name="name">FPGA 板子的名称</param>
|
||||||
/// <param name="ipAddr">FPGA 板子的IP地址</param>
|
|
||||||
/// <param name="port">FPGA 板子的通信端口</param>
|
|
||||||
/// <returns>插入的记录数</returns>
|
/// <returns>插入的记录数</returns>
|
||||||
public int AddBoard(string name, string ipAddr, int port)
|
public Guid AddBoard(string name)
|
||||||
{
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(name) || name.Contains('\'') || name.Contains(';'))
|
||||||
|
{
|
||||||
|
logger.Error("实验板名称非法,包含不允许的字符");
|
||||||
|
throw new ArgumentException("实验板名称非法");
|
||||||
|
}
|
||||||
var board = new Board()
|
var board = new Board()
|
||||||
{
|
{
|
||||||
BoardName = name,
|
BoardName = name,
|
||||||
IpAddr = ipAddr,
|
IpAddr = AllocateIpAddr(),
|
||||||
Port = port,
|
MacAddr = AllocateMacAddr(),
|
||||||
Status = Database.Board.BoardStatus.Available,
|
Status = BoardStatus.Disabled,
|
||||||
};
|
};
|
||||||
var result = this.Insert(board);
|
var result = _db.Insert(board);
|
||||||
logger.Info($"新实验板已添加: {name} ({ipAddr}:{port})");
|
logger.Info($"新实验板已添加: {name} ({board.IpAddr}:{board.MacAddr})");
|
||||||
return result;
|
return board.ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -400,7 +246,7 @@ public class AppDataConnection : DataConnection
|
|||||||
public int DeleteBoardByName(string name)
|
public int DeleteBoardByName(string name)
|
||||||
{
|
{
|
||||||
// 先获取要删除的板子信息
|
// 先获取要删除的板子信息
|
||||||
var board = this.BoardTable.Where(b => b.BoardName == name).FirstOrDefault();
|
var board = _db.BoardTable.Where(b => b.BoardName == name).FirstOrDefault();
|
||||||
if (board == null)
|
if (board == null)
|
||||||
{
|
{
|
||||||
logger.Warn($"未找到名称为 {name} 的实验板");
|
logger.Warn($"未找到名称为 {name} 的实验板");
|
||||||
@@ -410,7 +256,7 @@ public class AppDataConnection : DataConnection
|
|||||||
// 如果板子被占用,先解除绑定
|
// 如果板子被占用,先解除绑定
|
||||||
if (board.OccupiedUserID != Guid.Empty)
|
if (board.OccupiedUserID != Guid.Empty)
|
||||||
{
|
{
|
||||||
this.UserTable
|
_db.UserTable
|
||||||
.Where(u => u.ID == board.OccupiedUserID)
|
.Where(u => u.ID == board.OccupiedUserID)
|
||||||
.Set(u => u.BoardID, Guid.Empty)
|
.Set(u => u.BoardID, Guid.Empty)
|
||||||
.Set(u => u.BoardExpireTime, (DateTime?)null)
|
.Set(u => u.BoardExpireTime, (DateTime?)null)
|
||||||
@@ -418,7 +264,7 @@ public class AppDataConnection : DataConnection
|
|||||||
logger.Info($"已解除用户 {board.OccupiedUserID} 与实验板 {name} 的绑定");
|
logger.Info($"已解除用户 {board.OccupiedUserID} 与实验板 {name} 的绑定");
|
||||||
}
|
}
|
||||||
|
|
||||||
var result = this.BoardTable.Where(b => b.BoardName == name).Delete();
|
var result = _db.BoardTable.Where(b => b.BoardName == name).Delete();
|
||||||
logger.Info($"实验板已删除: {name},删除记录数: {result}");
|
logger.Info($"实验板已删除: {name},删除记录数: {result}");
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@@ -431,7 +277,7 @@ public class AppDataConnection : DataConnection
|
|||||||
public int DeleteBoardByID(Guid id)
|
public int DeleteBoardByID(Guid id)
|
||||||
{
|
{
|
||||||
// 先获取要删除的板子信息
|
// 先获取要删除的板子信息
|
||||||
var board = this.BoardTable.Where(b => b.ID == id).FirstOrDefault();
|
var board = _db.BoardTable.Where(b => b.ID == id).FirstOrDefault();
|
||||||
if (board == null)
|
if (board == null)
|
||||||
{
|
{
|
||||||
logger.Warn($"未找到ID为 {id} 的实验板");
|
logger.Warn($"未找到ID为 {id} 的实验板");
|
||||||
@@ -441,7 +287,7 @@ public class AppDataConnection : DataConnection
|
|||||||
// 如果板子被占用,先解除绑定
|
// 如果板子被占用,先解除绑定
|
||||||
if (board.OccupiedUserID != Guid.Empty)
|
if (board.OccupiedUserID != Guid.Empty)
|
||||||
{
|
{
|
||||||
this.UserTable
|
_db.UserTable
|
||||||
.Where(u => u.ID == board.OccupiedUserID)
|
.Where(u => u.ID == board.OccupiedUserID)
|
||||||
.Set(u => u.BoardID, Guid.Empty)
|
.Set(u => u.BoardID, Guid.Empty)
|
||||||
.Set(u => u.BoardExpireTime, (DateTime?)null)
|
.Set(u => u.BoardExpireTime, (DateTime?)null)
|
||||||
@@ -449,7 +295,7 @@ public class AppDataConnection : DataConnection
|
|||||||
logger.Info($"已解除用户 {board.OccupiedUserID} 与实验板 {id} 的绑定");
|
logger.Info($"已解除用户 {board.OccupiedUserID} 与实验板 {id} 的绑定");
|
||||||
}
|
}
|
||||||
|
|
||||||
var result = this.BoardTable.Where(b => b.ID == id).Delete();
|
var result = _db.BoardTable.Where(b => b.ID == id).Delete();
|
||||||
logger.Info($"实验板已删除: {id},删除记录数: {result}");
|
logger.Info($"实验板已删除: {id},删除记录数: {result}");
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@@ -461,7 +307,7 @@ public class AppDataConnection : DataConnection
|
|||||||
/// <returns>包含实验板信息的结果,如果未找到则返回空</returns>
|
/// <returns>包含实验板信息的结果,如果未找到则返回空</returns>
|
||||||
public Result<Optional<Board>> GetBoardByID(Guid id)
|
public Result<Optional<Board>> GetBoardByID(Guid id)
|
||||||
{
|
{
|
||||||
var boards = this.BoardTable.Where(board => board.ID == id).ToArray();
|
var boards = _db.BoardTable.Where(board => board.ID == id).ToArray();
|
||||||
|
|
||||||
if (boards.Length > 1)
|
if (boards.Length > 1)
|
||||||
{
|
{
|
||||||
@@ -479,13 +325,38 @@ public class AppDataConnection : DataConnection
|
|||||||
return new(boards[0]);
|
return new(boards[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 根据用户名获取实验板信息
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="userName">用户名</param>
|
||||||
|
/// <returns>包含实验板信息的结果,如果未找到则返回空</returns>
|
||||||
|
public Result<Optional<Board>> GetBoardByUserName(string userName)
|
||||||
|
{
|
||||||
|
var boards = _db.BoardTable.Where(board => board.OccupiedUserName == userName).ToArray();
|
||||||
|
|
||||||
|
if (boards.Length > 1)
|
||||||
|
{
|
||||||
|
logger.Error($"数据库中存在多个相同用户名的实验板: {userName}");
|
||||||
|
return new(new Exception($"数据库中存在多个相同用户名的实验板: {userName}"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (boards.Length == 0)
|
||||||
|
{
|
||||||
|
logger.Info($"未找到用户名对应的实验板: {userName}");
|
||||||
|
return new(Optional<Board>.None);
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.Debug($"成功获取实验板信息: {userName}");
|
||||||
|
return new(boards[0]);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取所有实验板信息
|
/// 获取所有实验板信息
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>所有实验板的数组</returns>
|
/// <returns>所有实验板的数组</returns>
|
||||||
public Board[] GetAllBoard()
|
public Board[] GetAllBoard()
|
||||||
{
|
{
|
||||||
var boards = this.BoardTable.ToArray();
|
var boards = _db.BoardTable.ToArray();
|
||||||
logger.Debug($"获取所有实验板,共 {boards.Length} 块");
|
logger.Debug($"获取所有实验板,共 {boards.Length} 块");
|
||||||
return boards;
|
return boards;
|
||||||
}
|
}
|
||||||
@@ -498,8 +369,8 @@ public class AppDataConnection : DataConnection
|
|||||||
/// <returns>可用的实验板,如果没有可用的板子则返回空</returns>
|
/// <returns>可用的实验板,如果没有可用的板子则返回空</returns>
|
||||||
public Optional<Board> GetAvailableBoard(Guid userId, DateTime expireTime)
|
public Optional<Board> GetAvailableBoard(Guid userId, DateTime expireTime)
|
||||||
{
|
{
|
||||||
var boards = this.BoardTable.Where(
|
var boards = _db.BoardTable.Where(
|
||||||
(board) => board.Status == Database.Board.BoardStatus.Available
|
(board) => board.Status == BoardStatus.Available
|
||||||
).ToArray();
|
).ToArray();
|
||||||
|
|
||||||
if (boards.Length == 0)
|
if (boards.Length == 0)
|
||||||
@@ -510,7 +381,7 @@ public class AppDataConnection : DataConnection
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
var board = boards[0];
|
var board = boards[0];
|
||||||
var user = this.UserTable.Where(u => u.ID == userId).FirstOrDefault();
|
var user = _db.UserTable.Where(u => u.ID == userId).FirstOrDefault();
|
||||||
|
|
||||||
if (user == null)
|
if (user == null)
|
||||||
{
|
{
|
||||||
@@ -519,21 +390,21 @@ public class AppDataConnection : DataConnection
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 更新板子状态和用户绑定信息
|
// 更新板子状态和用户绑定信息
|
||||||
this.BoardTable
|
_db.BoardTable
|
||||||
.Where(target => target.ID == board.ID)
|
.Where(target => target.ID == board.ID)
|
||||||
.Set(target => target.Status, Board.BoardStatus.Busy)
|
.Set(target => target.Status, BoardStatus.Busy)
|
||||||
.Set(target => target.OccupiedUserID, userId)
|
.Set(target => target.OccupiedUserID, userId)
|
||||||
.Set(target => target.OccupiedUserName, user.Name)
|
.Set(target => target.OccupiedUserName, user.Name)
|
||||||
.Update();
|
.Update();
|
||||||
|
|
||||||
// 更新用户的板子绑定信息
|
// 更新用户的板子绑定信息
|
||||||
this.UserTable
|
_db.UserTable
|
||||||
.Where(u => u.ID == userId)
|
.Where(u => u.ID == userId)
|
||||||
.Set(u => u.BoardID, board.ID)
|
.Set(u => u.BoardID, board.ID)
|
||||||
.Set(u => u.BoardExpireTime, expireTime)
|
.Set(u => u.BoardExpireTime, expireTime)
|
||||||
.Update();
|
.Update();
|
||||||
|
|
||||||
board.Status = Database.Board.BoardStatus.Busy;
|
board.Status = BoardStatus.Busy;
|
||||||
board.OccupiedUserID = userId;
|
board.OccupiedUserID = userId;
|
||||||
board.OccupiedUserName = user.Name;
|
board.OccupiedUserName = user.Name;
|
||||||
|
|
||||||
@@ -543,12 +414,40 @@ public class AppDataConnection : DataConnection
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 用户表
|
/// [TODO:description]
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ITable<User> UserTable => this.GetTable<User>();
|
/// <param name="boardId">[TODO:parameter]</param>
|
||||||
|
/// <param name="newName">[TODO:parameter]</param>
|
||||||
|
/// <returns>[TODO:return]</returns>
|
||||||
|
public int UpdateBoardName(Guid boardId, string newName)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(newName) || newName.Contains('\'') || newName.Contains(';'))
|
||||||
|
{
|
||||||
|
logger.Error("实验板名称非法,包含不允许的字符");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
var result = _db.BoardTable
|
||||||
|
.Where(b => b.ID == boardId)
|
||||||
|
.Set(b => b.BoardName, newName)
|
||||||
|
.Update();
|
||||||
|
logger.Info($"实验板名称已更新: {boardId} -> {newName}");
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// FPGA 板子表
|
/// [TODO:description]
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ITable<Board> BoardTable => this.GetTable<Board>();
|
/// <param name="boardId">[TODO:parameter]</param>
|
||||||
|
/// <param name="newStatus">[TODO:parameter]</param>
|
||||||
|
/// <returns>[TODO:return]</returns>
|
||||||
|
public int UpdateBoardStatus(Guid boardId, BoardStatus newStatus)
|
||||||
|
{
|
||||||
|
var result = _db.BoardTable
|
||||||
|
.Where(b => b.ID == boardId)
|
||||||
|
.Set(b => b.Status, newStatus)
|
||||||
|
.Update();
|
||||||
|
logger.Info($"TODO");
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
260
server/src/Hubs/DigitalTubesHub.cs
Normal file
260
server/src/Hubs/DigitalTubesHub.cs
Normal file
@@ -0,0 +1,260 @@
|
|||||||
|
using Microsoft.AspNetCore.Authorization;
|
||||||
|
using System.Security.Claims;
|
||||||
|
using Microsoft.AspNetCore.SignalR;
|
||||||
|
using Microsoft.AspNetCore.Cors;
|
||||||
|
using TypedSignalR.Client;
|
||||||
|
using Tapper;
|
||||||
|
using DotNext;
|
||||||
|
using Peripherals.SevenDigitalTubesClient;
|
||||||
|
using System.Collections.Concurrent;
|
||||||
|
|
||||||
|
#pragma warning disable 1998
|
||||||
|
|
||||||
|
namespace server.Hubs;
|
||||||
|
|
||||||
|
[Hub]
|
||||||
|
public interface IDigitalTubesHub
|
||||||
|
{
|
||||||
|
Task<bool> StartScan();
|
||||||
|
Task<bool> StopScan();
|
||||||
|
Task<bool> SetFrequency(int frequency);
|
||||||
|
Task<DigitalTubeTaskStatus?> GetStatus();
|
||||||
|
}
|
||||||
|
|
||||||
|
[Receiver]
|
||||||
|
public interface IDigitalTubesReceiver
|
||||||
|
{
|
||||||
|
Task OnReceive(byte[] data);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TranspilationSource]
|
||||||
|
public class DigitalTubeTaskStatus
|
||||||
|
{
|
||||||
|
public int Frequency { get; set; } = 100;
|
||||||
|
public bool IsRunning { get; set; } = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
class DigitalTubesScanTaskInfo
|
||||||
|
{
|
||||||
|
public string BoardID { get; set; }
|
||||||
|
public string ClientID { get; set; }
|
||||||
|
public Task? ScanTask { get; set; }
|
||||||
|
public SevenDigitalTubesCtrl TubeClient { get; set; }
|
||||||
|
public CancellationTokenSource CTS { get; set; } = new();
|
||||||
|
public int Frequency { get; set; } = 100;
|
||||||
|
public bool IsRunning { get; set; } = false;
|
||||||
|
|
||||||
|
public DigitalTubesScanTaskInfo(
|
||||||
|
string boardID, string clientID, SevenDigitalTubesCtrl client)
|
||||||
|
{
|
||||||
|
BoardID = boardID;
|
||||||
|
ClientID = clientID;
|
||||||
|
TubeClient = client;
|
||||||
|
}
|
||||||
|
|
||||||
|
public DigitalTubeTaskStatus ToDigitalTubeTaskStatus()
|
||||||
|
{
|
||||||
|
return new DigitalTubeTaskStatus
|
||||||
|
{
|
||||||
|
Frequency = Frequency,
|
||||||
|
IsRunning = IsRunning
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[Authorize]
|
||||||
|
[EnableCors("SignalR")]
|
||||||
|
public class DigitalTubesHub : Hub<IDigitalTubesReceiver>, IDigitalTubesHub
|
||||||
|
{
|
||||||
|
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
private readonly IHubContext<DigitalTubesHub, IDigitalTubesReceiver> _hubContext;
|
||||||
|
private readonly Database.UserManager _userManager = new();
|
||||||
|
|
||||||
|
private static ConcurrentDictionary<string, DigitalTubesScanTaskInfo> _scanTasks = new();
|
||||||
|
|
||||||
|
public DigitalTubesHub(IHubContext<DigitalTubesHub, IDigitalTubesReceiver> hubContext)
|
||||||
|
{
|
||||||
|
_hubContext = hubContext;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Optional<Database.Board> TryGetBoard()
|
||||||
|
{
|
||||||
|
var userName = Context.User?.FindFirstValue(ClaimTypes.Name);
|
||||||
|
if (string.IsNullOrEmpty(userName))
|
||||||
|
{
|
||||||
|
logger.Error("User name is null or empty");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
var userRet = _userManager.GetUserByName(userName);
|
||||||
|
if (!userRet.IsSuccessful || !userRet.Value.HasValue)
|
||||||
|
{
|
||||||
|
logger.Error($"User '{userName}' not found");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
var user = userRet.Value.Value;
|
||||||
|
|
||||||
|
var boardRet = _userManager.GetBoardByID(user.BoardID);
|
||||||
|
if (!boardRet.IsSuccessful || !boardRet.Value.HasValue)
|
||||||
|
{
|
||||||
|
logger.Error($"Board not found");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return boardRet.Value.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Task ScanAllTubes(DigitalTubesScanTaskInfo scanInfo)
|
||||||
|
{
|
||||||
|
var token = scanInfo.CTS.Token;
|
||||||
|
return Task.Run(async () =>
|
||||||
|
{
|
||||||
|
var cntError = 0;
|
||||||
|
while (!token.IsCancellationRequested)
|
||||||
|
{
|
||||||
|
var beginTime = DateTime.Now;
|
||||||
|
var waitTime = TimeSpan.FromMilliseconds(1000 / scanInfo.Frequency);
|
||||||
|
|
||||||
|
var dataRet = await scanInfo.TubeClient.ScanAllTubes();
|
||||||
|
if (!dataRet.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to scan tubes: {dataRet.Error}");
|
||||||
|
cntError++;
|
||||||
|
if (cntError > 3)
|
||||||
|
{
|
||||||
|
logger.Error($"Too many errors, stopping scan");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
await _hubContext.Clients.Client(scanInfo.ClientID).OnReceive(dataRet.Value);
|
||||||
|
|
||||||
|
var processTime = DateTime.Now - beginTime;
|
||||||
|
if (processTime < waitTime)
|
||||||
|
{
|
||||||
|
await Task.Delay(waitTime - processTime, token);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
scanInfo.IsRunning = false;
|
||||||
|
}, token)
|
||||||
|
.ContinueWith((task) =>
|
||||||
|
{
|
||||||
|
if (task.IsFaulted)
|
||||||
|
{
|
||||||
|
logger.Error(
|
||||||
|
$"Digital tubes scan operation failesj for board {task.Exception}");
|
||||||
|
}
|
||||||
|
else if (task.IsCanceled)
|
||||||
|
{
|
||||||
|
logger.Info(
|
||||||
|
$"Digital tubes scan operation cancelled for board {scanInfo.BoardID}");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logger.Info(
|
||||||
|
$"Digital tubes scan completed successfully for board {scanInfo.BoardID}");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> StartScan()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var board = TryGetBoard().OrThrow(() => new Exception("Board not found"));
|
||||||
|
var key = board.ID.ToString();
|
||||||
|
|
||||||
|
if (_scanTasks.TryGetValue(key, out var existing) && existing.IsRunning)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
var cts = new CancellationTokenSource();
|
||||||
|
var scanTaskInfo = new DigitalTubesScanTaskInfo(
|
||||||
|
board.ID.ToString(), Context.ConnectionId,
|
||||||
|
new SevenDigitalTubesCtrl(board.IpAddr, board.Port, 6)
|
||||||
|
);
|
||||||
|
scanTaskInfo.ScanTask = ScanAllTubes(scanTaskInfo);
|
||||||
|
|
||||||
|
_scanTasks[key] = scanTaskInfo;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Failed to start scan");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> StopScan()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var board = TryGetBoard().OrThrow(() => new Exception("Board not found"));
|
||||||
|
var key = board.ID.ToString();
|
||||||
|
|
||||||
|
if (_scanTasks.TryRemove(key, out var scanInfo))
|
||||||
|
{
|
||||||
|
scanInfo.IsRunning = false;
|
||||||
|
scanInfo.CTS.Cancel();
|
||||||
|
if (scanInfo.ScanTask != null)
|
||||||
|
await scanInfo.ScanTask;
|
||||||
|
scanInfo.CTS.Dispose();
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Failed to stop scan");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> SetFrequency(int frequency)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (frequency < 1 || frequency > 1000)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
var board = TryGetBoard().OrThrow(() => new Exception("Board not found"));
|
||||||
|
var key = board.ID.ToString();
|
||||||
|
|
||||||
|
if (_scanTasks.TryGetValue(key, out var scanInfo) && scanInfo.IsRunning)
|
||||||
|
{
|
||||||
|
scanInfo.Frequency = frequency;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logger.Warn($"SetFrequency called but no running scan for board {board.ID} and client {Context.ConnectionId}");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Failed to set frequency");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<DigitalTubeTaskStatus?> GetStatus()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var board = TryGetBoard().OrThrow(() => new Exception("Board not found"));
|
||||||
|
var key = board.ID.ToString();
|
||||||
|
|
||||||
|
if (_scanTasks.TryGetValue(key, out var scanInfo))
|
||||||
|
{
|
||||||
|
return scanInfo.ToDigitalTubeTaskStatus();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Failed to get status");
|
||||||
|
throw new Exception("Failed to get status", ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
203
server/src/Hubs/JtagHub.cs
Normal file
203
server/src/Hubs/JtagHub.cs
Normal file
@@ -0,0 +1,203 @@
|
|||||||
|
using Microsoft.AspNetCore.Authorization;
|
||||||
|
using Microsoft.AspNetCore.Cors;
|
||||||
|
using System.Security.Claims;
|
||||||
|
using Microsoft.AspNetCore.SignalR;
|
||||||
|
using DotNext;
|
||||||
|
using System.Collections.Concurrent;
|
||||||
|
using TypedSignalR.Client;
|
||||||
|
using Tapper;
|
||||||
|
|
||||||
|
namespace server.Hubs;
|
||||||
|
|
||||||
|
[Hub]
|
||||||
|
public interface IJtagHub
|
||||||
|
{
|
||||||
|
Task<bool> SetBoundaryScanFreq(int freq);
|
||||||
|
Task<bool> StartBoundaryScan(int freq = 100);
|
||||||
|
Task<bool> StopBoundaryScan();
|
||||||
|
}
|
||||||
|
|
||||||
|
[Receiver]
|
||||||
|
public interface IJtagReceiver
|
||||||
|
{
|
||||||
|
Task OnReceiveBoundaryScanData(Dictionary<string, bool> msg);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Authorize]
|
||||||
|
[EnableCors("SignalR")]
|
||||||
|
public class JtagHub : Hub<IJtagReceiver>, IJtagHub
|
||||||
|
{
|
||||||
|
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
private readonly IHubContext<JtagHub, IJtagReceiver> _hubContext;
|
||||||
|
private readonly Database.UserManager _userManager = new();
|
||||||
|
|
||||||
|
private static ConcurrentDictionary<string, int> FreqTable = new();
|
||||||
|
private static ConcurrentDictionary<string, CancellationTokenSource> CancellationTokenSourceTable = new();
|
||||||
|
|
||||||
|
public JtagHub(IHubContext<JtagHub, IJtagReceiver> hubContext)
|
||||||
|
{
|
||||||
|
_hubContext = hubContext;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Optional<Peripherals.JtagClient.Jtag> GetJtagClient(string userName)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var board = _userManager.GetBoardByUserName(userName);
|
||||||
|
if (!board.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Find Board {board.Value.Value.ID} failed because {board.Error}");
|
||||||
|
return new(null);
|
||||||
|
}
|
||||||
|
if (!board.Value.HasValue)
|
||||||
|
{
|
||||||
|
logger.Error($"Board {board.Value.Value.ID} not found");
|
||||||
|
return new(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
var jtag = new Peripherals.JtagClient.Jtag(board.Value.Value.IpAddr, board.Value.Value.Port);
|
||||||
|
return new(jtag);
|
||||||
|
}
|
||||||
|
catch (Exception error)
|
||||||
|
{
|
||||||
|
logger.Error(error);
|
||||||
|
return new(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> SetBoundaryScanFreq(int freq)
|
||||||
|
{
|
||||||
|
return await Task.Run(() =>
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var userName = Context.User?.FindFirstValue(ClaimTypes.Name);
|
||||||
|
if (userName is null)
|
||||||
|
{
|
||||||
|
logger.Error("Can't get user info");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
FreqTable.AddOrUpdate(userName, freq, (key, value) => freq);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Exception error)
|
||||||
|
{
|
||||||
|
logger.Error(error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> StartBoundaryScan(int freq = 100)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var userName = Context.User?.FindFirstValue(ClaimTypes.Name);
|
||||||
|
if (userName is null)
|
||||||
|
{
|
||||||
|
logger.Error("No Such User");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
await SetBoundaryScanFreq(freq);
|
||||||
|
var cts = new CancellationTokenSource();
|
||||||
|
CancellationTokenSourceTable.AddOrUpdate(userName, cts, (key, value) => cts);
|
||||||
|
|
||||||
|
_ = Task.Run(
|
||||||
|
() => BoundaryScanLogicPorts(Context.ConnectionId, userName, cts.Token),
|
||||||
|
cts.Token)
|
||||||
|
.ContinueWith((task) =>
|
||||||
|
{
|
||||||
|
if (task.IsFaulted)
|
||||||
|
{
|
||||||
|
// 遍历所有异常
|
||||||
|
foreach (var ex in task.Exception.InnerExceptions)
|
||||||
|
{
|
||||||
|
if (ex is OperationCanceledException)
|
||||||
|
{
|
||||||
|
logger.Info($"Boundary scan operation cancelled for user {userName}");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logger.Error($"Boundary scan operation failed for user {userName}: {ex}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (task.IsCanceled)
|
||||||
|
{
|
||||||
|
logger.Info($"Boundary scan operation cancelled for user {userName}");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logger.Info($"Boundary scan completed successfully for user {userName}");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
logger.Info($"Boundary scan started for user {userName}");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Exception error)
|
||||||
|
{
|
||||||
|
logger.Error(error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> StopBoundaryScan()
|
||||||
|
{
|
||||||
|
return await Task.Run(() =>
|
||||||
|
{
|
||||||
|
var userName = Context.User?.FindFirstValue(ClaimTypes.Name);
|
||||||
|
if (userName is null)
|
||||||
|
{
|
||||||
|
logger.Error("No Such User");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!CancellationTokenSourceTable.TryGetValue(userName, out var cts))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
cts.Cancel();
|
||||||
|
cts.Token.WaitHandle.WaitOne();
|
||||||
|
|
||||||
|
logger.Info($"Boundary scan stopped for user {userName}");
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task BoundaryScanLogicPorts(string connectionID, string userName, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var jtagCtrl = GetJtagClient(userName).OrThrow(() => new InvalidOperationException("JTAG client not found"));
|
||||||
|
var cntFail = 0;
|
||||||
|
|
||||||
|
while (true && cntFail < 5)
|
||||||
|
{
|
||||||
|
cancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
|
var ret = await jtagCtrl.BoundaryScanLogicalPorts();
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"User {userName} boundary scan failed for device {jtagCtrl.address}: {ret.Error}");
|
||||||
|
cntFail++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
await _hubContext.Clients.Client(connectionID).OnReceiveBoundaryScanData(ret.Value);
|
||||||
|
// logger.Info($"User {userName} successfully completed boundary scan for device {jtagCtrl.address}");
|
||||||
|
|
||||||
|
await Task.Delay(FreqTable.TryGetValue(userName, out var freq) ? 1000 / freq : 1000 / 100, cancellationToken);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cntFail >= 5)
|
||||||
|
{
|
||||||
|
logger.Error($"User {userName} boundary scan failed for device {jtagCtrl.address} after 5 attempts");
|
||||||
|
throw new InvalidOperationException("Boundary scan failed");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
403
server/src/Hubs/OscilloscopeHub.cs
Normal file
403
server/src/Hubs/OscilloscopeHub.cs
Normal file
@@ -0,0 +1,403 @@
|
|||||||
|
using Microsoft.AspNetCore.Authorization;
|
||||||
|
using System.Security.Claims;
|
||||||
|
using Microsoft.AspNetCore.SignalR;
|
||||||
|
using Microsoft.AspNetCore.Cors;
|
||||||
|
using TypedSignalR.Client;
|
||||||
|
using DotNext;
|
||||||
|
using Tapper;
|
||||||
|
using System.Collections.Concurrent;
|
||||||
|
using Peripherals.OscilloscopeClient;
|
||||||
|
|
||||||
|
#pragma warning disable 1998
|
||||||
|
|
||||||
|
namespace server.Hubs;
|
||||||
|
|
||||||
|
[Hub]
|
||||||
|
public interface IOscilloscopeHub
|
||||||
|
{
|
||||||
|
Task<bool> Initialize(OscilloscopeFullConfig config);
|
||||||
|
Task<bool> StartCapture();
|
||||||
|
Task<bool> StopCapture();
|
||||||
|
Task<OscilloscopeDataResponse?> GetData();
|
||||||
|
Task<bool> SetTrigger(byte level);
|
||||||
|
Task<bool> SetRisingEdge(bool risingEdge);
|
||||||
|
Task<bool> SetSampling(ushort decimationRate);
|
||||||
|
Task<bool> SetFrequency(int frequency);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Receiver]
|
||||||
|
public interface IOscilloscopeReceiver
|
||||||
|
{
|
||||||
|
Task OnDataReceived(OscilloscopeDataResponse data);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TranspilationSource]
|
||||||
|
public class OscilloscopeDataResponse
|
||||||
|
{
|
||||||
|
public uint AdFrequency { get; set; }
|
||||||
|
public byte AdVpp { get; set; }
|
||||||
|
public byte AdMax { get; set; }
|
||||||
|
public byte AdMin { get; set; }
|
||||||
|
public string WaveformData { get; set; } = "";
|
||||||
|
}
|
||||||
|
|
||||||
|
[TranspilationSource]
|
||||||
|
public class OscilloscopeFullConfig
|
||||||
|
{
|
||||||
|
public bool CaptureEnabled { get; set; }
|
||||||
|
public byte TriggerLevel { get; set; }
|
||||||
|
public bool TriggerRisingEdge { get; set; }
|
||||||
|
public ushort HorizontalShift { get; set; }
|
||||||
|
public ushort DecimationRate { get; set; }
|
||||||
|
public int CaptureFrequency { get; set; }
|
||||||
|
// public bool AutoRefreshRAM { get; set; }
|
||||||
|
|
||||||
|
public OscilloscopeConfig ToOscilloscopeConfig()
|
||||||
|
{
|
||||||
|
return new OscilloscopeConfig
|
||||||
|
{
|
||||||
|
CaptureEnabled = CaptureEnabled,
|
||||||
|
TriggerLevel = TriggerLevel,
|
||||||
|
TriggerRisingEdge = TriggerRisingEdge,
|
||||||
|
HorizontalShift = HorizontalShift,
|
||||||
|
DecimationRate = DecimationRate,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class OscilloscopeScanTaskInfo
|
||||||
|
{
|
||||||
|
public Task? ScanTask { get; set; }
|
||||||
|
public OscilloscopeCtrl Client { get; set; }
|
||||||
|
public CancellationTokenSource CTS { get; set; } = new CancellationTokenSource();
|
||||||
|
public int Frequency { get; set; } = 100;
|
||||||
|
|
||||||
|
public OscilloscopeScanTaskInfo(OscilloscopeCtrl client)
|
||||||
|
{
|
||||||
|
Client = client;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[Authorize]
|
||||||
|
[EnableCors("SignalR")]
|
||||||
|
public class OscilloscopeHub : Hub<IOscilloscopeReceiver>, IOscilloscopeHub
|
||||||
|
{
|
||||||
|
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
private readonly IHubContext<OscilloscopeHub, IOscilloscopeReceiver> _hubContext;
|
||||||
|
private readonly Database.UserManager _userManager = new();
|
||||||
|
|
||||||
|
private static ConcurrentDictionary<string, OscilloscopeScanTaskInfo> _scanTasks = new();
|
||||||
|
|
||||||
|
public OscilloscopeHub(IHubContext<OscilloscopeHub, IOscilloscopeReceiver> hubContext)
|
||||||
|
{
|
||||||
|
_hubContext = hubContext;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Optional<Database.Board> TryGetBoard()
|
||||||
|
{
|
||||||
|
var userName = Context.User?.FindFirstValue(ClaimTypes.Name);
|
||||||
|
if (string.IsNullOrEmpty(userName))
|
||||||
|
{
|
||||||
|
logger.Error("User name is null or empty");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
var boardRet = _userManager.GetBoardByUserName(userName);
|
||||||
|
if (!boardRet.IsSuccessful || !boardRet.Value.HasValue)
|
||||||
|
{
|
||||||
|
logger.Error($"Board not found");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return boardRet.Value.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Optional<OscilloscopeCtrl> GetOscilloscope()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var board = TryGetBoard().OrThrow(() => new Exception("Board not found"));
|
||||||
|
var client = new OscilloscopeCtrl(board.IpAddr, board.Port);
|
||||||
|
return client;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Failed to get oscilloscope");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> Initialize(OscilloscopeFullConfig config)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var client = GetOscilloscope().OrThrow(() => new Exception("Oscilloscope not found"));
|
||||||
|
|
||||||
|
var result = await client.Init(config.ToOscilloscopeConfig());
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error(result.Error, "Initialize failed");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return result.Value;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Failed to initialize oscilloscope");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private Task ScanTask(OscilloscopeScanTaskInfo taskInfo, string clientId)
|
||||||
|
{
|
||||||
|
var token = taskInfo.CTS.Token;
|
||||||
|
return Task.Run(async () =>
|
||||||
|
{
|
||||||
|
while (!token.IsCancellationRequested)
|
||||||
|
{
|
||||||
|
var data = await GetCaptureData(taskInfo.Client);
|
||||||
|
if (data == null)
|
||||||
|
{
|
||||||
|
logger.Error("GetData failed");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
await _hubContext.Clients.Client(clientId).OnDataReceived(data);
|
||||||
|
await Task.Delay(1000 / taskInfo.Frequency, token);
|
||||||
|
}
|
||||||
|
}, token).ContinueWith(t =>
|
||||||
|
{
|
||||||
|
if (t.IsFaulted)
|
||||||
|
logger.Error(t.Exception, "ScanTask failed");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> StartCapture()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var board = TryGetBoard().OrThrow(() => new Exception("Board not found"));
|
||||||
|
var key = board.ID.ToString();
|
||||||
|
var client = GetOscilloscope().OrThrow(() => new Exception("Oscilloscope not found"));
|
||||||
|
|
||||||
|
if (_scanTasks.TryGetValue(key, out var existing))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
var result = await client.SetCaptureEnable(true);
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error(result.Error, "StartCapture failed");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
var scanTaskInfo = new OscilloscopeScanTaskInfo(client);
|
||||||
|
scanTaskInfo.ScanTask = ScanTask(scanTaskInfo, Context.ConnectionId);
|
||||||
|
|
||||||
|
return _scanTasks.TryAdd(key, scanTaskInfo);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Failed to start capture");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> StopCapture()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var board = TryGetBoard().OrThrow(() => new Exception("Board not found"));
|
||||||
|
var client = GetOscilloscope().OrThrow(() => new Exception("Oscilloscope not found"));
|
||||||
|
|
||||||
|
var key = board.ID.ToString();
|
||||||
|
|
||||||
|
if (_scanTasks.TryRemove(key, out var taskInfo))
|
||||||
|
{
|
||||||
|
taskInfo.CTS.Cancel();
|
||||||
|
if (taskInfo.ScanTask != null) taskInfo.ScanTask.Wait();
|
||||||
|
|
||||||
|
var result = await client.SetCaptureEnable(false);
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error(result.Error, "StopCapture failed");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return result.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Exception("Task not found");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Failed to stop capture");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<OscilloscopeDataResponse?> GetCaptureData(OscilloscopeCtrl oscilloscope)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var freqResult = await oscilloscope.GetADFrequency();
|
||||||
|
var vppResult = await oscilloscope.GetADVpp();
|
||||||
|
var maxResult = await oscilloscope.GetADMax();
|
||||||
|
var minResult = await oscilloscope.GetADMin();
|
||||||
|
var waveformResult = await oscilloscope.GetWaveformData();
|
||||||
|
|
||||||
|
if (!freqResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"获取AD采样频率失败: {freqResult.Error}");
|
||||||
|
throw new Exception($"获取AD采样频率失败: {freqResult.Error}");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!vppResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"获取AD采样幅度失败: {vppResult.Error}");
|
||||||
|
throw new Exception($"获取AD采样幅度失败: {vppResult.Error}");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!maxResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"获取AD采样最大值失败: {maxResult.Error}");
|
||||||
|
throw new Exception($"获取AD采样最大值失败: {maxResult.Error}");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!minResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"获取AD采样最小值失败: {minResult.Error}");
|
||||||
|
throw new Exception($"获取AD采样最小值失败: {minResult.Error}");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!waveformResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"获取波形数据失败: {waveformResult.Error}");
|
||||||
|
throw new Exception($"获取波形数据失败: {waveformResult.Error}");
|
||||||
|
}
|
||||||
|
|
||||||
|
var response = new OscilloscopeDataResponse
|
||||||
|
{
|
||||||
|
AdFrequency = freqResult.Value,
|
||||||
|
AdVpp = vppResult.Value,
|
||||||
|
AdMax = maxResult.Value,
|
||||||
|
AdMin = minResult.Value,
|
||||||
|
WaveformData = Convert.ToBase64String(waveformResult.Value)
|
||||||
|
};
|
||||||
|
|
||||||
|
return new OscilloscopeDataResponse
|
||||||
|
{
|
||||||
|
AdFrequency = freqResult.Value,
|
||||||
|
AdVpp = vppResult.Value,
|
||||||
|
AdMax = maxResult.Value,
|
||||||
|
AdMin = minResult.Value,
|
||||||
|
WaveformData = Convert.ToBase64String(waveformResult.Value)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "获取示波器数据时发生异常");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<OscilloscopeDataResponse?> GetData()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var oscilloscope = GetOscilloscope().OrThrow(() => new Exception("Oscilloscope not found"));
|
||||||
|
var response = await GetCaptureData(oscilloscope);
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "获取示波器数据时发生异常");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> SetTrigger(byte level)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var client = GetOscilloscope().OrThrow(() => new Exception("Oscilloscope not found"));
|
||||||
|
var ret = await client.SetTriggerLevel(level);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error(ret.Error, "UpdateTrigger failed");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return ret.Value;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Failed to update trigger");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> SetRisingEdge(bool risingEdge)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var client = GetOscilloscope().OrThrow(() => new Exception("Oscilloscope not found"));
|
||||||
|
var ret = await client.SetTriggerEdge(risingEdge);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error(ret.Error, "Update Rising Edge failed");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return ret.Value;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "SetRisingEdge failed");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> SetSampling(ushort decimationRate)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var client = GetOscilloscope().OrThrow(() => new Exception("Oscilloscope not found"));
|
||||||
|
var result = await client.SetDecimationRate(decimationRate);
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error(result.Error, "UpdateSampling failed");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return result.Value;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Failed to update sampling");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> SetFrequency(int frequency)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (frequency < 1 || frequency > 1000)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
var board = TryGetBoard().OrThrow(() => new Exception("Board not found"));
|
||||||
|
var key = board.ID.ToString();
|
||||||
|
|
||||||
|
if (_scanTasks.TryGetValue(key, out var scanInfo))
|
||||||
|
{
|
||||||
|
scanInfo.Frequency = frequency;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logger.Warn($"SetFrequency called but no running scan for board {board.ID} and client {Context.ConnectionId}");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Failed to set frequency");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
77
server/src/Hubs/ProgressHub.cs
Normal file
77
server/src/Hubs/ProgressHub.cs
Normal file
@@ -0,0 +1,77 @@
|
|||||||
|
using Microsoft.AspNetCore.Authorization;
|
||||||
|
using Microsoft.AspNetCore.SignalR;
|
||||||
|
using Microsoft.AspNetCore.Cors;
|
||||||
|
using TypedSignalR.Client;
|
||||||
|
using Tapper;
|
||||||
|
using server.Services;
|
||||||
|
|
||||||
|
#pragma warning disable 1998
|
||||||
|
|
||||||
|
namespace server.Hubs;
|
||||||
|
|
||||||
|
[Hub]
|
||||||
|
public interface IProgressHub
|
||||||
|
{
|
||||||
|
Task<bool> Join(string taskId);
|
||||||
|
Task<bool> Leave(string taskId);
|
||||||
|
Task<ProgressInfo?> GetProgress(string taskId);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Receiver]
|
||||||
|
public interface IProgressReceiver
|
||||||
|
{
|
||||||
|
Task OnReceiveProgress(ProgressInfo message);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TranspilationSource]
|
||||||
|
public enum ProgressStatus
|
||||||
|
{
|
||||||
|
Running,
|
||||||
|
Completed,
|
||||||
|
Canceled,
|
||||||
|
Failed
|
||||||
|
}
|
||||||
|
|
||||||
|
[TranspilationSource]
|
||||||
|
public class ProgressInfo
|
||||||
|
{
|
||||||
|
public required string TaskId { get; set; }
|
||||||
|
public required ProgressStatus Status { get; set; }
|
||||||
|
public required double ProgressPercent { get; set; }
|
||||||
|
public required string ErrorMessage { get; set; }
|
||||||
|
};
|
||||||
|
|
||||||
|
[Authorize]
|
||||||
|
[EnableCors("SignalR")]
|
||||||
|
public class ProgressHub : Hub<IProgressReceiver>, IProgressHub
|
||||||
|
{
|
||||||
|
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
private readonly ProgressTracker _progressTracker = MsgBus.ProgressTracker;
|
||||||
|
|
||||||
|
public async Task<bool> Join(string taskId)
|
||||||
|
{
|
||||||
|
await Groups.AddToGroupAsync(Context.ConnectionId, taskId);
|
||||||
|
|
||||||
|
// 发送当前状态(如果存在)
|
||||||
|
var task = _progressTracker.GetTask(taskId);
|
||||||
|
if (task != null)
|
||||||
|
{
|
||||||
|
await Clients.Caller.OnReceiveProgress(task.Value.ToProgressInfo());
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.Info($"Client {Context.ConnectionId} joined task {taskId}");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> Leave(string taskId)
|
||||||
|
{
|
||||||
|
await Groups.RemoveFromGroupAsync(Context.ConnectionId, taskId);
|
||||||
|
logger.Info($"Client {Context.ConnectionId} left task {taskId}");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<ProgressInfo?> GetProgress(string taskId)
|
||||||
|
{
|
||||||
|
return _progressTracker.GetTask(taskId)?.ToProgressInfo();
|
||||||
|
}
|
||||||
|
}
|
||||||
268
server/src/Hubs/RotaryEncoderHub.cs
Normal file
268
server/src/Hubs/RotaryEncoderHub.cs
Normal file
@@ -0,0 +1,268 @@
|
|||||||
|
using Microsoft.AspNetCore.Authorization;
|
||||||
|
using System.Security.Claims;
|
||||||
|
using Microsoft.AspNetCore.SignalR;
|
||||||
|
using Microsoft.AspNetCore.Cors;
|
||||||
|
using TypedSignalR.Client;
|
||||||
|
using DotNext;
|
||||||
|
using Peripherals.RotaryEncoderClient;
|
||||||
|
using System.Collections.Concurrent;
|
||||||
|
|
||||||
|
#pragma warning disable 1998
|
||||||
|
|
||||||
|
namespace server.Hubs;
|
||||||
|
|
||||||
|
[Hub]
|
||||||
|
public interface IRotaryEncoderHub
|
||||||
|
{
|
||||||
|
Task<bool> SetEnable(bool enable);
|
||||||
|
Task<bool> RotateEncoderOnce(int num, RotaryEncoderDirection direction);
|
||||||
|
Task<bool> PressEncoderOnce(int num, RotaryEncoderPressStatus press);
|
||||||
|
Task<bool> EnableCycleRotateEncoder(int num, RotaryEncoderDirection direction, int freq);
|
||||||
|
Task<bool> DisableCycleRotateEncoder();
|
||||||
|
}
|
||||||
|
|
||||||
|
[Receiver]
|
||||||
|
public interface IRotaryEncoderReceiver
|
||||||
|
{
|
||||||
|
Task OnReceiveRotate(int num, RotaryEncoderDirection direction);
|
||||||
|
}
|
||||||
|
|
||||||
|
public class CycleTaskInfo
|
||||||
|
{
|
||||||
|
public Task? CycleTask { get; set; }
|
||||||
|
public RotaryEncoderCtrl EncoderClient { get; set; }
|
||||||
|
public CancellationTokenSource CTS { get; set; } = new();
|
||||||
|
public int Freq { get; set; }
|
||||||
|
public int Num { get; set; }
|
||||||
|
public RotaryEncoderDirection Direction { get; set; }
|
||||||
|
|
||||||
|
public CycleTaskInfo(
|
||||||
|
RotaryEncoderCtrl client,
|
||||||
|
int num, int freq,
|
||||||
|
RotaryEncoderDirection direction)
|
||||||
|
{
|
||||||
|
EncoderClient = client;
|
||||||
|
Num = num;
|
||||||
|
Direction = direction;
|
||||||
|
Freq = freq;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[Authorize]
|
||||||
|
[EnableCors("SignalR")]
|
||||||
|
public class RotaryEncoderHub : Hub<IRotaryEncoderReceiver>, IRotaryEncoderHub
|
||||||
|
{
|
||||||
|
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
private readonly IHubContext<RotaryEncoderHub, IRotaryEncoderReceiver> _hubContext;
|
||||||
|
private readonly Database.UserManager _userManager = new();
|
||||||
|
|
||||||
|
private ConcurrentDictionary<(string, string), CycleTaskInfo> _cycleTasks = new();
|
||||||
|
|
||||||
|
public RotaryEncoderHub(IHubContext<RotaryEncoderHub, IRotaryEncoderReceiver> hubContext)
|
||||||
|
{
|
||||||
|
_hubContext = hubContext;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Optional<Database.Board> TryGetBoard()
|
||||||
|
{
|
||||||
|
var userName = Context.User?.FindFirstValue(ClaimTypes.Name);
|
||||||
|
if (string.IsNullOrEmpty(userName))
|
||||||
|
{
|
||||||
|
logger.Error("User name is null or empty");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
var userRet = _userManager.GetUserByName(userName);
|
||||||
|
if (!userRet.IsSuccessful || !userRet.Value.HasValue)
|
||||||
|
{
|
||||||
|
logger.Error($"User '{userName}' not found");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
var user = userRet.Value.Value;
|
||||||
|
|
||||||
|
var boardRet = _userManager.GetBoardByID(user.BoardID);
|
||||||
|
if (!boardRet.IsSuccessful || !boardRet.Value.HasValue)
|
||||||
|
{
|
||||||
|
logger.Error($"Board not found");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return boardRet.Value.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> SetEnable(bool enable)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var board = TryGetBoard().OrThrow(() => new Exception("Board not found"));
|
||||||
|
var encoderCtrl = new RotaryEncoderCtrl(board.IpAddr, board.Port, 0);
|
||||||
|
var result = await encoderCtrl.SetEnable(enable);
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error(result.Error, "SetEnable failed");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return result.Value;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Failed to set enable");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> RotateEncoderOnce(int num, RotaryEncoderDirection direction)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (num <= 0 || num > 4)
|
||||||
|
throw new ArgumentException($"RotaryEncoder num should be 1~3, instead of {num}");
|
||||||
|
|
||||||
|
var board = TryGetBoard().OrThrow(() => new Exception("Board not found"));
|
||||||
|
var encoderCtrl = new RotaryEncoderCtrl(board.IpAddr, board.Port, 0);
|
||||||
|
var result = await encoderCtrl.RotateEncoderOnce(num, direction);
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error(result.Error, $"RotateEncoderOnce({num}, {direction}) failed");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return result.Value;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Failed to rotate encoder once");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> PressEncoderOnce(int num, RotaryEncoderPressStatus press)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (num <= 0 || num > 4)
|
||||||
|
throw new ArgumentException($"RotaryEncoder num should be 1~3, instead of {num}");
|
||||||
|
|
||||||
|
var board = TryGetBoard().OrThrow(() => new Exception("Board not found"));
|
||||||
|
var encoderCtrl = new RotaryEncoderCtrl(board.IpAddr, board.Port, 0);
|
||||||
|
var result = await encoderCtrl.PressEncoderOnce(num, press);
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error(result.Error, $"RotateEncoderOnce({num}, {press}) failed");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return result.Value;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Failed to rotate encoder once");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> EnableCycleRotateEncoder(int num, RotaryEncoderDirection direction, int freq)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (num <= 0 || num > 4) throw new ArgumentException(
|
||||||
|
$"RotaryEncoder num should be 1~3, instead of {num}");
|
||||||
|
|
||||||
|
if (freq <= 0 || freq > 1000) throw new ArgumentException(
|
||||||
|
$"Frequency should be between 1 and 1000, instead of {freq}");
|
||||||
|
|
||||||
|
var board = TryGetBoard().OrThrow(() => new Exception("Board not found"));
|
||||||
|
var key = (board.ID.ToString(), Context.ConnectionId);
|
||||||
|
|
||||||
|
if (_cycleTasks.TryGetValue(key, out var existing))
|
||||||
|
await DisableCycleRotateEncoder();
|
||||||
|
|
||||||
|
var cts = new CancellationTokenSource();
|
||||||
|
var encoderCtrl = new RotaryEncoderCtrl(board.IpAddr, board.Port, 0);
|
||||||
|
var cycleTaskInfo = new CycleTaskInfo(encoderCtrl, num, freq, direction);
|
||||||
|
cycleTaskInfo.CycleTask = CycleRotate(cycleTaskInfo, Context.ConnectionId, board.ID.ToString());
|
||||||
|
|
||||||
|
_cycleTasks[key] = cycleTaskInfo;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Failed to enable cycle rotate encoder");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> DisableCycleRotateEncoder()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var board = TryGetBoard().OrThrow(() => new Exception("Board not found"));
|
||||||
|
var key = (board.ID.ToString(), Context.ConnectionId);
|
||||||
|
|
||||||
|
if (_cycleTasks.TryRemove(key, out var taskInfo))
|
||||||
|
{
|
||||||
|
taskInfo.CTS.Cancel();
|
||||||
|
if (taskInfo.CycleTask != null)
|
||||||
|
await taskInfo.CycleTask;
|
||||||
|
taskInfo.CTS.Dispose();
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Failed to disable cycle rotate encoder");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private Task CycleRotate(CycleTaskInfo taskInfo, string clientId, string boardId)
|
||||||
|
{
|
||||||
|
var ctrl = taskInfo.EncoderClient;
|
||||||
|
var token = taskInfo.CTS.Token;
|
||||||
|
return Task.Run(async () =>
|
||||||
|
{
|
||||||
|
var cntError = 0;
|
||||||
|
while (!token.IsCancellationRequested)
|
||||||
|
{
|
||||||
|
var ret = await ctrl.RotateEncoderOnce(taskInfo.Num, taskInfo.Direction);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error(
|
||||||
|
$"Failed to rotate encoder {taskInfo.Num} on board {boardId}: {ret.Error}");
|
||||||
|
cntError++;
|
||||||
|
if (cntError >= 3)
|
||||||
|
{
|
||||||
|
logger.Error(
|
||||||
|
$"Too many errors occurred while rotating encoder {taskInfo.Num} on board {boardId}");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Warn(
|
||||||
|
$"Encoder {taskInfo.Num} on board {boardId} is not responding");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
await _hubContext.Clients
|
||||||
|
.Client(clientId)
|
||||||
|
.OnReceiveRotate(taskInfo.Num, taskInfo.Direction);
|
||||||
|
|
||||||
|
await Task.Delay(1000 / taskInfo.Freq, token);
|
||||||
|
}
|
||||||
|
}, token)
|
||||||
|
.ContinueWith((task) =>
|
||||||
|
{
|
||||||
|
if (task.IsFaulted)
|
||||||
|
{
|
||||||
|
logger.Error($"Rotary encoder cycle operation failed: {task.Exception}");
|
||||||
|
}
|
||||||
|
else if (task.IsCanceled)
|
||||||
|
{
|
||||||
|
logger.Info($"Rotary encoder cycle operation cancelled for board {boardId}");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logger.Info($"Rotary encoder cycle completed for board {boardId}");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
138
server/src/Hubs/WS2812Hub.cs
Normal file
138
server/src/Hubs/WS2812Hub.cs
Normal file
@@ -0,0 +1,138 @@
|
|||||||
|
using Microsoft.AspNetCore.Authorization;
|
||||||
|
using System.Security.Claims;
|
||||||
|
using Microsoft.AspNetCore.SignalR;
|
||||||
|
using Microsoft.AspNetCore.Cors;
|
||||||
|
using TypedSignalR.Client;
|
||||||
|
using Tapper;
|
||||||
|
using DotNext;
|
||||||
|
using Peripherals.WS2812Client;
|
||||||
|
using System.Collections.Concurrent;
|
||||||
|
|
||||||
|
#pragma warning disable 1998
|
||||||
|
|
||||||
|
namespace server.Hubs;
|
||||||
|
|
||||||
|
[Hub]
|
||||||
|
public interface IWS2812Hub
|
||||||
|
{
|
||||||
|
Task<RGBColor[]?> GetAllLedColors();
|
||||||
|
Task<RGBColor?> GetLedColor(int ledIndex);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Receiver]
|
||||||
|
public interface IWS2812Receiver
|
||||||
|
{
|
||||||
|
Task OnReceive(RGBColor[] data);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TranspilationSource]
|
||||||
|
public class WS2812TaskStatus
|
||||||
|
{
|
||||||
|
public bool IsRunning { get; set; } = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
class WS2812ScanTaskInfo
|
||||||
|
{
|
||||||
|
public string BoardID { get; set; }
|
||||||
|
public string ClientID { get; set; }
|
||||||
|
public Task? ScanTask { get; set; }
|
||||||
|
public WS2812Client LedClient { get; set; }
|
||||||
|
public CancellationTokenSource CTS { get; set; } = new();
|
||||||
|
public bool IsRunning { get; set; } = false;
|
||||||
|
|
||||||
|
public WS2812ScanTaskInfo(string boardID, string clientID, WS2812Client client)
|
||||||
|
{
|
||||||
|
BoardID = boardID;
|
||||||
|
ClientID = clientID;
|
||||||
|
LedClient = client;
|
||||||
|
}
|
||||||
|
|
||||||
|
public WS2812TaskStatus ToWS2812TaskStatus()
|
||||||
|
{
|
||||||
|
return new WS2812TaskStatus
|
||||||
|
{
|
||||||
|
IsRunning = IsRunning
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[Authorize]
|
||||||
|
[EnableCors("SignalR")]
|
||||||
|
public class WS2812Hub : Hub<IWS2812Receiver>, IWS2812Hub
|
||||||
|
{
|
||||||
|
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
private readonly IHubContext<WS2812Hub, IWS2812Receiver> _hubContext;
|
||||||
|
private readonly Database.UserManager _userManager = new();
|
||||||
|
private ConcurrentDictionary<(string, string), WS2812ScanTaskInfo> _scanTasks = new();
|
||||||
|
|
||||||
|
public WS2812Hub(IHubContext<WS2812Hub, IWS2812Receiver> hubContext)
|
||||||
|
{
|
||||||
|
_hubContext = hubContext;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Optional<Database.Board> TryGetBoard()
|
||||||
|
{
|
||||||
|
var userName = Context.User?.FindFirstValue(ClaimTypes.Name);
|
||||||
|
if (string.IsNullOrEmpty(userName))
|
||||||
|
{
|
||||||
|
logger.Error("User name is null or empty");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
var userRet = _userManager.GetUserByName(userName);
|
||||||
|
if (!userRet.IsSuccessful || !userRet.Value.HasValue)
|
||||||
|
{
|
||||||
|
logger.Error($"User '{userName}' not found");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
var user = userRet.Value.Value;
|
||||||
|
var boardRet = _userManager.GetBoardByID(user.BoardID);
|
||||||
|
if (!boardRet.IsSuccessful || !boardRet.Value.HasValue)
|
||||||
|
{
|
||||||
|
logger.Error($"Board not found");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return boardRet.Value.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<RGBColor[]?> GetAllLedColors()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var board = TryGetBoard().OrThrow(() => new Exception("Board not found"));
|
||||||
|
var client = new WS2812Client(board.IpAddr, board.Port, 0);
|
||||||
|
var result = await client.GetAllLedColors();
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"GetAllLedColors failed: {result.Error}");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return result.Value;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Failed to get all LED colors");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<RGBColor?> GetLedColor(int ledIndex)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var board = TryGetBoard().OrThrow(() => new Exception("Board not found"));
|
||||||
|
var client = new WS2812Client(board.IpAddr, board.Port, 0);
|
||||||
|
var result = await client.GetLedColor(ledIndex);
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"GetLedColor failed: {result.Error}");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return result.Value;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Failed to get LED color");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,27 +1,68 @@
|
|||||||
|
using server.Services;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 多线程通信总线
|
/// 多线程通信总线
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static class MsgBus
|
public sealed class MsgBus
|
||||||
{
|
{
|
||||||
|
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
// private static RtspStreamService _rtspStreamService = new RtspStreamService(new UsbCameraCapture());
|
||||||
|
|
||||||
private static readonly UDPServer udpServer = new UDPServer(1234, 12);
|
private static readonly UDPServer udpServer = new UDPServer(1234, 12);
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取UDP服务器
|
/// 获取UDP服务器
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static UDPServer UDPServer { get { return udpServer; } }
|
public static UDPServer UDPServer { get { return udpServer; } }
|
||||||
|
|
||||||
|
// 添加静态ProgressTracker引用
|
||||||
|
private static ProgressTracker? _progressTracker;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 设置全局ProgressTracker实例
|
||||||
|
/// </summary>
|
||||||
|
public static void SetProgressTracker(ProgressTracker progressTracker)
|
||||||
|
{
|
||||||
|
_progressTracker = progressTracker;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ProgressTracker ProgressTracker
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (_progressTracker == null)
|
||||||
|
{
|
||||||
|
throw new InvalidOperationException("ProgressTracker is not set.");
|
||||||
|
}
|
||||||
|
return _progressTracker;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private static bool isRunning = false;
|
private static bool isRunning = false;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取通信总线运行状态
|
/// 获取通信总线运行状态
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static bool IsRunning { get { return isRunning; } }
|
public static bool IsRunning { get { return isRunning; } }
|
||||||
|
|
||||||
|
private MsgBus() { }
|
||||||
|
|
||||||
|
static MsgBus() { }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 通信总线初始化
|
/// 通信总线初始化
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>无</returns>
|
/// <returns>无</returns>
|
||||||
public static void Init()
|
public static async void Init()
|
||||||
{
|
{
|
||||||
|
if (!ArpClient.IsAdministrator())
|
||||||
|
{
|
||||||
|
logger.Error($"非管理员运行,ARP无法更新,请用管理员权限运行");
|
||||||
|
// throw new Exception($"非管理员运行,ARP无法更新,请用管理员权限运行");
|
||||||
|
}
|
||||||
udpServer.Start();
|
udpServer.Start();
|
||||||
|
|
||||||
|
// _rtspStreamService.ConfigureVideo(1920, 1080, 30);
|
||||||
|
// await _rtspStreamService.StartAsync();
|
||||||
|
|
||||||
isRunning = true;
|
isRunning = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
using System.Net;
|
using System.Net;
|
||||||
using DotNext;
|
using DotNext;
|
||||||
using Peripherals.PowerClient;
|
using WebProtocol;
|
||||||
|
|
||||||
namespace Peripherals.CameraClient;
|
namespace Peripherals.CameraClient;
|
||||||
|
|
||||||
@@ -8,19 +8,19 @@ static class CameraAddr
|
|||||||
{
|
{
|
||||||
public const UInt32 BASE = 0x7000_0000;
|
public const UInt32 BASE = 0x7000_0000;
|
||||||
|
|
||||||
public const UInt32 STORE_ADDR = BASE + 0x12;
|
public const UInt32 DMA0_START_WRITE_ADDR = BASE + 0x0C;
|
||||||
public const UInt32 STORE_NUM = BASE + 0x13;
|
public const UInt32 DMA0_END_WRITE_ADDR = BASE + 0x0D;
|
||||||
public const UInt32 EXPECTED_VH = BASE + 0x14;
|
public const UInt32 DMA0_CAPTURE_CTRL = BASE + 0x0E; //[0]: on, 1 is on. [8]: reset, 1 is reset.
|
||||||
public const UInt32 CAPTURE_ON = BASE + 0x15;
|
public const UInt32 EXPECTED_VH = BASE + 0x0F;
|
||||||
public const UInt32 CAMERA_POWER = BASE + 0x16; //[0]: rstn, 0 is reset. [8]: power down, 1 is down.
|
public const UInt32 CAMERA_POWER = BASE + 0x10; //[0]: rstn, 0 is reset. [8]: power down, 1 is down.
|
||||||
}
|
}
|
||||||
|
|
||||||
class Camera
|
public class Camera
|
||||||
{
|
{
|
||||||
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
readonly int timeout = 2000;
|
readonly int timeout = 500;
|
||||||
readonly int taskID;
|
readonly int taskID = 8;
|
||||||
readonly int port;
|
readonly int port;
|
||||||
readonly string address;
|
readonly string address;
|
||||||
private IPEndPoint ep;
|
private IPEndPoint ep;
|
||||||
@@ -43,7 +43,7 @@ class Camera
|
|||||||
/// <param name="address">摄像头设备IP地址</param>
|
/// <param name="address">摄像头设备IP地址</param>
|
||||||
/// <param name="port">摄像头设备端口</param>
|
/// <param name="port">摄像头设备端口</param>
|
||||||
/// <param name="timeout">超时时间(毫秒)</param>
|
/// <param name="timeout">超时时间(毫秒)</param>
|
||||||
public Camera(string address, int port, int timeout = 2000)
|
public Camera(string address, int port, int timeout = 500)
|
||||||
{
|
{
|
||||||
if (timeout < 0)
|
if (timeout < 0)
|
||||||
throw new ArgumentException("Timeout couldn't be negative", nameof(timeout));
|
throw new ArgumentException("Timeout couldn't be negative", nameof(timeout));
|
||||||
@@ -61,7 +61,7 @@ class Camera
|
|||||||
var resetResult = await Reset();
|
var resetResult = await Reset();
|
||||||
if (!resetResult.IsSuccessful) return resetResult;
|
if (!resetResult.IsSuccessful) return resetResult;
|
||||||
|
|
||||||
var wakeupResult = await WakeUp();
|
var wakeupResult = await Sleep();
|
||||||
if (!wakeupResult.IsSuccessful) return wakeupResult;
|
if (!wakeupResult.IsSuccessful) return wakeupResult;
|
||||||
|
|
||||||
// 步骤3: 配置基础寄存器
|
// 步骤3: 配置基础寄存器
|
||||||
@@ -141,22 +141,22 @@ class Camera
|
|||||||
// var resolutionResult = await ConfigureResolution1280x720();
|
// var resolutionResult = await ConfigureResolution1280x720();
|
||||||
if (!resolutionResult.IsSuccessful) return resolutionResult;
|
if (!resolutionResult.IsSuccessful) return resolutionResult;
|
||||||
|
|
||||||
// var startResult = await WakeUp();
|
// var autofocusResult = await InitAutoFocus();
|
||||||
// if (!startResult.IsSuccessful) return startResult;
|
// if (!autofocusResult.IsSuccessful) return autofocusResult;
|
||||||
var sleepResult = await Sleep();
|
|
||||||
if (!sleepResult.IsSuccessful) return sleepResult;
|
var startResult = await WakeUp();
|
||||||
|
if (!startResult.IsSuccessful) return startResult;
|
||||||
|
// var sleepResult = await Sleep();
|
||||||
|
// if (!sleepResult.IsSuccessful) return sleepResult;
|
||||||
// var resetResult2 = await Reset();
|
// var resetResult2 = await Reset();
|
||||||
// if (!resetResult2.IsSuccessful) return resetResult2;
|
// if (!resetResult2.IsSuccessful) return resetResult2;
|
||||||
|
|
||||||
var autofocusResult = await InitAutoFocus();
|
|
||||||
if (!autofocusResult.IsSuccessful) return autofocusResult;
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async ValueTask<Result<bool>> EnableHardwareTrans(bool isEnable)
|
public async ValueTask<Result<bool>> EnableHardwareTrans(bool isEnable)
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, CameraAddr.CAPTURE_ON, Convert.ToUInt32(isEnable));
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, CameraAddr.DMA0_CAPTURE_CTRL, (isEnable ? 0x00000001u : 0x00000100u));
|
||||||
if (!ret.IsSuccessful)
|
if (!ret.IsSuccessful)
|
||||||
{
|
{
|
||||||
logger.Error($"Failed to write CAPTURE_ON to camera at {this.address}:{this.port}, error: {ret.Error}");
|
logger.Error($"Failed to write CAPTURE_ON to camera at {this.address}:{this.port}, error: {ret.Error}");
|
||||||
@@ -185,6 +185,7 @@ class Camera
|
|||||||
return new(new Exception("STORE_ADDR write returned false"));
|
return new(new Exception("STORE_ADDR write returned false"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
await Task.Delay(5); // 确保硬件状态稳定
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -214,7 +215,7 @@ class Camera
|
|||||||
public async ValueTask<Result<byte[]>> ReadFrame()
|
public async ValueTask<Result<byte[]>> ReadFrame()
|
||||||
{
|
{
|
||||||
// 只在第一次或出错时清除UDP缓冲区,避免每帧都清除造成延迟
|
// 只在第一次或出错时清除UDP缓冲区,避免每帧都清除造成延迟
|
||||||
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
// MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
|
||||||
logger.Trace($"Reading frame from camera {this.address}");
|
logger.Trace($"Reading frame from camera {this.address}");
|
||||||
|
|
||||||
@@ -224,6 +225,7 @@ class Camera
|
|||||||
this.taskID, // taskID
|
this.taskID, // taskID
|
||||||
FrameAddr,
|
FrameAddr,
|
||||||
(int)_currentFrameLength, // 使用当前分辨率的动态大小
|
(int)_currentFrameLength, // 使用当前分辨率的动态大小
|
||||||
|
BurstType.ExtendBurst,
|
||||||
this.timeout);
|
this.timeout);
|
||||||
|
|
||||||
if (!result.IsSuccessful)
|
if (!result.IsSuccessful)
|
||||||
@@ -248,7 +250,7 @@ class Camera
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 批量配置I2C寄存器
|
/// 批量配置I2C寄存器
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="registerTable">寄存器配置表,每个元素格式为:[16位寄存器地址, 数据1, 数据2, ...]</param>
|
/// <param name="registerTable">寄存器配置表,每个元素格式为:[16位寄存器地址, 数据1, 数据2, ...],数据按地址递增写入</param>
|
||||||
/// <param name="customDelayMs">自定义延时时间(毫秒),如果为null则使用默认延时逻辑</param>
|
/// <param name="customDelayMs">自定义延时时间(毫秒),如果为null则使用默认延时逻辑</param>
|
||||||
/// <returns>配置结果</returns>
|
/// <returns>配置结果</returns>
|
||||||
public async ValueTask<Result<bool>> ConfigureRegisters(UInt16[][] registerTable, int? customDelayMs = null)
|
public async ValueTask<Result<bool>> ConfigureRegisters(UInt16[][] registerTable, int? customDelayMs = null)
|
||||||
@@ -265,29 +267,34 @@ class Camera
|
|||||||
return new(new ArgumentException($"Invalid register command length: {cmd.Length}, expected at least 2 elements"));
|
return new(new ArgumentException($"Invalid register command length: {cmd.Length}, expected at least 2 elements"));
|
||||||
}
|
}
|
||||||
|
|
||||||
// 将16位地址和数据转换为字节数组
|
var baseAddress = cmd[0];
|
||||||
var i2cData = new byte[cmd.Length + 1]; // +1 because address becomes 2 bytes
|
logger.Debug($"ConfigureRegisters: 配置寄存器组,基地址=0x{baseAddress:X4}, 数据数量={cmd.Length - 1}");
|
||||||
var address = cmd[0];
|
|
||||||
i2cData[0] = (byte)(address >> 8); // 地址高位
|
|
||||||
i2cData[1] = (byte)(address & 0xFF); // 地址低位
|
|
||||||
|
|
||||||
// 复制数据部分
|
// 为每个数据字节单独写入到连续地址
|
||||||
for (int i = 1; i < cmd.Length; i++)
|
for (int i = 1; i < cmd.Length; i++)
|
||||||
{
|
{
|
||||||
i2cData[i + 1] = (byte)cmd[i];
|
var currentAddress = (UInt16)(baseAddress + i - 1);
|
||||||
}
|
var data = (byte)cmd[i];
|
||||||
|
|
||||||
|
logger.Debug($"ConfigureRegisters: 写入地址=0x{currentAddress:X4}, 数据=0x{data:X2}");
|
||||||
|
|
||||||
|
// 准备I2C数据:16位地址 + 8位数据
|
||||||
|
var i2cData = new byte[3];
|
||||||
|
i2cData[0] = (byte)(currentAddress >> 8); // 地址高位
|
||||||
|
i2cData[1] = (byte)(currentAddress & 0xFF); // 地址低位
|
||||||
|
i2cData[2] = data; // 数据
|
||||||
|
|
||||||
var ret = await i2c.WriteData(CAM_I2C_ADDR, i2cData, CAM_PROTO);
|
var ret = await i2c.WriteData(CAM_I2C_ADDR, i2cData, CAM_PROTO);
|
||||||
|
|
||||||
if (!ret.IsSuccessful)
|
if (!ret.IsSuccessful)
|
||||||
{
|
{
|
||||||
logger.Error($"I2C write 0x{CAM_I2C_ADDR.ToString("X")} failed: Address=0x{address:X4}, Data={string.Join(",", cmd.Skip(1).Select(x => $"0x{x:X2}"))} error: {ret.Error}");
|
logger.Error($"I2C write 0x{CAM_I2C_ADDR:X} failed: Address=0x{currentAddress:X4}, Data=0x{data:X2}, error: {ret.Error}");
|
||||||
return new(ret.Error);
|
return new(ret.Error);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ret.Value)
|
if (!ret.Value)
|
||||||
{
|
{
|
||||||
logger.Error($"I2C write 0x{CAM_I2C_ADDR.ToString("X")} returned false: Address=0x{address:X4}, Data={string.Join(",", cmd.Skip(1).Select(x => $"0x{x:X2}"))}");
|
logger.Error($"I2C write 0x{CAM_I2C_ADDR:X} returned false: Address=0x{currentAddress:X4}, Data=0x{data:X2}");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -298,13 +305,13 @@ class Camera
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// 默认延时逻辑:每个寄存器写入后延时1毫秒
|
await Task.Delay(1); // 1ms延时
|
||||||
await Task.Delay(1);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 读取I2C寄存器字节值
|
/// 读取I2C寄存器字节值
|
||||||
@@ -355,7 +362,7 @@ class Camera
|
|||||||
|
|
||||||
// 1. 配置UDP相关寄存器
|
// 1. 配置UDP相关寄存器
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, CameraAddr.STORE_ADDR, FrameAddr);
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, CameraAddr.DMA0_START_WRITE_ADDR, FrameAddr);
|
||||||
if (!ret.IsSuccessful)
|
if (!ret.IsSuccessful)
|
||||||
{
|
{
|
||||||
logger.Error($"Failed to write STORE_ADDR: {ret.Error}");
|
logger.Error($"Failed to write STORE_ADDR: {ret.Error}");
|
||||||
@@ -369,7 +376,7 @@ class Camera
|
|||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, CameraAddr.STORE_NUM, frameLength);
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, CameraAddr.DMA0_END_WRITE_ADDR, FrameAddr + frameLength - 1);
|
||||||
if (!ret.IsSuccessful)
|
if (!ret.IsSuccessful)
|
||||||
{
|
{
|
||||||
logger.Error($"Failed to write STORE_NUM: {ret.Error}");
|
logger.Error($"Failed to write STORE_NUM: {ret.Error}");
|
||||||
@@ -456,6 +463,20 @@ class Camera
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 配置为960x540分辨率
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>配置结果</returns>
|
||||||
|
public async ValueTask<Result<bool>> ConfigureResolution960x540()
|
||||||
|
{
|
||||||
|
return await ConfigureResolution(
|
||||||
|
hStart: 0, vStart: 0,
|
||||||
|
dvpHo: 960, dvpVo: 540,
|
||||||
|
hts: 1700, vts: 1500,
|
||||||
|
hOffset: 16, vOffset: 4
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 配置为320x240分辨率
|
/// 配置为320x240分辨率
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -478,14 +499,46 @@ class Camera
|
|||||||
public async ValueTask<Result<bool>> ConfigureResolution1280x720()
|
public async ValueTask<Result<bool>> ConfigureResolution1280x720()
|
||||||
{
|
{
|
||||||
return await ConfigureResolution(
|
return await ConfigureResolution(
|
||||||
hStart: 0, vStart: 0,
|
hStart: 0, vStart: 250,
|
||||||
dvpHo: 1280, dvpVo: 720,
|
dvpHo: 1280, dvpVo: 720,
|
||||||
hts: 2844, vts: 1968,
|
hts: 2844, vts: 1968,
|
||||||
hOffset: 16, vOffset: 4,
|
hOffset: 16, vOffset: 4,
|
||||||
hWindow: 2592, vWindow: 1944
|
hWindow: 2624, vWindow: 1456
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 配置为1280x720分辨率
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>配置结果</returns>
|
||||||
|
public async ValueTask<Result<bool>> ConfigureResolution1280x960()
|
||||||
|
{
|
||||||
|
return await ConfigureResolution(
|
||||||
|
hStart: 0, vStart: 250,
|
||||||
|
dvpHo: 1280, dvpVo: 960,
|
||||||
|
hts: 2844, vts: 1968,
|
||||||
|
hOffset: 16, vOffset: 4,
|
||||||
|
hWindow: 2624, vWindow: 1456
|
||||||
|
);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 配置为1920x1080分辨率
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>配置结果</returns>
|
||||||
|
public async ValueTask<Result<bool>> ConfigureResolution1920x1080()
|
||||||
|
{
|
||||||
|
return await ConfigureResolution(
|
||||||
|
hStart: 0, vStart: 250,
|
||||||
|
dvpHo: 1920, dvpVo: 1080,
|
||||||
|
hts: 2844, vts: 1968,
|
||||||
|
hOffset: 16, vOffset: 4,
|
||||||
|
hWindow: 2624, vWindow: 1456
|
||||||
|
);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 切换摄像头分辨率
|
/// 切换摄像头分辨率
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -496,7 +549,7 @@ class Camera
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
await WakeUp();
|
// await WakeUp();
|
||||||
logger.Info($"正在切换摄像头分辨率到 {width}x{height}");
|
logger.Info($"正在切换摄像头分辨率到 {width}x{height}");
|
||||||
|
|
||||||
Result<bool> result;
|
Result<bool> result;
|
||||||
@@ -505,9 +558,18 @@ class Camera
|
|||||||
case "640x480":
|
case "640x480":
|
||||||
result = await ConfigureResolution640x480();
|
result = await ConfigureResolution640x480();
|
||||||
break;
|
break;
|
||||||
|
case "960x540":
|
||||||
|
result = await ConfigureResolution960x540();
|
||||||
|
break;
|
||||||
case "1280x720":
|
case "1280x720":
|
||||||
result = await ConfigureResolution1280x720();
|
result = await ConfigureResolution1280x720();
|
||||||
break;
|
break;
|
||||||
|
case "1280x960":
|
||||||
|
result = await ConfigureResolution1280x960();
|
||||||
|
break;
|
||||||
|
case "1920x1080":
|
||||||
|
result = await ConfigureResolution1920x1080();
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
logger.Error($"不支持的分辨率: {width}x{height}");
|
logger.Error($"不支持的分辨率: {width}x{height}");
|
||||||
return new(new ArgumentException($"不支持的分辨率: {width}x{height}"));
|
return new(new ArgumentException($"不支持的分辨率: {width}x{height}"));
|
||||||
@@ -520,7 +582,7 @@ class Camera
|
|||||||
_currentFrameLength = (UInt32)(width * height * 2 / 4); // RGB565格式,按4字节对齐
|
_currentFrameLength = (UInt32)(width * height * 2 / 4); // RGB565格式,按4字节对齐
|
||||||
logger.Info($"摄像头分辨率已切换到 {width}x{height}");
|
logger.Info($"摄像头分辨率已切换到 {width}x{height}");
|
||||||
}
|
}
|
||||||
await Sleep();
|
// await Sleep();
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
@@ -585,7 +647,7 @@ class Camera
|
|||||||
{
|
{
|
||||||
var basicRegisters = new UInt16[][]
|
var basicRegisters = new UInt16[][]
|
||||||
{
|
{
|
||||||
[0x3103, 0x02], // system clock from pad, bit[1]
|
[0x3103, 0x03], // system clock from pad, bit[1] //02
|
||||||
[0x3017, 0xff],
|
[0x3017, 0xff],
|
||||||
[0x3018, 0xff],
|
[0x3018, 0xff],
|
||||||
[0x3037, 0x13],
|
[0x3037, 0x13],
|
||||||
@@ -700,6 +762,7 @@ class Camera
|
|||||||
[0x3c04, 0x28],
|
[0x3c04, 0x28],
|
||||||
[0x3c05, 0x98],
|
[0x3c05, 0x98],
|
||||||
[0x3c06, 0x00],
|
[0x3c06, 0x00],
|
||||||
|
[0x3c07, 0x07],
|
||||||
[0x3c08, 0x00],
|
[0x3c08, 0x00],
|
||||||
[0x3c09, 0x1c],
|
[0x3c09, 0x1c],
|
||||||
[0x3c0a, 0x9c],
|
[0x3c0a, 0x9c],
|
||||||
@@ -753,12 +816,12 @@ class Camera
|
|||||||
{
|
{
|
||||||
var aecRegisters = new UInt16[][]
|
var aecRegisters = new UInt16[][]
|
||||||
{
|
{
|
||||||
[0x3a0f, 0x30], // AEC控制;stable range in high
|
[0x3a0f, 0x30], // AEC控制;stable range in high //78
|
||||||
[0x3a10, 0x28], // AEC控制;stable range in low
|
[0x3a10, 0x28], // AEC控制;stable range in low //68
|
||||||
[0x3a1b, 0x30], // AEC控制;stable range out high
|
[0x3a1b, 0x30], // AEC控制;stable range out high //78
|
||||||
[0x3a1e, 0x26], // AEC控制;stable range out low
|
[0x3a1e, 0x26], // AEC控制;stable range out low //68
|
||||||
[0x3a11, 0x60], // AEC控制; fast zone high
|
[0x3a11, 0x60], // AEC控制; fast zone high //D0
|
||||||
[0x3a1f, 0x14], // AEC控制; fast zone low
|
[0x3a1f, 0x14], // AEC控制; fast zone low //40
|
||||||
[0x3b07, 0x0a] // 帧曝光模式
|
[0x3b07, 0x0a] // 帧曝光模式
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -902,11 +965,11 @@ class Camera
|
|||||||
{
|
{
|
||||||
var timingRegisters = new UInt16[][]
|
var timingRegisters = new UInt16[][]
|
||||||
{
|
{
|
||||||
[0x3035, 0x11], // 60fps
|
[0x3035, 0x21], // 60fps
|
||||||
[0x3036, PLL_MUX],// PLL倍频
|
[0x3036, PLL_MUX],// PLL倍频
|
||||||
[0x3c07, 0x08],
|
[0x3c07, 0x08],
|
||||||
[0x3820, 0x41], // vflip
|
[0x3820, 0x40], // vflip
|
||||||
[0x3821, 0x00], // mirror
|
[0x3821, 0x01], // mirror
|
||||||
[0x3814, 0x11], // timing X inc
|
[0x3814, 0x11], // timing X inc
|
||||||
[0x3815, 0x11] // timing Y inc
|
[0x3815, 0x11] // timing Y inc
|
||||||
};
|
};
|
||||||
@@ -929,7 +992,7 @@ class Camera
|
|||||||
[0x4004, 0x02], // BLC(背光) 2 lines
|
[0x4004, 0x02], // BLC(背光) 2 lines
|
||||||
[0x4713, 0x03], // JPEG mode 3
|
[0x4713, 0x03], // JPEG mode 3
|
||||||
[0x4407, 0x04], // 量化标度
|
[0x4407, 0x04], // 量化标度
|
||||||
[0x460c, 0x20],
|
[0x460c, 0x00],
|
||||||
[0x3a02, 0x17], // 60Hz max exposure
|
[0x3a02, 0x17], // 60Hz max exposure
|
||||||
[0x3a03, 0x10], // 60Hz max exposure
|
[0x3a03, 0x10], // 60Hz max exposure
|
||||||
[0x3a14, 0x17], // 50Hz max exposure
|
[0x3a14, 0x17], // 50Hz max exposure
|
||||||
@@ -937,7 +1000,7 @@ class Camera
|
|||||||
[0x4837, 0x22], // DVP CLK divider
|
[0x4837, 0x22], // DVP CLK divider
|
||||||
[0x3824, 0x02], // DVP CLK divider
|
[0x3824, 0x02], // DVP CLK divider
|
||||||
// 彩条测试禁用
|
// 彩条测试禁用
|
||||||
[0x503d, 0x80],
|
[0x503d, 0x00],
|
||||||
[0x4741, 0x00],
|
[0x4741, 0x00],
|
||||||
// 闪光灯配置
|
// 闪光灯配置
|
||||||
[0x3016, 0x02],
|
[0x3016, 0x02],
|
||||||
@@ -970,252 +1033,261 @@ class Camera
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private static readonly UInt16[] OV5640_AF_FIRMWARE =
|
private static readonly UInt16[] OV5640_AF_FIRMWARE =
|
||||||
[
|
[
|
||||||
0x02, 0x0d, 0xf3, 0x02, 0x0a, 0x5f, 0xc2, 0x01, 0x22, 0x22, 0x00, 0x02, 0x0f, 0x31, 0x30, 0x01,
|
0x02, 0x0f, 0xd6, 0x02, 0x0a, 0x39, 0xc2, 0x01, 0x22, 0x22, 0x00, 0x02, 0x0f, 0xb2, 0xe5, 0x1f, //0x8000,
|
||||||
0x03, 0x02, 0x03, 0x09, 0x30, 0x02, 0x03, 0x02, 0x03, 0x09, 0x90, 0x51, 0xa5, 0xe0, 0x78, 0xbb,
|
0x70, 0x72, 0xf5, 0x1e, 0xd2, 0x35, 0xff, 0xef, 0x25, 0xe0, 0x24, 0x4e, 0xf8, 0xe4, 0xf6, 0x08, //0x8010,
|
||||||
0xf6, 0xa3, 0xe0, 0x08, 0xf6, 0xa3, 0xe0, 0x08, 0xf6, 0xe5, 0x1f, 0x70, 0x45, 0x75, 0x1e, 0x20,
|
0xf6, 0x0f, 0xbf, 0x34, 0xf2, 0x90, 0x0e, 0x93, 0xe4, 0x93, 0xff, 0xe5, 0x4b, 0xc3, 0x9f, 0x50, //0x8020,
|
||||||
0xd2, 0x34, 0x12, 0x0c, 0x0c, 0x78, 0x9c, 0x12, 0x0b, 0xd2, 0x78, 0xa8, 0xa6, 0x14, 0x08, 0xa6,
|
0x04, 0x7f, 0x05, 0x80, 0x02, 0x7f, 0xfb, 0x78, 0xbd, 0xa6, 0x07, 0x12, 0x0f, 0x04, 0x40, 0x04, //0x8030,
|
||||||
0x15, 0x78, 0xb3, 0xa6, 0x09, 0x18, 0x76, 0x01, 0x78, 0x4c, 0xa6, 0x0a, 0x08, 0xa6, 0x0b, 0x78,
|
0x7f, 0x03, 0x80, 0x02, 0x7f, 0x30, 0x78, 0xbc, 0xa6, 0x07, 0xe6, 0x18, 0xf6, 0x08, 0xe6, 0x78, //0x8040,
|
||||||
0x6c, 0xa6, 0x14, 0x08, 0xa6, 0x15, 0x78, 0xb3, 0xe6, 0x78, 0x8c, 0xf6, 0x75, 0x1f, 0x01, 0x78,
|
0xb9, 0xf6, 0x78, 0xbc, 0xe6, 0x78, 0xba, 0xf6, 0x78, 0xbf, 0x76, 0x33, 0xe4, 0x08, 0xf6, 0x78, //0x8050,
|
||||||
0xbb, 0xe6, 0x78, 0xb8, 0xf6, 0x78, 0xbc, 0xe6, 0x78, 0xb9, 0xf6, 0x78, 0xbd, 0xe6, 0x78, 0xba,
|
0xb8, 0x76, 0x01, 0x75, 0x4a, 0x02, 0x78, 0xb6, 0xf6, 0x08, 0xf6, 0x74, 0xff, 0x78, 0xc1, 0xf6, //0x8060,
|
||||||
0xf6, 0x22, 0x79, 0xb8, 0xe7, 0xd3, 0x78, 0xbb, 0x96, 0x40, 0x05, 0xe7, 0x96, 0xff, 0x80, 0x08,
|
0x08, 0xf6, 0x75, 0x1f, 0x01, 0x78, 0xbc, 0xe6, 0x75, 0xf0, 0x05, 0xa4, 0xf5, 0x4b, 0x12, 0x0a, //0x8070,
|
||||||
0xc3, 0x79, 0xbb, 0xe7, 0x78, 0xb8, 0x96, 0xff, 0x78, 0xa6, 0x76, 0x00, 0x08, 0xa6, 0x07, 0x79,
|
0xff, 0xc2, 0x37, 0x22, 0x78, 0xb8, 0xe6, 0xd3, 0x94, 0x00, 0x40, 0x02, 0x16, 0x22, 0xe5, 0x1f, //0x8080,
|
||||||
0xb9, 0xe7, 0xd3, 0x78, 0xbc, 0x96, 0x40, 0x05, 0xe7, 0x96, 0xff, 0x80, 0x08, 0xc3, 0x79, 0xbc,
|
0xb4, 0x05, 0x23, 0xe4, 0xf5, 0x1f, 0xc2, 0x01, 0x78, 0xb6, 0xe6, 0xfe, 0x08, 0xe6, 0xff, 0x78, //0x8090,
|
||||||
0xe7, 0x78, 0xb9, 0x96, 0xff, 0x12, 0x0c, 0x13, 0x79, 0xba, 0xe7, 0xd3, 0x78, 0xbd, 0x96, 0x40,
|
0x4e, 0xa6, 0x06, 0x08, 0xa6, 0x07, 0xa2, 0x37, 0xe4, 0x33, 0xf5, 0x3c, 0x90, 0x30, 0x28, 0xf0, //0x80a0,
|
||||||
0x05, 0xe7, 0x96, 0xff, 0x80, 0x08, 0xc3, 0x79, 0xbd, 0xe7, 0x78, 0xba, 0x96, 0xff, 0x12, 0x0c,
|
0x75, 0x1e, 0x10, 0xd2, 0x35, 0x22, 0xe5, 0x4b, 0x75, 0xf0, 0x05, 0x84, 0x78, 0xbc, 0xf6, 0x90, //0x80b0,
|
||||||
0x13, 0x78, 0xb2, 0xe6, 0x25, 0xe0, 0x24, 0x4c, 0xf8, 0xa6, 0x0a, 0x08, 0xa6, 0x0b, 0x78, 0xb2,
|
0x0e, 0x8c, 0xe4, 0x93, 0xff, 0x25, 0xe0, 0x24, 0x0a, 0xf8, 0xe6, 0xfc, 0x08, 0xe6, 0xfd, 0x78, //0x80c0,
|
||||||
0xe6, 0x25, 0xe0, 0x24, 0x6c, 0xf8, 0xa6, 0x14, 0x08, 0xa6, 0x15, 0x78, 0xb2, 0xe6, 0x24, 0x8c,
|
0xbc, 0xe6, 0x25, 0xe0, 0x24, 0x4e, 0xf8, 0xa6, 0x04, 0x08, 0xa6, 0x05, 0xef, 0x12, 0x0f, 0x0b, //0x80d0,
|
||||||
0xf8, 0xa6, 0x09, 0x78, 0xb2, 0xe6, 0x24, 0x01, 0xff, 0xe4, 0x33, 0xfe, 0xd3, 0xef, 0x94, 0x0f,
|
0xd3, 0x78, 0xb7, 0x96, 0xee, 0x18, 0x96, 0x40, 0x0d, 0x78, 0xbc, 0xe6, 0x78, 0xb9, 0xf6, 0x78, //0x80e0,
|
||||||
0xee, 0x64, 0x80, 0x94, 0x80, 0x40, 0x04, 0x7f, 0x00, 0x80, 0x05, 0x78, 0xb2, 0xe6, 0x04, 0xff,
|
0xb6, 0xa6, 0x06, 0x08, 0xa6, 0x07, 0x90, 0x0e, 0x8c, 0xe4, 0x93, 0x12, 0x0f, 0x0b, 0xc3, 0x78, //0x80f0,
|
||||||
0x78, 0xb2, 0xa6, 0x07, 0xe5, 0x1f, 0xb4, 0x01, 0x0a, 0xe6, 0x60, 0x03, 0x02, 0x03, 0x09, 0x75,
|
0xc2, 0x96, 0xee, 0x18, 0x96, 0x50, 0x0d, 0x78, 0xbc, 0xe6, 0x78, 0xba, 0xf6, 0x78, 0xc1, 0xa6, //0x8100,
|
||||||
0x1f, 0x02, 0x22, 0x12, 0x0c, 0x0c, 0x78, 0x9e, 0x12, 0x0b, 0xd2, 0x12, 0x0c, 0x0c, 0x78, 0xa0,
|
0x06, 0x08, 0xa6, 0x07, 0x78, 0xb6, 0xe6, 0xfe, 0x08, 0xe6, 0xc3, 0x78, 0xc2, 0x96, 0xff, 0xee, //0x8110,
|
||||||
0x12, 0x0b, 0xff, 0x78, 0xaa, 0x12, 0x0b, 0xff, 0xff, 0x78, 0xac, 0xa6, 0x06, 0x08, 0xa6, 0x07,
|
0x18, 0x96, 0x78, 0xc3, 0xf6, 0x08, 0xa6, 0x07, 0x90, 0x0e, 0x95, 0xe4, 0x18, 0x12, 0x0e, 0xe9, //0x8120,
|
||||||
0x78, 0x8c, 0xe6, 0x78, 0xb4, 0xf6, 0x78, 0x8c, 0xe6, 0x78, 0xb5, 0xf6, 0x7f, 0x01, 0xef, 0x25,
|
0x40, 0x02, 0xd2, 0x37, 0x78, 0xbc, 0xe6, 0x08, 0x26, 0x08, 0xf6, 0xe5, 0x1f, 0x64, 0x01, 0x70, //0x8130,
|
||||||
0xe0, 0x24, 0x4d, 0x78, 0x9f, 0x12, 0x0b, 0xc9, 0x50, 0x0a, 0x12, 0x0b, 0xab, 0x78, 0x9e, 0xa6,
|
0x4a, 0xe6, 0xc3, 0x78, 0xc0, 0x12, 0x0e, 0xdf, 0x40, 0x05, 0x12, 0x0e, 0xda, 0x40, 0x39, 0x12, //0x8140,
|
||||||
0x04, 0x08, 0xa6, 0x05, 0xef, 0x25, 0xe0, 0x24, 0x6d, 0x78, 0xab, 0x12, 0x0b, 0xc9, 0x50, 0x0f,
|
0x0f, 0x02, 0x40, 0x04, 0x7f, 0xfe, 0x80, 0x02, 0x7f, 0x02, 0x78, 0xbd, 0xa6, 0x07, 0x78, 0xb9, //0x8150,
|
||||||
0xef, 0x25, 0xe0, 0x24, 0x6c, 0x12, 0x0b, 0xb0, 0x78, 0xaa, 0xa6, 0x04, 0x08, 0xa6, 0x05, 0x74,
|
0xe6, 0x24, 0x03, 0x78, 0xbf, 0xf6, 0x78, 0xb9, 0xe6, 0x24, 0xfd, 0x78, 0xc0, 0xf6, 0x12, 0x0f, //0x8160,
|
||||||
0x8c, 0x2f, 0xf9, 0x78, 0xb4, 0xe6, 0xc3, 0x97, 0x50, 0x08, 0x74, 0x8c, 0x2f, 0xf8, 0xe6, 0x78,
|
0x02, 0x40, 0x06, 0x78, 0xc0, 0xe6, 0xff, 0x80, 0x04, 0x78, 0xbf, 0xe6, 0xff, 0x78, 0xbe, 0xa6, //0x8170,
|
||||||
0xb4, 0xf6, 0xef, 0x25, 0xe0, 0x24, 0x4d, 0xf9, 0xd3, 0x78, 0xa1, 0x12, 0x0b, 0xcb, 0x40, 0x0a,
|
0x07, 0x75, 0x1f, 0x02, 0x78, 0xb8, 0x76, 0x01, 0x02, 0x02, 0x4a, 0xe5, 0x1f, 0x64, 0x02, 0x60, //0x8180,
|
||||||
0x12, 0x0b, 0xab, 0x78, 0xa0, 0xa6, 0x04, 0x08, 0xa6, 0x05, 0xef, 0x25, 0xe0, 0x24, 0x6d, 0xf9,
|
0x03, 0x02, 0x02, 0x2a, 0x78, 0xbe, 0xe6, 0xff, 0xc3, 0x78, 0xc0, 0x12, 0x0e, 0xe0, 0x40, 0x08, //0x8190,
|
||||||
0xd3, 0x78, 0xad, 0x12, 0x0b, 0xcb, 0x40, 0x0f, 0xef, 0x25, 0xe0, 0x24, 0x6c, 0x12, 0x0b, 0xb0,
|
0x12, 0x0e, 0xda, 0x50, 0x03, 0x02, 0x02, 0x28, 0x12, 0x0f, 0x02, 0x40, 0x04, 0x7f, 0xff, 0x80, //0x81a0,
|
||||||
0x78, 0xac, 0xa6, 0x04, 0x08, 0xa6, 0x05, 0x74, 0x8c, 0x2f, 0xf9, 0x78, 0xb5, 0xe6, 0xd3, 0x97,
|
0x02, 0x7f, 0x01, 0x78, 0xbd, 0xa6, 0x07, 0x78, 0xb9, 0xe6, 0x04, 0x78, 0xbf, 0xf6, 0x78, 0xb9, //0x81b0,
|
||||||
0x40, 0x08, 0x74, 0x8c, 0x2f, 0xf8, 0xe6, 0x78, 0xb5, 0xf6, 0x0f, 0xef, 0x64, 0x10, 0x60, 0x03,
|
0xe6, 0x14, 0x78, 0xc0, 0xf6, 0x18, 0x12, 0x0f, 0x04, 0x40, 0x04, 0xe6, 0xff, 0x80, 0x02, 0x7f, //0x81c0,
|
||||||
0x02, 0x01, 0x3e, 0xc3, 0x79, 0x9f, 0x78, 0xa1, 0x12, 0x0b, 0xf7, 0x78, 0xa2, 0xf6, 0x08, 0xa6,
|
0x00, 0x78, 0xbf, 0xa6, 0x07, 0xd3, 0x08, 0xe6, 0x64, 0x80, 0x94, 0x80, 0x40, 0x04, 0xe6, 0xff, //0x81d0,
|
||||||
0x07, 0xc3, 0x79, 0xab, 0x78, 0xad, 0x12, 0x0b, 0xf7, 0x78, 0xae, 0xf6, 0x08, 0xa6, 0x07, 0xc3,
|
0x80, 0x02, 0x7f, 0x00, 0x78, 0xc0, 0xa6, 0x07, 0xc3, 0x18, 0xe6, 0x64, 0x80, 0x94, 0xb3, 0x50, //0x81e0,
|
||||||
0x79, 0xb4, 0xe7, 0x78, 0xb5, 0x96, 0x08, 0xf6, 0xd3, 0x79, 0x9f, 0xe7, 0x78, 0x9d, 0x96, 0x19,
|
0x04, 0xe6, 0xff, 0x80, 0x02, 0x7f, 0x33, 0x78, 0xbf, 0xa6, 0x07, 0xc3, 0x08, 0xe6, 0x64, 0x80, //0x81f0,
|
||||||
0xe7, 0x18, 0x96, 0x40, 0x05, 0x09, 0xe7, 0x08, 0x80, 0x06, 0xc3, 0x79, 0x9d, 0xe7, 0x78, 0x9f,
|
0x94, 0xb3, 0x50, 0x04, 0xe6, 0xff, 0x80, 0x02, 0x7f, 0x33, 0x78, 0xc0, 0xa6, 0x07, 0x12, 0x0f, //0x8200,
|
||||||
0x12, 0x0b, 0xf8, 0xfe, 0x78, 0xa4, 0xa6, 0x06, 0x08, 0xa6, 0x07, 0xd3, 0x79, 0xab, 0xe7, 0x78,
|
0x02, 0x40, 0x06, 0x78, 0xc0, 0xe6, 0xff, 0x80, 0x04, 0x78, 0xbf, 0xe6, 0xff, 0x78, 0xbe, 0xa6, //0x8210,
|
||||||
0xa9, 0x96, 0x19, 0xe7, 0x18, 0x96, 0x40, 0x05, 0x09, 0xe7, 0x08, 0x80, 0x06, 0xc3, 0x79, 0xa9,
|
0x07, 0x75, 0x1f, 0x03, 0x78, 0xb8, 0x76, 0x01, 0x80, 0x20, 0xe5, 0x1f, 0x64, 0x03, 0x70, 0x26, //0x8220,
|
||||||
0xe7, 0x78, 0xab, 0x12, 0x0b, 0xf8, 0xfe, 0x78, 0xb0, 0xa6, 0x06, 0x08, 0xa6, 0x07, 0x79, 0xb4,
|
0x78, 0xbe, 0xe6, 0xff, 0xc3, 0x78, 0xc0, 0x12, 0x0e, 0xe0, 0x40, 0x05, 0x12, 0x0e, 0xda, 0x40, //0x8230,
|
||||||
0xe7, 0xd3, 0x78, 0xb3, 0x96, 0x40, 0x05, 0xe7, 0x96, 0xff, 0x80, 0x08, 0xc3, 0x79, 0xb3, 0xe7,
|
0x09, 0x78, 0xb9, 0xe6, 0x78, 0xbe, 0xf6, 0x75, 0x1f, 0x04, 0x78, 0xbe, 0xe6, 0x75, 0xf0, 0x05, //0x8240,
|
||||||
0x78, 0xb4, 0x96, 0xff, 0x78, 0xb7, 0xa6, 0x07, 0xe5, 0x1f, 0x64, 0x02, 0x60, 0x03, 0x02, 0x02,
|
0xa4, 0xf5, 0x4b, 0x02, 0x0a, 0xff, 0xe5, 0x1f, 0xb4, 0x04, 0x10, 0x90, 0x0e, 0x94, 0xe4, 0x78, //0x8250,
|
||||||
0xef, 0x90, 0x30, 0x24, 0x74, 0x0f, 0xf0, 0x90, 0x0e, 0x8a, 0xe4, 0x93, 0xff, 0x18, 0xe6, 0xc3,
|
0xc3, 0x12, 0x0e, 0xe9, 0x40, 0x02, 0xd2, 0x37, 0x75, 0x1f, 0x05, 0x22, 0x30, 0x01, 0x03, 0x02, //0x8260,
|
||||||
0x9f, 0x40, 0x03, 0x02, 0x03, 0x09, 0x90, 0x30, 0x24, 0x74, 0x0e, 0xf0, 0x78, 0xa2, 0x12, 0x0b,
|
0x04, 0xc0, 0x30, 0x02, 0x03, 0x02, 0x04, 0xc0, 0x90, 0x51, 0xa5, 0xe0, 0x78, 0x93, 0xf6, 0xa3, //0x8270,
|
||||||
0xd9, 0x12, 0x0b, 0xa2, 0x90, 0x0e, 0x87, 0x12, 0x0b, 0xb7, 0x78, 0x9e, 0x12, 0x0b, 0xe8, 0x7b,
|
0xe0, 0x08, 0xf6, 0xa3, 0xe0, 0x08, 0xf6, 0xe5, 0x1f, 0x70, 0x3c, 0x75, 0x1e, 0x20, 0xd2, 0x35, //0x8280,
|
||||||
0x04, 0x12, 0x0b, 0x90, 0xc3, 0x12, 0x07, 0x0e, 0x50, 0x6f, 0x90, 0x0e, 0x8b, 0xe4, 0x93, 0xff,
|
0x12, 0x0c, 0x7a, 0x78, 0x7e, 0xa6, 0x06, 0x08, 0xa6, 0x07, 0x78, 0x8b, 0xa6, 0x09, 0x18, 0x76, //0x8290,
|
||||||
0x78, 0xb7, 0xe6, 0x9f, 0x40, 0x07, 0x90, 0x30, 0x24, 0x74, 0x0a, 0x80, 0x16, 0x90, 0x0e, 0x89,
|
0x01, 0x12, 0x0c, 0x5b, 0x78, 0x4e, 0xa6, 0x06, 0x08, 0xa6, 0x07, 0x78, 0x8b, 0xe6, 0x78, 0x6e, //0x82a0,
|
||||||
0xe4, 0x93, 0xff, 0xd3, 0x78, 0xa7, 0xe6, 0x9f, 0x18, 0xe6, 0x94, 0x00, 0x40, 0x09, 0x90, 0x30,
|
0xf6, 0x75, 0x1f, 0x01, 0x78, 0x93, 0xe6, 0x78, 0x90, 0xf6, 0x78, 0x94, 0xe6, 0x78, 0x91, 0xf6, //0x82b0,
|
||||||
0x24, 0x74, 0x0b, 0xf0, 0x75, 0x1f, 0x05, 0x78, 0xae, 0x12, 0x0b, 0xd9, 0x12, 0x0b, 0xa2, 0x90,
|
0x78, 0x95, 0xe6, 0x78, 0x92, 0xf6, 0x22, 0x79, 0x90, 0xe7, 0xd3, 0x78, 0x93, 0x96, 0x40, 0x05, //0x82c0,
|
||||||
0x0e, 0x88, 0x12, 0x0b, 0xb7, 0x78, 0xa8, 0x12, 0x0b, 0xe8, 0x7b, 0x40, 0x12, 0x0b, 0x90, 0xd3,
|
0xe7, 0x96, 0xff, 0x80, 0x08, 0xc3, 0x79, 0x93, 0xe7, 0x78, 0x90, 0x96, 0xff, 0x78, 0x88, 0x76, //0x82d0,
|
||||||
0x12, 0x07, 0x0e, 0x40, 0x24, 0x90, 0x30, 0x24, 0x74, 0x0c, 0xf0, 0x75, 0x1f, 0x05, 0x22, 0x90,
|
0x00, 0x08, 0xa6, 0x07, 0x79, 0x91, 0xe7, 0xd3, 0x78, 0x94, 0x96, 0x40, 0x05, 0xe7, 0x96, 0xff, //0x82e0,
|
||||||
0x30, 0x24, 0x74, 0x01, 0xf0, 0xe5, 0x1f, 0xb4, 0x05, 0x0f, 0xd2, 0x01, 0xc2, 0x02, 0xe4, 0xf5,
|
0x80, 0x08, 0xc3, 0x79, 0x94, 0xe7, 0x78, 0x91, 0x96, 0xff, 0x12, 0x0c, 0x8e, 0x79, 0x92, 0xe7, //0x82f0,
|
||||||
0x1f, 0xf5, 0x1e, 0xd2, 0x34, 0xd2, 0x32, 0xd2, 0x35, 0x22, 0xe5, 0x1f, 0x60, 0x03, 0x02, 0x03,
|
0xd3, 0x78, 0x95, 0x96, 0x40, 0x05, 0xe7, 0x96, 0xff, 0x80, 0x08, 0xc3, 0x79, 0x95, 0xe7, 0x78, //0x8300,
|
||||||
0x93, 0xf5, 0x1e, 0xd2, 0x34, 0x75, 0x34, 0xff, 0x75, 0x35, 0x0e, 0x75, 0x36, 0x55, 0x75, 0x37,
|
0x92, 0x96, 0xff, 0x12, 0x0c, 0x8e, 0x12, 0x0c, 0x5b, 0x78, 0x8a, 0xe6, 0x25, 0xe0, 0x24, 0x4e, //0x8310,
|
||||||
0x01, 0x12, 0x0d, 0x85, 0xe4, 0xff, 0xef, 0x25, 0xe0, 0x24, 0x4c, 0xf8, 0xe4, 0xf6, 0x08, 0xf6,
|
0xf8, 0xa6, 0x06, 0x08, 0xa6, 0x07, 0x78, 0x8a, 0xe6, 0x24, 0x6e, 0xf8, 0xa6, 0x09, 0x78, 0x8a, //0x8320,
|
||||||
0x0f, 0xbf, 0x34, 0xf2, 0x90, 0x0e, 0x8c, 0xe4, 0x93, 0xff, 0xe5, 0x49, 0xc3, 0x9f, 0x50, 0x04,
|
0xe6, 0x24, 0x01, 0xff, 0xe4, 0x33, 0xfe, 0xd3, 0xef, 0x94, 0x0f, 0xee, 0x64, 0x80, 0x94, 0x80, //0x8330,
|
||||||
0x7f, 0x05, 0x80, 0x02, 0x7f, 0xfb, 0x78, 0xbb, 0xa6, 0x07, 0x12, 0x0e, 0xbc, 0x40, 0x04, 0x7f,
|
0x40, 0x04, 0x7f, 0x00, 0x80, 0x05, 0x78, 0x8a, 0xe6, 0x04, 0xff, 0x78, 0x8a, 0xa6, 0x07, 0xe5, //0x8340,
|
||||||
0x03, 0x80, 0x02, 0x7f, 0x30, 0x78, 0xba, 0xa6, 0x07, 0xe6, 0x18, 0xf6, 0x08, 0xe6, 0x78, 0xb7,
|
0x1f, 0xb4, 0x01, 0x0a, 0xe6, 0x60, 0x03, 0x02, 0x04, 0xc0, 0x75, 0x1f, 0x02, 0x22, 0x12, 0x0c, //0x8350,
|
||||||
0xf6, 0x78, 0xba, 0xe6, 0x78, 0xb8, 0xf6, 0x78, 0xbd, 0x76, 0x33, 0xe4, 0x08, 0xf6, 0x78, 0xb6,
|
0x7a, 0x78, 0x80, 0xa6, 0x06, 0x08, 0xa6, 0x07, 0x12, 0x0c, 0x7a, 0x78, 0x82, 0xa6, 0x06, 0x08, //0x8360,
|
||||||
0x76, 0x01, 0x75, 0x48, 0x02, 0x78, 0xb4, 0xf6, 0x08, 0xf6, 0x74, 0xff, 0x78, 0xbf, 0xf6, 0x08,
|
0xa6, 0x07, 0x78, 0x6e, 0xe6, 0x78, 0x8c, 0xf6, 0x78, 0x6e, 0xe6, 0x78, 0x8d, 0xf6, 0x7f, 0x01, //0x8370,
|
||||||
0xf6, 0x75, 0x1f, 0x01, 0x78, 0xba, 0xe6, 0x75, 0xf0, 0x05, 0xa4, 0xf5, 0x49, 0x12, 0x0a, 0xfd,
|
0xef, 0x25, 0xe0, 0x24, 0x4f, 0xf9, 0xc3, 0x78, 0x81, 0xe6, 0x97, 0x18, 0xe6, 0x19, 0x97, 0x50, //0x8380,
|
||||||
0xc2, 0x36, 0x22, 0x78, 0xb6, 0xe6, 0xd3, 0x94, 0x00, 0x40, 0x02, 0x16, 0x22, 0xe5, 0x1f, 0xb4,
|
0x0a, 0x12, 0x0c, 0x82, 0x78, 0x80, 0xa6, 0x04, 0x08, 0xa6, 0x05, 0x74, 0x6e, 0x2f, 0xf9, 0x78, //0x8390,
|
||||||
0x05, 0x23, 0xe4, 0xf5, 0x1f, 0xc2, 0x01, 0x78, 0xb4, 0xe6, 0xfe, 0x08, 0xe6, 0xff, 0x78, 0x4c,
|
0x8c, 0xe6, 0xc3, 0x97, 0x50, 0x08, 0x74, 0x6e, 0x2f, 0xf8, 0xe6, 0x78, 0x8c, 0xf6, 0xef, 0x25, //0x83a0,
|
||||||
0xa6, 0x06, 0x08, 0xa6, 0x07, 0xa2, 0x36, 0xe4, 0x33, 0xf5, 0x3c, 0x90, 0x30, 0x28, 0xf0, 0x75,
|
0xe0, 0x24, 0x4f, 0xf9, 0xd3, 0x78, 0x83, 0xe6, 0x97, 0x18, 0xe6, 0x19, 0x97, 0x40, 0x0a, 0x12, //0x83b0,
|
||||||
0x1e, 0x10, 0xd2, 0x34, 0x22, 0xe5, 0x49, 0x75, 0xf0, 0x05, 0x84, 0x78, 0xba, 0xf6, 0x90, 0x0e,
|
0x0c, 0x82, 0x78, 0x82, 0xa6, 0x04, 0x08, 0xa6, 0x05, 0x74, 0x6e, 0x2f, 0xf9, 0x78, 0x8d, 0xe6, //0x83c0,
|
||||||
0x85, 0xe4, 0x93, 0xff, 0x25, 0xe0, 0x24, 0x0a, 0xf8, 0xe6, 0xfc, 0x08, 0xe6, 0xfd, 0x78, 0xba,
|
0xd3, 0x97, 0x40, 0x08, 0x74, 0x6e, 0x2f, 0xf8, 0xe6, 0x78, 0x8d, 0xf6, 0x0f, 0xef, 0x64, 0x10, //0x83d0,
|
||||||
0xe6, 0x25, 0xe0, 0x24, 0x4c, 0xf8, 0xa6, 0x04, 0x08, 0xa6, 0x05, 0xef, 0x12, 0x0e, 0xc3, 0xd3,
|
0x70, 0x9e, 0xc3, 0x79, 0x81, 0xe7, 0x78, 0x83, 0x96, 0xff, 0x19, 0xe7, 0x18, 0x96, 0x78, 0x84, //0x83e0,
|
||||||
0x78, 0xb5, 0x96, 0xee, 0x18, 0x96, 0x40, 0x0d, 0x78, 0xba, 0xe6, 0x78, 0xb7, 0xf6, 0x78, 0xb4,
|
0xf6, 0x08, 0xa6, 0x07, 0xc3, 0x79, 0x8c, 0xe7, 0x78, 0x8d, 0x96, 0x08, 0xf6, 0xd3, 0x79, 0x81, //0x83f0,
|
||||||
0xa6, 0x06, 0x08, 0xa6, 0x07, 0x90, 0x0e, 0x85, 0xe4, 0x93, 0x12, 0x0e, 0xc3, 0xc3, 0x78, 0xc0,
|
0xe7, 0x78, 0x7f, 0x96, 0x19, 0xe7, 0x18, 0x96, 0x40, 0x05, 0x09, 0xe7, 0x08, 0x80, 0x06, 0xc3, //0x8400,
|
||||||
0x96, 0xee, 0x18, 0x96, 0x50, 0x0d, 0x78, 0xba, 0xe6, 0x78, 0xb8, 0xf6, 0x78, 0xbf, 0xa6, 0x06,
|
0x79, 0x7f, 0xe7, 0x78, 0x81, 0x96, 0xff, 0x19, 0xe7, 0x18, 0x96, 0xfe, 0x78, 0x86, 0xa6, 0x06, //0x8410,
|
||||||
0x08, 0xa6, 0x07, 0x78, 0xb4, 0xe6, 0xfe, 0x08, 0xe6, 0xc3, 0x78, 0xc0, 0x96, 0xff, 0xee, 0x18,
|
0x08, 0xa6, 0x07, 0x79, 0x8c, 0xe7, 0xd3, 0x78, 0x8b, 0x96, 0x40, 0x05, 0xe7, 0x96, 0xff, 0x80, //0x8420,
|
||||||
0x96, 0x78, 0xc1, 0xf6, 0x08, 0xa6, 0x07, 0x90, 0x0e, 0x8e, 0xe4, 0x18, 0x12, 0x0e, 0xa1, 0x40,
|
0x08, 0xc3, 0x79, 0x8b, 0xe7, 0x78, 0x8c, 0x96, 0xff, 0x78, 0x8f, 0xa6, 0x07, 0xe5, 0x1f, 0x64, //0x8430,
|
||||||
0x02, 0xd2, 0x36, 0x78, 0xba, 0xe6, 0x08, 0x26, 0x08, 0xf6, 0xe5, 0x1f, 0x64, 0x01, 0x70, 0x4a,
|
0x02, 0x70, 0x69, 0x90, 0x0e, 0x91, 0x93, 0xff, 0x18, 0xe6, 0xc3, 0x9f, 0x50, 0x72, 0x12, 0x0c, //0x8440,
|
||||||
0xe6, 0xc3, 0x78, 0xbe, 0x12, 0x0e, 0x97, 0x40, 0x05, 0x12, 0x0e, 0x92, 0x40, 0x39, 0x12, 0x0e,
|
0x4a, 0x12, 0x0c, 0x2f, 0x90, 0x0e, 0x8e, 0x12, 0x0c, 0x38, 0x78, 0x80, 0x12, 0x0c, 0x6b, 0x7b, //0x8450,
|
||||||
0xba, 0x40, 0x04, 0x7f, 0xfe, 0x80, 0x02, 0x7f, 0x02, 0x78, 0xbb, 0xa6, 0x07, 0x78, 0xb7, 0xe6,
|
0x04, 0x12, 0x0c, 0x1d, 0xc3, 0x12, 0x06, 0x45, 0x50, 0x56, 0x90, 0x0e, 0x92, 0xe4, 0x93, 0xff, //0x8460,
|
||||||
0x24, 0x03, 0x78, 0xbd, 0xf6, 0x78, 0xb7, 0xe6, 0x24, 0xfd, 0x78, 0xbe, 0xf6, 0x12, 0x0e, 0xba,
|
0x78, 0x8f, 0xe6, 0x9f, 0x40, 0x02, 0x80, 0x11, 0x90, 0x0e, 0x90, 0xe4, 0x93, 0xff, 0xd3, 0x78, //0x8470,
|
||||||
0x40, 0x06, 0x78, 0xbe, 0xe6, 0xff, 0x80, 0x04, 0x78, 0xbd, 0xe6, 0xff, 0x78, 0xbc, 0xa6, 0x07,
|
0x89, 0xe6, 0x9f, 0x18, 0xe6, 0x94, 0x00, 0x40, 0x03, 0x75, 0x1f, 0x05, 0x12, 0x0c, 0x4a, 0x12, //0x8480,
|
||||||
0x75, 0x1f, 0x02, 0x78, 0xb6, 0x76, 0x01, 0x02, 0x05, 0x59, 0xe5, 0x1f, 0x64, 0x02, 0x60, 0x03,
|
0x0c, 0x2f, 0x90, 0x0e, 0x8f, 0x12, 0x0c, 0x38, 0x78, 0x7e, 0x12, 0x0c, 0x6b, 0x7b, 0x40, 0x12, //0x8490,
|
||||||
0x02, 0x05, 0x39, 0x78, 0xbc, 0xe6, 0xff, 0xc3, 0x78, 0xbe, 0x12, 0x0e, 0x98, 0x40, 0x08, 0x12,
|
0x0c, 0x1d, 0xd3, 0x12, 0x06, 0x45, 0x40, 0x18, 0x75, 0x1f, 0x05, 0x22, 0xe5, 0x1f, 0xb4, 0x05, //0x84a0,
|
||||||
0x0e, 0x92, 0x50, 0x03, 0x02, 0x05, 0x37, 0x12, 0x0e, 0xba, 0x40, 0x04, 0x7f, 0xff, 0x80, 0x02,
|
0x0f, 0xd2, 0x01, 0xc2, 0x02, 0xe4, 0xf5, 0x1f, 0xf5, 0x1e, 0xd2, 0x35, 0xd2, 0x33, 0xd2, 0x36, //0x84b0,
|
||||||
0x7f, 0x01, 0x78, 0xbb, 0xa6, 0x07, 0x78, 0xb7, 0xe6, 0x04, 0x78, 0xbd, 0xf6, 0x78, 0xb7, 0xe6,
|
0x22, 0xef, 0x8d, 0xf0, 0xa4, 0xa8, 0xf0, 0xcf, 0x8c, 0xf0, 0xa4, 0x28, 0xce, 0x8d, 0xf0, 0xa4, //0x84c0,
|
||||||
0x14, 0x78, 0xbe, 0xf6, 0x18, 0x12, 0x0e, 0xbc, 0x40, 0x04, 0xe6, 0xff, 0x80, 0x02, 0x7f, 0x00,
|
0x2e, 0xfe, 0x22, 0xbc, 0x00, 0x0b, 0xbe, 0x00, 0x29, 0xef, 0x8d, 0xf0, 0x84, 0xff, 0xad, 0xf0, //0x84d0,
|
||||||
0x78, 0xbd, 0xa6, 0x07, 0xd3, 0x08, 0xe6, 0x64, 0x80, 0x94, 0x80, 0x40, 0x04, 0xe6, 0xff, 0x80,
|
0x22, 0xe4, 0xcc, 0xf8, 0x75, 0xf0, 0x08, 0xef, 0x2f, 0xff, 0xee, 0x33, 0xfe, 0xec, 0x33, 0xfc, //0x84e0,
|
||||||
0x02, 0x7f, 0x00, 0x78, 0xbe, 0xa6, 0x07, 0xc3, 0x18, 0xe6, 0x64, 0x80, 0x94, 0xb3, 0x50, 0x04,
|
0xee, 0x9d, 0xec, 0x98, 0x40, 0x05, 0xfc, 0xee, 0x9d, 0xfe, 0x0f, 0xd5, 0xf0, 0xe9, 0xe4, 0xce, //0x84f0,
|
||||||
0xe6, 0xff, 0x80, 0x02, 0x7f, 0x33, 0x78, 0xbd, 0xa6, 0x07, 0xc3, 0x08, 0xe6, 0x64, 0x80, 0x94,
|
0xfd, 0x22, 0xed, 0xf8, 0xf5, 0xf0, 0xee, 0x84, 0x20, 0xd2, 0x1c, 0xfe, 0xad, 0xf0, 0x75, 0xf0, //0x8500,
|
||||||
0xb3, 0x50, 0x04, 0xe6, 0xff, 0x80, 0x02, 0x7f, 0x33, 0x78, 0xbe, 0xa6, 0x07, 0x12, 0x0e, 0xba,
|
0x08, 0xef, 0x2f, 0xff, 0xed, 0x33, 0xfd, 0x40, 0x07, 0x98, 0x50, 0x06, 0xd5, 0xf0, 0xf2, 0x22, //0x8510,
|
||||||
0x40, 0x06, 0x78, 0xbe, 0xe6, 0xff, 0x80, 0x04, 0x78, 0xbd, 0xe6, 0xff, 0x78, 0xbc, 0xa6, 0x07,
|
0xc3, 0x98, 0xfd, 0x0f, 0xd5, 0xf0, 0xea, 0x22, 0xe8, 0x8f, 0xf0, 0xa4, 0xcc, 0x8b, 0xf0, 0xa4, //0x8520,
|
||||||
0x75, 0x1f, 0x03, 0x78, 0xb6, 0x76, 0x01, 0x80, 0x20, 0xe5, 0x1f, 0x64, 0x03, 0x70, 0x26, 0x78,
|
0x2c, 0xfc, 0xe9, 0x8e, 0xf0, 0xa4, 0x2c, 0xfc, 0x8a, 0xf0, 0xed, 0xa4, 0x2c, 0xfc, 0xea, 0x8e, //0x8530,
|
||||||
0xbc, 0xe6, 0xff, 0xc3, 0x78, 0xbe, 0x12, 0x0e, 0x98, 0x40, 0x05, 0x12, 0x0e, 0x92, 0x40, 0x09,
|
0xf0, 0xa4, 0xcd, 0xa8, 0xf0, 0x8b, 0xf0, 0xa4, 0x2d, 0xcc, 0x38, 0x25, 0xf0, 0xfd, 0xe9, 0x8f, //0x8540,
|
||||||
0x78, 0xb7, 0xe6, 0x78, 0xbc, 0xf6, 0x75, 0x1f, 0x04, 0x78, 0xbc, 0xe6, 0x75, 0xf0, 0x05, 0xa4,
|
0xf0, 0xa4, 0x2c, 0xcd, 0x35, 0xf0, 0xfc, 0xeb, 0x8e, 0xf0, 0xa4, 0xfe, 0xa9, 0xf0, 0xeb, 0x8f, //0x8550,
|
||||||
0xf5, 0x49, 0x02, 0x0a, 0xfd, 0xe5, 0x1f, 0xb4, 0x04, 0x1f, 0x90, 0x0e, 0x8d, 0xe4, 0x78, 0xc1,
|
0xf0, 0xa4, 0xcf, 0xc5, 0xf0, 0x2e, 0xcd, 0x39, 0xfe, 0xe4, 0x3c, 0xfc, 0xea, 0xa4, 0x2d, 0xce, //0x8560,
|
||||||
0x12, 0x0e, 0xa1, 0x40, 0x02, 0xd2, 0x36, 0x75, 0x1f, 0x05, 0x75, 0x34, 0xff, 0x75, 0x35, 0x0e,
|
0x35, 0xf0, 0xfd, 0xe4, 0x3c, 0xfc, 0x22, 0x75, 0xf0, 0x08, 0x75, 0x82, 0x00, 0xef, 0x2f, 0xff, //0x8570,
|
||||||
0x75, 0x36, 0x59, 0x75, 0x37, 0x01, 0x12, 0x0d, 0x85, 0x22, 0xef, 0x8d, 0xf0, 0xa4, 0xa8, 0xf0,
|
0xee, 0x33, 0xfe, 0xcd, 0x33, 0xcd, 0xcc, 0x33, 0xcc, 0xc5, 0x82, 0x33, 0xc5, 0x82, 0x9b, 0xed, //0x8580,
|
||||||
0xcf, 0x8c, 0xf0, 0xa4, 0x28, 0xce, 0x8d, 0xf0, 0xa4, 0x2e, 0xfe, 0x22, 0xbc, 0x00, 0x0b, 0xbe,
|
0x9a, 0xec, 0x99, 0xe5, 0x82, 0x98, 0x40, 0x0c, 0xf5, 0x82, 0xee, 0x9b, 0xfe, 0xed, 0x9a, 0xfd, //0x8590,
|
||||||
0x00, 0x29, 0xef, 0x8d, 0xf0, 0x84, 0xff, 0xad, 0xf0, 0x22, 0xe4, 0xcc, 0xf8, 0x75, 0xf0, 0x08,
|
0xec, 0x99, 0xfc, 0x0f, 0xd5, 0xf0, 0xd6, 0xe4, 0xce, 0xfb, 0xe4, 0xcd, 0xfa, 0xe4, 0xcc, 0xf9, //0x85a0,
|
||||||
0xef, 0x2f, 0xff, 0xee, 0x33, 0xfe, 0xec, 0x33, 0xfc, 0xee, 0x9d, 0xec, 0x98, 0x40, 0x05, 0xfc,
|
0xa8, 0x82, 0x22, 0xb8, 0x00, 0xc1, 0xb9, 0x00, 0x59, 0xba, 0x00, 0x2d, 0xec, 0x8b, 0xf0, 0x84, //0x85b0,
|
||||||
0xee, 0x9d, 0xfe, 0x0f, 0xd5, 0xf0, 0xe9, 0xe4, 0xce, 0xfd, 0x22, 0xed, 0xf8, 0xf5, 0xf0, 0xee,
|
0xcf, 0xce, 0xcd, 0xfc, 0xe5, 0xf0, 0xcb, 0xf9, 0x78, 0x18, 0xef, 0x2f, 0xff, 0xee, 0x33, 0xfe, //0x85c0,
|
||||||
0x84, 0x20, 0xd2, 0x1c, 0xfe, 0xad, 0xf0, 0x75, 0xf0, 0x08, 0xef, 0x2f, 0xff, 0xed, 0x33, 0xfd,
|
0xed, 0x33, 0xfd, 0xec, 0x33, 0xfc, 0xeb, 0x33, 0xfb, 0x10, 0xd7, 0x03, 0x99, 0x40, 0x04, 0xeb, //0x85d0,
|
||||||
0x40, 0x07, 0x98, 0x50, 0x06, 0xd5, 0xf0, 0xf2, 0x22, 0xc3, 0x98, 0xfd, 0x0f, 0xd5, 0xf0, 0xea,
|
0x99, 0xfb, 0x0f, 0xd8, 0xe5, 0xe4, 0xf9, 0xfa, 0x22, 0x78, 0x18, 0xef, 0x2f, 0xff, 0xee, 0x33, //0x85e0,
|
||||||
0x22, 0xe8, 0x8f, 0xf0, 0xa4, 0xcc, 0x8b, 0xf0, 0xa4, 0x2c, 0xfc, 0xe9, 0x8e, 0xf0, 0xa4, 0x2c,
|
0xfe, 0xed, 0x33, 0xfd, 0xec, 0x33, 0xfc, 0xc9, 0x33, 0xc9, 0x10, 0xd7, 0x05, 0x9b, 0xe9, 0x9a, //0x85f0,
|
||||||
0xfc, 0x8a, 0xf0, 0xed, 0xa4, 0x2c, 0xfc, 0xea, 0x8e, 0xf0, 0xa4, 0xcd, 0xa8, 0xf0, 0x8b, 0xf0,
|
0x40, 0x07, 0xec, 0x9b, 0xfc, 0xe9, 0x9a, 0xf9, 0x0f, 0xd8, 0xe0, 0xe4, 0xc9, 0xfa, 0xe4, 0xcc, //0x8600,
|
||||||
0xa4, 0x2d, 0xcc, 0x38, 0x25, 0xf0, 0xfd, 0xe9, 0x8f, 0xf0, 0xa4, 0x2c, 0xcd, 0x35, 0xf0, 0xfc,
|
0xfb, 0x22, 0x75, 0xf0, 0x10, 0xef, 0x2f, 0xff, 0xee, 0x33, 0xfe, 0xed, 0x33, 0xfd, 0xcc, 0x33, //0x8610,
|
||||||
0xeb, 0x8e, 0xf0, 0xa4, 0xfe, 0xa9, 0xf0, 0xeb, 0x8f, 0xf0, 0xa4, 0xcf, 0xc5, 0xf0, 0x2e, 0xcd,
|
0xcc, 0xc8, 0x33, 0xc8, 0x10, 0xd7, 0x07, 0x9b, 0xec, 0x9a, 0xe8, 0x99, 0x40, 0x0a, 0xed, 0x9b, //0x8620,
|
||||||
0x39, 0xfe, 0xe4, 0x3c, 0xfc, 0xea, 0xa4, 0x2d, 0xce, 0x35, 0xf0, 0xfd, 0xe4, 0x3c, 0xfc, 0x22,
|
0xfd, 0xec, 0x9a, 0xfc, 0xe8, 0x99, 0xf8, 0x0f, 0xd5, 0xf0, 0xda, 0xe4, 0xcd, 0xfb, 0xe4, 0xcc, //0x8630,
|
||||||
0x75, 0xf0, 0x08, 0x75, 0x82, 0x00, 0xef, 0x2f, 0xff, 0xee, 0x33, 0xfe, 0xcd, 0x33, 0xcd, 0xcc,
|
0xfa, 0xe4, 0xc8, 0xf9, 0x22, 0xeb, 0x9f, 0xf5, 0xf0, 0xea, 0x9e, 0x42, 0xf0, 0xe9, 0x9d, 0x42, //0x8640,
|
||||||
0x33, 0xcc, 0xc5, 0x82, 0x33, 0xc5, 0x82, 0x9b, 0xed, 0x9a, 0xec, 0x99, 0xe5, 0x82, 0x98, 0x40,
|
0xf0, 0xe8, 0x9c, 0x45, 0xf0, 0x22, 0xe8, 0x60, 0x0f, 0xec, 0xc3, 0x13, 0xfc, 0xed, 0x13, 0xfd, //0x8650,
|
||||||
0x0c, 0xf5, 0x82, 0xee, 0x9b, 0xfe, 0xed, 0x9a, 0xfd, 0xec, 0x99, 0xfc, 0x0f, 0xd5, 0xf0, 0xd6,
|
0xee, 0x13, 0xfe, 0xef, 0x13, 0xff, 0xd8, 0xf1, 0x22, 0xe8, 0x60, 0x0f, 0xef, 0xc3, 0x33, 0xff, //0x8660,
|
||||||
0xe4, 0xce, 0xfb, 0xe4, 0xcd, 0xfa, 0xe4, 0xcc, 0xf9, 0xa8, 0x82, 0x22, 0xb8, 0x00, 0xc1, 0xb9,
|
0xee, 0x33, 0xfe, 0xed, 0x33, 0xfd, 0xec, 0x33, 0xfc, 0xd8, 0xf1, 0x22, 0xe4, 0x93, 0xfc, 0x74, //0x8670,
|
||||||
0x00, 0x59, 0xba, 0x00, 0x2d, 0xec, 0x8b, 0xf0, 0x84, 0xcf, 0xce, 0xcd, 0xfc, 0xe5, 0xf0, 0xcb,
|
0x01, 0x93, 0xfd, 0x74, 0x02, 0x93, 0xfe, 0x74, 0x03, 0x93, 0xff, 0x22, 0xe6, 0xfb, 0x08, 0xe6, //0x8680,
|
||||||
0xf9, 0x78, 0x18, 0xef, 0x2f, 0xff, 0xee, 0x33, 0xfe, 0xed, 0x33, 0xfd, 0xec, 0x33, 0xfc, 0xeb,
|
0xf9, 0x08, 0xe6, 0xfa, 0x08, 0xe6, 0xcb, 0xf8, 0x22, 0xec, 0xf6, 0x08, 0xed, 0xf6, 0x08, 0xee, //0x8690,
|
||||||
0x33, 0xfb, 0x10, 0xd7, 0x03, 0x99, 0x40, 0x04, 0xeb, 0x99, 0xfb, 0x0f, 0xd8, 0xe5, 0xe4, 0xf9,
|
0xf6, 0x08, 0xef, 0xf6, 0x22, 0xa4, 0x25, 0x82, 0xf5, 0x82, 0xe5, 0xf0, 0x35, 0x83, 0xf5, 0x83, //0x86a0,
|
||||||
0xfa, 0x22, 0x78, 0x18, 0xef, 0x2f, 0xff, 0xee, 0x33, 0xfe, 0xed, 0x33, 0xfd, 0xec, 0x33, 0xfc,
|
0x22, 0xd0, 0x83, 0xd0, 0x82, 0xf8, 0xe4, 0x93, 0x70, 0x12, 0x74, 0x01, 0x93, 0x70, 0x0d, 0xa3, //0x86b0,
|
||||||
0xc9, 0x33, 0xc9, 0x10, 0xd7, 0x05, 0x9b, 0xe9, 0x9a, 0x40, 0x07, 0xec, 0x9b, 0xfc, 0xe9, 0x9a,
|
0xa3, 0x93, 0xf8, 0x74, 0x01, 0x93, 0xf5, 0x82, 0x88, 0x83, 0xe4, 0x73, 0x74, 0x02, 0x93, 0x68, //0x86c0,
|
||||||
0xf9, 0x0f, 0xd8, 0xe0, 0xe4, 0xc9, 0xfa, 0xe4, 0xcc, 0xfb, 0x22, 0x75, 0xf0, 0x10, 0xef, 0x2f,
|
0x60, 0xef, 0xa3, 0xa3, 0xa3, 0x80, 0xdf, 0x90, 0x38, 0x04, 0x78, 0x52, 0x12, 0x0b, 0xfd, 0x90, //0x86d0,
|
||||||
0xff, 0xee, 0x33, 0xfe, 0xed, 0x33, 0xfd, 0xcc, 0x33, 0xcc, 0xc8, 0x33, 0xc8, 0x10, 0xd7, 0x07,
|
0x38, 0x00, 0xe0, 0xfe, 0xa3, 0xe0, 0xfd, 0xed, 0xff, 0xc3, 0x12, 0x0b, 0x9e, 0x90, 0x38, 0x10, //0x86e0,
|
||||||
0x9b, 0xec, 0x9a, 0xe8, 0x99, 0x40, 0x0a, 0xed, 0x9b, 0xfd, 0xec, 0x9a, 0xfc, 0xe8, 0x99, 0xf8,
|
0x12, 0x0b, 0x92, 0x90, 0x38, 0x06, 0x78, 0x54, 0x12, 0x0b, 0xfd, 0x90, 0x38, 0x02, 0xe0, 0xfe, //0x86f0,
|
||||||
0x0f, 0xd5, 0xf0, 0xda, 0xe4, 0xcd, 0xfb, 0xe4, 0xcc, 0xfa, 0xe4, 0xc8, 0xf9, 0x22, 0xeb, 0x9f,
|
0xa3, 0xe0, 0xfd, 0xed, 0xff, 0xc3, 0x12, 0x0b, 0x9e, 0x90, 0x38, 0x12, 0x12, 0x0b, 0x92, 0xa3, //0x8700,
|
||||||
0xf5, 0xf0, 0xea, 0x9e, 0x42, 0xf0, 0xe9, 0x9d, 0x42, 0xf0, 0xe8, 0x9c, 0x45, 0xf0, 0x22, 0xe8,
|
0xe0, 0xb4, 0x31, 0x07, 0x78, 0x52, 0x79, 0x52, 0x12, 0x0c, 0x13, 0x90, 0x38, 0x14, 0xe0, 0xb4, //0x8710,
|
||||||
0x60, 0x0f, 0xef, 0xc3, 0x33, 0xff, 0xee, 0x33, 0xfe, 0xed, 0x33, 0xfd, 0xec, 0x33, 0xfc, 0xd8,
|
0x71, 0x15, 0x78, 0x52, 0xe6, 0xfe, 0x08, 0xe6, 0x78, 0x02, 0xce, 0xc3, 0x13, 0xce, 0x13, 0xd8, //0x8720,
|
||||||
0xf1, 0x22, 0xe4, 0x93, 0xfc, 0x74, 0x01, 0x93, 0xfd, 0x74, 0x02, 0x93, 0xfe, 0x74, 0x03, 0x93,
|
0xf9, 0x79, 0x53, 0xf7, 0xee, 0x19, 0xf7, 0x90, 0x38, 0x15, 0xe0, 0xb4, 0x31, 0x07, 0x78, 0x54, //0x8730,
|
||||||
0xff, 0x22, 0xe6, 0xfb, 0x08, 0xe6, 0xf9, 0x08, 0xe6, 0xfa, 0x08, 0xe6, 0xcb, 0xf8, 0x22, 0xec,
|
0x79, 0x54, 0x12, 0x0c, 0x13, 0x90, 0x38, 0x15, 0xe0, 0xb4, 0x71, 0x15, 0x78, 0x54, 0xe6, 0xfe, //0x8740,
|
||||||
0xf6, 0x08, 0xed, 0xf6, 0x08, 0xee, 0xf6, 0x08, 0xef, 0xf6, 0x22, 0xa4, 0x25, 0x82, 0xf5, 0x82,
|
0x08, 0xe6, 0x78, 0x02, 0xce, 0xc3, 0x13, 0xce, 0x13, 0xd8, 0xf9, 0x79, 0x55, 0xf7, 0xee, 0x19, //0x8750,
|
||||||
0xe5, 0xf0, 0x35, 0x83, 0xf5, 0x83, 0x22, 0xd0, 0x83, 0xd0, 0x82, 0xf8, 0xe4, 0x93, 0x70, 0x12,
|
0xf7, 0x79, 0x52, 0x12, 0x0b, 0xd9, 0x09, 0x12, 0x0b, 0xd9, 0xaf, 0x47, 0x12, 0x0b, 0xb2, 0xe5, //0x8760,
|
||||||
0x74, 0x01, 0x93, 0x70, 0x0d, 0xa3, 0xa3, 0x93, 0xf8, 0x74, 0x01, 0x93, 0xf5, 0x82, 0x88, 0x83,
|
0x44, 0xfb, 0x7a, 0x00, 0xfd, 0x7c, 0x00, 0x12, 0x04, 0xd3, 0x78, 0x5a, 0xa6, 0x06, 0x08, 0xa6, //0x8770,
|
||||||
0xe4, 0x73, 0x74, 0x02, 0x93, 0x68, 0x60, 0xef, 0xa3, 0xa3, 0xa3, 0x80, 0xdf, 0x90, 0x38, 0x04,
|
0x07, 0xaf, 0x45, 0x12, 0x0b, 0xb2, 0xad, 0x03, 0x7c, 0x00, 0x12, 0x04, 0xd3, 0x78, 0x56, 0xa6, //0x8780,
|
||||||
0x78, 0x50, 0x12, 0x0c, 0x7f, 0x90, 0x38, 0x00, 0xe0, 0xfe, 0xa3, 0xe0, 0xfd, 0xed, 0xff, 0xc3,
|
0x06, 0x08, 0xa6, 0x07, 0xaf, 0x48, 0x78, 0x54, 0x12, 0x0b, 0xb4, 0xe5, 0x43, 0xfb, 0xfd, 0x7c, //0x8790,
|
||||||
0x12, 0x0c, 0x38, 0x90, 0x38, 0x10, 0x12, 0x0c, 0x2c, 0x90, 0x38, 0x06, 0x78, 0x52, 0x12, 0x0c,
|
0x00, 0x12, 0x04, 0xd3, 0x78, 0x5c, 0xa6, 0x06, 0x08, 0xa6, 0x07, 0xaf, 0x46, 0x7e, 0x00, 0x78, //0x87a0,
|
||||||
0x7f, 0x90, 0x38, 0x02, 0xe0, 0xfe, 0xa3, 0xe0, 0xfd, 0xed, 0xff, 0xc3, 0x12, 0x0c, 0x38, 0x90,
|
0x54, 0x12, 0x0b, 0xb6, 0xad, 0x03, 0x7c, 0x00, 0x12, 0x04, 0xd3, 0x78, 0x58, 0xa6, 0x06, 0x08, //0x87b0,
|
||||||
0x38, 0x12, 0x12, 0x0c, 0x2c, 0xa3, 0xe0, 0xb4, 0x31, 0x07, 0x78, 0x50, 0x79, 0x50, 0x12, 0x0c,
|
0xa6, 0x07, 0xc3, 0x78, 0x5b, 0xe6, 0x94, 0x08, 0x18, 0xe6, 0x94, 0x00, 0x50, 0x05, 0x76, 0x00, //0x87c0,
|
||||||
0x95, 0x90, 0x38, 0x14, 0xe0, 0xb4, 0x71, 0x15, 0x78, 0x50, 0xe6, 0xfe, 0x08, 0xe6, 0x78, 0x02,
|
0x08, 0x76, 0x08, 0xc3, 0x78, 0x5d, 0xe6, 0x94, 0x08, 0x18, 0xe6, 0x94, 0x00, 0x50, 0x05, 0x76, //0x87d0,
|
||||||
0xce, 0xc3, 0x13, 0xce, 0x13, 0xd8, 0xf9, 0x79, 0x51, 0xf7, 0xee, 0x19, 0xf7, 0x90, 0x38, 0x15,
|
0x00, 0x08, 0x76, 0x08, 0x78, 0x5a, 0x12, 0x0b, 0xc6, 0xff, 0xd3, 0x78, 0x57, 0xe6, 0x9f, 0x18, //0x87e0,
|
||||||
0xe0, 0xb4, 0x31, 0x07, 0x78, 0x52, 0x79, 0x52, 0x12, 0x0c, 0x95, 0x90, 0x38, 0x15, 0xe0, 0xb4,
|
0xe6, 0x9e, 0x40, 0x0e, 0x78, 0x5a, 0xe6, 0x13, 0xfe, 0x08, 0xe6, 0x78, 0x57, 0x12, 0x0c, 0x08, //0x87f0,
|
||||||
0x71, 0x15, 0x78, 0x52, 0xe6, 0xfe, 0x08, 0xe6, 0x78, 0x02, 0xce, 0xc3, 0x13, 0xce, 0x13, 0xd8,
|
0x80, 0x04, 0x7e, 0x00, 0x7f, 0x00, 0x78, 0x5e, 0x12, 0x0b, 0xbe, 0xff, 0xd3, 0x78, 0x59, 0xe6, //0x8800,
|
||||||
0xf9, 0x79, 0x53, 0xf7, 0xee, 0x19, 0xf7, 0x79, 0x50, 0x12, 0x0c, 0x67, 0x09, 0x12, 0x0c, 0x67,
|
0x9f, 0x18, 0xe6, 0x9e, 0x40, 0x0e, 0x78, 0x5c, 0xe6, 0x13, 0xfe, 0x08, 0xe6, 0x78, 0x59, 0x12, //0x8810,
|
||||||
0xaf, 0x45, 0x12, 0x0c, 0x1d, 0x7d, 0x50, 0x12, 0x05, 0x9c, 0x78, 0x58, 0xa6, 0x06, 0x08, 0xa6,
|
0x0c, 0x08, 0x80, 0x04, 0x7e, 0x00, 0x7f, 0x00, 0xe4, 0xfc, 0xfd, 0x78, 0x62, 0x12, 0x06, 0x99, //0x8820,
|
||||||
0x07, 0xaf, 0x43, 0x12, 0x0c, 0x1d, 0x7d, 0x50, 0x12, 0x05, 0x9c, 0x78, 0x54, 0xa6, 0x06, 0x08,
|
0x78, 0x5a, 0x12, 0x0b, 0xc6, 0x78, 0x57, 0x26, 0xff, 0xee, 0x18, 0x36, 0xfe, 0x78, 0x66, 0x12, //0x8830,
|
||||||
0xa6, 0x07, 0xaf, 0x46, 0x78, 0x52, 0x12, 0x0c, 0x1f, 0x7d, 0x3c, 0x12, 0x05, 0x9c, 0x78, 0x5a,
|
0x0b, 0xbe, 0x78, 0x59, 0x26, 0xff, 0xee, 0x18, 0x36, 0xfe, 0xe4, 0xfc, 0xfd, 0x78, 0x6a, 0x12, //0x8840,
|
||||||
0xa6, 0x06, 0x08, 0xa6, 0x07, 0xaf, 0x44, 0x7e, 0x00, 0x78, 0x52, 0x12, 0x0c, 0x21, 0x7d, 0x3c,
|
0x06, 0x99, 0x12, 0x0b, 0xce, 0x78, 0x66, 0x12, 0x06, 0x8c, 0xd3, 0x12, 0x06, 0x45, 0x40, 0x08, //0x8850,
|
||||||
0x12, 0x05, 0x9c, 0x78, 0x56, 0xa6, 0x06, 0x08, 0xa6, 0x07, 0xc3, 0x78, 0x59, 0xe6, 0x94, 0x08,
|
0x12, 0x0b, 0xce, 0x78, 0x66, 0x12, 0x06, 0x99, 0x78, 0x54, 0x12, 0x0b, 0xd0, 0x78, 0x6a, 0x12, //0x8860,
|
||||||
0x18, 0xe6, 0x94, 0x00, 0x50, 0x05, 0x76, 0x00, 0x08, 0x76, 0x08, 0xc3, 0x78, 0x5b, 0xe6, 0x94,
|
0x06, 0x8c, 0xd3, 0x12, 0x06, 0x45, 0x40, 0x0a, 0x78, 0x54, 0x12, 0x0b, 0xd0, 0x78, 0x6a, 0x12, //0x8870,
|
||||||
0x08, 0x18, 0xe6, 0x94, 0x00, 0x50, 0x05, 0x76, 0x00, 0x08, 0x76, 0x08, 0x78, 0x58, 0x12, 0x0c,
|
0x06, 0x99, 0x78, 0x61, 0xe6, 0x90, 0x60, 0x01, 0xf0, 0x78, 0x65, 0xe6, 0xa3, 0xf0, 0x78, 0x69, //0x8880,
|
||||||
0x54, 0xff, 0xd3, 0x78, 0x55, 0xe6, 0x9f, 0x18, 0xe6, 0x9e, 0x40, 0x0e, 0x78, 0x58, 0xe6, 0x13,
|
0xe6, 0xa3, 0xf0, 0x78, 0x55, 0xe6, 0xa3, 0xf0, 0x7d, 0x01, 0x78, 0x61, 0x12, 0x0b, 0xe9, 0x24, //0x8890,
|
||||||
0xfe, 0x08, 0xe6, 0x78, 0x55, 0x12, 0x0c, 0x8a, 0x80, 0x04, 0x7e, 0x00, 0x7f, 0x00, 0x78, 0x5c,
|
0x01, 0x12, 0x0b, 0xa6, 0x78, 0x65, 0x12, 0x0b, 0xe9, 0x24, 0x02, 0x12, 0x0b, 0xa6, 0x78, 0x69, //0x88a0,
|
||||||
0x12, 0x0c, 0x4c, 0xff, 0xd3, 0x78, 0x57, 0xe6, 0x9f, 0x18, 0xe6, 0x9e, 0x40, 0x0e, 0x78, 0x5a,
|
0x12, 0x0b, 0xe9, 0x24, 0x03, 0x12, 0x0b, 0xa6, 0x78, 0x6d, 0x12, 0x0b, 0xe9, 0x24, 0x04, 0x12, //0x88b0,
|
||||||
0xe6, 0x13, 0xfe, 0x08, 0xe6, 0x78, 0x57, 0x12, 0x0c, 0x8a, 0x80, 0x04, 0x7e, 0x00, 0x7f, 0x00,
|
0x0b, 0xa6, 0x0d, 0xbd, 0x05, 0xd4, 0xc2, 0x0e, 0xc2, 0x06, 0x22, 0x85, 0x08, 0x41, 0x90, 0x30, //0x88c0,
|
||||||
0xe4, 0xfc, 0xfd, 0x78, 0x60, 0x12, 0x07, 0x4f, 0x78, 0x58, 0x12, 0x0c, 0x54, 0x78, 0x55, 0x26,
|
0x24, 0xe0, 0xf5, 0x3d, 0xa3, 0xe0, 0xf5, 0x3e, 0xa3, 0xe0, 0xf5, 0x3f, 0xa3, 0xe0, 0xf5, 0x40, //0x88d0,
|
||||||
0xff, 0xee, 0x18, 0x36, 0xfe, 0x78, 0x64, 0x12, 0x0c, 0x4c, 0x78, 0x57, 0x26, 0xff, 0xee, 0x18,
|
0xa3, 0xe0, 0xf5, 0x3c, 0xd2, 0x34, 0xe5, 0x41, 0x12, 0x06, 0xb1, 0x09, 0x31, 0x03, 0x09, 0x35, //0x88e0,
|
||||||
0x36, 0xfe, 0xe4, 0xfc, 0xfd, 0x78, 0x68, 0x12, 0x07, 0x4f, 0x12, 0x0c, 0x5c, 0x78, 0x64, 0x12,
|
0x04, 0x09, 0x3b, 0x05, 0x09, 0x3e, 0x06, 0x09, 0x41, 0x07, 0x09, 0x4a, 0x08, 0x09, 0x5b, 0x12, //0x88f0,
|
||||||
0x07, 0x42, 0xd3, 0x12, 0x07, 0x0e, 0x40, 0x08, 0x12, 0x0c, 0x5c, 0x78, 0x64, 0x12, 0x07, 0x4f,
|
0x09, 0x73, 0x18, 0x09, 0x89, 0x19, 0x09, 0x5e, 0x1a, 0x09, 0x6a, 0x1b, 0x09, 0xad, 0x80, 0x09, //0x8900,
|
||||||
0x78, 0x52, 0x12, 0x0c, 0x5e, 0x78, 0x68, 0x12, 0x07, 0x42, 0xd3, 0x12, 0x07, 0x0e, 0x40, 0x0a,
|
0xb2, 0x81, 0x0a, 0x1d, 0x8f, 0x0a, 0x09, 0x90, 0x0a, 0x1d, 0x91, 0x0a, 0x1d, 0x92, 0x0a, 0x1d, //0x8910,
|
||||||
0x78, 0x52, 0x12, 0x0c, 0x5e, 0x78, 0x68, 0x12, 0x07, 0x4f, 0xe4, 0xfd, 0x78, 0x5f, 0x12, 0x0c,
|
0x93, 0x0a, 0x1d, 0x94, 0x0a, 0x1d, 0x98, 0x0a, 0x17, 0x9f, 0x0a, 0x1a, 0xec, 0x00, 0x00, 0x0a, //0x8920,
|
||||||
0x77, 0x24, 0x01, 0x12, 0x0c, 0x40, 0x78, 0x63, 0x12, 0x0c, 0x77, 0x24, 0x02, 0x12, 0x0c, 0x40,
|
0x38, 0x12, 0x0f, 0x74, 0x22, 0x12, 0x0f, 0x74, 0xd2, 0x03, 0x22, 0xd2, 0x03, 0x22, 0xc2, 0x03, //0x8930,
|
||||||
0x78, 0x67, 0x12, 0x0c, 0x77, 0x24, 0x03, 0x12, 0x0c, 0x40, 0x78, 0x6b, 0x12, 0x0c, 0x77, 0x24,
|
0x22, 0xa2, 0x37, 0xe4, 0x33, 0xf5, 0x3c, 0x02, 0x0a, 0x1d, 0xc2, 0x01, 0xc2, 0x02, 0xc2, 0x03, //0x8940,
|
||||||
0x04, 0x12, 0x0c, 0x40, 0x0d, 0xbd, 0x05, 0xd4, 0xc2, 0x0e, 0xc2, 0x06, 0x22, 0x85, 0x08, 0x41,
|
0x12, 0x0d, 0x0d, 0x75, 0x1e, 0x70, 0xd2, 0x35, 0x02, 0x0a, 0x1d, 0x02, 0x0a, 0x04, 0x85, 0x40, //0x8950,
|
||||||
0x90, 0x30, 0x24, 0xe0, 0xf5, 0x3d, 0xa3, 0xe0, 0xf5, 0x3e, 0xa3, 0xe0, 0xf5, 0x3f, 0xa3, 0xe0,
|
0x4a, 0x85, 0x3c, 0x4b, 0x12, 0x0a, 0xff, 0x02, 0x0a, 0x1d, 0x85, 0x4a, 0x40, 0x85, 0x4b, 0x3c, //0x8960,
|
||||||
0xf5, 0x40, 0xa3, 0xe0, 0xf5, 0x3c, 0xd2, 0x33, 0xe5, 0x41, 0x12, 0x07, 0x67, 0x09, 0xb4, 0x03,
|
0x02, 0x0a, 0x1d, 0xe4, 0xf5, 0x22, 0xf5, 0x23, 0x85, 0x40, 0x31, 0x85, 0x3f, 0x30, 0x85, 0x3e, //0x8970,
|
||||||
0x09, 0xb8, 0x04, 0x09, 0xbe, 0x05, 0x09, 0xc1, 0x06, 0x09, 0xc4, 0x07, 0x09, 0xcd, 0x08, 0x09,
|
0x2f, 0x85, 0x3d, 0x2e, 0x12, 0x0f, 0x46, 0x80, 0x1f, 0x75, 0x22, 0x00, 0x75, 0x23, 0x01, 0x74, //0x8980,
|
||||||
0xde, 0x12, 0x09, 0xe0, 0x80, 0x09, 0xe5, 0x81, 0x0a, 0x43, 0x8f, 0x0a, 0x32, 0x90, 0x0a, 0x43,
|
0xff, 0xf5, 0x2d, 0xf5, 0x2c, 0xf5, 0x2b, 0xf5, 0x2a, 0x12, 0x0f, 0x46, 0x85, 0x2d, 0x40, 0x85, //0x8990,
|
||||||
0x91, 0x0a, 0x43, 0x92, 0x0a, 0x43, 0x93, 0x0a, 0x43, 0x94, 0x0a, 0x43, 0x98, 0x0a, 0x40, 0x9f,
|
0x2c, 0x3f, 0x85, 0x2b, 0x3e, 0x85, 0x2a, 0x3d, 0xe4, 0xf5, 0x3c, 0x80, 0x70, 0x12, 0x0f, 0x16, //0x89a0,
|
||||||
0x00, 0x00, 0x0a, 0x5e, 0x12, 0x0e, 0xce, 0x22, 0x12, 0x0e, 0xce, 0xd2, 0x03, 0x22, 0xd2, 0x03,
|
0x80, 0x6b, 0x85, 0x3d, 0x45, 0x85, 0x3e, 0x46, 0xe5, 0x47, 0xc3, 0x13, 0xff, 0xe5, 0x45, 0xc3, //0x89b0,
|
||||||
0x22, 0xc2, 0x03, 0x22, 0xa2, 0x36, 0xe4, 0x33, 0xf5, 0x3c, 0x02, 0x0a, 0x43, 0xc2, 0x01, 0xc2,
|
0x9f, 0x50, 0x02, 0x8f, 0x45, 0xe5, 0x48, 0xc3, 0x13, 0xff, 0xe5, 0x46, 0xc3, 0x9f, 0x50, 0x02, //0x89c0,
|
||||||
0x02, 0xc2, 0x03, 0x12, 0x0d, 0x14, 0x75, 0x1e, 0x70, 0xd2, 0x34, 0x02, 0x0a, 0x43, 0x80, 0x4d,
|
0x8f, 0x46, 0xe5, 0x47, 0xc3, 0x13, 0xff, 0xfd, 0xe5, 0x45, 0x2d, 0xfd, 0xe4, 0x33, 0xfc, 0xe5, //0x89d0,
|
||||||
0x12, 0x0f, 0x17, 0x80, 0x5e, 0x85, 0x3d, 0x43, 0x85, 0x3e, 0x44, 0xe5, 0x45, 0xc3, 0x13, 0xff,
|
0x44, 0x12, 0x0f, 0x90, 0x40, 0x05, 0xe5, 0x44, 0x9f, 0xf5, 0x45, 0xe5, 0x48, 0xc3, 0x13, 0xff, //0x89e0,
|
||||||
0xe5, 0x43, 0xc3, 0x9f, 0x50, 0x02, 0x8f, 0x43, 0xe5, 0x46, 0xc3, 0x13, 0xff, 0xe5, 0x44, 0xc3,
|
0xfd, 0xe5, 0x46, 0x2d, 0xfd, 0xe4, 0x33, 0xfc, 0xe5, 0x43, 0x12, 0x0f, 0x90, 0x40, 0x05, 0xe5, //0x89f0,
|
||||||
0x9f, 0x50, 0x02, 0x8f, 0x44, 0xe5, 0x45, 0xc3, 0x13, 0xff, 0xfd, 0xe5, 0x43, 0x90, 0x0e, 0x7f,
|
0x43, 0x9f, 0xf5, 0x46, 0x12, 0x06, 0xd7, 0x80, 0x14, 0x85, 0x40, 0x48, 0x85, 0x3f, 0x47, 0x85, //0x8a00,
|
||||||
0x12, 0x0e, 0xea, 0x40, 0x04, 0xee, 0x9f, 0xf5, 0x43, 0xe5, 0x46, 0xc3, 0x13, 0xff, 0xfd, 0xe5,
|
0x3e, 0x46, 0x85, 0x3d, 0x45, 0x80, 0x06, 0x02, 0x06, 0xd7, 0x12, 0x0d, 0x7e, 0x90, 0x30, 0x24, //0x8a10,
|
||||||
0x44, 0x90, 0x0e, 0x80, 0x12, 0x0e, 0xea, 0x40, 0x04, 0xee, 0x9f, 0xf5, 0x44, 0x12, 0x07, 0x8d,
|
0xe5, 0x3d, 0xf0, 0xa3, 0xe5, 0x3e, 0xf0, 0xa3, 0xe5, 0x3f, 0xf0, 0xa3, 0xe5, 0x40, 0xf0, 0xa3, //0x8a20,
|
||||||
0x80, 0x11, 0x85, 0x40, 0x46, 0x85, 0x3f, 0x45, 0x85, 0x3e, 0x44, 0x85, 0x3d, 0x43, 0x80, 0x03,
|
0xe5, 0x3c, 0xf0, 0x90, 0x30, 0x23, 0xe4, 0xf0, 0x22, 0xc0, 0xe0, 0xc0, 0x83, 0xc0, 0x82, 0xc0, //0x8a30,
|
||||||
0x02, 0x07, 0x8d, 0x90, 0x30, 0x24, 0xe5, 0x3d, 0xf0, 0xa3, 0xe5, 0x3e, 0xf0, 0xa3, 0xe5, 0x3f,
|
0xd0, 0x90, 0x3f, 0x0c, 0xe0, 0xf5, 0x32, 0xe5, 0x32, 0x30, 0xe3, 0x74, 0x30, 0x36, 0x66, 0x90, //0x8a40,
|
||||||
0xf0, 0xa3, 0xe5, 0x40, 0xf0, 0xa3, 0xe5, 0x3c, 0xf0, 0x90, 0x30, 0x23, 0xe4, 0xf0, 0x22, 0xc0,
|
0x60, 0x19, 0xe0, 0xf5, 0x0a, 0xa3, 0xe0, 0xf5, 0x0b, 0x90, 0x60, 0x1d, 0xe0, 0xf5, 0x14, 0xa3, //0x8a50,
|
||||||
0xe0, 0xc0, 0x83, 0xc0, 0x82, 0xc0, 0xd0, 0x90, 0x3f, 0x0c, 0xe0, 0xf5, 0x32, 0xe5, 0x32, 0x30,
|
0xe0, 0xf5, 0x15, 0x90, 0x60, 0x21, 0xe0, 0xf5, 0x0c, 0xa3, 0xe0, 0xf5, 0x0d, 0x90, 0x60, 0x29, //0x8a60,
|
||||||
0xe3, 0x4c, 0x30, 0x35, 0x3e, 0x90, 0x60, 0x19, 0xe0, 0xf5, 0x0a, 0xa3, 0xe0, 0xf5, 0x0b, 0x90,
|
0xe0, 0xf5, 0x0e, 0xa3, 0xe0, 0xf5, 0x0f, 0x90, 0x60, 0x31, 0xe0, 0xf5, 0x10, 0xa3, 0xe0, 0xf5, //0x8a70,
|
||||||
0x60, 0x1d, 0xe0, 0xf5, 0x14, 0xa3, 0xe0, 0xf5, 0x15, 0x30, 0x01, 0x06, 0x30, 0x32, 0x03, 0xd3,
|
0x11, 0x90, 0x60, 0x39, 0xe0, 0xf5, 0x12, 0xa3, 0xe0, 0xf5, 0x13, 0x30, 0x01, 0x06, 0x30, 0x33, //0x8a80,
|
||||||
0x80, 0x01, 0xc3, 0x92, 0x09, 0x30, 0x02, 0x06, 0x30, 0x32, 0x03, 0xd3, 0x80, 0x01, 0xc3, 0x92,
|
0x03, 0xd3, 0x80, 0x01, 0xc3, 0x92, 0x09, 0x30, 0x02, 0x06, 0x30, 0x33, 0x03, 0xd3, 0x80, 0x01, //0x8a90,
|
||||||
0x0a, 0x30, 0x32, 0x0c, 0x30, 0x03, 0x09, 0x20, 0x02, 0x06, 0x20, 0x01, 0x03, 0xd3, 0x80, 0x01,
|
0xc3, 0x92, 0x0a, 0x30, 0x33, 0x0c, 0x30, 0x03, 0x09, 0x20, 0x02, 0x06, 0x20, 0x01, 0x03, 0xd3, //0x8aa0,
|
||||||
0xc3, 0x92, 0x0b, 0x90, 0x30, 0x01, 0xe0, 0x44, 0x40, 0xf0, 0xe0, 0x54, 0xbf, 0xf0, 0xe5, 0x32,
|
0x80, 0x01, 0xc3, 0x92, 0x0b, 0x90, 0x30, 0x01, 0xe0, 0x44, 0x40, 0xf0, 0xe0, 0x54, 0xbf, 0xf0, //0x8ab0,
|
||||||
0x30, 0xe1, 0x14, 0x30, 0x33, 0x11, 0x90, 0x30, 0x22, 0xe0, 0xf5, 0x08, 0xe4, 0xf0, 0x30, 0x00,
|
0xe5, 0x32, 0x30, 0xe1, 0x14, 0x30, 0x34, 0x11, 0x90, 0x30, 0x22, 0xe0, 0xf5, 0x08, 0xe4, 0xf0, //0x8ac0,
|
||||||
0x03, 0xd3, 0x80, 0x01, 0xc3, 0x92, 0x08, 0xe5, 0x32, 0x30, 0xe5, 0x12, 0x90, 0x56, 0xa1, 0xe0,
|
0x30, 0x00, 0x03, 0xd3, 0x80, 0x01, 0xc3, 0x92, 0x08, 0xe5, 0x32, 0x30, 0xe5, 0x12, 0x90, 0x56, //0x8ad0,
|
||||||
0xf5, 0x09, 0x30, 0x30, 0x09, 0x30, 0x05, 0x03, 0xd3, 0x80, 0x01, 0xc3, 0x92, 0x0d, 0x90, 0x3f,
|
0xa1, 0xe0, 0xf5, 0x09, 0x30, 0x31, 0x09, 0x30, 0x05, 0x03, 0xd3, 0x80, 0x01, 0xc3, 0x92, 0x0d, //0x8ae0,
|
||||||
0x0c, 0xe5, 0x32, 0xf0, 0xd0, 0xd0, 0xd0, 0x82, 0xd0, 0x83, 0xd0, 0xe0, 0x32, 0x90, 0x0e, 0x7d,
|
0x90, 0x3f, 0x0c, 0xe5, 0x32, 0xf0, 0xd0, 0xd0, 0xd0, 0x82, 0xd0, 0x83, 0xd0, 0xe0, 0x32, 0x90, //0x8af0,
|
||||||
0xe4, 0x93, 0xfe, 0x74, 0x01, 0x93, 0xff, 0xc3, 0x90, 0x0e, 0x7b, 0x74, 0x01, 0x93, 0x9f, 0xff,
|
0x0e, 0x7e, 0xe4, 0x93, 0xfe, 0x74, 0x01, 0x93, 0xff, 0xc3, 0x90, 0x0e, 0x7c, 0x74, 0x01, 0x93, //0x8b00,
|
||||||
0xe4, 0x93, 0x9e, 0xfe, 0xe4, 0x8f, 0x3b, 0x8e, 0x3a, 0xf5, 0x39, 0xf5, 0x38, 0xab, 0x3b, 0xaa,
|
0x9f, 0xff, 0xe4, 0x93, 0x9e, 0xfe, 0xe4, 0x8f, 0x3b, 0x8e, 0x3a, 0xf5, 0x39, 0xf5, 0x38, 0xab, //0x8b10,
|
||||||
0x3a, 0xa9, 0x39, 0xa8, 0x38, 0xaf, 0x49, 0xfc, 0xfd, 0xfe, 0x12, 0x05, 0xf1, 0x12, 0x0e, 0xfc,
|
0x3b, 0xaa, 0x3a, 0xa9, 0x39, 0xa8, 0x38, 0xaf, 0x4b, 0xfc, 0xfd, 0xfe, 0x12, 0x05, 0x28, 0x12, //0x8b20,
|
||||||
0xe4, 0x7b, 0xff, 0xfa, 0xf9, 0xf8, 0x12, 0x06, 0x7c, 0x12, 0x0e, 0xfc, 0x90, 0x0e, 0x69, 0xe4,
|
0x0d, 0xe1, 0xe4, 0x7b, 0xff, 0xfa, 0xf9, 0xf8, 0x12, 0x05, 0xb3, 0x12, 0x0d, 0xe1, 0x90, 0x0e, //0x8b30,
|
||||||
0x12, 0x0f, 0x11, 0x12, 0x0e, 0xfc, 0xe4, 0x85, 0x48, 0x37, 0xf5, 0x36, 0xf5, 0x35, 0xf5, 0x34,
|
0x69, 0xe4, 0x12, 0x0d, 0xf6, 0x12, 0x0d, 0xe1, 0xe4, 0x85, 0x4a, 0x37, 0xf5, 0x36, 0xf5, 0x35, //0x8b40,
|
||||||
0xaf, 0x37, 0xae, 0x36, 0xad, 0x35, 0xac, 0x34, 0xa3, 0x12, 0x0f, 0x11, 0x8f, 0x37, 0x8e, 0x36,
|
0xf5, 0x34, 0xaf, 0x37, 0xae, 0x36, 0xad, 0x35, 0xac, 0x34, 0xa3, 0x12, 0x0d, 0xf6, 0x8f, 0x37, //0x8b50,
|
||||||
0x8d, 0x35, 0x8c, 0x34, 0xe5, 0x3b, 0x45, 0x37, 0xf5, 0x3b, 0xe5, 0x3a, 0x45, 0x36, 0xf5, 0x3a,
|
0x8e, 0x36, 0x8d, 0x35, 0x8c, 0x34, 0xe5, 0x3b, 0x45, 0x37, 0xf5, 0x3b, 0xe5, 0x3a, 0x45, 0x36, //0x8b60,
|
||||||
0xe5, 0x39, 0x45, 0x35, 0xf5, 0x39, 0xe5, 0x38, 0x45, 0x34, 0xf5, 0x38, 0xe4, 0xf5, 0x22, 0xf5,
|
0xf5, 0x3a, 0xe5, 0x39, 0x45, 0x35, 0xf5, 0x39, 0xe5, 0x38, 0x45, 0x34, 0xf5, 0x38, 0xe4, 0xf5, //0x8b70,
|
||||||
0x23, 0x85, 0x3b, 0x31, 0x85, 0x3a, 0x30, 0x85, 0x39, 0x2f, 0x85, 0x38, 0x2e, 0x02, 0x0d, 0xc5,
|
0x22, 0xf5, 0x23, 0x85, 0x3b, 0x31, 0x85, 0x3a, 0x30, 0x85, 0x39, 0x2f, 0x85, 0x38, 0x2e, 0x02, //0x8b80,
|
||||||
0xad, 0x39, 0xac, 0x38, 0xfa, 0xf9, 0xf8, 0x12, 0x05, 0xf1, 0x8f, 0x3b, 0x8e, 0x3a, 0x8d, 0x39,
|
0x0f, 0x46, 0xe0, 0xa3, 0xe0, 0x75, 0xf0, 0x02, 0xa4, 0xff, 0xae, 0xf0, 0xc3, 0x08, 0xe6, 0x9f, //0x8b90,
|
||||||
0x8c, 0x38, 0xab, 0x37, 0xaa, 0x36, 0xa9, 0x35, 0xa8, 0x34, 0x22, 0xef, 0x25, 0xe0, 0x24, 0x4c,
|
0xf6, 0x18, 0xe6, 0x9e, 0xf6, 0x22, 0xff, 0xe5, 0xf0, 0x34, 0x60, 0x8f, 0x82, 0xf5, 0x83, 0xec, //0x8ba0,
|
||||||
0xf8, 0xe6, 0xfc, 0x08, 0xe6, 0xfd, 0x22, 0x93, 0xff, 0xe4, 0xfc, 0xfd, 0xfe, 0x12, 0x05, 0xf1,
|
0xf0, 0x22, 0x78, 0x52, 0x7e, 0x00, 0xe6, 0xfc, 0x08, 0xe6, 0xfd, 0x02, 0x04, 0xc1, 0xe4, 0xfc, //0x8bb0,
|
||||||
0x8f, 0x37, 0x8e, 0x36, 0x8d, 0x35, 0x8c, 0x34, 0x22, 0xf9, 0xc3, 0xe6, 0x97, 0x18, 0xe6, 0x19,
|
0xfd, 0x12, 0x06, 0x99, 0x78, 0x5c, 0xe6, 0xc3, 0x13, 0xfe, 0x08, 0xe6, 0x13, 0x22, 0x78, 0x52, //0x8bc0,
|
||||||
0x97, 0x22, 0xff, 0xa6, 0x06, 0x08, 0xa6, 0x07, 0x22, 0xe6, 0xfe, 0x08, 0xe6, 0xff, 0xe4, 0x8f,
|
0xe6, 0xfe, 0x08, 0xe6, 0xff, 0xe4, 0xfc, 0xfd, 0x22, 0xe7, 0xc4, 0xf8, 0x54, 0xf0, 0xc8, 0x68, //0x8bd0,
|
||||||
0x37, 0x8e, 0x36, 0xf5, 0x35, 0xf5, 0x34, 0x22, 0xe6, 0xfe, 0x08, 0xe6, 0xff, 0xe4, 0x8f, 0x3b,
|
0xf7, 0x09, 0xe7, 0xc4, 0x54, 0x0f, 0x48, 0xf7, 0x22, 0xe6, 0xfc, 0xed, 0x75, 0xf0, 0x04, 0xa4, //0x8be0,
|
||||||
0x8e, 0x3a, 0xf5, 0x39, 0xf5, 0x38, 0x22, 0xe7, 0x96, 0xff, 0x19, 0xe7, 0x18, 0x96, 0x22, 0xff,
|
0x22, 0x12, 0x06, 0x7c, 0x8f, 0x48, 0x8e, 0x47, 0x8d, 0x46, 0x8c, 0x45, 0x22, 0xe0, 0xfe, 0xa3, //0x8bf0,
|
||||||
0xa6, 0x06, 0x08, 0xa6, 0x07, 0x78, 0x6c, 0xe6, 0xfe, 0x08, 0xe6, 0x22, 0x78, 0x4c, 0xe6, 0xfe,
|
0xe0, 0xfd, 0xee, 0xf6, 0xed, 0x08, 0xf6, 0x22, 0x13, 0xff, 0xc3, 0xe6, 0x9f, 0xff, 0x18, 0xe6, //0x8c00,
|
||||||
0x08, 0xe6, 0x22, 0x78, 0xa7, 0xef, 0x26, 0xf6, 0x18, 0xe4, 0x36, 0xf6, 0x22, 0x78, 0x50, 0x7e,
|
0x9e, 0xfe, 0x22, 0xe6, 0xc3, 0x13, 0xf7, 0x08, 0xe6, 0x13, 0x09, 0xf7, 0x22, 0xad, 0x39, 0xac, //0x8c10,
|
||||||
0x00, 0xe6, 0xfc, 0x08, 0xe6, 0xfd, 0x12, 0x05, 0x8a, 0x7c, 0x00, 0x22, 0xe0, 0xa3, 0xe0, 0x75,
|
0x38, 0xfa, 0xf9, 0xf8, 0x12, 0x05, 0x28, 0x8f, 0x3b, 0x8e, 0x3a, 0x8d, 0x39, 0x8c, 0x38, 0xab, //0x8c20,
|
||||||
0xf0, 0x02, 0xa4, 0xff, 0xae, 0xf0, 0xc3, 0x08, 0xe6, 0x9f, 0xf6, 0x18, 0xe6, 0x9e, 0xf6, 0x22,
|
0x37, 0xaa, 0x36, 0xa9, 0x35, 0xa8, 0x34, 0x22, 0x93, 0xff, 0xe4, 0xfc, 0xfd, 0xfe, 0x12, 0x05, //0x8c30,
|
||||||
0xff, 0xe5, 0xf0, 0x34, 0x60, 0x8f, 0x82, 0xf5, 0x83, 0xec, 0xf0, 0x22, 0xe4, 0xfc, 0xfd, 0x12,
|
0x28, 0x8f, 0x37, 0x8e, 0x36, 0x8d, 0x35, 0x8c, 0x34, 0x22, 0x78, 0x84, 0xe6, 0xfe, 0x08, 0xe6, //0x8c40,
|
||||||
0x07, 0x4f, 0x78, 0x5a, 0xe6, 0xc3, 0x13, 0xfe, 0x08, 0xe6, 0x13, 0x22, 0x78, 0x50, 0xe6, 0xfe,
|
0xff, 0xe4, 0x8f, 0x37, 0x8e, 0x36, 0xf5, 0x35, 0xf5, 0x34, 0x22, 0x90, 0x0e, 0x8c, 0xe4, 0x93, //0x8c50,
|
||||||
0x08, 0xe6, 0xff, 0xe4, 0xfc, 0xfd, 0x22, 0xe7, 0xc4, 0xf8, 0x54, 0xf0, 0xc8, 0x68, 0xf7, 0x09,
|
0x25, 0xe0, 0x24, 0x0a, 0xf8, 0xe6, 0xfe, 0x08, 0xe6, 0xff, 0x22, 0xe6, 0xfe, 0x08, 0xe6, 0xff, //0x8c60,
|
||||||
0xe7, 0xc4, 0x54, 0x0f, 0x48, 0xf7, 0x22, 0xe6, 0xfc, 0xed, 0x75, 0xf0, 0x04, 0xa4, 0x22, 0xe0,
|
0xe4, 0x8f, 0x3b, 0x8e, 0x3a, 0xf5, 0x39, 0xf5, 0x38, 0x22, 0x78, 0x4e, 0xe6, 0xfe, 0x08, 0xe6, //0x8c70,
|
||||||
0xfe, 0xa3, 0xe0, 0xfd, 0xee, 0xf6, 0xed, 0x08, 0xf6, 0x22, 0x13, 0xff, 0xc3, 0xe6, 0x9f, 0xff,
|
0xff, 0x22, 0xef, 0x25, 0xe0, 0x24, 0x4e, 0xf8, 0xe6, 0xfc, 0x08, 0xe6, 0xfd, 0x22, 0x78, 0x89, //0x8c80,
|
||||||
0x18, 0xe6, 0x9e, 0xfe, 0x22, 0xe6, 0xc3, 0x13, 0xf7, 0x08, 0xe6, 0x13, 0x09, 0xf7, 0x22, 0x75,
|
0xef, 0x26, 0xf6, 0x18, 0xe4, 0x36, 0xf6, 0x22, 0x75, 0x89, 0x03, 0x75, 0xa8, 0x01, 0x75, 0xb8, //0x8c90,
|
||||||
0x89, 0x03, 0x75, 0xa8, 0x01, 0x75, 0xb8, 0x04, 0x75, 0x34, 0xff, 0x75, 0x35, 0x0e, 0x75, 0x36,
|
0x04, 0x75, 0x34, 0xff, 0x75, 0x35, 0x0e, 0x75, 0x36, 0x15, 0x75, 0x37, 0x0d, 0x12, 0x0e, 0x9a, //0x8ca0,
|
||||||
0x15, 0x75, 0x37, 0x0d, 0x12, 0x0d, 0x85, 0x12, 0x00, 0x09, 0x12, 0x0f, 0x17, 0x12, 0x00, 0x06,
|
0x12, 0x00, 0x09, 0x12, 0x0f, 0x16, 0x12, 0x00, 0x06, 0xd2, 0x00, 0xd2, 0x34, 0xd2, 0xaf, 0x75, //0x8cb0,
|
||||||
0xd2, 0x00, 0xd2, 0x33, 0xd2, 0xaf, 0x75, 0x34, 0xff, 0x75, 0x35, 0x0e, 0x75, 0x36, 0x49, 0x75,
|
0x34, 0xff, 0x75, 0x35, 0x0e, 0x75, 0x36, 0x49, 0x75, 0x37, 0x03, 0x12, 0x0e, 0x9a, 0x30, 0x08, //0x8cc0,
|
||||||
0x37, 0x03, 0x12, 0x0d, 0x85, 0x30, 0x08, 0x09, 0xc2, 0x33, 0x12, 0x09, 0x5d, 0xc2, 0x08, 0xd2,
|
0x09, 0xc2, 0x34, 0x12, 0x08, 0xcb, 0xc2, 0x08, 0xd2, 0x34, 0x30, 0x0b, 0x09, 0xc2, 0x36, 0x12, //0x8cd0,
|
||||||
0x33, 0x30, 0x0b, 0x09, 0xc2, 0x35, 0x12, 0x00, 0x0e, 0xc2, 0x0b, 0xd2, 0x35, 0x30, 0x09, 0x09,
|
0x02, 0x6c, 0xc2, 0x0b, 0xd2, 0x36, 0x30, 0x09, 0x09, 0xc2, 0x36, 0x12, 0x00, 0x0e, 0xc2, 0x09, //0x8ce0,
|
||||||
0xc2, 0x35, 0x12, 0x03, 0x0a, 0xc2, 0x09, 0xd2, 0x35, 0x30, 0x0e, 0x03, 0x12, 0x07, 0x8d, 0x30,
|
0xd2, 0x36, 0x30, 0x0e, 0x03, 0x12, 0x06, 0xd7, 0x30, 0x35, 0xd3, 0x90, 0x30, 0x29, 0xe5, 0x1e, //0x8cf0,
|
||||||
0x34, 0xd3, 0x90, 0x30, 0x29, 0xe5, 0x1e, 0xf0, 0xb4, 0x10, 0x05, 0x90, 0x30, 0x23, 0xe4, 0xf0,
|
0xf0, 0xb4, 0x10, 0x05, 0x90, 0x30, 0x23, 0xe4, 0xf0, 0xc2, 0x35, 0x80, 0xc1, 0xe4, 0xf5, 0x4b, //0x8d00,
|
||||||
0xc2, 0x34, 0x80, 0xc1, 0xe4, 0xf5, 0x49, 0x90, 0x0e, 0x77, 0x93, 0xff, 0xe4, 0x8f, 0x37, 0xf5,
|
0x90, 0x0e, 0x7a, 0x93, 0xff, 0xe4, 0x8f, 0x37, 0xf5, 0x36, 0xf5, 0x35, 0xf5, 0x34, 0xaf, 0x37, //0x8d10,
|
||||||
0x36, 0xf5, 0x35, 0xf5, 0x34, 0xaf, 0x37, 0xae, 0x36, 0xad, 0x35, 0xac, 0x34, 0x90, 0x0e, 0x6a,
|
0xae, 0x36, 0xad, 0x35, 0xac, 0x34, 0x90, 0x0e, 0x6a, 0x12, 0x0d, 0xf6, 0x8f, 0x37, 0x8e, 0x36, //0x8d20,
|
||||||
0x12, 0x0f, 0x11, 0x8f, 0x37, 0x8e, 0x36, 0x8d, 0x35, 0x8c, 0x34, 0x90, 0x0e, 0x72, 0x12, 0x07,
|
0x8d, 0x35, 0x8c, 0x34, 0x90, 0x0e, 0x72, 0x12, 0x06, 0x7c, 0xef, 0x45, 0x37, 0xf5, 0x37, 0xee, //0x8d30,
|
||||||
0x32, 0xef, 0x45, 0x37, 0xf5, 0x37, 0xee, 0x45, 0x36, 0xf5, 0x36, 0xed, 0x45, 0x35, 0xf5, 0x35,
|
0x45, 0x36, 0xf5, 0x36, 0xed, 0x45, 0x35, 0xf5, 0x35, 0xec, 0x45, 0x34, 0xf5, 0x34, 0xe4, 0xf5, //0x8d40,
|
||||||
0xec, 0x45, 0x34, 0xf5, 0x34, 0xe4, 0xf5, 0x22, 0xf5, 0x23, 0x85, 0x37, 0x31, 0x85, 0x36, 0x30,
|
0x22, 0xf5, 0x23, 0x85, 0x37, 0x31, 0x85, 0x36, 0x30, 0x85, 0x35, 0x2f, 0x85, 0x34, 0x2e, 0x12, //0x8d50,
|
||||||
0x85, 0x35, 0x2f, 0x85, 0x34, 0x2e, 0x12, 0x0d, 0xc5, 0xe4, 0xf5, 0x22, 0xf5, 0x23, 0x90, 0x0e,
|
0x0f, 0x46, 0xe4, 0xf5, 0x22, 0xf5, 0x23, 0x90, 0x0e, 0x72, 0x12, 0x0d, 0xea, 0x12, 0x0f, 0x46, //0x8d60,
|
||||||
0x72, 0x12, 0x0f, 0x05, 0x12, 0x0d, 0xc5, 0xe4, 0xf5, 0x22, 0xf5, 0x23, 0x90, 0x0e, 0x6e, 0x12,
|
0xe4, 0xf5, 0x22, 0xf5, 0x23, 0x90, 0x0e, 0x6e, 0x12, 0x0d, 0xea, 0x02, 0x0f, 0x46, 0xe5, 0x40, //0x8d70,
|
||||||
0x0f, 0x05, 0x02, 0x0d, 0xc5, 0xae, 0x35, 0xaf, 0x36, 0xe4, 0xfd, 0xed, 0xc3, 0x95, 0x37, 0x50,
|
0x24, 0xf2, 0xf5, 0x37, 0xe5, 0x3f, 0x34, 0x43, 0xf5, 0x36, 0xe5, 0x3e, 0x34, 0xa2, 0xf5, 0x35, //0x8d80,
|
||||||
0x33, 0x12, 0x0f, 0x52, 0xe4, 0x93, 0xf5, 0x38, 0x74, 0x01, 0x93, 0xf5, 0x39, 0x45, 0x38, 0x60,
|
0xe5, 0x3d, 0x34, 0x28, 0xf5, 0x34, 0xe5, 0x37, 0xff, 0xe4, 0xfe, 0xfd, 0xfc, 0x78, 0x18, 0x12, //0x8d90,
|
||||||
0x23, 0x85, 0x39, 0x82, 0x85, 0x38, 0x83, 0xe0, 0xfc, 0x12, 0x0f, 0x52, 0x74, 0x03, 0x93, 0x52,
|
0x06, 0x69, 0x8f, 0x40, 0x8e, 0x3f, 0x8d, 0x3e, 0x8c, 0x3d, 0xe5, 0x37, 0x54, 0xa0, 0xff, 0xe5, //0x8da0,
|
||||||
0x04, 0x12, 0x0f, 0x52, 0x74, 0x02, 0x93, 0x42, 0x04, 0x85, 0x39, 0x82, 0x85, 0x38, 0x83, 0xec,
|
0x36, 0xfe, 0xe4, 0xfd, 0xfc, 0x78, 0x07, 0x12, 0x06, 0x56, 0x78, 0x10, 0x12, 0x0f, 0x9a, 0xe4, //0x8db0,
|
||||||
0xf0, 0x0d, 0x80, 0xc7, 0x22, 0xa2, 0xaf, 0x92, 0x31, 0xc2, 0xaf, 0xe5, 0x23, 0x45, 0x22, 0x90,
|
0xff, 0xfe, 0xe5, 0x35, 0xfd, 0xe4, 0xfc, 0x78, 0x0e, 0x12, 0x06, 0x56, 0x12, 0x0f, 0x9d, 0xe4, //0x8dc0,
|
||||||
0x0e, 0x5d, 0x60, 0x0b, 0x12, 0x0f, 0x47, 0xe0, 0xf5, 0x2c, 0xe0, 0xf5, 0x2d, 0x80, 0x0f, 0x12,
|
0xff, 0xfe, 0xfd, 0xe5, 0x34, 0xfc, 0x78, 0x18, 0x12, 0x06, 0x56, 0x78, 0x08, 0x12, 0x0f, 0x9a, //0x8dd0,
|
||||||
0x0f, 0x47, 0xe5, 0x30, 0xf0, 0x90, 0x0e, 0x5f, 0x12, 0x0f, 0x47, 0xe5, 0x31, 0xf0, 0xa2, 0x31,
|
0x22, 0x8f, 0x3b, 0x8e, 0x3a, 0x8d, 0x39, 0x8c, 0x38, 0x22, 0x12, 0x06, 0x7c, 0x8f, 0x31, 0x8e, //0x8de0,
|
||||||
0x92, 0xaf, 0x22, 0x78, 0x7f, 0xe4, 0xf6, 0xd8, 0xfd, 0x75, 0x81, 0xcb, 0x02, 0x0c, 0x9f, 0x00,
|
0x30, 0x8d, 0x2f, 0x8c, 0x2e, 0x22, 0x93, 0xf9, 0xf8, 0x02, 0x06, 0x69, 0x00, 0x00, 0x00, 0x00, //0x8df0,
|
||||||
0x11, 0x05, 0x25, 0x16, 0x33, 0x02, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x74, 0x20, 0x20, 0x14, 0x00,
|
0x12, 0x01, 0x17, 0x08, 0x31, 0x15, 0x53, 0x54, 0x44, 0x20, 0x20, 0x20, 0x20, 0x20, 0x13, 0x01, //0x8e00,
|
||||||
0x10, 0x00, 0x56, 0x40, 0x1a, 0x30, 0x29, 0x7e, 0x00, 0x30, 0x04, 0x20, 0xdf, 0x30, 0x05, 0x40,
|
0x10, 0x01, 0x56, 0x40, 0x1a, 0x30, 0x29, 0x7e, 0x00, 0x30, 0x04, 0x20, 0xdf, 0x30, 0x05, 0x40, //0x8e10,
|
||||||
0xbf, 0x50, 0x03, 0x00, 0xfd, 0x50, 0x27, 0x01, 0xfe, 0x60, 0x00, 0x11, 0x00, 0x3f, 0x05, 0x30,
|
0xbf, 0x50, 0x03, 0x00, 0xfd, 0x50, 0x27, 0x01, 0xfe, 0x60, 0x00, 0x11, 0x00, 0x3f, 0x05, 0x30, //0x8e20,
|
||||||
0x00, 0x3f, 0x06, 0x22, 0x00, 0x3f, 0x01, 0x2a, 0x00, 0x3f, 0x02, 0x00, 0x00, 0x36, 0x06, 0x07,
|
0x00, 0x3f, 0x06, 0x22, 0x00, 0x3f, 0x01, 0x2a, 0x00, 0x3f, 0x02, 0x00, 0x00, 0x36, 0x06, 0x07, //0x8e30,
|
||||||
0x00, 0x3f, 0x0b, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x01, 0x40, 0xbf, 0x30, 0x01, 0x00,
|
0x00, 0x3f, 0x0b, 0x0f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x01, 0x40, 0xbf, 0x30, 0x01, 0x00, //0x8e40,
|
||||||
0xbf, 0x30, 0x29, 0x70, 0x00, 0x3a, 0x00, 0x00, 0xff, 0x3a, 0x00, 0x00, 0xff, 0x36, 0x03, 0x36,
|
0xbf, 0x30, 0x29, 0x70, 0x00, 0x3a, 0x00, 0x00, 0xff, 0x3a, 0x00, 0x00, 0xff, 0x36, 0x03, 0x36, //0x8e50,
|
||||||
0x02, 0x41, 0x44, 0x58, 0x20, 0x18, 0x10, 0x0a, 0x04, 0x04, 0x00, 0x03, 0xff, 0x64, 0x00, 0x00,
|
0x02, 0x41, 0x44, 0x58, 0x20, 0x18, 0x10, 0x0a, 0x04, 0x04, 0x00, 0x03, 0xff, 0x64, 0x00, 0x00, //0x8e60,
|
||||||
0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x04, 0x06, 0x00, 0x03, 0x98, 0x00, 0xcc, 0x50,
|
0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x04, 0x06, 0x06, 0x00, 0x03, 0x51, 0x00, 0x7a, //0x8e70,
|
||||||
0x3c, 0x28, 0x1e, 0x0c, 0x0c, 0x00, 0x00, 0x10, 0x0c, 0x10, 0x04, 0x0c, 0x6e, 0x06, 0x05, 0x00,
|
0x50, 0x3c, 0x28, 0x1e, 0x10, 0x10, 0x50, 0x2d, 0x28, 0x16, 0x10, 0x10, 0x02, 0x00, 0x10, 0x0c, //0x8e80,
|
||||||
0xa5, 0x5a, 0x78, 0xbc, 0xe6, 0xd3, 0x08, 0xff, 0xe6, 0x64, 0x80, 0xf8, 0xef, 0x64, 0x80, 0x98,
|
0x10, 0x04, 0x0c, 0x6e, 0x06, 0x05, 0x00, 0xa5, 0x5a, 0x00, 0xae, 0x35, 0xaf, 0x36, 0xe4, 0xfd, //0x8e90,
|
||||||
0x22, 0x93, 0xff, 0x7e, 0x00, 0xe6, 0xfc, 0x08, 0xe6, 0xfd, 0x12, 0x05, 0x8a, 0x78, 0xbf, 0xe6,
|
0xed, 0xc3, 0x95, 0x37, 0x50, 0x33, 0x12, 0x0f, 0xe2, 0xe4, 0x93, 0xf5, 0x38, 0x74, 0x01, 0x93, //0x8ea0,
|
||||||
0xfc, 0x08, 0xe6, 0xfd, 0xd3, 0xef, 0x9d, 0xee, 0x9c, 0x22, 0x78, 0xbb, 0xd3, 0xe6, 0x64, 0x80,
|
0xf5, 0x39, 0x45, 0x38, 0x60, 0x23, 0x85, 0x39, 0x82, 0x85, 0x38, 0x83, 0xe0, 0xfc, 0x12, 0x0f, //0x8eb0,
|
||||||
0x94, 0x80, 0x22, 0x25, 0xe0, 0x24, 0x0a, 0xf8, 0xe6, 0xfe, 0x08, 0xe6, 0xff, 0x22, 0xd2, 0x01,
|
0xe2, 0x74, 0x03, 0x93, 0x52, 0x04, 0x12, 0x0f, 0xe2, 0x74, 0x02, 0x93, 0x42, 0x04, 0x85, 0x39, //0x8ec0,
|
||||||
0xc2, 0x02, 0xe4, 0xf5, 0x1f, 0xf5, 0x1e, 0xd2, 0x34, 0xd2, 0x32, 0xd2, 0x35, 0xd2, 0x01, 0xc2,
|
0x82, 0x85, 0x38, 0x83, 0xec, 0xf0, 0x0d, 0x80, 0xc7, 0x22, 0x78, 0xbe, 0xe6, 0xd3, 0x08, 0xff, //0x8ed0,
|
||||||
0x02, 0xf5, 0x1f, 0xf5, 0x1e, 0xd2, 0x34, 0xd2, 0x32, 0x22, 0x2d, 0xfd, 0xe4, 0x33, 0xfc, 0xe4,
|
0xe6, 0x64, 0x80, 0xf8, 0xef, 0x64, 0x80, 0x98, 0x22, 0x93, 0xff, 0x7e, 0x00, 0xe6, 0xfc, 0x08, //0x8ee0,
|
||||||
0x93, 0xfe, 0xfb, 0xd3, 0xed, 0x9b, 0x74, 0x80, 0xf8, 0x6c, 0x98, 0x22, 0x8f, 0x3b, 0x8e, 0x3a,
|
0xe6, 0xfd, 0x12, 0x04, 0xc1, 0x78, 0xc1, 0xe6, 0xfc, 0x08, 0xe6, 0xfd, 0xd3, 0xef, 0x9d, 0xee, //0x8ef0,
|
||||||
0x8d, 0x39, 0x8c, 0x38, 0x22, 0x12, 0x07, 0x32, 0x8f, 0x31, 0x8e, 0x30, 0x8d, 0x2f, 0x8c, 0x2e,
|
0x9c, 0x22, 0x78, 0xbd, 0xd3, 0xe6, 0x64, 0x80, 0x94, 0x80, 0x22, 0x25, 0xe0, 0x24, 0x0a, 0xf8, //0x8f00,
|
||||||
0x22, 0x93, 0xf9, 0xf8, 0x02, 0x07, 0x1f, 0x90, 0x0e, 0x81, 0x12, 0x07, 0x32, 0x8f, 0x46, 0x8e,
|
0xe6, 0xfe, 0x08, 0xe6, 0xff, 0x22, 0xe5, 0x3c, 0xd3, 0x94, 0x00, 0x40, 0x0b, 0x90, 0x0e, 0x88, //0x8f10,
|
||||||
0x45, 0x8d, 0x44, 0x8c, 0x43, 0xd2, 0x06, 0x30, 0x06, 0x03, 0xd3, 0x80, 0x01, 0xc3, 0x92, 0x0e,
|
0x12, 0x0b, 0xf1, 0x90, 0x0e, 0x86, 0x80, 0x09, 0x90, 0x0e, 0x82, 0x12, 0x0b, 0xf1, 0x90, 0x0e, //0x8f20,
|
||||||
0x22, 0xc0, 0xe0, 0xc0, 0x83, 0xc0, 0x82, 0x90, 0x3f, 0x0d, 0xe0, 0xf5, 0x33, 0xe5, 0x33, 0xf0,
|
0x80, 0xe4, 0x93, 0xf5, 0x44, 0xa3, 0xe4, 0x93, 0xf5, 0x43, 0xd2, 0x06, 0x30, 0x06, 0x03, 0xd3, //0x8f30,
|
||||||
0xd0, 0x82, 0xd0, 0x83, 0xd0, 0xe0, 0x32, 0xe4, 0x93, 0xfe, 0x74, 0x01, 0x93, 0xf5, 0x82, 0x8e,
|
0x80, 0x01, 0xc3, 0x92, 0x0e, 0x22, 0xa2, 0xaf, 0x92, 0x32, 0xc2, 0xaf, 0xe5, 0x23, 0x45, 0x22, //0x8f40,
|
||||||
0x83, 0x22, 0x8f, 0x82, 0x8e, 0x83, 0x75, 0xf0, 0x04, 0xed, 0x02, 0x07, 0x5b
|
0x90, 0x0e, 0x5d, 0x60, 0x0e, 0x12, 0x0f, 0xcb, 0xe0, 0xf5, 0x2c, 0x12, 0x0f, 0xc8, 0xe0, 0xf5, //0x8f50,
|
||||||
|
0x2d, 0x80, 0x0c, 0x12, 0x0f, 0xcb, 0xe5, 0x30, 0xf0, 0x12, 0x0f, 0xc8, 0xe5, 0x31, 0xf0, 0xa2, //0x8f60,
|
||||||
|
0x32, 0x92, 0xaf, 0x22, 0xd2, 0x01, 0xc2, 0x02, 0xe4, 0xf5, 0x1f, 0xf5, 0x1e, 0xd2, 0x35, 0xd2, //0x8f70,
|
||||||
|
0x33, 0xd2, 0x36, 0xd2, 0x01, 0xc2, 0x02, 0xf5, 0x1f, 0xf5, 0x1e, 0xd2, 0x35, 0xd2, 0x33, 0x22, //0x8f80,
|
||||||
|
0xfb, 0xd3, 0xed, 0x9b, 0x74, 0x80, 0xf8, 0x6c, 0x98, 0x22, 0x12, 0x06, 0x69, 0xe5, 0x40, 0x2f, //0x8f90,
|
||||||
|
0xf5, 0x40, 0xe5, 0x3f, 0x3e, 0xf5, 0x3f, 0xe5, 0x3e, 0x3d, 0xf5, 0x3e, 0xe5, 0x3d, 0x3c, 0xf5, //0x8fa0,
|
||||||
|
0x3d, 0x22, 0xc0, 0xe0, 0xc0, 0x83, 0xc0, 0x82, 0x90, 0x3f, 0x0d, 0xe0, 0xf5, 0x33, 0xe5, 0x33, //0x8fb0,
|
||||||
|
0xf0, 0xd0, 0x82, 0xd0, 0x83, 0xd0, 0xe0, 0x32, 0x90, 0x0e, 0x5f, 0xe4, 0x93, 0xfe, 0x74, 0x01, //0x8fc0,
|
||||||
|
0x93, 0xf5, 0x82, 0x8e, 0x83, 0x22, 0x78, 0x7f, 0xe4, 0xf6, 0xd8, 0xfd, 0x75, 0x81, 0xcd, 0x02, //0x8fd0,
|
||||||
|
0x0c, 0x98, 0x8f, 0x82, 0x8e, 0x83, 0x75, 0xf0, 0x04, 0xed, 0x02, 0x06, 0xa5 //0x8fe0
|
||||||
];
|
];
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -1227,8 +1299,6 @@ class Camera
|
|||||||
logger.Info("开始写入OV5640自动对焦固件");
|
logger.Info("开始写入OV5640自动对焦固件");
|
||||||
|
|
||||||
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
var setStartAddrResult = await ConfigureRegisters([[0x3000, 0x80]]);
|
|
||||||
if (!setStartAddrResult.IsSuccessful) return setStartAddrResult;
|
|
||||||
|
|
||||||
// 组装固件写入命令:地址 + 所有固件数据
|
// 组装固件写入命令:地址 + 所有固件数据
|
||||||
UInt16 firmwareAddr = 0x8000;
|
UInt16 firmwareAddr = 0x8000;
|
||||||
@@ -1285,31 +1355,31 @@ class Camera
|
|||||||
var result = await ConfigureRegisters(focusRegisters);
|
var result = await ConfigureRegisters(focusRegisters);
|
||||||
if (!result.IsSuccessful) return result;
|
if (!result.IsSuccessful) return result;
|
||||||
|
|
||||||
// 读取寄存器判断初始化是否完毕
|
// // 读取寄存器判断初始化是否完毕
|
||||||
for (int iteration = 1000; iteration > 0; iteration--)
|
// for (int iteration = 1000; iteration > 0; iteration--)
|
||||||
{
|
// {
|
||||||
var readResult = await ReadRegister(0x3029);
|
// var readResult = await ReadRegister(0x3029);
|
||||||
if (!readResult.IsSuccessful)
|
// if (!readResult.IsSuccessful)
|
||||||
{
|
// {
|
||||||
logger.Error($"读取自动对焦初始化状态失败: {readResult.Error}");
|
// logger.Error($"读取自动对焦初始化状态失败: {readResult.Error}");
|
||||||
return new(readResult.Error);
|
// return new(readResult.Error);
|
||||||
}
|
// }
|
||||||
|
|
||||||
logger.Trace($"自动对焦初始化状态检查, state=0x{readResult.Value:X2}");
|
// logger.Debug($"自动对焦初始化状态检查, state=0x{readResult.Value:X2}");
|
||||||
|
|
||||||
if (readResult.Value == 0x70)
|
// if (readResult.Value != 0x7F)
|
||||||
{
|
// {
|
||||||
break; // 初始化完成
|
// break; // 初始化完成
|
||||||
}
|
// }
|
||||||
|
|
||||||
if (iteration == 1)
|
// if (iteration == 1)
|
||||||
{
|
// {
|
||||||
logger.Error($"自动对焦初始化状态检查超时!! state=0x{readResult.Value:X2}");
|
// logger.Error($"自动对焦初始化状态检查超时!! state=0x{readResult.Value:X2}");
|
||||||
return new(new Exception($"自动对焦初始化状态检查超时, state=0x{readResult.Value:X2}"));
|
// return new(new Exception($"自动对焦初始化状态检查超时, state=0x{readResult.Value:X2}"));
|
||||||
}
|
// }
|
||||||
|
|
||||||
await Task.Delay(1);
|
// await Task.Delay(1);
|
||||||
}
|
// }
|
||||||
|
|
||||||
logger.Info("OV5640自动对焦功能初始化完成");
|
logger.Info("OV5640自动对焦功能初始化完成");
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
9
server/src/Peripherals/CommandID.md
Normal file
9
server/src/Peripherals/CommandID.md
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
# CommandID
|
||||||
|
示波器:12
|
||||||
|
逻辑分析仪: 11
|
||||||
|
Jtag: 10
|
||||||
|
矩阵键盘:1
|
||||||
|
HDMI:9
|
||||||
|
Camera: 8
|
||||||
|
Debugger: 7
|
||||||
|
七段数码港:6
|
||||||
254
server/src/Peripherals/DebuggerClient.cs
Normal file
254
server/src/Peripherals/DebuggerClient.cs
Normal file
@@ -0,0 +1,254 @@
|
|||||||
|
using System.Net;
|
||||||
|
using DotNext;
|
||||||
|
|
||||||
|
namespace Peripherals.DebuggerClient;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// FPGA调试器的内存地址映射常量
|
||||||
|
/// </summary>
|
||||||
|
class DebuggerAddr
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 触发器启动地址
|
||||||
|
/// </summary>
|
||||||
|
public const UInt32 Start = 0x5100_0000;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 刷新操作地址
|
||||||
|
/// </summary>
|
||||||
|
public const UInt32 Fresh = 0x5100_FFFF;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 信号标志读取地址
|
||||||
|
/// </summary>
|
||||||
|
public const UInt32 Signal = 0x5000_0001;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 数据读取基地址
|
||||||
|
/// </summary>
|
||||||
|
public const UInt32 Data = 0x5100_0000;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 捕获模式设置地址
|
||||||
|
/// </summary>
|
||||||
|
public const UInt32 Mode = 0x5101_0000;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// FPGA调试器命令常量
|
||||||
|
/// </summary>
|
||||||
|
class DebuggerCmd
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 启动触发器命令
|
||||||
|
/// </summary>
|
||||||
|
public const UInt32 Start = 0xFFFF_FFFF;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 刷新命令
|
||||||
|
/// </summary>
|
||||||
|
public const UInt32 Fresh = 0x0000_0000;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 清除信号标志命令
|
||||||
|
/// </summary>
|
||||||
|
public const UInt32 ClearSignal = 0xFFFF_FFFF;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 信号捕获模式枚举
|
||||||
|
/// </summary>
|
||||||
|
public enum CaptureMode : byte
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 无捕获模式
|
||||||
|
/// </summary>
|
||||||
|
None = 0,
|
||||||
|
/// <summary>
|
||||||
|
/// 低电平触发模式
|
||||||
|
/// </summary>
|
||||||
|
Logic0 = 1,
|
||||||
|
/// <summary>
|
||||||
|
/// 高电平触发模式
|
||||||
|
/// </summary>
|
||||||
|
Logic1 = 2,
|
||||||
|
/// <summary>
|
||||||
|
/// 上升沿触发模式
|
||||||
|
/// </summary>
|
||||||
|
Rise = 3,
|
||||||
|
/// <summary>
|
||||||
|
/// 下降沿触发模式
|
||||||
|
/// </summary>
|
||||||
|
Fall = 4,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// FPGA调试器客户端,用于通过UDP协议与FPGA调试器进行通信
|
||||||
|
/// </summary>
|
||||||
|
public class DebuggerClient
|
||||||
|
{
|
||||||
|
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
readonly int timeout = 2000;
|
||||||
|
readonly int taskID;
|
||||||
|
readonly int port;
|
||||||
|
readonly string address;
|
||||||
|
private IPEndPoint ep;
|
||||||
|
|
||||||
|
private UInt32 captureDataAddr = 0x5100_0000;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 初始化FPGA调试器客户端
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="address">FPGA设备的IP地址</param>
|
||||||
|
/// <param name="port">通信端口号</param>
|
||||||
|
/// <param name="taskID">任务标识符</param>
|
||||||
|
/// <param name="timeout">通信超时时间(毫秒),默认2000ms</param>
|
||||||
|
/// <exception cref="ArgumentException">当timeout为负数时抛出</exception>
|
||||||
|
public DebuggerClient(string address, int port, int taskID, int timeout = 2000)
|
||||||
|
{
|
||||||
|
if (timeout < 0)
|
||||||
|
throw new ArgumentException("Timeout couldn't be negative", nameof(timeout));
|
||||||
|
this.address = address;
|
||||||
|
this.taskID = taskID;
|
||||||
|
this.port = port;
|
||||||
|
this.ep = new IPEndPoint(IPAddress.Parse(address), port);
|
||||||
|
this.timeout = timeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 设置信号捕获模式
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="wireNum">要设置的线</param>
|
||||||
|
/// <param name="mode">要设置的捕获模式</param>
|
||||||
|
/// <returns>操作结果,成功返回true,失败返回错误信息</returns>
|
||||||
|
public async ValueTask<Result<bool>> SetMode(UInt32 wireNum, CaptureMode mode)
|
||||||
|
{
|
||||||
|
if (wireNum > 512)
|
||||||
|
{
|
||||||
|
return new(new ArgumentException($"Wire Num can't be over 512, but receive num: {wireNum}"));
|
||||||
|
}
|
||||||
|
|
||||||
|
UInt32 data = ((UInt32)mode);
|
||||||
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, DebuggerAddr.Mode + wireNum, data, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set mode: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error("WriteAddr to SetMode returned false");
|
||||||
|
return new(new Exception("Failed to set mode"));
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 启动信号触发器开始捕获
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>操作结果,成功返回true,失败返回错误信息</returns>
|
||||||
|
public async ValueTask<Result<bool>> StartTrigger()
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, DebuggerAddr.Start, DebuggerCmd.Start, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to start trigger: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error("WriteAddr to StartTrigger returned false");
|
||||||
|
return new(new Exception("Failed to start trigger"));
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 读取触发器状态标志
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>操作结果,成功返回状态标志字节,失败返回错误信息</returns>
|
||||||
|
public async ValueTask<Result<byte>> ReadFlag()
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.ReadAddrByte(this.ep, this.taskID, DebuggerAddr.Signal, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to read flag: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (ret.Value.Options.Data == null || ret.Value.Options.Data.Length < 1)
|
||||||
|
{
|
||||||
|
logger.Error("ReadAddr returned invalid data for flag");
|
||||||
|
return new(new Exception("Failed to read flag"));
|
||||||
|
}
|
||||||
|
return ret.Value.Options.Data[3];
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 清除触发器状态标志
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>操作结果,成功返回true,失败返回错误信息</returns>
|
||||||
|
public async ValueTask<Result<bool>> ClearFlag()
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, DebuggerAddr.Signal, DebuggerCmd.ClearSignal, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to clear flag: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error("WriteAddr to ClearFlag returned false");
|
||||||
|
return new(new Exception("Failed to clear flag"));
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 从指定偏移地址读取捕获的数据
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="portNum">Port数量</param>
|
||||||
|
/// <returns>操作结果,成功返回捕获数据,失败返回错误信息</returns>
|
||||||
|
public async ValueTask<Result<byte[]>> ReadData(UInt32 portNum)
|
||||||
|
{
|
||||||
|
var captureData = new byte[1024 * 4 * portNum];
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.ReadAddr4Bytes(this.ep, this.taskID, this.captureDataAddr, captureData.Length / 4, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to read data: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ret.Value.Length != captureData.Length)
|
||||||
|
{
|
||||||
|
logger.Error($"Receive capture data length should be {captureData.Length} instead of {ret.Value.Length}");
|
||||||
|
return new(new Exception($"Receive capture data length should be {captureData.Length} instead of {ret.Value.Length}"));
|
||||||
|
}
|
||||||
|
|
||||||
|
Buffer.BlockCopy(ret.Value, 0, captureData, 0, captureData.Length);
|
||||||
|
}
|
||||||
|
|
||||||
|
return captureData;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 刷新调试器状态,重置内部状态机
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>操作结果,成功返回true,失败返回错误信息</returns>
|
||||||
|
public async ValueTask<Result<bool>> Refresh()
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, DebuggerAddr.Fresh, DebuggerCmd.Fresh, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to refresh: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error("WriteAddr to Refresh returned false");
|
||||||
|
return new(new Exception("Failed to refresh"));
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
295
server/src/Peripherals/HdmiInClient.cs
Normal file
295
server/src/Peripherals/HdmiInClient.cs
Normal file
@@ -0,0 +1,295 @@
|
|||||||
|
using System.Net;
|
||||||
|
using DotNext;
|
||||||
|
using WebProtocol;
|
||||||
|
|
||||||
|
namespace Peripherals.HdmiInClient;
|
||||||
|
|
||||||
|
static class HdmiInAddr
|
||||||
|
{
|
||||||
|
public const UInt32 BASE = 0xA000_0000;
|
||||||
|
|
||||||
|
public const UInt32 CAPTURE_RD_CTRL = BASE + 0x0;
|
||||||
|
|
||||||
|
public const UInt32 START_WR_ADDR0 = BASE + 0x20;
|
||||||
|
public const UInt32 END_WR_ADDR0 = BASE + 0x21;
|
||||||
|
|
||||||
|
public const UInt32 HDMI_NOT_READY = BASE + 0x26;
|
||||||
|
public const UInt32 HDMI_HEIGHT_WIDTH = BASE + 0x27;
|
||||||
|
public const UInt32 CAPTURE_HEIGHT_WIDTH = BASE + 0x28;
|
||||||
|
|
||||||
|
public const UInt32 ADDR_HDMI_WD_START = 0x0400_0000;
|
||||||
|
}
|
||||||
|
|
||||||
|
public class HdmiIn
|
||||||
|
{
|
||||||
|
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
readonly int timeout = 500;
|
||||||
|
readonly int taskID;
|
||||||
|
readonly int port;
|
||||||
|
readonly string address;
|
||||||
|
private IPEndPoint ep;
|
||||||
|
|
||||||
|
public int Width { get; private set; }
|
||||||
|
public int Height { get; private set; }
|
||||||
|
public int FrameLength => Width * Height / 2;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 初始化HDMI输入客户端
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="address">HDMI输入设备IP地址</param>
|
||||||
|
/// <param name="port">HDMI输入设备端口</param>
|
||||||
|
/// <param name="taskID">任务ID</param>
|
||||||
|
/// <param name="timeout">超时时间(毫秒)</param>
|
||||||
|
public HdmiIn(string address, int port, int taskID, int timeout = 500)
|
||||||
|
{
|
||||||
|
if (timeout < 0)
|
||||||
|
throw new ArgumentException("Timeout couldn't be negative", nameof(timeout));
|
||||||
|
this.address = address;
|
||||||
|
this.port = port;
|
||||||
|
this.ep = new IPEndPoint(IPAddress.Parse(address), port);
|
||||||
|
this.taskID = taskID;
|
||||||
|
this.timeout = timeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<bool>> Init(bool enable = true)
|
||||||
|
{
|
||||||
|
{
|
||||||
|
var ret = await CheckHdmiIsReady();
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to check HDMI ready: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error("HDMI not ready");
|
||||||
|
return new(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int width = -1, height = -1;
|
||||||
|
{
|
||||||
|
var ret = await GetHdmiResolution();
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get HDMI resolution: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
(width, height) = ret.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
var ret = await ConnectJpeg2Hdmi(width, height);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to connect JPEG to HDMI: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error("Failed to connect JPEG to HDMI");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (enable) return await SetTransEnable(true);
|
||||||
|
else return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<bool>> SetTransEnable(bool isEnable)
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, HdmiInAddr.CAPTURE_RD_CTRL, (isEnable ? 0x00000001u : 0x00000000u));
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to write HdmiIn_CTRL to HdmiIn at {this.address}:{this.port}, error: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error($"HdmiIn_CTRL write returned false for HdmiIn at {this.address}:{this.port}");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 读取一帧图像数据
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>包含图像数据的字节数组</returns>
|
||||||
|
public async ValueTask<Result<byte[]>> ReadFrame()
|
||||||
|
{
|
||||||
|
// 只在第一次或出错时清除UDP缓冲区,避免每帧都清除造成延迟
|
||||||
|
// MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
|
||||||
|
logger.Trace($"Reading frame from HdmiIn {this.address}");
|
||||||
|
|
||||||
|
// 使用UDPClientPool读取图像帧数据
|
||||||
|
var result = await UDPClientPool.ReadAddr4BytesAsync(
|
||||||
|
this.ep,
|
||||||
|
this.taskID, // taskID
|
||||||
|
HdmiInAddr.ADDR_HDMI_WD_START,
|
||||||
|
FrameLength, // 使用当前分辨率的动态大小
|
||||||
|
BurstType.ExtendBurst,
|
||||||
|
this.timeout);
|
||||||
|
|
||||||
|
if (!result.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to read frame from HdmiIn {this.address}:{this.port}, error: {result.Error}");
|
||||||
|
// 读取失败时清除缓冲区,为下次读取做准备
|
||||||
|
try
|
||||||
|
{
|
||||||
|
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Warn($"Failed to clear UDP data after read error: {ex.Message}");
|
||||||
|
}
|
||||||
|
return new(result.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.Trace($"Successfully read frame from HdmiIn {this.address}:{this.port}, data length: {result.Value.Length} bytes");
|
||||||
|
return result.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Optional<(byte[] header, byte[] data, byte[] footer)>> GetMJpegFrame()
|
||||||
|
{
|
||||||
|
// 从HDMI读取RGB24数据
|
||||||
|
var readStartTime = DateTime.UtcNow;
|
||||||
|
var frameResult = await ReadFrame();
|
||||||
|
var readEndTime = DateTime.UtcNow;
|
||||||
|
var readTime = (readEndTime - readStartTime).TotalMilliseconds;
|
||||||
|
|
||||||
|
if (!frameResult.IsSuccessful || frameResult.Value == null)
|
||||||
|
{
|
||||||
|
logger.Warn("HDMI帧读取失败或为空");
|
||||||
|
return Optional<(byte[] header, byte[] data, byte[] footer)>.None;
|
||||||
|
}
|
||||||
|
|
||||||
|
var rgb565Data = frameResult.Value;
|
||||||
|
|
||||||
|
// 验证数据长度是否正确 (RGB24为每像素2字节)
|
||||||
|
var expectedLength = Width * Height * 2;
|
||||||
|
if (rgb565Data.Length != expectedLength)
|
||||||
|
{
|
||||||
|
logger.Warn("HDMI数据长度不匹配,期望: {Expected}, 实际: {Actual}",
|
||||||
|
expectedLength, rgb565Data.Length);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 将RGB24转换为JPEG(参考Camera版本的处理)
|
||||||
|
var jpegResult = Common.Image.ConvertRGB565ToJpeg(rgb565Data, Width, Height, 80, false);
|
||||||
|
|
||||||
|
if (!jpegResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error("HDMI RGB565转JPEG失败: {Error}", jpegResult.Error);
|
||||||
|
return Optional<(byte[] header, byte[] data, byte[] footer)>.None;
|
||||||
|
}
|
||||||
|
|
||||||
|
var jpegData = jpegResult.Value;
|
||||||
|
|
||||||
|
var mjpegFrameHeader = Common.Image.CreateMjpegFrameHeader(jpegData.Length);
|
||||||
|
var mjpegFrameFooter = Common.Image.CreateMjpegFrameFooter();
|
||||||
|
|
||||||
|
return (mjpegFrameHeader, jpegData, mjpegFrameFooter);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<bool>> CheckHdmiIsReady()
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.ReadAddrWithWait(
|
||||||
|
this.ep, this.taskID, HdmiInAddr.HDMI_NOT_READY, 0b00, 0b01, 100, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to check HDMI status: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
return ret.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<(int, int)>> GetHdmiResolution()
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.ReadAddrByte(
|
||||||
|
this.ep, this.taskID, HdmiInAddr.HDMI_HEIGHT_WIDTH, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get HDMI resolution: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
var data = ret.Value.Options.Data;
|
||||||
|
if (data == null || data.Length != 4)
|
||||||
|
{
|
||||||
|
logger.Error($"Invalid HDMI resolution data length: {data?.Length ?? 0}");
|
||||||
|
return new(new Exception("Invalid HDMI resolution data length"));
|
||||||
|
}
|
||||||
|
|
||||||
|
var width = (data[3] | (data[2] << 8)) - 1 - (((data[3] | (data[2] << 8)) - 1)%2);
|
||||||
|
var height = (data[1] | (data[0] << 8)) - 1 - (((data[1] | (data[0] << 8)) - 1)%2);
|
||||||
|
this.Width = width;
|
||||||
|
this.Height = height;
|
||||||
|
|
||||||
|
logger.Info($"HDMI resolution: {width}x{height}");
|
||||||
|
|
||||||
|
return new((width, height));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public async ValueTask<Result<bool>> ConnectJpeg2Hdmi(int width, int height)
|
||||||
|
{
|
||||||
|
if (width <= 0 || height <= 0)
|
||||||
|
{
|
||||||
|
logger.Error($"Invalid HDMI resolution: {width}x{height}");
|
||||||
|
return new(new ArgumentException("Invalid HDMI resolution"));
|
||||||
|
}
|
||||||
|
|
||||||
|
var frameSize = (UInt32)(width * height) / 2;
|
||||||
|
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(
|
||||||
|
this.ep, this.taskID, HdmiInAddr.CAPTURE_HEIGHT_WIDTH, (uint)((height << 16) + width), this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set CAPTURE_HEIGHT_WIDTH: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set HDMI output start address");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(
|
||||||
|
this.ep, this.taskID, HdmiInAddr.START_WR_ADDR0, HdmiInAddr.ADDR_HDMI_WD_START, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set HDMI output start address: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set HDMI output start address");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(
|
||||||
|
this.ep, this.taskID, HdmiInAddr.END_WR_ADDR0,
|
||||||
|
HdmiInAddr.ADDR_HDMI_WD_START + frameSize - 1, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set HDMI output end address: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set HDMI output address");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -174,7 +174,7 @@ public class I2c
|
|||||||
|
|
||||||
// 等待I2C命令完成
|
// 等待I2C命令完成
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.ReadAddrWithWait(this.ep, this.taskID, I2cAddr.Flag, 0x0000_0001, 0xFFFF_FFFF);
|
var ret = await UDPClientPool.ReadAddrWithWait(this.ep, this.taskID, I2cAddr.Flag, 0x0000_0001, 0xFFFF_FFFF, 10);
|
||||||
if (!ret.IsSuccessful)
|
if (!ret.IsSuccessful)
|
||||||
{
|
{
|
||||||
logger.Error($"Failed to wait for I2C command completion: {ret.Error}");
|
logger.Error($"Failed to wait for I2C command completion: {ret.Error}");
|
||||||
@@ -280,7 +280,7 @@ public class I2c
|
|||||||
|
|
||||||
// 等待I2C命令完成
|
// 等待I2C命令完成
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.ReadAddrWithWait(this.ep, this.taskID, I2cAddr.Flag, 0x0000_0001, 0xFFFF_FFFF);
|
var ret = await UDPClientPool.ReadAddrWithWait(this.ep, this.taskID, I2cAddr.Flag, 0x0000_0001, 0xFFFF_FFFF, 10);
|
||||||
if (!ret.IsSuccessful)
|
if (!ret.IsSuccessful)
|
||||||
{
|
{
|
||||||
logger.Error($"Failed to wait for I2C command completion: {ret.Error}");
|
logger.Error($"Failed to wait for I2C command completion: {ret.Error}");
|
||||||
@@ -296,20 +296,20 @@ public class I2c
|
|||||||
|
|
||||||
// 读取数据
|
// 读取数据
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.ReadAddr(this.ep, this.taskID, I2cAddr.Read, dataReadLength);
|
var ret = await UDPClientPool.ReadAddrByte(this.ep, this.taskID, I2cAddr.Read);
|
||||||
if (!ret.IsSuccessful)
|
if (!ret.IsSuccessful)
|
||||||
{
|
{
|
||||||
logger.Error($"Failed to read data from I2C FIFO: {ret.Error}");
|
logger.Error($"Failed to read data from I2C FIFO: {ret.Error}");
|
||||||
return new(ret.Error);
|
return new(ret.Error);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ret.Value.Options.Data == null || ret.Value.Options.Data.Length != dataReadLength)
|
if (ret.Value.Options.Data == null)
|
||||||
{
|
{
|
||||||
logger.Error($"ReadAddr returned unexpected data length: {ret.Value.Options.Data?.Length ?? 0}");
|
logger.Error($"ReadAddr returned unexpected data length: {ret.Value.Options.Data?.Length ?? 0}");
|
||||||
return new(new Exception("Failed to read expected amount of data from I2C FIFO"));
|
return new(new Exception("Failed to read expected amount of data from I2C FIFO"));
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret.Value.Options.Data;
|
return ret.Value.Options.Data[3..]; // 返回读取到的数据,跳过前3个字节
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
608
server/src/Peripherals/JpegClient.cs
Normal file
608
server/src/Peripherals/JpegClient.cs
Normal file
@@ -0,0 +1,608 @@
|
|||||||
|
using System.Net;
|
||||||
|
using DotNext;
|
||||||
|
using Common;
|
||||||
|
|
||||||
|
namespace Peripherals.JpegClient;
|
||||||
|
|
||||||
|
static class JpegAddr
|
||||||
|
{
|
||||||
|
const UInt32 BASE = 0xA000_0000;
|
||||||
|
|
||||||
|
public const UInt32 CAPTURE_RD_CTRL = BASE + 0x0;
|
||||||
|
public const UInt32 CAPTURE_WR_CTRL = BASE + 0x1;
|
||||||
|
|
||||||
|
public const UInt32 START_WR_ADDR0 = BASE + 0x2;
|
||||||
|
public const UInt32 END_WR_ADDR0 = BASE + 0x3;
|
||||||
|
public const UInt32 START_WR_ADDR1 = BASE + 0x4;
|
||||||
|
public const UInt32 END_WR_ADDR1 = BASE + 0x5;
|
||||||
|
public const UInt32 START_RD_ADDR0 = BASE + 0x6;
|
||||||
|
public const UInt32 END_RD_ADDR0 = BASE + 0x7;
|
||||||
|
|
||||||
|
public const UInt32 HDMI_NOT_READY = BASE + 0x8;
|
||||||
|
public const UInt32 HDMI_HEIGHT_WIDTH = BASE + 0x9;
|
||||||
|
|
||||||
|
public const UInt32 JPEG_HEIGHT_WIDTH = BASE + 0xA;
|
||||||
|
public const UInt32 JPEG_ADD_NEED_FRAME_NUM = BASE + 0xB;
|
||||||
|
public const UInt32 JPEG_FRAME_SAVE_NUM = BASE + 0xC;
|
||||||
|
public const UInt32 JPEG_FIFO_FRAME_INFO = BASE + 0xD;
|
||||||
|
|
||||||
|
public const UInt32 JPEG_QUANTIZATION_TABLE = BASE + 0x100;
|
||||||
|
|
||||||
|
public const UInt32 ADDR_HDMI_WD_START = 0x0400_0000;
|
||||||
|
public const UInt32 ADDR_JPEG_START = 0x0800_0000;
|
||||||
|
public const UInt32 ADDR_JPEG_END = 0x09FF_FFFF;
|
||||||
|
}
|
||||||
|
|
||||||
|
public class JpegInfo
|
||||||
|
{
|
||||||
|
public UInt32 Width { get; set; }
|
||||||
|
public UInt32 Height { get; set; }
|
||||||
|
public UInt32 Size { get; set; }
|
||||||
|
|
||||||
|
public JpegInfo(UInt32 width, UInt32 height, UInt32 size)
|
||||||
|
{
|
||||||
|
Width = width;
|
||||||
|
Height = height;
|
||||||
|
Size = size;
|
||||||
|
}
|
||||||
|
|
||||||
|
public JpegInfo(byte[] data)
|
||||||
|
{
|
||||||
|
if (data.Length < 8)
|
||||||
|
throw new ArgumentException("Invalid data length", nameof(data));
|
||||||
|
|
||||||
|
Width = ((UInt32)(data[5] << 8 + data[6] & 0xF0));
|
||||||
|
Height = ((UInt32)((data[6] & 0x0F) << 4 + data[7]));
|
||||||
|
Size = Number.BytesToUInt32(data, 0, 4).Value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum JpegSampleRate : UInt32
|
||||||
|
{
|
||||||
|
RATE_1_1 = 0b1111_1111_1111_1111_1111_1111_1111_1111,
|
||||||
|
RATE_1_2 = 0b1010_1010_1010_1010_1010_1010_1010_1010,
|
||||||
|
RATE_1_4 = 0b1000_1000_1000_1000_1000_1000_1000_1000,
|
||||||
|
RATE_3_4 = 0b1110_1110_1110_1110_1110_1110_1110_1110,
|
||||||
|
RATE_1_8 = 0b1000_0000_1000_0000_1000_0000_1000_0000,
|
||||||
|
RATE_3_8 = 0b1001_0010_0100_1001_1001_0010_0100_1001,
|
||||||
|
RATE_7_8 = 0b1111_1110_1111_1110_1111_1110_1111_1110,
|
||||||
|
RATE_1_16 = 0b1000_0000_0000_0000_1000_0000_0000_0000,
|
||||||
|
RATE_3_16 = 0b1000_0100_0010_0000_1000_0100_0010_0000,
|
||||||
|
RATE_5_16 = 0b1001_0001_0010_0010_0100_0100_1000_1001,
|
||||||
|
RATE_15_16 = 0b1111_1111_1111_1110_1111_1111_1111_1110,
|
||||||
|
RATE_1_32 = 0b1000_0000_0000_0000_0000_0000_0000_0000,
|
||||||
|
RATE_31_32 = 0b1111_1111_1111_1111_1111_1111_1111_1110,
|
||||||
|
}
|
||||||
|
|
||||||
|
public class Jpeg
|
||||||
|
{
|
||||||
|
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
readonly int timeout = 2000;
|
||||||
|
readonly int taskID;
|
||||||
|
readonly int port;
|
||||||
|
readonly string address;
|
||||||
|
private IPEndPoint ep;
|
||||||
|
|
||||||
|
public int Width { get; set; }
|
||||||
|
public int Height { get; set; }
|
||||||
|
|
||||||
|
public Jpeg(string address, int port, int taskID, int timeout = 2000)
|
||||||
|
{
|
||||||
|
if (timeout < 0)
|
||||||
|
throw new ArgumentException("Timeout couldn't be negative", nameof(timeout));
|
||||||
|
this.address = address;
|
||||||
|
this.taskID = taskID;
|
||||||
|
this.port = port;
|
||||||
|
this.ep = new IPEndPoint(IPAddress.Parse(address), port);
|
||||||
|
this.timeout = timeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<bool>> Init(bool enable = true)
|
||||||
|
{
|
||||||
|
{
|
||||||
|
var ret = await CheckHdmiIsReady();
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to check HDMI ready: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error("HDMI not ready");
|
||||||
|
return new(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int width = -1, height = -1;
|
||||||
|
{
|
||||||
|
var ret = await GetHdmiResolution();
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get HDMI resolution: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
(width, height) = ret.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
var ret = await ConnectJpeg2Hdmi(width, height);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to connect JPEG to HDMI: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error("Failed to connect JPEG to HDMI");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (enable)
|
||||||
|
return await SetEnable(true);
|
||||||
|
else return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<bool>> SetEnable(bool enable)
|
||||||
|
{
|
||||||
|
if (enable)
|
||||||
|
{
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddrSeq(
|
||||||
|
this.ep,
|
||||||
|
this.taskID,
|
||||||
|
[JpegAddr.CAPTURE_RD_CTRL, JpegAddr.CAPTURE_WR_CTRL],
|
||||||
|
[0b11, 0b01],
|
||||||
|
this.timeout
|
||||||
|
);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set JPEG enable: {ret.Error}");
|
||||||
|
return ret.Value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
var ret = await AddFrameNum2Process(1);
|
||||||
|
if (!ret)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to AddFrameNum2Process: {ret}");
|
||||||
|
return ret.Value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddrSeq(
|
||||||
|
this.ep,
|
||||||
|
this.taskID,
|
||||||
|
[JpegAddr.CAPTURE_RD_CTRL, JpegAddr.CAPTURE_WR_CTRL],
|
||||||
|
[0b00, 0b00],
|
||||||
|
this.timeout
|
||||||
|
);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set JPEG disable: {ret.Error}");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return ret.Value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<bool>> CheckHdmiIsReady()
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.ReadAddrWithWait(
|
||||||
|
this.ep, this.taskID, JpegAddr.HDMI_NOT_READY, 0b00, 0b01, 100, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to check HDMI status: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
return ret.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<(int, int)>> GetHdmiResolution()
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.ReadAddrByte(
|
||||||
|
this.ep, this.taskID, JpegAddr.HDMI_HEIGHT_WIDTH, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get HDMI resolution: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
var data = ret.Value.Options.Data;
|
||||||
|
if (data == null || data.Length != 4)
|
||||||
|
{
|
||||||
|
logger.Error($"Invalid HDMI resolution data length: {data?.Length ?? 0}");
|
||||||
|
return new(new Exception("Invalid HDMI resolution data length"));
|
||||||
|
}
|
||||||
|
|
||||||
|
var width = data[3] | (data[2] << 8);
|
||||||
|
var height = data[1] | (data[0] << 8);
|
||||||
|
this.Width = width;
|
||||||
|
this.Height = height;
|
||||||
|
|
||||||
|
logger.Info($"HDMI resolution: {width}x{height}");
|
||||||
|
|
||||||
|
return new((width, height));
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<bool>> ConnectJpeg2Hdmi(int width, int height)
|
||||||
|
{
|
||||||
|
if (width <= 0 || height <= 0)
|
||||||
|
{
|
||||||
|
logger.Error($"Invalid HDMI resolution: {width}x{height}");
|
||||||
|
return new(new ArgumentException("Invalid HDMI resolution"));
|
||||||
|
}
|
||||||
|
|
||||||
|
var frameSize = (UInt32)(width * height);
|
||||||
|
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(
|
||||||
|
this.ep, this.taskID, JpegAddr.JPEG_HEIGHT_WIDTH, (uint)((height << 16) + width), this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set HDMI output start address: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set HDMI output start address");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(
|
||||||
|
this.ep, this.taskID, JpegAddr.START_WR_ADDR0, JpegAddr.ADDR_HDMI_WD_START, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set HDMI output start address: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set HDMI output start address");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(
|
||||||
|
this.ep, this.taskID, JpegAddr.END_WR_ADDR0,
|
||||||
|
JpegAddr.ADDR_HDMI_WD_START + frameSize - 1, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set HDMI output end address: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set HDMI output address");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(
|
||||||
|
this.ep, this.taskID, JpegAddr.START_RD_ADDR0, JpegAddr.ADDR_HDMI_WD_START, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set jpeg input start address: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set jpeg input address");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(
|
||||||
|
this.ep, this.taskID, JpegAddr.END_RD_ADDR0,
|
||||||
|
JpegAddr.ADDR_HDMI_WD_START + frameSize - 1, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set jpeg input end address: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set jpeg input end address");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(
|
||||||
|
this.ep, this.taskID, JpegAddr.START_WR_ADDR1, JpegAddr.ADDR_JPEG_START, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set jpeg output start address: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set jpeg output start address");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(
|
||||||
|
this.ep, this.taskID, JpegAddr.END_WR_ADDR1, JpegAddr.ADDR_JPEG_END, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set jpeg output end address: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set jpeg output end address");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// public async ValueTask<bool> SetSampleRate(uint rate)
|
||||||
|
// {
|
||||||
|
// var ret = await UDPClientPool.WriteAddr(
|
||||||
|
// this.ep, this.taskID, JpegAddr.FRAME_SAMPLE_RATE, rate, this.timeout);
|
||||||
|
// if (!ret.IsSuccessful)
|
||||||
|
// {
|
||||||
|
// logger.Error($"Failed to set JPEG sample rate: {ret.Error}");
|
||||||
|
// return false;
|
||||||
|
// }
|
||||||
|
// return ret.Value;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// public async ValueTask<bool> SetSampleRate(JpegSampleRate rate)
|
||||||
|
// {
|
||||||
|
// return await SetSampleRate((uint)rate);
|
||||||
|
// }
|
||||||
|
|
||||||
|
public async ValueTask<uint> GetFrameNumber()
|
||||||
|
{
|
||||||
|
const int maxAttempts = 10;
|
||||||
|
const int delayMs = 5;
|
||||||
|
|
||||||
|
for (int attempt = 0; attempt < maxAttempts; attempt++)
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.ReadAddrByte(
|
||||||
|
this.ep, this.taskID, JpegAddr.JPEG_FRAME_SAVE_NUM, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get JPEG frame number on attempt {attempt + 1}: {ret.Error}");
|
||||||
|
if (attempt < maxAttempts - 1)
|
||||||
|
{
|
||||||
|
await Task.Delay(delayMs);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
var frameNumber = Number.BytesToUInt32(ret.Value.Options.Data ?? Array.Empty<byte>()).Value;
|
||||||
|
if (frameNumber != 0)
|
||||||
|
{
|
||||||
|
return frameNumber;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 如果不是最后一次尝试,等待5ms后重试
|
||||||
|
if (attempt < maxAttempts - 1)
|
||||||
|
{
|
||||||
|
await Task.Delay(delayMs);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 所有尝试都失败或返回0
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Optional<List<JpegInfo>>> GetFrameInfo(int num)
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.ReadAddr(this.ep, this.taskID, JpegAddr.JPEG_FIFO_FRAME_INFO, num, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get JPEG frame info: {ret.Error}");
|
||||||
|
return new(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
var data = ret.Value.Options.Data;
|
||||||
|
if (data == null || data.Length == 0)
|
||||||
|
{
|
||||||
|
logger.Error($"Data is null or empty");
|
||||||
|
return new(null);
|
||||||
|
}
|
||||||
|
if (data.Length != num * 2)
|
||||||
|
{
|
||||||
|
logger.Error(
|
||||||
|
$"Data length should be {num * 2} bytes, instead of {data.Length} bytes");
|
||||||
|
return new(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
var infos = new List<JpegInfo>();
|
||||||
|
for (int i = 0; i < num; i++)
|
||||||
|
{
|
||||||
|
infos.Add(new JpegInfo(data[i..(i + 1)]));
|
||||||
|
}
|
||||||
|
return new(infos);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<bool>> AddFrameNum2Process(uint cnt)
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(
|
||||||
|
this.ep, this.taskID, JpegAddr.JPEG_ADD_NEED_FRAME_NUM, cnt, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to update pointer: {ret.Error}");
|
||||||
|
return ret.Value;
|
||||||
|
}
|
||||||
|
return ret.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<byte[]?>> GetFrame(uint offset, uint length)
|
||||||
|
{
|
||||||
|
if (!MsgBus.IsRunning)
|
||||||
|
{
|
||||||
|
logger.Error("Message bus is not running");
|
||||||
|
return new(new Exception("Message bus is not running"));
|
||||||
|
}
|
||||||
|
MsgBus.UDPServer.ClearUDPData(this.ep.Address.ToString(), this.ep.Port);
|
||||||
|
|
||||||
|
var firstReadLength = (int)(Math.Min(
|
||||||
|
length,
|
||||||
|
JpegAddr.ADDR_JPEG_END - JpegAddr.ADDR_JPEG_START - offset
|
||||||
|
));
|
||||||
|
var secondReadLength = (int)(length - firstReadLength);
|
||||||
|
var dataBytes = new byte[length];
|
||||||
|
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.ReadAddr4Bytes(
|
||||||
|
this.ep, this.taskID, JpegAddr.ADDR_JPEG_START + offset, firstReadLength, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get JPEG frame data: {ret.Error}");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (ret.Value.Length != firstReadLength)
|
||||||
|
{
|
||||||
|
logger.Error($"Data length should be {firstReadLength} bytes, instead of {ret.Value.Length} bytes");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
Buffer.BlockCopy(ret.Value, 0, dataBytes, 0, firstReadLength);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (secondReadLength > 0)
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.ReadAddr4Bytes(
|
||||||
|
this.ep, this.taskID, JpegAddr.ADDR_JPEG_START, secondReadLength, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get JPEG frame data: {ret.Error}");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (ret.Value.Length != secondReadLength)
|
||||||
|
{
|
||||||
|
logger.Error($"Data length should be {secondReadLength} bytes, instead of {ret.Value.Length} bytes");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
Buffer.BlockCopy(ret.Value, 0, dataBytes, firstReadLength, secondReadLength);
|
||||||
|
}
|
||||||
|
|
||||||
|
return dataBytes;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<List<byte[]>> GetMultiFrames(uint offset, uint[] sizes)
|
||||||
|
{
|
||||||
|
var frames = new List<byte[]>();
|
||||||
|
for (int i = 0; i < sizes.Length; i++)
|
||||||
|
{
|
||||||
|
var ret = await GetFrame(offset, sizes[i]);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get JPEG frame {i} data: {ret.Error}");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (ret.Value == null)
|
||||||
|
{
|
||||||
|
logger.Error($"Frame {i} data is null");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (ret.Value.Length != sizes[i])
|
||||||
|
{
|
||||||
|
logger.Error(
|
||||||
|
$"Frame {i} data length should be {sizes[i]} bytes, instead of {ret.Value.Length} bytes");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
frames.Add(ret.Value);
|
||||||
|
offset += sizes[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
var ret = await AddFrameNum2Process((uint)sizes.Length);
|
||||||
|
if (!ret) logger.Error($"Failed to update pointer");
|
||||||
|
}
|
||||||
|
|
||||||
|
return frames;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<List<byte[]>?>> GetMultiFrames(uint offset)
|
||||||
|
{
|
||||||
|
if (!MsgBus.IsRunning)
|
||||||
|
{
|
||||||
|
logger.Error("Message bus is not running");
|
||||||
|
return new(new Exception("Message bus is not running"));
|
||||||
|
}
|
||||||
|
MsgBus.UDPServer.ClearUDPData(this.ep.Address.ToString(), this.ep.Port);
|
||||||
|
|
||||||
|
var frameNum = await GetFrameNumber();
|
||||||
|
if (frameNum == 0) return null;
|
||||||
|
|
||||||
|
List<uint>? frameSizes = null;
|
||||||
|
{
|
||||||
|
var ret = await GetFrameInfo((int)frameNum);
|
||||||
|
if (!ret.HasValue || ret.Value.Count == 0)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get frame info");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
frameSizes = ret.Value.Select(x => x.Size).ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
var frames = await GetMultiFrames(offset, frameSizes.ToArray());
|
||||||
|
if (frames.Count == 0)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get frames");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return frames;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<uint[]?>> GetQuantizationTable()
|
||||||
|
{
|
||||||
|
const int totalQuantValues = 8 * 8 * 3; // Y(64) + Cb(64) + Cr(64) = 192个量化值
|
||||||
|
const int bytesPerValue = 4; // 每个量化值32bit = 4字节
|
||||||
|
const int totalBytes = totalQuantValues * bytesPerValue; // 总共768字节
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.ReadAddr4Bytes(
|
||||||
|
this.ep, this.taskID, JpegAddr.JPEG_QUANTIZATION_TABLE, totalBytes, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to read JPEG quantization table: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
var data = ret.Value;
|
||||||
|
if (data == null || data.Length != totalBytes)
|
||||||
|
{
|
||||||
|
logger.Error($"Invalid quantization table data length: expected {totalBytes}, got {data?.Length ?? 0}");
|
||||||
|
return new(new Exception("Invalid quantization table data length"));
|
||||||
|
}
|
||||||
|
|
||||||
|
var quantTable = new uint[totalQuantValues];
|
||||||
|
for (int i = 0; i < totalQuantValues; i++)
|
||||||
|
{
|
||||||
|
// 每32bit为一个量化值,按小端序读取
|
||||||
|
var offset = i * bytesPerValue;
|
||||||
|
quantTable[i] = (uint)(data[offset] | (data[offset + 1] << 8) | (data[offset + 2] << 16) | (data[offset + 3] << 24));
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.Debug($"Successfully read JPEG quantization table with {totalQuantValues} values");
|
||||||
|
return quantTable;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Exception occurred while reading JPEG quantization table");
|
||||||
|
return new(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,7 +2,7 @@ using System.Collections;
|
|||||||
using System.Net;
|
using System.Net;
|
||||||
using DotNext;
|
using DotNext;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using server;
|
using server.Services;
|
||||||
using WebProtocol;
|
using WebProtocol;
|
||||||
|
|
||||||
namespace Peripherals.JtagClient;
|
namespace Peripherals.JtagClient;
|
||||||
@@ -380,15 +380,21 @@ public class JtagStatusReg
|
|||||||
public class Jtag
|
public class Jtag
|
||||||
{
|
{
|
||||||
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
private readonly ProgressTracker _progressTracker = MsgBus.ProgressTracker;
|
||||||
|
|
||||||
private const int CLOCK_FREQ = 50; // MHz
|
private const int CLOCK_FREQ = 50; // MHz
|
||||||
|
|
||||||
readonly int timeout;
|
readonly int timeout;
|
||||||
|
readonly int taskID = 10;
|
||||||
|
|
||||||
readonly int port;
|
readonly int port;
|
||||||
readonly string address;
|
/// <summary>
|
||||||
|
/// Jtag控制器IP地址
|
||||||
|
/// </summary>
|
||||||
|
public readonly string address;
|
||||||
private IPEndPoint ep;
|
private IPEndPoint ep;
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Jtag 构造函数
|
/// Jtag 构造函数
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -406,15 +412,17 @@ public class Jtag
|
|||||||
async ValueTask<Result<uint>> ReadFIFO(uint devAddr)
|
async ValueTask<Result<uint>> ReadFIFO(uint devAddr)
|
||||||
{
|
{
|
||||||
var ret = false;
|
var ret = false;
|
||||||
var opts = new SendAddrPackOptions();
|
var opts = new SendAddrPackOptions()
|
||||||
|
{
|
||||||
|
BurstType = BurstType.FixedBurst,
|
||||||
|
BurstLength = 0,
|
||||||
|
CommandID = (byte)this.taskID,
|
||||||
|
Address = devAddr,
|
||||||
|
IsWrite = false,
|
||||||
|
};
|
||||||
|
|
||||||
opts.BurstType = BurstType.FixedBurst;
|
|
||||||
opts.BurstLength = 0;
|
|
||||||
opts.CommandID = 0;
|
|
||||||
opts.Address = devAddr;
|
|
||||||
|
|
||||||
// Read Jtag State Register
|
// Read Jtag State Register
|
||||||
opts.IsWrite = false;
|
|
||||||
ret = await UDPClientPool.SendAddrPackAsync(ep, new SendAddrPackage(opts));
|
ret = await UDPClientPool.SendAddrPackAsync(ep, new SendAddrPackage(opts));
|
||||||
if (!ret) return new(new Exception("Send Address Package Failed!"));
|
if (!ret) return new(new Exception("Send Address Package Failed!"));
|
||||||
|
|
||||||
@@ -422,7 +430,7 @@ public class Jtag
|
|||||||
if (!MsgBus.IsRunning)
|
if (!MsgBus.IsRunning)
|
||||||
return new(new Exception("Message Bus not Working!"));
|
return new(new Exception("Message Bus not Working!"));
|
||||||
|
|
||||||
var retPack = await MsgBus.UDPServer.WaitForDataAsync(address, 0, port);
|
var retPack = await MsgBus.UDPServer.WaitForDataAsync(this.ep, this.taskID, this.timeout);
|
||||||
if (!retPack.IsSuccessful || !retPack.Value.IsSuccessful)
|
if (!retPack.IsSuccessful || !retPack.Value.IsSuccessful)
|
||||||
return new(new Exception("Send address package failed"));
|
return new(new Exception("Send address package failed"));
|
||||||
|
|
||||||
@@ -434,14 +442,15 @@ public class Jtag
|
|||||||
if (retPackLen != 4)
|
if (retPackLen != 4)
|
||||||
return new(new Exception($"RecvDataPackage BodyData Length not Equal to 4: Total {retPackLen} bytes"));
|
return new(new Exception($"RecvDataPackage BodyData Length not Equal to 4: Total {retPackLen} bytes"));
|
||||||
|
|
||||||
return Convert.ToUInt32(Common.Number.BytesToUInt64(retPackOpts.Data).Value);
|
return Convert.ToUInt32(Common.Number.BytesToUInt32(retPackOpts.Data).Value);
|
||||||
}
|
}
|
||||||
|
|
||||||
async ValueTask<Result<bool>> WriteFIFO
|
async ValueTask<Result<bool>> WriteFIFO(
|
||||||
(UInt32 devAddr, UInt32 data, UInt32 result, UInt32 resultMask = 0xFF_FF_FF_FF, UInt32 delayMilliseconds = 0)
|
UInt32 devAddr, UInt32 data, UInt32 result,
|
||||||
|
UInt32 resultMask = 0xFF_FF_FF_FF, UInt32 delayMilliseconds = 0, string progressId = "")
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.WriteAddr(this.ep, 0, devAddr, data, this.timeout);
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, devAddr, data, this.timeout, progressId);
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
if (!ret.Value) return new(new Exception("Write FIFO failed"));
|
if (!ret.Value) return new(new Exception("Write FIFO failed"));
|
||||||
}
|
}
|
||||||
@@ -450,17 +459,20 @@ public class Jtag
|
|||||||
await Task.Delay(TimeSpan.FromMilliseconds(delayMilliseconds));
|
await Task.Delay(TimeSpan.FromMilliseconds(delayMilliseconds));
|
||||||
|
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.ReadAddrWithWait(this.ep, 0, JtagAddr.STATE, result, resultMask, this.timeout);
|
var ret = await UDPClientPool.ReadAddrWithWait(this.ep, this.taskID, JtagAddr.STATE, result, resultMask, 0, this.timeout);
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
|
_progressTracker?.AdvanceProgress(progressId, 10);
|
||||||
return ret.Value;
|
return ret.Value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async ValueTask<Result<bool>> WriteFIFO
|
async ValueTask<Result<bool>> WriteFIFO(
|
||||||
(UInt32 devAddr, byte[] data, UInt32 result, UInt32 resultMask = 0xFF_FF_FF_FF, UInt32 delayMilliseconds = 0)
|
UInt32 devAddr, byte[] data, UInt32 result,
|
||||||
|
UInt32 resultMask = 0xFF_FF_FF_FF, UInt32 delayMilliseconds = 0, string progressId = "")
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.WriteAddr(this.ep, 0, devAddr, data, this.timeout);
|
var ret = await UDPClientPool.WriteAddr(
|
||||||
|
this.ep, this.taskID, devAddr, data, this.timeout, progressId);
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
if (!ret.Value) return new(new Exception("Write FIFO failed"));
|
if (!ret.Value) return new(new Exception("Write FIFO failed"));
|
||||||
}
|
}
|
||||||
@@ -469,8 +481,9 @@ public class Jtag
|
|||||||
await Task.Delay(TimeSpan.FromMilliseconds(delayMilliseconds));
|
await Task.Delay(TimeSpan.FromMilliseconds(delayMilliseconds));
|
||||||
|
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.ReadAddrWithWait(this.ep, 0, JtagAddr.STATE, result, resultMask, this.timeout);
|
var ret = await UDPClientPool.ReadAddrWithWait(this.ep, this.taskID, JtagAddr.STATE, result, resultMask, 0, this.timeout);
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
|
_progressTracker.AdvanceProgress(progressId, 10);
|
||||||
return ret.Value;
|
return ret.Value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -554,7 +567,8 @@ public class Jtag
|
|||||||
return await ClearWriteDataReg();
|
return await ClearWriteDataReg();
|
||||||
}
|
}
|
||||||
|
|
||||||
async ValueTask<Result<bool>> LoadDRCareInput(byte[] bytesArray, UInt32 timeout = 10_000, UInt32 cycle = 500)
|
async ValueTask<Result<bool>> LoadDRCareInput(
|
||||||
|
byte[] bytesArray, UInt32 timeout = 10_000, UInt32 cycle = 500, string progressId = "")
|
||||||
{
|
{
|
||||||
var bytesLen = ((uint)(bytesArray.Length * 8));
|
var bytesLen = ((uint)(bytesArray.Length * 8));
|
||||||
if (bytesLen > Math.Pow(2, 28)) return new(new Exception("Length is over 2^(28 - 3)"));
|
if (bytesLen > Math.Pow(2, 28)) return new(new Exception("Length is over 2^(28 - 3)"));
|
||||||
@@ -569,11 +583,16 @@ public class Jtag
|
|||||||
else if (!ret.Value) return new(new Exception("Write CMD_JTAG_LOAD_DR_CAREI Failed"));
|
else if (!ret.Value) return new(new Exception("Write CMD_JTAG_LOAD_DR_CAREI Failed"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_progressTracker.AdvanceProgress(progressId, 10);
|
||||||
|
|
||||||
{
|
{
|
||||||
var ret = await WriteFIFO(
|
var ret = await WriteFIFO(
|
||||||
JtagAddr.WRITE_DATA,
|
JtagAddr.WRITE_DATA,
|
||||||
bytesArray, 0x01_00_00_00,
|
bytesArray, 0x01_00_00_00,
|
||||||
JtagState.CMD_EXEC_FINISH);
|
JtagState.CMD_EXEC_FINISH,
|
||||||
|
0,
|
||||||
|
progressId
|
||||||
|
);
|
||||||
|
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
return ret.Value;
|
return ret.Value;
|
||||||
@@ -607,13 +626,10 @@ public class Jtag
|
|||||||
if (ret.Value)
|
if (ret.Value)
|
||||||
{
|
{
|
||||||
var array = new UInt32[UInt32Num];
|
var array = new UInt32[UInt32Num];
|
||||||
for (int i = 0; i < UInt32Num; i++)
|
var retData = await UDPClientPool.ReadAddr4Bytes(ep, this.taskID, JtagAddr.READ_DATA, (int)UInt32Num);
|
||||||
{
|
|
||||||
var retData = await ReadFIFO(JtagAddr.READ_DATA);
|
|
||||||
if (!retData.IsSuccessful)
|
if (!retData.IsSuccessful)
|
||||||
return new(new Exception("Read FIFO failed when Load DR"));
|
return new(new Exception("Read FIFO failed when Load DR"));
|
||||||
array[i] = retData.Value;
|
Buffer.BlockCopy(retData.Value, 0, array, 0, (int)UInt32Num * 4);
|
||||||
}
|
|
||||||
return array;
|
return array;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -627,9 +643,9 @@ public class Jtag
|
|||||||
public async ValueTask<Result<uint>> ReadIDCode()
|
public async ValueTask<Result<uint>> ReadIDCode()
|
||||||
{
|
{
|
||||||
// Clear Data
|
// Clear Data
|
||||||
MsgBus.UDPServer.ClearUDPData(this.address, 0);
|
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
|
||||||
logger.Trace($"Clear up udp server {this.address,0} receive data");
|
logger.Trace($"Clear up udp server {this.address} {this.taskID} receive data");
|
||||||
|
|
||||||
Result<bool> ret;
|
Result<bool> ret;
|
||||||
|
|
||||||
@@ -665,9 +681,9 @@ public class Jtag
|
|||||||
public async ValueTask<Result<uint>> ReadStatusReg()
|
public async ValueTask<Result<uint>> ReadStatusReg()
|
||||||
{
|
{
|
||||||
// Clear Data
|
// Clear Data
|
||||||
MsgBus.UDPServer.ClearUDPData(this.address, 0);
|
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
|
||||||
logger.Trace($"Clear up udp server {this.address,0} receive data");
|
logger.Trace($"Clear up udp server {this.address} {this.taskID} receive data");
|
||||||
|
|
||||||
Result<bool> ret;
|
Result<bool> ret;
|
||||||
|
|
||||||
@@ -698,45 +714,55 @@ public class Jtag
|
|||||||
/// 下载比特流到 JTAG 设备
|
/// 下载比特流到 JTAG 设备
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="bitstream">比特流数据</param>
|
/// <param name="bitstream">比特流数据</param>
|
||||||
|
/// <param name="progressId">进度ID</param>
|
||||||
/// <returns>指示下载是否成功的异步结果</returns>
|
/// <returns>指示下载是否成功的异步结果</returns>
|
||||||
public async ValueTask<Result<bool>> DownloadBitstream(byte[] bitstream)
|
public async ValueTask<Result<bool>> DownloadBitstream(
|
||||||
|
byte[] bitstream, string progressId = "")
|
||||||
{
|
{
|
||||||
// Clear Data
|
// Clear Data
|
||||||
MsgBus.UDPServer.ClearUDPData(this.address, 0);
|
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
|
||||||
logger.Trace($"Clear up udp server {this.address,0} receive data");
|
logger.Trace($"Clear up udp server {this.address} {this.taskID} receive data");
|
||||||
|
|
||||||
|
_progressTracker.AdvanceProgress(progressId, 10);
|
||||||
|
|
||||||
Result<bool> ret;
|
Result<bool> ret;
|
||||||
|
|
||||||
ret = await CloseTest();
|
ret = await CloseTest();
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
else if (!ret.Value) return new(new Exception("Jtag Close Test Failed"));
|
else if (!ret.Value) return new(new Exception("Jtag Close Test Failed"));
|
||||||
|
_progressTracker.AdvanceProgress(progressId, 10);
|
||||||
|
|
||||||
ret = await RunTest();
|
ret = await RunTest();
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
else if (!ret.Value) return new(new Exception("Jtag Run Test Failed"));
|
else if (!ret.Value) return new(new Exception("Jtag Run Test Failed"));
|
||||||
|
_progressTracker.AdvanceProgress(progressId, 10);
|
||||||
|
|
||||||
logger.Trace("Jtag initialize");
|
logger.Trace("Jtag initialize");
|
||||||
|
|
||||||
ret = await ExecRDCmd(JtagCmd.JTAG_DR_JRST);
|
ret = await ExecRDCmd(JtagCmd.JTAG_DR_JRST);
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
else if (!ret.Value) return new(new Exception("Jtag Execute Command JTAG_DR_JRST Failed"));
|
else if (!ret.Value) return new(new Exception("Jtag Execute Command JTAG_DR_JRST Failed"));
|
||||||
|
_progressTracker.AdvanceProgress(progressId, 10);
|
||||||
|
|
||||||
ret = await RunTest();
|
ret = await RunTest();
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
else if (!ret.Value) return new(new Exception("Jtag Run Test Failed"));
|
else if (!ret.Value) return new(new Exception("Jtag Run Test Failed"));
|
||||||
|
_progressTracker.AdvanceProgress(progressId, 10);
|
||||||
|
|
||||||
ret = await ExecRDCmd(JtagCmd.JTAG_DR_CFGI);
|
ret = await ExecRDCmd(JtagCmd.JTAG_DR_CFGI);
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
else if (!ret.Value) return new(new Exception("Jtag Execute Command JTAG_DR_CFGI Failed"));
|
else if (!ret.Value) return new(new Exception("Jtag Execute Command JTAG_DR_CFGI Failed"));
|
||||||
|
_progressTracker.AdvanceProgress(progressId, 10);
|
||||||
|
|
||||||
logger.Trace("Jtag ready to write bitstream");
|
logger.Trace("Jtag ready to write bitstream");
|
||||||
|
|
||||||
ret = await IdleDelay(100000);
|
ret = await IdleDelay(1000);
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
else if (!ret.Value) return new(new Exception("Jtag IDLE Delay Failed"));
|
else if (!ret.Value) return new(new Exception("Jtag IDLE Delay Failed"));
|
||||||
|
_progressTracker.AdvanceProgress(progressId, 10);
|
||||||
|
|
||||||
ret = await LoadDRCareInput(bitstream);
|
ret = await LoadDRCareInput(bitstream, progressId: progressId);
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
else if (!ret.Value) return new(new Exception("Jtag Load Data Failed"));
|
else if (!ret.Value) return new(new Exception("Jtag Load Data Failed"));
|
||||||
|
|
||||||
@@ -745,32 +771,40 @@ public class Jtag
|
|||||||
ret = await CloseTest();
|
ret = await CloseTest();
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
else if (!ret.Value) return new(new Exception("Jtag Close Test Failed"));
|
else if (!ret.Value) return new(new Exception("Jtag Close Test Failed"));
|
||||||
|
_progressTracker.AdvanceProgress(progressId, 10);
|
||||||
|
|
||||||
ret = await RunTest();
|
ret = await RunTest();
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
else if (!ret.Value) return new(new Exception("Jtag Run Test Failed"));
|
else if (!ret.Value) return new(new Exception("Jtag Run Test Failed"));
|
||||||
|
_progressTracker.AdvanceProgress(progressId, 10);
|
||||||
|
|
||||||
ret = await ExecRDCmd(JtagCmd.JTAG_DR_JWAKEUP);
|
ret = await ExecRDCmd(JtagCmd.JTAG_DR_JWAKEUP);
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
else if (!ret.Value) return new(new Exception("Jtag Execute Command JTAG_DR_JWAKEUP Failed"));
|
else if (!ret.Value) return new(new Exception("Jtag Execute Command JTAG_DR_JWAKEUP Failed"));
|
||||||
|
_progressTracker.AdvanceProgress(progressId, 10);
|
||||||
|
|
||||||
logger.Trace("Jtag reset device");
|
logger.Trace("Jtag reset device");
|
||||||
|
|
||||||
ret = await IdleDelay(10000);
|
ret = await IdleDelay(1000);
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
else if (!ret.Value) return new(new Exception("Jtag IDLE Delay Failed"));
|
else if (!ret.Value) return new(new Exception("Jtag IDLE Delay Failed"));
|
||||||
|
_progressTracker.AdvanceProgress(progressId, 10);
|
||||||
|
|
||||||
var retCode = await ReadStatusReg();
|
var retCode = await ReadStatusReg();
|
||||||
if (!retCode.IsSuccessful) return new(retCode.Error);
|
if (!retCode.IsSuccessful) return new(retCode.Error);
|
||||||
var jtagStatus = new JtagStatusReg(retCode.Value);
|
var jtagStatus = new JtagStatusReg(retCode.Value);
|
||||||
if (!(jtagStatus.done && jtagStatus.wakeup_over && jtagStatus.init_complete))
|
if (!(jtagStatus.done && jtagStatus.wakeup_over && jtagStatus.init_complete))
|
||||||
return new(new Exception("Jtag download bitstream failed"));
|
return new(new Exception("Jtag download bitstream failed"));
|
||||||
|
_progressTracker.AdvanceProgress(progressId, 10);
|
||||||
|
|
||||||
ret = await CloseTest();
|
ret = await CloseTest();
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
else if (!ret.Value) return new(new Exception("Jtag Close Test Failed"));
|
else if (!ret.Value) return new(new Exception("Jtag Close Test Failed"));
|
||||||
logger.Trace("Jtag download bitstream successfully");
|
logger.Trace("Jtag download bitstream successfully");
|
||||||
|
_progressTracker.AdvanceProgress(progressId, 10);
|
||||||
|
|
||||||
|
// Finish
|
||||||
|
_progressTracker.AdvanceProgress(progressId, 10);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -783,12 +817,12 @@ public class Jtag
|
|||||||
{
|
{
|
||||||
var paser = new BsdlParser.Parser();
|
var paser = new BsdlParser.Parser();
|
||||||
var portNum = paser.GetBoundaryRegsNum().Value;
|
var portNum = paser.GetBoundaryRegsNum().Value;
|
||||||
logger.Debug($"Get boundar scan registers number: {portNum}");
|
logger.Debug($"Get boundary scan registers number: {portNum}");
|
||||||
|
|
||||||
// Clear Data
|
// Clear Data
|
||||||
MsgBus.UDPServer.ClearUDPData(this.address, 0);
|
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
|
||||||
logger.Trace($"Clear up udp server {this.address,0} receive data");
|
logger.Trace($"Clear up udp server {this.address} {this.taskID} receive data");
|
||||||
|
|
||||||
Result<bool> ret;
|
Result<bool> ret;
|
||||||
|
|
||||||
@@ -853,9 +887,9 @@ public class Jtag
|
|||||||
public async ValueTask<Result<bool>> SetSpeed(UInt32 speed)
|
public async ValueTask<Result<bool>> SetSpeed(UInt32 speed)
|
||||||
{
|
{
|
||||||
// Clear Data
|
// Clear Data
|
||||||
MsgBus.UDPServer.ClearUDPData(this.address, 0);
|
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
|
||||||
logger.Trace($"Clear up udp server {this.address,0} receive data");
|
logger.Trace($"Clear up udp server {this.address} {this.taskID} receive data");
|
||||||
|
|
||||||
var ret = await WriteFIFO(
|
var ret = await WriteFIFO(
|
||||||
JtagAddr.SPEED_CTRL, (speed << 16) | speed,
|
JtagAddr.SPEED_CTRL, (speed << 16) | speed,
|
||||||
|
|||||||
@@ -1,12 +1,16 @@
|
|||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
|
using Common;
|
||||||
using DotNext;
|
using DotNext;
|
||||||
|
using WebProtocol;
|
||||||
|
|
||||||
namespace Peripherals.LogicAnalyzerClient;
|
namespace Peripherals.LogicAnalyzerClient;
|
||||||
|
|
||||||
static class AnalyzerAddr
|
static class AnalyzerAddr
|
||||||
{
|
{
|
||||||
const UInt32 BASE = 0x9000_0000;
|
const UInt32 BASE = 0x9000_0000;
|
||||||
|
const UInt32 DMA_BASE = 0xA000_0000;
|
||||||
|
const UInt32 DDR_BASE = 0x0000_0000;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 0x0000_0000 R/W [ 0] capture on: 置1开始等待捕获,0停止捕获。捕获到信号后该位自动清零。 <br/>
|
/// 0x0000_0000 R/W [ 0] capture on: 置1开始等待捕获,0停止捕获。捕获到信号后该位自动清零。 <br/>
|
||||||
@@ -23,17 +27,17 @@ static class AnalyzerAddr
|
|||||||
/// 10: 全局非与(~&) <br/>
|
/// 10: 全局非与(~&) <br/>
|
||||||
/// 11: 全局非或(~|) <br/>
|
/// 11: 全局非或(~|) <br/>
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public const UInt32 GLOBAL_TRIG_MODE = BASE + 0x0000_0000;
|
public const UInt32 GLOBAL_TRIG_MODE = BASE + 0x0000_0001;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 0x0000_0010 - 0x0000_0017 R/W [5:0] 信号M的触发操作符,共8路 <br/>
|
/// 0x0000_0010 - 0x0000_0017 R/W [5:0] 信号M的触发操作符,共8路 <br/>
|
||||||
/// [2:0] M's Operator: 000 == <br/>
|
/// [5:3] M's Operator: 000 == <br/>
|
||||||
/// 001 != <br/>
|
/// 001 != <br/>
|
||||||
/// 010 < <br/>
|
/// 010 < <br/>
|
||||||
/// 011 <= <br/>
|
/// 011 <= <br/>
|
||||||
/// 100 > <br/>
|
/// 100 > <br/>
|
||||||
/// 101 >= <br/>
|
/// 101 >= <br/>
|
||||||
/// [5:3] M's Value: 000 LOGIC 0 <br/>
|
/// [2:0] M's Value: 000 LOGIC 0 <br/>
|
||||||
/// 001 LOGIC 1 <br/>
|
/// 001 LOGIC 1 <br/>
|
||||||
/// 010 X(not care) <br/>
|
/// 010 X(not care) <br/>
|
||||||
/// 011 RISE <br/>
|
/// 011 RISE <br/>
|
||||||
@@ -43,22 +47,38 @@ static class AnalyzerAddr
|
|||||||
/// 111 SOME NUMBER <br/>
|
/// 111 SOME NUMBER <br/>
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static readonly UInt32[] SIGNAL_TRIG_MODE = {
|
public static readonly UInt32[] SIGNAL_TRIG_MODE = {
|
||||||
BASE + 0x0000_0010,
|
BASE + 0x0000_0010, BASE + 0x0000_0011,
|
||||||
BASE + 0x0000_0011,
|
BASE + 0x0000_0012, BASE + 0x0000_0013,
|
||||||
BASE + 0x0000_0012,
|
BASE + 0x0000_0014, BASE + 0x0000_0015,
|
||||||
BASE + 0x0000_0013,
|
BASE + 0x0000_0016, BASE + 0x0000_0017,
|
||||||
BASE + 0x0000_0014,
|
BASE + 0x0000_0018, BASE + 0x0000_0019,
|
||||||
BASE + 0x0000_0015,
|
BASE + 0x0000_001A, BASE + 0x0000_001B,
|
||||||
BASE + 0x0000_0016,
|
BASE + 0x0000_001C, BASE + 0x0000_001D,
|
||||||
BASE + 0x0000_0017,
|
BASE + 0x0000_001E, BASE + 0x0000_001F,
|
||||||
|
BASE + 0x0000_0020, BASE + 0x0000_0021,
|
||||||
|
BASE + 0x0000_0022, BASE + 0x0000_0023,
|
||||||
|
BASE + 0x0000_0024, BASE + 0x0000_0025,
|
||||||
|
BASE + 0x0000_0026, BASE + 0x0000_0027,
|
||||||
|
BASE + 0x0000_0028, BASE + 0x0000_0029,
|
||||||
|
BASE + 0x0000_002A, BASE + 0x0000_002B,
|
||||||
|
BASE + 0x0000_002C, BASE + 0x0000_002D,
|
||||||
|
BASE + 0x0000_002E, BASE + 0x0000_002F
|
||||||
};
|
};
|
||||||
|
public const UInt32 LOAD_NUM_ADDR = BASE + 0x0000_0002;
|
||||||
|
public const UInt32 PRE_LOAD_NUM_ADDR = BASE + 0x0000_0003;
|
||||||
|
public const UInt32 CAHNNEL_DIV_ADDR = BASE + 0x0000_0004;
|
||||||
|
public const UInt32 CLOCK_DIV_ADDR = BASE + 0x0000_0005;
|
||||||
|
public const UInt32 DMA_CAPTURE_RD_CTRL1 = DMA_BASE + 0x1;
|
||||||
|
public const UInt32 DMA_START_WRITE_ADDR1 = DMA_BASE + 0x22;
|
||||||
|
public const UInt32 DMA_END_WRITE_ADDR1 = DMA_BASE + 0x23;
|
||||||
|
public const UInt32 STORE_OFFSET_ADDR = DDR_BASE + 0x0100_0000;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 0x0100_0000 - 0x0100_03FF 只读 32位波形存储,得到的32位数据中低八位最先捕获,高八位最后捕获。<br/>
|
/// 0x0100_0000 - 0x0100_03FF 只读 32位波形存储,得到的32位数据中低八位最先捕获,高八位最后捕获。<br/>
|
||||||
/// 共1024个地址,每个地址存储4组,深度为4096。<br/>
|
/// 共1024个地址,每个地址存储4组,深度为4096。<br/>
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public const UInt32 CAPTURE_DATA_ADDR = BASE + 0x0100_0000;
|
|
||||||
public const Int32 CAPTURE_DATA_LENGTH = 1024;
|
public const Int32 CAPTURE_DATA_LENGTH = 1024;
|
||||||
|
public const Int32 CAPTURE_DATA_PRELOAD = 512;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -119,6 +139,52 @@ public enum GlobalCaptureMode
|
|||||||
NOR = 0b11
|
NOR = 0b11
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 逻辑分析仪采样时钟分频系数
|
||||||
|
/// </summary>
|
||||||
|
public enum AnalyzerClockDiv
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 1分频
|
||||||
|
/// </summary>
|
||||||
|
DIV1 = 0x0000_0000,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 2分频
|
||||||
|
/// </summary>
|
||||||
|
DIV2 = 0x0000_0001,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 4分频
|
||||||
|
/// </summary>
|
||||||
|
DIV4 = 0x0000_0002,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 8分频
|
||||||
|
/// </summary>
|
||||||
|
DIV8 = 0x0000_0003,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 16分频
|
||||||
|
/// </summary>
|
||||||
|
DIV16 = 0x0000_0004,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 32分频
|
||||||
|
/// </summary>
|
||||||
|
DIV32 = 0x0000_0005,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 64分频
|
||||||
|
/// </summary>
|
||||||
|
DIV64 = 0x0000_0006,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 128分频
|
||||||
|
/// </summary>
|
||||||
|
DIV128 = 0x0000_0007
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 信号M的操作符枚举
|
/// 信号M的操作符枚举
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -189,6 +255,37 @@ public enum SignalValue : byte
|
|||||||
SomeNumber = 0b111 // SOME NUMBER
|
SomeNumber = 0b111 // SOME NUMBER
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 逻辑分析仪有效通道数
|
||||||
|
/// </summary>
|
||||||
|
public enum AnalyzerChannelDiv
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 1路
|
||||||
|
/// </summary>
|
||||||
|
ONE = 0x0000_0000,
|
||||||
|
/// <summary>
|
||||||
|
/// 2路
|
||||||
|
/// </summary>
|
||||||
|
TWO = 0x0000_0001,
|
||||||
|
/// <summary>
|
||||||
|
/// 4路
|
||||||
|
/// </summary>
|
||||||
|
FOUR = 0x0000_0002,
|
||||||
|
/// <summary>
|
||||||
|
/// 8路
|
||||||
|
/// </summary>
|
||||||
|
EIGHT = 0x0000_0003,
|
||||||
|
/// <summary>
|
||||||
|
/// 16路
|
||||||
|
/// </summary>
|
||||||
|
XVI = 0x0000_0004,
|
||||||
|
/// <summary>
|
||||||
|
/// 32路
|
||||||
|
/// </summary>
|
||||||
|
XXXII = 0x0000_0005
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// FPGA逻辑分析仪客户端,用于控制FPGA上的逻辑分析仪模块进行信号捕获和分析
|
/// FPGA逻辑分析仪客户端,用于控制FPGA上的逻辑分析仪模块进行信号捕获和分析
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -230,11 +327,38 @@ public class Analyzer
|
|||||||
/// <returns>操作结果,成功返回true,否则返回异常信息</returns>
|
/// <returns>操作结果,成功返回true,否则返回异常信息</returns>
|
||||||
public async ValueTask<Result<bool>> SetCaptureMode(bool captureOn, bool force)
|
public async ValueTask<Result<bool>> SetCaptureMode(bool captureOn, bool force)
|
||||||
{
|
{
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, AnalyzerAddr.DMA_CAPTURE_RD_CTRL1, 0x00000000u, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set DMA_CAPTURE_RD_CTRL to 0: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error("WriteAddr to DMA_CAPTURE_RD_CTRL returned false");
|
||||||
|
return new(new Exception("Failed to set DMA_CAPTURE_RD_CTRL"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
await Task.Delay(5);
|
||||||
// 构造寄存器值
|
// 构造寄存器值
|
||||||
UInt32 value = 0;
|
UInt32 value = 0;
|
||||||
if (captureOn) value |= 1 << 0;
|
if (captureOn) value |= 1 << 0;
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, AnalyzerAddr.DMA_CAPTURE_RD_CTRL1, value, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set DMA_CAPTURE_RD_CTRL: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error("WriteAddr to DMA_CAPTURE_RD_CTRL returned false");
|
||||||
|
return new(new Exception("Failed to set DMA_CAPTURE_RD_CTRL"));
|
||||||
|
}
|
||||||
|
}
|
||||||
if (force) value |= 1 << 8;
|
if (force) value |= 1 << 8;
|
||||||
|
{
|
||||||
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, AnalyzerAddr.CAPTURE_MODE, value, this.timeout);
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, AnalyzerAddr.CAPTURE_MODE, value, this.timeout);
|
||||||
if (!ret.IsSuccessful)
|
if (!ret.IsSuccessful)
|
||||||
{
|
{
|
||||||
@@ -246,6 +370,7 @@ public class Analyzer
|
|||||||
logger.Error("WriteAddr to CAPTURE_MODE returned false");
|
logger.Error("WriteAddr to CAPTURE_MODE returned false");
|
||||||
return new(new Exception("Failed to set capture mode"));
|
return new(new Exception("Failed to set capture mode"));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -255,7 +380,7 @@ public class Analyzer
|
|||||||
/// <returns>操作结果,成功返回寄存器值,否则返回异常信息</returns>
|
/// <returns>操作结果,成功返回寄存器值,否则返回异常信息</returns>
|
||||||
public async ValueTask<Result<CaptureStatus>> ReadCaptureStatus()
|
public async ValueTask<Result<CaptureStatus>> ReadCaptureStatus()
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.ReadAddr(this.ep, this.taskID, AnalyzerAddr.CAPTURE_MODE, this.timeout);
|
var ret = await UDPClientPool.ReadAddrByte(this.ep, this.taskID, AnalyzerAddr.CAPTURE_MODE, this.timeout);
|
||||||
if (!ret.IsSuccessful)
|
if (!ret.IsSuccessful)
|
||||||
{
|
{
|
||||||
logger.Error($"Failed to read capture status: {ret.Error}");
|
logger.Error($"Failed to read capture status: {ret.Error}");
|
||||||
@@ -266,7 +391,7 @@ public class Analyzer
|
|||||||
logger.Error("ReadAddr returned invalid data for capture status");
|
logger.Error("ReadAddr returned invalid data for capture status");
|
||||||
return new(new Exception("Failed to read capture status"));
|
return new(new Exception("Failed to read capture status"));
|
||||||
}
|
}
|
||||||
UInt32 status = BitConverter.ToUInt32(ret.Value.Options.Data, 0);
|
UInt32 status = Number.BytesToUInt32(ret.Value.Options.Data).Value;
|
||||||
return (CaptureStatus)status;
|
return (CaptureStatus)status;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -304,8 +429,8 @@ public class Analyzer
|
|||||||
if (signalIndex < 0 || signalIndex >= AnalyzerAddr.SIGNAL_TRIG_MODE.Length)
|
if (signalIndex < 0 || signalIndex >= AnalyzerAddr.SIGNAL_TRIG_MODE.Length)
|
||||||
return new(new ArgumentException($"Signal index must be 0~{AnalyzerAddr.SIGNAL_TRIG_MODE.Length}"));
|
return new(new ArgumentException($"Signal index must be 0~{AnalyzerAddr.SIGNAL_TRIG_MODE.Length}"));
|
||||||
|
|
||||||
// 计算模式值: [2:0] 操作符, [5:3] 信号值
|
// 计算模式值: [2:0] 信号值, [5:3] 操作符
|
||||||
UInt32 mode = ((UInt32)val << 3) | (UInt32)op;
|
UInt32 mode = ((UInt32)op << 3) | (UInt32)val;
|
||||||
|
|
||||||
var addr = AnalyzerAddr.SIGNAL_TRIG_MODE[signalIndex];
|
var addr = AnalyzerAddr.SIGNAL_TRIG_MODE[signalIndex];
|
||||||
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, addr, mode, this.timeout);
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, addr, mode, this.timeout);
|
||||||
@@ -322,17 +447,111 @@ public class Analyzer
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 设置逻辑分析仪的深度、预采样深度、有效通道、分频系数
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="capture_length">深度</param>
|
||||||
|
/// <param name="pre_capture_length">预采样深度</param>
|
||||||
|
/// <param name="channel_div">有效通道(0-[1],1-[2],2-[4],3-[8],4-[16],5-[32])</param>
|
||||||
|
/// <param name="clock_div">采样时钟分频系数</param>
|
||||||
|
/// <returns>操作结果,成功返回true,否则返回异常信息</returns>
|
||||||
|
public async ValueTask<Result<bool>> SetCaptureParams(int capture_length, int pre_capture_length, AnalyzerChannelDiv channel_div, AnalyzerClockDiv clock_div)
|
||||||
|
{
|
||||||
|
if (capture_length == 0) capture_length = 1;
|
||||||
|
if (pre_capture_length == 0) pre_capture_length = 1;
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, AnalyzerAddr.LOAD_NUM_ADDR, (UInt32)(capture_length - 1), this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set LOAD_NUM_ADDR: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error("WriteAddr to LOAD_NUM_ADDR returned false");
|
||||||
|
return new(new Exception("Failed to set LOAD_NUM_ADDR"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, AnalyzerAddr.PRE_LOAD_NUM_ADDR, (UInt32)(pre_capture_length - 1), this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set PRE_LOAD_NUM_ADDR: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error("WriteAddr to PRE_LOAD_NUM_ADDR returned false");
|
||||||
|
return new(new Exception("Failed to set PRE_LOAD_NUM_ADDR"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, AnalyzerAddr.DMA_START_WRITE_ADDR1, AnalyzerAddr.STORE_OFFSET_ADDR, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set DMA_START_WRITE_ADDR: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error("WriteAddr to DMA_START_WRITE_ADDR returned false");
|
||||||
|
return new(new Exception("Failed to set DMA_START_WRITE_ADDR"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, AnalyzerAddr.DMA_END_WRITE_ADDR1, AnalyzerAddr.STORE_OFFSET_ADDR + (UInt32)(capture_length - 1), this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set DMA_END_WRITE_ADDR: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error("WriteAddr to DMA_END_WRITE_ADDR returned false");
|
||||||
|
return new(new Exception("Failed to set DMA_END_WRITE_ADDR"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, AnalyzerAddr.CAHNNEL_DIV_ADDR, (UInt32)channel_div, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set CAHNNEL_DIV_ADDR: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error("WriteAddr to CAHNNEL_DIV_ADDR returned false");
|
||||||
|
return new(new Exception("Failed to set CAHNNEL_DIV_ADDR"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, AnalyzerAddr.CLOCK_DIV_ADDR, (UInt32)clock_div, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set CLOCK_DIV_ADDR: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error("WriteAddr to CLOCK_DIV_ADDR returned false");
|
||||||
|
return new(new Exception("Failed to set CLOCK_DIV_ADDR"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 读取捕获的波形数据
|
/// 读取捕获的波形数据
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>操作结果,成功返回byte[],否则返回异常信息</returns>
|
/// <returns>操作结果,成功返回byte[],否则返回异常信息</returns>
|
||||||
public async ValueTask<Result<byte[]>> ReadCaptureData()
|
public async ValueTask<Result<byte[]>> ReadCaptureData(int capture_length = 2048 * 32)
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.ReadAddr4BytesAsync(
|
var ret = await UDPClientPool.ReadAddr4BytesAsync(
|
||||||
this.ep,
|
this.ep,
|
||||||
this.taskID,
|
this.taskID,
|
||||||
AnalyzerAddr.CAPTURE_DATA_ADDR,
|
AnalyzerAddr.STORE_OFFSET_ADDR,
|
||||||
AnalyzerAddr.CAPTURE_DATA_LENGTH,
|
capture_length,
|
||||||
|
BurstType.ExtendBurst, // 使用扩展突发读取
|
||||||
this.timeout
|
this.timeout
|
||||||
);
|
);
|
||||||
if (!ret.IsSuccessful)
|
if (!ret.IsSuccessful)
|
||||||
@@ -341,7 +560,7 @@ public class Analyzer
|
|||||||
return new(ret.Error);
|
return new(ret.Error);
|
||||||
}
|
}
|
||||||
var data = ret.Value;
|
var data = ret.Value;
|
||||||
if (data == null || data.Length != AnalyzerAddr.CAPTURE_DATA_LENGTH * 4)
|
if (data == null || data.Length != capture_length * 4)
|
||||||
{
|
{
|
||||||
logger.Error($"Capture data length mismatch: {data?.Length}");
|
logger.Error($"Capture data length mismatch: {data?.Length}");
|
||||||
return new(new Exception("Capture data length mismatch"));
|
return new(new Exception("Capture data length mismatch"));
|
||||||
|
|||||||
392
server/src/Peripherals/NetConfigClient.cs
Normal file
392
server/src/Peripherals/NetConfigClient.cs
Normal file
@@ -0,0 +1,392 @@
|
|||||||
|
using System.Net;
|
||||||
|
using DotNext;
|
||||||
|
|
||||||
|
namespace Peripherals.NetConfigClient;
|
||||||
|
|
||||||
|
static class NetConfigAddr
|
||||||
|
{
|
||||||
|
const UInt32 BASE = 0x30A7_0000;
|
||||||
|
|
||||||
|
public static readonly UInt32[] HOST_IP = { BASE + 0, BASE + 1, BASE + 2, BASE + 3 };
|
||||||
|
public static readonly UInt32[] BOARD_IP = { BASE + 4, BASE + 5, BASE + 6, BASE + 7 };
|
||||||
|
public static readonly UInt32[] HOST_MAC = { BASE + 8, BASE + 9, BASE + 10, BASE + 11, BASE + 12, BASE + 13 };
|
||||||
|
public static readonly UInt32[] BOARD_MAC = { BASE + 14, BASE + 15, BASE + 16, BASE + 17, BASE + 18, BASE + 19 };
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Network configuration client for FPGA board communication
|
||||||
|
/// </summary>
|
||||||
|
public class NetConfig
|
||||||
|
{
|
||||||
|
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
readonly int timeout = 2000;
|
||||||
|
readonly int taskID;
|
||||||
|
readonly int port;
|
||||||
|
readonly string address;
|
||||||
|
private IPEndPoint ep;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initialize NetConfig client
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="address">Target board address</param>
|
||||||
|
/// <param name="port">Target board port</param>
|
||||||
|
/// <param name="taskID">Task identifier</param>
|
||||||
|
/// <param name="timeout">Timeout in milliseconds</param>
|
||||||
|
public NetConfig(string address, int port, int taskID, int timeout = 2000)
|
||||||
|
{
|
||||||
|
if (timeout < 0)
|
||||||
|
throw new ArgumentException("Timeout couldn't be negative", nameof(timeout));
|
||||||
|
this.address = address;
|
||||||
|
this.taskID = taskID;
|
||||||
|
this.port = port;
|
||||||
|
this.ep = new IPEndPoint(IPAddress.Parse(address), port);
|
||||||
|
this.timeout = timeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Set host IP address
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="ip">IP address to set</param>
|
||||||
|
/// <returns>Result indicating success or failure</returns>
|
||||||
|
public async ValueTask<Result<bool>> SetHostIP(IPAddress ip)
|
||||||
|
{
|
||||||
|
// 清除UDP服务器接收缓冲区
|
||||||
|
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
|
||||||
|
// 刷新ARP
|
||||||
|
// var refrshRet = await Arp.UpdateArpEntryByPingAsync(this.address);
|
||||||
|
// if (!refrshRet)
|
||||||
|
// {
|
||||||
|
// logger.Warn($"Refrash Arp failed, but maybe not a big deal.");
|
||||||
|
// }
|
||||||
|
|
||||||
|
var ipBytes = ip.GetAddressBytes();
|
||||||
|
|
||||||
|
var ret = await UDPClientPool.WriteAddrSeq(this.ep, this.taskID, NetConfigAddr.HOST_IP, ipBytes, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set host IP: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set host IP: operation returned false");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 验证设置结果
|
||||||
|
var verifyResult = await GetHostIP();
|
||||||
|
if (!verifyResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to verify host IP after setting: {verifyResult.Error}");
|
||||||
|
return new(verifyResult.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
var expectedIP = ip.ToString();
|
||||||
|
if (verifyResult.Value != expectedIP)
|
||||||
|
{
|
||||||
|
logger.Error($"Host IP verification failed: expected {expectedIP}, got {verifyResult.Value}");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.Info($"Successfully set and verified host IP: {expectedIP}");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Set board IP address
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="ip">IP address to set</param>
|
||||||
|
/// <returns>Result indicating success or failure</returns>
|
||||||
|
public async ValueTask<Result<bool>> SetBoardIP(IPAddress ip)
|
||||||
|
{
|
||||||
|
// 清除UDP服务器接收缓冲区
|
||||||
|
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
|
||||||
|
// 刷新ARP
|
||||||
|
// var refrshRet = await Arp.UpdateArpEntryByPingAsync(this.address);
|
||||||
|
// if (!refrshRet)
|
||||||
|
// {
|
||||||
|
// logger.Warn($"Refrash Arp failed, but maybe not a big deal.");
|
||||||
|
// }
|
||||||
|
|
||||||
|
var ipBytes = ip.GetAddressBytes();
|
||||||
|
|
||||||
|
var ret = await UDPClientPool.WriteAddrSeq(this.ep, this.taskID, NetConfigAddr.BOARD_IP, ipBytes, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set board IP: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set board IP: operation returned false");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 验证设置结果
|
||||||
|
var verifyResult = await GetBoardIP();
|
||||||
|
if (!verifyResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to verify board IP after setting: {verifyResult.Error}");
|
||||||
|
return new(verifyResult.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
var expectedIP = ip.ToString();
|
||||||
|
if (verifyResult.Value != expectedIP)
|
||||||
|
{
|
||||||
|
logger.Error($"Board IP verification failed: expected {expectedIP}, got {verifyResult.Value}");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.Info($"Successfully set and verified board IP: {expectedIP}");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Set host MAC address
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="macAddress">MAC address bytes (6 bytes)</param>
|
||||||
|
/// <returns>Result indicating success or failure</returns>
|
||||||
|
public async ValueTask<Result<bool>> SetHostMAC(byte[] macAddress)
|
||||||
|
{
|
||||||
|
if (macAddress == null)
|
||||||
|
throw new ArgumentNullException(nameof(macAddress));
|
||||||
|
if (macAddress.Length != 6)
|
||||||
|
throw new ArgumentException("MAC address must be 6 bytes", nameof(macAddress));
|
||||||
|
|
||||||
|
// 清除UDP服务器接收缓冲区
|
||||||
|
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
|
||||||
|
// 刷新ARP
|
||||||
|
// var refrshRet = await Arp.UpdateArpEntryByPingAsync(this.address);
|
||||||
|
// if (!refrshRet)
|
||||||
|
// {
|
||||||
|
// logger.Warn($"Refrash Arp failed, but maybe not a big deal.");
|
||||||
|
// }
|
||||||
|
|
||||||
|
var ret = await UDPClientPool.WriteAddrSeq(this.ep, this.taskID, NetConfigAddr.HOST_MAC, macAddress, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set host MAC address: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set host MAC address: operation returned false");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 验证设置结果
|
||||||
|
var verifyResult = await GetHostMAC();
|
||||||
|
if (!verifyResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to verify host MAC after setting: {verifyResult.Error}");
|
||||||
|
return new(verifyResult.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
var expectedMAC = string.Join(":", macAddress.Select(b => $"{b:X2}"));
|
||||||
|
if (verifyResult.Value != expectedMAC)
|
||||||
|
{
|
||||||
|
logger.Error($"Host MAC verification failed: expected {expectedMAC}, got {verifyResult.Value}");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.Info($"Successfully set and verified host MAC: {expectedMAC}");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Set board MAC address
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="macAddress">MAC address bytes (6 bytes)</param>
|
||||||
|
/// <returns>Result indicating success or failure</returns>
|
||||||
|
public async ValueTask<Result<bool>> SetBoardMAC(byte[] macAddress)
|
||||||
|
{
|
||||||
|
if (macAddress == null)
|
||||||
|
throw new ArgumentNullException(nameof(macAddress));
|
||||||
|
if (macAddress.Length != 6)
|
||||||
|
throw new ArgumentException("MAC address must be 6 bytes", nameof(macAddress));
|
||||||
|
|
||||||
|
// 清除UDP服务器接收缓冲区
|
||||||
|
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
|
||||||
|
// 刷新ARP
|
||||||
|
// var refrshRet = await Arp.UpdateArpEntryByPingAsync(this.address);
|
||||||
|
// if (!refrshRet)
|
||||||
|
// {
|
||||||
|
// logger.Warn($"Refrash Arp failed, but maybe not a big deal.");
|
||||||
|
// }
|
||||||
|
|
||||||
|
var ret = await UDPClientPool.WriteAddrSeq(this.ep, this.taskID, NetConfigAddr.BOARD_MAC, macAddress, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set board MAC address: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set board MAC address: operation returned false");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 验证设置结果
|
||||||
|
var verifyResult = await GetBoardMAC();
|
||||||
|
if (!verifyResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to verify board MAC after setting: {verifyResult.Error}");
|
||||||
|
return new(verifyResult.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
var expectedMAC = string.Join(":", macAddress.Select(b => $"{b:X2}"));
|
||||||
|
if (verifyResult.Value != expectedMAC)
|
||||||
|
{
|
||||||
|
logger.Error($"Board MAC verification failed: expected {expectedMAC}, got {verifyResult.Value}");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.Info($"Successfully set and verified board MAC: {expectedMAC}");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get host IP address
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>Host IP address as string</returns>
|
||||||
|
public async ValueTask<Result<string>> GetHostIP()
|
||||||
|
{
|
||||||
|
// 清除UDP服务器接收缓冲区
|
||||||
|
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
|
||||||
|
// 刷新ARP
|
||||||
|
// var refrshRet = await Arp.UpdateArpEntryByPingAsync(this.address);
|
||||||
|
// if (!refrshRet)
|
||||||
|
// {
|
||||||
|
// logger.Warn($"Refrash Arp failed, but maybe not a big deal.");
|
||||||
|
// }
|
||||||
|
|
||||||
|
var ret = await UDPClientPool.ReadAddrSeq(this.ep, this.taskID, NetConfigAddr.HOST_IP, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get host IP: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
var ip = "";
|
||||||
|
for (int i = 0; i < NetConfigAddr.HOST_IP.Length; i++)
|
||||||
|
{
|
||||||
|
ip += $"{ret.Value[i * 4 + 3]}";
|
||||||
|
if (i != NetConfigAddr.HOST_IP.Length - 1)
|
||||||
|
ip += ".";
|
||||||
|
}
|
||||||
|
|
||||||
|
return ip;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get board IP address
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>Board IP address as string</returns>
|
||||||
|
public async ValueTask<Result<string>> GetBoardIP()
|
||||||
|
{
|
||||||
|
// 清除UDP服务器接收缓冲区
|
||||||
|
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
|
||||||
|
// 刷新ARP
|
||||||
|
// var refrshRet = await Arp.UpdateArpEntryByPingAsync(this.address);
|
||||||
|
// if (!refrshRet)
|
||||||
|
// {
|
||||||
|
// logger.Warn($"Refrash Arp failed, but maybe not a big deal.");
|
||||||
|
// }
|
||||||
|
|
||||||
|
var ret = await UDPClientPool.ReadAddrSeq(this.ep, this.taskID, NetConfigAddr.BOARD_IP, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get board IP: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
var ip = "";
|
||||||
|
for (int i = 0; i < NetConfigAddr.BOARD_IP.Length; i++)
|
||||||
|
{
|
||||||
|
ip += $"{ret.Value[i * 4 + 3]}";
|
||||||
|
if (i != NetConfigAddr.BOARD_IP.Length - 1)
|
||||||
|
ip += ".";
|
||||||
|
}
|
||||||
|
|
||||||
|
return ip;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get host MAC address
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>Host MAC address as formatted string (XX:XX:XX:XX:XX:XX)</returns>
|
||||||
|
public async ValueTask<Result<string>> GetHostMAC()
|
||||||
|
{
|
||||||
|
// 清除UDP服务器接收缓冲区
|
||||||
|
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
|
||||||
|
// 刷新ARP
|
||||||
|
// var refrshRet = await Arp.UpdateArpEntryByPingAsync(this.address);
|
||||||
|
// if (!refrshRet)
|
||||||
|
// {
|
||||||
|
// logger.Warn($"Refrash Arp failed, but maybe not a big deal.");
|
||||||
|
// }
|
||||||
|
|
||||||
|
var ret = await UDPClientPool.ReadAddrSeq(this.ep, this.taskID, NetConfigAddr.HOST_MAC, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get host MAC address: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
var mac = "";
|
||||||
|
for (int i = 0; i < NetConfigAddr.HOST_MAC.Length; i++)
|
||||||
|
{
|
||||||
|
mac += $"{ret.Value[i * 4 + 3]:X2}";
|
||||||
|
if (i != NetConfigAddr.HOST_MAC.Length - 1)
|
||||||
|
mac += ":";
|
||||||
|
}
|
||||||
|
|
||||||
|
return mac;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get board MAC address
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>Board MAC address as formatted string (XX:XX:XX:XX:XX:XX)</returns>
|
||||||
|
public async ValueTask<Result<string>> GetBoardMAC()
|
||||||
|
{
|
||||||
|
// 清除UDP服务器接收缓冲区
|
||||||
|
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
|
||||||
|
// 刷新ARP
|
||||||
|
// var refrshRet = await Arp.UpdateArpEntryByPingAsync(this.address);
|
||||||
|
// if (!refrshRet)
|
||||||
|
// {
|
||||||
|
// logger.Warn($"Refrash Arp failed, but maybe not a big deal.");
|
||||||
|
// }
|
||||||
|
|
||||||
|
var ret = await UDPClientPool.ReadAddrSeq(this.ep, this.taskID, NetConfigAddr.BOARD_MAC, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get board MAC address: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
var mac = "";
|
||||||
|
for (int i = 0; i < NetConfigAddr.BOARD_MAC.Length; i++)
|
||||||
|
{
|
||||||
|
mac += $"{ret.Value[i * 4 + 3]:X2}";
|
||||||
|
if (i != NetConfigAddr.BOARD_MAC.Length - 1)
|
||||||
|
mac += ":";
|
||||||
|
}
|
||||||
|
|
||||||
|
return mac;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,18 +1,93 @@
|
|||||||
using System.Net;
|
using System.Net;
|
||||||
|
using Common;
|
||||||
using DotNext;
|
using DotNext;
|
||||||
|
using WebProtocol;
|
||||||
|
using Tapper;
|
||||||
|
|
||||||
namespace Peripherals.OscilloscopeClient;
|
namespace Peripherals.OscilloscopeClient;
|
||||||
|
|
||||||
static class OscilloscopeAddr
|
public class OscilloscopeConfig
|
||||||
{
|
{
|
||||||
public const UInt32 Base = 0x0000_0000;
|
public bool CaptureEnabled { get; set; }
|
||||||
|
public byte TriggerLevel { get; set; }
|
||||||
|
public bool TriggerRisingEdge { get; set; }
|
||||||
|
public ushort HorizontalShift { get; set; }
|
||||||
|
public ushort DecimationRate { get; set; }
|
||||||
|
// public bool AutoRefreshRAM { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
class Oscilloscope
|
static class OscilloscopeAddr
|
||||||
|
{
|
||||||
|
const UInt32 BASE = 0x8000_0000;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 0x0000_0000:R/W[0] wave_run 启动捕获/关闭
|
||||||
|
/// </summary>
|
||||||
|
public const UInt32 START_CAPTURE = BASE + 0x0000_0000;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 0x0000_0001: R/W[7:0] trig_level 触发电平
|
||||||
|
/// </summary>
|
||||||
|
public const UInt32 TRIG_LEVEL = BASE + 0x0000_0001;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 0x0000_0002:R/W[0] trig_edge 触发边沿,0-下降沿,1-上升沿
|
||||||
|
/// </summary>
|
||||||
|
public const UInt32 TRIG_EDGE = BASE + 0x0000_0002;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 0x0000_0004: R/W[9:0] deci rate 抽样率,0—1023
|
||||||
|
/// </summary>
|
||||||
|
public const UInt32 DECI_RATE = BASE + 0x0000_0003;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 0x0000_0005:R/W[0] ram refresh RAM刷新
|
||||||
|
/// </summary>
|
||||||
|
public const UInt32 RAM_FRESH = BASE + 0x0000_0004;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 0x0000_0005:R/W[0] wave ready 波形数据就绪
|
||||||
|
/// </summary>
|
||||||
|
public const UInt32 WAVE_READY = BASE + 0x0000_0005;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 0x0000_0005:R/W[0] trig postion 触发地址
|
||||||
|
/// </summary>
|
||||||
|
public const UInt32 TRIG_POSIION = BASE + 0x0000_0006;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 0x0000 0006:R[19: 0] ad_freq AD采样频率
|
||||||
|
/// </summary>
|
||||||
|
public const UInt32 AD_FREQ = BASE + 0x0000_0007;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Ox0000_0007: R[7:0] ad_vpp AD采样幅度
|
||||||
|
/// </summary>
|
||||||
|
public const UInt32 AD_VPP = BASE + 0x0000_0008;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 0x0000_0008: R[7:0] ad max AD采样最大值
|
||||||
|
/// </summary>
|
||||||
|
public const UInt32 AD_MAX = BASE + 0x0000_0009;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 0x0000_0009: R[7:0] ad_min AD采样最小值
|
||||||
|
/// </summary>
|
||||||
|
public const UInt32 AD_MIN = BASE + 0x0000_000A;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 0x0000_1000-0x0000_13FF:R[7:0] wave_rd_data 共1024个字节
|
||||||
|
/// </summary>
|
||||||
|
public const UInt32 RD_DATA_ADDR = BASE + 0x0000_1000;
|
||||||
|
public const UInt32 RD_DATA_LENGTH = 0x0000_0400;
|
||||||
|
}
|
||||||
|
|
||||||
|
class OscilloscopeCtrl
|
||||||
{
|
{
|
||||||
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
readonly int timeout = 2000;
|
readonly int timeout = 2000;
|
||||||
|
readonly int taskID = 12;
|
||||||
|
|
||||||
readonly int port;
|
readonly int port;
|
||||||
readonly string address;
|
readonly string address;
|
||||||
@@ -24,7 +99,7 @@ class Oscilloscope
|
|||||||
/// <param name="address">示波器设备IP地址</param>
|
/// <param name="address">示波器设备IP地址</param>
|
||||||
/// <param name="port">示波器设备端口</param>
|
/// <param name="port">示波器设备端口</param>
|
||||||
/// <param name="timeout">超时时间(毫秒)</param>
|
/// <param name="timeout">超时时间(毫秒)</param>
|
||||||
public Oscilloscope(string address, int port, int timeout = 2000)
|
public OscilloscopeCtrl(string address, int port, int timeout = 2000)
|
||||||
{
|
{
|
||||||
if (timeout < 0)
|
if (timeout < 0)
|
||||||
throw new ArgumentException("Timeout couldn't be negative", nameof(timeout));
|
throw new ArgumentException("Timeout couldn't be negative", nameof(timeout));
|
||||||
@@ -33,4 +108,341 @@ class Oscilloscope
|
|||||||
this.ep = new IPEndPoint(IPAddress.Parse(address), port);
|
this.ep = new IPEndPoint(IPAddress.Parse(address), port);
|
||||||
this.timeout = timeout;
|
this.timeout = timeout;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 一次性初始化/配置示波器
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="config">完整配置</param>
|
||||||
|
/// <returns>操作结果,全部成功返回true,否则返回异常信息</returns>
|
||||||
|
public async ValueTask<Result<bool>> Init(OscilloscopeConfig config)
|
||||||
|
{
|
||||||
|
// 1. 捕获使能
|
||||||
|
var ret = await SetCaptureEnable(config.CaptureEnabled);
|
||||||
|
if (!ret.IsSuccessful || !ret.Value)
|
||||||
|
return new(ret.Error ?? new Exception("Failed to set capture enable"));
|
||||||
|
|
||||||
|
// 2. 触发电平
|
||||||
|
ret = await SetTriggerLevel(config.TriggerLevel);
|
||||||
|
if (!ret.IsSuccessful || !ret.Value)
|
||||||
|
return new(ret.Error ?? new Exception("Failed to set trigger level"));
|
||||||
|
|
||||||
|
// 3. 触发边沿
|
||||||
|
ret = await SetTriggerEdge(config.TriggerRisingEdge);
|
||||||
|
if (!ret.IsSuccessful || !ret.Value)
|
||||||
|
return new(ret.Error ?? new Exception("Failed to set trigger edge"));
|
||||||
|
|
||||||
|
// 4. 水平偏移
|
||||||
|
ret = await SetHorizontalShift(config.HorizontalShift);
|
||||||
|
if (!ret.IsSuccessful || !ret.Value)
|
||||||
|
return new(ret.Error ?? new Exception("Failed to set horizontal shift"));
|
||||||
|
|
||||||
|
// 5. 抽样率
|
||||||
|
ret = await SetDecimationRate(config.DecimationRate);
|
||||||
|
if (!ret.IsSuccessful || !ret.Value)
|
||||||
|
return new(ret.Error ?? new Exception("Failed to set decimation rate"));
|
||||||
|
|
||||||
|
// 6. RAM刷新(如果需要)
|
||||||
|
// if (config.AutoRefreshRAM)
|
||||||
|
// {
|
||||||
|
// ret = await RefreshRAM();
|
||||||
|
// if (!ret.IsSuccessful || !ret.Value)
|
||||||
|
// return new(ret.Error ?? new Exception("Failed to refresh RAM"));
|
||||||
|
// }
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 控制示波器的捕获开关
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="enable">是否启动捕获</param>
|
||||||
|
/// <returns>操作结果,成功返回true,否则返回异常信息</returns>
|
||||||
|
public async ValueTask<Result<bool>> SetCaptureEnable(bool enable)
|
||||||
|
{
|
||||||
|
UInt32 value = enable ? 1u : 0u;
|
||||||
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, OscilloscopeAddr.START_CAPTURE, value, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set capture enable: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error("WriteAddr to START_CAPTURE returned false");
|
||||||
|
return new(new Exception("Failed to set capture enable"));
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 设置触发电平
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="level">触发电平值(0-255)</param>
|
||||||
|
/// <returns>操作结果,成功返回true,否则返回异常信息</returns>
|
||||||
|
public async ValueTask<Result<bool>> SetTriggerLevel(byte level)
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, OscilloscopeAddr.TRIG_LEVEL, level, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set trigger level: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error("WriteAddr to TRIG_LEVEL returned false");
|
||||||
|
return new(new Exception("Failed to set trigger level"));
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 设置触发边沿
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="risingEdge">true为上升沿,false为下降沿</param>
|
||||||
|
/// <returns>操作结果,成功返回true,否则返回异常信息</returns>
|
||||||
|
public async ValueTask<Result<bool>> SetTriggerEdge(bool risingEdge)
|
||||||
|
{
|
||||||
|
UInt32 value = risingEdge ? 1u : 0u;
|
||||||
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, OscilloscopeAddr.TRIG_EDGE, value, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set trigger edge: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error("WriteAddr to TRIG_EDGE returned false");
|
||||||
|
return new(new Exception("Failed to set trigger edge"));
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 设置水平偏移量
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="shift">水平偏移量值(0-1023)</param>
|
||||||
|
/// <returns>操作结果,成功返回true,否则返回异常信息</returns>
|
||||||
|
public async ValueTask<Result<bool>> SetHorizontalShift(UInt16 shift)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 设置抽样率
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="rate">抽样率值(0-1023)</param>
|
||||||
|
/// <returns>操作结果,成功返回true,否则返回异常信息</returns>
|
||||||
|
public async ValueTask<Result<bool>> SetDecimationRate(UInt16 rate)
|
||||||
|
{
|
||||||
|
if (rate > 1023)
|
||||||
|
return new(new ArgumentException("Decimation rate must be 0-1023", nameof(rate)));
|
||||||
|
|
||||||
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, OscilloscopeAddr.DECI_RATE, rate, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set decimation rate: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error("WriteAddr to DECI_RATE returned false");
|
||||||
|
return new(new Exception("Failed to set decimation rate"));
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 刷新RAM
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>操作结果,成功返回true,否则返回异常信息</returns>
|
||||||
|
public async ValueTask<Result<bool>> RefreshRAM()
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, OscilloscopeAddr.RAM_FRESH, 1u, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to refresh RAM: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error("WriteAddr to RAM_FRESH returned false");
|
||||||
|
return new(new Exception("Failed to refresh RAM"));
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取AD采样频率
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>操作结果,成功返回采样频率值,否则返回异常信息</returns>
|
||||||
|
public async ValueTask<Result<UInt32>> GetADFrequency()
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.ReadAddrByte(this.ep, this.taskID, OscilloscopeAddr.AD_FREQ, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to read AD frequency: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (ret.Value.Options.Data == null || ret.Value.Options.Data.Length < 4)
|
||||||
|
{
|
||||||
|
logger.Error("ReadAddr returned invalid data for AD frequency");
|
||||||
|
return new(new Exception("Failed to read AD frequency"));
|
||||||
|
}
|
||||||
|
UInt32 freq = Number.BytesToUInt32(ret.Value.Options.Data).Value;
|
||||||
|
// 取低20位 [19:0]
|
||||||
|
freq &= 0xFFFFF;
|
||||||
|
return freq;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取AD采样幅度
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>操作结果,成功返回采样幅度值,否则返回异常信息</returns>
|
||||||
|
public async ValueTask<Result<byte>> GetADVpp()
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.ReadAddrByte(this.ep, this.taskID, OscilloscopeAddr.AD_VPP, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to read AD VPP: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (ret.Value.Options.Data == null || ret.Value.Options.Data.Length < 1)
|
||||||
|
{
|
||||||
|
logger.Error("ReadAddr returned invalid data for AD VPP");
|
||||||
|
return new(new Exception("Failed to read AD VPP"));
|
||||||
|
}
|
||||||
|
return ret.Value.Options.Data[3];
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取AD采样最大值
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>操作结果,成功返回采样最大值,否则返回异常信息</returns>
|
||||||
|
public async ValueTask<Result<byte>> GetADMax()
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.ReadAddrByte(this.ep, this.taskID, OscilloscopeAddr.AD_MAX, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to read AD max: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (ret.Value.Options.Data == null || ret.Value.Options.Data.Length < 1)
|
||||||
|
{
|
||||||
|
logger.Error("ReadAddr returned invalid data for AD max");
|
||||||
|
return new(new Exception("Failed to read AD max"));
|
||||||
|
}
|
||||||
|
return ret.Value.Options.Data[3];
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取AD采样最小值
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>操作结果,成功返回采样最小值,否则返回异常信息</returns>
|
||||||
|
public async ValueTask<Result<byte>> GetADMin()
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.ReadAddrByte(this.ep, this.taskID, OscilloscopeAddr.AD_MIN, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to read AD min: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (ret.Value.Options.Data == null || ret.Value.Options.Data.Length < 1)
|
||||||
|
{
|
||||||
|
logger.Error("ReadAddr returned invalid data for AD min");
|
||||||
|
return new(new Exception("Failed to read AD min"));
|
||||||
|
}
|
||||||
|
return ret.Value.Options.Data[3];
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取波形采样数据
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>操作结果,成功返回采样数据数组,否则返回异常信息</returns>
|
||||||
|
public async ValueTask<Result<byte[]>> GetWaveformData()
|
||||||
|
{
|
||||||
|
// 等待WAVE_READY[0]位为1,最多等待50ms(5次x10ms间隔)
|
||||||
|
var readyResult = await UDPClientPool.ReadAddrWithWait(
|
||||||
|
this.ep, this.taskID, OscilloscopeAddr.WAVE_READY, 0b01, 0x01, 10, 50);
|
||||||
|
|
||||||
|
if (!readyResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to wait for wave ready: {readyResult.Error}");
|
||||||
|
return new(readyResult.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 无论准备好与否,都继续读取数据(readyResult.Value表示是否在超时前准备好)
|
||||||
|
if (!readyResult.Value)
|
||||||
|
{
|
||||||
|
logger.Warn("Wave data may not be ready, but continuing to read");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 无论准备好与否,都继续读取数据
|
||||||
|
var ret = await UDPClientPool.ReadAddr4BytesAsync(
|
||||||
|
this.ep,
|
||||||
|
this.taskID,
|
||||||
|
OscilloscopeAddr.RD_DATA_ADDR,
|
||||||
|
(int)OscilloscopeAddr.RD_DATA_LENGTH / 32,
|
||||||
|
BurstType.ExtendBurst, // 使用扩展突发读取
|
||||||
|
this.timeout
|
||||||
|
);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to read waveform data: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
var data = ret.Value;
|
||||||
|
if (data == null || data.Length != OscilloscopeAddr.RD_DATA_LENGTH / 8)
|
||||||
|
{
|
||||||
|
logger.Error($"Waveform data length mismatch: {data?.Length}");
|
||||||
|
return new(new Exception("Waveform data length mismatch"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 处理波形数据:从每4个字节中提取第4个字节(索引3)作为有效数据
|
||||||
|
// 数据格式:低八位有效,即[4*i + 3]才是有效数据
|
||||||
|
int sampleCount = data.Length / 4;
|
||||||
|
byte[] waveformData = new byte[sampleCount];
|
||||||
|
|
||||||
|
for (int i = 0; i < sampleCount; i++)
|
||||||
|
{
|
||||||
|
waveformData[i] = data[4 * i + 3];
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取触发地址用作数据偏移量
|
||||||
|
var trigPosResult = await UDPClientPool.ReadAddrByte(this.ep, this.taskID, OscilloscopeAddr.TRIG_POSIION, this.timeout);
|
||||||
|
if (!trigPosResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to read trigger position: {trigPosResult.Error}");
|
||||||
|
return new(trigPosResult.Error);
|
||||||
|
}
|
||||||
|
if (trigPosResult.Value.Options.Data == null || trigPosResult.Value.Options.Data.Length < 4)
|
||||||
|
{
|
||||||
|
logger.Error("ReadAddr returned invalid data for trigger position");
|
||||||
|
return new(new Exception("Failed to read trigger position"));
|
||||||
|
}
|
||||||
|
|
||||||
|
UInt32 trigAddr = Number.BytesToUInt32(trigPosResult.Value.Options.Data).Value;
|
||||||
|
|
||||||
|
// 根据触发地址对数据进行偏移,使触发点位于数据中间
|
||||||
|
int targetPos = sampleCount / 2; // 目标位置:数据中间
|
||||||
|
int actualTrigPos = (int)(trigAddr % (UInt32)sampleCount); // 实际触发位置
|
||||||
|
int shiftAmount = targetPos - actualTrigPos;
|
||||||
|
|
||||||
|
// 创建偏移后的数据数组
|
||||||
|
byte[] offsetData = new byte[sampleCount];
|
||||||
|
for (int i = 0; i < sampleCount; i++)
|
||||||
|
{
|
||||||
|
int sourceIndex = (i - shiftAmount + sampleCount) % sampleCount;
|
||||||
|
offsetData[i] = waveformData[sourceIndex];
|
||||||
|
}
|
||||||
|
|
||||||
|
// 刷新RAM
|
||||||
|
var refreshResult = await RefreshRAM();
|
||||||
|
if (!refreshResult.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to refresh RAM after reading waveform data: {refreshResult.Error}");
|
||||||
|
return new(refreshResult.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return offsetData;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ public class RemoteUpdater
|
|||||||
const int FLASH_SECTOR_LENGTH = 4 * 1024;
|
const int FLASH_SECTOR_LENGTH = 4 * 1024;
|
||||||
|
|
||||||
readonly int timeout = 2000;
|
readonly int timeout = 2000;
|
||||||
readonly int timeoutForWait = 60 * 1000;
|
readonly int timeoutForWait = 20 * 1000;
|
||||||
|
|
||||||
readonly int port;
|
readonly int port;
|
||||||
readonly string address;
|
readonly string address;
|
||||||
@@ -152,7 +152,7 @@ public class RemoteUpdater
|
|||||||
{
|
{
|
||||||
var ret = await UDPClientPool.ReadAddrWithWait(
|
var ret = await UDPClientPool.ReadAddrWithWait(
|
||||||
this.ep, 0, RemoteUpdaterAddr.WriteSign,
|
this.ep, 0, RemoteUpdaterAddr.WriteSign,
|
||||||
0x00_00_00_01, 0x00_00_00_01, this.timeoutForWait);
|
0x00_00_00_01, 0x00_00_00_01, 100, this.timeoutForWait);
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
if (!ret.Value) return new(new Exception(
|
if (!ret.Value) return new(new Exception(
|
||||||
$"Flash clear failed after {this.timeoutForWait} milliseconds"));
|
$"Flash clear failed after {this.timeoutForWait} milliseconds"));
|
||||||
@@ -167,7 +167,7 @@ public class RemoteUpdater
|
|||||||
{
|
{
|
||||||
var ret = await UDPClientPool.ReadAddrWithWait(
|
var ret = await UDPClientPool.ReadAddrWithWait(
|
||||||
this.ep, 0, RemoteUpdaterAddr.WriteSign,
|
this.ep, 0, RemoteUpdaterAddr.WriteSign,
|
||||||
0x00_00_01_00, 0x00_00_01_00, this.timeoutForWait);
|
0x00_00_01_00, 0x00_00_01_00, 100, this.timeoutForWait);
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
return ret.Value;
|
return ret.Value;
|
||||||
}
|
}
|
||||||
@@ -332,14 +332,14 @@ public class RemoteUpdater
|
|||||||
{
|
{
|
||||||
var ret = await UDPClientPool.ReadAddrWithWait(
|
var ret = await UDPClientPool.ReadAddrWithWait(
|
||||||
this.ep, 0, RemoteUpdaterAddr.ReadSign,
|
this.ep, 0, RemoteUpdaterAddr.ReadSign,
|
||||||
0x00_00_01_00, 0x00_00_01_00, this.timeoutForWait);
|
0x00_00_01_00, 0x00_00_01_00, 10, this.timeoutForWait);
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
if (!ret.Value) return new(new Exception(
|
if (!ret.Value) return new(new Exception(
|
||||||
$"Read bitstream failed after {this.timeoutForWait} milliseconds"));
|
$"Read bitstream failed after {this.timeoutForWait} milliseconds"));
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.ReadAddr(this.ep, 0, RemoteUpdaterAddr.ReadCRC, this.timeout);
|
var ret = await UDPClientPool.ReadAddrByte(this.ep, 0, RemoteUpdaterAddr.ReadCRC, this.timeout);
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
|
|
||||||
var bytes = ret.Value.Options.Data;
|
var bytes = ret.Value.Options.Data;
|
||||||
@@ -543,7 +543,7 @@ public class RemoteUpdater
|
|||||||
logger.Trace("Clear udp data finished");
|
logger.Trace("Clear udp data finished");
|
||||||
|
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.ReadAddr(this.ep, 0, RemoteUpdaterAddr.Version, this.timeout);
|
var ret = await UDPClientPool.ReadAddrByte(this.ep, 0, RemoteUpdaterAddr.Version, this.timeout);
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
|
|
||||||
var retData = ret.Value.Options.Data;
|
var retData = ret.Value.Options.Data;
|
||||||
|
|||||||
106
server/src/Peripherals/RotaryEncoderClient.cs
Normal file
106
server/src/Peripherals/RotaryEncoderClient.cs
Normal file
@@ -0,0 +1,106 @@
|
|||||||
|
using System.Net;
|
||||||
|
using DotNext;
|
||||||
|
using Tapper;
|
||||||
|
|
||||||
|
namespace Peripherals.RotaryEncoderClient;
|
||||||
|
|
||||||
|
class RotaryEncoderCtrlAddr
|
||||||
|
{
|
||||||
|
public const UInt32 BASE = 0xB0_00_00_30;
|
||||||
|
public const UInt32 PRESS_BASE = 0xB0_00_00_40;
|
||||||
|
|
||||||
|
public const UInt32 ENABLE = BASE;
|
||||||
|
public const UInt32 PRESS_ENABLE = PRESS_BASE;
|
||||||
|
}
|
||||||
|
|
||||||
|
[TranspilationSource]
|
||||||
|
public enum RotaryEncoderDirection : uint
|
||||||
|
{
|
||||||
|
CounterClockwise = 0,
|
||||||
|
Clockwise = 1,
|
||||||
|
}
|
||||||
|
|
||||||
|
[TranspilationSource]
|
||||||
|
public enum RotaryEncoderPressStatus : uint
|
||||||
|
{
|
||||||
|
Press = 0,
|
||||||
|
Release = 1,
|
||||||
|
}
|
||||||
|
|
||||||
|
public class RotaryEncoderCtrl
|
||||||
|
{
|
||||||
|
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
readonly int timeout = 500;
|
||||||
|
readonly int taskID;
|
||||||
|
readonly int port;
|
||||||
|
readonly string address;
|
||||||
|
private IPEndPoint ep;
|
||||||
|
|
||||||
|
public RotaryEncoderCtrl(string address, int port, int taskID, int timeout = 500)
|
||||||
|
{
|
||||||
|
if (timeout < 0)
|
||||||
|
throw new ArgumentException("Timeout couldn't be negative", nameof(timeout));
|
||||||
|
this.address = address;
|
||||||
|
this.port = port;
|
||||||
|
this.ep = new IPEndPoint(IPAddress.Parse(address), port);
|
||||||
|
this.taskID = taskID;
|
||||||
|
this.timeout = timeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<bool>> SetEnable(bool enable)
|
||||||
|
{
|
||||||
|
if (MsgBus.IsRunning)
|
||||||
|
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
else return new(new Exception("Message Bus not work!"));
|
||||||
|
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(
|
||||||
|
this.ep, this.taskID, RotaryEncoderCtrlAddr.ENABLE, enable ? 0x1U : 0x0U, this.timeout);
|
||||||
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error($"Set Rotary Encoder Enable failed: {ret.Error}");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(
|
||||||
|
this.ep, this.taskID, RotaryEncoderCtrlAddr.PRESS_ENABLE, enable ? 0x1U : 0x0U, this.timeout);
|
||||||
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
|
return ret.Value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<bool>> RotateEncoderOnce(int num, RotaryEncoderDirection direction)
|
||||||
|
{
|
||||||
|
if (MsgBus.IsRunning)
|
||||||
|
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
else return new(new Exception("Message Bus not work!"));
|
||||||
|
|
||||||
|
var ret = await UDPClientPool.WriteAddr(
|
||||||
|
this.ep, this.taskID, RotaryEncoderCtrlAddr.BASE + (UInt32)num, (UInt32)direction, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Set Rotary Encoder Rotate {num} {direction.ToString()} failed: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
return ret.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<bool>> PressEncoderOnce(int num, RotaryEncoderPressStatus press)
|
||||||
|
{
|
||||||
|
if (MsgBus.IsRunning)
|
||||||
|
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
else return new(new Exception("Message Bus not work!"));
|
||||||
|
|
||||||
|
var ret = await UDPClientPool.WriteAddr(
|
||||||
|
this.ep, this.taskID, RotaryEncoderCtrlAddr.PRESS_BASE + (UInt32)num, (UInt32)press, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Set Rotary Encoder Set {num} {press.ToString()} failed: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
return ret.Value;
|
||||||
|
}
|
||||||
|
}
|
||||||
79
server/src/Peripherals/SevenDigitalTubesClient.cs
Normal file
79
server/src/Peripherals/SevenDigitalTubesClient.cs
Normal file
@@ -0,0 +1,79 @@
|
|||||||
|
using System.Net;
|
||||||
|
using DotNext;
|
||||||
|
using Common;
|
||||||
|
|
||||||
|
namespace Peripherals.SevenDigitalTubesClient;
|
||||||
|
|
||||||
|
static class SevenDigitalTubesAddr
|
||||||
|
{
|
||||||
|
public const UInt32 BASE = 0xB000_0000;
|
||||||
|
}
|
||||||
|
|
||||||
|
public class SevenDigitalTubesCtrl
|
||||||
|
{
|
||||||
|
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
readonly int timeout = 500;
|
||||||
|
readonly int taskID;
|
||||||
|
readonly int port;
|
||||||
|
readonly string address;
|
||||||
|
private IPEndPoint ep;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 初始化七段数码管控制器
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="address">七段数码管控制器IP地址</param>
|
||||||
|
/// <param name="port">七段数码管控制器端口</param>
|
||||||
|
/// <param name="taskID">任务ID</param>
|
||||||
|
/// <param name="timeout">超时时间(毫秒)</param>
|
||||||
|
public SevenDigitalTubesCtrl(string address, int port, int taskID, int timeout = 500)
|
||||||
|
{
|
||||||
|
if (timeout < 0)
|
||||||
|
throw new ArgumentException("Timeout couldn't be negative", nameof(timeout));
|
||||||
|
this.address = address;
|
||||||
|
this.port = port;
|
||||||
|
this.ep = new IPEndPoint(IPAddress.Parse(address), port);
|
||||||
|
this.taskID = taskID;
|
||||||
|
this.timeout = timeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<byte>> ReadTube(int num)
|
||||||
|
{
|
||||||
|
if (num < 0 || num > 31)
|
||||||
|
throw new ArgumentOutOfRangeException(nameof(num), "Tube number must be between 0 and 31");
|
||||||
|
|
||||||
|
var ret = await UDPClientPool.ReadAddrByte(
|
||||||
|
this.ep, this.taskID, SevenDigitalTubesAddr.BASE + (UInt32)num, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Read tubes failed: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (ret.Value.Options.Data == null || ret.Value.Options.Data.Length < 4)
|
||||||
|
return new(new Exception("Data length is too short"));
|
||||||
|
|
||||||
|
var data = Number.BytesToUInt32(ret.Value.Options.Data, 0, 4).Value;
|
||||||
|
|
||||||
|
if ((data >> 8) != num)
|
||||||
|
{
|
||||||
|
logger.Error($"Read wrong tube number: {num} != {data >> 8}");
|
||||||
|
return new(new Exception($"Read wrong tube number: {num} != {data >> 8}"));
|
||||||
|
}
|
||||||
|
|
||||||
|
return (byte)(data & 0xFF);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<byte[]>> ScanAllTubes()
|
||||||
|
{
|
||||||
|
var tubes = new byte[32];
|
||||||
|
for (int i = 0; i < 32; i++)
|
||||||
|
{
|
||||||
|
var ret = await ReadTube(i);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
return new(ret.Error);
|
||||||
|
tubes[i] = ret.Value;
|
||||||
|
}
|
||||||
|
return tubes;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
61
server/src/Peripherals/SwitchClient.cs
Normal file
61
server/src/Peripherals/SwitchClient.cs
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
using System.Net;
|
||||||
|
using DotNext;
|
||||||
|
|
||||||
|
namespace Peripherals.SwitchClient;
|
||||||
|
|
||||||
|
class SwitchCtrlAddr
|
||||||
|
{
|
||||||
|
public const UInt32 BASE = 0xB0_00_00_20;
|
||||||
|
|
||||||
|
public const UInt32 ENABLE = BASE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public class SwitchCtrl
|
||||||
|
{
|
||||||
|
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
readonly int timeout = 500;
|
||||||
|
readonly int taskID;
|
||||||
|
readonly int port;
|
||||||
|
readonly string address;
|
||||||
|
private IPEndPoint ep;
|
||||||
|
|
||||||
|
public SwitchCtrl(string address, int port, int taskID, int timeout = 500)
|
||||||
|
{
|
||||||
|
if (timeout < 0)
|
||||||
|
throw new ArgumentException("Timeout couldn't be negative", nameof(timeout));
|
||||||
|
this.address = address;
|
||||||
|
this.port = port;
|
||||||
|
this.ep = new IPEndPoint(IPAddress.Parse(address), port);
|
||||||
|
this.taskID = taskID;
|
||||||
|
this.timeout = timeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<bool>> SetEnable(bool enable)
|
||||||
|
{
|
||||||
|
if (MsgBus.IsRunning)
|
||||||
|
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
else return new(new Exception("Message Bus not work!"));
|
||||||
|
|
||||||
|
var ret = await UDPClientPool.WriteAddr(
|
||||||
|
this.ep, this.taskID, SwitchCtrlAddr.ENABLE, enable ? 0x1U : 0x0U, this.timeout);
|
||||||
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
|
return ret.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<bool>> SetSwitchOnOff(int num, bool onOff)
|
||||||
|
{
|
||||||
|
if (MsgBus.IsRunning)
|
||||||
|
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
else return new(new Exception("Message Bus not work!"));
|
||||||
|
|
||||||
|
var ret = await UDPClientPool.WriteAddr(
|
||||||
|
this.ep, this.taskID, SwitchCtrlAddr.BASE + (UInt32)num, onOff ? 0x1U : 0x0U, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Set Switch {onOff} failed: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
return ret.Value;
|
||||||
|
}
|
||||||
|
}
|
||||||
170
server/src/Peripherals/WS2812Client.cs
Normal file
170
server/src/Peripherals/WS2812Client.cs
Normal file
@@ -0,0 +1,170 @@
|
|||||||
|
using System.Net;
|
||||||
|
using DotNext;
|
||||||
|
using Tapper;
|
||||||
|
|
||||||
|
namespace Peripherals.WS2812Client;
|
||||||
|
|
||||||
|
class WS2812Addr
|
||||||
|
{
|
||||||
|
public const UInt32 BASE = 0xB0_00_01_00;
|
||||||
|
public const int LED_COUNT = 128;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// RGB颜色结构体,包含红、绿、蓝三个颜色分量
|
||||||
|
/// </summary>
|
||||||
|
[TranspilationSource]
|
||||||
|
public class RGBColor
|
||||||
|
{
|
||||||
|
public byte Red { get; set; }
|
||||||
|
public byte Green { get; set; }
|
||||||
|
public byte Blue { get; set; }
|
||||||
|
|
||||||
|
public RGBColor(byte red, byte green, byte blue)
|
||||||
|
{
|
||||||
|
Red = red;
|
||||||
|
Green = green;
|
||||||
|
Blue = blue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 从32位数据的低24位提取RGB颜色
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="data">32位数据</param>
|
||||||
|
/// <returns>RGB颜色</returns>
|
||||||
|
public static RGBColor FromUInt32(UInt32 data)
|
||||||
|
{
|
||||||
|
return new RGBColor(
|
||||||
|
(byte)((data >> 16) & 0xFF), // Red
|
||||||
|
(byte)((data >> 8) & 0xFF), // Green
|
||||||
|
(byte)(data & 0xFF) // Blue
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 转换为32位数据格式
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>32位数据</returns>
|
||||||
|
public UInt32 ToUInt32()
|
||||||
|
{
|
||||||
|
return ((UInt32)Red << 16) | ((UInt32)Green << 8) | (UInt32)Blue;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return $"RGB({Red}, {Green}, {Blue})";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public class WS2812Client
|
||||||
|
{
|
||||||
|
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
readonly int timeout = 500;
|
||||||
|
readonly int taskID;
|
||||||
|
readonly int port;
|
||||||
|
readonly string address;
|
||||||
|
private IPEndPoint ep;
|
||||||
|
|
||||||
|
public WS2812Client(string address, int port, int taskID, int timeout = 500)
|
||||||
|
{
|
||||||
|
if (timeout < 0)
|
||||||
|
throw new ArgumentException("Timeout couldn't be negative", nameof(timeout));
|
||||||
|
this.address = address;
|
||||||
|
this.port = port;
|
||||||
|
this.ep = new IPEndPoint(IPAddress.Parse(address), port);
|
||||||
|
this.taskID = taskID;
|
||||||
|
this.timeout = timeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取指定灯珠的RGB颜色
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="ledIndex">灯珠索引,范围0-127</param>
|
||||||
|
/// <returns>RGB颜色结果</returns>
|
||||||
|
public async ValueTask<Result<RGBColor>> GetLedColor(int ledIndex)
|
||||||
|
{
|
||||||
|
if (ledIndex < 0 || ledIndex >= WS2812Addr.LED_COUNT)
|
||||||
|
{
|
||||||
|
return new(new ArgumentOutOfRangeException(nameof(ledIndex),
|
||||||
|
$"LED index must be between 0 and {WS2812Addr.LED_COUNT - 1}"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (MsgBus.IsRunning)
|
||||||
|
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
else
|
||||||
|
return new(new Exception("Message Bus not work!"));
|
||||||
|
|
||||||
|
var addr = WS2812Addr.BASE + (UInt32)(ledIndex * 4); // 每个地址32位,步长为4字节
|
||||||
|
var ret = await UDPClientPool.ReadAddrByte(this.ep, this.taskID, addr, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Get LED {ledIndex} color failed: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
var retData = ret.Value.Options.Data;
|
||||||
|
if (retData is null)
|
||||||
|
return new(new Exception($"Device {address} receive none"));
|
||||||
|
if (retData.Length < 4)
|
||||||
|
{
|
||||||
|
var error = new Exception($"Invalid data length: expected 4 bytes, got {retData.Length}");
|
||||||
|
logger.Error($"Get LED {ledIndex} color failed: {error}");
|
||||||
|
return new(error);
|
||||||
|
}
|
||||||
|
|
||||||
|
var colorData = Convert.ToUInt32(Common.Number.BytesToUInt64(retData).Value);
|
||||||
|
var color = RGBColor.FromUInt32(colorData);
|
||||||
|
return new(color);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取所有灯珠的RGB颜色
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>包含所有灯珠颜色的数组</returns>
|
||||||
|
public async ValueTask<Result<RGBColor[]>> GetAllLedColors()
|
||||||
|
{
|
||||||
|
if (MsgBus.IsRunning)
|
||||||
|
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
|
||||||
|
else
|
||||||
|
return new(new Exception("Message Bus not work!"));
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// 一次性读取所有LED数据,每个LED占用4字节,总共128*4=512字节
|
||||||
|
var ret = await UDPClientPool.ReadAddr4Bytes(this.ep, this.taskID, WS2812Addr.BASE, WS2812Addr.LED_COUNT, this.timeout);
|
||||||
|
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Get all LED colors failed: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
var data = ret.Value;
|
||||||
|
var expectedLength = WS2812Addr.LED_COUNT * 4; // 128 * 4 = 512 bytes
|
||||||
|
|
||||||
|
if (data.Length < expectedLength)
|
||||||
|
{
|
||||||
|
var error = new Exception($"Invalid data length: expected {expectedLength} bytes, got {data.Length}");
|
||||||
|
logger.Error(error.Message);
|
||||||
|
return new(error);
|
||||||
|
}
|
||||||
|
|
||||||
|
var colors = new RGBColor[WS2812Addr.LED_COUNT];
|
||||||
|
|
||||||
|
for (int i = 0; i < WS2812Addr.LED_COUNT; i++)
|
||||||
|
{
|
||||||
|
var offset = i * 4;
|
||||||
|
// 将4字节数据转换为UInt32
|
||||||
|
var colorData = BitConverter.ToUInt32(data, offset);
|
||||||
|
colors[i] = RGBColor.FromUInt32(colorData);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new(colors);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error($"Get all LED colors failed: {ex}");
|
||||||
|
return new(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
496
server/src/Services/HttpHdmiVideoStreamService.cs
Normal file
496
server/src/Services/HttpHdmiVideoStreamService.cs
Normal file
@@ -0,0 +1,496 @@
|
|||||||
|
using System.Net;
|
||||||
|
using System.Collections.Concurrent;
|
||||||
|
using Peripherals.HdmiInClient;
|
||||||
|
using Peripherals.JpegClient;
|
||||||
|
|
||||||
|
namespace server.Services;
|
||||||
|
|
||||||
|
public class HdmiVideoStreamEndpoint
|
||||||
|
{
|
||||||
|
public string BoardId { get; set; } = "";
|
||||||
|
public string MjpegUrl { get; set; } = "";
|
||||||
|
public string VideoUrl { get; set; } = "";
|
||||||
|
public string SnapshotUrl { get; set; } = "";
|
||||||
|
}
|
||||||
|
|
||||||
|
public class HdmiVideoStreamClient
|
||||||
|
{
|
||||||
|
public required HdmiIn HdmiInClient { get; set; }
|
||||||
|
|
||||||
|
// public required Jpeg JpegClient { get; set; }
|
||||||
|
|
||||||
|
public required CancellationTokenSource CTS { get; set; }
|
||||||
|
|
||||||
|
public required int Offset { get; set; }
|
||||||
|
|
||||||
|
public int Width { get; set; }
|
||||||
|
public int Height { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class HttpHdmiVideoStreamService : BackgroundService
|
||||||
|
{
|
||||||
|
private readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
private HttpListener? _httpListener;
|
||||||
|
private readonly int _serverPort = 4322;
|
||||||
|
private readonly ConcurrentDictionary<string, HdmiVideoStreamClient> _clientDict = new();
|
||||||
|
|
||||||
|
public override async Task StartAsync(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
_httpListener = new HttpListener();
|
||||||
|
_httpListener.Prefixes.Add($"http://{Global.LocalHost}:{_serverPort}/");
|
||||||
|
_httpListener.Start();
|
||||||
|
logger.Info($"HDMI Video Stream Service started on port {_serverPort}");
|
||||||
|
|
||||||
|
await base.StartAsync(cancellationToken);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
|
||||||
|
{
|
||||||
|
while (!stoppingToken.IsCancellationRequested)
|
||||||
|
{
|
||||||
|
if (_httpListener == null) continue;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
logger.Debug("Waiting for HTTP request...");
|
||||||
|
var contextTask = _httpListener.GetContextAsync();
|
||||||
|
var completedTask = await Task.WhenAny(contextTask, Task.Delay(-1, stoppingToken));
|
||||||
|
if (completedTask == contextTask)
|
||||||
|
{
|
||||||
|
var context = contextTask.Result;
|
||||||
|
logger.Debug($"Received request: {context.Request.Url?.AbsolutePath}");
|
||||||
|
if (context != null)
|
||||||
|
_ = HandleRequestAsync(context, stoppingToken);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Error in GetContextAsync");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public override async Task StopAsync(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
logger.Info("Stopping HDMI Video Stream Service...");
|
||||||
|
|
||||||
|
// 禁用所有活跃的HDMI传输
|
||||||
|
var disableTasks = new List<Task>();
|
||||||
|
foreach (var hdmiKey in _clientDict.Keys)
|
||||||
|
{
|
||||||
|
disableTasks.Add(DisableHdmiTransmissionAsync(hdmiKey));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 等待所有禁用操作完成
|
||||||
|
await Task.WhenAll(disableTasks);
|
||||||
|
|
||||||
|
// 清空字典
|
||||||
|
_clientDict.Clear();
|
||||||
|
|
||||||
|
await base.StopAsync(cancellationToken);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task DisableHdmiTransmissionAsync(string key)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var client = _clientDict[key];
|
||||||
|
client.CTS.Cancel();
|
||||||
|
|
||||||
|
// var disableResult = await client.JpegClient.SetEnable(false);
|
||||||
|
var disableResult = await client.HdmiInClient.SetTransEnable(false);
|
||||||
|
if (disableResult)
|
||||||
|
{
|
||||||
|
logger.Info("Successfully disabled HDMI transmission");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to disable HDMI transmission");
|
||||||
|
}
|
||||||
|
|
||||||
|
client.CTS = new CancellationTokenSource();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Exception occurred while disabling HDMI transmission");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<HdmiVideoStreamClient?> GetOrCreateClientAsync(string boardId)
|
||||||
|
{
|
||||||
|
if (!_clientDict.TryGetValue(boardId, out var client))
|
||||||
|
{
|
||||||
|
var userManager = new Database.UserManager();
|
||||||
|
|
||||||
|
var boardRet = userManager.GetBoardByID(Guid.Parse(boardId));
|
||||||
|
if (!boardRet.IsSuccessful || !boardRet.Value.HasValue)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get board with ID {boardId}");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
var board = boardRet.Value.Value;
|
||||||
|
|
||||||
|
client = new HdmiVideoStreamClient()
|
||||||
|
{
|
||||||
|
HdmiInClient = new HdmiIn(board.IpAddr, board.Port, 9),
|
||||||
|
// JpegClient = new Jpeg(board.IpAddr, board.Port, 1),
|
||||||
|
CTS = new CancellationTokenSource(),
|
||||||
|
Offset = 0
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// 启用HDMI传输
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var hdmiEnableRet = await client.HdmiInClient.Init(true);
|
||||||
|
if (!hdmiEnableRet.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to enable HDMI transmission for board {boardId}: {hdmiEnableRet.Error}");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
logger.Info($"Successfully enabled HDMI transmission for board {boardId}");
|
||||||
|
|
||||||
|
// var jpegEnableRet = await client.JpegClient.Init(true);
|
||||||
|
// if (!jpegEnableRet.IsSuccessful)
|
||||||
|
// {
|
||||||
|
// logger.Error($"Failed to enable JPEG transmission for board {boardId}: {jpegEnableRet.Error}");
|
||||||
|
// return null;
|
||||||
|
// }
|
||||||
|
// logger.Info($"Successfully enabled JPEG transmission for board {boardId}");
|
||||||
|
|
||||||
|
client.Width = client.HdmiInClient.Width;
|
||||||
|
client.Height = client.HdmiInClient.Height;
|
||||||
|
// client.Width = client.JpegClient.Width;
|
||||||
|
// client.Height = client.JpegClient.Height;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, $"Exception occurred while enabling HDMI transmission for board {boardId}");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
_clientDict[boardId] = client;
|
||||||
|
return client;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task HandleRequestAsync(HttpListenerContext context, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var path = context.Request.Url?.AbsolutePath ?? "/";
|
||||||
|
var boardId = context.Request.QueryString["boardId"];
|
||||||
|
if (string.IsNullOrEmpty(boardId))
|
||||||
|
{
|
||||||
|
await SendErrorAsync(context.Response, "Missing boardId");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var client = await GetOrCreateClientAsync(boardId);
|
||||||
|
if (client == null)
|
||||||
|
{
|
||||||
|
await SendErrorAsync(context.Response, "Invalid boardId or board not available");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var token = CancellationTokenSource.CreateLinkedTokenSource(
|
||||||
|
cancellationToken, client.CTS.Token).Token;
|
||||||
|
|
||||||
|
if (path == "/snapshot")
|
||||||
|
{
|
||||||
|
await HandleSnapshotRequestAsync(context.Response, client, token);
|
||||||
|
}
|
||||||
|
else if (path == "/mjpeg")
|
||||||
|
{
|
||||||
|
await HandleMjpegStreamAsync(context.Response, client, token);
|
||||||
|
}
|
||||||
|
else if (path == "/video")
|
||||||
|
{
|
||||||
|
await SendVideoHtmlPageAsync(context.Response, boardId);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
await SendIndexHtmlPageAsync(context.Response, boardId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task HandleSnapshotRequestAsync(
|
||||||
|
HttpListenerResponse response, HdmiVideoStreamClient client, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
logger.Debug("处理HDMI快照请求");
|
||||||
|
|
||||||
|
// 从HDMI读取RGB565数据
|
||||||
|
// var frameResult = await client.JpegClient.GetMultiFrames((uint)client.Offset);
|
||||||
|
// if (!frameResult.IsSuccessful || frameResult.Value == null || frameResult.Value.Count == 0)
|
||||||
|
// {
|
||||||
|
// logger.Error("HDMI快照获取失败");
|
||||||
|
// response.StatusCode = 500;
|
||||||
|
// var errorBytes = System.Text.Encoding.UTF8.GetBytes("Failed to get HDMI snapshot");
|
||||||
|
// await response.OutputStream.WriteAsync(errorBytes, 0, errorBytes.Length, cancellationToken);
|
||||||
|
// response.Close();
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// var jpegData = frameResult.Value[0];
|
||||||
|
|
||||||
|
// var quantTableResult = await client.JpegClient.GetQuantizationTable();
|
||||||
|
// if (!quantTableResult.IsSuccessful || quantTableResult.Value == null)
|
||||||
|
// {
|
||||||
|
// logger.Error("获取JPEG量化表失败: {Error}", quantTableResult.Error);
|
||||||
|
// response.StatusCode = 500;
|
||||||
|
// var errorBytes = System.Text.Encoding.UTF8.GetBytes("Failed to get quantization table");
|
||||||
|
// await response.OutputStream.WriteAsync(errorBytes, 0, errorBytes.Length, cancellationToken);
|
||||||
|
// response.Close();
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// var jpegImage = Common.Image.CompleteJpegData(jpegData, client.Width, client.Height, quantTableResult.Value);
|
||||||
|
// if (!jpegImage.IsSuccessful)
|
||||||
|
// {
|
||||||
|
// logger.Error("JPEG数据补全失败");
|
||||||
|
// response.StatusCode = 500;
|
||||||
|
// var errorBytes = System.Text.Encoding.UTF8.GetBytes("Failed to complete JPEG data");
|
||||||
|
// await response.OutputStream.WriteAsync(errorBytes, 0, errorBytes.Length, cancellationToken);
|
||||||
|
// response.Close();
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
|
|
||||||
|
var jpegImage = await client.HdmiInClient.GetMJpegFrame();
|
||||||
|
if (!jpegImage.HasValue)
|
||||||
|
{
|
||||||
|
logger.Error("获取HDMI MJPEG帧失败");
|
||||||
|
response.StatusCode = 500;
|
||||||
|
var errorBytes = System.Text.Encoding.UTF8.GetBytes("Failed to get HDMI MJPEG frame");
|
||||||
|
await response.OutputStream.WriteAsync(errorBytes, 0, errorBytes.Length, cancellationToken);
|
||||||
|
response.Close();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 设置响应头(参考Camera版本)
|
||||||
|
response.ContentType = "image/jpeg";
|
||||||
|
response.ContentLength64 = jpegImage.Value.data.Length;
|
||||||
|
response.Headers.Add("Cache-Control", "no-cache, no-store, must-revalidate");
|
||||||
|
|
||||||
|
await response.OutputStream.WriteAsync(jpegImage.Value.data, 0, jpegImage.Value.data.Length, cancellationToken);
|
||||||
|
await response.OutputStream.FlushAsync(cancellationToken);
|
||||||
|
|
||||||
|
logger.Debug("已发送HDMI快照图像,大小:{Size} 字节", jpegImage.Value.data.Length);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "处理HDMI快照请求时出错");
|
||||||
|
response.StatusCode = 500;
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
response.StatusCode = 200;
|
||||||
|
response.Close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task HandleMjpegStreamAsync(
|
||||||
|
HttpListenerResponse response, HdmiVideoStreamClient client, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// 设置MJPEG流的响应头(参考Camera版本)
|
||||||
|
response.ContentType = "multipart/x-mixed-replace; boundary=--boundary";
|
||||||
|
response.Headers.Add("Cache-Control", "no-cache, no-store, must-revalidate");
|
||||||
|
response.Headers.Add("Pragma", "no-cache");
|
||||||
|
response.Headers.Add("Expires", "0");
|
||||||
|
|
||||||
|
logger.Debug("开始HDMI MJPEG流传输");
|
||||||
|
|
||||||
|
// var quantTableResult = await client.JpegClient.GetQuantizationTable();
|
||||||
|
// if (!quantTableResult.IsSuccessful || quantTableResult.Value == null)
|
||||||
|
// {
|
||||||
|
// logger.Error("获取JPEG量化表失败: {Error}", quantTableResult.Error);
|
||||||
|
// response.StatusCode = 500;
|
||||||
|
// await response.OutputStream.WriteAsync(
|
||||||
|
// System.Text.Encoding.UTF8.GetBytes("Failed to get quantization table"), 0, 0, cancellationToken);
|
||||||
|
// response.Close();
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
|
// var quantTable = quantTableResult.Value;
|
||||||
|
|
||||||
|
int frameCounter = 0;
|
||||||
|
|
||||||
|
while (!cancellationToken.IsCancellationRequested)
|
||||||
|
{
|
||||||
|
var frameStartTime = DateTime.UtcNow;
|
||||||
|
|
||||||
|
var frameRet = await client.HdmiInClient.GetMJpegFrame();
|
||||||
|
if (!frameRet.HasValue)
|
||||||
|
{
|
||||||
|
logger.Error("获取HDMI帧失败");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
var frame = frameRet.Value;
|
||||||
|
|
||||||
|
await response.OutputStream.WriteAsync(frame.header, 0, frame.header.Length, cancellationToken);
|
||||||
|
await response.OutputStream.WriteAsync(frame.data, 0, frame.data.Length, cancellationToken);
|
||||||
|
await response.OutputStream.WriteAsync(frame.footer, 0, frame.footer.Length, cancellationToken);
|
||||||
|
await response.OutputStream.FlushAsync(cancellationToken);
|
||||||
|
|
||||||
|
frameCounter++;
|
||||||
|
|
||||||
|
var totalTime = (DateTime.UtcNow - frameStartTime).TotalMilliseconds;
|
||||||
|
|
||||||
|
// 性能统计日志(每30帧记录一次)
|
||||||
|
if (frameCounter % 30 == 0)
|
||||||
|
{
|
||||||
|
logger.Debug("HDMI帧 {FrameNumber} 性能统计 - 总计: {TotalTime:F1}ms, JPEG大小: {JpegSize} 字节",
|
||||||
|
frameCounter, totalTime, frame.data.Length);
|
||||||
|
}
|
||||||
|
|
||||||
|
// var frameResult =
|
||||||
|
// await client.JpegClient.GetMultiFrames((uint)client.Offset);
|
||||||
|
// if (!frameResult.IsSuccessful || frameResult.Value == null || frameResult.Value.Count == 0)
|
||||||
|
// {
|
||||||
|
// logger.Error("获取HDMI帧失败");
|
||||||
|
// await Task.Delay(100, cancellationToken);
|
||||||
|
// continue;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// foreach (var framebytes in frameResult.Value)
|
||||||
|
// {
|
||||||
|
// var jpegImage = Common.Image.CompleteJpegData(framebytes, client.Width, client.Height, quantTable);
|
||||||
|
// if (!jpegImage.IsSuccessful)
|
||||||
|
// {
|
||||||
|
// logger.Error("JPEG数据不完整");
|
||||||
|
// await Task.Delay(100, cancellationToken);
|
||||||
|
// continue;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// var frameRet = Common.Image.CreateMjpegFrameFromJpeg(jpegImage.Value);
|
||||||
|
// if (!frameRet.IsSuccessful)
|
||||||
|
// {
|
||||||
|
// logger.Error("创建MJPEG帧失败");
|
||||||
|
// await Task.Delay(100, cancellationToken);
|
||||||
|
// continue;
|
||||||
|
// }
|
||||||
|
// var frame = frameRet.Value;
|
||||||
|
|
||||||
|
// await response.OutputStream.WriteAsync(frame.header, 0, frame.header.Length, cancellationToken); // await response.OutputStream.WriteAsync(frame.data, 0, frame.data.Length, cancellationToken);
|
||||||
|
// await response.OutputStream.WriteAsync(frame.footer, 0, frame.footer.Length, cancellationToken);
|
||||||
|
// await response.OutputStream.FlushAsync(cancellationToken);
|
||||||
|
|
||||||
|
// frameCounter++;
|
||||||
|
|
||||||
|
// var totalTime = (DateTime.UtcNow - frameStartTime).TotalMilliseconds;
|
||||||
|
|
||||||
|
// // 性能统计日志(每30帧记录一次)
|
||||||
|
// if (frameCounter % 30 == 0)
|
||||||
|
// {
|
||||||
|
// logger.Debug("HDMI帧 {FrameNumber} 性能统计 - 总计: {TotalTime:F1}ms, JPEG大小: {JpegSize} 字节",
|
||||||
|
// frameCounter, totalTime, frame.data.Length);
|
||||||
|
// }
|
||||||
|
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "HDMI MJPEG流处理异常");
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// 停止传输时禁用HDMI传输
|
||||||
|
await client.HdmiInClient.SetTransEnable(false);
|
||||||
|
logger.Info("已禁用HDMI传输");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "禁用HDMI传输时出错");
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
response.Close();
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// 忽略关闭时的错误
|
||||||
|
}
|
||||||
|
logger.Debug("HDMI MJPEG流连接已关闭");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task SendVideoHtmlPageAsync(HttpListenerResponse response, string boardId)
|
||||||
|
{
|
||||||
|
string html = $@"<html><body>
|
||||||
|
<h1>HDMI Video Stream for Board {boardId}</h1>
|
||||||
|
<img src='/mjpeg?boardId={boardId}' />
|
||||||
|
</body></html>";
|
||||||
|
response.ContentType = "text/html";
|
||||||
|
await response.OutputStream.WriteAsync(System.Text.Encoding.UTF8.GetBytes(html));
|
||||||
|
response.Close();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task SendIndexHtmlPageAsync(HttpListenerResponse response, string boardId)
|
||||||
|
{
|
||||||
|
string html = $@"<html><body>
|
||||||
|
<h1>Welcome to HDMI Video Stream Service</h1>
|
||||||
|
<a href='/video?boardId={boardId}'>View Video Stream for Board {boardId}</a>
|
||||||
|
</body></html>";
|
||||||
|
response.ContentType = "text/html";
|
||||||
|
await response.OutputStream.WriteAsync(System.Text.Encoding.UTF8.GetBytes(html));
|
||||||
|
response.Close();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task SendErrorAsync(HttpListenerResponse response, string message)
|
||||||
|
{
|
||||||
|
response.StatusCode = 400;
|
||||||
|
await response.OutputStream.WriteAsync(System.Text.Encoding.UTF8.GetBytes(message));
|
||||||
|
response.Close();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取所有可用的HDMI视频流终端点
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>返回所有可用的HDMI视频流终端点列表</returns>
|
||||||
|
public List<HdmiVideoStreamEndpoint>? GetAllVideoEndpoints()
|
||||||
|
{
|
||||||
|
var userManager = new Database.UserManager();
|
||||||
|
|
||||||
|
var boards = userManager.GetAllBoard();
|
||||||
|
if (boards == null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
var endpoints = new List<HdmiVideoStreamEndpoint>();
|
||||||
|
foreach (var board in boards)
|
||||||
|
{
|
||||||
|
endpoints.Add(new HdmiVideoStreamEndpoint
|
||||||
|
{
|
||||||
|
BoardId = board.ID.ToString(),
|
||||||
|
MjpegUrl = $"http://{Global.LocalHost}:{_serverPort}/mjpeg?boardId={board.ID}",
|
||||||
|
VideoUrl = $"http://{Global.LocalHost}:{_serverPort}/video?boardId={board.ID}",
|
||||||
|
SnapshotUrl = $"http://{Global.LocalHost}:{_serverPort}/snapshot?boardId={board.ID}"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return endpoints;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取指定板卡ID的HDMI视频流终端点
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="boardId">板卡ID</param>
|
||||||
|
/// <returns>返回指定板卡的HDMI视频流终端点</returns>
|
||||||
|
public HdmiVideoStreamEndpoint GetVideoEndpoint(string boardId)
|
||||||
|
{
|
||||||
|
return new HdmiVideoStreamEndpoint
|
||||||
|
{
|
||||||
|
BoardId = boardId,
|
||||||
|
MjpegUrl = $"http://{Global.LocalHost}:{_serverPort}/mjpeg?boardId={boardId}",
|
||||||
|
VideoUrl = $"http://{Global.LocalHost}:{_serverPort}/video?boardId={boardId}",
|
||||||
|
SnapshotUrl = $"http://{Global.LocalHost}:{_serverPort}/snapshot?boardId={boardId}"
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
147
server/src/Services/ProgressTracker.cs
Normal file
147
server/src/Services/ProgressTracker.cs
Normal file
@@ -0,0 +1,147 @@
|
|||||||
|
using System.Collections.Concurrent;
|
||||||
|
using Microsoft.AspNetCore.SignalR;
|
||||||
|
using server.Hubs;
|
||||||
|
|
||||||
|
namespace server.Services;
|
||||||
|
|
||||||
|
public enum TaskState { Running, Completed, Failed, Cancelled }
|
||||||
|
|
||||||
|
public readonly struct TaskProgress
|
||||||
|
{
|
||||||
|
public string Id { get; }
|
||||||
|
public int Current { get; }
|
||||||
|
public int Total { get; }
|
||||||
|
public TaskState State { get; }
|
||||||
|
public long Timestamp { get; }
|
||||||
|
public string? Error { get; }
|
||||||
|
|
||||||
|
public TaskProgress(string id, int current, int total, TaskState state, long timestamp, string? error = null)
|
||||||
|
{
|
||||||
|
Id = id;
|
||||||
|
Current = current;
|
||||||
|
Total = total;
|
||||||
|
State = state;
|
||||||
|
Timestamp = timestamp;
|
||||||
|
Error = error;
|
||||||
|
}
|
||||||
|
|
||||||
|
public TaskProgress WithUpdate(int? current = null, TaskState? state = null, string? error = null)
|
||||||
|
{
|
||||||
|
return new TaskProgress(
|
||||||
|
Id,
|
||||||
|
current ?? Current,
|
||||||
|
Total,
|
||||||
|
state ?? State,
|
||||||
|
DateTimeOffset.UtcNow.ToUnixTimeSeconds(),
|
||||||
|
error ?? Error
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ProgressInfo ToProgressInfo()
|
||||||
|
{
|
||||||
|
return new ProgressInfo
|
||||||
|
{
|
||||||
|
TaskId = Id,
|
||||||
|
Status = State switch
|
||||||
|
{
|
||||||
|
TaskState.Running => ProgressStatus.Running,
|
||||||
|
TaskState.Completed => ProgressStatus.Completed,
|
||||||
|
TaskState.Failed => ProgressStatus.Failed,
|
||||||
|
TaskState.Cancelled => ProgressStatus.Canceled,
|
||||||
|
_ => ProgressStatus.Failed
|
||||||
|
},
|
||||||
|
ProgressPercent = Total > 0 ? ((double)Current * 100) / (double)Total : 0,
|
||||||
|
ErrorMessage = Error ?? string.Empty
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public sealed class ProgressTracker
|
||||||
|
{
|
||||||
|
private readonly ConcurrentDictionary<string, TaskProgress> _tasks = new();
|
||||||
|
private readonly Timer _cleaner;
|
||||||
|
private readonly IHubContext<ProgressHub, IProgressReceiver> _hubContext;
|
||||||
|
|
||||||
|
// 构造器支持可选的Hub注入
|
||||||
|
public ProgressTracker(IHubContext<ProgressHub, IProgressReceiver> hubContext)
|
||||||
|
{
|
||||||
|
_hubContext = hubContext;
|
||||||
|
_cleaner = new Timer(CleanExpiredTasks, null,
|
||||||
|
TimeSpan.FromMinutes(1), TimeSpan.FromMinutes(1));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void CleanExpiredTasks(object? obj)
|
||||||
|
{
|
||||||
|
var cutoff = DateTimeOffset.Now.AddMinutes(-3).ToUnixTimeSeconds();
|
||||||
|
var expired = _tasks.Where(kvp => kvp.Value.Timestamp < cutoff).Select(kvp => kvp.Key).ToList();
|
||||||
|
foreach (var id in expired)
|
||||||
|
{
|
||||||
|
_tasks.TryRemove(id, out _);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public string CreateTask(int total)
|
||||||
|
{
|
||||||
|
var id = Guid.NewGuid().ToString();
|
||||||
|
var task = new TaskProgress(id, 0, total, TaskState.Running, DateTimeOffset.UtcNow.ToUnixTimeSeconds());
|
||||||
|
_tasks[id] = task;
|
||||||
|
NotifyIfNeeded(task);
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 核心更新方法,现在包含自动通知
|
||||||
|
public bool UpdateTask(string id, Func<TaskProgress, TaskProgress> updater)
|
||||||
|
{
|
||||||
|
if (!_tasks.TryGetValue(id, out var current))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
var updated = updater(current);
|
||||||
|
if (_tasks.TryUpdate(id, updated, current))
|
||||||
|
{
|
||||||
|
NotifyIfNeeded(updated);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 自动通知逻辑 - 简单直接
|
||||||
|
private void NotifyIfNeeded(TaskProgress task)
|
||||||
|
{
|
||||||
|
_hubContext.Clients.Group(task.Id).OnReceiveProgress(task.ToProgressInfo());
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool UpdateProgress(string id, int current)
|
||||||
|
{
|
||||||
|
return UpdateTask(id, p => p.WithUpdate(
|
||||||
|
current: Math.Min(current, p.Total)));
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool AdvanceProgress(string id, int steps)
|
||||||
|
{
|
||||||
|
return UpdateTask(id, p => p.WithUpdate(
|
||||||
|
current: Math.Min(p.Current + steps, p.Total)));
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool CancelProgress(string id)
|
||||||
|
{
|
||||||
|
return UpdateTask(id, p => p.WithUpdate(state: TaskState.Cancelled));
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool CompleteProgress(string id)
|
||||||
|
{
|
||||||
|
return UpdateTask(id, p => p.WithUpdate(
|
||||||
|
current: p.Total, state: TaskState.Completed));
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool FailProgress(string id, string? error)
|
||||||
|
{
|
||||||
|
return UpdateTask(id, p => p.WithUpdate(
|
||||||
|
state: TaskState.Failed, error: error));
|
||||||
|
}
|
||||||
|
|
||||||
|
public TaskProgress? GetTask(string id)
|
||||||
|
{
|
||||||
|
_tasks.TryGetValue(id, out var task);
|
||||||
|
return task.Id == null ? null : task;
|
||||||
|
}
|
||||||
|
}
|
||||||
576
server/src/Services/RtspStreamService.cs
Normal file
576
server/src/Services/RtspStreamService.cs
Normal file
@@ -0,0 +1,576 @@
|
|||||||
|
using System.Net;
|
||||||
|
using System.Net.Sockets;
|
||||||
|
using System.Collections.Concurrent;
|
||||||
|
using System.Text;
|
||||||
|
using Rtsp;
|
||||||
|
using Rtsp.Messages;
|
||||||
|
using Rtsp.Sdp;
|
||||||
|
using server.Services;
|
||||||
|
using SixLabors.ImageSharp;
|
||||||
|
using SixLabors.ImageSharp.PixelFormats;
|
||||||
|
using SixLabors.ImageSharp.Processing;
|
||||||
|
|
||||||
|
namespace server.Services;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// RTSP streaming service that integrates with UsbCameraCapture
|
||||||
|
/// Uses simplified RTSP server architecture with RTSPDispatcher
|
||||||
|
/// Provides Motion JPEG stream over RTP/RTSP
|
||||||
|
/// Compatible with Windows and Linux
|
||||||
|
/// </summary>
|
||||||
|
public class RtspStreamService : IDisposable
|
||||||
|
{
|
||||||
|
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
private readonly UsbCameraCapture _cameraCapture;
|
||||||
|
private readonly ConcurrentDictionary<string, RtspListener> _activeListeners = new();
|
||||||
|
|
||||||
|
// RTSP configuration
|
||||||
|
private readonly int _rtspPort;
|
||||||
|
private readonly string _streamPath;
|
||||||
|
private TcpListener? _rtspServerListener;
|
||||||
|
private ManualResetEvent? _stopping;
|
||||||
|
private Thread? _listenThread;
|
||||||
|
|
||||||
|
// Video encoding parameters
|
||||||
|
private int _videoWidth = 640;
|
||||||
|
private int _videoHeight = 480;
|
||||||
|
private int _frameRate = 30;
|
||||||
|
private int _jpegQuality = 75;
|
||||||
|
|
||||||
|
private bool _isStreaming;
|
||||||
|
private bool _disposed;
|
||||||
|
|
||||||
|
// Frame timing and RTP sequencing
|
||||||
|
private DateTime _lastFrameTime = DateTime.UtcNow;
|
||||||
|
private readonly TimeSpan _frameInterval;
|
||||||
|
private uint _rtpTimestamp = 0;
|
||||||
|
private ushort _sequenceNumber = 0;
|
||||||
|
private readonly uint _ssrc = (uint)Random.Shared.Next();
|
||||||
|
|
||||||
|
// Current frame data for broadcasting
|
||||||
|
private byte[]? _currentFrame;
|
||||||
|
private readonly object _frameLock = new object();
|
||||||
|
|
||||||
|
public event Action<Exception>? Error;
|
||||||
|
public event Action<string>? StatusChanged;
|
||||||
|
|
||||||
|
public bool IsStreaming => _isStreaming;
|
||||||
|
public int Port => _rtspPort;
|
||||||
|
public string StreamUrl => $"rtsp://localhost:{_rtspPort}/{_streamPath}";
|
||||||
|
public int ActiveSessions => _activeListeners.Count;
|
||||||
|
|
||||||
|
public RtspStreamService(UsbCameraCapture cameraCapture, int port = 8554, string streamPath = "camera")
|
||||||
|
{
|
||||||
|
_cameraCapture = cameraCapture ?? throw new ArgumentNullException(nameof(cameraCapture));
|
||||||
|
_rtspPort = port;
|
||||||
|
_streamPath = streamPath;
|
||||||
|
_frameInterval = TimeSpan.FromSeconds(1.0 / _frameRate);
|
||||||
|
|
||||||
|
// Register RTSP URI scheme
|
||||||
|
RtspUtils.RegisterUri();
|
||||||
|
|
||||||
|
// Subscribe to camera events
|
||||||
|
_cameraCapture.FrameReady += OnFrameReady;
|
||||||
|
_cameraCapture.Error += OnCameraError;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Configure video encoding parameters
|
||||||
|
/// </summary>
|
||||||
|
public void ConfigureVideo(int width, int height, int frameRate, int jpegQuality = 75)
|
||||||
|
{
|
||||||
|
if (_isStreaming)
|
||||||
|
throw new InvalidOperationException("Cannot configure video while streaming");
|
||||||
|
|
||||||
|
_videoWidth = width;
|
||||||
|
_videoHeight = height;
|
||||||
|
_frameRate = frameRate;
|
||||||
|
_jpegQuality = jpegQuality;
|
||||||
|
|
||||||
|
logger.Info($"Video configured: {width}x{height} @ {frameRate}fps, JPEG quality {jpegQuality}%");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Start RTSP server and begin streaming
|
||||||
|
/// </summary>
|
||||||
|
public async Task StartAsync()
|
||||||
|
{
|
||||||
|
if (_isStreaming)
|
||||||
|
return;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// Validate port range
|
||||||
|
if (_rtspPort < IPEndPoint.MinPort || _rtspPort > IPEndPoint.MaxPort)
|
||||||
|
throw new ArgumentOutOfRangeException(nameof(_rtspPort), _rtspPort, "Port number must be between System.Net.IPEndPoint.MinPort and System.Net.IPEndPoint.MaxPort");
|
||||||
|
|
||||||
|
// Initialize RTSP server
|
||||||
|
_rtspServerListener = new TcpListener(IPAddress.Any, _rtspPort);
|
||||||
|
_rtspServerListener.Start();
|
||||||
|
|
||||||
|
// Start listening for connections
|
||||||
|
_stopping = new ManualResetEvent(false);
|
||||||
|
_listenThread = new Thread(AcceptConnections)
|
||||||
|
{
|
||||||
|
Name = "RTSP-Listener",
|
||||||
|
IsBackground = true
|
||||||
|
};
|
||||||
|
_listenThread.Start();
|
||||||
|
|
||||||
|
// Start camera capture if not already running
|
||||||
|
if (!_cameraCapture.IsCapturing)
|
||||||
|
{
|
||||||
|
await _cameraCapture.StartAsync(1, _videoWidth, _videoHeight, _frameRate);
|
||||||
|
}
|
||||||
|
|
||||||
|
_isStreaming = true;
|
||||||
|
StatusChanged?.Invoke("Streaming started");
|
||||||
|
logger.Info($"RTSP stream started on {StreamUrl}");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
await StopAsync();
|
||||||
|
Error?.Invoke(ex);
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Stop RTSP server and streaming
|
||||||
|
/// </summary>
|
||||||
|
public async Task StopAsync()
|
||||||
|
{
|
||||||
|
if (!_isStreaming)
|
||||||
|
return;
|
||||||
|
|
||||||
|
_isStreaming = false;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// Signal stop and wait for listen thread
|
||||||
|
_stopping?.Set();
|
||||||
|
if (_listenThread != null && _listenThread.IsAlive)
|
||||||
|
{
|
||||||
|
_listenThread.Join(TimeSpan.FromSeconds(5));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Stop RTSP server
|
||||||
|
_rtspServerListener?.Stop();
|
||||||
|
|
||||||
|
// Clean up active listeners
|
||||||
|
foreach (var listener in _activeListeners.Values.ToArray())
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
listener.Stop();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Warn(ex, "Error stopping RTSP listener");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_activeListeners.Clear();
|
||||||
|
|
||||||
|
StatusChanged?.Invoke("Streaming stopped");
|
||||||
|
logger.Info("RTSP stream stopped");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Error?.Invoke(ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
await Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get current stream statistics
|
||||||
|
/// </summary>
|
||||||
|
public StreamStats GetStats()
|
||||||
|
{
|
||||||
|
return new StreamStats
|
||||||
|
{
|
||||||
|
IsStreaming = _isStreaming,
|
||||||
|
ActiveSessions = _activeListeners.Count,
|
||||||
|
VideoWidth = _videoWidth,
|
||||||
|
VideoHeight = _videoHeight,
|
||||||
|
FrameRate = _frameRate,
|
||||||
|
StreamUrl = StreamUrl
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Accept incoming RTSP connections
|
||||||
|
/// </summary>
|
||||||
|
private void AcceptConnections()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
while (!(_stopping?.WaitOne(0) ?? true))
|
||||||
|
{
|
||||||
|
TcpClient client = _rtspServerListener!.AcceptTcpClient();
|
||||||
|
var transport = new RtspTcpTransport(client);
|
||||||
|
var listener = new RtspListener(transport);
|
||||||
|
|
||||||
|
var listenerId = Guid.NewGuid().ToString();
|
||||||
|
_activeListeners[listenerId] = listener;
|
||||||
|
|
||||||
|
// Handle listener events
|
||||||
|
listener.MessageReceived += (sender, args) => HandleRtspMessage(listenerId, args);
|
||||||
|
|
||||||
|
// Store listener for later cleanup
|
||||||
|
// We'll rely on exception handling to detect disconnections
|
||||||
|
|
||||||
|
// Start the listener
|
||||||
|
listener.Start();
|
||||||
|
|
||||||
|
logger.Info($"New RTSP client connected: {listenerId} from {client.Client.RemoteEndPoint}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (SocketException ex)
|
||||||
|
{
|
||||||
|
if (_isStreaming) // Only log if we're still supposed to be running
|
||||||
|
{
|
||||||
|
logger.Warn(ex, "Socket error while accepting connections (may be normal during shutdown)");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
if (_isStreaming)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Error accepting RTSP connections");
|
||||||
|
Error?.Invoke(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Handle RTSP messages from clients
|
||||||
|
/// </summary>
|
||||||
|
private void HandleRtspMessage(string listenerId, RtspChunkEventArgs args)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (args.Message is RtspRequest request)
|
||||||
|
{
|
||||||
|
HandleRtspRequest(listenerId, request);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, $"Error handling RTSP message for listener {listenerId}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Handle RTSP requests
|
||||||
|
/// </summary>
|
||||||
|
private void HandleRtspRequest(string listenerId, RtspRequest request)
|
||||||
|
{
|
||||||
|
if (!_activeListeners.TryGetValue(listenerId, out var listener))
|
||||||
|
return;
|
||||||
|
|
||||||
|
var response = new RtspResponse();
|
||||||
|
response.OriginalRequest = request;
|
||||||
|
|
||||||
|
// 1. 返回 CSeq 字段
|
||||||
|
if (request.Headers.TryGetValue("CSeq", out var cseq))
|
||||||
|
{
|
||||||
|
response.Headers["CSeq"] = cseq;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (request.RequestTyped)
|
||||||
|
{
|
||||||
|
case RtspRequest.RequestType.OPTIONS:
|
||||||
|
response.Headers["Public"] = "DESCRIBE, SETUP, TEARDOWN, PLAY, PAUSE";
|
||||||
|
response.ReturnCode = 200;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case RtspRequest.RequestType.DESCRIBE:
|
||||||
|
if (request.RtspUri?.AbsolutePath.TrimStart('/') == _streamPath)
|
||||||
|
{
|
||||||
|
var sdp = CreateSdp();
|
||||||
|
response.Headers["Content-Type"] = "application/sdp";
|
||||||
|
response.Data = Encoding.UTF8.GetBytes(sdp);
|
||||||
|
response.ReturnCode = 200;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
response.ReturnCode = 404;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case RtspRequest.RequestType.SETUP:
|
||||||
|
// 2. 解析客户端 Transport 字段
|
||||||
|
string clientTransport = request.Headers.TryGetValue("Transport", out var transport) ? transport : "";
|
||||||
|
string serverTransport;
|
||||||
|
if (clientTransport.Contains("TCP", StringComparison.OrdinalIgnoreCase) || clientTransport.Contains("interleaved"))
|
||||||
|
{
|
||||||
|
// 客户端要求TCP
|
||||||
|
serverTransport = "RTP/AVP/TCP;unicast;interleaved=0-1";
|
||||||
|
}
|
||||||
|
else if (clientTransport.Contains("UDP", StringComparison.OrdinalIgnoreCase) || clientTransport.Contains("client_port"))
|
||||||
|
{
|
||||||
|
// 客户端要求UDP
|
||||||
|
// 这里假设端口号格式为 client_port=xxxx-xxxx
|
||||||
|
var match = System.Text.RegularExpressions.Regex.Match(clientTransport, @"client_port=(\d+)-(\d+)");
|
||||||
|
if (match.Success)
|
||||||
|
{
|
||||||
|
var clientPort1 = match.Groups[1].Value;
|
||||||
|
var clientPort2 = match.Groups[2].Value;
|
||||||
|
// 你可以自定义 server_port
|
||||||
|
serverTransport = $"RTP/AVP;unicast;client_port={clientPort1}-{clientPort2};server_port=9000-9001";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// 默认UDP
|
||||||
|
serverTransport = "RTP/AVP;unicast;client_port=8000-8001;server_port=9000-9001";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// 默认TCP
|
||||||
|
serverTransport = "RTP/AVP/TCP;unicast;interleaved=0-1";
|
||||||
|
}
|
||||||
|
response.Headers["Transport"] = serverTransport;
|
||||||
|
response.Headers["Session"] = listenerId;
|
||||||
|
response.ReturnCode = 200;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case RtspRequest.RequestType.PLAY:
|
||||||
|
response.Headers["Session"] = listenerId;
|
||||||
|
response.ReturnCode = 200;
|
||||||
|
// Start sending frames to this client
|
||||||
|
StartFrameBroadcastForListener(listenerId);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case RtspRequest.RequestType.TEARDOWN:
|
||||||
|
response.ReturnCode = 200;
|
||||||
|
// Stop and remove the listener
|
||||||
|
Task.Run(() =>
|
||||||
|
{
|
||||||
|
listener.Stop();
|
||||||
|
_activeListeners.TryRemove(listenerId, out _);
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
response.ReturnCode = 501; // Not implemented
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Send response
|
||||||
|
try
|
||||||
|
{
|
||||||
|
listener.SendMessage(response);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, $"Error sending RTSP response to listener {listenerId}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Create SDP description for the stream
|
||||||
|
/// </summary>
|
||||||
|
private string CreateSdp()
|
||||||
|
{
|
||||||
|
var sessionId = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
|
||||||
|
|
||||||
|
return $@"v=0
|
||||||
|
o=- {sessionId} {sessionId} IN IP4 127.0.0.1
|
||||||
|
s=FPGA WebLab Camera Stream
|
||||||
|
c=IN IP4 0.0.0.0
|
||||||
|
t=0 0
|
||||||
|
m=video 0 RTP/AVP 26
|
||||||
|
a=rtpmap:26 JPEG/90000
|
||||||
|
a=control:track1
|
||||||
|
a=framerate:{_frameRate}";
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Start broadcasting frames to a specific listener
|
||||||
|
/// </summary>
|
||||||
|
private void StartFrameBroadcastForListener(string listenerId)
|
||||||
|
{
|
||||||
|
// For now, we'll use a simple approach where we send the current frame
|
||||||
|
// In a full implementation, you'd want to manage RTP streaming per client
|
||||||
|
lock (_frameLock)
|
||||||
|
{
|
||||||
|
if (_currentFrame != null && _activeListeners.TryGetValue(listenerId, out var listener))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// Send current frame (simplified - in real implementation you'd send RTP packets)
|
||||||
|
// This is a placeholder for actual RTP packet creation and sending
|
||||||
|
logger.Debug($"Started frame broadcast for listener {listenerId}");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, $"Error starting frame broadcast for listener {listenerId}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Handle new frame from camera
|
||||||
|
/// </summary>
|
||||||
|
private void OnFrameReady(byte[] frameData)
|
||||||
|
{
|
||||||
|
if (!_isStreaming || frameData == null || _activeListeners.IsEmpty)
|
||||||
|
return;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// Throttle frame rate
|
||||||
|
var now = DateTime.UtcNow;
|
||||||
|
if (now - _lastFrameTime < _frameInterval)
|
||||||
|
return;
|
||||||
|
|
||||||
|
_lastFrameTime = now;
|
||||||
|
|
||||||
|
// Process and encode frame
|
||||||
|
var processedFrame = ProcessFrame(frameData);
|
||||||
|
if (processedFrame != null)
|
||||||
|
{
|
||||||
|
lock (_frameLock)
|
||||||
|
{
|
||||||
|
_currentFrame = processedFrame;
|
||||||
|
}
|
||||||
|
|
||||||
|
BroadcastFrame(processedFrame);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Error processing camera frame");
|
||||||
|
Error?.Invoke(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Process raw frame data
|
||||||
|
/// </summary>
|
||||||
|
private byte[]? ProcessFrame(byte[] frameData)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// Convert frame to JPEG for Motion JPEG streaming
|
||||||
|
using var image = Image.Load<Rgb24>(frameData);
|
||||||
|
|
||||||
|
// Resize if necessary
|
||||||
|
if (image.Width != _videoWidth || image.Height != _videoHeight)
|
||||||
|
{
|
||||||
|
image.Mutate(x => x.Resize(_videoWidth, _videoHeight));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Encode as JPEG with specified quality
|
||||||
|
using var stream = new MemoryStream();
|
||||||
|
image.SaveAsJpeg(stream, new SixLabors.ImageSharp.Formats.Jpeg.JpegEncoder
|
||||||
|
{
|
||||||
|
Quality = _jpegQuality
|
||||||
|
});
|
||||||
|
|
||||||
|
return stream.ToArray();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error(ex, "Error processing frame");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Broadcast frame to all active listeners
|
||||||
|
/// </summary>
|
||||||
|
private void BroadcastFrame(byte[] frameData)
|
||||||
|
{
|
||||||
|
if (_activeListeners.IsEmpty)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var timestamp = _rtpTimestamp;
|
||||||
|
_rtpTimestamp += (uint)(90000 / _frameRate); // 90kHz clock
|
||||||
|
var sequenceNumber = ++_sequenceNumber;
|
||||||
|
|
||||||
|
var listenersToRemove = new List<string>();
|
||||||
|
|
||||||
|
foreach (var kvp in _activeListeners)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var listener = kvp.Value;
|
||||||
|
// Try to send data to test if listener is still active
|
||||||
|
// In a full implementation, you would create and send RTP packets here
|
||||||
|
// For now, this is a placeholder that just checks if we can access the listener
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var _ = listener.RemoteEndPoint; // Test if listener is still valid
|
||||||
|
// SendRtpFrame(listener, frameData, timestamp, sequenceNumber, _ssrc);
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
listenersToRemove.Add(kvp.Key);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Warn(ex, $"Error sending frame to listener {kvp.Key}");
|
||||||
|
listenersToRemove.Add(kvp.Key);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove failed listeners
|
||||||
|
foreach (var listenerId in listenersToRemove)
|
||||||
|
{
|
||||||
|
if (_activeListeners.TryRemove(listenerId, out var listener))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
listener.Stop();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Warn(ex, $"Error stopping failed listener {listenerId}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Handle camera capture errors
|
||||||
|
/// </summary>
|
||||||
|
private void OnCameraError(Exception error)
|
||||||
|
{
|
||||||
|
logger.Error(error, "Camera capture error");
|
||||||
|
Error?.Invoke(error);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
if (_disposed) return;
|
||||||
|
|
||||||
|
StopAsync().Wait();
|
||||||
|
|
||||||
|
_cameraCapture.FrameReady -= OnFrameReady;
|
||||||
|
_cameraCapture.Error -= OnCameraError;
|
||||||
|
|
||||||
|
_rtspServerListener?.Stop();
|
||||||
|
_stopping?.Dispose();
|
||||||
|
|
||||||
|
_disposed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Stream statistics data structure
|
||||||
|
/// </summary>
|
||||||
|
public class StreamStats
|
||||||
|
{
|
||||||
|
public bool IsStreaming { get; set; }
|
||||||
|
public int ActiveSessions { get; set; }
|
||||||
|
public int VideoWidth { get; set; }
|
||||||
|
public int VideoHeight { get; set; }
|
||||||
|
public int FrameRate { get; set; }
|
||||||
|
public string StreamUrl { get; set; } = string.Empty;
|
||||||
|
}
|
||||||
202
server/src/Services/UsbCameraCapture.cs
Normal file
202
server/src/Services/UsbCameraCapture.cs
Normal file
@@ -0,0 +1,202 @@
|
|||||||
|
using FlashCap;
|
||||||
|
|
||||||
|
namespace server.Services;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Simple USB camera capture service following Linus principles:
|
||||||
|
/// - Single responsibility: just capture frames
|
||||||
|
/// - No special cases: uniform error handling
|
||||||
|
/// - Good taste: clean data structures
|
||||||
|
/// </summary>
|
||||||
|
public class UsbCameraCapture : IDisposable
|
||||||
|
{
|
||||||
|
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
private readonly CaptureDevices _captureDevices;
|
||||||
|
private CaptureDevice? _device;
|
||||||
|
private CaptureDeviceDescriptor? _descriptor;
|
||||||
|
private VideoCharacteristics? _characteristics;
|
||||||
|
|
||||||
|
// Single source of truth for latest frame - no redundant buffering
|
||||||
|
private volatile byte[]? _latestFrame;
|
||||||
|
private volatile bool _isCapturing;
|
||||||
|
private bool _disposed;
|
||||||
|
|
||||||
|
public event Action<byte[]>? FrameReady;
|
||||||
|
public event Action<Exception>? Error;
|
||||||
|
|
||||||
|
public bool IsCapturing => _isCapturing;
|
||||||
|
public VideoCharacteristics? CurrentCharacteristics => _characteristics;
|
||||||
|
public CaptureDeviceDescriptor? CurrentDevice => _descriptor;
|
||||||
|
|
||||||
|
public UsbCameraCapture()
|
||||||
|
{
|
||||||
|
_captureDevices = new CaptureDevices();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get all available camera devices
|
||||||
|
/// </summary>
|
||||||
|
public IReadOnlyList<CaptureDeviceDescriptor> GetDevices()
|
||||||
|
{
|
||||||
|
return _captureDevices.EnumerateDescriptors().ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Start capturing from specified device with best matching characteristics
|
||||||
|
/// </summary>
|
||||||
|
public async Task StartAsync(int deviceIndex, int width = 640, int height = 480, int frameRate = 30)
|
||||||
|
{
|
||||||
|
var devices = GetDevices();
|
||||||
|
if (deviceIndex >= devices.Count)
|
||||||
|
throw new ArgumentOutOfRangeException(nameof(deviceIndex));
|
||||||
|
|
||||||
|
var descriptor = devices[deviceIndex];
|
||||||
|
var characteristics = FindBestMatch(descriptor, width, height, frameRate);
|
||||||
|
|
||||||
|
await StartAsync(descriptor, characteristics);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Start capturing with exact device and characteristics
|
||||||
|
/// </summary>
|
||||||
|
public async Task StartAsync(CaptureDeviceDescriptor descriptor, VideoCharacteristics characteristics)
|
||||||
|
{
|
||||||
|
if (_isCapturing)
|
||||||
|
await StopAsync();
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_descriptor = descriptor;
|
||||||
|
_characteristics = characteristics;
|
||||||
|
_device = await descriptor.OpenAsync(
|
||||||
|
characteristics, TranscodeFormats.DoNotTranscode, true, 10, OnFrameCaptured);
|
||||||
|
|
||||||
|
await _device.StartAsync();
|
||||||
|
_isCapturing = true;
|
||||||
|
logger.Debug("Started capturing");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
await CleanupAsync();
|
||||||
|
Error?.Invoke(ex);
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Stop capturing and cleanup
|
||||||
|
/// </summary>
|
||||||
|
public async Task StopAsync()
|
||||||
|
{
|
||||||
|
if (!_isCapturing)
|
||||||
|
return;
|
||||||
|
|
||||||
|
_isCapturing = false;
|
||||||
|
await CleanupAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get the latest captured frame (returns copy for thread safety)
|
||||||
|
/// </summary>
|
||||||
|
public byte[]? GetLatestFrame()
|
||||||
|
{
|
||||||
|
return _latestFrame;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get supported video characteristics for current device
|
||||||
|
/// </summary>
|
||||||
|
public IReadOnlyList<VideoCharacteristics> GetSupportedCharacteristics()
|
||||||
|
{
|
||||||
|
return _descriptor?.Characteristics.ToArray() ?? Array.Empty<VideoCharacteristics>();
|
||||||
|
}
|
||||||
|
|
||||||
|
private VideoCharacteristics FindBestMatch(CaptureDeviceDescriptor descriptor, int width, int height, int frameRate)
|
||||||
|
{
|
||||||
|
var characteristics = descriptor.Characteristics;
|
||||||
|
|
||||||
|
// Exact match first
|
||||||
|
var exact = characteristics.FirstOrDefault(c =>
|
||||||
|
c.Width == width && c.Height == height && Math.Abs(c.FramesPerSecond - frameRate) < 1);
|
||||||
|
if (exact != null)
|
||||||
|
return exact;
|
||||||
|
|
||||||
|
// Resolution match with best framerate
|
||||||
|
var resolution = characteristics
|
||||||
|
.Where(c => c.Width == width && c.Height == height)
|
||||||
|
.OrderByDescending(c => c.FramesPerSecond)
|
||||||
|
.FirstOrDefault();
|
||||||
|
if (resolution != null)
|
||||||
|
return resolution;
|
||||||
|
|
||||||
|
// Closest resolution
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var closest = characteristics
|
||||||
|
.OrderBy(c => Math.Abs(c.Width - width) + Math.Abs(c.Height - height))
|
||||||
|
.ThenByDescending(c => c.FramesPerSecond)
|
||||||
|
.First();
|
||||||
|
|
||||||
|
return closest;
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
for (int i = 0; i < characteristics.Length; i++)
|
||||||
|
logger.Error($"Characteristics[{i}]: {characteristics[i].Width}x{characteristics[i].Height} @ {characteristics[i].FramesPerSecond}fps");
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnFrameCaptured(PixelBufferScope bufferScope)
|
||||||
|
{
|
||||||
|
if (!_isCapturing)
|
||||||
|
return;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// Simple: extract and store. No queues, no locks, no complexity.
|
||||||
|
var imageData = bufferScope.Buffer.CopyImage();
|
||||||
|
_latestFrame = imageData;
|
||||||
|
FrameReady?.Invoke(imageData);
|
||||||
|
// logger.Info("USB Camera frame captured");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Error?.Invoke(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task CleanupAsync()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (_device != null)
|
||||||
|
{
|
||||||
|
await _device.StopAsync();
|
||||||
|
_device.Dispose();
|
||||||
|
_device = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Error?.Invoke(ex);
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
_latestFrame = null;
|
||||||
|
_descriptor = null;
|
||||||
|
_characteristics = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
if (_disposed) return;
|
||||||
|
|
||||||
|
if (_isCapturing) StopAsync().Wait();
|
||||||
|
|
||||||
|
_device?.Dispose();
|
||||||
|
_disposed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,15 +3,16 @@ using System.Net.Sockets;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using DotNext;
|
using DotNext;
|
||||||
using WebProtocol;
|
using WebProtocol;
|
||||||
|
using server.Services;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// UDP客户端发送池
|
/// UDP客户端发送池
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class UDPClientPool
|
public sealed class UDPClientPool
|
||||||
{
|
{
|
||||||
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
private static IPAddress localhost = IPAddress.Parse("127.0.0.1");
|
private static ProgressTracker _progressTracker = MsgBus.ProgressTracker;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 发送字符串
|
/// 发送字符串
|
||||||
@@ -91,9 +92,9 @@ public class UDPClientPool
|
|||||||
var sendLen = socket.SendTo(sendBytes, endPoint);
|
var sendLen = socket.SendTo(sendBytes, endPoint);
|
||||||
socket.Close();
|
socket.Close();
|
||||||
|
|
||||||
logger.Debug($"UDP socket send address package to device {endPoint.Address.ToString()}:{endPoint.Port.ToString()}:");
|
// logger.Debug($"UDP socket send address package to device {endPoint.Address.ToString()}:{endPoint.Port.ToString()}:");
|
||||||
logger.Debug($" Original Data: {BitConverter.ToString(pkg.ToBytes()).Replace("-", " ")}");
|
// logger.Debug($" Original Data: {BitConverter.ToString(pkg.ToBytes()).Replace("-", " ")}");
|
||||||
logger.Debug($" Decoded Data: {pkg.ToString()}");
|
// logger.Debug($" Decoded Data: {pkg.ToString()}");
|
||||||
|
|
||||||
if (sendLen == sendBytes.Length) { return true; }
|
if (sendLen == sendBytes.Length) { return true; }
|
||||||
else { return false; }
|
else { return false; }
|
||||||
@@ -164,8 +165,8 @@ public class UDPClientPool
|
|||||||
var sendLen = socket.SendTo(sendBytes, endPoint);
|
var sendLen = socket.SendTo(sendBytes, endPoint);
|
||||||
socket.Close();
|
socket.Close();
|
||||||
|
|
||||||
logger.Debug($"UDP socket send data package to device {endPoint.Address.ToString()}:{endPoint.Port.ToString()}:");
|
// logger.Debug($"UDP socket send data package to device {endPoint.Address.ToString()}:{endPoint.Port.ToString()}:");
|
||||||
logger.Debug($" Original Data: {BitConverter.ToString(pkg.ToBytes()).Replace("-", " ")}");
|
// logger.Debug($" Original Data: {BitConverter.ToString(pkg.ToBytes()).Replace("-", " ")}");
|
||||||
|
|
||||||
if (sendLen == sendBytes.Length) { return true; }
|
if (sendLen == sendBytes.Length) { return true; }
|
||||||
else { return false; }
|
else { return false; }
|
||||||
@@ -183,37 +184,67 @@ public class UDPClientPool
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 发送字符串到本地
|
/// 发送重置信号
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="port">端口</param>
|
/// <param name="endPoint">IP端点(IP地址与端口)</param>
|
||||||
/// <param name="stringArray">字符串数组</param>
|
|
||||||
/// <returns>是否成功</returns>
|
/// <returns>是否成功</returns>
|
||||||
public static bool SendStringLocalHost(int port, string[] stringArray)
|
public async static ValueTask<bool> SendResetSignal(IPEndPoint endPoint)
|
||||||
{
|
{
|
||||||
return SendString(new IPEndPoint(localhost, port), stringArray);
|
return await Task.Run(async () =>
|
||||||
|
{
|
||||||
|
var ret = SendAddrPack(endPoint,
|
||||||
|
new WebProtocol.SendAddrPackage(BurstType.FixedBurst, 0, true, 0, 0xF0F0F0F0));
|
||||||
|
await Task.Delay(100);
|
||||||
|
return ret;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 循环发送字符串到本地
|
/// 读取设备地址数据
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="times">发送总次数</param>
|
/// <param name="endPoint">IP端点(IP地址与端口)</param>
|
||||||
/// <param name="sleepMilliSeconds">间隔时间</param>
|
/// <param name="taskID">任务ID</param>
|
||||||
/// <param name="port">端口</param>
|
/// <param name="devAddr">设备地址</param>
|
||||||
/// <param name="stringArray">字符串数组</param>
|
/// <param name="dataLength">数据长度(0~255)</param>
|
||||||
/// <returns>是否成功</returns>
|
/// <param name="timeout">超时时间(毫秒)</param>
|
||||||
public static bool CycleSendStringLocalHost(int times, int sleepMilliSeconds, int port, string[] stringArray)
|
/// <returns>读取结果,包含接收到的数据包</returns>
|
||||||
|
public static async ValueTask<Result<RecvDataPackage>> ReadAddr(
|
||||||
|
IPEndPoint endPoint, int taskID, uint devAddr, int dataLength, int timeout = 1000)
|
||||||
{
|
{
|
||||||
var isSuccessful = true;
|
if (dataLength <= 0) return new(new ArgumentException(
|
||||||
|
$"Data length must be greater than 0, instead of {dataLength}"));
|
||||||
|
|
||||||
while (times-- >= 0)
|
if (dataLength > 255) return new(new ArgumentException(
|
||||||
|
$"Data length must be less than or equal to 255, instead of {dataLength}"));
|
||||||
|
|
||||||
|
var ret = false;
|
||||||
|
var opts = new SendAddrPackOptions()
|
||||||
{
|
{
|
||||||
isSuccessful = SendStringLocalHost(port, stringArray);
|
BurstType = BurstType.FixedBurst,
|
||||||
if (!isSuccessful) break;
|
BurstLength = ((byte)(dataLength - 1)),
|
||||||
|
CommandID = Convert.ToByte(taskID),
|
||||||
|
Address = devAddr,
|
||||||
|
IsWrite = false,
|
||||||
|
};
|
||||||
|
|
||||||
Thread.Sleep(sleepMilliSeconds);
|
// Read Register
|
||||||
}
|
ret = await UDPClientPool.SendAddrPackAsync(endPoint, new SendAddrPackage(opts));
|
||||||
|
if (!ret) return new(new Exception("Send Address Package Failed!"));
|
||||||
|
|
||||||
return isSuccessful;
|
// Wait for Read Ack
|
||||||
|
if (!MsgBus.IsRunning)
|
||||||
|
return new(new Exception("Message Bus not Working!"));
|
||||||
|
|
||||||
|
var retPack = await MsgBus.UDPServer.WaitForDataAsync(endPoint, taskID, timeout);
|
||||||
|
if (!retPack.IsSuccessful) return new(retPack.Error);
|
||||||
|
else if (!retPack.Value.IsSuccessful)
|
||||||
|
return new(new Exception("Send address package failed"));
|
||||||
|
|
||||||
|
var retPackOpts = retPack.Value.Options;
|
||||||
|
if (retPackOpts.Data is null)
|
||||||
|
return new(new Exception($"Data is Null, package: {retPackOpts.ToString()}"));
|
||||||
|
|
||||||
|
return retPack;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -224,37 +255,10 @@ public class UDPClientPool
|
|||||||
/// <param name="devAddr">设备地址</param>
|
/// <param name="devAddr">设备地址</param>
|
||||||
/// <param name="timeout">超时时间(毫秒)</param>
|
/// <param name="timeout">超时时间(毫秒)</param>
|
||||||
/// <returns>读取结果,包含接收到的数据包</returns>
|
/// <returns>读取结果,包含接收到的数据包</returns>
|
||||||
public static async ValueTask<Result<RecvDataPackage>> ReadAddr(
|
public static async ValueTask<Result<RecvDataPackage>> ReadAddrByte(
|
||||||
IPEndPoint endPoint, int taskID, uint devAddr, int timeout = 1000)
|
IPEndPoint endPoint, int taskID, uint devAddr, int timeout = 1000)
|
||||||
{
|
{
|
||||||
var ret = false;
|
return await ReadAddr(endPoint, taskID, devAddr, 1, timeout);
|
||||||
var opts = new SendAddrPackOptions();
|
|
||||||
|
|
||||||
opts.BurstType = BurstType.FixedBurst;
|
|
||||||
opts.BurstLength = 0;
|
|
||||||
opts.CommandID = Convert.ToByte(taskID);
|
|
||||||
opts.Address = devAddr;
|
|
||||||
|
|
||||||
// Read Jtag State Register
|
|
||||||
opts.IsWrite = false;
|
|
||||||
ret = await UDPClientPool.SendAddrPackAsync(endPoint, new SendAddrPackage(opts));
|
|
||||||
if (!ret) return new(new Exception("Send Address Package Failed!"));
|
|
||||||
|
|
||||||
// Wait for Read Ack
|
|
||||||
if (!MsgBus.IsRunning)
|
|
||||||
return new(new Exception("Message Bus not Working!"));
|
|
||||||
|
|
||||||
var retPack = await MsgBus.UDPServer.WaitForDataAsync(
|
|
||||||
endPoint.Address.ToString(), taskID, endPoint.Port, timeout);
|
|
||||||
if (!retPack.IsSuccessful) return new(retPack.Error);
|
|
||||||
else if (!retPack.Value.IsSuccessful)
|
|
||||||
return new(new Exception("Send address package failed"));
|
|
||||||
|
|
||||||
var retPackOpts = retPack.Value.Options;
|
|
||||||
if (retPackOpts.Data is null)
|
|
||||||
return new(new Exception($"Data is Null, package: {retPackOpts.ToString()}"));
|
|
||||||
|
|
||||||
return retPack;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -272,7 +276,7 @@ public class UDPClientPool
|
|||||||
{
|
{
|
||||||
var address = endPoint.Address.ToString();
|
var address = endPoint.Address.ToString();
|
||||||
|
|
||||||
var ret = await ReadAddr(endPoint, taskID, devAddr, timeout);
|
var ret = await ReadAddrByte(endPoint, taskID, devAddr, timeout);
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
if (!ret.Value.IsSuccessful)
|
if (!ret.Value.IsSuccessful)
|
||||||
return new(new Exception($"Read device {address} address {devAddr} failed"));
|
return new(new Exception($"Read device {address} address {devAddr} failed"));
|
||||||
@@ -304,10 +308,13 @@ public class UDPClientPool
|
|||||||
/// <param name="devAddr">设备地址</param>
|
/// <param name="devAddr">设备地址</param>
|
||||||
/// <param name="result">期望的结果值</param>
|
/// <param name="result">期望的结果值</param>
|
||||||
/// <param name="resultMask">结果掩码,用于位校验</param>
|
/// <param name="resultMask">结果掩码,用于位校验</param>
|
||||||
|
/// <param name="waittime">等待间隔时间(毫秒)</param>
|
||||||
/// <param name="timeout">超时时间(毫秒)</param>
|
/// <param name="timeout">超时时间(毫秒)</param>
|
||||||
/// <returns>校验结果,true表示在超时前数据匹配期望值</returns>
|
/// <returns>校验结果,true表示在超时前数据匹配期望值</returns>
|
||||||
public static async ValueTask<Result<bool>> ReadAddrWithWait(
|
public static async ValueTask<Result<bool>> ReadAddrWithWait(
|
||||||
IPEndPoint endPoint, int taskID, uint devAddr, UInt32 result, UInt32 resultMask, int timeout = 1000)
|
IPEndPoint endPoint, int taskID, uint devAddr,
|
||||||
|
UInt32 result, UInt32 resultMask,
|
||||||
|
int waittime = 100, int timeout = 1000)
|
||||||
{
|
{
|
||||||
var address = endPoint.Address.ToString();
|
var address = endPoint.Address.ToString();
|
||||||
|
|
||||||
@@ -317,10 +324,10 @@ public class UDPClientPool
|
|||||||
var elapsed = DateTime.Now - startTime;
|
var elapsed = DateTime.Now - startTime;
|
||||||
if (elapsed >= TimeSpan.FromMilliseconds(timeout)) break;
|
if (elapsed >= TimeSpan.FromMilliseconds(timeout)) break;
|
||||||
var timeleft = TimeSpan.FromMilliseconds(timeout) - elapsed;
|
var timeleft = TimeSpan.FromMilliseconds(timeout) - elapsed;
|
||||||
|
await Task.Delay(waittime);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var ret = await ReadAddr(endPoint, taskID, devAddr, Convert.ToInt32(timeleft.TotalMilliseconds));
|
var ret = await ReadAddrByte(endPoint, taskID, devAddr, Convert.ToInt32(timeleft.TotalMilliseconds));
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
if (!ret.Value.IsSuccessful)
|
if (!ret.Value.IsSuccessful)
|
||||||
return new(new Exception($"Read device {address} address {devAddr} failed"));
|
return new(new Exception($"Read device {address} address {devAddr} failed"));
|
||||||
@@ -333,7 +340,7 @@ public class UDPClientPool
|
|||||||
$"Device {address} receive data is {retData.Length} bytes instead of 4 bytes"));
|
$"Device {address} receive data is {retData.Length} bytes instead of 4 bytes"));
|
||||||
|
|
||||||
// Check result
|
// Check result
|
||||||
var retCode = Convert.ToUInt32(Common.Number.BytesToUInt64(retData).Value);
|
var retCode = Convert.ToUInt32(Common.Number.BytesToUInt32(retData).Value);
|
||||||
if (Common.Number.BitsCheck(retCode, result, resultMask)) return true;
|
if (Common.Number.BitsCheck(retCode, result, resultMask)) return true;
|
||||||
}
|
}
|
||||||
catch (Exception error)
|
catch (Exception error)
|
||||||
@@ -358,12 +365,16 @@ public class UDPClientPool
|
|||||||
IPEndPoint endPoint, int taskID, UInt32 devAddr, int dataLength, int timeout = 1000)
|
IPEndPoint endPoint, int taskID, UInt32 devAddr, int dataLength, int timeout = 1000)
|
||||||
{
|
{
|
||||||
var ret = false;
|
var ret = false;
|
||||||
var opts = new SendAddrPackOptions();
|
var opts = new SendAddrPackOptions()
|
||||||
|
{
|
||||||
|
BurstLength = 0,
|
||||||
|
Address = 0,
|
||||||
|
BurstType = BurstType.FixedBurst,
|
||||||
|
CommandID = Convert.ToByte(taskID),
|
||||||
|
IsWrite = false,
|
||||||
|
};
|
||||||
var resultData = new List<byte>();
|
var resultData = new List<byte>();
|
||||||
|
|
||||||
opts.BurstType = BurstType.FixedBurst;
|
|
||||||
opts.CommandID = Convert.ToByte(taskID);
|
|
||||||
opts.IsWrite = false;
|
|
||||||
|
|
||||||
// Check Msg Bus
|
// Check Msg Bus
|
||||||
if (!MsgBus.IsRunning)
|
if (!MsgBus.IsRunning)
|
||||||
@@ -393,8 +404,7 @@ public class UDPClientPool
|
|||||||
if (!ret) return new(new Exception($"Send address package failed at segment {i}!"));
|
if (!ret) return new(new Exception($"Send address package failed at segment {i}!"));
|
||||||
|
|
||||||
// Wait for data response
|
// Wait for data response
|
||||||
var retPack = await MsgBus.UDPServer.WaitForDataAsync(
|
var retPack = await MsgBus.UDPServer.WaitForDataAsync(endPoint, taskID, timeout);
|
||||||
endPoint.Address.ToString(), taskID, endPoint.Port, timeout);
|
|
||||||
if (!retPack.IsSuccessful) return new(retPack.Error);
|
if (!retPack.IsSuccessful) return new(retPack.Error);
|
||||||
|
|
||||||
if (!retPack.Value.IsSuccessful)
|
if (!retPack.Value.IsSuccessful)
|
||||||
@@ -426,11 +436,12 @@ public class UDPClientPool
|
|||||||
/// <param name="endPoint">IP端点(IP地址与端口)</param>
|
/// <param name="endPoint">IP端点(IP地址与端口)</param>
|
||||||
/// <param name="taskID">任务ID</param>
|
/// <param name="taskID">任务ID</param>
|
||||||
/// <param name="devAddr">设备地址</param>
|
/// <param name="devAddr">设备地址</param>
|
||||||
|
/// <param name="burstType">突发类型</param>
|
||||||
/// <param name="dataLength">要读取的数据长度(4字节)</param>
|
/// <param name="dataLength">要读取的数据长度(4字节)</param>
|
||||||
/// <param name="timeout">超时时间(毫秒)</param>
|
/// <param name="timeout">超时时间(毫秒)</param>
|
||||||
/// <returns>读取结果,包含接收到的字节数组</returns>
|
/// <returns>读取结果,包含接收到的字节数组</returns>
|
||||||
public static async ValueTask<Result<byte[]>> ReadAddr4BytesAsync(
|
public static async ValueTask<Result<byte[]>> ReadAddr4BytesAsync(
|
||||||
IPEndPoint endPoint, int taskID, UInt32 devAddr, int dataLength, int timeout = 1000)
|
IPEndPoint endPoint, int taskID, UInt32 devAddr, int dataLength, BurstType burstType, int timeout = 1000)
|
||||||
{
|
{
|
||||||
var pkgList = new List<SendAddrPackage>();
|
var pkgList = new List<SendAddrPackage>();
|
||||||
var resultData = new List<byte>();
|
var resultData = new List<byte>();
|
||||||
@@ -453,11 +464,12 @@ public class UDPClientPool
|
|||||||
|
|
||||||
var opts = new SendAddrPackOptions
|
var opts = new SendAddrPackOptions
|
||||||
{
|
{
|
||||||
BurstType = BurstType.FixedBurst,
|
BurstType = burstType,
|
||||||
CommandID = Convert.ToByte(taskID),
|
CommandID = Convert.ToByte(taskID),
|
||||||
IsWrite = false,
|
IsWrite = false,
|
||||||
BurstLength = (byte)(currentSegmentSize - 1),
|
BurstLength = (byte)(currentSegmentSize - 1),
|
||||||
Address = devAddr + (uint)(i * max4BytesPerRead)
|
Address = (burstType == BurstType.ExtendBurst) ? (devAddr + (uint)(i * max4BytesPerRead)) : (devAddr),
|
||||||
|
// Address = devAddr + (uint)(i * max4BytesPerRead),
|
||||||
};
|
};
|
||||||
pkgList.Add(new SendAddrPackage(opts));
|
pkgList.Add(new SendAddrPackage(opts));
|
||||||
}
|
}
|
||||||
@@ -465,7 +477,7 @@ public class UDPClientPool
|
|||||||
// Send address packages in batches of 128, control outstanding
|
// Send address packages in batches of 128, control outstanding
|
||||||
int sentCount = 0;
|
int sentCount = 0;
|
||||||
var startTime = DateTime.Now;
|
var startTime = DateTime.Now;
|
||||||
const int batchSize = 64;
|
const int batchSize = 32;
|
||||||
while (sentCount < pkgList.Count)
|
while (sentCount < pkgList.Count)
|
||||||
{
|
{
|
||||||
var elapsed = DateTime.Now - startTime;
|
var elapsed = DateTime.Now - startTime;
|
||||||
@@ -477,7 +489,7 @@ public class UDPClientPool
|
|||||||
int outstanding = sentCount - (found.HasValue ? found.Value : 0);
|
int outstanding = sentCount - (found.HasValue ? found.Value : 0);
|
||||||
|
|
||||||
// If outstanding >= 512 - batchSize, wait for some data to be received
|
// If outstanding >= 512 - batchSize, wait for some data to be received
|
||||||
if (outstanding >= 256 - batchSize)
|
if (outstanding >= 128 - batchSize)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
|
||||||
@@ -519,9 +531,9 @@ public class UDPClientPool
|
|||||||
{
|
{
|
||||||
var bytes = udpDatas[i].Data;
|
var bytes = udpDatas[i].Data;
|
||||||
var expectedLen = ((pkgList[i].Options.BurstLength + 1) * 4);
|
var expectedLen = ((pkgList[i].Options.BurstLength + 1) * 4);
|
||||||
if ((bytes.Length - 4) != expectedLen)
|
if ((bytes.Length - 8) != expectedLen)
|
||||||
return new(new Exception($"Expected {expectedLen} bytes but received {bytes.Length - 4} bytes at segment {i}"));
|
return new(new Exception($"Expected {expectedLen} bytes but received {bytes.Length - 8} bytes at segment {i}"));
|
||||||
resultData.AddRange(bytes[4..]);
|
resultData.AddRange(bytes[8..]);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Validate total data length
|
// Validate total data length
|
||||||
@@ -531,6 +543,42 @@ public class UDPClientPool
|
|||||||
return resultData.ToArray();
|
return resultData.ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 顺序读取多个地址的数据,并合并BodyData后返回
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="endPoint">IP端点(IP地址与端口)</param>
|
||||||
|
/// <param name="taskID">任务ID</param>
|
||||||
|
/// <param name="addr">地址数组</param>
|
||||||
|
/// <param name="timeout">超时时间(毫秒)</param>
|
||||||
|
/// <returns>合并后的BodyData字节数组</returns>
|
||||||
|
public static async ValueTask<Result<byte[]>> ReadAddrSeq(IPEndPoint endPoint, int taskID, UInt32[] addr, int timeout = 1000)
|
||||||
|
{
|
||||||
|
var length = addr.Length;
|
||||||
|
var resultData = new List<byte>();
|
||||||
|
for (int i = 0; i < length; i++)
|
||||||
|
{
|
||||||
|
var ret = await ReadAddrByte(endPoint, taskID, addr[i], timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"ReadAddrSeq failed at index {i}: {ret.Error}");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"ReadAddrSeq failed at index {i}: Read not successful");
|
||||||
|
return new(new Exception($"ReadAddrSeq failed at index {i}"));
|
||||||
|
}
|
||||||
|
var data = ret.Value.Options.Data;
|
||||||
|
if (data is null)
|
||||||
|
{
|
||||||
|
logger.Error($"ReadAddrSeq got null data at index {i}");
|
||||||
|
return new(new Exception($"ReadAddrSeq got null data at index {i}"));
|
||||||
|
}
|
||||||
|
resultData.AddRange(data);
|
||||||
|
}
|
||||||
|
return resultData.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 向设备地址写入32位数据
|
/// 向设备地址写入32位数据
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -539,35 +587,42 @@ public class UDPClientPool
|
|||||||
/// <param name="devAddr">设备地址</param>
|
/// <param name="devAddr">设备地址</param>
|
||||||
/// <param name="data">要写入的32位数据</param>
|
/// <param name="data">要写入的32位数据</param>
|
||||||
/// <param name="timeout">超时时间(毫秒)</param>
|
/// <param name="timeout">超时时间(毫秒)</param>
|
||||||
|
/// <param name="progressId">进度报告器</param>
|
||||||
/// <returns>写入结果,true表示写入成功</returns>
|
/// <returns>写入结果,true表示写入成功</returns>
|
||||||
public static async ValueTask<Result<bool>> WriteAddr(
|
public static async ValueTask<Result<bool>> WriteAddr(
|
||||||
IPEndPoint endPoint, int taskID, UInt32 devAddr, UInt32 data, int timeout = 1000)
|
IPEndPoint endPoint, int taskID, UInt32 devAddr,
|
||||||
|
UInt32 data, int timeout = 1000, string progressId = "")
|
||||||
{
|
{
|
||||||
var ret = false;
|
var ret = false;
|
||||||
var opts = new SendAddrPackOptions();
|
var opts = new SendAddrPackOptions()
|
||||||
|
{
|
||||||
|
BurstType = BurstType.FixedBurst,
|
||||||
|
BurstLength = 0,
|
||||||
|
CommandID = Convert.ToByte(taskID),
|
||||||
|
Address = devAddr,
|
||||||
|
IsWrite = true,
|
||||||
|
};
|
||||||
|
_progressTracker.AdvanceProgress(progressId, 10);
|
||||||
|
|
||||||
opts.BurstType = BurstType.FixedBurst;
|
// Write Register
|
||||||
opts.BurstLength = 0;
|
|
||||||
opts.CommandID = Convert.ToByte(taskID);
|
|
||||||
opts.Address = devAddr;
|
|
||||||
|
|
||||||
// Write Jtag State Register
|
|
||||||
opts.IsWrite = true;
|
|
||||||
ret = await UDPClientPool.SendAddrPackAsync(endPoint, new SendAddrPackage(opts));
|
ret = await UDPClientPool.SendAddrPackAsync(endPoint, new SendAddrPackage(opts));
|
||||||
if (!ret) return new(new Exception("Send 1st address package failed!"));
|
if (!ret) return new(new Exception("Send 1st address package failed!"));
|
||||||
|
_progressTracker.AdvanceProgress(progressId, 10);
|
||||||
|
|
||||||
// Send Data Package
|
// Send Data Package
|
||||||
ret = await UDPClientPool.SendDataPackAsync(endPoint,
|
ret = await UDPClientPool.SendDataPackAsync(endPoint,
|
||||||
new SendDataPackage(Common.Number.NumberToBytes(data, 4).Value));
|
new SendDataPackage(Common.Number.NumberToBytes(data, 4).Value));
|
||||||
if (!ret) return new(new Exception("Send data package failed!"));
|
if (!ret) return new(new Exception("Send data package failed!"));
|
||||||
|
_progressTracker.AdvanceProgress(progressId, 10);
|
||||||
|
|
||||||
// Check Msg Bus
|
// Check Msg Bus
|
||||||
if (!MsgBus.IsRunning)
|
if (!MsgBus.IsRunning)
|
||||||
return new(new Exception("Message bus not working!"));
|
return new(new Exception("Message bus not working!"));
|
||||||
|
|
||||||
// Wait for Write Ack
|
// Wait for Write Ack
|
||||||
var udpWriteAck = await MsgBus.UDPServer.WaitForAckAsync(
|
var udpWriteAck = await MsgBus.UDPServer.WaitForAckAsync(endPoint, taskID, timeout);
|
||||||
endPoint.Address.ToString(), taskID, endPoint.Port, timeout);
|
|
||||||
if (!udpWriteAck.IsSuccessful) return new(udpWriteAck.Error);
|
if (!udpWriteAck.IsSuccessful) return new(udpWriteAck.Error);
|
||||||
|
_progressTracker.AdvanceProgress(progressId, 10);
|
||||||
|
|
||||||
return udpWriteAck.Value.IsSuccessful;
|
return udpWriteAck.Value.IsSuccessful;
|
||||||
}
|
}
|
||||||
@@ -580,34 +635,39 @@ public class UDPClientPool
|
|||||||
/// <param name="devAddr">设备地址</param>
|
/// <param name="devAddr">设备地址</param>
|
||||||
/// <param name="dataArray">要写入的字节数组</param>
|
/// <param name="dataArray">要写入的字节数组</param>
|
||||||
/// <param name="timeout">超时时间(毫秒)</param>
|
/// <param name="timeout">超时时间(毫秒)</param>
|
||||||
|
/// <param name="progressId">进度报告器</param>
|
||||||
/// <returns>写入结果,true表示写入成功</returns>
|
/// <returns>写入结果,true表示写入成功</returns>
|
||||||
public static async ValueTask<Result<bool>> WriteAddr(
|
public static async ValueTask<Result<bool>> WriteAddr(
|
||||||
IPEndPoint endPoint, int taskID, UInt32 devAddr, byte[] dataArray, int timeout = 1000)
|
IPEndPoint endPoint, int taskID, UInt32 devAddr,
|
||||||
|
byte[] dataArray, int timeout = 1000, string progressId = "")
|
||||||
{
|
{
|
||||||
var ret = false;
|
var ret = false;
|
||||||
var opts = new SendAddrPackOptions();
|
var opts = new SendAddrPackOptions()
|
||||||
|
{
|
||||||
|
BurstType = BurstType.FixedBurst,
|
||||||
|
CommandID = Convert.ToByte(taskID),
|
||||||
|
Address = devAddr,
|
||||||
|
BurstLength = 0,
|
||||||
|
IsWrite = true,
|
||||||
|
};
|
||||||
|
|
||||||
|
var max4BytesPerRead = 128; // 1024 bytes per read
|
||||||
opts.BurstType = BurstType.FixedBurst;
|
|
||||||
opts.CommandID = Convert.ToByte(taskID);
|
|
||||||
opts.Address = devAddr;
|
|
||||||
|
|
||||||
// Check Msg Bus
|
// Check Msg Bus
|
||||||
if (!MsgBus.IsRunning)
|
if (!MsgBus.IsRunning)
|
||||||
return new(new Exception("Message bus not working!"));
|
return new(new Exception("Message bus not working!"));
|
||||||
|
|
||||||
opts.IsWrite = true;
|
var hasRest = dataArray.Length % (max4BytesPerRead * (32 / 8)) != 0;
|
||||||
var hasRest = dataArray.Length % (256 * (32 / 8)) != 0;
|
|
||||||
var writeTimes = hasRest ?
|
var writeTimes = hasRest ?
|
||||||
dataArray.Length / (256 * (32 / 8)) + 1 :
|
dataArray.Length / (max4BytesPerRead * (32 / 8)) + 1 :
|
||||||
dataArray.Length / (256 * (32 / 8));
|
dataArray.Length / (max4BytesPerRead * (32 / 8));
|
||||||
for (var i = 0; i < writeTimes; i++)
|
for (var i = 0; i < writeTimes; i++)
|
||||||
{
|
{
|
||||||
// Sperate Data Array
|
// Sperate Data Array
|
||||||
var isLastData = i == writeTimes - 1;
|
var isLastData = i == writeTimes - 1;
|
||||||
var sendDataArray = isLastData ?
|
var sendDataArray = isLastData ?
|
||||||
dataArray[(i * (256 * (32 / 8)))..] :
|
dataArray[(i * (max4BytesPerRead * (32 / 8)))..] :
|
||||||
dataArray[(i * (256 * (32 / 8)))..((i + 1) * (256 * (32 / 8)))];
|
dataArray[(i * (max4BytesPerRead * (32 / 8)))..((i + 1) * (max4BytesPerRead * (32 / 8)))];
|
||||||
|
|
||||||
// Calculate BurstLength
|
// Calculate BurstLength
|
||||||
opts.BurstLength = ((byte)(
|
opts.BurstLength = ((byte)(
|
||||||
@@ -624,11 +684,49 @@ public class UDPClientPool
|
|||||||
if (!ret) return new(new Exception("Send data package failed!"));
|
if (!ret) return new(new Exception("Send data package failed!"));
|
||||||
|
|
||||||
// Wait for Write Ack
|
// Wait for Write Ack
|
||||||
var udpWriteAck = await MsgBus.UDPServer.WaitForAckAsync(endPoint.Address.ToString(), taskID, endPoint.Port, timeout);
|
var udpWriteAck = await MsgBus.UDPServer.WaitForAckAsync(endPoint, taskID, timeout);
|
||||||
if (!udpWriteAck.IsSuccessful) return new(udpWriteAck.Error);
|
if (!udpWriteAck.IsSuccessful) return new(udpWriteAck.Error);
|
||||||
|
|
||||||
if (!udpWriteAck.Value.IsSuccessful)
|
if (!udpWriteAck.Value.IsSuccessful)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
_progressTracker.AdvanceProgress(progressId, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// [TODO:description]
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="endPoint">[TODO:parameter]</param>
|
||||||
|
/// <param name="taskID">[TODO:parameter]</param>
|
||||||
|
/// <param name="addr">[TODO:parameter]</param>
|
||||||
|
/// <param name="data">[TODO:parameter]</param>
|
||||||
|
/// <param name="timeout">[TODO:parameter]</param>
|
||||||
|
/// <returns>[TODO:return]</returns>
|
||||||
|
public static async ValueTask<Result<bool>> WriteAddrSeq(IPEndPoint endPoint, int taskID, UInt32[] addr, byte[] data, int timeout = 1000)
|
||||||
|
{
|
||||||
|
var length = addr.Length;
|
||||||
|
if (length != data.Length)
|
||||||
|
{
|
||||||
|
logger.Error($"TODO");
|
||||||
|
return new(new ArgumentException($"TODO"));
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < length; i++)
|
||||||
|
{
|
||||||
|
var ret = await WriteAddr(endPoint, taskID, addr[i], (UInt32)data[i], timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"TODO");
|
||||||
|
return new(ret.Error);
|
||||||
|
}
|
||||||
|
if (!ret.Value)
|
||||||
|
{
|
||||||
|
logger.Error($"TODO");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -4,7 +4,9 @@ using System.Net.NetworkInformation; // 添加这个引用
|
|||||||
using System.Net.Sockets;
|
using System.Net.Sockets;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
using Common;
|
||||||
using DotNext;
|
using DotNext;
|
||||||
|
using DotNext.Threading;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using WebProtocol;
|
using WebProtocol;
|
||||||
|
|
||||||
@@ -16,6 +18,10 @@ public class UDPData
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public required DateTime DateTime { get; set; }
|
public required DateTime DateTime { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
/// 数据包时间戳
|
||||||
|
/// </summary>
|
||||||
|
public required UInt32 Timestamp { get; set; }
|
||||||
|
/// <summary>
|
||||||
/// 发送来源的IP地址
|
/// 发送来源的IP地址
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public required string Address { get; set; }
|
public required string Address { get; set; }
|
||||||
@@ -48,6 +54,7 @@ public class UDPData
|
|||||||
return new UDPData()
|
return new UDPData()
|
||||||
{
|
{
|
||||||
DateTime = this.DateTime,
|
DateTime = this.DateTime,
|
||||||
|
Timestamp = this.Timestamp,
|
||||||
Address = new string(this.Address),
|
Address = new string(this.Address),
|
||||||
Port = this.Port,
|
Port = this.Port,
|
||||||
TaskID = this.TaskID,
|
TaskID = this.TaskID,
|
||||||
@@ -69,24 +76,26 @@ public class UDPData
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// UDP 服务器
|
/// UDP 服务器
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class UDPServer : IDisposable
|
public class UDPServer
|
||||||
{
|
{
|
||||||
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
private ConcurrentDictionary<string, SortedList<DateTime, UDPData>> udpData = new ConcurrentDictionary<string, SortedList<DateTime, UDPData>>();
|
private ConcurrentDictionary<string, SortedList<UInt32, UDPData>> udpData
|
||||||
private readonly ReaderWriterLockSlim udpDataLock = new ReaderWriterLockSlim();
|
= new ConcurrentDictionary<string, SortedList<UInt32, UDPData>>();
|
||||||
|
private readonly AsyncReaderWriterLock udpDataLock = new AsyncReaderWriterLock();
|
||||||
|
|
||||||
private int listenPort;
|
private int listenPort;
|
||||||
private List<UdpClient> listeners = new List<UdpClient>();
|
private List<UdpClient> listeners = new List<UdpClient>();
|
||||||
|
private List<Task> tasks = new List<Task>();
|
||||||
private IPEndPoint groupEP;
|
private IPEndPoint groupEP;
|
||||||
|
|
||||||
private bool isRunning = false;
|
private CancellationTokenSource? cancellationTokenSource;
|
||||||
private bool disposed = false;
|
private bool disposed = false;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 是否正在工作
|
/// 是否正在工作
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool IsRunning { get { return isRunning; } }
|
public bool IsRunning => cancellationTokenSource?.Token.IsCancellationRequested == false;
|
||||||
|
|
||||||
/// <summary> UDP 服务器的错误代码 </summary>
|
/// <summary> UDP 服务器的错误代码 </summary>
|
||||||
public enum ErrorCode
|
public enum ErrorCode
|
||||||
@@ -115,7 +124,15 @@ public class UDPServer : IDisposable
|
|||||||
{
|
{
|
||||||
for (int i = 0; i < num; i++)
|
for (int i = 0; i < num; i++)
|
||||||
{
|
{
|
||||||
listeners.Add(new UdpClient(this.listenPort + i));
|
int currentPort = this.listenPort + i;
|
||||||
|
if (IsPortInUse(currentPort))
|
||||||
|
{
|
||||||
|
throw new ArgumentException(
|
||||||
|
$"端口{currentPort}已被占用,无法启动UDP Server",
|
||||||
|
nameof(port)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
listeners.Add(new UdpClient(currentPort));
|
||||||
}
|
}
|
||||||
this.groupEP = new IPEndPoint(IPAddress.Any, listenPort);
|
this.groupEP = new IPEndPoint(IPAddress.Any, listenPort);
|
||||||
}
|
}
|
||||||
@@ -129,6 +146,29 @@ public class UDPServer : IDisposable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private bool IsPortInUse(int port)
|
||||||
|
{
|
||||||
|
bool inUse = false;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var ipGlobalProperties = IPGlobalProperties.GetIPGlobalProperties();
|
||||||
|
var udpListeners = ipGlobalProperties.GetActiveUdpListeners();
|
||||||
|
foreach (var ep in udpListeners)
|
||||||
|
{
|
||||||
|
if (ep.Port == port)
|
||||||
|
{
|
||||||
|
inUse = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Warn($"Failed to check port usage for port {port}: {ex.Message}");
|
||||||
|
}
|
||||||
|
return inUse;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 异步寻找目标发送的内容
|
/// 异步寻找目标发送的内容
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -150,19 +190,21 @@ public class UDPServer : IDisposable
|
|||||||
)
|
)
|
||||||
{
|
{
|
||||||
UDPData? data = null;
|
UDPData? data = null;
|
||||||
|
var key = $"{ipAddr}-{taskID}";
|
||||||
|
|
||||||
var startTime = DateTime.Now;
|
var startTime = DateTime.Now;
|
||||||
var isTimeout = false;
|
var isTimeout = false;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
while (!isTimeout)
|
while (!isTimeout)
|
||||||
{
|
{
|
||||||
var elapsed = DateTime.Now - startTime;
|
var elapsed = DateTime.Now - startTime;
|
||||||
isTimeout = elapsed >= TimeSpan.FromMilliseconds(timeout);
|
isTimeout = elapsed >= TimeSpan.FromMilliseconds(timeout);
|
||||||
if (isTimeout) break;
|
if (isTimeout) break;
|
||||||
|
|
||||||
udpDataLock.EnterWriteLock();
|
using (await udpDataLock.AcquireWriteLockAsync(TimeSpan.FromMilliseconds(timeout)))
|
||||||
try
|
|
||||||
{
|
{
|
||||||
var key = $"{ipAddr}-{taskID}";
|
|
||||||
if (udpData.TryGetValue(key, out var sortedList) && sortedList.Count > 0)
|
if (udpData.TryGetValue(key, out var sortedList) && sortedList.Count > 0)
|
||||||
{
|
{
|
||||||
// 获取最早的数据(第一个元素)
|
// 获取最早的数据(第一个元素)
|
||||||
@@ -172,23 +214,17 @@ public class UDPServer : IDisposable
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
finally
|
|
||||||
{
|
|
||||||
udpDataLock.ExitWriteLock();
|
|
||||||
}
|
|
||||||
|
|
||||||
await Task.Delay(cycle);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data is null)
|
if (data is null)
|
||||||
|
throw new TimeoutException("Get nothing even after time out");
|
||||||
|
else return new(data.DeepClone());
|
||||||
|
}
|
||||||
|
catch
|
||||||
{
|
{
|
||||||
logger.Trace("Get nothing even after time out");
|
logger.Trace("Get nothing even after time out");
|
||||||
return new(null);
|
return new(null);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
return new(data.DeepClone());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -201,6 +237,8 @@ public class UDPServer : IDisposable
|
|||||||
public async ValueTask<Optional<List<UDPData>>> FindDataArrayAsync(string ipAddr, int taskID, int timeout = 1000)
|
public async ValueTask<Optional<List<UDPData>>> FindDataArrayAsync(string ipAddr, int taskID, int timeout = 1000)
|
||||||
{
|
{
|
||||||
List<UDPData>? data = null;
|
List<UDPData>? data = null;
|
||||||
|
var key = $"{ipAddr}-{taskID}";
|
||||||
|
|
||||||
|
|
||||||
var startTime = DateTime.Now;
|
var startTime = DateTime.Now;
|
||||||
var isTimeout = false;
|
var isTimeout = false;
|
||||||
@@ -210,10 +248,10 @@ public class UDPServer : IDisposable
|
|||||||
isTimeout = elapsed >= TimeSpan.FromMilliseconds(timeout);
|
isTimeout = elapsed >= TimeSpan.FromMilliseconds(timeout);
|
||||||
if (isTimeout) break;
|
if (isTimeout) break;
|
||||||
|
|
||||||
udpDataLock.EnterWriteLock();
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var key = $"{ipAddr}-{taskID}";
|
using (await udpDataLock.AcquireWriteLockAsync(TimeSpan.FromMilliseconds(timeout)))
|
||||||
|
{
|
||||||
if (udpData.TryGetValue(key, out var sortedList) && sortedList.Count > 0)
|
if (udpData.TryGetValue(key, out var sortedList) && sortedList.Count > 0)
|
||||||
{
|
{
|
||||||
data = new List<UDPData>(sortedList.Values);
|
data = new List<UDPData>(sortedList.Values);
|
||||||
@@ -223,9 +261,11 @@ public class UDPServer : IDisposable
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
finally
|
}
|
||||||
|
catch
|
||||||
{
|
{
|
||||||
udpDataLock.ExitWriteLock();
|
logger.Trace("Get nothing even after time out");
|
||||||
|
return new(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -251,28 +291,21 @@ public class UDPServer : IDisposable
|
|||||||
{
|
{
|
||||||
List<UDPData>? data = null;
|
List<UDPData>? data = null;
|
||||||
|
|
||||||
var startTime = DateTime.Now;
|
|
||||||
var isTimeout = false;
|
|
||||||
while (!isTimeout)
|
|
||||||
{
|
|
||||||
var elapsed = DateTime.Now - startTime;
|
|
||||||
isTimeout = elapsed >= TimeSpan.FromMilliseconds(timeout);
|
|
||||||
if (isTimeout) break;
|
|
||||||
|
|
||||||
udpDataLock.EnterReadLock();
|
|
||||||
try
|
try
|
||||||
|
{
|
||||||
|
using (await udpDataLock.AcquireReadLockAsync(TimeSpan.FromMilliseconds(timeout)))
|
||||||
{
|
{
|
||||||
var key = $"{ipAddr}-{taskID}";
|
var key = $"{ipAddr}-{taskID}";
|
||||||
if (udpData.TryGetValue(key, out var sortedList) && sortedList.Count > 0)
|
if (udpData.TryGetValue(key, out var sortedList) && sortedList.Count > 0)
|
||||||
{
|
{
|
||||||
data = new List<UDPData>(sortedList.Values);
|
data = new List<UDPData>(sortedList.Values);
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
finally
|
}
|
||||||
|
catch (TimeoutException)
|
||||||
{
|
{
|
||||||
udpDataLock.ExitReadLock();
|
logger.Trace("Failed to acquire read lock within timeout");
|
||||||
}
|
return new(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data is null)
|
if (data is null)
|
||||||
@@ -297,28 +330,21 @@ public class UDPServer : IDisposable
|
|||||||
{
|
{
|
||||||
int? count = null;
|
int? count = null;
|
||||||
|
|
||||||
var startTime = DateTime.Now;
|
|
||||||
var isTimeout = false;
|
|
||||||
while (!isTimeout)
|
|
||||||
{
|
|
||||||
var elapsed = DateTime.Now - startTime;
|
|
||||||
isTimeout = elapsed >= TimeSpan.FromMilliseconds(timeout);
|
|
||||||
if (isTimeout) break;
|
|
||||||
|
|
||||||
udpDataLock.EnterReadLock();
|
|
||||||
try
|
try
|
||||||
|
{
|
||||||
|
using (await udpDataLock.AcquireReadLockAsync(TimeSpan.FromMilliseconds(timeout)))
|
||||||
{
|
{
|
||||||
var key = $"{ipAddr}-{taskID}";
|
var key = $"{ipAddr}-{taskID}";
|
||||||
if (udpData.TryGetValue(key, out var sortedList))
|
if (udpData.TryGetValue(key, out var sortedList))
|
||||||
{
|
{
|
||||||
count = sortedList.Count;
|
count = sortedList.Count;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
finally
|
}
|
||||||
|
catch (TimeoutException)
|
||||||
{
|
{
|
||||||
udpDataLock.ExitReadLock();
|
logger.Trace("Failed to acquire read lock within timeout");
|
||||||
}
|
return Optional<int>.None;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (count is null)
|
if (count is null)
|
||||||
@@ -335,17 +361,22 @@ public class UDPServer : IDisposable
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 异步等待写响应
|
/// 异步等待写响应
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="address">IP地址</param>
|
/// <param name="endPoint">IP地址及端口</param>
|
||||||
/// <param name="taskID">[TODO:parameter]</param>
|
/// <param name="taskID">[TODO:parameter]</param>
|
||||||
/// <param name="port">UDP 端口</param>
|
|
||||||
/// <param name="timeout">超时时间范围</param>
|
/// <param name="timeout">超时时间范围</param>
|
||||||
/// <returns>接收响应包</returns>
|
/// <returns>接收响应包</returns>
|
||||||
public async ValueTask<Result<WebProtocol.RecvRespPackage>> WaitForAckAsync
|
public async ValueTask<Result<WebProtocol.RecvRespPackage>> WaitForAckAsync
|
||||||
(string address, int taskID, int port = -1, int timeout = 1000)
|
(IPEndPoint endPoint, int taskID, int timeout = 1000)
|
||||||
{
|
{
|
||||||
|
var address = endPoint.Address.ToString();
|
||||||
|
var port = endPoint.Port;
|
||||||
|
|
||||||
var data = await FindDataAsync(address, taskID, timeout);
|
var data = await FindDataAsync(address, taskID, timeout);
|
||||||
if (!data.HasValue)
|
if (!data.HasValue)
|
||||||
|
{
|
||||||
|
await UDPClientPool.SendResetSignal(endPoint);
|
||||||
return new(new Exception("Get None even after time out!"));
|
return new(new Exception("Get None even after time out!"));
|
||||||
|
}
|
||||||
|
|
||||||
var recvData = data.Value;
|
var recvData = data.Value;
|
||||||
if (recvData.Address != address || (port > 0 && recvData.Port != port))
|
if (recvData.Address != address || (port > 0 && recvData.Port != port))
|
||||||
@@ -361,17 +392,22 @@ public class UDPServer : IDisposable
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 异步等待数据
|
/// 异步等待数据
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="address">IP地址</param>
|
/// <param name="endPoint">IP地址</param>
|
||||||
/// <param name="taskID">[TODO:parameter]</param>
|
/// <param name="taskID">任务ID</param>
|
||||||
/// <param name="port">UDP 端口</param>
|
|
||||||
/// <param name="timeout">超时时间范围</param>
|
/// <param name="timeout">超时时间范围</param>
|
||||||
/// <returns>接收数据包</returns>
|
/// <returns>接收数据包</returns>
|
||||||
public async ValueTask<Result<RecvDataPackage>> WaitForDataAsync
|
public async ValueTask<Result<RecvDataPackage>> WaitForDataAsync
|
||||||
(string address, int taskID, int port = -1, int timeout = 1000)
|
(IPEndPoint endPoint, int taskID, int timeout = 1000)
|
||||||
{
|
{
|
||||||
|
var address = endPoint.Address.ToString();
|
||||||
|
var port = endPoint.Port;
|
||||||
|
|
||||||
var data = await FindDataAsync(address, taskID, timeout);
|
var data = await FindDataAsync(address, taskID, timeout);
|
||||||
if (!data.HasValue)
|
if (!data.HasValue)
|
||||||
|
{
|
||||||
|
await UDPClientPool.SendResetSignal(endPoint);
|
||||||
return new(new Exception("Get None even after time out!"));
|
return new(new Exception("Get None even after time out!"));
|
||||||
|
}
|
||||||
|
|
||||||
var recvData = data.Value;
|
var recvData = data.Value;
|
||||||
if (recvData.Address != address || (port >= 0 && recvData.Port != port))
|
if (recvData.Address != address || (port >= 0 && recvData.Port != port))
|
||||||
@@ -387,7 +423,7 @@ public class UDPServer : IDisposable
|
|||||||
private async Task ReceiveHandler(byte[] data, IPEndPoint endPoint, DateTime time)
|
private async Task ReceiveHandler(byte[] data, IPEndPoint endPoint, DateTime time)
|
||||||
{
|
{
|
||||||
// 异步锁保护 udpData
|
// 异步锁保护 udpData
|
||||||
await Task.Run(() =>
|
await Task.Run(async () =>
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -399,7 +435,7 @@ public class UDPServer : IDisposable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var udpDataObj = RecordUDPData(data, endPoint, time, Convert.ToInt32(data[1]));
|
var udpDataObj = await RecordUDPData(data, endPoint, time, Convert.ToInt32(data[1 + 4]));
|
||||||
// PrintData(udpDataObj);
|
// PrintData(udpDataObj);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
@@ -409,44 +445,47 @@ public class UDPServer : IDisposable
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private UDPData RecordUDPData(byte[] bytes, IPEndPoint remoteEP, DateTime time, int taskID)
|
private async Task<UDPData> RecordUDPData(byte[] bytes, IPEndPoint remoteEP, DateTime time, int taskID)
|
||||||
{
|
{
|
||||||
var remoteAddress = remoteEP.Address.ToString();
|
var remoteAddress = remoteEP.Address.ToString();
|
||||||
var remotePort = remoteEP.Port;
|
var remotePort = remoteEP.Port;
|
||||||
var data = new UDPData()
|
var data = new UDPData()
|
||||||
{
|
{
|
||||||
|
DateTime = time,
|
||||||
|
Timestamp = Number.BytesToUInt32(bytes[..4]).Value,
|
||||||
Address = remoteAddress,
|
Address = remoteAddress,
|
||||||
Port = remotePort,
|
Port = remotePort,
|
||||||
TaskID = taskID,
|
TaskID = taskID,
|
||||||
Data = bytes,
|
Data = bytes,
|
||||||
DateTime = time,
|
|
||||||
HasRead = false,
|
HasRead = false,
|
||||||
};
|
};
|
||||||
|
|
||||||
udpDataLock.EnterWriteLock();
|
var key = $"{remoteAddress}-{taskID}";
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var key = $"{remoteAddress}-{taskID}";
|
using (await udpDataLock.AcquireWriteLockAsync(TimeSpan.FromMilliseconds(5000)))
|
||||||
var sortedList = udpData.GetOrAdd(key, _ => new SortedList<DateTime, UDPData>());
|
{
|
||||||
|
var sortedList = udpData.GetOrAdd(key, _ => new SortedList<UInt32, UDPData>());
|
||||||
|
|
||||||
// 处理相同时间戳的情况,添加微小的时间差
|
// 处理相同时间戳的情况,添加微小的时间差
|
||||||
var uniqueTime = time;
|
var uniqueTime = data.Timestamp;
|
||||||
while (sortedList.ContainsKey(uniqueTime))
|
while (sortedList.ContainsKey(uniqueTime))
|
||||||
{
|
{
|
||||||
logger.Warn(
|
logger.Warn(
|
||||||
$"Duplicate timestamp detected for {remoteAddress}:{remotePort} at {uniqueTime}.");
|
$"Duplicate timestamp detected for {remoteAddress}:{remotePort} at {uniqueTime}.");
|
||||||
uniqueTime = uniqueTime.AddTicks(1);
|
uniqueTime += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
sortedList.Add(uniqueTime, data);
|
sortedList.Add(uniqueTime, data);
|
||||||
// 输出单个数据
|
// 输出单个数据
|
||||||
PrintData(data);
|
// PrintData(data);
|
||||||
// 输出全部数据
|
|
||||||
// PrintAllData();
|
|
||||||
}
|
}
|
||||||
finally
|
}
|
||||||
|
catch (TimeoutException)
|
||||||
{
|
{
|
||||||
udpDataLock.ExitWriteLock();
|
logger.Error($"Failed to acquire write lock for recording UDP data from {remoteAddress}:{remotePort}");
|
||||||
|
throw;
|
||||||
}
|
}
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
@@ -459,18 +498,9 @@ public class UDPServer : IDisposable
|
|||||||
public string PrintData(UDPData data)
|
public string PrintData(UDPData data)
|
||||||
{
|
{
|
||||||
var bytes = data.Data;
|
var bytes = data.Data;
|
||||||
var sign = bytes[0];
|
var sign = bytes[4];
|
||||||
string recvData = "";
|
string recvData = "";
|
||||||
if (sign == (byte)WebProtocol.PackSign.SendAddr)
|
if (sign == (byte)WebProtocol.PackSign.RecvData)
|
||||||
{
|
|
||||||
var resData = WebProtocol.SendAddrPackage.FromBytes(bytes);
|
|
||||||
if (resData.IsSuccessful)
|
|
||||||
recvData = resData.Value.ToString();
|
|
||||||
else
|
|
||||||
recvData = resData.Error.ToString();
|
|
||||||
}
|
|
||||||
else if (sign == (byte)WebProtocol.PackSign.SendData) { }
|
|
||||||
else if (sign == (byte)WebProtocol.PackSign.RecvData)
|
|
||||||
{
|
{
|
||||||
var resData = WebProtocol.RecvDataPackage.FromBytes(bytes);
|
var resData = WebProtocol.RecvDataPackage.FromBytes(bytes);
|
||||||
if (resData.IsSuccessful)
|
if (resData.IsSuccessful)
|
||||||
@@ -491,7 +521,7 @@ public class UDPServer : IDisposable
|
|||||||
recvData = Encoding.ASCII.GetString(bytes, 0, bytes.Length);
|
recvData = Encoding.ASCII.GetString(bytes, 0, bytes.Length);
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.Debug($"Receive Data from {data.Address}:{data.Port} at {data.DateTime.ToString()}:");
|
logger.Debug($"Receive Data from {data.Address}:{data.Port} at {data.DateTime.ToString()} - {data.Timestamp}:");
|
||||||
logger.Debug($" Original Data : {BitConverter.ToString(bytes).Replace("-", " ")}");
|
logger.Debug($" Original Data : {BitConverter.ToString(bytes).Replace("-", " ")}");
|
||||||
if (recvData.Length != 0) logger.Debug($" Decoded Data : {recvData}");
|
if (recvData.Length != 0) logger.Debug($" Decoded Data : {recvData}");
|
||||||
return $@"
|
return $@"
|
||||||
@@ -518,12 +548,13 @@ public class UDPServer : IDisposable
|
|||||||
/// 将所有数据输出到log中
|
/// 将所有数据输出到log中
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns> void </returns>
|
/// <returns> void </returns>
|
||||||
public void PrintAllData()
|
public async Task PrintAllDataAsync()
|
||||||
{
|
{
|
||||||
logger.Debug("Ready Data:");
|
logger.Debug("Ready Data:");
|
||||||
|
|
||||||
udpDataLock.EnterReadLock();
|
|
||||||
try
|
try
|
||||||
|
{
|
||||||
|
using (await udpDataLock.AcquireReadLockAsync(TimeSpan.FromMilliseconds(5000)))
|
||||||
{
|
{
|
||||||
foreach (var kvp in udpData)
|
foreach (var kvp in udpData)
|
||||||
{
|
{
|
||||||
@@ -533,9 +564,10 @@ public class UDPServer : IDisposable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
finally
|
}
|
||||||
|
catch (TimeoutException)
|
||||||
{
|
{
|
||||||
udpDataLock.ExitReadLock();
|
logger.Error("Failed to acquire read lock for printing all data");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -548,256 +580,15 @@ public class UDPServer : IDisposable
|
|||||||
public void ClearUDPData(string ipAddr, int taskID)
|
public void ClearUDPData(string ipAddr, int taskID)
|
||||||
{
|
{
|
||||||
var key = $"{ipAddr}-{taskID}";
|
var key = $"{ipAddr}-{taskID}";
|
||||||
udpDataLock.EnterWriteLock();
|
|
||||||
try
|
using (udpDataLock.AcquireWriteLock())
|
||||||
{
|
{
|
||||||
if (udpData.TryGetValue(key, out var sortedList))
|
if (udpData.TryGetValue(key, out var sortedList))
|
||||||
{
|
{
|
||||||
sortedList.Clear();
|
sortedList.Clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
finally
|
|
||||||
{
|
|
||||||
udpDataLock.ExitWriteLock();
|
|
||||||
}
|
|
||||||
|
|
||||||
// 强制进行ARP刷新,防止后续传输时造成影响
|
|
||||||
FlushArpEntry(ipAddr);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 跨平台ARP缓存刷新
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="ipAddr">目标IP地址</param>
|
|
||||||
private void FlushArpEntry(string ipAddr)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// 验证IP地址格式
|
|
||||||
if (!IPAddress.TryParse(ipAddr, out var _))
|
|
||||||
{
|
|
||||||
logger.Warn($"Invalid IP address format: {ipAddr}");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 异步执行ARP刷新,避免阻塞主线程
|
|
||||||
Task.Run(() => ExecuteArpFlush(ipAddr));
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
logger.Error($"Error during ARP cache flush for {ipAddr}: {ex.Message}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 使用Ping类重新刷新ARP缓存
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="ipAddr">目标IP地址</param>
|
|
||||||
private async void RefreshArpWithPing(string ipAddr)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
using var ping = new Ping();
|
|
||||||
var options = new PingOptions
|
|
||||||
{
|
|
||||||
DontFragment = true,
|
|
||||||
Ttl = 32,
|
|
||||||
};
|
|
||||||
|
|
||||||
// 创建32字节的数据包
|
|
||||||
byte[] buffer = new byte[32];
|
|
||||||
for (int i = 0; i < buffer.Length; i++)
|
|
||||||
{
|
|
||||||
buffer[i] = (byte)(i % 256);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 异步发送ping,100ms超时
|
|
||||||
var reply = await ping.SendPingAsync(ipAddr, 100, buffer, options);
|
|
||||||
|
|
||||||
if (reply.Status == IPStatus.Success)
|
|
||||||
{
|
|
||||||
logger.Debug($"ARP cache refreshed successfully for {ipAddr} (RTT: {reply.RoundtripTime}ms)");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
logger.Warn($"Ping to {ipAddr} failed with status: {reply.Status}, but ARP entry should still be updated");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
logger.Error($"Error refreshing ARP with ping for {ipAddr}: {ex.Message}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 执行ARP刷新流程:先删除ARP条目,再用ping重新刷新
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="ipAddr">目标IP地址</param>
|
|
||||||
private async void ExecuteArpFlush(string ipAddr)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// 第一步:删除ARP条目
|
|
||||||
bool deleteSuccess = DeleteArpEntry(ipAddr);
|
|
||||||
|
|
||||||
if (deleteSuccess)
|
|
||||||
{
|
|
||||||
logger.Debug($"ARP entry deleted successfully for {ipAddr}");
|
|
||||||
|
|
||||||
// 第二步:使用Ping类重新刷新ARP缓存
|
|
||||||
RefreshArpWithPing(ipAddr);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
logger.Warn($"Failed to delete ARP entry for {ipAddr}, but continuing with ping refresh");
|
|
||||||
// 即使删除失败,也尝试ping刷新
|
|
||||||
RefreshArpWithPing(ipAddr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
logger.Error($"Failed to execute ARP flush for {ipAddr}: {ex.Message}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 删除ARP条目
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="ipAddr">目标IP地址</param>
|
|
||||||
/// <returns>是否成功删除</returns>
|
|
||||||
private bool DeleteArpEntry(string ipAddr)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
string command;
|
|
||||||
string arguments;
|
|
||||||
|
|
||||||
if (OperatingSystem.IsWindows())
|
|
||||||
{
|
|
||||||
// Windows: arp -d <ip>
|
|
||||||
command = "arp";
|
|
||||||
arguments = $"-d {ipAddr}";
|
|
||||||
}
|
|
||||||
else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS())
|
|
||||||
{
|
|
||||||
// Linux/macOS: 优先使用 ip 命令删除
|
|
||||||
if (IsCommandAvailable("ip"))
|
|
||||||
{
|
|
||||||
command = "ip";
|
|
||||||
arguments = $"neigh del {ipAddr}";
|
|
||||||
}
|
|
||||||
else if (IsCommandAvailable("arp"))
|
|
||||||
{
|
|
||||||
command = "arp";
|
|
||||||
arguments = $"-d {ipAddr}";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
logger.Warn("Neither 'ip' nor 'arp' command is available for ARP entry deletion");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
logger.Warn($"Unsupported operating system for ARP entry deletion");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ExecuteCommand(command, arguments, $"delete ARP entry for {ipAddr}");
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
logger.Error($"Error deleting ARP entry for {ipAddr}: {ex.Message}");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 检查系统命令是否可用
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="command">命令名称</param>
|
|
||||||
/// <returns>命令是否可用</returns>
|
|
||||||
private bool IsCommandAvailable(string command)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var process = new System.Diagnostics.Process
|
|
||||||
{
|
|
||||||
StartInfo = new System.Diagnostics.ProcessStartInfo
|
|
||||||
{
|
|
||||||
FileName = OperatingSystem.IsWindows() ? "where" : "which",
|
|
||||||
Arguments = command,
|
|
||||||
UseShellExecute = false,
|
|
||||||
RedirectStandardOutput = true,
|
|
||||||
CreateNoWindow = true
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
process.Start();
|
|
||||||
process.WaitForExit(1000); // 1秒超时
|
|
||||||
return process.ExitCode == 0;
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 执行系统命令
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="command">命令</param>
|
|
||||||
/// <param name="arguments">参数</param>
|
|
||||||
/// <param name="operation">操作描述</param>
|
|
||||||
/// <returns>是否成功执行</returns>
|
|
||||||
private bool ExecuteCommand(string command, string arguments, string operation)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var process = new System.Diagnostics.Process
|
|
||||||
{
|
|
||||||
StartInfo = new System.Diagnostics.ProcessStartInfo
|
|
||||||
{
|
|
||||||
FileName = command,
|
|
||||||
Arguments = arguments,
|
|
||||||
UseShellExecute = false,
|
|
||||||
RedirectStandardOutput = true,
|
|
||||||
RedirectStandardError = true,
|
|
||||||
CreateNoWindow = true
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
process.Start();
|
|
||||||
|
|
||||||
// 设置超时时间,避免进程挂起
|
|
||||||
if (process.WaitForExit(5000)) // 5秒超时
|
|
||||||
{
|
|
||||||
var output = process.StandardOutput.ReadToEnd();
|
|
||||||
var error = process.StandardError.ReadToEnd();
|
|
||||||
|
|
||||||
if (process.ExitCode == 0)
|
|
||||||
{
|
|
||||||
logger.Debug($"Command executed successfully: {operation}");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
logger.Warn($"Command failed: {operation}. Exit code: {process.ExitCode}, Error: {error}");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
process.Kill();
|
|
||||||
logger.Warn($"Command timed out: {operation}");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
logger.Error($"Failed to execute command for {operation}: {ex.Message}");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -806,33 +597,57 @@ public class UDPServer : IDisposable
|
|||||||
/// <returns>None</returns>
|
/// <returns>None</returns>
|
||||||
public void Start()
|
public void Start()
|
||||||
{
|
{
|
||||||
this.isRunning = true;
|
if (cancellationTokenSource != null && !cancellationTokenSource.Token.IsCancellationRequested)
|
||||||
|
{
|
||||||
|
logger.Warn("UDP Server is already running");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
cancellationTokenSource = new CancellationTokenSource();
|
||||||
|
var cancellationToken = cancellationTokenSource.Token;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
foreach (var client in listeners)
|
foreach (var client in listeners)
|
||||||
{
|
{
|
||||||
Task.Run(() =>
|
tasks.Add(Task.Run(async () =>
|
||||||
{
|
{
|
||||||
while (this.isRunning)
|
while (!cancellationToken.IsCancellationRequested)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var ep = new IPEndPoint(IPAddress.Any, listenPort);
|
// 使用 CancellationToken 来取消接收操作
|
||||||
var result = client.Receive(ref ep);
|
var result = await client.ReceiveAsync(cancellationToken);
|
||||||
_ = ReceiveHandler(result, ep, DateTime.Now);
|
_ = ReceiveHandler(result.Buffer, result.RemoteEndPoint, DateTime.Now);
|
||||||
|
}
|
||||||
|
catch (OperationCanceledException)
|
||||||
|
{
|
||||||
|
logger.Debug("UDP receive operation was cancelled");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
catch (ObjectDisposedException)
|
||||||
|
{
|
||||||
|
logger.Debug("UDP client was disposed");
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Console.WriteLine($"Error: {ex.Message}");
|
if (!cancellationToken.IsCancellationRequested)
|
||||||
|
{
|
||||||
|
logger.Error($"Error in UDP receive: {ex.Message}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
}, cancellationToken));
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.Info("UDP Server started successfully");
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
Console.WriteLine(e.ToString());
|
logger.Error($"Failed to start UDP server: {e}");
|
||||||
this.isRunning = false;
|
cancellationTokenSource?.Cancel();
|
||||||
|
throw;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -842,39 +657,71 @@ public class UDPServer : IDisposable
|
|||||||
/// <returns>None</returns>
|
/// <returns>None</returns>
|
||||||
public void Stop()
|
public void Stop()
|
||||||
{
|
{
|
||||||
foreach (var item in listeners)
|
if (cancellationTokenSource == null || cancellationTokenSource.Token.IsCancellationRequested)
|
||||||
{
|
{
|
||||||
item.Close();
|
logger.Warn("UDP Server is not running or already stopped");
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
this.isRunning = false;
|
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
logger.Info("Stopping UDP Server...");
|
||||||
|
|
||||||
|
// 取消所有操作
|
||||||
|
cancellationTokenSource.Cancel();
|
||||||
|
|
||||||
|
// 等待所有任务完成,设置超时时间
|
||||||
|
var waitTasks = Task.WhenAll(tasks);
|
||||||
|
if (!waitTasks.Wait(TimeSpan.FromSeconds(5)))
|
||||||
|
{
|
||||||
|
logger.Warn("Some tasks did not complete within timeout period");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 关闭所有UDP客户端
|
||||||
|
foreach (var client in listeners)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
client.Close();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Warn($"Error closing UDP client: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 清理任务列表
|
||||||
|
tasks.Clear();
|
||||||
|
|
||||||
|
logger.Info("UDP Server stopped successfully");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.Error($"Error stopping UDP server: {ex.Message}");
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
cancellationTokenSource?.Dispose();
|
||||||
|
cancellationTokenSource = null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 释放资源
|
/// 实现IDisposable接口,确保资源正确释放
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
|
||||||
Dispose(true);
|
|
||||||
GC.SuppressFinalize(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected virtual void Dispose(bool disposing)
|
|
||||||
{
|
{
|
||||||
if (!disposed)
|
if (!disposed)
|
||||||
{
|
|
||||||
if (disposing)
|
|
||||||
{
|
{
|
||||||
Stop();
|
Stop();
|
||||||
udpDataLock?.Dispose();
|
|
||||||
|
foreach (var client in listeners)
|
||||||
|
{
|
||||||
|
client?.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
udpDataLock?.Dispose();
|
||||||
disposed = true;
|
disposed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
~UDPServer()
|
|
||||||
{
|
|
||||||
Dispose(false);
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using Common;
|
||||||
using DotNext;
|
using DotNext;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
|
|
||||||
@@ -35,32 +36,32 @@ namespace WebProtocol
|
|||||||
/// 突发类型
|
/// 突发类型
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <example>0</example>
|
/// <example>0</example>
|
||||||
public BurstType BurstType { get; set; }
|
public required BurstType BurstType { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 任务ID
|
/// 任务ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <example>1</example>
|
/// <example>1</example>
|
||||||
public byte CommandID { get; set; }
|
public required byte CommandID { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 标识写入还是读取
|
/// 标识写入还是读取
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <example>true</example>
|
/// <example>true</example>
|
||||||
public bool IsWrite { get; set; }
|
public required bool IsWrite { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 突发长度:0是32bits,255是32bits x 256
|
/// 突发长度:0是32bits,255是32bits x 256
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <example>255</example>
|
/// <example>255</example>
|
||||||
public byte BurstLength { get; set; }
|
public required byte BurstLength { get; set; }
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 目标地址
|
/// 目标地址
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <example>0</example>
|
/// <example>0</example>
|
||||||
public UInt32 Address { get; set; }
|
public required UInt32 Address { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 转换为Json格式字符串
|
/// 转换为Json格式字符串
|
||||||
@@ -84,23 +85,29 @@ namespace WebProtocol
|
|||||||
WriteResp
|
WriteResp
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 时间戳
|
||||||
|
/// </summary>
|
||||||
|
/// <example>1234567</example>
|
||||||
|
public required UInt32 Timestamp { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 数据包类型
|
/// 数据包类型
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <example>0</example>
|
/// <example>0</example>
|
||||||
public PackType Type { get; set; }
|
public required PackType Type { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Task ID
|
/// Task ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <example>0</example>
|
/// <example>0</example>
|
||||||
public byte CommandID { get; set; }
|
public required byte CommandID { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Whether is succeed to finish command
|
/// Whether is succeed to finish command
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <example>true</example>
|
/// <example>true</example>
|
||||||
public bool IsSuccess { get; set; }
|
public required bool IsSuccess { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Return Data
|
/// Return Data
|
||||||
@@ -124,7 +131,7 @@ namespace WebProtocol
|
|||||||
readonly byte sign = (byte)PackSign.SendAddr;
|
readonly byte sign = (byte)PackSign.SendAddr;
|
||||||
readonly byte commandType;
|
readonly byte commandType;
|
||||||
readonly byte burstLength;
|
readonly byte burstLength;
|
||||||
readonly byte _reserved = 0;
|
readonly byte commandID;
|
||||||
readonly UInt32 address;
|
readonly UInt32 address;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -133,10 +140,10 @@ namespace WebProtocol
|
|||||||
/// <param name="opts"> 地址包选项 </param>
|
/// <param name="opts"> 地址包选项 </param>
|
||||||
public SendAddrPackage(SendAddrPackOptions opts)
|
public SendAddrPackage(SendAddrPackOptions opts)
|
||||||
{
|
{
|
||||||
byte byteBurstType = Convert.ToByte((byte)opts.BurstType << 6);
|
byte byteBurstType = Convert.ToByte((byte)opts.BurstType << 4);
|
||||||
byte byteCommandID = Convert.ToByte((opts.CommandID & 0x03) << 4);
|
|
||||||
byte byteIsWrite = (opts.IsWrite ? (byte)0x01 : (byte)0x00);
|
byte byteIsWrite = (opts.IsWrite ? (byte)0x01 : (byte)0x00);
|
||||||
this.commandType = Convert.ToByte(byteBurstType | byteCommandID | byteIsWrite);
|
this.commandType = Convert.ToByte(byteBurstType | byteIsWrite);
|
||||||
|
this.commandID = opts.CommandID;
|
||||||
this.burstLength = opts.BurstLength;
|
this.burstLength = opts.BurstLength;
|
||||||
this.address = opts.Address;
|
this.address = opts.Address;
|
||||||
}
|
}
|
||||||
@@ -151,10 +158,10 @@ namespace WebProtocol
|
|||||||
/// <param name="address"> 设备地址 </param>
|
/// <param name="address"> 设备地址 </param>
|
||||||
public SendAddrPackage(BurstType burstType, byte commandID, bool isWrite, byte burstLength, UInt32 address)
|
public SendAddrPackage(BurstType burstType, byte commandID, bool isWrite, byte burstLength, UInt32 address)
|
||||||
{
|
{
|
||||||
byte byteBurstType = Convert.ToByte((byte)burstType << 6);
|
byte byteBurstType = Convert.ToByte((byte)burstType << 4);
|
||||||
byte byteCommandID = Convert.ToByte((commandID & 0x03) << 4);
|
|
||||||
byte byteIsWrite = (isWrite ? (byte)0x01 : (byte)0x00);
|
byte byteIsWrite = (isWrite ? (byte)0x01 : (byte)0x00);
|
||||||
this.commandType = Convert.ToByte(byteBurstType | byteCommandID | byteIsWrite);
|
this.commandType = Convert.ToByte(byteBurstType | byteIsWrite);
|
||||||
|
this.commandID = commandID;
|
||||||
this.burstLength = burstLength;
|
this.burstLength = burstLength;
|
||||||
this.address = address;
|
this.address = address;
|
||||||
}
|
}
|
||||||
@@ -165,9 +172,10 @@ namespace WebProtocol
|
|||||||
/// <param name="commandType">二进制命令类型</param>
|
/// <param name="commandType">二进制命令类型</param>
|
||||||
/// <param name="burstLength">突发长度</param>
|
/// <param name="burstLength">突发长度</param>
|
||||||
/// <param name="address">写入或读取的地址</param>
|
/// <param name="address">写入或读取的地址</param>
|
||||||
public SendAddrPackage(byte commandType, byte burstLength, UInt32 address)
|
public SendAddrPackage(byte commandType, byte burstLength, byte commandID, UInt32 address)
|
||||||
{
|
{
|
||||||
this.commandType = commandType;
|
this.commandType = commandType;
|
||||||
|
this.commandID = commandID;
|
||||||
this.burstLength = burstLength;
|
this.burstLength = burstLength;
|
||||||
this.address = address;
|
this.address = address;
|
||||||
}
|
}
|
||||||
@@ -183,8 +191,8 @@ namespace WebProtocol
|
|||||||
{
|
{
|
||||||
Address = this.address,
|
Address = this.address,
|
||||||
BurstLength = this.burstLength,
|
BurstLength = this.burstLength,
|
||||||
BurstType = (BurstType)(this.commandType >> 6),
|
BurstType = (BurstType)(this.commandType >> 4),
|
||||||
CommandID = Convert.ToByte((this.commandType >> 4) & 0b11),
|
CommandID = this.commandID,
|
||||||
IsWrite = Convert.ToBoolean(this.commandType & 1)
|
IsWrite = Convert.ToBoolean(this.commandType & 1)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -200,7 +208,7 @@ namespace WebProtocol
|
|||||||
arr[0] = sign;
|
arr[0] = sign;
|
||||||
arr[1] = commandType;
|
arr[1] = commandType;
|
||||||
arr[2] = burstLength;
|
arr[2] = burstLength;
|
||||||
arr[3] = _reserved;
|
arr[3] = commandID;
|
||||||
|
|
||||||
var bytesAddr = Common.Number.NumberToBytes(address, 4).Value;
|
var bytesAddr = Common.Number.NumberToBytes(address, 4).Value;
|
||||||
Array.Copy(bytesAddr, 0, arr, 4, bytesAddr.Length);
|
Array.Copy(bytesAddr, 0, arr, 4, bytesAddr.Length);
|
||||||
@@ -214,12 +222,14 @@ namespace WebProtocol
|
|||||||
/// <returns> 字符串 </returns>
|
/// <returns> 字符串 </returns>
|
||||||
public override string ToString()
|
public override string ToString()
|
||||||
{
|
{
|
||||||
var opts = new SendAddrPackOptions();
|
var opts = new SendAddrPackOptions()
|
||||||
opts.BurstType = (BurstType)(commandType >> 6);
|
{
|
||||||
opts.CommandID = Convert.ToByte((commandType >> 4) & 0b0011);
|
BurstType = (BurstType)(commandType >> 4),
|
||||||
opts.IsWrite = Convert.ToBoolean(commandType & 0x01);
|
CommandID = this.commandID,
|
||||||
opts.BurstLength = burstLength;
|
IsWrite = Convert.ToBoolean(commandType & 0x01),
|
||||||
opts.Address = address;
|
BurstLength = burstLength,
|
||||||
|
Address = address,
|
||||||
|
};
|
||||||
|
|
||||||
return JsonConvert.SerializeObject(opts);
|
return JsonConvert.SerializeObject(opts);
|
||||||
}
|
}
|
||||||
@@ -249,7 +259,7 @@ namespace WebProtocol
|
|||||||
}
|
}
|
||||||
|
|
||||||
var address = Common.Number.BytesToUInt64(bytes[4..]).Value;
|
var address = Common.Number.BytesToUInt64(bytes[4..]).Value;
|
||||||
return new SendAddrPackage(bytes[1], bytes[2], Convert.ToUInt32(address));
|
return new SendAddrPackage(bytes[1], bytes[2], bytes[3], Convert.ToUInt32(address));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -297,8 +307,9 @@ namespace WebProtocol
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary> FPGA->Server 读响应包 </summary>
|
/// <summary> FPGA->Server 读响应包 </summary>
|
||||||
public struct RecvDataPackage
|
public class RecvDataPackage
|
||||||
{
|
{
|
||||||
|
readonly UInt32 timestamp;
|
||||||
readonly byte sign = (byte)PackSign.RecvData;
|
readonly byte sign = (byte)PackSign.RecvData;
|
||||||
readonly byte commandID;
|
readonly byte commandID;
|
||||||
readonly byte resp;
|
readonly byte resp;
|
||||||
@@ -309,11 +320,13 @@ namespace WebProtocol
|
|||||||
/// FPGA->Server 读响应包
|
/// FPGA->Server 读响应包
|
||||||
/// 构造函数
|
/// 构造函数
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
/// <param name="timestamp"> 时间戳 </param>
|
||||||
/// <param name="commandID"> 任务ID号 </param>
|
/// <param name="commandID"> 任务ID号 </param>
|
||||||
/// <param name="resp"> 读响应包响应 </param>
|
/// <param name="resp"> 读响应包响应 </param>
|
||||||
/// <param name="bodyData"> 数据 </param>
|
/// <param name="bodyData"> 数据 </param>
|
||||||
public RecvDataPackage(byte commandID, byte resp, byte[] bodyData)
|
public RecvDataPackage(UInt32 timestamp, byte commandID, byte resp, byte[] bodyData)
|
||||||
{
|
{
|
||||||
|
this.timestamp = timestamp;
|
||||||
this.commandID = commandID;
|
this.commandID = commandID;
|
||||||
this.resp = resp;
|
this.resp = resp;
|
||||||
this.bodyData = bodyData;
|
this.bodyData = bodyData;
|
||||||
@@ -322,26 +335,13 @@ namespace WebProtocol
|
|||||||
_ = this._reserved;
|
_ = this._reserved;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// FPGA->Server 读响应包
|
|
||||||
/// 构造函数
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="commandID"> 任务ID号 </param>
|
|
||||||
/// <param name="isSuccess">是否读取成功</param>
|
|
||||||
/// <param name="bodyData"> 数据 </param>
|
|
||||||
public RecvDataPackage(byte commandID, bool isSuccess, byte[] bodyData)
|
|
||||||
{
|
|
||||||
this.commandID = commandID;
|
|
||||||
this.resp = Convert.ToByte(isSuccess);
|
|
||||||
this.bodyData = bodyData;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 通过接受包选项构建读响应包
|
/// 通过接受包选项构建读响应包
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="opts">接收包(读响应包和写响应包)选项</param>
|
/// <param name="opts">接收包(读响应包和写响应包)选项</param>
|
||||||
public RecvDataPackage(RecvPackOptions opts)
|
public RecvDataPackage(RecvPackOptions opts)
|
||||||
{
|
{
|
||||||
|
this.timestamp = opts.Timestamp;
|
||||||
this.commandID = opts.CommandID;
|
this.commandID = opts.CommandID;
|
||||||
this.resp = Convert.ToByte(opts.IsSuccess ? 0b10 : 0b00);
|
this.resp = Convert.ToByte(opts.IsSuccess ? 0b10 : 0b00);
|
||||||
this.bodyData = opts.Data ?? (byte[])[0, 0, 0, 0];
|
this.bodyData = opts.Data ?? (byte[])[0, 0, 0, 0];
|
||||||
@@ -354,11 +354,14 @@ namespace WebProtocol
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
var opts = new RecvPackOptions();
|
var opts = new RecvPackOptions()
|
||||||
opts.Type = RecvPackOptions.PackType.ReadResp;
|
{
|
||||||
opts.CommandID = commandID;
|
Timestamp = this.timestamp,
|
||||||
opts.IsSuccess = Convert.ToBoolean((resp >> 1) == 0b01 ? false : true);
|
Type = RecvPackOptions.PackType.ReadResp,
|
||||||
opts.Data = bodyData;
|
CommandID = this.commandID,
|
||||||
|
IsSuccess = Convert.ToBoolean((resp >> 1) == 0b01 ? false : true),
|
||||||
|
Data = this.bodyData,
|
||||||
|
};
|
||||||
|
|
||||||
return opts;
|
return opts;
|
||||||
}
|
}
|
||||||
@@ -369,7 +372,7 @@ namespace WebProtocol
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public bool IsSuccessful
|
public bool IsSuccessful
|
||||||
{
|
{
|
||||||
get { return Convert.ToBoolean((resp >> 1) == 0b01 ? false : true); }
|
get { return Convert.ToBoolean((this.resp >> 1) == 0b01 ? false : true); }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -379,12 +382,26 @@ namespace WebProtocol
|
|||||||
/// <returns>读响应包</returns>
|
/// <returns>读响应包</returns>
|
||||||
public static Result<RecvDataPackage> FromBytes(byte[] bytes)
|
public static Result<RecvDataPackage> FromBytes(byte[] bytes)
|
||||||
{
|
{
|
||||||
if (bytes[0] != (byte)PackSign.RecvData)
|
if (bytes[4] != (byte)PackSign.RecvData)
|
||||||
return new(new ArgumentException(
|
return new(new ArgumentException(
|
||||||
$"The sign of bytes is not RecvData Package, Sign: 0x{BitConverter.ToString([bytes[0]])}",
|
$"The sign of bytes is not RecvData Package, Sign: 0x{BitConverter.ToString([bytes[0]])}",
|
||||||
nameof(bytes)
|
nameof(bytes)
|
||||||
));
|
));
|
||||||
return new RecvDataPackage(bytes[1], bytes[2], bytes[4..]);
|
return new RecvDataPackage(
|
||||||
|
Number.BytesToUInt32(bytes[..4]).Value,
|
||||||
|
bytes[5],
|
||||||
|
bytes[6],
|
||||||
|
bytes[8..]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// [TODO:description]
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="bytes">[TODO:parameter]</param>
|
||||||
|
/// <returns>[TODO:return]</returns>
|
||||||
|
public static bool IsRecvDataPackage(byte[] bytes)
|
||||||
|
{
|
||||||
|
return bytes[4] == (byte)PackSign.RecvData;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -394,13 +411,16 @@ namespace WebProtocol
|
|||||||
public byte[] ToBytes()
|
public byte[] ToBytes()
|
||||||
{
|
{
|
||||||
var bodyDataLen = bodyData.Length;
|
var bodyDataLen = bodyData.Length;
|
||||||
var arr = new byte[4 + bodyDataLen];
|
var arr = new byte[8 + bodyDataLen];
|
||||||
|
|
||||||
arr[0] = this.sign;
|
Buffer.BlockCopy(
|
||||||
arr[1] = this.commandID;
|
Number.UInt32ArrayToBytes([this.timestamp]).Value, 0, arr, 0, 4);
|
||||||
arr[2] = this.resp;
|
arr[4] = this.sign;
|
||||||
|
arr[5] = this.commandID;
|
||||||
|
arr[6] = this.resp;
|
||||||
|
arr[7] = this.resp;
|
||||||
|
|
||||||
Array.Copy(bodyData, 0, arr, 4, bodyDataLen);
|
Array.Copy(bodyData, 0, arr, 8, bodyDataLen);
|
||||||
|
|
||||||
return arr;
|
return arr;
|
||||||
}
|
}
|
||||||
@@ -408,8 +428,9 @@ namespace WebProtocol
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary> 写响应包 </summary>
|
/// <summary> 写响应包 </summary>
|
||||||
public struct RecvRespPackage
|
public class RecvRespPackage
|
||||||
{
|
{
|
||||||
|
readonly UInt32 timestamp;
|
||||||
readonly byte sign = (byte)PackSign.RecvResp;
|
readonly byte sign = (byte)PackSign.RecvResp;
|
||||||
readonly byte commandID;
|
readonly byte commandID;
|
||||||
readonly byte resp;
|
readonly byte resp;
|
||||||
@@ -418,10 +439,12 @@ namespace WebProtocol
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 构建写响应包
|
/// 构建写响应包
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
/// <param name="timestamp">时间戳</param>
|
||||||
/// <param name="commandID">任务ID</param>
|
/// <param name="commandID">任务ID</param>
|
||||||
/// <param name="resp">写响应</param>
|
/// <param name="resp">写响应</param>
|
||||||
public RecvRespPackage(byte commandID, byte resp)
|
public RecvRespPackage(UInt32 timestamp, byte commandID, byte resp)
|
||||||
{
|
{
|
||||||
|
this.timestamp = timestamp;
|
||||||
this.commandID = commandID;
|
this.commandID = commandID;
|
||||||
this.resp = resp;
|
this.resp = resp;
|
||||||
|
|
||||||
@@ -429,23 +452,13 @@ namespace WebProtocol
|
|||||||
_ = this._reserved;
|
_ = this._reserved;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 构建写响应包
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="commandID">任务ID</param>
|
|
||||||
/// <param name="isSuccess">是否写成功</param>
|
|
||||||
public RecvRespPackage(byte commandID, bool isSuccess)
|
|
||||||
{
|
|
||||||
this.commandID = commandID;
|
|
||||||
this.resp = Convert.ToByte(isSuccess);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 通过接受包选项构建写响应包
|
/// 通过接受包选项构建写响应包
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="opts">接收包(读响应包和写响应包)选项</param>
|
/// <param name="opts">接收包(读响应包和写响应包)选项</param>
|
||||||
public RecvRespPackage(RecvPackOptions opts)
|
public RecvRespPackage(RecvPackOptions opts)
|
||||||
{
|
{
|
||||||
|
this.timestamp = opts.Timestamp;
|
||||||
this.commandID = opts.CommandID;
|
this.commandID = opts.CommandID;
|
||||||
this.resp = Convert.ToByte(opts.IsSuccess ? 0b10 : 0b00);
|
this.resp = Convert.ToByte(opts.IsSuccess ? 0b10 : 0b00);
|
||||||
}
|
}
|
||||||
@@ -457,11 +470,14 @@ namespace WebProtocol
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
var opts = new RecvPackOptions();
|
var opts = new RecvPackOptions()
|
||||||
opts.Type = RecvPackOptions.PackType.WriteResp;
|
{
|
||||||
opts.CommandID = commandID;
|
Timestamp = this.timestamp,
|
||||||
opts.IsSuccess = Convert.ToBoolean((resp >> 1) == 0b01 ? false : true);
|
Type = RecvPackOptions.PackType.WriteResp,
|
||||||
opts.Data = null;
|
CommandID = commandID,
|
||||||
|
IsSuccess = Convert.ToBoolean((resp >> 1) == 0b01 ? false : true),
|
||||||
|
Data = null,
|
||||||
|
};
|
||||||
|
|
||||||
return opts;
|
return opts;
|
||||||
}
|
}
|
||||||
@@ -472,7 +488,7 @@ namespace WebProtocol
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public bool IsSuccessful
|
public bool IsSuccessful
|
||||||
{
|
{
|
||||||
get { return Convert.ToBoolean((resp >> 1) == 0b01 ? false : true); }
|
get { return Convert.ToBoolean((this.resp >> 1) == 0b01 ? false : true); }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -482,12 +498,23 @@ namespace WebProtocol
|
|||||||
/// <returns>写响应包</returns>
|
/// <returns>写响应包</returns>
|
||||||
public static Result<RecvRespPackage> FromBytes(byte[] bytes)
|
public static Result<RecvRespPackage> FromBytes(byte[] bytes)
|
||||||
{
|
{
|
||||||
if (bytes[0] != (byte)PackSign.RecvResp)
|
if (bytes[4] != (byte)PackSign.RecvResp)
|
||||||
return new(new ArgumentException(
|
return new(new ArgumentException(
|
||||||
$"The sign of bytes is not RecvResp Package, Sign: 0x{BitConverter.ToString([bytes[0]])}",
|
$"The sign of bytes is not RecvResp Package, Sign: 0x{BitConverter.ToString([bytes[4]])}",
|
||||||
nameof(bytes)
|
nameof(bytes)
|
||||||
));
|
));
|
||||||
return new RecvRespPackage(bytes[1], bytes[2]);
|
var timestamp = Number.BytesToUInt32(bytes[..4]).Value;
|
||||||
|
return new RecvRespPackage(timestamp, bytes[5], bytes[6]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// [TODO:description]
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="bytes">[TODO:parameter]</param>
|
||||||
|
/// <returns>[TODO:return]</returns>
|
||||||
|
public static bool IsRecvRespPackage(byte[] bytes)
|
||||||
|
{
|
||||||
|
return bytes[4] == (byte)PackSign.RecvResp;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -496,11 +523,13 @@ namespace WebProtocol
|
|||||||
/// <returns>字节数组</returns>
|
/// <returns>字节数组</returns>
|
||||||
public byte[] ToBytes()
|
public byte[] ToBytes()
|
||||||
{
|
{
|
||||||
var arr = new byte[4];
|
var arr = new byte[8];
|
||||||
|
Buffer.BlockCopy(
|
||||||
arr[0] = this.sign;
|
Number.UInt32ArrayToBytes([this.timestamp]).Value, 0, arr, 0, 4);
|
||||||
arr[1] = this.commandID;
|
arr[4] = this.sign;
|
||||||
arr[2] = this.resp;
|
arr[5] = this.commandID;
|
||||||
|
arr[6] = this.resp;
|
||||||
|
arr[7] = this._reserved;
|
||||||
|
|
||||||
return arr;
|
return arr;
|
||||||
}
|
}
|
||||||
|
|||||||
7822
src/APIClient.ts
7822
src/APIClient.ts
File diff suppressed because it is too large
Load Diff
48
src/App.vue
48
src/App.vue
@@ -4,13 +4,21 @@ import Dialog from "./components/Dialog.vue";
|
|||||||
import { Alert, useAlertProvider } from "./components/Alert";
|
import { Alert, useAlertProvider } from "./components/Alert";
|
||||||
import { ref, provide, computed, onMounted } from "vue";
|
import { ref, provide, computed, onMounted } from "vue";
|
||||||
import { useRouter } from "vue-router";
|
import { useRouter } from "vue-router";
|
||||||
|
import { useThemeStore } from "./stores/theme";
|
||||||
|
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
const theme = useThemeStore();
|
||||||
|
|
||||||
// 主题切换状态管理
|
// 主题切换状态管理
|
||||||
const isDarkMode = ref(
|
const isDarkMode = ref(theme.isDarkTheme());
|
||||||
window.matchMedia("(prefers-color-scheme: dark)").matches,
|
|
||||||
);
|
// Navbar显示状态管理
|
||||||
|
const showNavbar = ref(true);
|
||||||
|
|
||||||
|
// 切换Navbar显示状态
|
||||||
|
const toggleNavbar = () => {
|
||||||
|
showNavbar.value = !showNavbar.value;
|
||||||
|
};
|
||||||
|
|
||||||
// 初始化主题设置
|
// 初始化主题设置
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
@@ -38,6 +46,7 @@ const applyTheme = () => {
|
|||||||
// 切换主题
|
// 切换主题
|
||||||
const toggleTheme = () => {
|
const toggleTheme = () => {
|
||||||
isDarkMode.value = !isDarkMode.value;
|
isDarkMode.value = !isDarkMode.value;
|
||||||
|
theme.toggleTheme();
|
||||||
applyTheme();
|
applyTheme();
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -47,6 +56,12 @@ provide("theme", {
|
|||||||
toggleTheme,
|
toggleTheme,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// 提供Navbar控制给子组件
|
||||||
|
provide("navbar", {
|
||||||
|
showNavbar,
|
||||||
|
toggleNavbar,
|
||||||
|
});
|
||||||
|
|
||||||
const currentRoutePath = computed(() => {
|
const currentRoutePath = computed(() => {
|
||||||
return router.currentRoute.value.path;
|
return router.currentRoute.value.path;
|
||||||
});
|
});
|
||||||
@@ -56,8 +71,8 @@ useAlertProvider();
|
|||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<header class="relative">
|
<header class="relative" :class="{ 'navbar-hidden': !showNavbar }">
|
||||||
<Navbar />
|
<Navbar v-show="showNavbar" />
|
||||||
<Dialog />
|
<Dialog />
|
||||||
<Alert />
|
<Alert />
|
||||||
</header>
|
</header>
|
||||||
@@ -71,7 +86,7 @@ useAlertProvider();
|
|||||||
class="footer footer-center p-4 bg-base-300 text-base-content"
|
class="footer footer-center p-4 bg-base-300 text-base-content"
|
||||||
>
|
>
|
||||||
<div>
|
<div>
|
||||||
<p>Copyright © 2023 - All right reserved by OurEDA</p>
|
<p>Copyright © 2025 - All right reserved by OurEDA</p>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div>
|
</div>
|
||||||
@@ -79,4 +94,25 @@ useAlertProvider();
|
|||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
/* 特定于App.vue的样式 */
|
/* 特定于App.vue的样式 */
|
||||||
|
header {
|
||||||
|
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
|
||||||
|
transform-origin: top;
|
||||||
|
}
|
||||||
|
|
||||||
|
.navbar-hidden {
|
||||||
|
transform: scaleY(0);
|
||||||
|
height: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Navbar显示/隐藏动画 */
|
||||||
|
header .navbar {
|
||||||
|
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
|
||||||
|
transform-origin: top;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 当header被隐藏时,确保navbar也相应变化 */
|
||||||
|
.navbar-hidden .navbar {
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="fixed left-1/2 top-30 z-999 -translate-x-1/2">
|
<div class="fixed left-1/2 top-30 z-[9999] -translate-x-1/2">
|
||||||
<transition
|
<transition
|
||||||
name="alert"
|
name="alert"
|
||||||
enter-active-class="alert-enter-active"
|
enter-active-class="alert-enter-active"
|
||||||
|
|||||||
@@ -119,6 +119,7 @@
|
|||||||
componentManager.prepareComponentProps(
|
componentManager.prepareComponentProps(
|
||||||
component.attrs || {},
|
component.attrs || {},
|
||||||
component.id,
|
component.id,
|
||||||
|
props.examId,
|
||||||
)
|
)
|
||||||
"
|
"
|
||||||
@update:bindKey="
|
@update:bindKey="
|
||||||
@@ -175,9 +176,7 @@ import {
|
|||||||
ref,
|
ref,
|
||||||
reactive,
|
reactive,
|
||||||
onMounted,
|
onMounted,
|
||||||
onUnmounted,
|
|
||||||
computed,
|
computed,
|
||||||
watch,
|
|
||||||
provide,
|
provide,
|
||||||
} from "vue";
|
} from "vue";
|
||||||
import { useEventListener } from "@vueuse/core";
|
import { useEventListener } from "@vueuse/core";
|
||||||
@@ -188,7 +187,6 @@ import { useAlertStore } from "@/components/Alert";
|
|||||||
// 导入 diagram 管理器
|
// 导入 diagram 管理器
|
||||||
import {
|
import {
|
||||||
loadDiagramData,
|
loadDiagramData,
|
||||||
saveDiagramData,
|
|
||||||
updatePartPosition,
|
updatePartPosition,
|
||||||
updatePartAttribute,
|
updatePartAttribute,
|
||||||
parseConnectionPin,
|
parseConnectionPin,
|
||||||
@@ -217,6 +215,7 @@ const emit = defineEmits(["toggle-doc-panel", "open-components"]);
|
|||||||
// 定义组件接受的属性
|
// 定义组件接受的属性
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
showDocPanel?: boolean; // 添加属性接收文档面板的显示状态
|
showDocPanel?: boolean; // 添加属性接收文档面板的显示状态
|
||||||
|
examId?: string; // 新增examId属性
|
||||||
}>();
|
}>();
|
||||||
|
|
||||||
// 获取componentManager实例
|
// 获取componentManager实例
|
||||||
@@ -606,14 +605,13 @@ function onComponentDrag(e: MouseEvent) {
|
|||||||
|
|
||||||
// 停止拖拽组件
|
// 停止拖拽组件
|
||||||
function stopComponentDrag() {
|
function stopComponentDrag() {
|
||||||
// 如果有组件被拖拽,保存当前状态
|
// 如果有组件被拖拽,仅清除拖拽状态(不保存)
|
||||||
if (draggingComponentId.value) {
|
if (draggingComponentId.value) {
|
||||||
draggingComponentId.value = null;
|
draggingComponentId.value = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
isComponentDragEventActive.value = false;
|
isComponentDragEventActive.value = false;
|
||||||
|
// 移除自动保存功能 - 不再自动保存到localStorage
|
||||||
saveDiagramData(diagramData.value);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 更新组件属性
|
// 更新组件属性
|
||||||
@@ -977,7 +975,8 @@ function exportDiagram() {
|
|||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
// 加载图表数据
|
// 加载图表数据
|
||||||
try {
|
try {
|
||||||
diagramData.value = await loadDiagramData();
|
// 传入examId参数,让diagramManager处理动态加载
|
||||||
|
diagramData.value = await loadDiagramData(props.examId);
|
||||||
|
|
||||||
// 预加载所有组件模块
|
// 预加载所有组件模块
|
||||||
const componentTypes = new Set<string>();
|
const componentTypes = new Set<string>();
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { ref, shallowRef, computed, reactive } from "vue";
|
import { ref, shallowRef, computed, reactive } from "vue";
|
||||||
import { createInjectionState } from "@vueuse/core";
|
import { createInjectionState } from "@vueuse/core";
|
||||||
import {
|
import {
|
||||||
saveDiagramData,
|
|
||||||
type DiagramData,
|
type DiagramData,
|
||||||
type DiagramPart,
|
type DiagramPart,
|
||||||
} from "./diagramManager";
|
} from "./diagramManager";
|
||||||
@@ -302,7 +301,7 @@ const [useProvideComponentManager, useComponentManager] = createInjectionState(
|
|||||||
|
|
||||||
// 使用 updateDiagramDataDirectly 避免触发加载状态
|
// 使用 updateDiagramDataDirectly 避免触发加载状态
|
||||||
canvasInstance.updateDiagramDataDirectly(currentData);
|
canvasInstance.updateDiagramDataDirectly(currentData);
|
||||||
saveDiagramData(currentData);
|
// 移除自动保存功能
|
||||||
|
|
||||||
console.log("组件添加完成:", newComponent);
|
console.log("组件添加完成:", newComponent);
|
||||||
|
|
||||||
@@ -431,7 +430,7 @@ const [useProvideComponentManager, useComponentManager] = createInjectionState(
|
|||||||
"=== 更新图表数据完成,新组件数量:",
|
"=== 更新图表数据完成,新组件数量:",
|
||||||
currentData.parts.length,
|
currentData.parts.length,
|
||||||
);
|
);
|
||||||
saveDiagramData(currentData);
|
// 移除自动保存功能
|
||||||
|
|
||||||
return { success: true, message: `已添加 ${templateData.name} 模板` };
|
return { success: true, message: `已添加 ${templateData.name} 模板` };
|
||||||
} else {
|
} else {
|
||||||
@@ -504,7 +503,7 @@ const [useProvideComponentManager, useComponentManager] = createInjectionState(
|
|||||||
|
|
||||||
canvasInstance.updateDiagramDataDirectly(currentData);
|
canvasInstance.updateDiagramDataDirectly(currentData);
|
||||||
|
|
||||||
saveDiagramData(currentData);
|
// 移除自动保存功能
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -763,11 +762,15 @@ const [useProvideComponentManager, useComponentManager] = createInjectionState(
|
|||||||
function prepareComponentProps(
|
function prepareComponentProps(
|
||||||
attrs: Record<string, any>,
|
attrs: Record<string, any>,
|
||||||
componentId?: string,
|
componentId?: string,
|
||||||
|
examId?: string,
|
||||||
): Record<string, any> {
|
): Record<string, any> {
|
||||||
const result: Record<string, any> = { ...attrs };
|
const result: Record<string, any> = { ...attrs };
|
||||||
if (componentId) {
|
if (componentId) {
|
||||||
result.componentId = componentId;
|
result.componentId = componentId;
|
||||||
}
|
}
|
||||||
|
if (examId) {
|
||||||
|
result.examId = examId;
|
||||||
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
import { ResourceClient, ResourcePurpose } from "@/APIClient";
|
||||||
|
import { AuthManager } from "@/utils/AuthManager";
|
||||||
|
|
||||||
// 定义 diagram.json 的类型结构
|
// 定义 diagram.json 的类型结构
|
||||||
export interface DiagramData {
|
export interface DiagramData {
|
||||||
version: number;
|
version: number;
|
||||||
@@ -27,8 +30,11 @@ export interface DiagramPart {
|
|||||||
export type ConnectionArray = [string, string, number, string[]];
|
export type ConnectionArray = [string, string, number, string[]];
|
||||||
|
|
||||||
// 解析连接字符串为组件ID和引脚ID
|
// 解析连接字符串为组件ID和引脚ID
|
||||||
export function parseConnectionPin(connectionPin: string): { componentId: string; pinId: string } {
|
export function parseConnectionPin(connectionPin: string): {
|
||||||
const [componentId, pinId] = connectionPin.split(':');
|
componentId: string;
|
||||||
|
pinId: string;
|
||||||
|
} {
|
||||||
|
const [componentId, pinId] = connectionPin.split(":");
|
||||||
return { componentId, pinId };
|
return { componentId, pinId };
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -37,11 +43,13 @@ export function connectionArrayToWireItem(
|
|||||||
connection: ConnectionArray,
|
connection: ConnectionArray,
|
||||||
index: number,
|
index: number,
|
||||||
startPos = { x: 0, y: 0 },
|
startPos = { x: 0, y: 0 },
|
||||||
endPos = { x: 0, y: 0 }
|
endPos = { x: 0, y: 0 },
|
||||||
): WireItem {
|
): WireItem {
|
||||||
const [startPinStr, endPinStr, width, path] = connection;
|
const [startPinStr, endPinStr, width, path] = connection;
|
||||||
const { componentId: startComponentId, pinId: startPinId } = parseConnectionPin(startPinStr);
|
const { componentId: startComponentId, pinId: startPinId } =
|
||||||
const { componentId: endComponentId, pinId: endPinId } = parseConnectionPin(endPinStr);
|
parseConnectionPin(startPinStr);
|
||||||
|
const { componentId: endComponentId, pinId: endPinId } =
|
||||||
|
parseConnectionPin(endPinStr);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
id: `wire-${index}`,
|
id: `wire-${index}`,
|
||||||
@@ -54,10 +62,10 @@ export function connectionArrayToWireItem(
|
|||||||
endComponentId,
|
endComponentId,
|
||||||
endPinId,
|
endPinId,
|
||||||
strokeWidth: width,
|
strokeWidth: width,
|
||||||
color: '#4a5568', // 默认颜色
|
color: "#4a5568", // 默认颜色
|
||||||
routingMode: 'path',
|
routingMode: "path",
|
||||||
pathCommands: path,
|
pathCommands: path,
|
||||||
showLabel: false
|
showLabel: false,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -74,30 +82,76 @@ export interface WireItem {
|
|||||||
endPinId?: string;
|
endPinId?: string;
|
||||||
strokeWidth: number;
|
strokeWidth: number;
|
||||||
color: string;
|
color: string;
|
||||||
routingMode: 'orthogonal' | 'path';
|
routingMode: "orthogonal" | "path";
|
||||||
constraint?: string;
|
constraint?: string;
|
||||||
pathCommands?: string[];
|
pathCommands?: string[];
|
||||||
showLabel: boolean;
|
showLabel: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 从本地存储加载图表数据
|
// 从本地存储或动态API加载图表数据
|
||||||
export async function loadDiagramData(): Promise<DiagramData> {
|
export async function loadDiagramData(examId?: string): Promise<DiagramData> {
|
||||||
try {
|
try {
|
||||||
// 先尝试从本地存储加载
|
// 如果提供了examId,优先从API加载实验的diagram
|
||||||
const savedData = localStorage.getItem('diagramData');
|
if (examId) {
|
||||||
if (savedData) {
|
try {
|
||||||
return JSON.parse(savedData);
|
const resourceClient = AuthManager.createClient(ResourceClient);
|
||||||
|
|
||||||
|
// 获取diagram类型的资源列表
|
||||||
|
const resources = await resourceClient.getResourceList(
|
||||||
|
examId,
|
||||||
|
"canvas",
|
||||||
|
ResourcePurpose.Template,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (resources && resources.length > 0) {
|
||||||
|
// 获取第一个diagram资源
|
||||||
|
const diagramResource = resources[0];
|
||||||
|
|
||||||
|
// 使用动态API获取资源文件内容
|
||||||
|
const response = await resourceClient.getResourceById(
|
||||||
|
diagramResource.id,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (response && response.data) {
|
||||||
|
const text = await response.data.text();
|
||||||
|
const data = JSON.parse(text);
|
||||||
|
|
||||||
|
// 验证数据格式
|
||||||
|
const validation = validateDiagramData(data);
|
||||||
|
if (validation.isValid) {
|
||||||
|
console.log("成功从API加载实验diagram:", examId);
|
||||||
|
return data;
|
||||||
|
} else {
|
||||||
|
console.warn("API返回的diagram数据格式无效:", validation.errors);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.log("未找到实验diagram资源,使用默认加载方式");
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.warn("从API加载实验diagram失败,使用默认加载方式:", error);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 如果本地存储没有,从文件加载
|
// 如果没有examId或API加载失败,尝试从静态文件加载(不再使用本地存储)
|
||||||
const response = await fetch('/src/components/diagram.json');
|
|
||||||
|
// 从静态文件加载(作为备选方案)
|
||||||
|
const response = await fetch("/src/components/diagram.json");
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error(`Failed to load diagram.json: ${response.statusText}`);
|
throw new Error(`Failed to load diagram.json: ${response.statusText}`);
|
||||||
}
|
}
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
|
|
||||||
|
// 验证静态文件数据
|
||||||
|
const validation = validateDiagramData(data);
|
||||||
|
if (validation.isValid) {
|
||||||
return data;
|
return data;
|
||||||
|
} else {
|
||||||
|
console.warn("静态diagram文件数据格式无效:", validation.errors);
|
||||||
|
throw new Error("所有diagram数据源都无效");
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Error loading diagram data:', error);
|
console.error("Error loading diagram data:", error);
|
||||||
// 返回空的默认数据结构
|
// 返回空的默认数据结构
|
||||||
return createEmptyDiagram();
|
return createEmptyDiagram();
|
||||||
}
|
}
|
||||||
@@ -107,20 +161,17 @@ export async function loadDiagramData(): Promise<DiagramData> {
|
|||||||
export function createEmptyDiagram(): DiagramData {
|
export function createEmptyDiagram(): DiagramData {
|
||||||
return {
|
return {
|
||||||
version: 1,
|
version: 1,
|
||||||
author: 'user',
|
author: "user",
|
||||||
editor: 'user',
|
editor: "user",
|
||||||
parts: [],
|
parts: [],
|
||||||
connections: []
|
connections: [],
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// 保存图表数据到本地存储
|
// 保存图表数据(已禁用本地存储)
|
||||||
export function saveDiagramData(data: DiagramData): void {
|
export function saveDiagramData(data: DiagramData): void {
|
||||||
try {
|
// 本地存储功能已禁用 - 不再保存到localStorage
|
||||||
localStorage.setItem('diagramData', JSON.stringify(data));
|
console.debug("saveDiagramData called but localStorage saving is disabled");
|
||||||
} catch (error) {
|
|
||||||
console.error('Error saving diagram data:', error);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 更新组件位置
|
// 更新组件位置
|
||||||
@@ -128,15 +179,13 @@ export function updatePartPosition(
|
|||||||
data: DiagramData,
|
data: DiagramData,
|
||||||
partId: string,
|
partId: string,
|
||||||
x: number,
|
x: number,
|
||||||
y: number
|
y: number,
|
||||||
): DiagramData {
|
): DiagramData {
|
||||||
return {
|
return {
|
||||||
...data,
|
...data,
|
||||||
parts: data.parts.map(part =>
|
parts: data.parts.map((part) =>
|
||||||
part.id === partId
|
part.id === partId ? { ...part, x, y } : part,
|
||||||
? { ...part, x, y }
|
),
|
||||||
: part
|
|
||||||
)
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -145,21 +194,21 @@ export function updatePartAttribute(
|
|||||||
data: DiagramData,
|
data: DiagramData,
|
||||||
partId: string,
|
partId: string,
|
||||||
attrName: string,
|
attrName: string,
|
||||||
value: any
|
value: any,
|
||||||
): DiagramData {
|
): DiagramData {
|
||||||
return {
|
return {
|
||||||
...data,
|
...data,
|
||||||
parts: data.parts.map(part =>
|
parts: data.parts.map((part) =>
|
||||||
part.id === partId
|
part.id === partId
|
||||||
? {
|
? {
|
||||||
...part,
|
...part,
|
||||||
attrs: {
|
attrs: {
|
||||||
...part.attrs,
|
...part.attrs,
|
||||||
[attrName]: value
|
[attrName]: value,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
: part,
|
||||||
: part
|
),
|
||||||
)
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -171,72 +220,79 @@ export function addConnection(
|
|||||||
endComponentId: string,
|
endComponentId: string,
|
||||||
endPinId: string,
|
endPinId: string,
|
||||||
width: number = 2,
|
width: number = 2,
|
||||||
path: string[] = []
|
path: string[] = [],
|
||||||
): DiagramData {
|
): DiagramData {
|
||||||
const newConnection: ConnectionArray = [
|
const newConnection: ConnectionArray = [
|
||||||
`${startComponentId}:${startPinId}`,
|
`${startComponentId}:${startPinId}`,
|
||||||
`${endComponentId}:${endPinId}`,
|
`${endComponentId}:${endPinId}`,
|
||||||
width,
|
width,
|
||||||
path
|
path,
|
||||||
];
|
];
|
||||||
|
|
||||||
return {
|
return {
|
||||||
...data,
|
...data,
|
||||||
connections: [...data.connections, newConnection]
|
connections: [...data.connections, newConnection],
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// 删除连接
|
// 删除连接
|
||||||
export function deleteConnection(
|
export function deleteConnection(
|
||||||
data: DiagramData,
|
data: DiagramData,
|
||||||
connectionIndex: number
|
connectionIndex: number,
|
||||||
): DiagramData {
|
): DiagramData {
|
||||||
return {
|
return {
|
||||||
...data,
|
...data,
|
||||||
connections: data.connections.filter((_, index) => index !== connectionIndex)
|
connections: data.connections.filter(
|
||||||
|
(_, index) => index !== connectionIndex,
|
||||||
|
),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// 查找与组件关联的所有连接
|
// 查找与组件关联的所有连接
|
||||||
export function findConnectionsByPart(
|
export function findConnectionsByPart(
|
||||||
data: DiagramData,
|
data: DiagramData,
|
||||||
partId: string
|
partId: string,
|
||||||
): { connection: ConnectionArray; index: number }[] {
|
): { connection: ConnectionArray; index: number }[] {
|
||||||
return data.connections
|
return data.connections
|
||||||
.map((connection, index) => ({ connection, index }))
|
.map((connection, index) => ({ connection, index }))
|
||||||
.filter(({ connection }) => {
|
.filter(({ connection }) => {
|
||||||
const [startPin, endPin] = connection;
|
const [startPin, endPin] = connection;
|
||||||
const startCompId = startPin.split(':')[0];
|
const startCompId = startPin.split(":")[0];
|
||||||
const endCompId = endPin.split(':')[0];
|
const endCompId = endPin.split(":")[0];
|
||||||
return startCompId === partId || endCompId === partId;
|
return startCompId === partId || endCompId === partId;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// 添加验证diagram.json文件的函数
|
// 添加验证diagram.json文件的函数
|
||||||
export function validateDiagramData(data: any): { isValid: boolean; errors: string[] } {
|
export function validateDiagramData(data: any): {
|
||||||
|
isValid: boolean;
|
||||||
|
errors: string[];
|
||||||
|
} {
|
||||||
const errors: string[] = [];
|
const errors: string[] = [];
|
||||||
|
|
||||||
// 检查版本号
|
// 检查版本号
|
||||||
if (!data.version) {
|
if (!data.version) {
|
||||||
errors.push('缺少version字段');
|
errors.push("缺少version字段");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 检查parts数组
|
// 检查parts数组
|
||||||
if (!Array.isArray(data.parts)) {
|
if (!Array.isArray(data.parts)) {
|
||||||
errors.push('parts字段不是数组');
|
errors.push("parts字段不是数组");
|
||||||
} else {
|
} else {
|
||||||
// 验证parts中的每个对象
|
// 验证parts中的每个对象
|
||||||
data.parts.forEach((part: any, index: number) => {
|
data.parts.forEach((part: any, index: number) => {
|
||||||
if (!part.id) errors.push(`parts[${index}]缺少id`);
|
if (!part.id) errors.push(`parts[${index}]缺少id`);
|
||||||
if (!part.type) errors.push(`parts[${index}]缺少type`);
|
if (!part.type) errors.push(`parts[${index}]缺少type`);
|
||||||
if (typeof part.x !== 'number') errors.push(`parts[${index}]缺少有效的x坐标`);
|
if (typeof part.x !== "number")
|
||||||
if (typeof part.y !== 'number') errors.push(`parts[${index}]缺少有效的y坐标`);
|
errors.push(`parts[${index}]缺少有效的x坐标`);
|
||||||
|
if (typeof part.y !== "number")
|
||||||
|
errors.push(`parts[${index}]缺少有效的y坐标`);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// 检查connections数组
|
// 检查connections数组
|
||||||
if (!Array.isArray(data.connections)) {
|
if (!Array.isArray(data.connections)) {
|
||||||
errors.push('connections字段不是数组');
|
errors.push("connections字段不是数组");
|
||||||
} else {
|
} else {
|
||||||
// 验证connections中的每个数组
|
// 验证connections中的每个数组
|
||||||
data.connections.forEach((conn: any, index: number) => {
|
data.connections.forEach((conn: any, index: number) => {
|
||||||
@@ -247,15 +303,15 @@ export function validateDiagramData(data: any): { isValid: boolean; errors: stri
|
|||||||
|
|
||||||
const [startPin, endPin, width] = conn;
|
const [startPin, endPin, width] = conn;
|
||||||
|
|
||||||
if (typeof startPin !== 'string' || !startPin.includes(':')) {
|
if (typeof startPin !== "string" || !startPin.includes(":")) {
|
||||||
errors.push(`connections[${index}]的起始针脚格式无效`);
|
errors.push(`connections[${index}]的起始针脚格式无效`);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (typeof endPin !== 'string' || !endPin.includes(':')) {
|
if (typeof endPin !== "string" || !endPin.includes(":")) {
|
||||||
errors.push(`connections[${index}]的结束针脚格式无效`);
|
errors.push(`connections[${index}]的结束针脚格式无效`);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (typeof width !== 'number') {
|
if (typeof width !== "number") {
|
||||||
errors.push(`connections[${index}]的宽度不是有效的数字`);
|
errors.push(`connections[${index}]的宽度不是有效的数字`);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -263,6 +319,6 @@ export function validateDiagramData(data: any): { isValid: boolean; errors: stri
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
isValid: errors.length === 0,
|
isValid: errors.length === 0,
|
||||||
errors
|
errors,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,9 +29,10 @@ export interface TemplateConfig {
|
|||||||
export const previewSizes: Record<string, number> = {
|
export const previewSizes: Record<string, number> = {
|
||||||
MechanicalButton: 0.4,
|
MechanicalButton: 0.4,
|
||||||
Switch: 0.35,
|
Switch: 0.35,
|
||||||
|
EC11RotaryEncoder: 0.4,
|
||||||
Pin: 0.8,
|
Pin: 0.8,
|
||||||
SMT_LED: 0.7,
|
SMT_LED: 0.7,
|
||||||
SevenSegmentDisplay: 0.4,
|
SevenSegmentDisplayUltimate: 0.4,
|
||||||
HDMI: 0.5,
|
HDMI: 0.5,
|
||||||
DDR: 0.5,
|
DDR: 0.5,
|
||||||
ETH: 0.5,
|
ETH: 0.5,
|
||||||
@@ -48,9 +49,10 @@ export const previewSizes: Record<string, number> = {
|
|||||||
export const availableComponents: ComponentConfig[] = [
|
export const availableComponents: ComponentConfig[] = [
|
||||||
{ type: "MechanicalButton", name: "机械按钮" },
|
{ type: "MechanicalButton", name: "机械按钮" },
|
||||||
{ type: "Switch", name: "开关" },
|
{ type: "Switch", name: "开关" },
|
||||||
|
{ type: "EC11RotaryEncoder", name: "EC11旋转编码器" },
|
||||||
{ type: "Pin", name: "引脚" },
|
{ type: "Pin", name: "引脚" },
|
||||||
{ type: "SMT_LED", name: "贴片LED" },
|
{ type: "SMT_LED", name: "贴片LED" },
|
||||||
{ type: "SevenSegmentDisplay", name: "数码管" },
|
{ type: "SevenSegmentDisplayUltimate", name: "数码管" },
|
||||||
{ type: "HDMI", name: "HDMI接口" },
|
{ type: "HDMI", name: "HDMI接口" },
|
||||||
{ type: "DDR", name: "DDR内存" },
|
{ type: "DDR", name: "DDR内存" },
|
||||||
{ type: "ETH", name: "以太网接口" },
|
{ type: "ETH", name: "以太网接口" },
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ import {
|
|||||||
SignalOperator,
|
SignalOperator,
|
||||||
SignalTriggerConfig,
|
SignalTriggerConfig,
|
||||||
SignalValue,
|
SignalValue,
|
||||||
|
AnalyzerChannelDiv,
|
||||||
|
AnalyzerClockDiv,
|
||||||
} from "@/APIClient";
|
} from "@/APIClient";
|
||||||
import { AuthManager } from "@/utils/AuthManager";
|
import { AuthManager } from "@/utils/AuthManager";
|
||||||
import { useAlertStore } from "@/components/Alert";
|
import { useAlertStore } from "@/components/Alert";
|
||||||
@@ -65,6 +67,66 @@ const signalValues = [
|
|||||||
{ value: SignalValue.SomeNumber, label: "#" },
|
{ value: SignalValue.SomeNumber, label: "#" },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
// 通道组选项
|
||||||
|
const channelDivOptions = [
|
||||||
|
{ value: 1, label: "1通道", description: "启用1个通道 (CH0)" },
|
||||||
|
{ value: 2, label: "2通道", description: "启用2个通道 (CH0-CH1)" },
|
||||||
|
{ value: 4, label: "4通道", description: "启用4个通道 (CH0-CH3)" },
|
||||||
|
{ value: 8, label: "8通道", description: "启用8个通道 (CH0-CH7)" },
|
||||||
|
{ value: 16, label: "16通道", description: "启用16个通道 (CH0-CH15)" },
|
||||||
|
{ value: 32, label: "32通道", description: "启用32个通道 (CH0-CH31)" },
|
||||||
|
];
|
||||||
|
|
||||||
|
const ClockDivOptions = [
|
||||||
|
{
|
||||||
|
value: AnalyzerClockDiv.DIV1,
|
||||||
|
label: "120MHz",
|
||||||
|
description: "采样频率120MHz",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: AnalyzerClockDiv.DIV2,
|
||||||
|
label: "60MHz",
|
||||||
|
description: "采样频率60MHz",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: AnalyzerClockDiv.DIV4,
|
||||||
|
label: "30MHz",
|
||||||
|
description: "采样频率30MHz",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: AnalyzerClockDiv.DIV8,
|
||||||
|
label: "15MHz",
|
||||||
|
description: "采样频率15MHz",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: AnalyzerClockDiv.DIV16,
|
||||||
|
label: "7.5MHz",
|
||||||
|
description: "采样频率7.5MHz",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: AnalyzerClockDiv.DIV32,
|
||||||
|
label: "3.75MHz",
|
||||||
|
description: "采样频率3.75MHz",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: AnalyzerClockDiv.DIV64,
|
||||||
|
label: "1.875MHz",
|
||||||
|
description: "采样频率1.875MHz",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: AnalyzerClockDiv.DIV128,
|
||||||
|
label: "937.5KHz",
|
||||||
|
description: "采样频率937.5KHz",
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
// 捕获深度限制常量
|
||||||
|
const CAPTURE_LENGTH_MIN = 1024; // 最小捕获深度 1024
|
||||||
|
const CAPTURE_LENGTH_MAX = 0x10000000 - 0x01000000; // 最大捕获深度
|
||||||
|
|
||||||
|
// 预捕获深度限制常量
|
||||||
|
const PRE_CAPTURE_LENGTH_MIN = 2; // 最小预捕获深度 2
|
||||||
|
|
||||||
// 默认颜色数组
|
// 默认颜色数组
|
||||||
const defaultColors = [
|
const defaultColors = [
|
||||||
"#FF5733",
|
"#FF5733",
|
||||||
@@ -77,6 +139,9 @@ const defaultColors = [
|
|||||||
"#8C33FF",
|
"#8C33FF",
|
||||||
];
|
];
|
||||||
|
|
||||||
|
// 添加逻辑分析仪基础频率常量
|
||||||
|
const BASE_LOGIC_ANALYZER_FREQUENCY = 120_000_000; // 120MHz基础频率
|
||||||
|
|
||||||
const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
|
const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
|
||||||
() => {
|
() => {
|
||||||
const logicData = shallowRef<LogicDataType>();
|
const logicData = shallowRef<LogicDataType>();
|
||||||
@@ -87,25 +152,31 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
|
|||||||
|
|
||||||
// 触发设置相关状态
|
// 触发设置相关状态
|
||||||
const currentGlobalMode = ref<GlobalCaptureMode>(GlobalCaptureMode.AND);
|
const currentGlobalMode = ref<GlobalCaptureMode>(GlobalCaptureMode.AND);
|
||||||
|
const currentChannelDiv = ref<number>(8); // 默认启用8个通道
|
||||||
|
const captureLength = ref<number>(CAPTURE_LENGTH_MIN); // 捕获深度,默认为最小值
|
||||||
|
const preCaptureLength = ref<number>(PRE_CAPTURE_LENGTH_MIN); // 预捕获深度,默认0
|
||||||
|
const currentclockDiv = ref<AnalyzerClockDiv>(AnalyzerClockDiv.DIV1); // 默认时钟分频为1
|
||||||
const isApplying = ref(false);
|
const isApplying = ref(false);
|
||||||
const isCapturing = ref(false); // 添加捕获状态标识
|
const isCapturing = ref(false); // 添加捕获状态标识
|
||||||
|
|
||||||
// 通道配置
|
// 通道配置
|
||||||
const channels = reactive<Channel[]>(
|
const channels = reactive<Channel[]>(
|
||||||
Array.from({ length: 8 }, (_, index) => ({
|
Array.from({ length: 32 }, (_, index) => ({
|
||||||
enabled: false,
|
enabled: index < 8, // 默认启用前8个通道
|
||||||
label: `CH${index}`,
|
label: `CH${index}`,
|
||||||
color: defaultColors[index],
|
color: defaultColors[index % defaultColors.length], // 使用模运算避免数组越界
|
||||||
})),
|
})),
|
||||||
);
|
);
|
||||||
|
|
||||||
// 8个信号通道的配置
|
// 32个信号通道的配置
|
||||||
const signalConfigs = reactive<SignalTriggerConfig[]>(
|
const signalConfigs = reactive<SignalTriggerConfig[]>(
|
||||||
Array.from({ length: 8 }, (_, index) =>
|
Array.from(
|
||||||
|
{ length: 32 },
|
||||||
|
(_, index) =>
|
||||||
new SignalTriggerConfig({
|
new SignalTriggerConfig({
|
||||||
signalIndex: index,
|
signalIndex: index,
|
||||||
operator: SignalOperator.Equal,
|
operator: SignalOperator.Equal,
|
||||||
value: SignalValue.Logic1,
|
value: SignalValue.NotCare,
|
||||||
}),
|
}),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
@@ -125,105 +196,158 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
|
|||||||
channels.filter((channel) => channel.enabled),
|
channels.filter((channel) => channel.enabled),
|
||||||
);
|
);
|
||||||
|
|
||||||
const enableAllChannels = () => {
|
// 计算属性:根据当前时钟分频获取实际采样频率
|
||||||
channels.forEach((channel) => {
|
const currentSampleFrequency = computed(() => {
|
||||||
channel.enabled = true;
|
const divValue = Math.pow(2, currentclockDiv.value);
|
||||||
|
return BASE_LOGIC_ANALYZER_FREQUENCY / divValue;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// 计算属性:获取当前采样周期(纳秒)
|
||||||
|
const currentSamplePeriodNs = computed(() => {
|
||||||
|
return 1_000_000_000 / currentSampleFrequency.value;
|
||||||
|
});
|
||||||
|
|
||||||
|
// 转换通道数字到枚举值
|
||||||
|
const getChannelDivEnum = (channelCount: number): AnalyzerChannelDiv => {
|
||||||
|
switch (channelCount) {
|
||||||
|
case 1:
|
||||||
|
return AnalyzerChannelDiv.ONE;
|
||||||
|
case 2:
|
||||||
|
return AnalyzerChannelDiv.TWO;
|
||||||
|
case 4:
|
||||||
|
return AnalyzerChannelDiv.FOUR;
|
||||||
|
case 8:
|
||||||
|
return AnalyzerChannelDiv.EIGHT;
|
||||||
|
case 16:
|
||||||
|
return AnalyzerChannelDiv.XVI;
|
||||||
|
case 32:
|
||||||
|
return AnalyzerChannelDiv.XXXII;
|
||||||
|
default:
|
||||||
|
return AnalyzerChannelDiv.EIGHT;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const disableAllChannels = () => {
|
// 验证捕获深度
|
||||||
|
const validateCaptureLength = (
|
||||||
|
value: number,
|
||||||
|
): { valid: boolean; message?: string } => {
|
||||||
|
if (!Number.isInteger(value)) {
|
||||||
|
return { valid: false, message: "捕获深度必须是整数" };
|
||||||
|
}
|
||||||
|
if (value < CAPTURE_LENGTH_MIN) {
|
||||||
|
return {
|
||||||
|
valid: false,
|
||||||
|
message: `捕获深度不能小于 ${CAPTURE_LENGTH_MIN}`,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (value > CAPTURE_LENGTH_MAX) {
|
||||||
|
return {
|
||||||
|
valid: false,
|
||||||
|
message: `捕获深度不能大于 ${CAPTURE_LENGTH_MAX.toLocaleString()}`,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return { valid: true };
|
||||||
|
};
|
||||||
|
|
||||||
|
// 验证预捕获深度
|
||||||
|
const validatePreCaptureLength = (
|
||||||
|
value: number,
|
||||||
|
currentCaptureLength: number,
|
||||||
|
): { valid: boolean; message?: string } => {
|
||||||
|
if (!Number.isInteger(value)) {
|
||||||
|
return { valid: false, message: "预捕获深度必须是整数" };
|
||||||
|
}
|
||||||
|
if (value < PRE_CAPTURE_LENGTH_MIN) {
|
||||||
|
return {
|
||||||
|
valid: false,
|
||||||
|
message: `预捕获深度不能小于 ${PRE_CAPTURE_LENGTH_MIN}`,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (value >= currentCaptureLength) {
|
||||||
|
return {
|
||||||
|
valid: false,
|
||||||
|
message: `预捕获深度不能大于等于捕获深度 (${currentCaptureLength})`,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return { valid: true };
|
||||||
|
};
|
||||||
|
|
||||||
|
// 设置捕获深度
|
||||||
|
const setCaptureLength = (value: number) => {
|
||||||
|
const validation = validateCaptureLength(value);
|
||||||
|
if (!validation.valid) {
|
||||||
|
alert?.error(validation.message!, 3000);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 检查预捕获深度是否仍然有效
|
||||||
|
if (preCaptureLength.value >= value) {
|
||||||
|
preCaptureLength.value = Math.max(0, value - 1);
|
||||||
|
alert?.warn(`预捕获深度已自动调整为 ${preCaptureLength.value}`, 3000);
|
||||||
|
}
|
||||||
|
|
||||||
|
captureLength.value = value;
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
|
// 设置预捕获深度
|
||||||
|
const setPreCaptureLength = (value: number) => {
|
||||||
|
const validation = validatePreCaptureLength(value, captureLength.value);
|
||||||
|
if (!validation.valid) {
|
||||||
|
alert?.error(validation.message!, 3000);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
preCaptureLength.value = value;
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
|
// 设置通道组
|
||||||
|
const setChannelDiv = (channelCount: number) => {
|
||||||
|
// 验证通道数量是否有效
|
||||||
|
if (!channelDivOptions.find((option) => option.value === channelCount)) {
|
||||||
|
console.error(`无效的通道组设置: ${channelCount}`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
currentChannelDiv.value = channelCount;
|
||||||
|
|
||||||
|
// 禁用所有通道
|
||||||
channels.forEach((channel) => {
|
channels.forEach((channel) => {
|
||||||
channel.enabled = false;
|
channel.enabled = false;
|
||||||
});
|
});
|
||||||
};
|
|
||||||
|
|
||||||
const setGlobalMode = async (mode: GlobalCaptureMode) => {
|
// 启用指定数量的通道(从CH0开始)
|
||||||
// 检查是否有其他操作正在进行
|
for (let i = 0; i < channelCount && i < channels.length; i++) {
|
||||||
if (operationMutex.isLocked()) {
|
channels[i].enabled = true;
|
||||||
alert.warn("有其他操作正在进行中,请稍后再试", 3000);
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const release = await operationMutex.acquire();
|
const option = channelDivOptions.find(
|
||||||
try {
|
(opt) => opt.value === channelCount,
|
||||||
const client = AuthManager.createAuthenticatedLogicAnalyzerClient();
|
);
|
||||||
const success = await client.setGlobalTrigMode(mode);
|
alert?.success(`已设置为${option?.label}`, 2000);
|
||||||
|
};
|
||||||
|
|
||||||
if (success) {
|
const setGlobalMode = (mode: GlobalCaptureMode) => {
|
||||||
currentGlobalMode.value = mode;
|
currentGlobalMode.value = mode;
|
||||||
alert?.success(
|
const modeOption = globalModes.find((m) => m.value === mode);
|
||||||
`全局触发模式已设置为 ${globalModes.find((m) => m.value === mode)?.label}`,
|
alert?.info(`全局触发模式已设置为 ${modeOption?.label}`, 2000);
|
||||||
3000,
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
throw new Error("设置失败");
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error("设置全局触发模式失败:", error);
|
|
||||||
alert?.error("设置全局触发模式失败", 3000);
|
|
||||||
} finally {
|
|
||||||
release();
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const applyConfiguration = async () => {
|
const setClockDiv = (mode: AnalyzerClockDiv) => {
|
||||||
// 检查是否有其他操作正在进行
|
currentclockDiv.value = mode;
|
||||||
if (operationMutex.isLocked()) {
|
const modeOption = ClockDivOptions.find((m) => m.value === mode);
|
||||||
alert.warn("有其他操作正在进行中,请稍后再试", 3000);
|
alert?.info(`时钟分频已设置为 ${modeOption?.label}`, 2000);
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const release = await operationMutex.acquire();
|
|
||||||
isApplying.value = true;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const client = AuthManager.createAuthenticatedLogicAnalyzerClient();
|
|
||||||
|
|
||||||
// 准备配置数据 - 只包含启用的通道
|
|
||||||
const enabledSignals = signalConfigs.filter(
|
|
||||||
(signal, index) => channels[index].enabled,
|
|
||||||
);
|
|
||||||
|
|
||||||
const config = new CaptureConfig({
|
|
||||||
globalMode: currentGlobalMode.value,
|
|
||||||
signalConfigs: enabledSignals,
|
|
||||||
});
|
|
||||||
|
|
||||||
// 发送配置
|
|
||||||
const success = await client.configureCapture(config);
|
|
||||||
|
|
||||||
if (success) {
|
|
||||||
const enabledChannelCount = channels.filter(
|
|
||||||
(ch) => ch.enabled,
|
|
||||||
).length;
|
|
||||||
alert?.success(
|
|
||||||
`配置已成功应用,启用了 ${enabledChannelCount} 个通道和触发条件`,
|
|
||||||
3000,
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
throw new Error("应用配置失败");
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error("应用配置失败:", error);
|
|
||||||
alert?.error("应用配置失败,请检查设备连接", 3000);
|
|
||||||
} finally {
|
|
||||||
isApplying.value = false;
|
|
||||||
release();
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const resetConfiguration = () => {
|
const resetConfiguration = () => {
|
||||||
currentGlobalMode.value = GlobalCaptureMode.AND;
|
currentGlobalMode.value = GlobalCaptureMode.AND;
|
||||||
|
currentChannelDiv.value = 8; // 重置为默认的8通道
|
||||||
channels.forEach((channel, index) => {
|
currentclockDiv.value = AnalyzerClockDiv.DIV1; // 重置为默认采样频率
|
||||||
channel.enabled = false;
|
setChannelDiv(8); // 重置为默认的8通道
|
||||||
channel.label = `CH${index}`;
|
|
||||||
channel.color = defaultColors[index];
|
|
||||||
});
|
|
||||||
|
|
||||||
signalConfigs.forEach((signal) => {
|
signalConfigs.forEach((signal) => {
|
||||||
signal.operator = SignalOperator.Equal;
|
signal.operator = SignalOperator.Equal;
|
||||||
signal.value = SignalValue.Logic1;
|
signal.value = SignalValue.NotCare;
|
||||||
});
|
});
|
||||||
|
|
||||||
alert?.info("配置已重置", 2000);
|
alert?.info("配置已重置", 2000);
|
||||||
@@ -234,6 +358,211 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
|
|||||||
logicData.value = data;
|
logicData.value = data;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const getCaptureData = async () => {
|
||||||
|
try {
|
||||||
|
const client = AuthManager.createClient(LogicAnalyzerClient);
|
||||||
|
// 获取捕获数据,使用当前设置的捕获长度
|
||||||
|
const base64Data = await client.getCaptureData(captureLength.value);
|
||||||
|
|
||||||
|
// 将base64数据转换为bytes
|
||||||
|
const binaryString = atob(base64Data);
|
||||||
|
const bytes = new Uint8Array(binaryString.length);
|
||||||
|
for (let i = 0; i < binaryString.length; i++) {
|
||||||
|
bytes[i] = binaryString.charCodeAt(i);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 根据当前通道数量解析数据
|
||||||
|
const channelCount = currentChannelDiv.value;
|
||||||
|
const timeStepNs = currentSamplePeriodNs.value;
|
||||||
|
|
||||||
|
let sampleCount: number;
|
||||||
|
let x: number[];
|
||||||
|
let y: number[][];
|
||||||
|
|
||||||
|
if (channelCount === 1) {
|
||||||
|
// 1通道:每个字节包含8个时间单位的数据
|
||||||
|
sampleCount = bytes.length * 8;
|
||||||
|
|
||||||
|
// 创建时间轴
|
||||||
|
x = Array.from(
|
||||||
|
{ length: sampleCount },
|
||||||
|
(_, i) => (i * timeStepNs) / 1000,
|
||||||
|
); // 转换为微秒
|
||||||
|
|
||||||
|
// 创建通道数据数组
|
||||||
|
y = Array.from({ length: 1 }, () => new Array(sampleCount));
|
||||||
|
|
||||||
|
// 解析数据:每个字节的8个位对应8个时间单位
|
||||||
|
for (let byteIndex = 0; byteIndex < bytes.length; byteIndex++) {
|
||||||
|
const byte = bytes[byteIndex];
|
||||||
|
for (let bitIndex = 0; bitIndex < 8; bitIndex++) {
|
||||||
|
const timeIndex = byteIndex * 8 + bitIndex;
|
||||||
|
y[0][timeIndex] = (byte >> bitIndex) & 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (channelCount === 2) {
|
||||||
|
// 2通道:每个字节包含4个时间单位的数据
|
||||||
|
sampleCount = bytes.length * 4;
|
||||||
|
|
||||||
|
// 创建时间轴
|
||||||
|
x = Array.from(
|
||||||
|
{ length: sampleCount },
|
||||||
|
(_, i) => (i * timeStepNs) / 1000,
|
||||||
|
); // 转换为微秒
|
||||||
|
|
||||||
|
// 创建通道数据数组
|
||||||
|
y = Array.from({ length: 2 }, () => new Array(sampleCount));
|
||||||
|
|
||||||
|
// 解析数据:每个字节的8个位对应4个时间单位的2通道数据
|
||||||
|
// 位分布:[T3_CH1, T3_CH0, T2_CH1, T2_CH0, T1_CH1, T1_CH0, T0_CH1, T0_CH0]
|
||||||
|
for (let byteIndex = 0; byteIndex < bytes.length; byteIndex++) {
|
||||||
|
const byte = bytes[byteIndex];
|
||||||
|
for (let timeUnit = 0; timeUnit < 4; timeUnit++) {
|
||||||
|
const timeIndex = byteIndex * 4 + timeUnit;
|
||||||
|
const bitOffset = timeUnit * 2;
|
||||||
|
y[0][timeIndex] = (byte >> bitOffset) & 1; // CH0
|
||||||
|
y[1][timeIndex] = (byte >> (bitOffset + 1)) & 1; // CH1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (channelCount === 4) {
|
||||||
|
// 4通道:每个字节包含2个时间单位的数据
|
||||||
|
sampleCount = bytes.length * 2;
|
||||||
|
|
||||||
|
// 创建时间轴
|
||||||
|
x = Array.from(
|
||||||
|
{ length: sampleCount },
|
||||||
|
(_, i) => (i * timeStepNs) / 1000,
|
||||||
|
); // 转换为微秒
|
||||||
|
|
||||||
|
// 创建通道数据数组
|
||||||
|
y = Array.from({ length: 4 }, () => new Array(sampleCount));
|
||||||
|
|
||||||
|
// 解析数据:每个字节的8个位对应2个时间单位的4通道数据
|
||||||
|
// 位分布:[T1_CH3, T1_CH2, T1_CH1, T1_CH0, T0_CH3, T0_CH2, T0_CH1, T0_CH0]
|
||||||
|
for (let byteIndex = 0; byteIndex < bytes.length; byteIndex++) {
|
||||||
|
const byte = bytes[byteIndex];
|
||||||
|
|
||||||
|
// 处理第一个时间单位(低4位)
|
||||||
|
const timeIndex1 = byteIndex * 2;
|
||||||
|
for (let channel = 0; channel < 4; channel++) {
|
||||||
|
y[channel][timeIndex1] = (byte >> channel) & 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 处理第二个时间单位(高4位)
|
||||||
|
const timeIndex2 = byteIndex * 2 + 1;
|
||||||
|
for (let channel = 0; channel < 4; channel++) {
|
||||||
|
y[channel][timeIndex2] = (byte >> (channel + 4)) & 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (channelCount === 8) {
|
||||||
|
// 8通道:每个字节包含1个时间单位的8个通道数据
|
||||||
|
sampleCount = bytes.length;
|
||||||
|
|
||||||
|
// 创建时间轴
|
||||||
|
x = Array.from(
|
||||||
|
{ length: sampleCount },
|
||||||
|
(_, i) => (i * timeStepNs) / 1000,
|
||||||
|
); // 转换为微秒
|
||||||
|
|
||||||
|
// 创建8个通道的数据
|
||||||
|
y = Array.from({ length: 8 }, () => new Array(sampleCount));
|
||||||
|
|
||||||
|
// 解析每个字节的8个位到对应通道
|
||||||
|
for (let i = 0; i < sampleCount; i++) {
|
||||||
|
const byte = bytes[i];
|
||||||
|
for (let channel = 0; channel < 8; channel++) {
|
||||||
|
// bit0对应ch0, bit1对应ch1, ..., bit7对应ch7
|
||||||
|
y[channel][i] = (byte >> channel) & 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (channelCount === 16) {
|
||||||
|
// 16通道:每2个字节包含1个时间单位的16个通道数据
|
||||||
|
sampleCount = bytes.length / 2;
|
||||||
|
|
||||||
|
// 创建时间轴
|
||||||
|
x = Array.from(
|
||||||
|
{ length: sampleCount },
|
||||||
|
(_, i) => (i * timeStepNs) / 1000,
|
||||||
|
); // 转换为微秒
|
||||||
|
|
||||||
|
// 创建16个通道的数据
|
||||||
|
y = Array.from({ length: 16 }, () => new Array(sampleCount));
|
||||||
|
|
||||||
|
// 解析数据:每2个字节为一个时间单位
|
||||||
|
for (let timeIndex = 0; timeIndex < sampleCount; timeIndex++) {
|
||||||
|
const byteIndex = timeIndex * 2;
|
||||||
|
const byte1 = bytes[byteIndex]; // [7:0]
|
||||||
|
const byte2 = bytes[byteIndex + 1]; // [15:8]
|
||||||
|
|
||||||
|
// 处理低8位通道 [7:0]
|
||||||
|
for (let channel = 0; channel < 8; channel++) {
|
||||||
|
y[channel][timeIndex] = (byte1 >> channel) & 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 处理高8位通道 [15:8]
|
||||||
|
for (let channel = 0; channel < 8; channel++) {
|
||||||
|
y[channel + 8][timeIndex] = (byte2 >> channel) & 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (channelCount === 32) {
|
||||||
|
// 32通道:每4个字节包含1个时间单位的32个通道数据
|
||||||
|
sampleCount = bytes.length / 4;
|
||||||
|
|
||||||
|
// 创建时间轴
|
||||||
|
x = Array.from(
|
||||||
|
{ length: sampleCount },
|
||||||
|
(_, i) => (i * timeStepNs) / 1000,
|
||||||
|
); // 转换为微秒
|
||||||
|
|
||||||
|
// 创建32个通道的数据
|
||||||
|
y = Array.from({ length: 32 }, () => new Array(sampleCount));
|
||||||
|
|
||||||
|
// 解析数据:每4个字节为一个时间单位
|
||||||
|
for (let timeIndex = 0; timeIndex < sampleCount; timeIndex++) {
|
||||||
|
const byteIndex = timeIndex * 4;
|
||||||
|
const byte1 = bytes[byteIndex]; // [7:0]
|
||||||
|
const byte2 = bytes[byteIndex + 1]; // [15:8]
|
||||||
|
const byte3 = bytes[byteIndex + 2]; // [23:16]
|
||||||
|
const byte4 = bytes[byteIndex + 3]; // [31:24]
|
||||||
|
|
||||||
|
// 处理 [7:0]
|
||||||
|
for (let channel = 0; channel < 8; channel++) {
|
||||||
|
y[channel][timeIndex] = (byte1 >> channel) & 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 处理 [15:8]
|
||||||
|
for (let channel = 0; channel < 8; channel++) {
|
||||||
|
y[channel + 8][timeIndex] = (byte2 >> channel) & 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 处理 [23:16]
|
||||||
|
for (let channel = 0; channel < 8; channel++) {
|
||||||
|
y[channel + 16][timeIndex] = (byte3 >> channel) & 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 处理 [31:24]
|
||||||
|
for (let channel = 0; channel < 8; channel++) {
|
||||||
|
y[channel + 24][timeIndex] = (byte4 >> channel) & 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
throw new Error(`不支持的通道数量: ${channelCount}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 设置逻辑数据
|
||||||
|
const logicData: LogicDataType = {
|
||||||
|
x,
|
||||||
|
y,
|
||||||
|
xUnit: "us", // 微秒单位
|
||||||
|
};
|
||||||
|
|
||||||
|
setLogicData(logicData);
|
||||||
|
} catch (error) {
|
||||||
|
console.error("获取捕获数据失败:", error);
|
||||||
|
alert?.error("获取捕获数据失败", 3000);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const startCapture = async () => {
|
const startCapture = async () => {
|
||||||
// 检查是否有其他操作正在进行
|
// 检查是否有其他操作正在进行
|
||||||
if (operationMutex.isLocked()) {
|
if (operationMutex.isLocked()) {
|
||||||
@@ -241,13 +570,51 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const release = await operationMutex.acquire();
|
|
||||||
isCapturing.value = true;
|
isCapturing.value = true;
|
||||||
|
const release = await operationMutex.acquire();
|
||||||
try {
|
try {
|
||||||
const client = AuthManager.createAuthenticatedLogicAnalyzerClient();
|
const client = AuthManager.createClient(LogicAnalyzerClient);
|
||||||
|
|
||||||
// 1. 设置捕获模式为开始捕获
|
// 1. 先应用配置
|
||||||
|
alert?.info("正在应用配置...", 2000);
|
||||||
|
|
||||||
|
// 准备配置数据 - 包含所有32个通道,未启用的通道设置为默认值
|
||||||
|
const allSignals = signalConfigs.map((signal, index) => {
|
||||||
|
if (channels[index].enabled) {
|
||||||
|
// 启用的通道使用用户配置的触发条件
|
||||||
|
return signal;
|
||||||
|
} else {
|
||||||
|
// 未启用的通道设置为默认触发条件
|
||||||
|
return new SignalTriggerConfig({
|
||||||
|
signalIndex: index,
|
||||||
|
operator: SignalOperator.Equal,
|
||||||
|
value: SignalValue.NotCare,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const config = new CaptureConfig({
|
||||||
|
globalMode: currentGlobalMode.value,
|
||||||
|
channelDiv: getChannelDivEnum(currentChannelDiv.value),
|
||||||
|
captureLength: captureLength.value,
|
||||||
|
preCaptureLength: preCaptureLength.value,
|
||||||
|
clockDiv: currentclockDiv.value,
|
||||||
|
signalConfigs: allSignals,
|
||||||
|
});
|
||||||
|
|
||||||
|
// 发送配置
|
||||||
|
const configSuccess = await client.configureCapture(config);
|
||||||
|
if (!configSuccess) {
|
||||||
|
throw new Error("配置应用失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
const enabledChannelCount = channels.filter((ch) => ch.enabled).length;
|
||||||
|
alert?.success(
|
||||||
|
`配置已应用,启用了 ${enabledChannelCount} 个通道,捕获深度: ${captureLength.value}`,
|
||||||
|
2000,
|
||||||
|
);
|
||||||
|
|
||||||
|
// 2. 设置捕获模式为开始捕获
|
||||||
const captureStarted = await client.setCaptureMode(true, false);
|
const captureStarted = await client.setCaptureMode(true, false);
|
||||||
if (!captureStarted) {
|
if (!captureStarted) {
|
||||||
throw new Error("无法启动捕获");
|
throw new Error("无法启动捕获");
|
||||||
@@ -255,18 +622,15 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
|
|||||||
|
|
||||||
alert?.info("开始捕获信号...", 2000);
|
alert?.info("开始捕获信号...", 2000);
|
||||||
|
|
||||||
// 2. 轮询捕获状态
|
// 3. 轮询捕获状态
|
||||||
const pollCaptureStatus = async (): Promise<boolean> => {
|
let captureCompleted = false;
|
||||||
// 如果不再处于捕获状态,说明被停止了
|
while (isCapturing.value) {
|
||||||
if (!isCapturing.value) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
const status = await client.getCaptureStatus();
|
const status = await client.getCaptureStatus();
|
||||||
|
|
||||||
// 检查是否捕获完成
|
// 检查是否捕获完成
|
||||||
if (status === CaptureStatus.CaptureDone) {
|
if (status === CaptureStatus.CaptureDone) {
|
||||||
return true;
|
captureCompleted = true;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 检查是否仍在捕获中
|
// 检查是否仍在捕获中
|
||||||
@@ -277,15 +641,12 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
|
|||||||
) {
|
) {
|
||||||
// 等待500毫秒后继续轮询
|
// 等待500毫秒后继续轮询
|
||||||
await new Promise((resolve) => setTimeout(resolve, 500));
|
await new Promise((resolve) => setTimeout(resolve, 500));
|
||||||
return await pollCaptureStatus();
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 其他状态视为错误
|
// 其他状态视为错误
|
||||||
throw new Error(`捕获状态异常: ${status}`);
|
// throw new Error(`捕获状态异常: ${status}`);
|
||||||
};
|
}
|
||||||
|
|
||||||
// 等待捕获完成
|
|
||||||
const captureCompleted = await pollCaptureStatus();
|
|
||||||
|
|
||||||
// 如果捕获被停止,不继续处理数据
|
// 如果捕获被停止,不继续处理数据
|
||||||
if (!captureCompleted) {
|
if (!captureCompleted) {
|
||||||
@@ -293,48 +654,8 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3. 获取捕获数据
|
await getCaptureData();
|
||||||
const base64Data = await client.getCaptureData();
|
alert.success(`捕获完成!`, 3000);
|
||||||
|
|
||||||
// 4. 将base64数据转换为bytes
|
|
||||||
const binaryString = atob(base64Data);
|
|
||||||
const bytes = new Uint8Array(binaryString.length);
|
|
||||||
for (let i = 0; i < binaryString.length; i++) {
|
|
||||||
bytes[i] = binaryString.charCodeAt(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 5. 解析数据为8个通道的数字信号
|
|
||||||
const sampleCount = bytes.length;
|
|
||||||
const timeStep = 0.1; // 假设每个采样点间隔0.1ms
|
|
||||||
|
|
||||||
// 创建时间轴
|
|
||||||
const x = Array.from({ length: sampleCount }, (_, i) => i * timeStep);
|
|
||||||
|
|
||||||
// 创建8个通道的数据
|
|
||||||
const y: number[][] = Array.from(
|
|
||||||
{ length: 8 },
|
|
||||||
() => new Array(sampleCount),
|
|
||||||
);
|
|
||||||
|
|
||||||
// 解析每个字节的8个位到对应通道
|
|
||||||
for (let i = 0; i < sampleCount; i++) {
|
|
||||||
const byte = bytes[i];
|
|
||||||
for (let channel = 0; channel < 8; channel++) {
|
|
||||||
// bit0对应ch0, bit1对应ch1, ..., bit7对应ch7
|
|
||||||
y[channel][i] = (byte >> channel) & 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 6. 设置逻辑数据
|
|
||||||
const logicData: LogicDataType = {
|
|
||||||
x,
|
|
||||||
y,
|
|
||||||
xUnit: "ms",
|
|
||||||
};
|
|
||||||
|
|
||||||
setLogicData(logicData);
|
|
||||||
|
|
||||||
alert?.success(`捕获完成!获得 ${sampleCount} 个采样点`, 3000);
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("捕获失败:", error);
|
console.error("捕获失败:", error);
|
||||||
alert?.error(
|
alert?.error(
|
||||||
@@ -354,25 +675,58 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 设置捕获状态为false,这会使轮询停止
|
||||||
|
isCapturing.value = false;
|
||||||
|
|
||||||
|
const release = await operationMutex.acquire();
|
||||||
try {
|
try {
|
||||||
const client = AuthManager.createAuthenticatedLogicAnalyzerClient();
|
const client = AuthManager.createClient(LogicAnalyzerClient);
|
||||||
|
|
||||||
// 执行强制捕获来停止当前捕获
|
// 执行强制捕获来停止当前捕获
|
||||||
const forceSuccess = await client.setCaptureMode(false, true);
|
const forceSuccess = await client.setCaptureMode(false, false);
|
||||||
|
if (!forceSuccess) {
|
||||||
|
throw new Error("无法停止捕获");
|
||||||
|
}
|
||||||
|
|
||||||
|
alert.info("已停止强制捕获...", 2000);
|
||||||
|
} catch (error) {
|
||||||
|
console.error("停止捕获失败:", error);
|
||||||
|
alert.error(
|
||||||
|
`停止捕获失败: ${error instanceof Error ? error.message : "未知错误"}`,
|
||||||
|
3000,
|
||||||
|
);
|
||||||
|
} finally {
|
||||||
|
release();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const forceCapture = async () => {
|
||||||
|
// 检查是否正在捕获
|
||||||
|
if (!isCapturing.value) {
|
||||||
|
alert.warn("当前没有正在进行的捕获操作", 2000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const release = await operationMutex.acquire();
|
||||||
|
try {
|
||||||
|
const client = AuthManager.createClient(LogicAnalyzerClient);
|
||||||
|
|
||||||
|
// 执行强制捕获来停止当前捕获
|
||||||
|
const forceSuccess = await client.setCaptureMode(true, true);
|
||||||
if (!forceSuccess) {
|
if (!forceSuccess) {
|
||||||
throw new Error("无法执行强制捕获");
|
throw new Error("无法执行强制捕获");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 设置捕获状态为false,这会使轮询停止
|
await getCaptureData();
|
||||||
isCapturing.value = false;
|
alert.success(`强制捕获完成!`, 3000);
|
||||||
|
|
||||||
alert?.info("正在停止捕获...", 2000);
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("停止捕获失败:", error);
|
console.error("强制捕获失败:", error);
|
||||||
alert?.error(
|
alert.error(
|
||||||
`停止捕获失败: ${error instanceof Error ? error.message : "未知错误"}`,
|
`强制捕获失败: ${error instanceof Error ? error.message : "未知错误"}`,
|
||||||
3000,
|
3000,
|
||||||
);
|
);
|
||||||
|
} finally {
|
||||||
|
release();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -383,51 +737,51 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
|
|||||||
|
|
||||||
// 添加生成测试数据的方法
|
// 添加生成测试数据的方法
|
||||||
const generateTestData = () => {
|
const generateTestData = () => {
|
||||||
const sampleRate = 10000; // 10kHz sampling
|
const sampleRate = currentSampleFrequency.value; // 使用当前设置的采样频率
|
||||||
const duration = 1;
|
const duration = 0.001; // 1ms的数据
|
||||||
const points = Math.floor(sampleRate * duration);
|
const points = Math.floor(sampleRate * duration);
|
||||||
|
|
||||||
const x = Array.from(
|
const x = Array.from(
|
||||||
{ length: points },
|
{ length: points },
|
||||||
(_, i) => (i / sampleRate) * 1000,
|
(_, i) => (i * currentSamplePeriodNs.value) / 1000, // 时间轴,单位:微秒
|
||||||
); // time in ms
|
);
|
||||||
|
|
||||||
// Generate 8 channels with different digital patterns
|
// Generate 8 channels with different digital patterns
|
||||||
const y = [
|
const y = [
|
||||||
// Channel 0: Clock signal 100Hz
|
// Channel 0: Clock signal 1MHz
|
||||||
Array.from(
|
Array.from(
|
||||||
{ length: points },
|
{ length: points },
|
||||||
(_, i) => Math.floor((100 * i) / sampleRate) % 2,
|
(_, i) => Math.floor((1_000_000 * i) / sampleRate) % 2,
|
||||||
),
|
),
|
||||||
// Channel 1: Clock/2 signal 50Hz
|
// Channel 1: Clock/2 signal 500kHz
|
||||||
Array.from(
|
Array.from(
|
||||||
{ length: points },
|
{ length: points },
|
||||||
(_, i) => Math.floor((50 * i) / sampleRate) % 2,
|
(_, i) => Math.floor((500_000 * i) / sampleRate) % 2,
|
||||||
),
|
),
|
||||||
// Channel 2: Clock/4 signal 25Hz
|
// Channel 2: Clock/4 signal 250kHz
|
||||||
Array.from(
|
Array.from(
|
||||||
{ length: points },
|
{ length: points },
|
||||||
(_, i) => Math.floor((25 * i) / sampleRate) % 2,
|
(_, i) => Math.floor((250_000 * i) / sampleRate) % 2,
|
||||||
),
|
),
|
||||||
// Channel 3: Clock/8 signal 12.5Hz
|
// Channel 3: Clock/8 signal 125kHz
|
||||||
Array.from(
|
Array.from(
|
||||||
{ length: points },
|
{ length: points },
|
||||||
(_, i) => Math.floor((12.5 * i) / sampleRate) % 2,
|
(_, i) => Math.floor((125_000 * i) / sampleRate) % 2,
|
||||||
),
|
),
|
||||||
// Channel 4: Data signal (pseudo-random pattern)
|
// Channel 4: Data signal (pseudo-random pattern)
|
||||||
Array.from({ length: points }, (_, i) =>
|
Array.from({ length: points }, (_, i) =>
|
||||||
Math.abs(Math.floor(Math.sin(i * 0.01) * 10) % 2),
|
Math.abs(Math.floor(Math.sin(i * 0.001) * 10) % 2),
|
||||||
),
|
),
|
||||||
// Channel 5: Enable signal (periodic pulse)
|
// Channel 5: Enable signal (periodic pulse)
|
||||||
Array.from({ length: points }, (_, i) =>
|
Array.from({ length: points }, (_, i) =>
|
||||||
Math.floor(i / 50) % 10 < 3 ? 1 : 0,
|
Math.floor(i / 250) % 10 < 3 ? 1 : 0,
|
||||||
),
|
),
|
||||||
// Channel 6: Reset signal (occasional pulse)
|
// Channel 6: Reset signal (occasional pulse)
|
||||||
Array.from({ length: points }, (_, i) =>
|
Array.from({ length: points }, (_, i) =>
|
||||||
Math.floor(i / 200) % 20 === 0 ? 1 : 0,
|
Math.floor(i / 1000) % 20 === 0 ? 1 : 0,
|
||||||
),
|
),
|
||||||
// Channel 7: Status signal (slow changing)
|
// Channel 7: Status signal (slow changing)
|
||||||
Array.from({ length: points }, (_, i) => Math.floor(i / 1000) % 2),
|
Array.from({ length: points }, (_, i) => Math.floor(i / 5000) % 2),
|
||||||
];
|
];
|
||||||
|
|
||||||
// 同时更新通道标签为更有意义的名称
|
// 同时更新通道标签为更有意义的名称
|
||||||
@@ -447,8 +801,8 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
|
|||||||
});
|
});
|
||||||
|
|
||||||
// 设置逻辑数据
|
// 设置逻辑数据
|
||||||
enableAllChannels();
|
setChannelDiv(8);
|
||||||
setLogicData({ x, y, xUnit: "ms" });
|
setLogicData({ x, y, xUnit: "us" }); // 改为微秒单位
|
||||||
|
|
||||||
alert?.success("测试数据生成成功", 2000);
|
alert?.success("测试数据生成成功", 2000);
|
||||||
};
|
};
|
||||||
@@ -459,6 +813,10 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
|
|||||||
|
|
||||||
// 触发设置状态
|
// 触发设置状态
|
||||||
currentGlobalMode,
|
currentGlobalMode,
|
||||||
|
currentChannelDiv, // 导出当前通道组状态
|
||||||
|
captureLength, // 导出捕获深度
|
||||||
|
preCaptureLength, // 导出预捕获深度
|
||||||
|
currentclockDiv, // 导出当前采样频率状态
|
||||||
isApplying,
|
isApplying,
|
||||||
isCapturing, // 导出捕获状态
|
isCapturing, // 导出捕获状态
|
||||||
isOperationInProgress, // 导出操作进行状态
|
isOperationInProgress, // 导出操作进行状态
|
||||||
@@ -467,21 +825,34 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
|
|||||||
enabledChannelCount,
|
enabledChannelCount,
|
||||||
channelNames,
|
channelNames,
|
||||||
enabledChannels,
|
enabledChannels,
|
||||||
|
currentSampleFrequency, // 导出当前采样频率
|
||||||
|
currentSamplePeriodNs, // 导出当前采样周期
|
||||||
|
|
||||||
// 选项数据
|
// 选项数据
|
||||||
globalModes,
|
globalModes,
|
||||||
operators,
|
operators,
|
||||||
signalValues,
|
signalValues,
|
||||||
|
channelDivOptions, // 导出通道组选项
|
||||||
|
ClockDivOptions, // 导出采样频率选项
|
||||||
|
|
||||||
|
// 捕获深度常量和验证
|
||||||
|
CAPTURE_LENGTH_MIN,
|
||||||
|
CAPTURE_LENGTH_MAX,
|
||||||
|
PRE_CAPTURE_LENGTH_MIN,
|
||||||
|
validateCaptureLength,
|
||||||
|
validatePreCaptureLength,
|
||||||
|
setCaptureLength,
|
||||||
|
setPreCaptureLength,
|
||||||
|
|
||||||
// 触发设置方法
|
// 触发设置方法
|
||||||
enableAllChannels,
|
setChannelDiv, // 导出设置通道组方法
|
||||||
disableAllChannels,
|
|
||||||
setGlobalMode,
|
setGlobalMode,
|
||||||
applyConfiguration,
|
setClockDiv, // 导出设置采样频率方法
|
||||||
resetConfiguration,
|
resetConfiguration,
|
||||||
setLogicData,
|
setLogicData,
|
||||||
startCapture,
|
startCapture,
|
||||||
stopCapture, // 添加停止捕获方法
|
forceCapture,
|
||||||
|
stopCapture,
|
||||||
generateTestData,
|
generateTestData,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -21,51 +21,7 @@
|
|||||||
<h3 class="text-xl font-semibold text-slate-600 mb-2">
|
<h3 class="text-xl font-semibold text-slate-600 mb-2">
|
||||||
暂无逻辑分析数据
|
暂无逻辑分析数据
|
||||||
</h3>
|
</h3>
|
||||||
<p class="text-sm text-slate-500">点击下方按钮生成测试数据用于观察</p>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- <button
|
|
||||||
class="group relative px-8 py-3 bg-gradient-to-r from-blue-500 to-purple-600 hover:from-blue-600 hover:to-purple-700 text-white font-medium rounded-lg shadow-lg hover:shadow-xl transform hover:scale-105 transition-all duration-200 ease-in-out focus:outline-none focus:ring-4 focus:ring-blue-300 active:scale-95"
|
|
||||||
@click="analyzer.generateTestData"
|
|
||||||
>
|
|
||||||
<span class="flex items-center gap-2">
|
|
||||||
<RefreshCcw
|
|
||||||
class="w-5 h-5 group-hover:rotate-180 transition-transform duration-300"
|
|
||||||
/>
|
|
||||||
生成测试数据
|
|
||||||
</span>
|
|
||||||
<div
|
|
||||||
class="absolute inset-0 bg-white opacity-0 group-hover:opacity-20 rounded-lg transition-opacity duration-200"
|
|
||||||
></div>
|
|
||||||
</button> -->
|
|
||||||
<button
|
|
||||||
class="group relative px-8 py-3 bg-gradient-to-r text-white font-medium rounded-lg shadow-lg hover:shadow-xl transform hover:scale-105 transition-all duration-200 ease-in-out focus:outline-none focus:ring-4 active:scale-95"
|
|
||||||
:class="{
|
|
||||||
'from-blue-500 to-purple-600 hover:from-blue-600 hover:to-purple-700 focus:ring-blue-300':
|
|
||||||
!analyzer.isCapturing.value,
|
|
||||||
'from-red-500 to-red-600 hover:from-red-600 hover:to-red-700 focus:ring-red-300':
|
|
||||||
analyzer.isCapturing.value,
|
|
||||||
}"
|
|
||||||
:disabled="
|
|
||||||
analyzer.isOperationInProgress.value && !analyzer.isCapturing.value
|
|
||||||
"
|
|
||||||
@click="
|
|
||||||
analyzer.isCapturing.value
|
|
||||||
? analyzer.stopCapture()
|
|
||||||
: analyzer.startCapture()
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<span class="flex items-center gap-2">
|
|
||||||
<template v-if="analyzer.isCapturing.value">
|
|
||||||
<Square class="w-5 h-5" />
|
|
||||||
停止捕获
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
<Play class="w-5 h-5" />
|
|
||||||
开始捕获
|
|
||||||
</template>
|
|
||||||
</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -73,7 +29,6 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, shallowRef } from "vue";
|
import { computed, shallowRef } from "vue";
|
||||||
import VChart from "vue-echarts";
|
import VChart from "vue-echarts";
|
||||||
import { RefreshCcw, Play, Square } from "lucide-vue-next";
|
|
||||||
|
|
||||||
// Echarts
|
// Echarts
|
||||||
import { use } from "echarts/core";
|
import { use } from "echarts/core";
|
||||||
|
|||||||
@@ -1,132 +1,260 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="space-y-6">
|
<div class="space-y-6">
|
||||||
<!-- 通道状态概览 -->
|
|
||||||
<div class="stats stats-horizontal bg-base-100 shadow flex justify-between">
|
|
||||||
<div class="stat">
|
|
||||||
<div class="stat-title">总通道数</div>
|
|
||||||
<div class="stat-value text-primary">8</div>
|
|
||||||
<div class="stat-desc">逻辑分析仪通道</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="stat">
|
|
||||||
<div class="stat-title">启用通道</div>
|
|
||||||
<div class="stat-value text-success">{{ enabledChannelCount }}</div>
|
|
||||||
<div class="stat-desc">当前激活通道</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="stat">
|
|
||||||
<div class="stat-title">采样率</div>
|
|
||||||
<div class="stat-value text-info">100MHz</div>
|
|
||||||
<div class="stat-desc">最大采样频率</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 通道配置 -->
|
<!-- 通道配置 -->
|
||||||
<div class="form-control">
|
<div class="form-control">
|
||||||
<!-- 全局触发模式选择 -->
|
<!-- 全局触发模式选择和通道组配置 -->
|
||||||
<div class="flex flex-row justify-between my-4 mx-2">
|
<div class="flex flex-col gap-6 my-4 mx-2">
|
||||||
<div class="flex flex-row gap-4">
|
<div class="flex flex-col lg:flex-row gap-6">
|
||||||
<label class="label">
|
<div class="flex flex-col gap-2">
|
||||||
<span class="label-text text-sm">全局触发逻辑</span>
|
<label class="block text-sm font-semibold antialiased">
|
||||||
|
全局触发逻辑
|
||||||
</label>
|
</label>
|
||||||
<select
|
<div class="relative w-[200px]">
|
||||||
v-model="currentGlobalMode"
|
<button
|
||||||
@change="setGlobalMode(currentGlobalMode)"
|
tabindex="0"
|
||||||
class="select select-sm select-bordered w-full"
|
type="button"
|
||||||
|
class="flex items-center gap-4 justify-between h-max outline-none focus:outline-none bg-transparent ring-transparent border border-slate-200 transition-all duration-300 ease-in disabled:opacity-50 disabled:pointer-events-none select-none text-start text-sm rounded-md py-2 px-2.5 ring shadow-sm hover:border-slate-800 hover:ring-slate-800/10 focus:border-slate-800 focus:ring-slate-800/10 w-full"
|
||||||
|
@click="toggleGlobalModeDropdown"
|
||||||
|
:aria-expanded="showGlobalModeDropdown"
|
||||||
|
aria-haspopup="listbox"
|
||||||
|
role="combobox"
|
||||||
>
|
>
|
||||||
<option
|
<span>{{ currentGlobalModeLabel }}</span>
|
||||||
|
<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" color="currentColor" class="h-[1em] w-[1em] translate-x-0.5 stroke-[1.5]">
|
||||||
|
<path d="M17 8L12 3L7 8" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path>
|
||||||
|
<path d="M17 16L12 21L7 16" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
<input readonly style="display:none" :value="currentGlobalMode" />
|
||||||
|
<!-- 下拉菜单 -->
|
||||||
|
<div v-if="showGlobalModeDropdown" class="absolute top-full left-0 right-0 mt-1 bg-white border border-slate-200 rounded-md shadow-lg z-50">
|
||||||
|
<div
|
||||||
v-for="mode in globalModes"
|
v-for="mode in globalModes"
|
||||||
:key="mode.value"
|
:key="mode.value"
|
||||||
:value="mode.value"
|
@click="selectGlobalMode(mode.value)"
|
||||||
|
class="px-3 py-2 text-sm text-slate-700 hover:bg-slate-100 cursor-pointer"
|
||||||
|
:class="{ 'bg-slate-100': mode.value === currentGlobalMode }"
|
||||||
>
|
>
|
||||||
{{ mode.label }} - {{ mode.description }}
|
{{ mode.label }}
|
||||||
</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
<div class="flex flex-row gap-4">
|
</div>
|
||||||
<button @click="toggleAllChannels" class="btn btn-primary btn-sm">
|
<p class="flex items-center text-xs text-slate-400">
|
||||||
{{ enabledChannelCount > 0 ? "全部禁用" : "全部启用" }}
|
{{ currentGlobalModeDescription }}
|
||||||
</button>
|
</p>
|
||||||
|
</div>
|
||||||
|
<div class="flex flex-col gap-2">
|
||||||
|
<label class="block text-sm font-semibold antialiased">
|
||||||
|
通道组
|
||||||
|
</label>
|
||||||
|
<div class="relative w-[200px]">
|
||||||
<button
|
<button
|
||||||
@click="applyConfiguration"
|
tabindex="0"
|
||||||
:disabled="isApplying"
|
type="button"
|
||||||
class="btn btn-primary btn-sm"
|
class="flex items-center gap-4 justify-between h-max outline-none focus:outline-none bg-transparent ring-transparent border border-slate-200 transition-all duration-300 ease-in disabled:opacity-50 disabled:pointer-events-none select-none text-start text-sm rounded-md py-2 px-2.5 ring shadow-sm hover:border-slate-800 hover:ring-slate-800/10 focus:border-slate-800 focus:ring-slate-800/10 w-full"
|
||||||
|
@click="toggleChannelDivDropdown"
|
||||||
|
:aria-expanded="showChannelDivDropdown"
|
||||||
|
aria-haspopup="listbox"
|
||||||
|
role="combobox"
|
||||||
>
|
>
|
||||||
<span
|
<span>{{ currentChannelDivLabel }}</span>
|
||||||
v-if="isApplying"
|
<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" color="currentColor" class="h-[1em] w-[1em] translate-x-0.5 stroke-[1.5]">
|
||||||
class="loading loading-spinner loading-sm"
|
<path d="M17 8L12 3L7 8" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path>
|
||||||
></span>
|
<path d="M17 16L12 21L7 16" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path>
|
||||||
应用配置
|
</svg>
|
||||||
</button>
|
</button>
|
||||||
|
<input readonly style="display:none" :value="currentChannelDiv" />
|
||||||
<button @click="resetConfiguration" class="btn btn-outline btn-sm">
|
<!-- 下拉菜单 -->
|
||||||
重置
|
<div v-if="showChannelDivDropdown" class="absolute top-full left-0 right-0 mt-1 bg-white border border-slate-200 rounded-md shadow-lg z-50">
|
||||||
|
<div
|
||||||
|
v-for="option in channelDivOptions"
|
||||||
|
:key="option.value"
|
||||||
|
@click="selectChannelDiv(option.value)"
|
||||||
|
class="px-3 py-2 text-sm text-slate-700 hover:bg-slate-100 cursor-pointer"
|
||||||
|
:class="{ 'bg-slate-100': option.value === currentChannelDiv }"
|
||||||
|
>
|
||||||
|
{{ option.label }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<p class="flex items-center text-xs text-slate-400">
|
||||||
|
{{ currentChannelDivDescription }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div class="flex flex-col gap-2">
|
||||||
|
<label class="block text-sm font-semibold antialiased text-slate-800">
|
||||||
|
采样频率
|
||||||
|
</label>
|
||||||
|
<div class="relative w-[200px]">
|
||||||
|
<button
|
||||||
|
tabindex="0"
|
||||||
|
type="button"
|
||||||
|
class="flex items-center gap-4 justify-between h-max outline-none focus:outline-none text-slate-600 bg-transparent ring-transparent border border-slate-200 transition-all duration-300 ease-in disabled:opacity-50 disabled:pointer-events-none select-none text-start text-sm rounded-md py-2 px-2.5 ring shadow-sm hover:border-slate-800 hover:ring-slate-800/10 focus:border-slate-800 focus:ring-slate-800/10 w-full"
|
||||||
|
@click="toggleClockDivDropdown"
|
||||||
|
:aria-expanded="showClockDivDropdown"
|
||||||
|
aria-haspopup="listbox"
|
||||||
|
role="combobox"
|
||||||
|
>
|
||||||
|
<span>{{ currentClockDivLabel }}</span>
|
||||||
|
<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" color="currentColor" class="h-[1em] w-[1em] translate-x-0.5 stroke-[1.5]">
|
||||||
|
<path d="M17 8L12 3L7 8" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path>
|
||||||
|
<path d="M17 16L12 21L7 16" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path>
|
||||||
|
</svg>
|
||||||
</button>
|
</button>
|
||||||
|
<input readonly style="display:none" :value="currentclockDiv" />
|
||||||
|
<!-- 下拉菜单 -->
|
||||||
|
<div v-if="showClockDivDropdown" class="absolute top-full left-0 right-0 mt-1 bg-white border border-slate-200 rounded-md shadow-lg z-50">
|
||||||
|
<div
|
||||||
|
v-for="option in ClockDivOptions"
|
||||||
|
:key="option.value"
|
||||||
|
@click="selectClockDiv(option.value)"
|
||||||
|
class="px-3 py-2 text-sm text-slate-700 hover:bg-slate-100 cursor-pointer"
|
||||||
|
:class="{ 'bg-slate-100': option.value === currentclockDiv }"
|
||||||
|
>
|
||||||
|
{{ option.label }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<p class="flex items-center text-xs text-slate-400">
|
||||||
|
{{ currentClockDivDescription }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div class="flex flex-col gap-2">
|
||||||
|
<label class="block text-sm font-semibold antialiased">
|
||||||
|
捕获深度
|
||||||
|
</label>
|
||||||
|
<div class="relative w-[200px]">
|
||||||
|
<button
|
||||||
|
@click="decreaseCaptureLength"
|
||||||
|
class="absolute right-9 top-1 rounded-md border border-transparent p-1.5 text-center text-sm transition-all hover:bg-slate-100 focus:bg-slate-100 active:bg-slate-100 disabled:pointer-events-none disabled:opacity-50 disabled:shadow-none"
|
||||||
|
type="button"
|
||||||
|
:disabled="captureLength <= CAPTURE_LENGTH_MIN"
|
||||||
|
>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" class="w-4 h-4">
|
||||||
|
<path d="M3.75 7.25a.75.75 0 0 0 0 1.5h8.5a.75.75 0 0 0 0-1.5h-8.5Z" />
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
<input
|
||||||
|
v-model.number="captureLength"
|
||||||
|
@change="handleCaptureLengthChange"
|
||||||
|
type="number"
|
||||||
|
:min="CAPTURE_LENGTH_MIN"
|
||||||
|
:max="CAPTURE_LENGTH_MAX"
|
||||||
|
class="w-full bg-transparent placeholder:text-sm border border-slate-200 rounded-md pl-3 pr-20 py-2 transition duration-300 ease focus:outline-none focus:border-slate-400 ring ring-transparent hover:ring-slate-800/10 focus:ring-slate-800/10 hover:border-slate-800 shadow-sm focus:shadow appearance-none [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
|
||||||
|
:placeholder="CAPTURE_LENGTH_MIN.toString()"
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
@click="increaseCaptureLength"
|
||||||
|
class="absolute right-1 top-1 rounded-md border border-transparent p-1.5 text-center text-sm transition-all hover:bg-slate-100 focus:bg-slate-100 active:bg-slate-100 disabled:pointer-events-none disabled:opacity-50 disabled:shadow-none"
|
||||||
|
type="button"
|
||||||
|
:disabled="captureLength >= CAPTURE_LENGTH_MAX"
|
||||||
|
>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" class="w-4 h-4">
|
||||||
|
<path d="M8.75 3.75a.75.75 0 0 0-1.5 0v3.5h-3.5a.75.75 0 0 0 0 1.5h3.5v3.5a.75.75 0 0 0 1.5 0v-3.5h3.5a.75.75 0 0 0 0-1.5h-3.5v-3.5Z" />
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<p class="flex items-center text-xs text-slate-400">
|
||||||
|
范围: {{ CAPTURE_LENGTH_MIN.toLocaleString() }} - {{ CAPTURE_LENGTH_MAX.toLocaleString() }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div class="flex flex-col gap-2">
|
||||||
|
<label class="block text-sm font-semibold antialiased">
|
||||||
|
预捕获深度
|
||||||
|
</label>
|
||||||
|
<div class="relative w-[200px]">
|
||||||
|
<button
|
||||||
|
@click="decreasePreCaptureLength"
|
||||||
|
class="absolute right-9 top-1 rounded-md border border-transparent p-1.5 text-center text-sm transition-all hover:bg-slate-100 focus:bg-slate-100 active:bg-slate-100 disabled:pointer-events-none disabled:opacity-50 disabled:shadow-none"
|
||||||
|
type="button"
|
||||||
|
:disabled="preCaptureLength <= PRE_CAPTURE_LENGTH_MIN"
|
||||||
|
>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" class="w-4 h-4">
|
||||||
|
<path d="M3.75 7.25a.75.75 0 0 0 0 1.5h8.5a.75.75 0 0 0 0-1.5h-8.5Z" />
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
<input
|
||||||
|
v-model.number="preCaptureLength"
|
||||||
|
@change="handlePreCaptureLengthChange"
|
||||||
|
type="number"
|
||||||
|
:min="PRE_CAPTURE_LENGTH_MIN"
|
||||||
|
:max="Math.max(0, captureLength - 1)"
|
||||||
|
class="w-full bg-transparent placeholder:text-sm border border-slate-200 rounded-md pl-3 pr-20 py-2 transition duration-300 ease focus:outline-none focus:border-slate-400 ring ring-transparent hover:ring-slate-800/10 focus:ring-slate-800/10 hover:border-slate-800 shadow-sm focus:shadow appearance-none [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
|
||||||
|
:placeholder="PRE_CAPTURE_LENGTH_MIN.toString()"
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
@click="increasePreCaptureLength"
|
||||||
|
class="absolute right-1 top-1 rounded-md border border-transparent p-1.5 text-center text-sm transition-all hover:bg-slate-100 focus:bg-slate-100 active:bg-slate-100 disabled:pointer-events-none disabled:opacity-50 disabled:shadow-none"
|
||||||
|
type="button"
|
||||||
|
:disabled="preCaptureLength >= Math.max(0, captureLength - 1)"
|
||||||
|
>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" class="w-4 h-4">
|
||||||
|
<path d="M8.75 3.75a.75.75 0 0 0-1.5 0v3.5h-3.5a.75.75 0 0 0 0 1.5h3.5v3.5a.75.75 0 0 0 1.5 0v-3.5h3.5a.75.75 0 0 0 0-1.5h-3.5v-3.5Z" />
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<p class="flex items-center text-xs text-slate-400">
|
||||||
|
范围: {{ PRE_CAPTURE_LENGTH_MIN }} - {{ Math.max(0, captureLength - 1) }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div class="flex flex-col gap-2">
|
||||||
|
<label class="block text-sm font-semibold antialiased">
|
||||||
|
重置配置
|
||||||
|
</label>
|
||||||
|
<div class="relative w-[200px]">
|
||||||
|
<button
|
||||||
|
@click="resetConfiguration"
|
||||||
|
class="w-10 h-10 bg-transparent text-red-600 text-sm border border-red-200 rounded-md py-2 px-2.5 transition duration-300 ease ring ring-transparent hover:ring-red-600/10 focus:ring-red-600/10 hover:border-red-600 shadow-sm focus:shadow flex items-center justify-center"
|
||||||
|
type="button"
|
||||||
|
title="重置配置"
|
||||||
|
>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" class="w-4 h-4">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15" />
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<p class="flex items-center text-xs text-slate-400">
|
||||||
|
恢复所有设置到默认值
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- 通道列表 -->
|
<!-- 通道列表 -->
|
||||||
<div class="space-y-2">
|
<div class="space-y-2">
|
||||||
<!-- 表头 - 小屏幕单列时显示 -->
|
<!-- 表头 -->
|
||||||
<div
|
<div
|
||||||
class="flex items-center gap-2 p-2 bg-base-300 rounded-lg text-sm font-medium lg:hidden"
|
class="flex items-center gap-2 p-2 bg-base-300 rounded-lg text-sm font-medium"
|
||||||
>
|
>
|
||||||
<span class="w-16">通道</span>
|
<span class="w-16">通道</span>
|
||||||
<span class="w-20">启用/触发</span>
|
|
||||||
<span class="w-32">标签</span>
|
<span class="w-32">标签</span>
|
||||||
<span class="w-16">颜色</span>
|
<span class="w-16">颜色</span>
|
||||||
<span class="w-32">触发操作</span>
|
<span class="w-32">触发操作</span>
|
||||||
<span class="w-32">触发值</span>
|
<span class="w-32">触发值</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 通道配置网格 -->
|
<!-- 通道配置网格 - 根据当前通道组动态显示 -->
|
||||||
<div class="grid grid-cols-1 lg:grid-cols-2 gap-4">
|
<div class="grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4 gap-4">
|
||||||
<!-- 左列 (CH0-CH3) -->
|
|
||||||
<div class="space-y-2">
|
|
||||||
<!-- 左列表头 - 大屏幕时显示 -->
|
|
||||||
<div
|
<div
|
||||||
class="hidden lg:flex items-center gap-2 p-2 bg-base-300 rounded-lg text-sm font-medium"
|
v-for="(channel, index) in channels.filter(ch => ch.enabled)"
|
||||||
>
|
|
||||||
<span class="w-16">通道</span>
|
|
||||||
<span class="w-20">启用</span>
|
|
||||||
<span class="w-32">标签</span>
|
|
||||||
<span class="w-16">颜色</span>
|
|
||||||
<span class="w-32">触发操作</span>
|
|
||||||
<span class="w-32">触发值</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 左列通道 (0-3) -->
|
|
||||||
<div
|
|
||||||
v-for="(channel, index) in channels.slice(0, 4)"
|
|
||||||
:key="index"
|
:key="index"
|
||||||
class="flex items-center gap-2 p-3 bg-base-200 rounded-lg hover:bg-base-300 transition-colors"
|
class="flex items-center gap-2 p-3 bg-base-200 rounded-lg hover:bg-base-300 transition-colors"
|
||||||
>
|
>
|
||||||
<!-- 通道编号和颜色指示 -->
|
<!-- 通道编号和颜色指示 -->
|
||||||
<div class="flex items-center gap-2 w-16">
|
<div class="flex items-center gap-2 w-16">
|
||||||
<span class="font-mono font-medium">CH{{ index }}</span>
|
<span class="font-mono font-medium">CH{{ channels.indexOf(channel) }}</span>
|
||||||
<div
|
<div
|
||||||
class="w-3 h-3 rounded-full border-2 border-white shadow-sm"
|
class="w-3 h-3 rounded-full border-2 border-white shadow-sm"
|
||||||
:style="{ backgroundColor: channel.color }"
|
:style="{ backgroundColor: channel.color }"
|
||||||
></div>
|
></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 通道启用开关(同时控制触发) -->
|
|
||||||
<div class="form-control w-20">
|
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
v-model="channel.enabled"
|
|
||||||
class="toggle toggle-sm toggle-primary"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 通道标签 -->
|
<!-- 通道标签 -->
|
||||||
<div class="form-control w-32">
|
<div class="form-control w-32">
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
v-model="channel.label"
|
v-model="channel.label"
|
||||||
:placeholder="`通道 ${index}`"
|
:placeholder="`通道 ${channels.indexOf(channel)}`"
|
||||||
class="input input-sm input-bordered w-full"
|
class="input input-sm input-bordered w-full"
|
||||||
:disabled="!channel.enabled"
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -136,15 +264,13 @@
|
|||||||
type="color"
|
type="color"
|
||||||
v-model="channel.color"
|
v-model="channel.color"
|
||||||
class="w-8 h-8 rounded border-2 border-base-300 cursor-pointer"
|
class="w-8 h-8 rounded border-2 border-base-300 cursor-pointer"
|
||||||
:disabled="!channel.enabled"
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 触发操作符选择 -->
|
<!-- 触发操作符选择 -->
|
||||||
<select
|
<select
|
||||||
v-model="signalConfigs[index].operator"
|
v-model="signalConfigs[channels.indexOf(channel)].operator"
|
||||||
class="select select-sm select-bordered w-32"
|
class="select select-sm select-bordered w-32"
|
||||||
:disabled="!channel.enabled"
|
|
||||||
>
|
>
|
||||||
<option
|
<option
|
||||||
v-for="op in operators"
|
v-for="op in operators"
|
||||||
@@ -157,9 +283,8 @@
|
|||||||
|
|
||||||
<!-- 触发信号值选择 -->
|
<!-- 触发信号值选择 -->
|
||||||
<select
|
<select
|
||||||
v-model="signalConfigs[index].value"
|
v-model="signalConfigs[channels.indexOf(channel)].value"
|
||||||
class="select select-sm select-bordered w-32"
|
class="select select-sm select-bordered w-32"
|
||||||
:disabled="!channel.enabled"
|
|
||||||
>
|
>
|
||||||
<option
|
<option
|
||||||
v-for="val in signalValues"
|
v-for="val in signalValues"
|
||||||
@@ -172,174 +297,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 右列 (CH4-CH7) - 仅在大屏幕显示 -->
|
<!-- 当没有启用通道时的提示 -->
|
||||||
<div class="hidden lg:block space-y-2">
|
<div v-if="enabledChannelCount === 0" class="text-center py-8 text-base-content/60">
|
||||||
<!-- 右列表头 -->
|
<p class="text-lg font-medium">未启用任何通道</p>
|
||||||
<div
|
<p class="text-sm">请选择通道组来配置逻辑分析仪</p>
|
||||||
class="flex items-center gap-2 p-2 bg-base-300 rounded-lg text-sm font-medium"
|
|
||||||
>
|
|
||||||
<span class="w-16">通道</span>
|
|
||||||
<span class="w-20">启用/触发</span>
|
|
||||||
<span class="w-32">标签</span>
|
|
||||||
<span class="w-16">颜色</span>
|
|
||||||
<span class="w-32">触发操作</span>
|
|
||||||
<span class="w-32">触发值</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 右列通道 (4-7) -->
|
|
||||||
<div
|
|
||||||
v-for="(channel, index) in channels.slice(4, 8)"
|
|
||||||
:key="index + 4"
|
|
||||||
class="flex items-center gap-2 p-3 bg-base-200 rounded-lg hover:bg-base-300 transition-colors"
|
|
||||||
>
|
|
||||||
<!-- 通道编号和颜色指示 -->
|
|
||||||
<div class="flex items-center gap-2 w-16">
|
|
||||||
<span class="font-mono font-medium">CH{{ index + 4 }}</span>
|
|
||||||
<div
|
|
||||||
class="w-3 h-3 rounded-full border-2 border-white shadow-sm"
|
|
||||||
:style="{ backgroundColor: channel.color }"
|
|
||||||
></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 通道启用开关(同时控制触发) -->
|
|
||||||
<div class="form-control w-20">
|
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
v-model="channel.enabled"
|
|
||||||
class="toggle toggle-sm toggle-primary"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 通道标签 -->
|
|
||||||
<div class="form-control w-32">
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
v-model="channel.label"
|
|
||||||
:placeholder="`通道 ${index + 4}`"
|
|
||||||
class="input input-sm input-bordered w-full"
|
|
||||||
:disabled="!channel.enabled"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 颜色选择 -->
|
|
||||||
<div class="form-control w-16">
|
|
||||||
<input
|
|
||||||
type="color"
|
|
||||||
v-model="channel.color"
|
|
||||||
class="w-8 h-8 rounded border-2 border-base-300 cursor-pointer"
|
|
||||||
:disabled="!channel.enabled"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 触发操作符选择 -->
|
|
||||||
<select
|
|
||||||
v-model="signalConfigs[index + 4].operator"
|
|
||||||
class="select select-sm select-bordered w-32"
|
|
||||||
:disabled="!channel.enabled"
|
|
||||||
>
|
|
||||||
<option
|
|
||||||
v-for="op in operators"
|
|
||||||
:key="op.value"
|
|
||||||
:value="op.value"
|
|
||||||
>
|
|
||||||
{{ op.label }}
|
|
||||||
</option>
|
|
||||||
</select>
|
|
||||||
|
|
||||||
<!-- 触发信号值选择 -->
|
|
||||||
<select
|
|
||||||
v-model="signalConfigs[index + 4].value"
|
|
||||||
class="select select-sm select-bordered w-32"
|
|
||||||
:disabled="!channel.enabled"
|
|
||||||
>
|
|
||||||
<option
|
|
||||||
v-for="val in signalValues"
|
|
||||||
:key="val.value"
|
|
||||||
:value="val.value"
|
|
||||||
>
|
|
||||||
{{ val.label }}
|
|
||||||
</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 小屏幕时继续显示 CH4-CH7 -->
|
|
||||||
<div class="lg:hidden space-y-2">
|
|
||||||
<div
|
|
||||||
v-for="(channel, index) in channels.slice(4, 8)"
|
|
||||||
:key="index + 4"
|
|
||||||
class="flex items-center gap-2 p-3 bg-base-200 rounded-lg hover:bg-base-300 transition-colors"
|
|
||||||
>
|
|
||||||
<!-- 通道编号和颜色指示 -->
|
|
||||||
<div class="flex items-center gap-2 w-16">
|
|
||||||
<span class="font-mono font-medium">CH{{ index + 4 }}</span>
|
|
||||||
<div
|
|
||||||
class="w-3 h-3 rounded-full border-2 border-white shadow-sm"
|
|
||||||
:style="{ backgroundColor: channel.color }"
|
|
||||||
></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 通道启用开关(同时控制触发) -->
|
|
||||||
<div class="form-control w-20">
|
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
v-model="channel.enabled"
|
|
||||||
class="toggle toggle-sm toggle-primary"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 通道标签 -->
|
|
||||||
<div class="form-control w-32">
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
v-model="channel.label"
|
|
||||||
:placeholder="`通道 ${index + 4}`"
|
|
||||||
class="input input-sm input-bordered w-full"
|
|
||||||
:disabled="!channel.enabled"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 颜色选择 -->
|
|
||||||
<div class="form-control w-16">
|
|
||||||
<input
|
|
||||||
type="color"
|
|
||||||
v-model="channel.color"
|
|
||||||
class="w-8 h-8 rounded border-2 border-base-300 cursor-pointer"
|
|
||||||
:disabled="!channel.enabled"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 触发操作符选择 -->
|
|
||||||
<select
|
|
||||||
v-model="signalConfigs[index + 4].operator"
|
|
||||||
class="select select-sm select-bordered w-32"
|
|
||||||
:disabled="!channel.enabled"
|
|
||||||
>
|
|
||||||
<option
|
|
||||||
v-for="op in operators"
|
|
||||||
:key="op.value"
|
|
||||||
:value="op.value"
|
|
||||||
>
|
|
||||||
{{ op.label }}
|
|
||||||
</option>
|
|
||||||
</select>
|
|
||||||
|
|
||||||
<!-- 触发信号值选择 -->
|
|
||||||
<select
|
|
||||||
v-model="signalConfigs[index + 4].value"
|
|
||||||
class="select select-sm select-bordered w-32"
|
|
||||||
:disabled="!channel.enabled"
|
|
||||||
>
|
|
||||||
<option
|
|
||||||
v-for="val in signalValues"
|
|
||||||
:key="val.value"
|
|
||||||
:value="val.value"
|
|
||||||
>
|
|
||||||
{{ val.label }}
|
|
||||||
</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -347,11 +308,16 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
|
import { computed, ref, onMounted, onUnmounted } from "vue";
|
||||||
import { useRequiredInjection } from "@/utils/Common";
|
import { useRequiredInjection } from "@/utils/Common";
|
||||||
import { useLogicAnalyzerState } from "./LogicAnalyzerManager";
|
import { useLogicAnalyzerState } from "./LogicAnalyzerManager";
|
||||||
|
|
||||||
const {
|
const {
|
||||||
currentGlobalMode,
|
currentGlobalMode,
|
||||||
|
currentChannelDiv,
|
||||||
|
currentclockDiv,
|
||||||
|
captureLength,
|
||||||
|
preCaptureLength,
|
||||||
isApplying,
|
isApplying,
|
||||||
channels,
|
channels,
|
||||||
signalConfigs,
|
signalConfigs,
|
||||||
@@ -359,18 +325,154 @@ const {
|
|||||||
globalModes,
|
globalModes,
|
||||||
operators,
|
operators,
|
||||||
signalValues,
|
signalValues,
|
||||||
enableAllChannels,
|
channelDivOptions,
|
||||||
disableAllChannels,
|
ClockDivOptions,
|
||||||
|
CAPTURE_LENGTH_MIN,
|
||||||
|
CAPTURE_LENGTH_MAX,
|
||||||
|
PRE_CAPTURE_LENGTH_MIN,
|
||||||
|
validateCaptureLength,
|
||||||
|
validatePreCaptureLength,
|
||||||
|
setCaptureLength,
|
||||||
|
setPreCaptureLength,
|
||||||
|
setChannelDiv,
|
||||||
setGlobalMode,
|
setGlobalMode,
|
||||||
applyConfiguration,
|
setClockDiv,
|
||||||
resetConfiguration,
|
resetConfiguration,
|
||||||
} = useRequiredInjection(useLogicAnalyzerState);
|
} = useRequiredInjection(useLogicAnalyzerState);
|
||||||
|
|
||||||
const toggleAllChannels = () => {
|
// 下拉菜单状态
|
||||||
if (enabledChannelCount.value > 0) {
|
const showGlobalModeDropdown = ref(false);
|
||||||
disableAllChannels();
|
const showChannelDivDropdown = ref(false);
|
||||||
} else {
|
const showClockDivDropdown = ref(false);
|
||||||
enableAllChannels();
|
|
||||||
|
// 处理捕获深度变化
|
||||||
|
const handleCaptureLengthChange = () => {
|
||||||
|
setCaptureLength(captureLength.value);
|
||||||
|
};
|
||||||
|
|
||||||
|
// 处理预捕获深度变化
|
||||||
|
const handlePreCaptureLengthChange = () => {
|
||||||
|
setPreCaptureLength(preCaptureLength.value);
|
||||||
|
};
|
||||||
|
|
||||||
|
// 增加捕获深度
|
||||||
|
const increaseCaptureLength = () => {
|
||||||
|
const newValue = Math.min(captureLength.value + 1024, CAPTURE_LENGTH_MAX);
|
||||||
|
setCaptureLength(newValue);
|
||||||
|
};
|
||||||
|
|
||||||
|
// 减少捕获深度
|
||||||
|
const decreaseCaptureLength = () => {
|
||||||
|
const newValue = Math.max(captureLength.value - 1024, CAPTURE_LENGTH_MIN);
|
||||||
|
setCaptureLength(newValue);
|
||||||
|
};
|
||||||
|
|
||||||
|
// 增加预捕获深度
|
||||||
|
const increasePreCaptureLength = () => {
|
||||||
|
const maxValue = Math.max(0, captureLength.value - 1);
|
||||||
|
const newValue = Math.min(preCaptureLength.value + 64, maxValue);
|
||||||
|
setPreCaptureLength(newValue);
|
||||||
|
};
|
||||||
|
|
||||||
|
// 减少预捕获深度
|
||||||
|
const decreasePreCaptureLength = () => {
|
||||||
|
const newValue = Math.max(preCaptureLength.value - 64, PRE_CAPTURE_LENGTH_MIN);
|
||||||
|
setPreCaptureLength(newValue);
|
||||||
|
};
|
||||||
|
|
||||||
|
// 计算属性:获取当前全局模式的标签
|
||||||
|
const currentGlobalModeLabel = computed(() => {
|
||||||
|
const mode = globalModes.find(m => m.value === currentGlobalMode.value);
|
||||||
|
return mode ? mode.label : '';
|
||||||
|
});
|
||||||
|
|
||||||
|
// 计算属性:获取当前全局模式的描述
|
||||||
|
const currentGlobalModeDescription = computed(() => {
|
||||||
|
const mode = globalModes.find(m => m.value === currentGlobalMode.value);
|
||||||
|
return mode ? mode.description : '';
|
||||||
|
});
|
||||||
|
|
||||||
|
// 计算属性:获取当前通道组的标签
|
||||||
|
const currentChannelDivLabel = computed(() => {
|
||||||
|
const option = channelDivOptions.find(opt => opt.value === currentChannelDiv.value);
|
||||||
|
return option ? option.label : '';
|
||||||
|
});
|
||||||
|
|
||||||
|
// 计算属性:获取当前通道组的描述
|
||||||
|
const currentChannelDivDescription = computed(() => {
|
||||||
|
const option = channelDivOptions.find(opt => opt.value === currentChannelDiv.value);
|
||||||
|
return option ? option.description : '';
|
||||||
|
});
|
||||||
|
|
||||||
|
// 计算属性:获取当前采样频率的标签
|
||||||
|
const currentClockDivLabel = computed(() => {
|
||||||
|
const option = ClockDivOptions.find(opt => opt.value === currentclockDiv.value);
|
||||||
|
return option ? option.label : '';
|
||||||
|
});
|
||||||
|
|
||||||
|
// 计算属性:获取当前采样频率的描述
|
||||||
|
const currentClockDivDescription = computed(() => {
|
||||||
|
const option = ClockDivOptions.find(opt => opt.value === currentclockDiv.value);
|
||||||
|
return option ? option.description : '';
|
||||||
|
});
|
||||||
|
|
||||||
|
// 全局模式下拉菜单相关函数
|
||||||
|
const toggleGlobalModeDropdown = () => {
|
||||||
|
showGlobalModeDropdown.value = !showGlobalModeDropdown.value;
|
||||||
|
if (showGlobalModeDropdown.value) {
|
||||||
|
showChannelDivDropdown.value = false;
|
||||||
|
showClockDivDropdown.value = false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const selectGlobalMode = (mode: any) => {
|
||||||
|
setGlobalMode(mode);
|
||||||
|
showGlobalModeDropdown.value = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
// 通道组下拉菜单相关函数
|
||||||
|
const toggleChannelDivDropdown = () => {
|
||||||
|
showChannelDivDropdown.value = !showChannelDivDropdown.value;
|
||||||
|
if (showChannelDivDropdown.value) {
|
||||||
|
showGlobalModeDropdown.value = false;
|
||||||
|
showClockDivDropdown.value = false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const selectChannelDiv = (value: number) => {
|
||||||
|
setChannelDiv(value);
|
||||||
|
showChannelDivDropdown.value = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
// 采样频率下拉菜单相关函数
|
||||||
|
const toggleClockDivDropdown = () => {
|
||||||
|
showClockDivDropdown.value = !showClockDivDropdown.value;
|
||||||
|
if (showClockDivDropdown.value) {
|
||||||
|
showGlobalModeDropdown.value = false;
|
||||||
|
showChannelDivDropdown.value = false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const selectClockDiv = (value: any) => {
|
||||||
|
setClockDiv(value);
|
||||||
|
showClockDivDropdown.value = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
// 点击其他地方关闭下拉菜单
|
||||||
|
const handleClickOutside = (event: MouseEvent) => {
|
||||||
|
const target = event.target as HTMLElement;
|
||||||
|
if (!target.closest('.relative')) {
|
||||||
|
showGlobalModeDropdown.value = false;
|
||||||
|
showChannelDivDropdown.value = false;
|
||||||
|
showClockDivDropdown.value = false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
document.addEventListener('click', handleClickOutside);
|
||||||
|
});
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
document.removeEventListener('click', handleClickOutside);
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
33
src/components/MarkdownEditor.vue
Normal file
33
src/components/MarkdownEditor.vue
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { ref } from "vue";
|
||||||
|
import { MdEditor } from "md-editor-v3";
|
||||||
|
import "md-editor-v3/lib/style.css";
|
||||||
|
import { useThemeStore } from "@/stores/theme";
|
||||||
|
|
||||||
|
const theme = useThemeStore();
|
||||||
|
|
||||||
|
const text = ref("# Hello Editor");
|
||||||
|
|
||||||
|
async function handleSaveEvent(v: string, h: Promise<string>) {}
|
||||||
|
|
||||||
|
async function loadMarkdownFromString(markdown: string) {
|
||||||
|
text.value = markdown;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadMarkdownFromUrl(url: string) {
|
||||||
|
const response = await fetch(url);
|
||||||
|
const markdown = await response.text();
|
||||||
|
text.value = markdown;
|
||||||
|
}
|
||||||
|
|
||||||
|
defineExpose({
|
||||||
|
loadMarkdownFromString,
|
||||||
|
loadMarkdownFromUrl,
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<MdEditor v-model="text" :theme="theme.currentMode" />
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style lang="postcss" scoped></style>
|
||||||
@@ -1,21 +1,27 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, onMounted, ref, watch } from 'vue';
|
import { computed, onMounted, ref, watch } from "vue";
|
||||||
import { marked } from 'marked';
|
import { marked } from "marked";
|
||||||
import hljs from 'highlight.js';
|
import hljs from "highlight.js";
|
||||||
// 导入亮色主题样式
|
// 导入亮色主题样式
|
||||||
import 'highlight.js/styles/github.css'; // 亮色主题
|
import "highlight.js/styles/github.css"; // 亮色主题
|
||||||
// 导入主题存储
|
// 导入主题存储
|
||||||
import { useThemeStore } from '@/stores/theme';
|
import { useThemeStore } from "@/stores/theme";
|
||||||
|
import { AuthManager } from "@/utils/AuthManager";
|
||||||
|
import { ResourceClient, ResourcePurpose } from "@/APIClient";
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
content: {
|
content: {
|
||||||
type: String,
|
type: String,
|
||||||
required: true
|
required: true,
|
||||||
},
|
},
|
||||||
removeFirstH1: {
|
removeFirstH1: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false,
|
||||||
}
|
},
|
||||||
|
examId: {
|
||||||
|
type: String,
|
||||||
|
default: "",
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
// 使用主题存储
|
// 使用主题存储
|
||||||
@@ -23,11 +29,59 @@ const themeStore = useThemeStore();
|
|||||||
// 使用 isDarkTheme 函数来检查当前是否为暗色主题
|
// 使用 isDarkTheme 函数来检查当前是否为暗色主题
|
||||||
const isDarkMode = computed(() => themeStore.isDarkTheme());
|
const isDarkMode = computed(() => themeStore.isDarkTheme());
|
||||||
|
|
||||||
|
// 图片资源缓存
|
||||||
|
const imageResourceCache = ref<Map<string, string>>(new Map());
|
||||||
|
|
||||||
|
// 获取图片资源ID的函数
|
||||||
|
async function getImageResourceId(
|
||||||
|
examId: string,
|
||||||
|
imagePath: string,
|
||||||
|
): Promise<string | null> {
|
||||||
|
try {
|
||||||
|
const client = AuthManager.createClient(ResourceClient);
|
||||||
|
const resources = await client.getResourceList(
|
||||||
|
examId,
|
||||||
|
"images",
|
||||||
|
ResourcePurpose.Template,
|
||||||
|
);
|
||||||
|
|
||||||
|
// 查找匹配的图片资源
|
||||||
|
const imageResource = resources.find(
|
||||||
|
(r) => r.name === imagePath || r.name.endsWith(imagePath),
|
||||||
|
);
|
||||||
|
|
||||||
|
return imageResource ? imageResource.id.toString() : null;
|
||||||
|
} catch (error) {
|
||||||
|
console.error("获取图片资源ID失败:", error);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 通过资源ID获取图片数据URL
|
||||||
|
async function getImageDataUrl(resourceId: string): Promise<string | null> {
|
||||||
|
try {
|
||||||
|
const client = AuthManager.createClient(ResourceClient);
|
||||||
|
const response = await client.getResourceById(parseInt(resourceId));
|
||||||
|
|
||||||
|
if (response && response.data) {
|
||||||
|
return URL.createObjectURL(response.data);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
} catch (error) {
|
||||||
|
console.error("获取图片数据失败:", error);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 监听主题变化
|
// 监听主题变化
|
||||||
watch(() => themeStore.currentTheme, () => {
|
watch(
|
||||||
|
() => themeStore.currentTheme,
|
||||||
|
() => {
|
||||||
// 主题变化时更新代码高亮样式
|
// 主题变化时更新代码高亮样式
|
||||||
updateCodeBlocksTheme();
|
updateCodeBlocksTheme();
|
||||||
});
|
},
|
||||||
|
);
|
||||||
|
|
||||||
// 更新代码块主题样式
|
// 更新代码块主题样式
|
||||||
const updateCodeBlocksTheme = () => {
|
const updateCodeBlocksTheme = () => {
|
||||||
@@ -37,44 +91,128 @@ const updateCodeBlocksTheme = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const renderedContent = computed(() => {
|
const renderedContent = computed(() => {
|
||||||
if (!props.content) return '<p>没有内容</p>';
|
if (!props.content) return "<p>没有内容</p>";
|
||||||
|
|
||||||
let processedContent = props.content;
|
let processedContent = props.content;
|
||||||
|
|
||||||
// 如果需要,移除第一个一级标题
|
// 如果需要,移除第一个一级标题
|
||||||
if (props.removeFirstH1) {
|
if (props.removeFirstH1) {
|
||||||
const lines = processedContent.split('\n');
|
const lines = processedContent.split("\n");
|
||||||
const firstH1Index = lines.findIndex(line => line.startsWith('# '));
|
const firstH1Index = lines.findIndex((line) => line.startsWith("# "));
|
||||||
|
|
||||||
if (firstH1Index !== -1) {
|
if (firstH1Index !== -1) {
|
||||||
processedContent = lines.slice(firstH1Index + 1).join('\n');
|
processedContent = lines.slice(firstH1Index + 1).join("\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 创建自定义渲染器
|
// 创建自定义渲染器
|
||||||
const renderer = new marked.Renderer();
|
const renderer = new marked.Renderer();
|
||||||
|
|
||||||
|
// 重写图片渲染方法,处理相对路径
|
||||||
|
renderer.image = (href, title, text) => {
|
||||||
|
let src = href;
|
||||||
|
|
||||||
|
console.log(`原始图片路径: ${href}, examId: ${props.examId}`);
|
||||||
|
|
||||||
|
// 如果是相对路径且有实验ID,需要通过动态API获取
|
||||||
|
if (props.examId && href && href.startsWith("./")) {
|
||||||
|
// 对于相对路径的图片,我们需要先获取图片资源ID,然后通过动态API获取
|
||||||
|
// 暂时保留原始路径,在后处理中进行替换
|
||||||
|
src = href;
|
||||||
|
console.log(`保留原始路径用于后处理: ${src}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const titleAttr = title ? ` title="${title}"` : "";
|
||||||
|
const altAttr = text ? ` alt="${text}"` : "";
|
||||||
|
const dataOriginal =
|
||||||
|
href && href.startsWith("./") ? ` data-original-src="${href}"` : "";
|
||||||
|
console.log(
|
||||||
|
`最终渲染的HTML: <img src="${src}"${titleAttr}${altAttr}${dataOriginal} />`,
|
||||||
|
);
|
||||||
|
return `<img src="${src}"${titleAttr}${altAttr}${dataOriginal} />`;
|
||||||
|
};
|
||||||
|
|
||||||
// 重写代码块渲染方法,添加语言信息
|
// 重写代码块渲染方法,添加语言信息
|
||||||
renderer.code = (code, incomingLanguage) => {
|
renderer.code = (code, incomingLanguage) => {
|
||||||
// 确保语言参数是字符串
|
// 确保语言参数是字符串
|
||||||
const language = incomingLanguage || 'plaintext';
|
const language = incomingLanguage || "plaintext";
|
||||||
// 验证语言
|
// 验证语言
|
||||||
const validLanguage = hljs.getLanguage(language) ? language : 'plaintext';
|
const validLanguage = hljs.getLanguage(language) ? language : "plaintext";
|
||||||
// 高亮代码
|
// 高亮代码
|
||||||
const highlightedCode = hljs.highlight(code, { language: validLanguage }).value;
|
const highlightedCode = hljs.highlight(code, {
|
||||||
|
language: validLanguage,
|
||||||
|
}).value;
|
||||||
|
|
||||||
// 添加语言标签到代码块
|
// 添加语言标签到代码块
|
||||||
return `<pre class="hljs" data-language="${validLanguage}"><code class="language-${validLanguage}">${highlightedCode}</code></pre>`;
|
return `<pre class="hljs" data-language="${validLanguage}"><code class="language-${validLanguage}">${highlightedCode}</code></pre>`;
|
||||||
};
|
};
|
||||||
|
|
||||||
// 设置 marked 选项
|
// 设置 marked 选项并解析内容
|
||||||
marked.use({
|
let html = marked.parse(processedContent, {
|
||||||
renderer: renderer,
|
renderer: renderer,
|
||||||
gfm: true,
|
gfm: true,
|
||||||
breaks: true
|
breaks: true,
|
||||||
});
|
}) as string;
|
||||||
|
|
||||||
return marked(processedContent);
|
// 后处理HTML,异步处理图片
|
||||||
|
if (props.examId) {
|
||||||
|
// 查找所有需要处理的图片
|
||||||
|
const imgMatches = Array.from(
|
||||||
|
html.matchAll(
|
||||||
|
/(<img[^>]+data-original-src=["'])\.\/([^"']+)(["'][^>]*>)/g,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
// 异步处理每个图片
|
||||||
|
imgMatches.forEach(async (match) => {
|
||||||
|
const [fullMatch, prefix, path, suffix] = match;
|
||||||
|
const imagePath = path.replace("images/", "");
|
||||||
|
|
||||||
|
// 检查缓存
|
||||||
|
if (imageResourceCache.value.has(imagePath)) {
|
||||||
|
const cachedUrl = imageResourceCache.value.get(imagePath)!;
|
||||||
|
html = html.replace(
|
||||||
|
fullMatch,
|
||||||
|
`${prefix}${cachedUrl}${suffix.replace(' data-original-src="./' + path + '"', "")}`,
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
// 获取图片资源ID
|
||||||
|
const resourceId = await getImageResourceId(props.examId, imagePath);
|
||||||
|
if (resourceId) {
|
||||||
|
// 获取图片数据URL
|
||||||
|
const dataUrl = await getImageDataUrl(resourceId);
|
||||||
|
if (dataUrl) {
|
||||||
|
// 缓存URL
|
||||||
|
imageResourceCache.value.set(imagePath, dataUrl);
|
||||||
|
|
||||||
|
// 更新HTML中的图片src
|
||||||
|
const updatedHtml = html.replace(
|
||||||
|
fullMatch,
|
||||||
|
`${prefix}${dataUrl}${suffix.replace(' data-original-src="./' + path + '"', "")}`,
|
||||||
|
);
|
||||||
|
|
||||||
|
// 触发重新渲染
|
||||||
|
setTimeout(() => {
|
||||||
|
const imgElements = document.querySelectorAll(
|
||||||
|
`img[data-original-src="./${path}"]`,
|
||||||
|
);
|
||||||
|
imgElements.forEach((img) => {
|
||||||
|
(img as HTMLImageElement).src = dataUrl;
|
||||||
|
img.removeAttribute("data-original-src");
|
||||||
|
});
|
||||||
|
}, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error(`处理图片 ${imagePath} 失败:`, error);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return html;
|
||||||
});
|
});
|
||||||
|
|
||||||
// 页面挂载后,确保应用正确的主题样式
|
// 页面挂载后,确保应用正确的主题样式
|
||||||
@@ -84,7 +222,11 @@ onMounted(() => {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="markdown-content" :data-theme="themeStore.currentTheme" v-html="renderedContent"></div>
|
<div
|
||||||
|
class="markdown-content"
|
||||||
|
:data-theme="themeStore.currentTheme"
|
||||||
|
v-html="renderedContent"
|
||||||
|
></div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
@@ -160,7 +302,7 @@ onMounted(() => {
|
|||||||
.markdown-content :deep(h4::before),
|
.markdown-content :deep(h4::before),
|
||||||
.markdown-content :deep(h5::before),
|
.markdown-content :deep(h5::before),
|
||||||
.markdown-content :deep(h6::before) {
|
.markdown-content :deep(h6::before) {
|
||||||
content: '▶';
|
content: "▶";
|
||||||
color: hsl(var(--p) / 0.7);
|
color: hsl(var(--p) / 0.7);
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 0.2rem;
|
left: 0.2rem;
|
||||||
@@ -241,7 +383,7 @@ onMounted(() => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.markdown-content :deep(pre::before) {
|
.markdown-content :deep(pre::before) {
|
||||||
content: '';
|
content: "";
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
@@ -267,7 +409,9 @@ onMounted(() => {
|
|||||||
|
|
||||||
/* 内联代码样式 */
|
/* 内联代码样式 */
|
||||||
.markdown-content :deep(code) {
|
.markdown-content :deep(code) {
|
||||||
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
|
font-family:
|
||||||
|
ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono",
|
||||||
|
"Courier New", monospace;
|
||||||
background-color: var(--inline-code-bg, hsl(var(--b3) / 0.7));
|
background-color: var(--inline-code-bg, hsl(var(--b3) / 0.7));
|
||||||
padding: 0.2rem 0.5rem;
|
padding: 0.2rem 0.5rem;
|
||||||
border-radius: 0.25rem;
|
border-radius: 0.25rem;
|
||||||
@@ -284,7 +428,9 @@ onMounted(() => {
|
|||||||
color: inherit;
|
color: inherit;
|
||||||
font-size: 0.95em;
|
font-size: 0.95em;
|
||||||
line-height: 1.5;
|
line-height: 1.5;
|
||||||
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
|
font-family:
|
||||||
|
ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono",
|
||||||
|
"Courier New", monospace;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 为常见语言添加一些特殊的高亮效果 */
|
/* 为常见语言添加一些特殊的高亮效果 */
|
||||||
|
|||||||
@@ -31,6 +31,12 @@
|
|||||||
工程界面
|
工程界面
|
||||||
</router-link>
|
</router-link>
|
||||||
</li>
|
</li>
|
||||||
|
<li class="my-1 hover:translate-x-1 transition-all duration-300">
|
||||||
|
<router-link to="/exam" class="text-base font-medium">
|
||||||
|
<FileText class="icon" />
|
||||||
|
实验列表
|
||||||
|
</router-link>
|
||||||
|
</li>
|
||||||
<li class="my-1 hover:translate-x-1 transition-all duration-300">
|
<li class="my-1 hover:translate-x-1 transition-all duration-300">
|
||||||
<router-link to="/test" class="text-base font-medium">
|
<router-link to="/test" class="text-base font-medium">
|
||||||
<FlaskConical class="icon" />
|
<FlaskConical class="icon" />
|
||||||
@@ -38,7 +44,7 @@
|
|||||||
</router-link>
|
</router-link>
|
||||||
</li>
|
</li>
|
||||||
<li class="my-1 hover:translate-x-1 transition-all duration-300">
|
<li class="my-1 hover:translate-x-1 transition-all duration-300">
|
||||||
<router-link to="/markdown-test" class="text-base font-medium">
|
<router-link to="/markdown" class="text-base font-medium">
|
||||||
<FileText class="icon" />
|
<FileText class="icon" />
|
||||||
Markdown测试
|
Markdown测试
|
||||||
</router-link>
|
</router-link>
|
||||||
@@ -139,6 +145,7 @@ import {
|
|||||||
ChevronDownIcon,
|
ChevronDownIcon,
|
||||||
} from "lucide-vue-next";
|
} from "lucide-vue-next";
|
||||||
import { AuthManager } from "@/utils/AuthManager";
|
import { AuthManager } from "@/utils/AuthManager";
|
||||||
|
import { DataClient } from "@/APIClient";
|
||||||
|
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
|
||||||
@@ -152,7 +159,7 @@ const loadUserInfo = async () => {
|
|||||||
try {
|
try {
|
||||||
const authenticated = await AuthManager.isAuthenticated();
|
const authenticated = await AuthManager.isAuthenticated();
|
||||||
if (authenticated) {
|
if (authenticated) {
|
||||||
const client = AuthManager.createAuthenticatedDataClient();
|
const client = AuthManager.createClient(DataClient);
|
||||||
const userInfo = await client.getUserInfo();
|
const userInfo = await client.getUserInfo();
|
||||||
userName.value = userInfo.name;
|
userName.value = userInfo.name;
|
||||||
isLoggedIn.value = true;
|
isLoggedIn.value = true;
|
||||||
|
|||||||
390
src/components/Oscilloscope/OscilloscopeManager.ts
Normal file
390
src/components/Oscilloscope/OscilloscopeManager.ts
Normal file
@@ -0,0 +1,390 @@
|
|||||||
|
import {
|
||||||
|
autoResetRef,
|
||||||
|
createInjectionState,
|
||||||
|
watchDebounced,
|
||||||
|
} from "@vueuse/core";
|
||||||
|
import {
|
||||||
|
shallowRef,
|
||||||
|
reactive,
|
||||||
|
ref,
|
||||||
|
computed,
|
||||||
|
onMounted,
|
||||||
|
onUnmounted,
|
||||||
|
watchEffect,
|
||||||
|
} from "vue";
|
||||||
|
import { Mutex } from "async-mutex";
|
||||||
|
import { OscilloscopeApiClient } from "@/APIClient";
|
||||||
|
import { AuthManager } from "@/utils/AuthManager";
|
||||||
|
import { useAlertStore } from "@/components/Alert";
|
||||||
|
import { useRequiredInjection } from "@/utils/Common";
|
||||||
|
import type { HubConnection } from "@microsoft/signalr";
|
||||||
|
import type {
|
||||||
|
IOscilloscopeHub,
|
||||||
|
IOscilloscopeReceiver,
|
||||||
|
} from "@/utils/signalR/TypedSignalR.Client/server.Hubs";
|
||||||
|
import {
|
||||||
|
getHubProxyFactory,
|
||||||
|
getReceiverRegister,
|
||||||
|
} from "@/utils/signalR/TypedSignalR.Client";
|
||||||
|
import type {
|
||||||
|
OscilloscopeDataResponse,
|
||||||
|
OscilloscopeFullConfig,
|
||||||
|
} from "@/utils/signalR/server.Hubs";
|
||||||
|
|
||||||
|
export type OscilloscopeDataType = {
|
||||||
|
x: number[];
|
||||||
|
y: number[] | number[][];
|
||||||
|
xUnit: "s" | "ms" | "us" | "ns";
|
||||||
|
yUnit: "V" | "mV" | "uV";
|
||||||
|
adFrequency: number;
|
||||||
|
adVpp: number;
|
||||||
|
adMax: number;
|
||||||
|
adMin: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
// 默认配置
|
||||||
|
const DEFAULT_CONFIG: OscilloscopeFullConfig = {
|
||||||
|
captureEnabled: false,
|
||||||
|
triggerLevel: 128,
|
||||||
|
triggerRisingEdge: true,
|
||||||
|
horizontalShift: 0,
|
||||||
|
decimationRate: 50,
|
||||||
|
captureFrequency: 100,
|
||||||
|
};
|
||||||
|
|
||||||
|
// 采样频率常量(后端返回)
|
||||||
|
const [useProvideOscilloscope, useOscilloscopeState] = createInjectionState(
|
||||||
|
() => {
|
||||||
|
// Global Store
|
||||||
|
const alert = useRequiredInjection(useAlertStore);
|
||||||
|
|
||||||
|
// Data
|
||||||
|
const oscData = shallowRef<OscilloscopeDataType>();
|
||||||
|
const clearOscilloscopeData = () => {
|
||||||
|
oscData.value = undefined;
|
||||||
|
};
|
||||||
|
|
||||||
|
// SignalR Hub
|
||||||
|
const oscilloscopeHub = shallowRef<{
|
||||||
|
connection: HubConnection;
|
||||||
|
proxy: IOscilloscopeHub;
|
||||||
|
} | null>(null);
|
||||||
|
|
||||||
|
const oscilloscopeReceiver: IOscilloscopeReceiver = {
|
||||||
|
onDataReceived: async (data) => {
|
||||||
|
analyzeOscilloscopeData(data);
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
initHub();
|
||||||
|
});
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
clearHub();
|
||||||
|
});
|
||||||
|
|
||||||
|
async function initHub() {
|
||||||
|
if (oscilloscopeHub.value) return;
|
||||||
|
|
||||||
|
const connection = AuthManager.createHubConnection("OscilloscopeHub");
|
||||||
|
|
||||||
|
const proxy =
|
||||||
|
getHubProxyFactory("IOscilloscopeHub").createHubProxy(connection);
|
||||||
|
|
||||||
|
getReceiverRegister("IOscilloscopeReceiver").register(
|
||||||
|
connection,
|
||||||
|
oscilloscopeReceiver,
|
||||||
|
);
|
||||||
|
await connection.start();
|
||||||
|
oscilloscopeHub.value = { connection, proxy };
|
||||||
|
}
|
||||||
|
|
||||||
|
function clearHub() {
|
||||||
|
if (!oscilloscopeHub.value) return;
|
||||||
|
oscilloscopeHub.value.connection.stop();
|
||||||
|
oscilloscopeHub.value = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function reinitializeHub() {
|
||||||
|
clearHub();
|
||||||
|
initHub();
|
||||||
|
}
|
||||||
|
|
||||||
|
function getHubProxy() {
|
||||||
|
if (!oscilloscopeHub.value) {
|
||||||
|
reinitializeHub();
|
||||||
|
throw new Error("Hub not initialized");
|
||||||
|
}
|
||||||
|
return oscilloscopeHub.value.proxy;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 互斥锁
|
||||||
|
const operationMutex = new Mutex();
|
||||||
|
|
||||||
|
// 状态
|
||||||
|
const isApplying = ref(false);
|
||||||
|
const isCapturing = ref(false);
|
||||||
|
const isAutoApplying = ref(false);
|
||||||
|
|
||||||
|
// 配置
|
||||||
|
const config = reactive<OscilloscopeFullConfig>({ ...DEFAULT_CONFIG });
|
||||||
|
watchDebounced(
|
||||||
|
config,
|
||||||
|
() => {
|
||||||
|
if (!isAutoApplying.value) return;
|
||||||
|
|
||||||
|
if (
|
||||||
|
!isApplying.value ||
|
||||||
|
!isCapturing.value ||
|
||||||
|
!operationMutex.isLocked()
|
||||||
|
) {
|
||||||
|
applyConfiguration();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{ debounce: 200, maxWait: 1000 },
|
||||||
|
);
|
||||||
|
|
||||||
|
// 应用配置
|
||||||
|
const applyConfiguration = async () => {
|
||||||
|
if (operationMutex.isLocked()) {
|
||||||
|
alert.warn("有其他操作正在进行中,请稍后再试", 3000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const release = await operationMutex.acquire();
|
||||||
|
isApplying.value = true;
|
||||||
|
try {
|
||||||
|
const proxy = getHubProxy();
|
||||||
|
|
||||||
|
// console.log("Applying configuration", config);
|
||||||
|
const success = await proxy.initialize(config);
|
||||||
|
|
||||||
|
if (success) {
|
||||||
|
alert.success("示波器配置已应用", 2000);
|
||||||
|
} else {
|
||||||
|
throw new Error("应用失败");
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
if (error instanceof Error && error.message === "Hub not initialized")
|
||||||
|
reinitializeHub();
|
||||||
|
alert.error("应用配置失败", 3000);
|
||||||
|
} finally {
|
||||||
|
isApplying.value = false;
|
||||||
|
release();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// 重置配置
|
||||||
|
const resetConfiguration = () => {
|
||||||
|
Object.assign(config, { ...DEFAULT_CONFIG });
|
||||||
|
alert.info("配置已重置", 2000);
|
||||||
|
};
|
||||||
|
|
||||||
|
// 采样点数(由后端数据决定)
|
||||||
|
const sampleCount = ref(0);
|
||||||
|
|
||||||
|
// 采样周期(ns),由adFrequency计算
|
||||||
|
const samplePeriodNs = computed(() =>
|
||||||
|
oscData.value?.adFrequency
|
||||||
|
? 1_000_000_000 / oscData.value.adFrequency
|
||||||
|
: 200,
|
||||||
|
);
|
||||||
|
|
||||||
|
const analyzeOscilloscopeData = (resp: OscilloscopeDataResponse) => {
|
||||||
|
// 解析波形数据
|
||||||
|
const binaryString = atob(resp.waveformData);
|
||||||
|
const bytes = new Uint8Array(binaryString.length);
|
||||||
|
for (let i = 0; i < binaryString.length; i++) {
|
||||||
|
bytes[i] = binaryString.charCodeAt(i);
|
||||||
|
}
|
||||||
|
sampleCount.value = bytes.length;
|
||||||
|
|
||||||
|
const aDFrequency = resp.adFrequency;
|
||||||
|
|
||||||
|
// 计算采样周期(ns)
|
||||||
|
const samplePeriodNs =
|
||||||
|
aDFrequency > 0 ? 1_000_000_000 / aDFrequency : 200;
|
||||||
|
|
||||||
|
// 构建时间轴
|
||||||
|
const x = Array.from(
|
||||||
|
{ length: bytes.length },
|
||||||
|
(_, i) => (i * samplePeriodNs) / 1000, // us
|
||||||
|
);
|
||||||
|
const y = Array.from(bytes);
|
||||||
|
|
||||||
|
oscData.value = {
|
||||||
|
x,
|
||||||
|
y,
|
||||||
|
xUnit: "us",
|
||||||
|
yUnit: "V",
|
||||||
|
adFrequency: aDFrequency,
|
||||||
|
adVpp: resp.adVpp,
|
||||||
|
adMax: resp.adMax,
|
||||||
|
adMin: resp.adMin,
|
||||||
|
};
|
||||||
|
|
||||||
|
console.log("解析后的参数:", resp, oscData.value); // 添加调试日志
|
||||||
|
};
|
||||||
|
|
||||||
|
// 获取数据
|
||||||
|
const getOscilloscopeData = async () => {
|
||||||
|
try {
|
||||||
|
const proxy = getHubProxy();
|
||||||
|
const resp = await proxy.getData();
|
||||||
|
analyzeOscilloscopeData(resp);
|
||||||
|
} catch (error) {
|
||||||
|
alert.error("获取示波器数据失败", 3000);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// 启动捕获
|
||||||
|
const startCapture = async () => {
|
||||||
|
if (operationMutex.isLocked()) {
|
||||||
|
alert.warn("有其他操作正在进行中,请稍后再试", 3000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
isCapturing.value = true;
|
||||||
|
const release = await operationMutex.acquire();
|
||||||
|
try {
|
||||||
|
const proxy = getHubProxy();
|
||||||
|
const started = await proxy.startCapture();
|
||||||
|
if (!started) throw new Error("无法启动捕获");
|
||||||
|
alert.info("开始捕获...", 2000);
|
||||||
|
} catch (error) {
|
||||||
|
alert.error("捕获失败", 3000);
|
||||||
|
isCapturing.value = false;
|
||||||
|
} finally {
|
||||||
|
release();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// 停止捕获
|
||||||
|
const stopCapture = async () => {
|
||||||
|
if (!isCapturing.value) {
|
||||||
|
alert.warn("当前没有正在进行的捕获操作", 2000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const release = await operationMutex.acquire();
|
||||||
|
try {
|
||||||
|
const proxy = getHubProxy();
|
||||||
|
const stopped = await proxy.stopCapture();
|
||||||
|
if (!stopped) throw new Error("无法停止捕获");
|
||||||
|
isCapturing.value = false;
|
||||||
|
alert.info("捕获已停止", 2000);
|
||||||
|
} catch (error) {
|
||||||
|
alert.error("停止捕获失败", 3000);
|
||||||
|
} finally {
|
||||||
|
release();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const toggleCapture = async () => {
|
||||||
|
if (isCapturing.value) {
|
||||||
|
await stopCapture();
|
||||||
|
} else {
|
||||||
|
await startCapture();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// 更新触发参数
|
||||||
|
const updateTrigger = async (level: number, risingEdge: boolean) => {
|
||||||
|
const client = AuthManager.createClient(OscilloscopeApiClient);
|
||||||
|
try {
|
||||||
|
const ok = await client.updateTrigger(level, risingEdge);
|
||||||
|
if (ok) {
|
||||||
|
config.triggerLevel = level;
|
||||||
|
config.triggerRisingEdge = risingEdge;
|
||||||
|
alert.success("触发参数已更新", 2000);
|
||||||
|
} else {
|
||||||
|
throw new Error();
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
alert.error("更新触发参数失败", 2000);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// 更新采样参数
|
||||||
|
const updateSampling = async (
|
||||||
|
horizontalShift: number,
|
||||||
|
decimationRate: number,
|
||||||
|
) => {
|
||||||
|
const client = AuthManager.createClient(OscilloscopeApiClient);
|
||||||
|
try {
|
||||||
|
const ok = await client.updateSampling(horizontalShift, decimationRate);
|
||||||
|
if (ok) {
|
||||||
|
config.horizontalShift = horizontalShift;
|
||||||
|
config.decimationRate = decimationRate;
|
||||||
|
alert.success("采样参数已更新", 2000);
|
||||||
|
} else {
|
||||||
|
throw new Error();
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
alert.error("更新采样参数失败", 2000);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// 手动刷新RAM
|
||||||
|
const refreshRAM = async () => {
|
||||||
|
const client = AuthManager.createClient(OscilloscopeApiClient);
|
||||||
|
try {
|
||||||
|
const ok = await client.refreshRAM();
|
||||||
|
if (ok) {
|
||||||
|
// alert.success("RAM已刷新", 2000);
|
||||||
|
} else {
|
||||||
|
throw new Error();
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
alert.error("刷新RAM失败", 2000);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// 生成测试数据
|
||||||
|
const generateTestData = () => {
|
||||||
|
const freq = 5_000_000;
|
||||||
|
const duration = 0.001; // 1ms
|
||||||
|
const points = Math.floor(freq * duration);
|
||||||
|
const x = Array.from(
|
||||||
|
{ length: points },
|
||||||
|
(_, i) => (i * 1_000_000_000) / freq / 1000,
|
||||||
|
);
|
||||||
|
const y = Array.from({ length: points }, (_, i) =>
|
||||||
|
Math.floor(Math.sin(i * 0.01) * 127 + 128),
|
||||||
|
);
|
||||||
|
oscData.value = {
|
||||||
|
x,
|
||||||
|
y,
|
||||||
|
xUnit: "us",
|
||||||
|
yUnit: "V",
|
||||||
|
adFrequency: freq,
|
||||||
|
adVpp: 2.0,
|
||||||
|
adMax: 255,
|
||||||
|
adMin: 0,
|
||||||
|
};
|
||||||
|
alert.success("测试数据生成成功", 2000);
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
oscData,
|
||||||
|
config,
|
||||||
|
isApplying,
|
||||||
|
isCapturing,
|
||||||
|
isAutoApplying,
|
||||||
|
sampleCount,
|
||||||
|
samplePeriodNs,
|
||||||
|
|
||||||
|
applyConfiguration,
|
||||||
|
resetConfiguration,
|
||||||
|
clearOscilloscopeData,
|
||||||
|
getOscilloscopeData,
|
||||||
|
startCapture,
|
||||||
|
stopCapture,
|
||||||
|
toggleCapture,
|
||||||
|
updateTrigger,
|
||||||
|
updateSampling,
|
||||||
|
refreshRAM,
|
||||||
|
generateTestData,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
export { useProvideOscilloscope, useOscilloscopeState, DEFAULT_CONFIG };
|
||||||
676
src/components/Oscilloscope/OscilloscopeWaveformDisplay.vue
Normal file
676
src/components/Oscilloscope/OscilloscopeWaveformDisplay.vue
Normal file
@@ -0,0 +1,676 @@
|
|||||||
|
<template>
|
||||||
|
<div
|
||||||
|
class="waveform-container w-full h-full relative overflow-hidden rounded-lg"
|
||||||
|
>
|
||||||
|
<!-- 波形图表 -->
|
||||||
|
<v-chart
|
||||||
|
v-if="hasData"
|
||||||
|
class="w-full h-full transition-all duration-500 ease-in-out"
|
||||||
|
:option="option"
|
||||||
|
autoresize
|
||||||
|
/>
|
||||||
|
|
||||||
|
<!-- 无数据状态 -->
|
||||||
|
<div
|
||||||
|
v-else
|
||||||
|
class="w-full h-full flex flex-col items-center justify-center bg-gradient-to-br from-slate-50 to-blue-50 dark:from-slate-900 dark:to-slate-800"
|
||||||
|
>
|
||||||
|
<!-- 动画图标 -->
|
||||||
|
<div class="relative mb-6">
|
||||||
|
<div
|
||||||
|
class="w-24 h-24 rounded-full border-4 border-blue-200 dark:border-blue-800 animate-pulse"
|
||||||
|
></div>
|
||||||
|
<div class="absolute inset-0 flex items-center justify-center">
|
||||||
|
<Activity class="w-12 h-12 text-blue-500 animate-bounce" />
|
||||||
|
</div>
|
||||||
|
<!-- 扫描线效果 -->
|
||||||
|
<div
|
||||||
|
class="absolute inset-0 rounded-full border-2 border-transparent border-t-blue-500 animate-spin"
|
||||||
|
></div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 状态文本 -->
|
||||||
|
<div class="text-center space-y-2 mb-8">
|
||||||
|
<h3 class="text-xl font-semibold text-slate-700 dark:text-slate-300">
|
||||||
|
等待信号输入
|
||||||
|
</h3>
|
||||||
|
<p class="text-slate-500 dark:text-slate-400">
|
||||||
|
请启动数据采集以显示波形
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 快速启动按钮 -->
|
||||||
|
<div class="flex justify-center items-center">
|
||||||
|
<button
|
||||||
|
class="group relative px-8 py-4 bg-gradient-to-r text-white font-semibold rounded-xl shadow-xl hover:shadow-2xl transform hover:scale-110 transition-all duration-300 ease-out focus:outline-none focus:ring-4 active:scale-95 overflow-hidden"
|
||||||
|
:class="{
|
||||||
|
'from-emerald-500 via-blue-500 to-purple-600 hover:from-emerald-600 hover:via-blue-600 hover:to-purple-700 focus:ring-blue-300':
|
||||||
|
!oscManager.isCapturing.value,
|
||||||
|
'from-red-500 via-pink-500 to-red-600 hover:from-red-600 hover:via-pink-600 hover:to-red-700 focus:ring-red-300':
|
||||||
|
oscManager.isCapturing.value,
|
||||||
|
}"
|
||||||
|
@click="
|
||||||
|
oscManager.isCapturing.value
|
||||||
|
? oscManager.stopCapture()
|
||||||
|
: oscManager.startCapture()
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<!-- 背景动画效果 -->
|
||||||
|
<div
|
||||||
|
class="absolute inset-0 bg-white opacity-0 group-hover:opacity-20 transition-opacity duration-300"
|
||||||
|
></div>
|
||||||
|
|
||||||
|
<!-- 按钮内容 -->
|
||||||
|
<span class="relative flex items-center gap-3">
|
||||||
|
<template v-if="oscManager.isCapturing.value">
|
||||||
|
<Square class="w-6 h-6 animate-pulse" />
|
||||||
|
停止采集
|
||||||
|
</template>
|
||||||
|
<template v-else>
|
||||||
|
<Play class="w-6 h-6 group-hover:animate-pulse" />
|
||||||
|
开始采集
|
||||||
|
</template>
|
||||||
|
</span>
|
||||||
|
|
||||||
|
<!-- 光晕效果 -->
|
||||||
|
<div
|
||||||
|
class="absolute inset-0 rounded-xl bg-gradient-to-r from-transparent via-white to-transparent opacity-0 group-hover:opacity-30 transform -skew-x-12 translate-x-full group-hover:translate-x-[-200%] transition-transform duration-700"
|
||||||
|
></div>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 数据采集状态指示器 -->
|
||||||
|
<div
|
||||||
|
v-if="hasData && oscManager.isCapturing.value"
|
||||||
|
class="absolute top-4 right-4 flex items-center gap-2 bg-red-500/90 text-white px-3 py-1 rounded-full text-sm font-medium backdrop-blur-sm"
|
||||||
|
>
|
||||||
|
<div class="w-2 h-2 bg-white rounded-full animate-pulse"></div>
|
||||||
|
采集中
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 测量数据展示面板 -->
|
||||||
|
<div
|
||||||
|
v-if="hasData"
|
||||||
|
class="absolute top-4 left-4 bg-white/95 dark:bg-slate-800/95 backdrop-blur-sm rounded-lg shadow-lg border border-slate-200/50 dark:border-slate-700/50 p-3 min-w-[200px]"
|
||||||
|
>
|
||||||
|
<h4 class="text-sm font-semibold text-slate-700 dark:text-slate-300 mb-3 flex items-center gap-2">
|
||||||
|
<Activity class="w-4 h-4 text-blue-500" />
|
||||||
|
测量参数
|
||||||
|
</h4>
|
||||||
|
|
||||||
|
<div class="space-y-2 text-xs">
|
||||||
|
<!-- 采样频率 -->
|
||||||
|
<div class="flex justify-between items-center">
|
||||||
|
<span class="text-slate-600 dark:text-slate-400">采样频率:</span>
|
||||||
|
<span class="font-mono font-semibold text-blue-600 dark:text-blue-400">
|
||||||
|
{{ formatFrequency(oscData?.adFrequency || 0) }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 电压范围 -->
|
||||||
|
<div class="flex justify-between items-center">
|
||||||
|
<span class="text-slate-600 dark:text-slate-400">Vpp:</span>
|
||||||
|
<span class="font-mono font-semibold text-emerald-600 dark:text-emerald-400">
|
||||||
|
{{ (oscData?.adVpp || 0).toFixed(2) }}V
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 最大值 -->
|
||||||
|
<div class="flex justify-between items-center">
|
||||||
|
<span class="text-slate-600 dark:text-slate-400">最大值:</span>
|
||||||
|
<span class="font-mono font-semibold text-orange-600 dark:text-orange-400">
|
||||||
|
{{ formatAdcValue(oscData?.adMax || 0) }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 最小值 -->
|
||||||
|
<div class="flex justify-between items-center">
|
||||||
|
<span class="text-slate-600 dark:text-slate-400">最小值:</span>
|
||||||
|
<span class="font-mono font-semibold text-purple-600 dark:text-purple-400">
|
||||||
|
{{ formatAdcValue(oscData?.adMin || 0) }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 采样点数 -->
|
||||||
|
<div class="flex justify-between items-center pt-1 border-t border-slate-200 dark:border-slate-700">
|
||||||
|
<span class="text-slate-600 dark:text-slate-400">采样点:</span>
|
||||||
|
<span class="font-mono font-semibold text-slate-700 dark:text-slate-300">
|
||||||
|
{{ formatSampleCount(oscManager.sampleCount.value) }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 采样周期 -->
|
||||||
|
<div class="flex justify-between items-center">
|
||||||
|
<span class="text-slate-600 dark:text-slate-400">周期:</span>
|
||||||
|
<span class="font-mono font-semibold text-slate-700 dark:text-slate-300">
|
||||||
|
{{ formatPeriod(oscManager.samplePeriodNs.value) }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { computed } from "vue";
|
||||||
|
import { forEach } from "lodash";
|
||||||
|
import VChart from "vue-echarts";
|
||||||
|
import { useOscilloscopeState } from "./OscilloscopeManager";
|
||||||
|
|
||||||
|
// Echarts
|
||||||
|
import { use } from "echarts/core";
|
||||||
|
import { LineChart } from "echarts/charts";
|
||||||
|
import {
|
||||||
|
TooltipComponent,
|
||||||
|
LegendComponent,
|
||||||
|
ToolboxComponent,
|
||||||
|
DataZoomComponent,
|
||||||
|
GridComponent,
|
||||||
|
} from "echarts/components";
|
||||||
|
import { CanvasRenderer } from "echarts/renderers";
|
||||||
|
import type { ComposeOption } from "echarts/core";
|
||||||
|
import type { LineSeriesOption } from "echarts/charts";
|
||||||
|
import type {
|
||||||
|
TooltipComponentOption,
|
||||||
|
LegendComponentOption,
|
||||||
|
ToolboxComponentOption,
|
||||||
|
DataZoomComponentOption,
|
||||||
|
GridComponentOption,
|
||||||
|
} from "echarts/components";
|
||||||
|
import { useRequiredInjection } from "@/utils/Common";
|
||||||
|
import { Play, Square, Activity } from "lucide-vue-next";
|
||||||
|
|
||||||
|
use([
|
||||||
|
TooltipComponent,
|
||||||
|
LegendComponent,
|
||||||
|
ToolboxComponent,
|
||||||
|
DataZoomComponent,
|
||||||
|
GridComponent,
|
||||||
|
LineChart,
|
||||||
|
CanvasRenderer,
|
||||||
|
]);
|
||||||
|
|
||||||
|
type EChartsOption = ComposeOption<
|
||||||
|
| TooltipComponentOption
|
||||||
|
| LegendComponentOption
|
||||||
|
| ToolboxComponentOption
|
||||||
|
| DataZoomComponentOption
|
||||||
|
| GridComponentOption
|
||||||
|
| LineSeriesOption
|
||||||
|
>;
|
||||||
|
|
||||||
|
// 使用 manager 获取 oscilloscope 数据
|
||||||
|
const oscManager = useRequiredInjection(useOscilloscopeState);
|
||||||
|
|
||||||
|
const oscData = computed(() => oscManager.oscData.value);
|
||||||
|
|
||||||
|
const hasData = computed(() => {
|
||||||
|
return (
|
||||||
|
oscData.value &&
|
||||||
|
oscData.value.x &&
|
||||||
|
oscData.value.y &&
|
||||||
|
oscData.value.x.length > 0 &&
|
||||||
|
(Array.isArray(oscData.value.y[0])
|
||||||
|
? oscData.value.y.some((channel: any) => channel.length > 0)
|
||||||
|
: oscData.value.y.length > 0)
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
// 格式化频率显示
|
||||||
|
const formatFrequency = (frequency: number): string => {
|
||||||
|
if (frequency >= 1_000_000) {
|
||||||
|
return `${(frequency / 1_000_000).toFixed(1)}MHz`;
|
||||||
|
} else if (frequency >= 1_000) {
|
||||||
|
return `${(frequency / 1_000).toFixed(1)}kHz`;
|
||||||
|
} else {
|
||||||
|
return `${frequency}Hz`;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// 格式化ADC值显示
|
||||||
|
const formatAdcValue = (value: number): string => {
|
||||||
|
return `${value} (${((value / 255) * 3.3).toFixed(2)}V)`;
|
||||||
|
};
|
||||||
|
|
||||||
|
// 格式化采样点数显示
|
||||||
|
const formatSampleCount = (count: number): string => {
|
||||||
|
if (count >= 1_000_000) {
|
||||||
|
return `${(count / 1_000_000).toFixed(1)}M`;
|
||||||
|
} else if (count >= 1_000) {
|
||||||
|
return `${(count / 1_000).toFixed(1)}k`;
|
||||||
|
} else {
|
||||||
|
return `${count}`;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// 格式化周期显示
|
||||||
|
const formatPeriod = (periodNs: number): string => {
|
||||||
|
if (periodNs >= 1_000_000) {
|
||||||
|
return `${(periodNs / 1_000_000).toFixed(2)}ms`;
|
||||||
|
} else if (periodNs >= 1_000) {
|
||||||
|
return `${(periodNs / 1_000).toFixed(2)}μs`;
|
||||||
|
} else {
|
||||||
|
return `${periodNs.toFixed(2)}ns`;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const option = computed((): EChartsOption => {
|
||||||
|
if (!oscData.value || !oscData.value.x || !oscData.value.y) {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
const isCapturing = oscManager.isCapturing.value;
|
||||||
|
|
||||||
|
const series: LineSeriesOption[] = [];
|
||||||
|
|
||||||
|
// 兼容单通道和多通道,确保 yChannels 为 number[]
|
||||||
|
const yChannels: number[][] = Array.isArray(oscData.value.y[0])
|
||||||
|
? (oscData.value.y as number[][])
|
||||||
|
: [oscData.value.y as number[]];
|
||||||
|
|
||||||
|
// 预定义的通道颜色
|
||||||
|
const channelColors = [
|
||||||
|
"#3B82F6", // blue-500
|
||||||
|
"#EF4444", // red-500
|
||||||
|
"#10B981", // emerald-500
|
||||||
|
"#F59E0B", // amber-500
|
||||||
|
"#8B5CF6", // violet-500
|
||||||
|
"#06B6D4", // cyan-500
|
||||||
|
];
|
||||||
|
|
||||||
|
forEach(yChannels, (yData, index) => {
|
||||||
|
if (!oscData.value || !yData) return;
|
||||||
|
const seriesData = oscData.value.x.map((xValue, i) => [
|
||||||
|
xValue,
|
||||||
|
yData && yData[i] !== undefined ? yData[i] : 0,
|
||||||
|
]);
|
||||||
|
|
||||||
|
series.push({
|
||||||
|
type: "line",
|
||||||
|
name: `通道 ${index + 1}`,
|
||||||
|
data: seriesData,
|
||||||
|
smooth: false,
|
||||||
|
symbol: "none",
|
||||||
|
lineStyle: {
|
||||||
|
width: 2.5,
|
||||||
|
color: channelColors[index % channelColors.length],
|
||||||
|
shadowColor: channelColors[index % channelColors.length],
|
||||||
|
shadowBlur: isCapturing ? 0 : 4,
|
||||||
|
shadowOffsetY: 2,
|
||||||
|
},
|
||||||
|
itemStyle: {
|
||||||
|
color: channelColors[index % channelColors.length],
|
||||||
|
},
|
||||||
|
// 动画配置
|
||||||
|
animation: !isCapturing,
|
||||||
|
animationDuration: isCapturing ? 0 : 1200,
|
||||||
|
animationEasing: isCapturing ? "linear" : "cubicOut",
|
||||||
|
animationDelay: index * 100, // 错开动画时间
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
backgroundColor: "transparent",
|
||||||
|
grid: {
|
||||||
|
left: "8%",
|
||||||
|
right: "5%",
|
||||||
|
top: "12%",
|
||||||
|
bottom: "20%",
|
||||||
|
borderWidth: 1,
|
||||||
|
borderColor: "#E2E8F0",
|
||||||
|
backgroundColor: "rgba(248, 250, 252, 0.8)",
|
||||||
|
},
|
||||||
|
tooltip: {
|
||||||
|
trigger: "axis",
|
||||||
|
backgroundColor: "rgba(255, 255, 255, 0.95)",
|
||||||
|
borderColor: "#E2E8F0",
|
||||||
|
borderWidth: 1,
|
||||||
|
textStyle: {
|
||||||
|
color: "#334155",
|
||||||
|
fontSize: 12,
|
||||||
|
},
|
||||||
|
formatter: (params: any) => {
|
||||||
|
if (!oscData.value) return "";
|
||||||
|
let result = `<div style="font-weight: 600; margin-bottom: 4px;">时间: ${params[0].data[0].toFixed(2)} ${oscData.value.xUnit}</div>`;
|
||||||
|
params.forEach((param: any) => {
|
||||||
|
const adcValue = param.data[1];
|
||||||
|
const voltage = ((adcValue / 255) * 3.3).toFixed(3);
|
||||||
|
result += `<div style="color: ${param.color};">● ${param.seriesName}: ${adcValue} (${voltage}V)</div>`;
|
||||||
|
});
|
||||||
|
return result;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
legend: {
|
||||||
|
top: "2%",
|
||||||
|
left: "center",
|
||||||
|
textStyle: {
|
||||||
|
color: "#64748B",
|
||||||
|
fontSize: 12,
|
||||||
|
fontWeight: 500,
|
||||||
|
},
|
||||||
|
itemGap: 20,
|
||||||
|
data: series.map((s) => s.name) as string[],
|
||||||
|
},
|
||||||
|
toolbox: {
|
||||||
|
right: "2%",
|
||||||
|
top: "2%",
|
||||||
|
feature: {
|
||||||
|
restore: {
|
||||||
|
title: "重置缩放",
|
||||||
|
},
|
||||||
|
saveAsImage: {
|
||||||
|
title: "保存图片",
|
||||||
|
name: `oscilloscope_${new Date().toISOString().slice(0, 19)}`,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
iconStyle: {
|
||||||
|
borderColor: "#64748B",
|
||||||
|
},
|
||||||
|
emphasis: {
|
||||||
|
iconStyle: {
|
||||||
|
borderColor: "#3B82F6",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
dataZoom: [
|
||||||
|
{
|
||||||
|
type: "inside",
|
||||||
|
start: 0,
|
||||||
|
end: 100,
|
||||||
|
filterMode: "weakFilter",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
start: 0,
|
||||||
|
end: 100,
|
||||||
|
height: 25,
|
||||||
|
bottom: "8%",
|
||||||
|
borderColor: "#E2E8F0",
|
||||||
|
fillerColor: "rgba(59, 130, 246, 0.1)",
|
||||||
|
handleStyle: {
|
||||||
|
color: "#3B82F6",
|
||||||
|
borderColor: "#1E40AF",
|
||||||
|
},
|
||||||
|
textStyle: {
|
||||||
|
color: "#64748B",
|
||||||
|
fontSize: 11,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
xAxis: {
|
||||||
|
type: "value",
|
||||||
|
name: oscData.value ? `时间 (${oscData.value.xUnit})` : "时间",
|
||||||
|
nameLocation: "middle",
|
||||||
|
nameGap: 35,
|
||||||
|
nameTextStyle: {
|
||||||
|
color: "#64748B",
|
||||||
|
fontSize: 12,
|
||||||
|
fontWeight: 500,
|
||||||
|
},
|
||||||
|
axisLine: {
|
||||||
|
show: true,
|
||||||
|
lineStyle: {
|
||||||
|
color: "#CBD5E1",
|
||||||
|
width: 1.5,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
axisTick: {
|
||||||
|
show: true,
|
||||||
|
lineStyle: {
|
||||||
|
color: "#E2E8F0",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
axisLabel: {
|
||||||
|
color: "#64748B",
|
||||||
|
fontSize: 11,
|
||||||
|
},
|
||||||
|
splitLine: {
|
||||||
|
show: true,
|
||||||
|
lineStyle: {
|
||||||
|
color: "#F1F5F9",
|
||||||
|
type: "dashed",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
yAxis: {
|
||||||
|
type: "value",
|
||||||
|
name: oscData.value ? `ADC值 (0-255)` : "ADC值",
|
||||||
|
nameLocation: "middle",
|
||||||
|
nameGap: 50,
|
||||||
|
nameTextStyle: {
|
||||||
|
color: "#64748B",
|
||||||
|
fontSize: 12,
|
||||||
|
fontWeight: 500,
|
||||||
|
},
|
||||||
|
axisLine: {
|
||||||
|
show: true,
|
||||||
|
lineStyle: {
|
||||||
|
color: "#CBD5E1",
|
||||||
|
width: 1.5,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
axisTick: {
|
||||||
|
show: true,
|
||||||
|
lineStyle: {
|
||||||
|
color: "#E2E8F0",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
axisLabel: {
|
||||||
|
color: "#64748B",
|
||||||
|
fontSize: 11,
|
||||||
|
formatter: (value: number) => {
|
||||||
|
return `${value} (${((value / 255) * 3.3).toFixed(1)}V)`;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
splitLine: {
|
||||||
|
show: true,
|
||||||
|
lineStyle: {
|
||||||
|
color: "#F1F5F9",
|
||||||
|
type: "dashed",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
// 全局动画开关
|
||||||
|
animation: !isCapturing,
|
||||||
|
animationDuration: isCapturing ? 0 : 1200,
|
||||||
|
animationEasing: isCapturing ? "linear" : "cubicOut",
|
||||||
|
series: series,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped lang="postcss">
|
||||||
|
@import "@/assets/main.css";
|
||||||
|
/* 波形容器样式 */
|
||||||
|
.waveform-container {
|
||||||
|
background: linear-gradient(
|
||||||
|
135deg,
|
||||||
|
rgba(248, 250, 252, 0.8) 0%,
|
||||||
|
rgba(241, 245, 249, 0.8) 100%
|
||||||
|
);
|
||||||
|
border: 1px solid rgba(226, 232, 240, 0.5);
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.waveform-container::before {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
background: linear-gradient(
|
||||||
|
45deg,
|
||||||
|
transparent 48%,
|
||||||
|
rgba(59, 130, 246, 0.05) 50%,
|
||||||
|
transparent 52%
|
||||||
|
);
|
||||||
|
pointer-events: none;
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 无数据状态的背景动画 */
|
||||||
|
.waveform-container:not(:has(canvas)) {
|
||||||
|
background: linear-gradient(
|
||||||
|
135deg,
|
||||||
|
rgba(248, 250, 252, 1) 0%,
|
||||||
|
rgba(239, 246, 255, 1) 25%,
|
||||||
|
rgba(219, 234, 254, 1) 50%,
|
||||||
|
rgba(239, 246, 255, 1) 75%,
|
||||||
|
rgba(248, 250, 252, 1) 100%
|
||||||
|
);
|
||||||
|
background-size: 200% 200%;
|
||||||
|
animation: gradient-shift 8s ease-in-out infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes gradient-shift {
|
||||||
|
0%,
|
||||||
|
100% {
|
||||||
|
background-position: 0% 50%;
|
||||||
|
}
|
||||||
|
50% {
|
||||||
|
background-position: 100% 50%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 深色模式支持 */
|
||||||
|
@media (prefers-color-scheme: dark) {
|
||||||
|
.waveform-container {
|
||||||
|
background: linear-gradient(
|
||||||
|
135deg,
|
||||||
|
rgba(15, 23, 42, 0.8) 0%,
|
||||||
|
rgba(30, 41, 59, 0.8) 100%
|
||||||
|
);
|
||||||
|
border-color: rgba(71, 85, 105, 0.5);
|
||||||
|
}
|
||||||
|
|
||||||
|
.waveform-container:not(:has(canvas)) {
|
||||||
|
background: linear-gradient(
|
||||||
|
135deg,
|
||||||
|
rgba(15, 23, 42, 1) 0%,
|
||||||
|
rgba(30, 41, 59, 1) 25%,
|
||||||
|
rgba(51, 65, 85, 1) 50%,
|
||||||
|
rgba(30, 41, 59, 1) 75%,
|
||||||
|
rgba(15, 23, 42, 1) 100%
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 按钮光晕效果增强 */
|
||||||
|
button {
|
||||||
|
position: relative;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
button::after {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
top: 50%;
|
||||||
|
left: 50%;
|
||||||
|
width: 0;
|
||||||
|
height: 0;
|
||||||
|
border-radius: 50%;
|
||||||
|
background: rgba(255, 255, 255, 0.3);
|
||||||
|
transform: translate(-50%, -50%);
|
||||||
|
transition:
|
||||||
|
width 0.6s,
|
||||||
|
height 0.6s;
|
||||||
|
}
|
||||||
|
|
||||||
|
button:active::after {
|
||||||
|
width: 300px;
|
||||||
|
height: 300px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 扫描线动画优化 */
|
||||||
|
@keyframes scan-line {
|
||||||
|
0% {
|
||||||
|
transform: rotate(0deg) scale(1);
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
50% {
|
||||||
|
transform: rotate(180deg) scale(1.1);
|
||||||
|
opacity: 0.7;
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
transform: rotate(360deg) scale(1);
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.animate-spin {
|
||||||
|
animation: scan-line 3s linear infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 状态指示器增强 */
|
||||||
|
.absolute.top-4.right-4 {
|
||||||
|
backdrop-filter: blur(8px);
|
||||||
|
box-shadow: 0 4px 12px rgba(239, 68, 68, 0.25);
|
||||||
|
animation: float 2s ease-in-out infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes float {
|
||||||
|
0%,
|
||||||
|
100% {
|
||||||
|
transform: translateY(0px);
|
||||||
|
}
|
||||||
|
50% {
|
||||||
|
transform: translateY(-2px);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 图表容器增强 */
|
||||||
|
.w-full.h-full.transition-all {
|
||||||
|
border-radius: 8px;
|
||||||
|
overflow: hidden;
|
||||||
|
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.05);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 响应式调整 */
|
||||||
|
@media (max-width: 768px) {
|
||||||
|
.waveform-container {
|
||||||
|
min-height: 300px;
|
||||||
|
}
|
||||||
|
|
||||||
|
button {
|
||||||
|
padding: 12px 20px;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.absolute.top-4.right-4 {
|
||||||
|
top: 8px;
|
||||||
|
right: 8px;
|
||||||
|
font-size: 12px;
|
||||||
|
padding: 4px 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 移动端测量面板调整 */
|
||||||
|
.absolute.top-4.left-4 {
|
||||||
|
top: 8px;
|
||||||
|
left: 8px;
|
||||||
|
min-width: 180px;
|
||||||
|
font-size: 11px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 平滑过渡效果 */
|
||||||
|
* {
|
||||||
|
transition: all 0.2s ease-in-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 焦点样式 */
|
||||||
|
button:focus-visible {
|
||||||
|
outline: 2px solid rgba(59, 130, 246, 0.5);
|
||||||
|
outline-offset: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 测量面板样式增强 */
|
||||||
|
.absolute.top-4.left-4 {
|
||||||
|
backdrop-filter: blur(8px);
|
||||||
|
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
|
||||||
|
transition: all 0.3s ease-in-out;
|
||||||
|
z-index: 10;
|
||||||
|
}
|
||||||
|
|
||||||
|
.absolute.top-4.left-4:hover {
|
||||||
|
transform: translateY(-1px);
|
||||||
|
box-shadow: 0 6px 16px rgba(0, 0, 0, 0.15);
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -1,175 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="w-full h-100">
|
|
||||||
<v-chart v-if="true" class="w-full h-full" :option="option" autoresize />
|
|
||||||
<div
|
|
||||||
v-else
|
|
||||||
class="w-full h-full flex items-center justify-center text-gray-500"
|
|
||||||
>
|
|
||||||
暂无数据
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { computed, withDefaults } from "vue";
|
|
||||||
import { forEach } from "lodash";
|
|
||||||
import VChart from "vue-echarts";
|
|
||||||
import { type WaveformDataType } from "./index";
|
|
||||||
|
|
||||||
// Echarts
|
|
||||||
import { use } from "echarts/core";
|
|
||||||
import { LineChart } from "echarts/charts";
|
|
||||||
import {
|
|
||||||
TitleComponent,
|
|
||||||
TooltipComponent,
|
|
||||||
LegendComponent,
|
|
||||||
ToolboxComponent,
|
|
||||||
DataZoomComponent,
|
|
||||||
GridComponent,
|
|
||||||
} from "echarts/components";
|
|
||||||
import { CanvasRenderer } from "echarts/renderers";
|
|
||||||
import type { ComposeOption } from "echarts/core";
|
|
||||||
import type { LineSeriesOption } from "echarts/charts";
|
|
||||||
import type {
|
|
||||||
TooltipComponentOption,
|
|
||||||
LegendComponentOption,
|
|
||||||
ToolboxComponentOption,
|
|
||||||
DataZoomComponentOption,
|
|
||||||
GridComponentOption,
|
|
||||||
} from "echarts/components";
|
|
||||||
|
|
||||||
use([
|
|
||||||
TooltipComponent,
|
|
||||||
LegendComponent,
|
|
||||||
ToolboxComponent,
|
|
||||||
DataZoomComponent,
|
|
||||||
GridComponent,
|
|
||||||
LineChart,
|
|
||||||
CanvasRenderer,
|
|
||||||
]);
|
|
||||||
|
|
||||||
type EChartsOption = ComposeOption<
|
|
||||||
| TooltipComponentOption
|
|
||||||
| LegendComponentOption
|
|
||||||
| ToolboxComponentOption
|
|
||||||
| DataZoomComponentOption
|
|
||||||
| GridComponentOption
|
|
||||||
| LineSeriesOption
|
|
||||||
>;
|
|
||||||
|
|
||||||
const props = withDefaults(
|
|
||||||
defineProps<{
|
|
||||||
data?: WaveformDataType;
|
|
||||||
}>(),
|
|
||||||
{
|
|
||||||
data: () => ({
|
|
||||||
x: [],
|
|
||||||
y: [],
|
|
||||||
xUnit: "s",
|
|
||||||
yUnit: "V",
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
const hasData = computed(() => {
|
|
||||||
return (
|
|
||||||
props.data &&
|
|
||||||
props.data.x &&
|
|
||||||
props.data.y &&
|
|
||||||
props.data.x.length > 0 &&
|
|
||||||
props.data.y.length > 0 &&
|
|
||||||
props.data.y.some((channel) => channel.length > 0)
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
const option = computed((): EChartsOption => {
|
|
||||||
const series: LineSeriesOption[] = [];
|
|
||||||
|
|
||||||
forEach(props.data.y, (yData, index) => {
|
|
||||||
// 将 x 和 y 数据组合成 [x, y] 格式
|
|
||||||
const seriesData = props.data.x.map((xValue, i) => [xValue, yData[i] || 0]);
|
|
||||||
|
|
||||||
series.push({
|
|
||||||
type: "line",
|
|
||||||
name: `通道 ${index + 1}`,
|
|
||||||
data: seriesData,
|
|
||||||
smooth: false, // 示波器通常显示原始波形
|
|
||||||
symbol: "none", // 不显示数据点标记
|
|
||||||
lineStyle: {
|
|
||||||
width: 2,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
return {
|
|
||||||
grid: {
|
|
||||||
left: "10%",
|
|
||||||
right: "10%",
|
|
||||||
top: "15%",
|
|
||||||
bottom: "25%",
|
|
||||||
},
|
|
||||||
tooltip: {
|
|
||||||
trigger: "axis",
|
|
||||||
formatter: (params: any) => {
|
|
||||||
let result = `时间: ${params[0].data[0].toFixed(2)} ${props.data.xUnit}<br/>`;
|
|
||||||
params.forEach((param: any) => {
|
|
||||||
result += `${param.seriesName}: ${param.data[1].toFixed(3)} ${props.data.yUnit}<br/>`;
|
|
||||||
});
|
|
||||||
return result;
|
|
||||||
},
|
|
||||||
},
|
|
||||||
legend: {
|
|
||||||
top: "5%",
|
|
||||||
data: series.map((s) => s.name) as string[],
|
|
||||||
},
|
|
||||||
toolbox: {
|
|
||||||
feature: {
|
|
||||||
restore: {},
|
|
||||||
saveAsImage: {},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
dataZoom: [
|
|
||||||
{
|
|
||||||
type: "inside",
|
|
||||||
start: 0,
|
|
||||||
end: 100,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
start: 0,
|
|
||||||
end: 100,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
xAxis: {
|
|
||||||
type: "value",
|
|
||||||
name: `时间 (${props.data.xUnit})`,
|
|
||||||
nameLocation: "middle",
|
|
||||||
nameGap: 30,
|
|
||||||
axisLine: {
|
|
||||||
show: true,
|
|
||||||
},
|
|
||||||
axisTick: {
|
|
||||||
show: true,
|
|
||||||
},
|
|
||||||
splitLine: {
|
|
||||||
show: false,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
yAxis: {
|
|
||||||
type: "value",
|
|
||||||
name: `电压 (${props.data.yUnit})`,
|
|
||||||
nameLocation: "middle",
|
|
||||||
nameGap: 40,
|
|
||||||
axisLine: {
|
|
||||||
show: true,
|
|
||||||
},
|
|
||||||
axisTick: {
|
|
||||||
show: true,
|
|
||||||
},
|
|
||||||
splitLine: {
|
|
||||||
show: false,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
series: series,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
@@ -1,42 +1,3 @@
|
|||||||
import WaveformDisplay from "./WaveformDisplay.vue";
|
import OscilloscopeWaveformDisplay from "./OscilloscopeWaveformDisplay.vue";
|
||||||
|
|
||||||
type WaveformDataType = {
|
export { OscilloscopeWaveformDisplay };
|
||||||
x: number[];
|
|
||||||
y: number[][];
|
|
||||||
xUnit: "s" | "ms" | "us";
|
|
||||||
yUnit: "V" | "mV" | "uV";
|
|
||||||
};
|
|
||||||
|
|
||||||
// Test data generator
|
|
||||||
function generateTestData(): WaveformDataType {
|
|
||||||
const sampleRate = 1000; // 1kHz
|
|
||||||
const duration = 0.1; // 10ms
|
|
||||||
const points = Math.floor(sampleRate * duration);
|
|
||||||
|
|
||||||
const x = Array.from({ length: points }, (_, i) => (i / sampleRate) * 1000); // time in ms
|
|
||||||
|
|
||||||
// Generate multiple channels with different waveforms
|
|
||||||
const y = [
|
|
||||||
// Channel 1: Sine wave 50Hz
|
|
||||||
Array.from(
|
|
||||||
{ length: points },
|
|
||||||
(_, i) => Math.sin((2 * Math.PI * 50 * i) / sampleRate) * 3.3,
|
|
||||||
),
|
|
||||||
// Channel 2: Square wave 25Hz
|
|
||||||
Array.from(
|
|
||||||
{ length: points },
|
|
||||||
(_, i) => Math.sign(Math.sin((2 * Math.PI * 25 * i) / sampleRate)) * 5,
|
|
||||||
),
|
|
||||||
// Channel 3: Sawtooth wave 33Hz
|
|
||||||
Array.from(
|
|
||||||
{ length: points },
|
|
||||||
(_, i) => (2 * (((33 * i) / sampleRate) % 1) - 1) * 2.5,
|
|
||||||
),
|
|
||||||
// Channel 4: Noise + DC offset
|
|
||||||
Array.from({ length: points }, () => Math.random() * 0.5 + 1.5),
|
|
||||||
];
|
|
||||||
|
|
||||||
return { x, y, xUnit: "ms", yUnit: "V" };
|
|
||||||
}
|
|
||||||
|
|
||||||
export { WaveformDisplay, generateTestData , type WaveformDataType };
|
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
<template>
|
|
||||||
<button class="btn transition-transform duration-150 ease-in-out hover:scale-120">
|
|
||||||
Button A
|
|
||||||
</button>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts" setup></script>
|
|
||||||
|
|
||||||
<style scoped lang="postcss">
|
|
||||||
@import "@/assets/main.css";
|
|
||||||
</style>
|
|
||||||
@@ -1,162 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div
|
|
||||||
class="card card-dash shadow-xl h-screen"
|
|
||||||
:class="[sidebar.isClose ? 'w-31' : 'w-80']"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
class="card-body flex relative transition-all duration-500 ease-in-out"
|
|
||||||
>
|
|
||||||
<!-- Avatar and Name -->
|
|
||||||
<div class="relative" :class="sidebar.isClose ? 'h-50' : 'h-20'">
|
|
||||||
<!-- Img -->
|
|
||||||
<div
|
|
||||||
class="avatar h-10 fixed top-10"
|
|
||||||
:class="sidebar.isClose ? 'left-10' : 'left-7'"
|
|
||||||
>
|
|
||||||
<div class="rounded-full">
|
|
||||||
<img src="../assets/user.svg" alt="User" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<!-- Text -->
|
|
||||||
<Transition>
|
|
||||||
<div v-if="!sidebar.isClose" class="mx-5 grow fixed left-20 top-11">
|
|
||||||
<label class="text-2xl">用户名</label>
|
|
||||||
</div>
|
|
||||||
</Transition>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Toggle Button -->
|
|
||||||
<button
|
|
||||||
class="btn btn-square rounded-lg p-2 m-3 fixed"
|
|
||||||
:class="sidebar.isClose ? 'left-7 top-23' : 'left-60 top-7'"
|
|
||||||
@click="sidebar.toggleSidebar"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
t="1741694970690"
|
|
||||||
:class="sidebar.isClose ? 'rotate-0' : 'rotate-540'"
|
|
||||||
class="icon"
|
|
||||||
viewBox="0 0 1024 1024"
|
|
||||||
version="1.1"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
p-id="4546"
|
|
||||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
|
||||||
width="200"
|
|
||||||
height="200"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M803.758 514.017c-0.001-0.311-0.013-0.622-0.018-0.933-0.162-23.974-9.386-47.811-27.743-65.903-0.084-0.082-0.172-0.157-0.256-0.239-0.154-0.154-0.296-0.315-0.451-0.468L417.861 94.096c-37.685-37.153-99.034-37.476-136.331-0.718-37.297 36.758-36.979 97.231 0.707 134.384l290.361 286.257-290.362 286.257c-37.685 37.153-38.004 97.625-0.707 134.383 37.297 36.758 98.646 36.435 136.331-0.718l357.43-352.378c0.155-0.153 0.297-0.314 0.451-0.468 0.084-0.082 0.172-0.157 0.256-0.239 18.354-18.089 27.578-41.922 27.743-65.892 0.004-0.315 0.017-0.631 0.018-0.947z"
|
|
||||||
:fill="theme.isLightTheme() ? '#828282' : '#C0C3C8'"
|
|
||||||
p-id="4547"
|
|
||||||
></path>
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<div class="divider"></div>
|
|
||||||
|
|
||||||
<ul class="menu h-full w-full">
|
|
||||||
<li v-for="item in props.items" class="text-xl my-1">
|
|
||||||
<a @click="router.push(item.page)">
|
|
||||||
<svg
|
|
||||||
t="1741694797806"
|
|
||||||
class="icon h-[1.5em] w-[1.5em] opacity-50 mx-1"
|
|
||||||
viewBox="0 0 1024 1024"
|
|
||||||
version="1.1"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
p-id="2622"
|
|
||||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
|
||||||
width="200"
|
|
||||||
height="200"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M192 192m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z"
|
|
||||||
p-id="2623"
|
|
||||||
></path>
|
|
||||||
<path
|
|
||||||
d="M192 512m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z"
|
|
||||||
p-id="2624"
|
|
||||||
></path>
|
|
||||||
<path
|
|
||||||
d="M192 832m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z"
|
|
||||||
p-id="2625"
|
|
||||||
></path>
|
|
||||||
<path
|
|
||||||
d="M864 160H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32zM864 480H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32zM864 800H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32z"
|
|
||||||
p-id="2626"
|
|
||||||
></path>
|
|
||||||
</svg>
|
|
||||||
<Transition>
|
|
||||||
<p class="break-keep" v-if="!sidebar.isClose">{{ item.text }}</p>
|
|
||||||
</Transition>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<div class="divider"></div>
|
|
||||||
|
|
||||||
<ul class="menu w-full">
|
|
||||||
<li>
|
|
||||||
<a @click="theme.toggleTheme" class="text-xl">
|
|
||||||
<ThemeControlButton />
|
|
||||||
<Transition>
|
|
||||||
<p v-if="!sidebar.isClose" class="break-keep">改变主题</p>
|
|
||||||
</Transition>
|
|
||||||
<Transition>
|
|
||||||
<ThemeControlToggle v-if="!sidebar.isClose" />
|
|
||||||
</Transition>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import iconMenu from "../assets/menu.svg";
|
|
||||||
import "../router";
|
|
||||||
import { useThemeStore } from "@/stores/theme";
|
|
||||||
import { useSidebarStore } from "@/stores/sidebar";
|
|
||||||
import ThemeControlButton from "./ThemeControlButton.vue";
|
|
||||||
import ThemeControlToggle from "./ThemeControlToggle.vue";
|
|
||||||
import router from "../router";
|
|
||||||
|
|
||||||
const theme = useThemeStore();
|
|
||||||
const sidebar = useSidebarStore();
|
|
||||||
|
|
||||||
type Item = {
|
|
||||||
id: number;
|
|
||||||
icon: string;
|
|
||||||
text: string;
|
|
||||||
page: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
interface Props {
|
|
||||||
items?: Array<Item>;
|
|
||||||
}
|
|
||||||
|
|
||||||
const props = withDefaults(defineProps<Props>(), {
|
|
||||||
items: () => [
|
|
||||||
{ id: 1, icon: iconMenu, text: "btn1", page: "/" },
|
|
||||||
{ id: 2, icon: iconMenu, text: "btn2", page: "/" },
|
|
||||||
{ id: 3, icon: iconMenu, text: "btn3", page: "/" },
|
|
||||||
{ id: 4, icon: iconMenu, text: "btn4", page: "/" },
|
|
||||||
],
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style scoped lang="postcss">
|
|
||||||
@reference "../assets/main.css";
|
|
||||||
|
|
||||||
* {
|
|
||||||
@apply transition-all duration-500 ease-in-out;
|
|
||||||
}
|
|
||||||
|
|
||||||
.v-enter-active,
|
|
||||||
.v-leave-active {
|
|
||||||
transition: opacity 0.3s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.v-enter-from,
|
|
||||||
.v-leave-to {
|
|
||||||
opacity: 0;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -4,7 +4,8 @@
|
|||||||
@wheel.prevent="handleWheel"
|
@wheel.prevent="handleWheel"
|
||||||
@mouseenter="pauseAutoRotation"
|
@mouseenter="pauseAutoRotation"
|
||||||
@mouseleave="resumeAutoRotation"
|
@mouseleave="resumeAutoRotation"
|
||||||
> <!-- 例程卡片堆叠 -->
|
>
|
||||||
|
<!-- 例程卡片堆叠 -->
|
||||||
<div class="card-stack relative mx-auto">
|
<div class="card-stack relative mx-auto">
|
||||||
<div
|
<div
|
||||||
v-for="(tutorial, index) in tutorials"
|
v-for="(tutorial, index) in tutorials"
|
||||||
@@ -16,11 +17,15 @@
|
|||||||
>
|
>
|
||||||
<!-- 卡片内容 -->
|
<!-- 卡片内容 -->
|
||||||
<div class="relative">
|
<div class="relative">
|
||||||
<!-- 图片 --> <img
|
<!-- 图片 -->
|
||||||
:src="tutorial.thumbnail || `https://placehold.co/600x400?text=${tutorial.title}`"
|
<img
|
||||||
|
:src="
|
||||||
|
tutorial.thumbnail ||
|
||||||
|
`https://kaifage.com/api/placeholder/600/400?text=${tutorial.title}&color=000000&bgColor=ffffff&fontSize=72`
|
||||||
|
"
|
||||||
class="w-full object-contain"
|
class="w-full object-contain"
|
||||||
:alt="tutorial.title"
|
:alt="tutorial.title"
|
||||||
style="width: 600px; height: 400px;"
|
style="width: 600px; height: 400px"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<!-- 卡片蒙层 -->
|
<!-- 卡片蒙层 -->
|
||||||
@@ -30,9 +35,30 @@
|
|||||||
></div>
|
></div>
|
||||||
|
|
||||||
<!-- 标题覆盖层 -->
|
<!-- 标题覆盖层 -->
|
||||||
<div class="absolute bottom-0 left-0 right-0 p-4 bg-gradient-to-t from-base-300 to-transparent">
|
<div
|
||||||
<h3 class="text-lg font-bold text-base-content">{{ tutorial.title }}</h3>
|
class="absolute bottom-0 left-0 right-0 p-4 bg-gradient-to-t from-base-300 to-transparent"
|
||||||
<p class="text-sm opacity-80 truncate">{{ tutorial.description }}</p>
|
>
|
||||||
|
<div class="flex flex-col gap-2">
|
||||||
|
<h3 class="text-lg font-bold text-base-content">
|
||||||
|
{{ tutorial.title }}
|
||||||
|
</h3>
|
||||||
|
<p class="text-sm opacity-80 truncate">
|
||||||
|
{{ tutorial.description }}
|
||||||
|
</p>
|
||||||
|
<!-- 标签显示 -->
|
||||||
|
<div
|
||||||
|
v-if="tutorial.tags && tutorial.tags.length > 0"
|
||||||
|
class="flex flex-wrap gap-1"
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
v-for="tag in tutorial.tags.slice(0, 3)"
|
||||||
|
:key="tag"
|
||||||
|
class="badge badge-outline badge-xs text-xs"
|
||||||
|
>
|
||||||
|
{{ tag }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -52,8 +78,15 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, onMounted, onUnmounted } from 'vue';
|
import { ref, onMounted, onUnmounted } from "vue";
|
||||||
import { useRouter } from 'vue-router';
|
import { useRouter } from "vue-router";
|
||||||
|
import { AuthManager } from "@/utils/AuthManager";
|
||||||
|
import {
|
||||||
|
ExamClient,
|
||||||
|
ResourceClient,
|
||||||
|
ResourcePurpose,
|
||||||
|
type ExamInfo,
|
||||||
|
} from "@/APIClient";
|
||||||
|
|
||||||
// 接口定义
|
// 接口定义
|
||||||
interface Tutorial {
|
interface Tutorial {
|
||||||
@@ -61,7 +94,7 @@ interface Tutorial {
|
|||||||
title: string;
|
title: string;
|
||||||
description: string;
|
description: string;
|
||||||
thumbnail?: string;
|
thumbnail?: string;
|
||||||
docPath: string;
|
tags: string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
// Props
|
// Props
|
||||||
@@ -81,87 +114,101 @@ let autoRotationTimer: number | null = null;
|
|||||||
// 处理卡片点击
|
// 处理卡片点击
|
||||||
const handleCardClick = (index: number, tutorialId: string) => {
|
const handleCardClick = (index: number, tutorialId: string) => {
|
||||||
if (index === currentIndex.value) {
|
if (index === currentIndex.value) {
|
||||||
goToTutorial(tutorialId);
|
goToExam(tutorialId);
|
||||||
} else {
|
} else {
|
||||||
setActiveCard(index);
|
setActiveCard(index);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// 从 public/doc 目录加载例程信息
|
// 从数据库加载实验数据
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
try {
|
try {
|
||||||
// 尝试从API获取教程目录
|
console.log("正在从数据库加载实验数据...");
|
||||||
let tutorialIds: string[] = [];
|
|
||||||
try {
|
// 创建认证客户端
|
||||||
const response = await fetch('/api/tutorial');
|
const client = AuthManager.createClient(ExamClient);
|
||||||
if (response.ok) {
|
|
||||||
const data = await response.json();
|
// 获取实验列表
|
||||||
tutorialIds = data.tutorials || [];
|
const examList: ExamInfo[] = await client.getExamList();
|
||||||
}
|
|
||||||
} catch (error) {
|
// 筛选可见的实验并转换为Tutorial格式
|
||||||
console.warn('无法从API获取教程目录,使用默认值:', error);
|
const visibleExams = examList
|
||||||
|
.filter((exam) => exam.isVisibleToUsers)
|
||||||
|
.slice(0, 6); // 限制轮播显示最多6个实验
|
||||||
|
|
||||||
|
if (visibleExams.length === 0) {
|
||||||
|
console.warn("没有找到可见的实验");
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 如果API调用失败或返回空列表,使用默认值
|
// 转换数据格式并获取封面图片
|
||||||
if (tutorialIds.length === 0) {
|
const tutorialPromises = visibleExams.map(async (exam) => {
|
||||||
console.log('使用默认教程列表');
|
let thumbnail: string | undefined;
|
||||||
tutorialIds = ['01', '02', '03', '04', '05', '06', '11', '12', '13']; // 默认例程
|
|
||||||
} else {
|
|
||||||
console.log('使用API获取的教程列表:', tutorialIds);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 为每个例程创建对象并尝试获取文档标题
|
|
||||||
const tutorialPromises = tutorialIds.map(async (id) => {
|
|
||||||
// 尝试读取doc.md获取标题
|
|
||||||
let title = `例程 ${id}`;
|
|
||||||
let description = "点击加载此例程";
|
|
||||||
let thumbnail = `/doc/${id}/cover.png`; // 默认使用第一张图片作为缩略图
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// 尝试读取文档内容获取标题
|
// 获取实验的封面资源(模板资源)
|
||||||
const response = await fetch(`/doc/${id}/doc.md`);
|
const resourceClient = AuthManager.createClient(ResourceClient);
|
||||||
if (response.ok) {
|
const resourceList = await resourceClient.getResourceList(
|
||||||
const text = await response.text();
|
exam.id,
|
||||||
// 从Markdown提取标题
|
"cover",
|
||||||
const titleMatch = text.match(/^#\s+(.+)$/m);
|
ResourcePurpose.Template,
|
||||||
if (titleMatch && titleMatch[1]) {
|
);
|
||||||
title = titleMatch[1].trim();
|
if (resourceList && resourceList.length > 0) {
|
||||||
}
|
// 使用第一个封面资源
|
||||||
|
const coverResource = resourceList[0];
|
||||||
// 提取第一段作为描述
|
const fileResponse = await resourceClient.getResourceById(
|
||||||
const descMatch = text.match(/\n\n([^#\n][^\n]+)/);
|
coverResource.id,
|
||||||
if (descMatch && descMatch[1]) {
|
);
|
||||||
description = descMatch[1].substring(0, 100).trim();
|
// 创建Blob URL作为缩略图
|
||||||
if (description.length === 100) description += '...';
|
thumbnail = URL.createObjectURL(fileResponse.data);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.warn(`无法读取例程${id}的文档内容:`, error);
|
console.warn(`无法获取实验${exam.id}的封面图片:`, error);
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
id,
|
id: exam.id,
|
||||||
title,
|
title: exam.name,
|
||||||
description,
|
description: "点击查看实验详情",
|
||||||
thumbnail,
|
thumbnail,
|
||||||
docPath: `/doc/${id}/doc.md`
|
tags: exam.tags || [],
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
tutorials.value = await Promise.all(tutorialPromises);
|
tutorials.value = await Promise.all(tutorialPromises);
|
||||||
|
|
||||||
|
console.log("成功加载实验数据:", tutorials.value.length, "个实验");
|
||||||
|
|
||||||
// 启动自动旋转
|
// 启动自动旋转
|
||||||
startAutoRotation();
|
startAutoRotation();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('加载例程失败:', error);
|
console.error("加载实验数据失败:", error);
|
||||||
|
|
||||||
|
// 如果加载失败,显示默认的占位内容
|
||||||
|
tutorials.value = [
|
||||||
|
{
|
||||||
|
id: "placeholder",
|
||||||
|
title: "实验数据加载中...",
|
||||||
|
description: "请稍后或刷新页面重试",
|
||||||
|
thumbnail: undefined,
|
||||||
|
tags: [],
|
||||||
|
},
|
||||||
|
];
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// 在组件销毁时清除计时器
|
// 在组件销毁时清除计时器和Blob URLs
|
||||||
onUnmounted(() => {
|
onUnmounted(() => {
|
||||||
if (autoRotationTimer) {
|
if (autoRotationTimer) {
|
||||||
clearInterval(autoRotationTimer);
|
clearInterval(autoRotationTimer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 清理创建的Blob URLs
|
||||||
|
tutorials.value.forEach((tutorial) => {
|
||||||
|
if (tutorial.thumbnail && tutorial.thumbnail.startsWith("blob:")) {
|
||||||
|
URL.revokeObjectURL(tutorial.thumbnail);
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// 鼠标滚轮处理
|
// 鼠标滚轮处理
|
||||||
@@ -180,7 +227,8 @@ const nextCard = () => {
|
|||||||
|
|
||||||
// 上一张卡片
|
// 上一张卡片
|
||||||
const prevCard = () => {
|
const prevCard = () => {
|
||||||
currentIndex.value = (currentIndex.value - 1 + tutorials.value.length) % tutorials.value.length;
|
currentIndex.value =
|
||||||
|
(currentIndex.value - 1 + tutorials.value.length) % tutorials.value.length;
|
||||||
};
|
};
|
||||||
|
|
||||||
// 设置活动卡片
|
// 设置活动卡片
|
||||||
@@ -210,40 +258,48 @@ const resumeAutoRotation = () => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// 前往例程
|
// 前往实验
|
||||||
const goToTutorial = (tutorialId: string) => {
|
const goToExam = (examId: string) => {
|
||||||
// 跳转到工程页面,并通过 query 参数传递文档路径
|
// 跳转到实验列表页面并传递examId参数,页面将自动打开对应的实验详情模态框
|
||||||
router.push({
|
router.push({
|
||||||
path: '/project',
|
path: "/exam",
|
||||||
query: { tutorial: tutorialId }
|
query: { examId: examId },
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
// 计算卡片类和样式
|
// 计算卡片类和样式
|
||||||
const getCardClass = (index: number) => {
|
const getCardClass = (index: number) => {
|
||||||
const isActive = index === currentIndex.value;
|
const isActive = index === currentIndex.value;
|
||||||
const isPrev = (index === currentIndex.value - 1) || (currentIndex.value === 0 && index === tutorials.value.length - 1);
|
const isPrev =
|
||||||
const isNext = (index === currentIndex.value + 1) || (currentIndex.value === tutorials.value.length - 1 && index === 0);
|
index === currentIndex.value - 1 ||
|
||||||
|
(currentIndex.value === 0 && index === tutorials.value.length - 1);
|
||||||
|
const isNext =
|
||||||
|
index === currentIndex.value + 1 ||
|
||||||
|
(currentIndex.value === tutorials.value.length - 1 && index === 0);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'z-30': isActive,
|
"z-30": isActive,
|
||||||
'z-20': isPrev || isNext,
|
"z-20": isPrev || isNext,
|
||||||
'z-10': !isActive && !isPrev && !isNext,
|
"z-10": !isActive && !isPrev && !isNext,
|
||||||
'hover:scale-105': isActive,
|
"hover:scale-105": isActive,
|
||||||
'cursor-pointer': true
|
"cursor-pointer": true,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
const getCardStyle = (index: number) => {
|
const getCardStyle = (index: number) => {
|
||||||
const isActive = index === currentIndex.value;
|
const isActive = index === currentIndex.value;
|
||||||
const isPrev = (index === currentIndex.value - 1) || (currentIndex.value === 0 && index === tutorials.value.length - 1);
|
const isPrev =
|
||||||
const isNext = (index === currentIndex.value + 1) || (currentIndex.value === tutorials.value.length - 1 && index === 0);
|
index === currentIndex.value - 1 ||
|
||||||
|
(currentIndex.value === 0 && index === tutorials.value.length - 1);
|
||||||
|
const isNext =
|
||||||
|
index === currentIndex.value + 1 ||
|
||||||
|
(currentIndex.value === tutorials.value.length - 1 && index === 0);
|
||||||
|
|
||||||
// 基本样式
|
// 基本样式
|
||||||
let style = {
|
let style = {
|
||||||
transform: 'scale(1) translateY(0) rotate(0deg)',
|
transform: "scale(1) translateY(0) rotate(0deg)",
|
||||||
opacity: '1',
|
opacity: "1",
|
||||||
filter: 'blur(0)'
|
filter: "blur(0)",
|
||||||
};
|
};
|
||||||
|
|
||||||
// 活动卡片
|
// 活动卡片
|
||||||
@@ -253,26 +309,26 @@ const getCardStyle = (index: number) => {
|
|||||||
|
|
||||||
// 上一张卡片
|
// 上一张卡片
|
||||||
if (isPrev) {
|
if (isPrev) {
|
||||||
style.transform = 'scale(0.85) translateY(-10%) rotate(-5deg)';
|
style.transform = "scale(0.85) translateY(-10%) rotate(-5deg)";
|
||||||
style.opacity = '0.7';
|
style.opacity = "0.7";
|
||||||
style.filter = 'blur(1px)';
|
style.filter = "blur(1px)";
|
||||||
return style;
|
return style;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 下一张卡片
|
// 下一张卡片
|
||||||
if (isNext) {
|
if (isNext) {
|
||||||
style.transform = 'scale(0.85) translateY(10%) rotate(5deg)';
|
style.transform = "scale(0.85) translateY(10%) rotate(5deg)";
|
||||||
style.opacity = '0.7';
|
style.opacity = "0.7";
|
||||||
style.filter = 'blur(1px)';
|
style.filter = "blur(1px)";
|
||||||
return style;
|
return style;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 其他卡片
|
// 其他卡片
|
||||||
style.transform = 'scale(0.7) translateY(0) rotate(0deg)';
|
style.transform = "scale(0.7) translateY(0) rotate(0deg)";
|
||||||
style.opacity = '0.4';
|
style.opacity = "0.4";
|
||||||
style.filter = 'blur(2px)';
|
style.filter = "blur(2px)";
|
||||||
return style;
|
return style;
|
||||||
}
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
|||||||
@@ -1,132 +1,283 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="flex flex-col bg-base-100 justify-center items-center">
|
<div class="flex flex-col bg-base-100 justify-center items-center gap-4">
|
||||||
<!-- Title -->
|
<!-- Title -->
|
||||||
<h1 class="font-bold text-2xl">上传比特流文件</h1>
|
<h1 class="font-bold text-2xl">比特流文件</h1>
|
||||||
|
|
||||||
|
<!-- 示例比特流下载区域 (仅在有examId时显示) -->
|
||||||
|
<div v-if="examId && availableBitstreams.length > 0" class="w-full">
|
||||||
|
<fieldset class="fieldset w-full">
|
||||||
|
<legend class="fieldset-legend text-sm">示例比特流文件</legend>
|
||||||
|
<div class="space-y-2">
|
||||||
|
<div
|
||||||
|
v-for="bitstream in availableBitstreams"
|
||||||
|
:key="bitstream.id"
|
||||||
|
class="flex items-center justify-between p-2 border-2 border-base-300 rounded-lg"
|
||||||
|
>
|
||||||
|
<span class="text-sm">{{ bitstream.name }}</span>
|
||||||
|
<div class="flex gap-2">
|
||||||
|
<button
|
||||||
|
@click="handleExampleBitstream('download', bitstream)"
|
||||||
|
class="btn btn-sm btn-secondary"
|
||||||
|
:disabled="currentTask !== 'none'"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
v-if="
|
||||||
|
currentTask === 'downloading' &&
|
||||||
|
currentBitstreamId === bitstream.id
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<span class="loading loading-spinner loading-xs"></span>
|
||||||
|
下载中...
|
||||||
|
</div>
|
||||||
|
<div v-else>下载示例</div>
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
@click="handleExampleBitstream('program', bitstream)"
|
||||||
|
class="btn btn-sm btn-primary"
|
||||||
|
:disabled="currentTask !== 'none'"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
v-if="
|
||||||
|
currentTask === 'programming' &&
|
||||||
|
currentBitstreamId === bitstream.id
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<span class="loading loading-spinner loading-xs"></span>
|
||||||
|
烧录中...
|
||||||
|
</div>
|
||||||
|
<div v-else>直接烧录</div>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</fieldset>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 分割线 -->
|
||||||
|
<div v-if="examId && availableBitstreams.length > 0" class="divider">
|
||||||
|
或
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- Input File -->
|
<!-- Input File -->
|
||||||
<fieldset class="fieldset w-full">
|
<fieldset class="fieldset w-full">
|
||||||
<legend class="fieldset-legend text-sm">选择或拖拽上传文件</legend>
|
<legend class="fieldset-legend text-sm">上传自定义比特流文件</legend>
|
||||||
<input type="file" ref="fileInput" class="file-input w-full" @change="handleFileChange" />
|
<input
|
||||||
|
type="file"
|
||||||
|
ref="fileInput"
|
||||||
|
class="file-input w-full"
|
||||||
|
@change="handleFileChange"
|
||||||
|
/>
|
||||||
<label class="fieldset-label">文件最大容量: {{ maxMemory }}MB</label>
|
<label class="fieldset-label">文件最大容量: {{ maxMemory }}MB</label>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
<!-- Upload Button -->
|
<!-- Upload Button -->
|
||||||
<div class="card-actions w-full">
|
<div class="card-actions w-full">
|
||||||
<button @click="handleClick" class="btn btn-primary grow" :disabled="isUploading">
|
<button
|
||||||
<div v-if="isUploading">
|
@click="handleUploadAndDownload"
|
||||||
|
class="btn btn-primary grow"
|
||||||
|
:disabled="currentTask !== 'none'"
|
||||||
|
>
|
||||||
|
<div v-if="currentTask === 'uploading'">
|
||||||
<span class="loading loading-spinner"></span>
|
<span class="loading loading-spinner"></span>
|
||||||
下载中...
|
上传中...
|
||||||
</div>
|
</div>
|
||||||
<div v-else>
|
<div v-else-if="currentTask === 'programming'">
|
||||||
{{ buttonText }}
|
<span class="loading loading-spinner"></span>
|
||||||
|
{{ currentProgressPercent }}% ...
|
||||||
</div>
|
</div>
|
||||||
|
<div v-else>上传并下载</div>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { computed, ref, useTemplateRef, onMounted } from "vue";
|
import { ref, useTemplateRef, onMounted } from "vue";
|
||||||
|
import { AuthManager } from "@/utils/AuthManager";
|
||||||
import { useDialogStore } from "@/stores/dialog";
|
import { useDialogStore } from "@/stores/dialog";
|
||||||
import { isNull, isUndefined } from "lodash";
|
import { useEquipments } from "@/stores/equipments";
|
||||||
|
import { useRequiredInjection } from "@/utils/Common";
|
||||||
|
import { useAlertStore } from "./Alert";
|
||||||
|
import { ResourceClient, ResourcePurpose } from "@/APIClient";
|
||||||
|
import { useProgressStore } from "@/stores/progress";
|
||||||
|
import { ProgressStatus, type ProgressInfo } from "@/utils/signalR/server.Hubs";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
uploadEvent?: (file: File) => Promise<boolean>;
|
|
||||||
downloadEvent?: () => Promise<boolean>;
|
|
||||||
maxMemory?: number;
|
maxMemory?: number;
|
||||||
|
examId?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const props = withDefaults(defineProps<Props>(), {
|
const props = withDefaults(defineProps<Props>(), {
|
||||||
maxMemory: 4,
|
maxMemory: 4,
|
||||||
|
examId: "",
|
||||||
});
|
});
|
||||||
|
|
||||||
const emits = defineEmits<{
|
const emits = defineEmits<{
|
||||||
finishedUpload: [file: File];
|
finishedUpload: [file: File];
|
||||||
}>();
|
}>();
|
||||||
|
|
||||||
|
const alert = useRequiredInjection(useAlertStore);
|
||||||
|
const progressTracker = useProgressStore();
|
||||||
const dialog = useDialogStore();
|
const dialog = useDialogStore();
|
||||||
|
const eqps = useEquipments();
|
||||||
|
|
||||||
const isUploading = ref(false);
|
const availableBitstreams = ref<{ id: string; name: string }[]>([]);
|
||||||
const buttonText = computed(() => {
|
|
||||||
return isUndefined(props.downloadEvent) ? "上传" : "上传并下载";
|
|
||||||
});
|
|
||||||
|
|
||||||
const fileInput = useTemplateRef("fileInput");
|
const fileInput = useTemplateRef("fileInput");
|
||||||
const bitstream = defineModel("bitstreamFile", {
|
const bitstream = ref<File | undefined>(undefined);
|
||||||
type: File,
|
|
||||||
default: undefined,
|
// 用一个状态变量替代多个
|
||||||
});
|
const currentTask = ref<"none" | "uploading" | "downloading" | "programming">(
|
||||||
onMounted(() => {
|
"none",
|
||||||
if (!isUndefined(bitstream.value) && !isNull(fileInput.value)) {
|
);
|
||||||
|
const currentBitstreamId = ref<string>("");
|
||||||
|
const currentProgressId = ref<string>("");
|
||||||
|
const currentProgressPercent = ref<number>(0);
|
||||||
|
|
||||||
|
onMounted(async () => {
|
||||||
|
if (bitstream.value && fileInput.value) {
|
||||||
let fileList = new DataTransfer();
|
let fileList = new DataTransfer();
|
||||||
fileList.items.add(bitstream.value);
|
fileList.items.add(bitstream.value);
|
||||||
fileInput.value.files = fileList.files;
|
fileInput.value.files = fileList.files;
|
||||||
}
|
}
|
||||||
|
await loadAvailableBitstreams();
|
||||||
});
|
});
|
||||||
|
|
||||||
function handleFileChange(event: Event): void {
|
function handleFileChange(event: Event): void {
|
||||||
const target = event.target as HTMLInputElement;
|
const target = event.target as HTMLInputElement;
|
||||||
const file = target.files?.[0]; // 获取选中的第一个文件
|
const file = target.files?.[0];
|
||||||
|
bitstream.value = file || undefined;
|
||||||
if (!file) {
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bitstream.value = file;
|
function checkFileInput(): boolean {
|
||||||
|
if (!bitstream.value) {
|
||||||
|
dialog.error(`未选择文件`);
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
const maxBytes = props.maxMemory! * 1024 * 1024;
|
||||||
function checkFile(file: File): boolean {
|
if (bitstream.value.size > maxBytes) {
|
||||||
const maxBytes = props.maxMemory! * 1024 * 1024; // 将最大容量从 MB 转换为字节
|
|
||||||
if (file.size > maxBytes) {
|
|
||||||
dialog.error(`文件大小超过最大限制: ${props.maxMemory}MB`);
|
dialog.error(`文件大小超过最大限制: ${props.maxMemory}MB`);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function handleClick(event: Event): Promise<void> {
|
async function downloadBitstream() {
|
||||||
if (isNull(bitstream.value) || isUndefined(bitstream.value)) {
|
currentTask.value = "programming";
|
||||||
dialog.error(`未选择文件`);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!checkFile(bitstream.value)) return;
|
|
||||||
if (isUndefined(props.uploadEvent)) {
|
|
||||||
dialog.error("无法上传");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
isUploading.value = true;
|
|
||||||
try {
|
try {
|
||||||
const ret = await props.uploadEvent(bitstream.value);
|
currentProgressId.value = await eqps.jtagDownloadBitstream(
|
||||||
if (isUndefined(props.downloadEvent)) {
|
currentBitstreamId.value,
|
||||||
if (ret) {
|
);
|
||||||
dialog.info("上传成功");
|
progressTracker.register(
|
||||||
emits("finishedUpload", bitstream.value);
|
currentProgressId.value,
|
||||||
} else dialog.error("上传失败");
|
"programBitstream",
|
||||||
|
handleProgressUpdate,
|
||||||
|
);
|
||||||
|
} catch {
|
||||||
|
dialog.error("比特流烧录失败");
|
||||||
|
cleanProgressTracker();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function cleanProgressTracker() {
|
||||||
|
currentTask.value = "none";
|
||||||
|
currentProgressId.value = "";
|
||||||
|
currentBitstreamId.value = "";
|
||||||
|
currentProgressPercent.value = 0;
|
||||||
|
progressTracker.unregister(currentProgressId.value, "programBitstream");
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadAvailableBitstreams() {
|
||||||
|
if (!props.examId) {
|
||||||
|
availableBitstreams.value = [];
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!ret) {
|
try {
|
||||||
isUploading.value = false;
|
const resourceClient = AuthManager.createClient(ResourceClient);
|
||||||
return;
|
const resources = await resourceClient.getResourceList(
|
||||||
|
props.examId,
|
||||||
|
"bitstream",
|
||||||
|
ResourcePurpose.Template,
|
||||||
|
);
|
||||||
|
availableBitstreams.value =
|
||||||
|
resources.map((r) => ({ id: r.id, name: r.name })) || [];
|
||||||
|
} catch (error) {
|
||||||
|
availableBitstreams.value = [];
|
||||||
}
|
}
|
||||||
} catch (e) {
|
}
|
||||||
|
|
||||||
|
// 统一处理示例比特流的下载/烧录
|
||||||
|
async function handleExampleBitstream(
|
||||||
|
action: "download" | "program",
|
||||||
|
bitstreamObj: { id: string; name: string },
|
||||||
|
) {
|
||||||
|
if (currentTask.value !== "none") return;
|
||||||
|
currentBitstreamId.value = bitstreamObj.id;
|
||||||
|
if (action === "download") {
|
||||||
|
currentTask.value = "downloading";
|
||||||
|
try {
|
||||||
|
const resourceClient = AuthManager.createClient(ResourceClient);
|
||||||
|
const response = await resourceClient.getResourceById(bitstreamObj.id);
|
||||||
|
if (response && response.data) {
|
||||||
|
const url = URL.createObjectURL(response.data);
|
||||||
|
const link = document.createElement("a");
|
||||||
|
link.href = url;
|
||||||
|
link.download = response.fileName || bitstreamObj.name;
|
||||||
|
document.body.appendChild(link);
|
||||||
|
link.click();
|
||||||
|
document.body.removeChild(link);
|
||||||
|
URL.revokeObjectURL(url);
|
||||||
|
alert.info("示例比特流下载成功");
|
||||||
|
} else {
|
||||||
|
alert.error("下载失败:响应数据为空");
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
alert.error("下载示例比特流失败");
|
||||||
|
} finally {
|
||||||
|
currentTask.value = "none";
|
||||||
|
currentBitstreamId.value = "";
|
||||||
|
}
|
||||||
|
} else if (action === "program") {
|
||||||
|
currentBitstreamId.value = bitstreamObj.id;
|
||||||
|
await downloadBitstream();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 上传并下载
|
||||||
|
async function handleUploadAndDownload() {
|
||||||
|
if (currentTask.value !== "none") return;
|
||||||
|
if (!checkFileInput()) return;
|
||||||
|
|
||||||
|
currentTask.value = "uploading";
|
||||||
|
let uploadedBitstreamId: string | null = null;
|
||||||
|
try {
|
||||||
|
uploadedBitstreamId = await eqps.jtagUploadBitstream(
|
||||||
|
bitstream.value!,
|
||||||
|
props.examId || "",
|
||||||
|
);
|
||||||
|
if (!uploadedBitstreamId) throw new Error("上传失败");
|
||||||
|
emits("finishedUpload", bitstream.value!);
|
||||||
|
} catch {
|
||||||
dialog.error("上传失败");
|
dialog.error("上传失败");
|
||||||
console.error(e);
|
currentTask.value = "none";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Download
|
currentBitstreamId.value = uploadedBitstreamId;
|
||||||
try {
|
|
||||||
const ret = await props.downloadEvent();
|
await downloadBitstream();
|
||||||
if (ret) dialog.info("下载成功");
|
|
||||||
else dialog.error("下载失败");
|
|
||||||
} catch (e) {
|
|
||||||
dialog.error("下载失败");
|
|
||||||
console.error(e);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
isUploading.value = false;
|
function handleProgressUpdate(msg: ProgressInfo) {
|
||||||
|
// console.log(msg);
|
||||||
|
if (msg.status === ProgressStatus.Running)
|
||||||
|
currentProgressPercent.value = msg.progressPercent;
|
||||||
|
else if (msg.status === ProgressStatus.Failed) {
|
||||||
|
dialog.error(`比特流烧录失败: ${msg.errorMessage}`);
|
||||||
|
cleanProgressTracker();
|
||||||
|
} else if (msg.status === ProgressStatus.Completed) {
|
||||||
|
dialog.info("比特流烧录成功");
|
||||||
|
cleanProgressTracker();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
126
src/components/UploadModal.vue
Normal file
126
src/components/UploadModal.vue
Normal file
@@ -0,0 +1,126 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { useRequiredInjection } from "@/utils/Common";
|
||||||
|
import { templateRef } from "@vueuse/core";
|
||||||
|
import { File, UploadIcon, XIcon } from "lucide-vue-next";
|
||||||
|
import { isNull } from "mathjs";
|
||||||
|
import { useSlots } from "vue";
|
||||||
|
import { useAlertStore } from "./Alert";
|
||||||
|
|
||||||
|
const alert = useRequiredInjection(useAlertStore);
|
||||||
|
const slots = useSlots();
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
autoUpload?: boolean;
|
||||||
|
closeAfterUpload?: boolean;
|
||||||
|
callback: (files: File[]) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
const props = withDefaults(defineProps<Props>(), {
|
||||||
|
autoUpload: false,
|
||||||
|
closeAfterUpload: false,
|
||||||
|
});
|
||||||
|
|
||||||
|
const emits = defineEmits<{
|
||||||
|
finishedUpload: [];
|
||||||
|
}>();
|
||||||
|
|
||||||
|
const inputFiles = defineModel<File[] | null>("inputFiles", { default: null });
|
||||||
|
const isShowModal = defineModel<boolean>("isShowModal", { default: false });
|
||||||
|
|
||||||
|
const fileInputRef = templateRef("fileInputRef");
|
||||||
|
|
||||||
|
function handleFileChange(event: Event) {
|
||||||
|
const files = (event.target as HTMLInputElement).files;
|
||||||
|
if (!files) return;
|
||||||
|
inputFiles.value = Array.from(files);
|
||||||
|
|
||||||
|
if (props.autoUpload) handleUpload();
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleFileDrop(event: DragEvent) {
|
||||||
|
const files = event.dataTransfer?.files;
|
||||||
|
if (!files) return;
|
||||||
|
inputFiles.value = Array.from(files);
|
||||||
|
|
||||||
|
if (props.autoUpload) handleUpload();
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleUpload() {
|
||||||
|
if (!inputFiles.value) return;
|
||||||
|
props.callback(inputFiles.value);
|
||||||
|
if (props.closeAfterUpload) close();
|
||||||
|
alert.info("上传成功");
|
||||||
|
emits("finishedUpload");
|
||||||
|
}
|
||||||
|
|
||||||
|
function show() {
|
||||||
|
isShowModal.value = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function close() {
|
||||||
|
isShowModal.value = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
defineExpose({
|
||||||
|
show,
|
||||||
|
close,
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div v-if="isShowModal" class="modal modal-open overflow-hidden">
|
||||||
|
<div class="modal-box overflow-hidden flex flex-col gap-3">
|
||||||
|
<div
|
||||||
|
class="flex justify-between items-center pb-3 border-b border-base-300"
|
||||||
|
>
|
||||||
|
<h2 class="text-2xl font-bold text-base-content">文件上传</h2>
|
||||||
|
<button @click="close" class="btn btn-sm btn-circle btn-ghost">
|
||||||
|
<XIcon class="w-6 h-6" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="border-2 border-dashed border-base-300 rounded-lg text-center cursor-pointer hover:border-primary hover:bg-primary/5 transition-colors aspect-4/2 flex items-center justify-center"
|
||||||
|
@click="fileInputRef.click()"
|
||||||
|
@dragover.prevent
|
||||||
|
@dragenter.prevent
|
||||||
|
@drop.prevent="handleFileDrop"
|
||||||
|
>
|
||||||
|
<div v-if="slots.content">
|
||||||
|
<slot name="content"></slot>
|
||||||
|
</div>
|
||||||
|
<div v-else class="flex flex-col items-center gap-3">
|
||||||
|
<File class="w-12 h-12 text-base-content opacity-40" />
|
||||||
|
<div class="text-sm text-base-content/70 text-center">
|
||||||
|
<div class="font-medium mb-1">点击或拖拽上传</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div v-else class="flex flex-col items-center gap-2">
|
||||||
|
<File class="w-8 h-8 text-success" />
|
||||||
|
<div class="text-xs font-medium text-success text-center">
|
||||||
|
{{ inputFiles?.[0]?.name }}
|
||||||
|
</div>
|
||||||
|
<div class="text-xs text-base-content/50">点击重新选择</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<input
|
||||||
|
type="file"
|
||||||
|
ref="fileInputRef"
|
||||||
|
@change="handleFileChange"
|
||||||
|
accept=""
|
||||||
|
class="hidden"
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
v-if="!autoUpload"
|
||||||
|
class="btn btn-primary btn-sm w-full h-10"
|
||||||
|
@click="handleUpload"
|
||||||
|
:disabled="isNull(inputFiles) || inputFiles.length === 0"
|
||||||
|
>
|
||||||
|
<UploadIcon class="w-6 h-6" />
|
||||||
|
上传
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div class="modal-backdrop" @click="close"></div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style lang="postcss" scoped></style>
|
||||||
373
src/components/WaveformDisplay/WaveformDisplay.vue
Normal file
373
src/components/WaveformDisplay/WaveformDisplay.vue
Normal file
@@ -0,0 +1,373 @@
|
|||||||
|
<template>
|
||||||
|
<div
|
||||||
|
class="w-full"
|
||||||
|
:class="{
|
||||||
|
'h-48': !props.data,
|
||||||
|
'h-150': props.data,
|
||||||
|
}"
|
||||||
|
>
|
||||||
|
<v-chart
|
||||||
|
v-if="props.data"
|
||||||
|
class="w-full h-full"
|
||||||
|
:option="option"
|
||||||
|
autoresize
|
||||||
|
:update-options="updateOptions"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
v-else
|
||||||
|
class="w-full h-full flex flex-col gap-6 items-center justify-center"
|
||||||
|
>
|
||||||
|
<template v-if="hasSlot">
|
||||||
|
<slot />
|
||||||
|
</template>
|
||||||
|
<template v-else>
|
||||||
|
<div class="text-center">
|
||||||
|
<h3 class="text-xl font-semibold text-slate-600 mb-2">暂无数据</h3>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { computed, shallowRef, useSlots } from "vue";
|
||||||
|
import VChart from "vue-echarts";
|
||||||
|
|
||||||
|
// Echarts
|
||||||
|
import { use } from "echarts/core";
|
||||||
|
import { LineChart } from "echarts/charts";
|
||||||
|
import {
|
||||||
|
TooltipComponent,
|
||||||
|
GridComponent,
|
||||||
|
DataZoomComponent,
|
||||||
|
AxisPointerComponent,
|
||||||
|
ToolboxComponent,
|
||||||
|
MarkLineComponent,
|
||||||
|
} from "echarts/components";
|
||||||
|
import { CanvasRenderer } from "echarts/renderers";
|
||||||
|
import type { ComposeOption } from "echarts/core";
|
||||||
|
import type { LineSeriesOption } from "echarts/charts";
|
||||||
|
import type {
|
||||||
|
AxisPointerComponentOption,
|
||||||
|
TooltipComponentOption,
|
||||||
|
GridComponentOption,
|
||||||
|
DataZoomComponentOption,
|
||||||
|
MarkLineComponentOption,
|
||||||
|
} from "echarts/components";
|
||||||
|
import type {
|
||||||
|
ToolboxComponentOption,
|
||||||
|
XAXisOption,
|
||||||
|
YAXisOption,
|
||||||
|
} from "echarts/types/dist/shared";
|
||||||
|
import { isUndefined } from "lodash";
|
||||||
|
import type { LogicDataType } from ".";
|
||||||
|
|
||||||
|
use([
|
||||||
|
TooltipComponent,
|
||||||
|
ToolboxComponent,
|
||||||
|
GridComponent,
|
||||||
|
AxisPointerComponent,
|
||||||
|
DataZoomComponent,
|
||||||
|
LineChart,
|
||||||
|
CanvasRenderer,
|
||||||
|
MarkLineComponent,
|
||||||
|
]);
|
||||||
|
|
||||||
|
type EChartsOption = ComposeOption<
|
||||||
|
| AxisPointerComponentOption
|
||||||
|
| TooltipComponentOption
|
||||||
|
| ToolboxComponentOption
|
||||||
|
| GridComponentOption
|
||||||
|
| DataZoomComponentOption
|
||||||
|
| LineSeriesOption
|
||||||
|
| MarkLineComponentOption
|
||||||
|
>;
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
data?: LogicDataType;
|
||||||
|
}>();
|
||||||
|
|
||||||
|
const slots = useSlots();
|
||||||
|
const hasSlot = computed(() => !!slots.default && slots.default().length > 0);
|
||||||
|
|
||||||
|
// 添加更新选项来减少重绘
|
||||||
|
const updateOptions = shallowRef({
|
||||||
|
notMerge: false,
|
||||||
|
lazyUpdate: true,
|
||||||
|
silent: false,
|
||||||
|
});
|
||||||
|
|
||||||
|
const option = computed((): EChartsOption => {
|
||||||
|
if (isUndefined(props.data)) return {};
|
||||||
|
|
||||||
|
// 只获取启用的通道,使用y数据结构
|
||||||
|
const enabledChannels = props.data.y.filter(
|
||||||
|
(channel) => channel.enabled,
|
||||||
|
);
|
||||||
|
const enabledChannelIndices = props.data.y
|
||||||
|
.map((channel, index) => (channel.enabled ? index : -1))
|
||||||
|
.filter((index) => index !== -1);
|
||||||
|
|
||||||
|
// 统计启用通道数量
|
||||||
|
const channelCount = enabledChannels.length;
|
||||||
|
const channelSpacing = 2; // 每个通道之间的间距
|
||||||
|
|
||||||
|
if (channelCount === 0) {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
// 单个网格
|
||||||
|
const grids: GridComponentOption[] = [
|
||||||
|
{
|
||||||
|
left: "5%",
|
||||||
|
right: "5%",
|
||||||
|
top: "5%",
|
||||||
|
bottom: "15%",
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
// 单个X轴
|
||||||
|
const xAxis: XAXisOption[] = [
|
||||||
|
{
|
||||||
|
type: "category",
|
||||||
|
boundaryGap: true,
|
||||||
|
data: props.data.x.map((x) => x.toFixed(3)),
|
||||||
|
axisLabel: {
|
||||||
|
formatter: (value: string) =>
|
||||||
|
props.data
|
||||||
|
? `${value}${props.data.xUnit}`
|
||||||
|
: `${value}`,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
// 单个Y轴,范围根据启用通道数量调整
|
||||||
|
const yAxis: YAXisOption[] = [
|
||||||
|
{
|
||||||
|
type: "value",
|
||||||
|
min: -0.5,
|
||||||
|
max: channelCount * channelSpacing - 0.5,
|
||||||
|
interval: channelSpacing,
|
||||||
|
axisLabel: {
|
||||||
|
formatter: (value: number) => {
|
||||||
|
const channelIndex = Math.round(value / channelSpacing);
|
||||||
|
return channelIndex < channelCount
|
||||||
|
? enabledChannels[channelIndex].name
|
||||||
|
: "";
|
||||||
|
},
|
||||||
|
},
|
||||||
|
splitLine: { show: false },
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
// 创建系列数据
|
||||||
|
const series: LineSeriesOption[] = [];
|
||||||
|
enabledChannelIndices.forEach(
|
||||||
|
(originalIndex: number, displayIndex: number) => {
|
||||||
|
const channel = props.data!.y[originalIndex];
|
||||||
|
if (channel.type === "logic") {
|
||||||
|
// logic类型,原样显示
|
||||||
|
series.push({
|
||||||
|
name: channel.name,
|
||||||
|
type: "line",
|
||||||
|
data: channel.value.map(
|
||||||
|
(value: number) => value + displayIndex * channelSpacing + 0.2,
|
||||||
|
),
|
||||||
|
step: "end",
|
||||||
|
lineStyle: {
|
||||||
|
width: 2,
|
||||||
|
color: channel.color,
|
||||||
|
},
|
||||||
|
areaStyle: {
|
||||||
|
opacity: 0.3,
|
||||||
|
origin: displayIndex * channelSpacing,
|
||||||
|
color: channel.color,
|
||||||
|
},
|
||||||
|
symbol: "none",
|
||||||
|
sampling: "lttb",
|
||||||
|
animation: false,
|
||||||
|
});
|
||||||
|
} else if (channel.type === "number") {
|
||||||
|
const values = channel.value;
|
||||||
|
const xArr = props.data!.x;
|
||||||
|
// 构造带过渡的点序列
|
||||||
|
function buildVcdLine(valArr: number[], high: number, low: number) {
|
||||||
|
const points: { x: number; y: number }[] = [];
|
||||||
|
let lastValue = high;
|
||||||
|
points.push({ x: xArr[0], y: lastValue });
|
||||||
|
for (let i = 1; i < valArr.length; i++) {
|
||||||
|
const v =
|
||||||
|
valArr[i] !== valArr[i - 1]
|
||||||
|
? lastValue === high
|
||||||
|
? low
|
||||||
|
: high
|
||||||
|
: lastValue;
|
||||||
|
points.push({ x: xArr[i], y: v });
|
||||||
|
lastValue = v;
|
||||||
|
}
|
||||||
|
return points.map((p) => p.y);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 计算变化点区间
|
||||||
|
function buildMarkLines(valArr: number[], yBase: number) {
|
||||||
|
const markLines: any[] = [];
|
||||||
|
let lastValue = valArr[0];
|
||||||
|
let lastIdx = 0;
|
||||||
|
// 格式化函数
|
||||||
|
function formatValue(val: number) {
|
||||||
|
if (channel.base === "hex")
|
||||||
|
return "0x" + val.toString(16).toUpperCase();
|
||||||
|
if (channel.base === "bin") return "0b" + val.toString(2);
|
||||||
|
return val.toString();
|
||||||
|
}
|
||||||
|
for (let i = 1; i <= valArr.length; i++) {
|
||||||
|
if (i === valArr.length || valArr[i] !== lastValue) {
|
||||||
|
markLines.push([
|
||||||
|
{
|
||||||
|
xAxis: lastIdx,
|
||||||
|
yAxis: yBase,
|
||||||
|
label: {
|
||||||
|
formatter: formatValue(lastValue),
|
||||||
|
position: "insideMiddle",
|
||||||
|
color: channel.color,
|
||||||
|
fontSize: 18,
|
||||||
|
opacity: 1,
|
||||||
|
},
|
||||||
|
lineStyle: {
|
||||||
|
opacity: 0,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
xAxis: i - 1,
|
||||||
|
yAxis: yBase,
|
||||||
|
lineStyle: {
|
||||||
|
opacity: 0,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
lastValue = valArr[i];
|
||||||
|
lastIdx = i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return markLines;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 1线条
|
||||||
|
series.push({
|
||||||
|
name: channel.name + "_1",
|
||||||
|
type: "line",
|
||||||
|
data: buildVcdLine(
|
||||||
|
values,
|
||||||
|
displayIndex * channelSpacing + 1,
|
||||||
|
displayIndex * channelSpacing,
|
||||||
|
),
|
||||||
|
step: false,
|
||||||
|
lineStyle: {
|
||||||
|
width: 2,
|
||||||
|
color: channel.color,
|
||||||
|
},
|
||||||
|
areaStyle: {
|
||||||
|
opacity: 0.3,
|
||||||
|
origin: displayIndex * channelSpacing + 0.5,
|
||||||
|
color: channel.color,
|
||||||
|
},
|
||||||
|
symbol: "none",
|
||||||
|
sampling: "lttb",
|
||||||
|
animation: false,
|
||||||
|
// 添加markLine
|
||||||
|
markLine: {
|
||||||
|
data: buildMarkLines(values, displayIndex * channelSpacing + 0.5),
|
||||||
|
emphasis: {
|
||||||
|
disabled: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
// 0线条
|
||||||
|
series.push({
|
||||||
|
name: channel.name + "_0",
|
||||||
|
type: "line",
|
||||||
|
data: buildVcdLine(
|
||||||
|
values,
|
||||||
|
displayIndex * channelSpacing,
|
||||||
|
displayIndex * channelSpacing + 1,
|
||||||
|
),
|
||||||
|
step: false,
|
||||||
|
lineStyle: {
|
||||||
|
width: 2,
|
||||||
|
color: channel.color,
|
||||||
|
},
|
||||||
|
areaStyle: {
|
||||||
|
opacity: 0.3,
|
||||||
|
origin: displayIndex * channelSpacing + 0.5,
|
||||||
|
color: channel.color,
|
||||||
|
},
|
||||||
|
symbol: "none",
|
||||||
|
sampling: "lttb",
|
||||||
|
animation: false,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
return {
|
||||||
|
animation: false,
|
||||||
|
tooltip: {
|
||||||
|
trigger: "axis",
|
||||||
|
axisPointer: {
|
||||||
|
type: "line",
|
||||||
|
label: {
|
||||||
|
backgroundColor: "#6a7985",
|
||||||
|
},
|
||||||
|
animation: false,
|
||||||
|
},
|
||||||
|
formatter: (params: any) => {
|
||||||
|
if (Array.isArray(params) && params.length > 0) {
|
||||||
|
const timeValue = props.data!.x[params[0].dataIndex];
|
||||||
|
const dataIndex = params[0].dataIndex;
|
||||||
|
let tooltip = `Time: ${timeValue.toFixed(3)}${props.data!.xUnit}<br/>`;
|
||||||
|
enabledChannelIndices.forEach(
|
||||||
|
(originalIndex: number, displayIndex: number) => {
|
||||||
|
const channel = props.data!.y[originalIndex];
|
||||||
|
if (channel.type === "logic") {
|
||||||
|
const channelName = channel.name;
|
||||||
|
const originalValue = channel.value[dataIndex];
|
||||||
|
tooltip += `${channelName}: ${originalValue}<br/>`;
|
||||||
|
} else if (channel.type === "number") {
|
||||||
|
const channelName = channel.name;
|
||||||
|
const originalValue = channel.value[dataIndex];
|
||||||
|
tooltip += `${channelName}: ${originalValue}<br/>`;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
return tooltip;
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
},
|
||||||
|
hideDelay: 100,
|
||||||
|
},
|
||||||
|
toolbox: {
|
||||||
|
feature: {
|
||||||
|
restore: {},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
grid: grids,
|
||||||
|
xAxis: xAxis,
|
||||||
|
yAxis: yAxis,
|
||||||
|
dataZoom: [
|
||||||
|
{
|
||||||
|
show: true,
|
||||||
|
realtime: true,
|
||||||
|
start: 0,
|
||||||
|
end: 100,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: "inside",
|
||||||
|
realtime: true,
|
||||||
|
start: 0,
|
||||||
|
end: 100,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
series: series,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
</script>
|
||||||
61
src/components/WaveformDisplay/index.ts
Normal file
61
src/components/WaveformDisplay/index.ts
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
import WaveformDisplay from "./WaveformDisplay.vue";
|
||||||
|
|
||||||
|
export type LogicDataType = {
|
||||||
|
x: number[];
|
||||||
|
y: {
|
||||||
|
enabled: boolean;
|
||||||
|
type: "logic" | "number";
|
||||||
|
name: string;
|
||||||
|
color: string;
|
||||||
|
value: number[];
|
||||||
|
base: "bin" | "dec" | "hex";
|
||||||
|
}[];
|
||||||
|
xUnit: "s" | "ms" | "us" | "ns";
|
||||||
|
};
|
||||||
|
|
||||||
|
// 生成4路测试数据的函数
|
||||||
|
export function generateTestData(): LogicDataType {
|
||||||
|
// 生成时间轴数据 (0-100ns,每1ns一个采样点)
|
||||||
|
const timePoints = Array.from({ length: 101 }, (_, i) => i);
|
||||||
|
|
||||||
|
return {
|
||||||
|
x: timePoints,
|
||||||
|
y: [
|
||||||
|
{
|
||||||
|
enabled: true,
|
||||||
|
type: "logic",
|
||||||
|
name: "CLK",
|
||||||
|
color: "#ff0000",
|
||||||
|
value: timePoints.map((t) => t % 2), // 时钟信号,每1ns翻转
|
||||||
|
base: "bin",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
enabled: true,
|
||||||
|
type: "logic",
|
||||||
|
name: "RESET",
|
||||||
|
color: "#00ff00",
|
||||||
|
value: timePoints.map((t) => (t < 10 ? 1 : 0)), // 复位信号,前10ns为高电平
|
||||||
|
base: "bin",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
enabled: true,
|
||||||
|
type: "number",
|
||||||
|
name: "DATA",
|
||||||
|
color: "#0000ff",
|
||||||
|
value: timePoints.map((t) => Math.floor(t / 4) % 16), // 计数器,每4ns递增
|
||||||
|
base: "hex",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
enabled: true,
|
||||||
|
type: "logic",
|
||||||
|
name: "ENABLE",
|
||||||
|
color: "#ff8800",
|
||||||
|
value: timePoints.map((t) => (t >= 20 && t < 80 ? 1 : 0)), // 使能信号,20-80ns为高电平
|
||||||
|
base: "bin",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
xUnit: "ns",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export { WaveformDisplay };
|
||||||
@@ -212,6 +212,7 @@ import { useEquipments } from "@/stores/equipments";
|
|||||||
import { useDialogStore } from "@/stores/dialog";
|
import { useDialogStore } from "@/stores/dialog";
|
||||||
import { toInteger } from "lodash";
|
import { toInteger } from "lodash";
|
||||||
import { AuthManager } from "@/utils/AuthManager";
|
import { AuthManager } from "@/utils/AuthManager";
|
||||||
|
import { DDSClient } from "@/APIClient";
|
||||||
|
|
||||||
// Component Attributes
|
// Component Attributes
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
@@ -221,7 +222,7 @@ const props = defineProps<{
|
|||||||
const emit = defineEmits(["update:modelValue"]);
|
const emit = defineEmits(["update:modelValue"]);
|
||||||
|
|
||||||
// Global varibles
|
// Global varibles
|
||||||
const dds = AuthManager.createAuthenticatedDDSClient();
|
const dds = AuthManager.createClient(DDSClient);
|
||||||
const eqps = useEquipments();
|
const eqps = useEquipments();
|
||||||
const dialog = useDialogStore();
|
const dialog = useDialogStore();
|
||||||
|
|
||||||
|
|||||||
318
src/components/equipments/EC11RotaryEncoder.vue
Normal file
318
src/components/equipments/EC11RotaryEncoder.vue
Normal file
@@ -0,0 +1,318 @@
|
|||||||
|
<template>
|
||||||
|
<div
|
||||||
|
class="inline-block select-none"
|
||||||
|
:style="{
|
||||||
|
width: width + 'px',
|
||||||
|
height: height + 'px',
|
||||||
|
position: 'relative',
|
||||||
|
}"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
:width="width"
|
||||||
|
:height="height"
|
||||||
|
viewBox="0 0 100 100"
|
||||||
|
class="ec11-encoder"
|
||||||
|
>
|
||||||
|
<defs>
|
||||||
|
<!-- 发光效果滤镜 -->
|
||||||
|
<filter id="glow" x="-50%" y="-50%" width="200%" height="200%">
|
||||||
|
<feFlood
|
||||||
|
result="flood"
|
||||||
|
flood-color="#00ff88"
|
||||||
|
flood-opacity="1"
|
||||||
|
></feFlood>
|
||||||
|
<feComposite
|
||||||
|
in="flood"
|
||||||
|
result="mask"
|
||||||
|
in2="SourceGraphic"
|
||||||
|
operator="in"
|
||||||
|
></feComposite>
|
||||||
|
<feMorphology
|
||||||
|
in="mask"
|
||||||
|
result="dilated"
|
||||||
|
operator="dilate"
|
||||||
|
radius="1"
|
||||||
|
></feMorphology>
|
||||||
|
<feGaussianBlur in="dilated" stdDeviation="2" result="blur1" />
|
||||||
|
<feGaussianBlur in="dilated" stdDeviation="4" result="blur2" />
|
||||||
|
<feGaussianBlur in="dilated" stdDeviation="8" result="blur3" />
|
||||||
|
<feMerge>
|
||||||
|
<feMergeNode in="blur3" />
|
||||||
|
<feMergeNode in="blur2" />
|
||||||
|
<feMergeNode in="blur1" />
|
||||||
|
<feMergeNode in="SourceGraphic" />
|
||||||
|
</feMerge>
|
||||||
|
</filter>
|
||||||
|
|
||||||
|
<!-- 编码器主体渐变 -->
|
||||||
|
<radialGradient id="encoderGradient" cx="50%" cy="30%">
|
||||||
|
<stop offset="0%" stop-color="#666666" />
|
||||||
|
<stop offset="70%" stop-color="#333333" />
|
||||||
|
<stop offset="100%" stop-color="#1a1a1a" />
|
||||||
|
</radialGradient>
|
||||||
|
|
||||||
|
<!-- 旋钮渐变 -->
|
||||||
|
<radialGradient id="knobGradient" cx="30%" cy="30%">
|
||||||
|
<stop offset="0%" stop-color="#555555" />
|
||||||
|
<stop offset="70%" stop-color="#222222" />
|
||||||
|
<stop offset="100%" stop-color="#111111" />
|
||||||
|
</radialGradient>
|
||||||
|
|
||||||
|
<!-- 按下状态渐变 -->
|
||||||
|
<radialGradient id="knobPressedGradient" cx="50%" cy="50%">
|
||||||
|
<stop offset="0%" stop-color="#333333" />
|
||||||
|
<stop offset="70%" stop-color="#555555" />
|
||||||
|
<stop offset="100%" stop-color="#888888" />
|
||||||
|
</radialGradient>
|
||||||
|
</defs>
|
||||||
|
|
||||||
|
<!-- 编码器底座 -->
|
||||||
|
<rect
|
||||||
|
x="10"
|
||||||
|
y="30"
|
||||||
|
width="80"
|
||||||
|
height="60"
|
||||||
|
rx="8"
|
||||||
|
ry="8"
|
||||||
|
fill="#2a2a2a"
|
||||||
|
stroke="#444444"
|
||||||
|
stroke-width="1"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<!-- 编码器主体外壳 -->
|
||||||
|
<circle
|
||||||
|
cx="50"
|
||||||
|
cy="60"
|
||||||
|
r="32"
|
||||||
|
fill="url(#encoderGradient)"
|
||||||
|
stroke="#555555"
|
||||||
|
stroke-width="1"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<!-- 编码器接线端子 -->
|
||||||
|
<rect x="5" y="75" width="4" height="8" fill="#c9c9c9" rx="1" />
|
||||||
|
<rect x="15" y="85" width="4" height="8" fill="#c9c9c9" rx="1" />
|
||||||
|
<rect x="25" y="85" width="4" height="8" fill="#c9c9c9" rx="1" />
|
||||||
|
<rect x="81" y="85" width="4" height="8" fill="#c9c9c9" rx="1" />
|
||||||
|
<rect x="91" y="75" width="4" height="8" fill="#c9c9c9" rx="1" />
|
||||||
|
|
||||||
|
<!-- 旋钮 -->
|
||||||
|
<circle
|
||||||
|
cx="50"
|
||||||
|
cy="60"
|
||||||
|
r="22"
|
||||||
|
:fill="isPressed ? 'url(#knobPressedGradient)' : 'url(#knobGradient)'"
|
||||||
|
stroke="#666666"
|
||||||
|
stroke-width="1"
|
||||||
|
:transform="`rotate(${rotationStep * 7.5} 50 60)`"
|
||||||
|
class="interactive"
|
||||||
|
@mousedown="handleMouseDown"
|
||||||
|
@mouseup="handlePress(false)"
|
||||||
|
@mouseleave="handlePress(false)"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<!-- 旋钮指示器 -->
|
||||||
|
<line
|
||||||
|
x1="50"
|
||||||
|
y1="42"
|
||||||
|
x2="50"
|
||||||
|
y2="48"
|
||||||
|
stroke="#ffffff"
|
||||||
|
stroke-width="2"
|
||||||
|
stroke-linecap="round"
|
||||||
|
:transform="`rotate(${rotationStep * 15} 50 60)`"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<!-- 旋钮上的纹理刻度 -->
|
||||||
|
<g :transform="`rotate(${rotationStep * 15} 50 60)`">
|
||||||
|
<circle
|
||||||
|
cx="50"
|
||||||
|
cy="60"
|
||||||
|
r="18"
|
||||||
|
fill="none"
|
||||||
|
stroke="#777777"
|
||||||
|
stroke-width="0.5"
|
||||||
|
/>
|
||||||
|
<!-- 刻度线 -->
|
||||||
|
<g v-for="i in 16" :key="i">
|
||||||
|
<line
|
||||||
|
:x1="50 + 16 * Math.cos(((i - 1) * Math.PI) / 8)"
|
||||||
|
:y1="60 + 16 * Math.sin(((i - 1) * Math.PI) / 8)"
|
||||||
|
:x2="50 + 18 * Math.cos(((i - 1) * Math.PI) / 8)"
|
||||||
|
:y2="60 + 18 * Math.sin(((i - 1) * Math.PI) / 8)"
|
||||||
|
stroke="#999999"
|
||||||
|
stroke-width="0.5"
|
||||||
|
/>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
|
||||||
|
<!-- 编码器编号标签 -->
|
||||||
|
<text
|
||||||
|
x="50"
|
||||||
|
y="15"
|
||||||
|
text-anchor="middle"
|
||||||
|
font-family="Arial"
|
||||||
|
font-size="10"
|
||||||
|
fill="#cccccc"
|
||||||
|
font-weight="bold"
|
||||||
|
>
|
||||||
|
EC11-{{ encoderNumber }}
|
||||||
|
</text>
|
||||||
|
|
||||||
|
<!-- 状态指示器 -->
|
||||||
|
<circle
|
||||||
|
cx="85"
|
||||||
|
cy="20"
|
||||||
|
r="3"
|
||||||
|
:fill="isPressed ? '#ff4444' : '#444444'"
|
||||||
|
:filter="isPressed ? 'url(#glow)' : ''"
|
||||||
|
stroke="#666666"
|
||||||
|
stroke-width="0.5"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="ts" setup>
|
||||||
|
import { useRotaryEncoder } from "@/stores/Peripherals/RotaryEncoder";
|
||||||
|
import {
|
||||||
|
RotaryEncoderDirection,
|
||||||
|
RotaryEncoderPressStatus,
|
||||||
|
} from "@/utils/signalR/Peripherals.RotaryEncoderClient";
|
||||||
|
import { watch } from "vue";
|
||||||
|
import { watchEffect } from "vue";
|
||||||
|
import { ref, computed } from "vue";
|
||||||
|
|
||||||
|
const rotataryEncoderStore = useRotaryEncoder();
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
size?: number;
|
||||||
|
componentId?: string;
|
||||||
|
enableDigitalTwin?: boolean;
|
||||||
|
encoderNumber?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
const props = withDefaults(defineProps<Props>(), {
|
||||||
|
size: 1,
|
||||||
|
enableDigitalTwin: false,
|
||||||
|
encoderNumber: 1,
|
||||||
|
});
|
||||||
|
|
||||||
|
// 组件状态
|
||||||
|
const isPressed = ref(false);
|
||||||
|
const rotationStep = ref(0); // 步进计数,1步=15度
|
||||||
|
|
||||||
|
// 拖动状态对象,增加 hasRotated 标记
|
||||||
|
const drag = ref<{
|
||||||
|
active: boolean;
|
||||||
|
startX: number;
|
||||||
|
hasRotated: boolean;
|
||||||
|
} | null>(null);
|
||||||
|
|
||||||
|
const dragThreshold = 20; // 每20像素触发一次旋转
|
||||||
|
|
||||||
|
// 计算宽高
|
||||||
|
const width = computed(() => 100 * props.size);
|
||||||
|
const height = computed(() => 100 * props.size);
|
||||||
|
|
||||||
|
// 鼠标按下处理
|
||||||
|
function handleMouseDown(event: MouseEvent) {
|
||||||
|
drag.value = { active: true, startX: event.clientX, hasRotated: false };
|
||||||
|
window.addEventListener("mousemove", handleMouseMove);
|
||||||
|
window.addEventListener("mouseup", handleMouseUp);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 鼠标移动处理
|
||||||
|
function handleMouseMove(event: MouseEvent) {
|
||||||
|
if (!drag.value?.active) return;
|
||||||
|
const dx = event.clientX - drag.value.startX;
|
||||||
|
if (Math.abs(dx) >= dragThreshold) {
|
||||||
|
rotationStep.value += dx > 0 ? 1 : -1;
|
||||||
|
drag.value.startX = event.clientX;
|
||||||
|
drag.value.hasRotated = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 鼠标松开处理
|
||||||
|
function handleMouseUp() {
|
||||||
|
if (drag.value && drag.value.active) {
|
||||||
|
// 仅在未发生旋转时才触发按压
|
||||||
|
if (!drag.value.hasRotated) {
|
||||||
|
isPressed.value = true;
|
||||||
|
rotataryEncoderStore.pressOnce(
|
||||||
|
props.encoderNumber,
|
||||||
|
RotaryEncoderPressStatus.Press,
|
||||||
|
);
|
||||||
|
setTimeout(() => {
|
||||||
|
isPressed.value = false;
|
||||||
|
rotataryEncoderStore.pressOnce(
|
||||||
|
props.encoderNumber,
|
||||||
|
RotaryEncoderPressStatus.Release,
|
||||||
|
);
|
||||||
|
}, 100);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
drag.value = null;
|
||||||
|
window.removeEventListener("mousemove", handleMouseMove);
|
||||||
|
window.removeEventListener("mouseup", handleMouseUp);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 按压处理(用于鼠标离开和mouseup)
|
||||||
|
function handlePress(pressed: boolean) {
|
||||||
|
isPressed.value = pressed;
|
||||||
|
}
|
||||||
|
|
||||||
|
watchEffect(() => {
|
||||||
|
if (!props.enableDigitalTwin) return;
|
||||||
|
|
||||||
|
if (props.componentId)
|
||||||
|
rotataryEncoderStore.setEnable(props.enableDigitalTwin);
|
||||||
|
});
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => rotationStep.value,
|
||||||
|
(newStep, oldStep) => {
|
||||||
|
if (!props.enableDigitalTwin) return;
|
||||||
|
|
||||||
|
if (newStep > oldStep) {
|
||||||
|
rotataryEncoderStore.rotateOnce(
|
||||||
|
props.encoderNumber,
|
||||||
|
RotaryEncoderDirection.Clockwise,
|
||||||
|
);
|
||||||
|
} else if (newStep < oldStep) {
|
||||||
|
rotataryEncoderStore.rotateOnce(
|
||||||
|
props.encoderNumber,
|
||||||
|
RotaryEncoderDirection.CounterClockwise,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<script lang="ts">
|
||||||
|
// 添加一个静态方法来获取默认props
|
||||||
|
export function getDefaultProps() {
|
||||||
|
return {
|
||||||
|
size: 1,
|
||||||
|
enableDigitalTwin: false,
|
||||||
|
encoderNumber: 1,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped lang="postcss">
|
||||||
|
.ec11-container {
|
||||||
|
display: inline-block;
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ec11-encoder {
|
||||||
|
display: block;
|
||||||
|
overflow: visible;
|
||||||
|
}
|
||||||
|
|
||||||
|
.interactive {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -18,8 +18,8 @@
|
|||||||
</feMerge>
|
</feMerge>
|
||||||
</filter>
|
</filter>
|
||||||
<linearGradient id="normal" gradientTransform="rotate(45 0 0)">
|
<linearGradient id="normal" gradientTransform="rotate(45 0 0)">
|
||||||
<stop stop-color="#4b4b4b" offset="0" />
|
<stop stop-color="#FFFFFF" offset="0" />
|
||||||
<stop stop-color="#171717" offset="1" />
|
<stop stop-color="#333333" offset="1" />
|
||||||
</linearGradient>
|
</linearGradient>
|
||||||
<linearGradient id="pressed" gradientTransform="rotate(45 0 0)">
|
<linearGradient id="pressed" gradientTransform="rotate(45 0 0)">
|
||||||
<stop stop-color="#171717" offset="0" />
|
<stop stop-color="#171717" offset="0" />
|
||||||
@@ -42,7 +42,6 @@
|
|||||||
fill-opacity="0.9" @mousedown="toggleButtonState(true)" @mouseup="toggleButtonState(false)"
|
fill-opacity="0.9" @mousedown="toggleButtonState(true)" @mouseup="toggleButtonState(false)"
|
||||||
@mouseleave="toggleButtonState(false)" style="
|
@mouseleave="toggleButtonState(false)" style="
|
||||||
pointer-events: auto;
|
pointer-events: auto;
|
||||||
transition: all 20ms ease-in-out;
|
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
" />
|
" />
|
||||||
<!-- 按键文字 - 仅显示绑定的按键 -->
|
<!-- 按键文字 - 仅显示绑定的按键 -->
|
||||||
|
|||||||
@@ -1,32 +1,47 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="motherboard-container" v-bind="$attrs" :style="{
|
<div
|
||||||
|
class="motherboard-container"
|
||||||
|
v-bind="$attrs"
|
||||||
|
:style="{
|
||||||
width: width + 'px',
|
width: width + 'px',
|
||||||
height: height + 'px',
|
height: height + 'px',
|
||||||
position: 'relative',
|
position: 'relative',
|
||||||
}">
|
}"
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" :width="width" :height="height" :viewBox="`0 0 800 600`"
|
>
|
||||||
class="motherboard-svg">
|
<svg
|
||||||
<image href="../equipments/svg/motherboard.svg" width="100%" height="100%" preserveAspectRatio="xMidYMid meet" />
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
:width="width"
|
||||||
|
:height="height"
|
||||||
|
:viewBox="`0 0 800 600`"
|
||||||
|
class="motherboard-svg"
|
||||||
|
>
|
||||||
|
<image
|
||||||
|
href="../equipments/svg/motherboard.svg"
|
||||||
|
width="100%"
|
||||||
|
height="100%"
|
||||||
|
preserveAspectRatio="xMidYMid meet"
|
||||||
|
/>
|
||||||
</svg>
|
</svg>
|
||||||
</div>
|
</div>
|
||||||
<Teleport to="#ComponentCapabilities" v-if="selectecComponentID === props.componentId">
|
<Teleport
|
||||||
<MotherBoardCaps :jtagAddr="props.boardAddr" :jtagPort="toNumber(props.boardPort)" :jtagFreq="jtagFreq"
|
to="#ComponentCapabilities"
|
||||||
@change-jtag-freq="changeJtagFreq" />
|
v-if="selectecComponentID === props.componentId"
|
||||||
|
>
|
||||||
|
<MotherBoardCaps :jtagFreq="jtagFreq" :exam-id="examId" @change-jtag-freq="changeJtagFreq" />
|
||||||
</Teleport>
|
</Teleport>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="tsx">
|
<script setup lang="tsx">
|
||||||
import MotherBoardCaps from "./MotherBoardCaps.vue";
|
import MotherBoardCaps from "./MotherBoardCaps.vue";
|
||||||
import { ref, computed, watchEffect, inject } from "vue";
|
import { ref, computed, inject } from "vue";
|
||||||
import { CanvasCurrentSelectedComponentID } from "../InjectKeys";
|
import { CanvasCurrentSelectedComponentID } from "../InjectKeys";
|
||||||
import { toNumber } from "lodash";
|
import { toNumber } from "lodash";
|
||||||
|
|
||||||
// 主板特有属性
|
// 主板特有属性
|
||||||
export interface MotherBoardProps {
|
export interface MotherBoardProps {
|
||||||
size: number;
|
size: number;
|
||||||
boardAddr?: string;
|
|
||||||
boardPort?: string;
|
|
||||||
componentId?: string;
|
componentId?: string;
|
||||||
|
examId?: string; // 新增examId属性
|
||||||
}
|
}
|
||||||
|
|
||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
@@ -61,8 +76,6 @@ defineExpose({
|
|||||||
export function getDefaultProps(): MotherBoardProps {
|
export function getDefaultProps(): MotherBoardProps {
|
||||||
return {
|
return {
|
||||||
size: 1,
|
size: 1,
|
||||||
boardAddr: "127.0.0.1",
|
|
||||||
boardPort: "1234",
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -8,29 +8,22 @@
|
|||||||
<p>
|
<p>
|
||||||
IDCode: 0x{{ jtagIDCode.toString(16).padStart(8, "0").toUpperCase() }}
|
IDCode: 0x{{ jtagIDCode.toString(16).padStart(8, "0").toUpperCase() }}
|
||||||
</p>
|
</p>
|
||||||
<button class="btn btn-circle w-6 h-6" :onclick="getIDCode">
|
<button
|
||||||
<svg
|
class="btn btn-circle w-6 h-6"
|
||||||
class="icon opacity-70 fill-primary"
|
:disabled="isGettingIDCode"
|
||||||
viewBox="0 0 1024 1024"
|
:onclick="getIDCode"
|
||||||
version="1.1"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
p-id="4865"
|
|
||||||
width="200"
|
|
||||||
height="200"
|
|
||||||
>
|
>
|
||||||
<path
|
<RefreshCcwIcon
|
||||||
d="M894.481158 505.727133c0 49.589418-9.711176 97.705276-28.867468 143.007041-18.501376 43.74634-44.98454 83.031065-78.712713 116.759237-33.728172 33.728172-73.012897 60.211337-116.759237 78.712713-45.311998 19.156292-93.417623 28.877701-143.007041 28.877701s-97.695043-9.721409-142.996808-28.877701c-43.756573-18.501376-83.031065-44.98454-116.76947-78.712713-33.728172-33.728172-60.211337-73.012897-78.712713-116.759237-19.156292-45.301765-28.867468-93.417623-28.867468-143.007041 0-49.579185 9.711176-97.695043 28.867468-142.996808 18.501376-43.74634 44.98454-83.031065 78.712713-116.759237 33.738405-33.728172 73.012897-60.211337 116.76947-78.712713 45.301765-19.166525 93.40739-28.877701 142.996808-28.877701 52.925397 0 104.008842 11.010775 151.827941 32.745798 46.192042 20.977777 86.909395 50.79692 121.016191 88.608084 4.389984 4.860704 8.646937 9.854439 12.781094 14.97097l0-136.263453c0-11.307533 9.168824-20.466124 20.466124-20.466124 11.307533 0 20.466124 9.15859 20.466124 20.466124l0 183.64253c0 5.433756-2.148943 10.632151-5.986341 14.46955-3.847631 3.837398-9.046027 5.996574-14.479783 5.996574l-183.64253-0.020466c-11.307533 0-20.466124-9.168824-20.466124-20.466124 0-11.307533 9.168824-20.466124 20.466124-20.466124l132.293025 0.020466c-3.960195-4.952802-8.063653-9.782807-12.289907-14.479783-30.320563-33.605376-66.514903-60.098773-107.549481-78.753645-42.467207-19.289322-87.850837-29.072129-134.902456-29.072129-87.195921 0-169.172981 33.9533-230.816946 95.597265-61.654198 61.654198-95.597265 143.621025-95.597265 230.816946s33.943067 169.172981 95.597265 230.816946c61.643965 61.654198 143.621025 95.607498 230.816946 95.607498s169.172981-33.9533 230.816946-95.607498c61.654198-61.643965 95.597265-143.621025 95.597265-230.816946 0-11.2973 9.168824-20.466124 20.466124-20.466124C885.322567 485.261009 894.481158 494.429833 894.481158 505.727133z"
|
class="icon"
|
||||||
p-id="4866"
|
:class="{ 'animate-spin': isGettingIDCode }"
|
||||||
></path>
|
/>
|
||||||
</svg>
|
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="divider"></div>
|
<div class="divider"></div>
|
||||||
<UploadCard
|
<UploadCard
|
||||||
class="bg-base-200"
|
:exam-id="props.examId"
|
||||||
:upload-event="eqps.jtagUploadBitstream"
|
:upload-event="eqps.jtagUploadBitstream"
|
||||||
:download-event="eqps.jtagDownloadBitstream"
|
|
||||||
:bitstream-file="eqps.jtagBitstream"
|
:bitstream-file="eqps.jtagBitstream"
|
||||||
@update:bitstream-file="handleBitstreamChange"
|
@update:bitstream-file="handleBitstreamChange"
|
||||||
>
|
>
|
||||||
@@ -73,7 +66,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="divider"></div>
|
<div class="divider"></div>
|
||||||
<h1 class="font-bold text-center text-2xl">外设</h1>
|
<h1 class="font-bold text-center text-2xl">外设</h1>
|
||||||
<div class="flex flex-row justify-around">
|
<div class="flex flex-row justify-between columns-2">
|
||||||
<div class="flex flex-row">
|
<div class="flex flex-row">
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
@@ -87,10 +80,10 @@
|
|||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
class="checkbox"
|
class="checkbox"
|
||||||
:checked="eqps.enablePower"
|
:checked="eqps.enableSevenSegmentDisplay"
|
||||||
@change="handlePowerCheckboxChange"
|
@change="handleSevenSegmentDisplayCheckboxChange"
|
||||||
/>
|
/>
|
||||||
<p class="mx-2">启用电源</p>
|
<p class="mx-2">启用数码管</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -102,11 +95,11 @@ import UploadCard from "@/components/UploadCard.vue";
|
|||||||
import { useDialogStore } from "@/stores/dialog";
|
import { useDialogStore } from "@/stores/dialog";
|
||||||
import { useEquipments } from "@/stores/equipments";
|
import { useEquipments } from "@/stores/equipments";
|
||||||
import { computed, ref, watchEffect } from "vue";
|
import { computed, ref, watchEffect } from "vue";
|
||||||
|
import { RefreshCcwIcon } from "lucide-vue-next";
|
||||||
|
|
||||||
interface CapsProps {
|
interface CapsProps {
|
||||||
jtagAddr?: string;
|
|
||||||
jtagPort?: number;
|
|
||||||
jtagFreq?: string;
|
jtagFreq?: string;
|
||||||
|
examId?: string; // 新增examId属性
|
||||||
}
|
}
|
||||||
|
|
||||||
const emits = defineEmits<{
|
const emits = defineEmits<{
|
||||||
@@ -162,28 +155,25 @@ async function handleMatrixkeyCheckboxChange(event: Event) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function handlePowerCheckboxChange(event: Event) {
|
async function handleSevenSegmentDisplayCheckboxChange(event: Event) {
|
||||||
const target = event.target as HTMLInputElement;
|
const target = event.target as HTMLInputElement;
|
||||||
const ret = await eqps.powerSetOnOff(target.checked);
|
|
||||||
if (target.checked) {
|
if (target.checked) {
|
||||||
eqps.enablePower = ret;
|
await eqps.sevenSegmentDisplaySetOnOff(true);
|
||||||
} else {
|
} else {
|
||||||
eqps.enablePower = !ret;
|
await eqps.sevenSegmentDisplaySetOnOff(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function toggleJtagBoundaryScan() {
|
async function toggleJtagBoundaryScan() {
|
||||||
eqps.enableJtagBoundaryScan = !eqps.enableJtagBoundaryScan;
|
eqps.jtagBoundaryScanSetOnOff(!eqps.enableJtagBoundaryScan);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const isGettingIDCode = ref(false);
|
||||||
async function getIDCode(isQuiet: boolean = false) {
|
async function getIDCode(isQuiet: boolean = false) {
|
||||||
|
isGettingIDCode.value = true;
|
||||||
jtagIDCode.value = await eqps.jtagGetIDCode(isQuiet);
|
jtagIDCode.value = await eqps.jtagGetIDCode(isQuiet);
|
||||||
|
isGettingIDCode.value = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
watchEffect(async () => {
|
|
||||||
if (eqps.setAddr(props.jtagAddr) && eqps.setPort(props.jtagPort))
|
|
||||||
getIDCode(true);
|
|
||||||
});
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped lang="postcss">
|
<style scoped lang="postcss">
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user