zhangsheng/WLG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
zhangsheng 2026-03-13 10:33:51 +08:00
parent bce3805da5
commit 5e0732fd06
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jsonparse/web_cmd_parse4.cpp
View File

@ -212,6 +212,7 @@ std::string JsonData::JsonCmd_Cgi_110(Param_110 &param){
jsonVal["message"] = "设置报警灯失败"; jsonVal["message"] = "设置报警灯失败";
return show_value_.write(jsonVal); return show_value_.write(jsonVal);
} }
mssleep(10000);
unsigned char command[11] = {0x00}; unsigned char command[11] = {0x00};
int data = (param.flashTime << 16) | (param.alarmMode & 0xFFFF); int data = (param.flashTime << 16) | (param.alarmMode & 0xFFFF);
command[0] = 0xA5; command[0] = 0xA5;
@ -240,5 +241,6 @@ std::string JsonData::JsonCmd_Cgi_110(Param_110 &param){
jsonVal["message"] = "设置报警灯失败"; jsonVal["message"] = "设置报警灯失败";
} }
uart_inst::instance().alarmFlag = false; uart_inst::instance().alarmFlag = false;
printf("alarmFlag = %d\n",uart_inst::instance().alarmFlag);
return show_value_.write(jsonVal); return show_value_.write(jsonVal);
} }

15
uart/uart.cpp
View File

@ -38,7 +38,13 @@ int Uart::UartRecv(int fd, char srcshow, char *buffer) {
int timeoutflag = 0; int timeoutflag = 0;
char head[] = {0xAA, 0x55, 0xAA}; char head[] = {0xAA, 0x55, 0xAA};
char szbuffer[BUF_LENGTH] = {0x00}; char szbuffer[BUF_LENGTH] = {0x00};
while (1 && !bUpdate && !alarmFlag) { while (1) {
if (bUpdate || alarmFlag)
{
mssleep(10000);
continue;
}
if (now_task == WAVE_CMD) { if (now_task == WAVE_CMD) {
memset(buff, 0, sizeof(buff)); memset(buff, 0, sizeof(buff));
ret = read_data(fd, buff, BUF_LENGTH, 10); ret = read_data(fd, buff, BUF_LENGTH, 10);
@ -288,6 +294,11 @@ int Uart::ReadFromAlarm(){
char head[] = {0xA5, 0x5A, 0xA5}; char head[] = {0xA5, 0x5A, 0xA5};
if (len > 0) if (len > 0)
{ {
if(alarmFlag){
printf( "\nRead From Alarm Start: %s\n",GetCurrentTime().c_str());
for (int i = 0; i < len; i++) printf( "%02X ", buffer[i] & 0xFF);
printf( "\nRead From Alarm End.\n");
}
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
if (buffer[i] == head[0]) { if (buffer[i] == head[0]) {
char buf[12] = {0x00}; char buf[12] = {0x00};
@ -299,6 +310,8 @@ int Uart::ReadFromAlarm(){
return 0 ; return 0 ;
}else if(buffer[i + 5] == 0x03 && buffer[i + 6] == 0xFF){ }else if(buffer[i + 5] == 0x03 && buffer[i + 6] == 0xFF){
return 2 ; return 2 ;
}else if(buffer[i + 5] == 0x03 && buffer[i + 6] != 0xFF){
return 1 ;
}else if(buffer[i + 5] == 0x02 && buffer[i + 6] == 0x00){ }else if(buffer[i + 5] == 0x02 && buffer[i + 6] == 0x00){
return 1 ; return 1 ;
} }