haifeng.wang
/
ShipCentralControl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug,完成

This commit is contained in:
haifeng.wang 2025-06-05 13:40:44 +08:00
parent f5cd347fdd
commit a055bbca3d
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Anjiehui7_DTU/User/dwin_form.c
View File

@ -131,7 +131,7 @@ void DWIN_ParseFrame(uint8_t c)
// 触摸按键返回 // 触摸按键返回
if(readData.Addr == 0x5000 || readData.Addr == 0x5012 || readData.Addr == 0x5030|| readData.Addr == 0x9100 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) || readData.Addr == 0x5032|| readData.Addr == 0x5034|| readData.Addr == 0x5036|| readData.Addr == 0x6F00)
{ {
LoopBuff_PutItem(&Form_KeyM, (uint8_t *) &readData); LoopBuff_PutItem(&Form_KeyM, (uint8_t *) &readData);
@ -2666,9 +2666,9 @@ void Key_Task(void *p_arg)
{ {
Form_BOX_PSN_D0WN(); 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); DWIN_Touch(1265, 105);
} }
else if(key.Addr == 0x5012) // 设置 else if(key.Addr == 0x5012) // 设置
@ -2678,7 +2678,7 @@ void Key_Task(void *p_arg)
if(dcBuff.configDisplay.ch_en) if(dcBuff.configDisplay.ch_en)
Form_DispMessage("Please enter the password.", DWIN_COLOR_GREEN); Form_DispMessage("Please enter the password.", DWIN_COLOR_GREEN);
else else
Form_DispMessage("请输入密码!", DWIN_COLOR_GREEN); Form_DispMessage("请输入密码。", DWIN_COLOR_GREEN);
// 弹出密码输入对话（触控区域在可视区域之外，只能由程序弹出） // 弹出密码输入对话（触控区域在可视区域之外，只能由程序弹出）
DWIN_Touch(2040, 257); DWIN_Touch(2040, 257);
@ -2702,7 +2702,7 @@ void Key_Task(void *p_arg)
if(dcBuff.configDisplay.ch_en) if(dcBuff.configDisplay.ch_en)
Form_DispMessage("Communication and save failure", DWIN_COLOR_RED); Form_DispMessage("Communication and save failure", DWIN_COLOR_RED);
else else
Form_DispMessage("通信故障，保存失败!", DWIN_COLOR_RED); Form_DispMessage("保存失败!", DWIN_COLOR_RED);
} }
} }
else else
@ -2739,7 +2739,7 @@ void Key_Task(void *p_arg)
if(dcBuff.configDisplay.ch_en) if(dcBuff.configDisplay.ch_en)
Form_DispMessage("Please enter the password.", DWIN_COLOR_GREEN); Form_DispMessage("Please enter the password.", DWIN_COLOR_GREEN);
else else
Form_DispMessage("请输入密码!", DWIN_COLOR_GREEN); Form_DispMessage("请输入密码", DWIN_COLOR_GREEN);
// 弹出密码输入对话（触控区域在可视区域之外，只能由程序弹出） // 弹出密码输入对话（触控区域在可视区域之外，只能由程序弹出）
DWIN_Touch(1541, 166); DWIN_Touch(1541, 166);
} }

22
Anjiehui7_DTU/User/modbus_slave.c
View File

@ -139,20 +139,20 @@ void Modbus_Task(void *p_arg)
heartTick = GetDelayTick(30000); // 30秒以后再发 heartTick = GetDelayTick(30000); // 30秒以后再发
// TODO: 发送心跳到上位机，不等待返回 // TODO: 发送心跳到上位机，不等待返回
// i = pack_heart_send_data(); i = pack_heart_send_data();
// RS485_SendDataByte(Heart_sendBuff, i); RS485_SendDataByte(Heart_sendBuff, i);
} }
// if(LoopBuff_GetCount(&Modbus_SendM)) if(LoopBuff_GetCount(&Modbus_SendM))
// { {
//// // 取数据 // // 取数据
// memmove(&Gprs, LoopBuff_GetDataPtr(&Modbus_SendM, Modbus_SendM.info.rdPtr), sizeof(ext_data_t)); memmove(&Gprs, LoopBuff_GetDataPtr(&Modbus_SendM, Modbus_SendM.info.rdPtr), sizeof(ext_data_t));
// LoopBuff_RemoveItems(&Modbus_SendM, 1); LoopBuff_RemoveItems(&Modbus_SendM, 1);
//// i = pack_modbus_tran_data(&Gprs); i = pack_modbus_tran_data(&Gprs);
//// // TODO: 发送数据到上位机，不等待返回 // TODO: 发送数据到上位机，不等待返回
//// RS485_SendDataByte(Modbus_sendBuff, i); RS485_SendDataByte(Modbus_sendBuff, i);
// } }
} }
} }

4
Anjiehui7_DTU/User/uart_Ethernet.c
View File

@ -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,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,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,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,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,114.55.209.85,8088", "+OK", "+ERR")) // data.ajhiot.com
// if(!Ethernet_ATCmd("AT+SOCKA1=TCPC,192.168.0.2,8061", "+OK", "+ERR")) // 直连电脑 // if(!Ethernet_ATCmd("AT+SOCKA1=TCPC,192.168.0.2,8061", "+OK", "+ERR")) // 直连电脑
return; return;

6
Loader_DTU/MDK-ARM/loader_DTU.uvprojx
View File

@ -10,13 +10,13 @@
<TargetName>loader_DTU</TargetName> <TargetName>loader_DTU</TargetName>
<ToolsetNumber>0x4</ToolsetNumber> <ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName> <ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060061::V5.06 update 1 (build 61)::ARMCC</pCCUsed> <pCCUsed>5060422::V5.06 update 4 (build 422)::ARMCC</pCCUsed>
<TargetOption> <TargetOption>
<TargetCommonOption> <TargetCommonOption>
<Device>STM32F413VGTx</Device> <Device>STM32F413VGTx</Device>
<Vendor>STMicroelectronics</Vendor> <Vendor>STMicroelectronics</Vendor>
<PackID>Keil.STM32F4xx_DFP.2.15.0</PackID> <PackID>Keil.STM32F4xx_DFP.2.17.1</PackID>
<PackURL>http://www.keil.com/pack/</PackURL> <PackURL>https://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000-0x2004FFFF) IROM(0x8000000-0x80FFFFF) CLOCK(25000000) FPU2 CPUTYPE("Cortex-M4")</Cpu> <Cpu>IRAM(0x20000000-0x2004FFFF) IROM(0x8000000-0x80FFFFF) CLOCK(25000000) FPU2 CPUTYPE("Cortex-M4")</Cpu>
<FlashUtilSpec></FlashUtilSpec> <FlashUtilSpec></FlashUtilSpec>
<StartupFile></StartupFile> <StartupFile></StartupFile>