diff --git a/applications/EmsShower/emsshower.json b/applications/EmsShower/emsshower.json index 4d92332..e4fa219 100644 --- a/applications/EmsShower/emsshower.json +++ b/applications/EmsShower/emsshower.json @@ -186,6 +186,98 @@ "skip":0 } ] + }, + { + "start_addr":50009, + "quantity":4, + "bytes_per_register":2, + "language":"en", + "device_name_chn":"传感器", + "device_name_eng":"Sensor", + "device_type":6, + "data": [ + { + "comment":"设备通讯状态", + "order":0, + "precision":1, + "unit":"", + "title_chn":"设备通讯状态", + "title_eng":"Online", + "display":1, + "skip":0 + }, + { + "comment":"门禁状态", + "order":1, + "precision":1, + "unit":"", + "title_chn":"门禁状态", + "title_eng":"Access Control", + "display":1, + "skip":0 + }, + { + "comment":"水浸传感器", + "order":2, + "precision":1, + "unit":"", + "title_chn":"水浸传感器", + "title_eng":"water ingress", + "display":1, + "skip":1 + }, + { + "comment":"烟雾传感器", + "order":3, + "precision":1, + "unit":"", + "title_chn":"烟雾传感器", + "title_eng":"Smoke", + "display":1, + "skip":0 + } + ] + }, + { + "start_addr":40009, + "quantity":3, + "bytes_per_register":2, + "language":"en", + "device_name_chn":"传感器告警", + "device_name_eng":"Sensor Alarm", + "device_type":6, + "data": [ + { + "comment":"门禁告警", + "order":0, + "precision":10, + "unit":"", + "title_chn":"门禁告警", + "title_eng":"Access Control Alarm", + "display":0, + "skip":0 + }, + { + "comment":"水浸告警", + "order":1, + "precision":1, + "unit":"", + "title_chn":"水浸告警", + "title_eng":"Water ingress", + "display":0, + "skip":0 + }, + { + "comment":"烟雾告警", + "order":2, + "precision":1, + "unit":"", + "title_chn":"烟雾告警", + "title_eng":"Smoke", + "display":0, + "skip":0 + } + ] } ] } diff --git a/applications/addrCalc/addrCalc.exe b/applications/addrCalc/addrCalc.exe new file mode 100644 index 0000000..30e53a7 Binary files /dev/null and b/applications/addrCalc/addrCalc.exe differ diff --git a/applications/addrCalc/addrCalc.sln b/applications/addrCalc/addrCalc.sln new file mode 100644 index 0000000..24ba63a --- /dev/null +++ b/applications/addrCalc/addrCalc.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.35425.106 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addrCalc", "addrCalc.vcxproj", "{043565F0-4E57-419F-BACA-34AE0B9A99A7}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {043565F0-4E57-419F-BACA-34AE0B9A99A7}.Debug|x64.ActiveCfg = Debug|x64 + {043565F0-4E57-419F-BACA-34AE0B9A99A7}.Debug|x64.Build.0 = Debug|x64 + {043565F0-4E57-419F-BACA-34AE0B9A99A7}.Debug|x86.ActiveCfg = Debug|Win32 + {043565F0-4E57-419F-BACA-34AE0B9A99A7}.Debug|x86.Build.0 = Debug|Win32 + {043565F0-4E57-419F-BACA-34AE0B9A99A7}.Release|x64.ActiveCfg = Release|x64 + {043565F0-4E57-419F-BACA-34AE0B9A99A7}.Release|x64.Build.0 = Release|x64 + {043565F0-4E57-419F-BACA-34AE0B9A99A7}.Release|x86.ActiveCfg = Release|Win32 + {043565F0-4E57-419F-BACA-34AE0B9A99A7}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {127C6F00-0CE3-4777-83DB-1985A193B905} + EndGlobalSection +EndGlobal diff --git a/applications/addrCalc/addrCalc.vcxproj b/applications/addrCalc/addrCalc.vcxproj new file mode 100644 index 0000000..e893dca --- /dev/null +++ b/applications/addrCalc/addrCalc.vcxproj @@ -0,0 +1,147 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 16.0 + Win32Proj + {043565f0-4e57-419f-baca-34ae0b9a99a7} + addrCalc + 10.0 + + + + Application + true + v142 + Unicode + + + Application + false + v142 + true + Unicode + + + Application + true + v142 + Unicode + + + Application + false + v142 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + + \ No newline at end of file