From fa85d8ee46b05d2c741225fa04beac3d163cfd05 Mon Sep 17 00:00:00 2001 From: zhangsheng Date: Fri, 15 Nov 2024 19:47:21 +0800 Subject: [PATCH] fix update config bug --- common/global.hpp | 1 - jsonparse/web_cmd_parse3.cpp | 14 ++++++++++++++ main.cpp | 7 ------- uart/uart.cpp | 17 +++++++++++++++-- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/common/global.hpp b/common/global.hpp index 46c6519..0cf2043 100644 --- a/common/global.hpp +++ b/common/global.hpp @@ -21,7 +21,6 @@ enum enumZigBeeTransmitStatus { //#define Q4G_MODULE //#define WIFI_MODULE //#define NR5G_MEIGE -//#define G2UL_GATEWAY class GlobalConfig { diff --git a/jsonparse/web_cmd_parse3.cpp b/jsonparse/web_cmd_parse3.cpp index 4e9963c..6e0cd31 100644 --- a/jsonparse/web_cmd_parse3.cpp +++ b/jsonparse/web_cmd_parse3.cpp @@ -229,6 +229,20 @@ std::string JsonData::JsonCmd_Cgi_53(std::vector ¶m) { char whereCon[1024] = {0}; char updateSql[1024] = {0}; for (size_t i = 0; i < param.size(); i++) { + + sprintf(whereCon, "dataNodeNo='%s'", param[i].mdataNodeNo.c_str()); + std::string zigbeeShortAddr = sqlite_db_ctrl::instance().GetData(T_SENSOR_INFO(TNAME), " zigbeeShortAddr ", whereCon); + + uint16_t short_addr; + char *end_ptr = NULL; + short_addr = strtol(zigbeeShortAddr.c_str(), &end_ptr, 16); + int res = scheduler::instance().UpdateSensorConfig(short_addr); + if (res != 0){ + jsonVal["success"] = false; + jsonVal["message"] = "update config error"; + return show_value_.write(jsonVal); + } + if (param[i].mUpdateKey2 == "") { sprintf(updateSql, "%s='%s',UpdateFlag = 0", param[i].mUpdateKey.c_str(), param[i].mUpdateValue.c_str()); } else if (param[i].mUpdateKey3 == "" && param[i].mUpdateKey2 != "") { diff --git a/main.cpp b/main.cpp index f127c0a..f009fb5 100644 --- a/main.cpp +++ b/main.cpp @@ -78,10 +78,6 @@ int main(int argc, char *argv[]) { boost::thread uartWaveReadTh(UartStartWave); uartWaveReadTh.detach(); - //启动 RUN LED - boost::thread startRunLED(RunLED); - startRunLED.detach(); - #ifdef NR5G_MODULE print_info("NR5G_MODULE \n"); @@ -140,9 +136,6 @@ int main(int argc, char *argv[]) { //int fd = OpenWatchDog(); int count = 0; while (GlobalConfig::QuitFlag_G) { - gpio_set(GlobalConfig::GPIO_G.hardWatchDog, 1); - usleep(20000); - gpio_set(GlobalConfig::GPIO_G.hardWatchDog, 0); //WriteWatchDog(fd); sleep(20); if (GlobalConfig::threadStatus == 0) { diff --git a/uart/uart.cpp b/uart/uart.cpp index 3b8f22f..f6252bf 100644 --- a/uart/uart.cpp +++ b/uart/uart.cpp @@ -1034,7 +1034,14 @@ int Uart::FindRecvPackage(int bytesRead, char *mUartRecvBuf, char *head) { sprintf(whereCon, "zigbeeShortAddr='%s'",strShortAddr.c_str()); std::string strDataNodeNo = sqlite_db_ctrl::instance().GetData(T_SENSOR_INFO(TNAME), " dataNodeNo ", whereCon); memset(whereCon, 0x00, sizeof(whereCon)); - sprintf(error_msg,"Index error,command = %d",command); + if (command == WAVE_X){ + sprintf(error_msg,"Index error,wave X"); + }else if (command == WAVE_Y){ + sprintf(error_msg,"Index error,wave Y"); + }else if (command == WAVE_Z){ + sprintf(error_msg,"Index error,wave Z"); + } + sprintf(insertSql, "'%s','%s','%s',%d,'%d','%s' ", strDataNodeNo.c_str(),strShortAddr.c_str(),localtimestamp,bytesRead,0,error_msg); sqlite_db_ctrl::instance().InsertData(" receive_wave_status ", insertSql); @@ -1065,7 +1072,13 @@ int Uart::FindRecvPackage(int bytesRead, char *mUartRecvBuf, char *head) { sprintf(whereCon, "zigbeeShortAddr='%s'",strShortAddr.c_str()); std::string strDataNodeNo = sqlite_db_ctrl::instance().GetData(T_SENSOR_INFO(TNAME), " dataNodeNo ", whereCon); memset(whereCon, 0x00, sizeof(whereCon)); - sprintf(error_msg,"Crc error,command = %d",command); + if (command == WAVE_X){ + sprintf(error_msg,"Crc error,wave X"); + }else if (command == WAVE_Y){ + sprintf(error_msg,"Crc error,wave Y"); + }else if (command == WAVE_Z){ + sprintf(error_msg,"Crc error,wave Z"); + } sprintf(insertSql, "'%s','%s','%s',%d,'%d','%s' ", strDataNodeNo.c_str(),strShortAddr.c_str(),localtimestamp,bytesRead,0,error_msg); sqlite_db_ctrl::instance().InsertData(" receive_wave_status ", insertSql);