Merge branch 'master' of http://jiecheng2024.tpddns.cn:3000/liyuezong/SmartPDCode

pro/src/app.c

@@ -1698,7 +1698,17 @@ static void* sensor_thread(void* arg)
                     _globalSensorInfo.val2 = -1;
                 }
                 _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;