feat: RS485透传改为Modbus RTU Master轮询寄存器41161报警信号

MDK-ARM/RTE/_project/RTE_Components.h

@@ -1,7 +1,6 @@
-
 /*
- * Auto generated Run-Time-Environment Component Configuration File
- *      *** Do not modify ! ***
+ * UVISION generated file: DO NOT EDIT!
+ * Generated by: uVision version 5.43.1.0
  *
  * Project: 'project' 
  * Target:  'project' 
@@ -17,4 +16,5 @@
 #define CMSIS_device_header "stm32f10x.h"
 
 
+
 #endif /* RTE_COMPONENTS_H */

MDK-ARM/project.uvprojx

@@ -10,14 +10,14 @@
       <TargetName>project</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>5060750::V5.06 update 6 (build 750)::ARMCC</pCCUsed>
+      <pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
       <uAC6>0</uAC6>
       <TargetOption>
         <TargetCommonOption>
           <Device>STM32F103C8</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32F1xx_DFP.1.1.0</PackID>
-          <PackURL>http://www.keil.com/pack/</PackURL>
+          <PackID>Keil.STM32F1xx_DFP.2.4.1</PackID>
+          <PackURL>https://www.keil.com/pack/</PackURL>
           <Cpu>IRAM(0x20000000-0x20004FFF) IROM(0x8000000-0x800FFFF) CLOCK(8000000) CPUTYPE("Cortex-M3") TZ</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
@@ -184,6 +184,9 @@
             <hadXRAM>0</hadXRAM>
             <uocXRam>0</uocXRam>
             <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <nBranchProt>0</nBranchProt>
             <hadIRAM2>0</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -350,7 +353,7 @@
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
             <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
+            <ClangAsOpt>4</ClangAsOpt>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define></Define>
@@ -528,14 +531,9 @@
               <FilePath>..\Core\Src\multi_uart_router.c</FilePath>
             </File>
             <File>
-              <FileName>uart3_passthrough.c</FileName>
+              <FileName>modbus_rtu_master.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\Core\Src\uart3_passthrough.c</FilePath>
-            </File>
-            <File>
-              <FileName>uart3_protocol_discriminator.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\Core\Src\uart3_protocol_discriminator.c</FilePath>
+              <FilePath>..\Core\Src\modbus_rtu_master.c</FilePath>
             </File>
             <File>
               <FileName>tim.c</FileName>
@@ -785,4 +783,14 @@
     <files/>
   </RTE>
 
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>project</LayName>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
 </Project>

MDK-ARM/project/project.lnp

@@ -17,8 +17,7 @@
 "project\cmd_router.o"
 "project\debug_log.o"
 "project\multi_uart_router.o"
-"project\uart3_passthrough.o"
-"project\uart3_protocol_discriminator.o"
+"project\modbus_rtu_master.o"
 "project\tim.o"
 "project\stm32f1xx_hal_gpio_ex.o"
 "project\stm32f1xx_hal_spi.o"

MDK-ARM/project/project.sct

@@ -7,6 +7,7 @@ LR_IROM1 0x08000000 0x00010000  {    ; load region size_region
    *.o (RESET, +First)
    *(InRoot$$Sections)
    .ANY (+RO)
+   .ANY (+XO)
   }
   RW_IRAM1 0x20000000 0x00005000  {  ; RW data
    .ANY (+RW +ZI)

MDK-ARM/project/project_sct.Bak

@@ -7,7 +7,6 @@ LR_IROM1 0x08000000 0x00010000  {    ; load region size_region
    *.o (RESET, +First)
    *(InRoot$$Sections)
    .ANY (+RO)
-   .ANY (+XO)
   }
   RW_IRAM1 0x20000000 0x00005000  {  ; RW data
    .ANY (+RW +ZI)

MDK-ARM/startup_stm32f103xb.lst

@@ -461,11 +461,11 @@ ARM Macro Assembler    Page 8
 
 Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw
 ork --depend=project\startup_stm32f103xb.d -oproject\startup_stm32f103xb.o -I.\
-RTE\_project -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.4.0\CMSIS\Core\Include -IC:\Keil
-_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.1.0\Device\Include --predefine="__MICROLIB SE
-TA 1" --predefine="__UVISION_VERSION SETA 525" --predefine="_RTE_ SETA 1" --pre
-define="STM32F10X_MD SETA 1" --list=startup_stm32f103xb.lst startup_stm32f103xb
-.s
+RTE\_project -IC:\Users\xtell\AppData\Local\Arm\Packs\ARM\CMSIS\6.2.0\CMSIS\Cor
+e\Include -IC:\Users\xtell\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.1\Dev
+ice\Include --predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA
+ 543" --predefine="STM32F10X_MD SETA 1" --predefine="_RTE_ SETA 1" --list=start
+up_stm32f103xb.lst startup_stm32f103xb.s