解决冲突

pro/src/cascade_slave.c

@@ -9,11 +9,11 @@
 
 #define DEV_CHN_REG                 (4000)  
 #define OUT_INFO_REG                (4001)     
-#define IN_TOTAL_REG                (4768)  
-#define TEM_HUMAN_REG               (4777)       
-#define CHN_SWITCH_REG              (4779)
-#define CHN_OPEN_DLA_REG            (4843)
-#define CHN_CLOSE_DLA_REG           (4907)
+#define IN_TOTAL_REG                (4385)  
+#define TEM_HUMAN_REG               (4389)       
+#define CHN_SWITCH_REG              (4390)
+#define CHN_OPEN_DLA_REG            (4454)
+#define CHN_CLOSE_DLA_REG           (4518)
 #define CHN_SET_OPEN_DLA_REG        (5000)
 #define CHN_SET_CLOSE_DLA_REG       (5064)
 #define CHN_SET_SWITCH_STA_REG      (5128)
@@ -187,7 +187,7 @@ int cascade_slave_init(void)
 static void slave_read(slave_handle_t *sh, uint32_t addr,int num,uint32_t reg_type,uint32_t type)
 {
     GlobalDeviceManager* mgr=get_dm();
-
+  
     if(mgr->_globalDevInfo.product_pwr_type == SmartPDU_AC || 
             mgr->_globalDevInfo.product_pwr_type == SmartPDU_DC){    
         if(addr >= DEV_CHN_REG && addr <= ALL_SET_SWITCH_REG)
@@ -206,7 +206,7 @@ static void slave_read(slave_handle_t *sh, uint32_t addr,int num,uint32_t reg_ty
             {
                 uint32_t *base_addr = (uint32_t *)modbus_single[reg_type].addr;
                 uint32_t step = addr - sh->map->start_registers;
-                base_addr = base_addr + (addr - modbus_single[reg_type].offset) / 2;
+                base_addr = base_addr + (addr - modbus_single[reg_type].offset);
                 uint32_t *map_addr = (uint32_t *)&(sh->map->tab_registers[step]);
                 if(num < 126)
                 {
@@ -252,21 +252,21 @@ void cascade_slave_read(uint32_t addr,uint32_t lenth)
         case 4000:
             slave_read(sh,addr,lenth,DS_R_DEV_CHN,TYPE_U16);
         break;
-        case 4001 ... 4768:
+        case 4001 ... 4384:
             slave_read(sh,addr,lenth,DS_R_OUT_INFO,TYPE_U32);
         break;
-        case 4769 ... 4776:
+        case 4385 ... 4388:
             slave_read(sh,addr,lenth,DS_R_IN_TOTAL,TYPE_U32);
         break;
-        case 4777 ... 4778:
+        case 4389:
             slave_read(sh,addr,lenth,DS_R_TEMP_HUM,TYPE_U16);
-        case 4779 ... 4842:
+        case 4390 ... 4453:
             slave_read(sh,addr,lenth,DS_R_SWITCH_STA,TYPE_U16);
         break;
-        case 4843 ... 4906:
+        case 4454 ... 4517:
             slave_read(sh,addr,lenth,DS_R_OPEN_DELAY,TYPE_U16);
         break;
-        case 4907 ... 4970:
+        case 4518 ... 4581:
             slave_read(sh,addr,lenth,DS_R_CLOSE_DELAY,TYPE_U16);
         break;
         case 5000 ... 5063:
@@ -325,7 +325,7 @@ void cascade_slave_write(uint32_t addr, uint16_t val)
     slave_handle_t *sh=&slHandle;
     GlobalDeviceManager* mgr=get_dm();
     uint16_t buff[128] = {0};
-
+ 
     if(mgr->_globalDevInfo.product_pwr_type == SmartPDU_AC 
             || mgr->_globalDevInfo.product_pwr_type == SmartPDU_DC)   
     {