瀏覽代碼

modbus RTU

liyi 1 年之前
父節點
當前提交
bf9cd9387b
共有 1 個文件被更改,包括 11 次插入 和 1 次删除
  1. 11 1
      pro/src/app.c

+ 11 - 1
pro/src/app.c

@@ -1699,7 +1699,17 @@ static void* sensor_thread(void* arg)
                 _globalSensorInfo.val1 = sdat.flag;
                 _globalSensorInfo.val1 = sdat.flag;
                 _globalSensorInfo.val2 = -1;
                 _globalSensorInfo.val2 = -1;
                 _globalSensorMangerTemp->Cur_sensor_info=_globalSensorInfo;
                 _globalSensorMangerTemp->Cur_sensor_info=_globalSensorInfo;
-                set_sensor_val_modbus(_globalDeviceManager,&_globalSensorInfo,_globalSensorMangerTemp->sensor_addr);
+                //set_sensor_val_modbus(_globalDeviceManager,&_globalSensorInfo,_globalSensorMangerTemp->sensor_addr);
+                if(_globalDeviceManager->_globalDevInfo.product.pwr_type == SmartPDU_AC ||
+                            _globalDeviceManager->_globalDevInfo.product.pwr_type == SmartPDU_DC)
+                {
+                    _globalDeviceManager->single_mmap->cas_sensor[_globalSensorMangerTemp->sensor_addr-1].s_1 = info->val;
+                    _globalDeviceManager->single_mmap->cas_sensor[_globalSensorMangerTemp->sensor_addr-1].s_2 = 0xFFFFFFFF;
+                }else
+                {
+                    _globalDeviceManager->triphasic_mmap->cas_sensor[_globalSensorMangerTemp->sensor_addr-1].s_1 = info->val;
+                    _globalDeviceManager->triphasic_mmap->cas_sensor[_globalSensorMangerTemp->sensor_addr-1].s_2 = 0xFFFFFFFF;
+                }
             }
             }
             break;
             break;