sensor新接口增加一个参数

pro/src/app.c

@@ -1559,7 +1559,7 @@ static void* sensor_thread(void* arg)
             case SENSOR_TYPE_TEMP://温度传感器
             {
                 sensor_dat_t sdat;
-                ret = sensor_get_data(SENSOR_TYPE_TEMP, SENSOR_TYPE_TEMP_BTG50H8EL3200, _globalSensorMangerTemp->sensor_addr, &sdat);
+                ret = sensor_get_data(SENSOR_TYPE_TEMP, SENSOR_TYPE_TEMP_BTG50H8EL3200, _globalSensorMangerTemp->sensor_addr, 0, &sdat);
                 if (ret == -1){
                     //log_w("Relay modbus Error:%s\n", modbus_strerror(errno));
                     _globalSensorMangerTemp->sensor_status = 1;
@@ -1576,7 +1576,7 @@ static void* sensor_thread(void* arg)
             case SENSOR_TYPE_LEAK://泄漏传感器
             {
                 sensor_dat_t sdat;
-                ret = sensor_get_data(SENSOR_TYPE_LEAK, SENSOR_TYPE_LEAK_XWDC01A, _globalSensorMangerTemp->sensor_addr, &sdat);
+                ret = sensor_get_data(SENSOR_TYPE_LEAK, SENSOR_TYPE_LEAK_XWDC01A, _globalSensorMangerTemp->sensor_addr, 0, &sdat);
                 if (ret == -1){
                     //log_w("Relay modbus Error:%s\n", modbus_strerror(errno));
                     _globalSensorMangerTemp->sensor_status = 1;

pro/src/json_handle.c

@@ -2991,6 +2991,11 @@ char* over_all_sensor_info_to_json(_OverSensorBackInfo* _over_all_sensor_back_in
         cJSON_AddStringToObject(data_filed,"temperatureValue",temp);
         sprintf(temp,"%0.2f",_temp->temperatureValue2);
         cJSON_AddStringToObject(data_filed,"temperatureValue2",temp);
+
+        //add leak sensor 
+        //sprintf(temp,"%d",_temp->leakStatus);
+        //cJSON_AddStringToObject(data_filed,"leakStatus",temp);
+
         cJSON_AddNumberToObject(data_filed, "waterImmersionState",_temp->waterImmersionState);
         cJSON_AddItemToObject(data_root_array, "data", data_filed);
 	}

pro/src/sensor_handle.c

@@ -119,7 +119,7 @@ int sensor_get_co2_value(void* manger,int saddr,float* temp)
 }
 
 
-int sensor_get_data(int type, int subtype, int addr, sensor_dat_t *data)
+int sensor_get_data(int type, int subtype, int addr, int subaddr, sensor_dat_t *data)
 {
     int r=-1;
     Modbus_Manger *mm=&__globalDeviceManage.sensor_modbus_manager;
@@ -162,7 +162,7 @@ int sensor_get_data(int type, int subtype, int addr, sensor_dat_t *data)
         case SENSOR_TYPE_WATER:
         case SENSOR_TYPE_ACCESS:
         {
-            r = gpio_get(GPIO_PD11);
+            r = gpio_get(subaddr+GPIO_PD11);
             if(r<0) {
                 return -1;
             }

pro/src/sensor_handle.h

@@ -15,7 +15,7 @@ int sensor_get_d_temperature_value_anderson(void* manger,int saddr,float* temp1,
 int sensor_get_co2_value(void* manger,int saddr,float* temp);
 int sensor_get_io_status(int saddr,unsigned char* sts);
 
-int sensor_get_data(int type, int subtype, int addr, sensor_dat_t *data);
+int sensor_get_data(int type, int subtype, int addr, int subaddr, sensor_dat_t *data);
 
 #endif