EquipmentCode 地址位高7个位，SerialNumber地址位低9位

2025-03-21 13:27:34 +08:00 · 2025-03-21 13:27:34 +08:00 · 3075d80704
parent 2135b69ecc
commit 3075d80704
4 changed files with 270 additions and 0 deletions
--- 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 
+                        }
+                    ]
                }
            ]
        }
--- a/applications/addrCalc/addrCalc.exe
+++ b/applications/addrCalc/addrCalc.exe
--- a/applications/addrCalc/addrCalc.sln
+++ 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
--- a/applications/addrCalc/addrCalc.vcxproj
+++ b/applications/addrCalc/addrCalc.vcxproj
@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{043565f0-4e57-419f-baca-34ae0b9a99a7}</ProjectGuid>
+    <RootNamespace>addrCalc</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="addrCalc.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>