FIX 1.修改当获取不到cau数据时（cau可能异常），此时把上传给后台的电流值写为0;2.调整了函数所在文件;3.版本号改为6.2.1.18;

app/include/ca_cau.h

@@ -65,6 +65,8 @@ extern pwr_t pwr;
 /* Extern functions ----------------------------------------------------------*/
 extern int32_t cau_handle_init(void);
 extern int _cau_set_calibration_param(float *pparam);
+extern void _cau_reset_real_data();
+extern int _cau_get_current_values(float *fdestArr);
 #endif
 #endif
 

app/include/ca_dbg.h

@@ -129,7 +129,5 @@ extern debug_ctrl_t debug_ctrl;
 extern int32_t debug_handle_init(void);
 //extern int32_t debug_pkt_port_state_post(void)
 extern int _debug_pkt_send_data(int cmd, char *psrc, int len);
-extern int _dbg_get_current_cau_values(float *fdestArr);
-
 #endif
 #endif

app/lib/a_process/ca_cau.c

@@ -121,6 +121,7 @@ int _cau_set_user_param()
         }
         if (slen != 8)
         {
+        	DBG(DBG_M_CA_CAU_ERR, "get cau value failed.\n");
             return -1;
         }
     }
@@ -470,6 +471,11 @@ int _cau_noraml_work()
                 _cau_get_meas_param();
                 cau_collect_flag = 1;
             }
+            else 
+            {
+				_cau_reset_real_data();
+				cau_collect_flag = 1;
+            }
             _cau_power_off();
         }
     }
@@ -846,5 +852,30 @@ int _pwr_read_vout(void)
     return _pwr_read_adc(fd);
 }
 
+void _cau_reset_real_data()
+{
+	cau_real_data_t *pval = &cau.real_data;
+	memset(pval, 0, sizeof(cau_real_data_t));
+}
+
+int _cau_get_current_values(float *fdestArr)
+{
+    float valist[24] = {0};
+    int chswitch;
+    int i;
+
+    cau_real_data_t *pval = &cau.real_data;
+    memcpy(valist, pval->tag, sizeof(pval->tag));
+    
+    for (i = 0; i < 11; i++)
+    {
+        chswitch = pparam_config->cauParam[i].chSwitch;
+        if (chswitch > 0)
+            fdestArr[chswitch - 1] = valist[i];
+    }
+    return 0;
+}
+
+
 #endif
 

app/lib/a_process/ca_csg.c

@@ -334,7 +334,7 @@ int _csg_response_realtime_data(int sendtype)
     float cauValues[11] = {0};
     debug_pkt_realdata_t realdata = {0}; 
     
-    _dbg_get_current_cau_values(cauValues);
+    _cau_get_current_values(cauValues);
     
     realdata.proVer = 0x00000363;
     time_t t;

app/lib/a_process/ca_dbg.c

@@ -139,6 +139,32 @@ int _dbg_pkt_config_get(debug_msg_info_t *msg)
     return 0;
 }
 
+int is_valid_ip(char *ip)
+{
+	int ret = 0;
+	int len = strlen(ip);
+	if (len > 15)
+	{
+		LOG("invalid ip:%s ", ip);
+		return -1;
+	}
+	for(int i = 0; i < len; i++) 
+	{
+        if(!((ip[i] >= '0' && ip[i] <= '9') || ip[i] == '.')) 
+        {
+            LOG("invalid ip:%s ", ip);
+            ret = -1;
+            break;
+        }
+    }
+
+    if (strcmp(ip, "0.0.0.0") == 0)
+    {
+		ret = -1;
+    }
+    return ret;
+}
+
 int _dbg_pkt_config_set(debug_msg_info_t *msg)
 {
     int i;
@@ -202,24 +228,6 @@ int _dbg_pkt_reboot_system()
     return 0;
 }
 
-int _dbg_get_current_cau_values(float *fdestArr)
-{
-    float valist[24] = {0};
-    int chswitch;
-    int i;
-
-    cau_real_data_t *pval = &cau.real_data;
-    memcpy(valist, pval->tag, sizeof(pval->tag));
-    
-    for (i = 0; i < 11; i++)
-    {
-        chswitch = pparam_config->cauParam[i].chSwitch;
-        if (chswitch > 0)
-            fdestArr[chswitch - 1] = valist[i];
-    }
-    return 0;
-}
-
 int _dbg_pkt_realdata_get(debug_msg_info_t *msg)
 {
     //printf("%d:%s\n", __LINE__, __FUNCTION__);
@@ -239,7 +247,7 @@ int _dbg_pkt_realdata_get(debug_msg_info_t *msg)
 
     //1 填写8相电流 3相电压数据 
     float cauValues[11] = {0};
-    _dbg_get_current_cau_values(cauValues);
+    _cau_get_current_values(cauValues);
 
     RtdPack_t *rtd = &realpack.rtd;//实时数据
     //rtd->StartFlag1 = sysVar.gateway;
@@ -258,18 +266,18 @@ int _dbg_pkt_realdata_get(debug_msg_info_t *msg)
     //rtd->I16A_Gx = (U16)(tsTag[0]+16000);
     //rtd->I16A_Gy = (U16)(tsTag[1]+16000);
     //rtd->I16A_Gz = (U16)(tsTag[2]+16000);
-    //rtd->I16A_Temp1 = temp2U16(tsTag[3]);
-    //rtd->I16A_Temp2 = temp2U16(tsTag[4]);
+    rtd->I16A_Temp1 = 0x0C02;//temp2U16(tsTag[3]);
+    rtd->I16A_Temp2 = 0x0C02;//temp2U16(tsTag[4]);
     //rtd->I16B_Gx = (U16)(tsTag[5]+16000);
     //rtd->I16B_Gy = (U16)(tsTag[6]+16000);
     //rtd->I16B_Gz = (U16)(tsTag[7]+16000);
-    //rtd->I16B_Temp1 = temp2U16(tsTag[8]);
-    //rtd->I16B_Temp2 = temp2U16(tsTag[9]);
+    rtd->I16B_Temp1 = 0x0C02;//temp2U16(tsTag[8]);
+    rtd->I16B_Temp2 = 0x0C02;//temp2U16(tsTag[9]);
     //rtd->I16C_Gx = (U16)(tsTag[10]+16000);
     //rtd->I16C_Gy = (U16)(tsTag[11]+16000);
     //rtd->I16C_Gz = (U16)(tsTag[12]+16000);
-    //rtd->I16C_Temp1 = temp2U16(tsTag[13]);
-    //rtd->I16C_Temp2 = temp2U16(tsTag[14]);
+    rtd->I16C_Temp1 = 0x0C02;//temp2U16(tsTag[13]);
+    rtd->I16C_Temp2 = 0x0C02;//temp2U16(tsTag[14]);
     //2022-11-08 安靠智能接地箱 三相表面温度
     //if(EartBoxProtocol == pConfigCtrl->gateway.CommunicationMode)
     //{

app/lib/a_process/ca_mqtt.c

@@ -378,7 +378,7 @@ void _mqtt_current_data_upload(void)
 {
     float cauValues[11] = {0};
     int i = 0;
-    _dbg_get_current_cau_values(cauValues);
+    _cau_get_current_values(cauValues);
     //int messageId;
     //struct tm *tm_now;
     char datetime[128];
@@ -404,7 +404,7 @@ void _mqtt_current_data_report(void)
     //cJSON *pJsRoot = cJSON_CreateObject();
     cJSON *pJson = cJSON_CreateObject();
     mqtt_param_t *param = &pparam_config->mqttCfg;
-    _dbg_get_current_cau_values(cauValues);
+    _cau_get_current_values(cauValues);
     for (int i = 0; i < 11; i++)
     {
         LOG("cauValues[%d] = %f", i, cauValues[i]);

build/Makefile

@@ -31,7 +31,7 @@ VERSION_FILE := $(SOURCE_DIR)/include/version.h
 MQTTLIB_DIR := $(SOURCE_DIR)/lib/l_library
 VERSION_LIB := version.a
 DATE_STRING := `date "+%Y.%m.%d %k:%M:%S"`
-VERSION_STRING := "6.2.1.17"
+VERSION_STRING := "6.2.1.18"
 
 MV := mv -f
 RM := rm -rf