diff --git a/app/include/dbg.h b/app/include/dbg.h index 76df9e3..1932956 100755 --- a/app/include/dbg.h +++ b/app/include/dbg.h @@ -64,7 +64,7 @@ typedef enum DBG_M_CA_NETWORK_ERR, DBG_M_CA_MQTT, DBG_M_CA_MQTT_ERR, - DBG_M_DEBUG, + DBG_M_CA_DBG, DBG_M_COUNT } DBG_MODULE_E; diff --git a/app/lib/a_process/ca_cau.c b/app/lib/a_process/ca_cau.c index deedf09..45a4f33 100755 --- a/app/lib/a_process/ca_cau.c +++ b/app/lib/a_process/ca_cau.c @@ -466,6 +466,7 @@ int _cau_noraml_work() _cau_power_on(); if (_cau_set_user_param() == 0) { + //_cau_get_user_param_ratio(NULL); _cau_get_meas_param(); cau_collect_flag = 1; } diff --git a/app/lib/a_process/ca_dbg.c b/app/lib/a_process/ca_dbg.c index 54cb9e7..e70ff16 100755 --- a/app/lib/a_process/ca_dbg.c +++ b/app/lib/a_process/ca_dbg.c @@ -63,7 +63,7 @@ int32_t _debug_pkt_common_send(char *buf, uint16_t cmd, uint32_t data_len) if (write(debug_ctrl.fd_client, buf, sizeof(debug_pkt_head_t) + data_len + 2) <= 0) { - DBG(DBG_M_DEBUG, "Write cmd %x ERROR\r\n", head->cmd); + DBG(DBG_M_CA_DBG, "Write cmd %x ERROR\r\n", head->cmd); return E_SYS_CALL; } @@ -186,8 +186,8 @@ int _dbg_pkt_config_set(debug_msg_info_t *msg) for (i = 0; i < 24; i++) { memcpy(&pparam_config->cauParam[i], &pcfg->CAUInit[i], 24); - //printf("ch%d Range=%f Ratio=%f ZeroPoint=%f ChangeThreshold=%f HighLimit=%f LowLimit=%f\n", - //i, pcfg->CAUInit[i].Range, pcfg->CAUInit[i].Ratio, pcfg->CAUInit[i].ZeroPoint, pcfg->CAUInit[i].ChangeThreshold, pcfg->CAUInit[i].HighLimit, pcfg->CAUInit[i].LowLimit); + DBG(DBG_M_CA_DBG, "ch%d Range=%f Ratio=%f ZeroPoint=%f ChangeThreshold=%f HighLimit=%f LowLimit=%f\n", + i, pcfg->CAUInit[i].Range, pcfg->CAUInit[i].Ratio, pcfg->CAUInit[i].ZeroPoint, pcfg->CAUInit[i].ChangeThreshold, pcfg->CAUInit[i].HighLimit, pcfg->CAUInit[i].LowLimit); } param_save(); @@ -587,7 +587,7 @@ int32_t _debug_pkt_process(char *buf, int32_t len) debug_pkt_head_t *head = (debug_pkt_head_t*)buf; /* 报文格式检查. */ - LD_E_RETURN(DBG_M_DEBUG, _debug_pkt_check(buf, len)); + LD_E_RETURN(DBG_M_CA_DBG, _debug_pkt_check(buf, len)); msg_proc_t *ptable = &dbg_proc_table[0]; for (; DEBUG_INVALID != head->cmd; ptable++) @@ -750,7 +750,7 @@ void *_debug_pkt_recv_handle(void *arg) if (len <= 0) { /* 连接中断, 关闭 socket 和手动采样. */ - DBG(DBG_M_DEBUG, "Read len %d, close fd!\r\n", len); + DBG(DBG_M_CA_DBG, "Read len %d, close fd!\r\n", len); debug_ctrl.is_manual_col = FALSE; close(debug_ctrl.fd_client); debug_ctrl.fd_client = -1; diff --git a/app/lib/m_management/dbg.c b/app/lib/m_management/dbg.c index 3d4a7cf..bff5cf4 100755 --- a/app/lib/m_management/dbg.c +++ b/app/lib/m_management/dbg.c @@ -68,7 +68,7 @@ dbg_module_t _dbg_module[DBG_M_COUNT] = {DBG_M_CA_NETWORK_ERR, FALSE, "network_err"}, {DBG_M_CA_MQTT, FALSE, "mqtt"}, {DBG_M_CA_MQTT_ERR, FALSE, "mqtt_err"}, - {DBG_M_DEBUG, FALSE, "debug"}, + {DBG_M_CA_DBG, FALSE, "dbg"}, }; /* Private function prototypes -----------------------------------------------*/