From a055bbca3d610abcc427474ca7a3194df5bcfeeb Mon Sep 17 00:00:00 2001 From: "haifeng.wang" Date: Thu, 5 Jun 2025 13:40:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug,=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Anjiehui7_DTU/User/dwin_form.c | 12 ++++++------ Anjiehui7_DTU/User/modbus_slave.c | 22 +++++++++++----------- Anjiehui7_DTU/User/uart_Ethernet.c | 4 ++-- Loader_DTU/MDK-ARM/loader_DTU.uvprojx | 6 +++--- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Anjiehui7_DTU/User/dwin_form.c b/Anjiehui7_DTU/User/dwin_form.c index 71b67b8..dddfd2c 100644 --- a/Anjiehui7_DTU/User/dwin_form.c +++ b/Anjiehui7_DTU/User/dwin_form.c @@ -131,7 +131,7 @@ void DWIN_ParseFrame(uint8_t c) // 触摸按键返回 if(readData.Addr == 0x5000 || readData.Addr == 0x5012 || readData.Addr == 0x5030|| readData.Addr == 0x9100 - || readData.Addr == 0x5022 || readData.Addr == 0x502C || readData.Addr == 0x502E|| readData.Addr == 0x5038 + || readData.Addr == 0x5022 || readData.Addr == 0x502C || readData.Addr == 0x502E|| readData.Addr == 0x5040 || readData.Addr == 0x5032|| readData.Addr == 0x5034|| readData.Addr == 0x5036|| readData.Addr == 0x6F00) { LoopBuff_PutItem(&Form_KeyM, (uint8_t *) &readData); @@ -2666,9 +2666,9 @@ void Key_Task(void *p_arg) { Form_BOX_PSN_D0WN(); } - else if(key.Addr == 0x5038) // chu罐 + else if(key.Addr == 0x5040) // chu罐 { - Form_DispMessage("请输入密码!", DWIN_COLOR_GREEN); +// Form_DispMessage("请输入密码!", DWIN_COLOR_GREEN); DWIN_Touch(1265, 105); } else if(key.Addr == 0x5012) // 设置 @@ -2678,7 +2678,7 @@ void Key_Task(void *p_arg) if(dcBuff.configDisplay.ch_en) Form_DispMessage("Please enter the password.", DWIN_COLOR_GREEN); else - Form_DispMessage("请输入密码!", DWIN_COLOR_GREEN); + Form_DispMessage("请输入密码。", DWIN_COLOR_GREEN); // 弹出密码输入对话（触控区域在可视区域之外，只能由程序弹出） DWIN_Touch(2040, 257); @@ -2702,7 +2702,7 @@ void Key_Task(void *p_arg) if(dcBuff.configDisplay.ch_en) Form_DispMessage("Communication and save failure", DWIN_COLOR_RED); else - Form_DispMessage("通信故障，保存失败!", DWIN_COLOR_RED); + Form_DispMessage("保存失败!", DWIN_COLOR_RED); } } else @@ -2739,7 +2739,7 @@ void Key_Task(void *p_arg) if(dcBuff.configDisplay.ch_en) Form_DispMessage("Please enter the password.", DWIN_COLOR_GREEN); else - Form_DispMessage("请输入密码!", DWIN_COLOR_GREEN); + Form_DispMessage("请输入密码", DWIN_COLOR_GREEN); // 弹出密码输入对话（触控区域在可视区域之外，只能由程序弹出） DWIN_Touch(1541, 166); } diff --git a/Anjiehui7_DTU/User/modbus_slave.c b/Anjiehui7_DTU/User/modbus_slave.c index f368e1e..b7852fd 100644 --- a/Anjiehui7_DTU/User/modbus_slave.c +++ b/Anjiehui7_DTU/User/modbus_slave.c @@ -139,20 +139,20 @@ void Modbus_Task(void *p_arg) heartTick = GetDelayTick(30000); // 30秒以后再发 // TODO: 发送心跳到上位机，不等待返回 -// i = pack_heart_send_data(); -// RS485_SendDataByte(Heart_sendBuff, i); + i = pack_heart_send_data(); + RS485_SendDataByte(Heart_sendBuff, i); } -// if(LoopBuff_GetCount(&Modbus_SendM)) -// { -//// // 取数据 -// memmove(&Gprs, LoopBuff_GetDataPtr(&Modbus_SendM, Modbus_SendM.info.rdPtr), sizeof(ext_data_t)); -// LoopBuff_RemoveItems(&Modbus_SendM, 1); -//// i = pack_modbus_tran_data(&Gprs); + if(LoopBuff_GetCount(&Modbus_SendM)) + { +// // 取数据 + memmove(&Gprs, LoopBuff_GetDataPtr(&Modbus_SendM, Modbus_SendM.info.rdPtr), sizeof(ext_data_t)); + LoopBuff_RemoveItems(&Modbus_SendM, 1); + i = pack_modbus_tran_data(&Gprs); -//// // TODO: 发送数据到上位机，不等待返回 -//// RS485_SendDataByte(Modbus_sendBuff, i); -// } + // TODO: 发送数据到上位机，不等待返回 + RS485_SendDataByte(Modbus_sendBuff, i); + } } } diff --git a/Anjiehui7_DTU/User/uart_Ethernet.c b/Anjiehui7_DTU/User/uart_Ethernet.c index e6788e8..57e5139 100644 --- a/Anjiehui7_DTU/User/uart_Ethernet.c +++ b/Anjiehui7_DTU/User/uart_Ethernet.c @@ -195,8 +195,8 @@ void Ethernet_Config() { // if(!Ethernet_ATCmd("AT+SOCKA1=TCPC,171.88.5.52,8061", "+OK", "+ERR")) // 公司路由器 // if(!Ethernet_ATCmd("AT+SOCKA1=TCPC,extra.cd-ls.cn,8061", "+OK", "+ERR")) - if(!Ethernet_ATCmd("AT+SOCKA1=TCPC,121.89.205.240,41001", "+OK", "+ERR")) -// if(!Ethernet_ATCmd("AT+SOCKA1=TCPC,data.ajhiot.com,8088", "+OK", "+ERR")) +// if(!Ethernet_ATCmd("AT+SOCKA1=TCPC,121.89.205.240,41001", "+OK", "+ERR")) + if(!Ethernet_ATCmd("AT+SOCKA1=TCPC,data.ajhiot.com,8088", "+OK", "+ERR")) // if(!Ethernet_ATCmd("AT+SOCKA1=TCPC,114.55.209.85,8088", "+OK", "+ERR")) // data.ajhiot.com // if(!Ethernet_ATCmd("AT+SOCKA1=TCPC,192.168.0.2,8061", "+OK", "+ERR")) // 直连电脑 return; diff --git a/Loader_DTU/MDK-ARM/loader_DTU.uvprojx b/Loader_DTU/MDK-ARM/loader_DTU.uvprojx index 762fed7..e1885dc 100644 --- a/Loader_DTU/MDK-ARM/loader_DTU.uvprojx +++ b/Loader_DTU/MDK-ARM/loader_DTU.uvprojx @@ -10,13 +10,13 @@ loader_DTU 0x4 ARM-ADS - 5060061::V5.06 update 1 (build 61)::ARMCC + 5060422::V5.06 update 4 (build 422)::ARMCC STM32F413VGTx STMicroelectronics - Keil.STM32F4xx_DFP.2.15.0 - http://www.keil.com/pack/ + Keil.STM32F4xx_DFP.2.17.1 + https://www.keil.com/pack/ IRAM(0x20000000-0x2004FFFF) IROM(0x8000000-0x80FFFFF) CLOCK(25000000) FPU2 CPUTYPE("Cortex-M4")