|
|
@@ -1917,6 +1917,11 @@ static void sensorStatusMonitoring(void* conn)
|
|
|
{
|
|
|
|
|
|
}break;
|
|
|
+ case 7://双头温度传感器 2个值
|
|
|
+ {
|
|
|
+ _overSensorBackInfoTemp->temperatureValue = _globalSensorManagerTemp->Cur_sensor_info.val1;
|
|
|
+ _overSensorBackInfoTemp->temperatureValue2 =_globalSensorManagerTemp->Cur_sensor_info.val2;
|
|
|
+ }break;
|
|
|
}
|
|
|
//入队
|
|
|
list_add_tail(&_overSensorBackInfoTemp->list,&_over_all_sensor_back_info.list);
|
|
|
@@ -2078,6 +2083,9 @@ static void sensorStatusMonitoring(void* conn)
|
|
|
case 6:
|
|
|
_globalSensorMangerTemp->sensor_val_count = 0;
|
|
|
break; // 空调遥控器 没有值
|
|
|
+ case 7:
|
|
|
+ _globalSensorMangerTemp->sensor_val_count = 2;
|
|
|
+ break; // 双头温度传感器 2个值
|
|
|
}
|
|
|
|
|
|
// 插入数据库
|
|
|
@@ -2193,6 +2201,8 @@ static void sensorStatusMonitoring(void* conn)
|
|
|
case 4:_globalSensorMangerTemp->sensor_val_count = 1 ;break; //气体传感器 1个值
|
|
|
case 5:_globalSensorMangerTemp->sensor_val_count = 2 ;break; //气压气流传感器 2个值
|
|
|
case 6:_globalSensorMangerTemp->sensor_val_count = 0 ;break; //空调遥控器 没有值
|
|
|
+ case 7:_globalSensorMangerTemp->sensor_val_count = 2 ;break; //双头温度传感器 2个值
|
|
|
+ default:break;
|
|
|
}
|
|
|
//插入数据库
|
|
|
if(dev_insert_sensor_genera_manage(__globalDeviceManage.db,_globalSensorMangerTemp)!=0)
|
|
|
@@ -2332,7 +2342,7 @@ static void sensorStatusMonitoring(void* conn)
|
|
|
case SENSOR_TYPE_TEMPERATURE: // 温湿度传感器 2个值
|
|
|
{
|
|
|
_overSensorBackInfoTemp->temp_humi_sensor.ydata[0][_TempCount] = _globalSensorInfoTemp->val1;
|
|
|
- _overSensorBackInfoTemp->temp_humi_sensor.ydata[1][_TempCount] = _globalSensorInfoTemp->val2;
|
|
|
+ _overSensorBackInfoTemp->temp_humi_sensor.ydata[1][_TempCount] = _globalSensorInfoTemp->val2;
|
|
|
strcpy(_overSensorBackInfoTemp->temp_humi_sensor.xAxis[_TempCount], _globalSensorInfoTemp->samp_time);
|
|
|
}
|
|
|
break;
|
|
|
@@ -2353,14 +2363,14 @@ static void sensorStatusMonitoring(void* conn)
|
|
|
break;
|
|
|
case SENSOR_TYPE_GAS: // 气体传感器 1个值
|
|
|
{
|
|
|
- _overSensorBackInfoTemp->gas_sensor.ydata[_TempCount] = _globalSensorInfoTemp->val1;// 气体浓度
|
|
|
+ _overSensorBackInfoTemp->gas_sensor.ydata[_TempCount] = _globalSensorInfoTemp->val1; // 气体浓度
|
|
|
strcpy(_overSensorBackInfoTemp->gas_sensor.xAxis[_TempCount], _globalSensorInfoTemp->samp_time);
|
|
|
}
|
|
|
break;
|
|
|
case SENSOR_TYPE_AIR_PRESS:
|
|
|
{
|
|
|
_overSensorBackInfoTemp->air_press_sensor.ydata[0][_TempCount] = _globalSensorInfoTemp->val1;
|
|
|
- _overSensorBackInfoTemp->air_press_sensor.ydata[1][_TempCount] = _globalSensorInfoTemp->val2;
|
|
|
+ _overSensorBackInfoTemp->air_press_sensor.ydata[1][_TempCount] = _globalSensorInfoTemp->val2;
|
|
|
strcpy(_overSensorBackInfoTemp->air_press_sensor.xAxis[_TempCount], _globalSensorInfoTemp->samp_time);
|
|
|
}
|
|
|
break;
|
|
|
@@ -2368,6 +2378,13 @@ static void sensorStatusMonitoring(void* conn)
|
|
|
{
|
|
|
}
|
|
|
break;
|
|
|
+ case SENSOR_TYPE_DoubleT: // 温湿度传感器 2个值
|
|
|
+ {
|
|
|
+ _overSensorBackInfoTemp->temp_humi_sensor.ydata[0][_TempCount] = _globalSensorInfoTemp->val1;
|
|
|
+ _overSensorBackInfoTemp->temp_humi_sensor.ydata[1][_TempCount] = _globalSensorInfoTemp->val2;
|
|
|
+ strcpy(_overSensorBackInfoTemp->temp_humi_sensor.xAxis[_TempCount], _globalSensorInfoTemp->samp_time);
|
|
|
+ }
|
|
|
+ break;
|
|
|
}
|
|
|
_TempCount++;
|
|
|
}
|
|
|
@@ -2413,6 +2430,10 @@ static void sensorStatusMonitoring(void* conn)
|
|
|
{
|
|
|
ack_str = over_sensor_history_info_to_json(&_over_all_sensor_back_info, SENSOR_TYPE_LIST);
|
|
|
}
|
|
|
+ else if(strcmp(_over_all_sensor_request.sensorType,"7")==0)
|
|
|
+ {
|
|
|
+ ack_str = over_sensor_history_info_to_json(&_over_all_sensor_back_info, SENSOR_TYPE_VALUE);
|
|
|
+ }
|
|
|
else ack_str = ctrl_sts_ack_to_json();
|
|
|
|
|
|
// //参数转换json
|