Embedded/H7-TOOL_STM32H7_App
1
0
Fork 0
mirror of https://github.com/armfly/H7-TOOL_STM32H7_App.git synced 2024-08-09 10:05:34 +08:00
Code Issues Projects Releases Wiki Activity

修复旧版固件升级后串口监视界面死机问题

Browse Source
This commit is contained in:
armfly 2020-10-19 18:30:17 +08:00
parent 250c13f912
commit 0b378f20e2
9 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -1,3 +1,7 @@
----------------------------------------------------------------------------
2020-10-19 V1.34a
1.解决旧版升级到新固件后,串口监视界面死机问题。原因是缺省参数不正确。
----------------------------------------------------------------------------
2020-10-19 V1.34
1. 修改net_udp.c中lua_udp_SendBuf()函数，遇到0x0A就立即发送，解决PC软件显示log不全问题

25
Project/MDK-ARM(uV5)/project.uvoptx
View File

@ -153,7 +153,24 @@
<Name></Name>
</SetRegEntry>
</TargetDriverDllRegistry>
<Breakpoint/>
<Breakpoint>
<Bp>
<Number>0</Number>
<Type>0</Type>
<LineNumber>214</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134438848</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>..\..\User\segger\HardFaultHandlerMDK\SEGGER_HardFaultHandler.c</Filename>
<ExecCommand></ExecCommand>
<Expression>\\output\../../User/segger/HardFaultHandlerMDK/SEGGER_HardFaultHandler.c\214</Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
<Ww>
<count>0</count>
@ -183,7 +200,7 @@
<DebugFlag>
<trace>0</trace>
<periodic>1</periodic>
<aLwin>0</aLwin>
<aLwin>1</aLwin>
<aCover>0</aCover>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
@ -503,7 +520,7 @@
<Group>
<GroupName>BSP</GroupName>
<tvExp>1</tvExp>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@ -1603,7 +1620,7 @@
<Group>
<GroupName>SEGGER/HardFault</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>

2
Project/MDK-ARM(uV5)/startup_stm32h743xx.s
View File

@ -68,7 +68,7 @@ __Vectors DCD __initial_sp ; Top of Stack
DCD MemManage_Handler ; MPU Fault Handler
DCD BusFault_Handler ; Bus Fault Handler
DCD UsageFault_Handler ; Usage Fault Handler
DCD 0x00000134 ; Reserved H7-TOOL APP 固件版本
DCD 0x00000135 ; Reserved H7-TOOL APP 固件版本
DCD 0 ; Reserved
DCD 0 ; Reserved
DCD 0 ; Reserved

0
Project/h7_tool_app(V1.34).bin → Project/h7_tool_app(V1.34a).bin
View File

BIN
Project/h7_tool_app.bin Normal file
View File

Binary file not shown.

1
User/app/inc/modify_param.h
View File

@ -25,6 +25,7 @@ typedef struct
int32_t DefaultValue; /* 缺省值 */
}PARAM_LIST_T;
void UartMonInitParam(uint16_t _MainStatus);
void ModifyParam(uint16_t _MainStatus);
void UartMonCheckParam(void);

5
User/app/src/modify_param.c
View File

@ -35,7 +35,6 @@ char *g_MenuParam_Text[MENU_ITEM_COUNT_MAX + 1];
MENU_T g_tMenuParam;
static void UartMonInitParam(uint16_t _MainStatus);
static void UartMonDispParam(void);
static void UartMonAdjustParam(uint8_t _index, int16_t _adj);
@ -306,7 +305,7 @@ void ModifyParam(uint16_t _MainStatus)
* 返 回 值: 无
*********************************************************************************************************
*/
static void UartMonInitParam(uint16_t _MainStatus)
void UartMonInitParam(uint16_t _MainStatus)
{
if (_MainStatus == MS_MONITOR_UART)
{
@ -541,5 +540,5 @@ void UartMonCheckParam(void)
MonDispWriteParam(i, now);
}
}
/***************************** 安富莱电子 www.armfly.com (END OF FILE) *********************************/

1
User/app/src/status_can_monitor.c
View File

@ -151,6 +151,7 @@ void status_MonitorCan(void)
LCD_SetEncode(ENCODE_GBK);
UartMonInitParam(g_MainStatus);
UartMonCheckParam(); /* 检查参数 */
fInit = 1;

3
User/app/src/status_uart_monitor.c
View File

@ -263,6 +263,8 @@ void status_MonitorUart(void)
LCD_SetEncode(ENCODE_GBK);
/* V1.35, 检查串口参数 */
UartMonInitParam(g_MainStatus);
UartMonCheckParam(); /* 检查参数 */
s_Pause = 0;
@ -301,6 +303,7 @@ void status_MonitorUart(void)
}
s_BeginTime = bsp_GetRunTimeUs();
/* 设置第1个串口 9600 无校验 */
bsp_SetUartParam(COM_RS485, BaudTab[g_tParam.UartMonBaud],