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

pro/src/app.c

@@ -1635,6 +1635,7 @@ void* sensor_thread(void* arg)
                 sensor_alarm(_globalSensorMangerTemp, SENSOR_VAL2_UPPER);
                 sensor_alarm(_globalSensorMangerTemp, SENSOR_VAL2_LOWER);
             }
+            usleep(50000);
         }
         lock_s_release(LOCK_ID_SENSOR);
         sleep(1);

pro/src/modbus_handle.c

@@ -202,7 +202,7 @@ int g_modbus_read_x_reg(void* manger,int saddr,unsigned short reg,unsigned int s
     int ret = 0 ;
     Modbus_Manger *modbus_manger = (Modbus_Manger *)manger; 
     pthread_mutex_lock(&modbus_manger->mutex);
-    if(modbus_manger->delay>0) usleep(10000); 
+    if(modbus_manger->delay>0) usleep(30000); 
     modbus_set_slave(modbus_manger->mb, saddr);   
     ret = modbus_read_registers(modbus_manger->mb, reg, size, data);//0x03 
     pthread_mutex_unlock(&modbus_manger->mutex);