From b0e6260abb7b73fbc178af119c24b0a73ab2ffc5 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期四, 09 一月 2020 08:56:02 +0800 Subject: [PATCH] 华星第一版测试完成,修复标签timeout bug --- 源码/核心板/MDK-ARM/Project.uvoptx | 59 +++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 35 insertions(+), 24 deletions(-) diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" index 41568c0..cde2e27 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" @@ -82,22 +82,22 @@ <Book> <Number>0</Number> <Title>Quick Start Guide (MCBSTM32E)</Title> - <Path>d:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.3.0\Boards/Keil/MCBSTM32E/Documentation/STM32E_QSG.pdf</Path> + <Path>d:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.3.0\Boards\Keil\MCBSTM32E\Documentation\STM32E_QSG.pdf</Path> </Book> <Book> <Number>1</Number> <Title>Base Board Schematics (MCBSTM32E)</Title> - <Path>d:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.3.0\Boards/Keil/MCBSTM32E/Documentation/mcbstm32e-base-board-schematics.pdf</Path> + <Path>d:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.3.0\Boards\Keil\MCBSTM32E\Documentation\mcbstm32e-base-board-schematics.pdf</Path> </Book> <Book> <Number>2</Number> <Title>Display Board Schematics (MCBSTM32E)</Title> - <Path>d:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.3.0\Boards/Keil/MCBSTM32E/Documentation/mcbstm32e-display-board-schematics.pdf</Path> + <Path>d:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.3.0\Boards\Keil\MCBSTM32E\Documentation\mcbstm32e-display-board-schematics.pdf</Path> </Book> <Book> <Number>3</Number> <Title>User Manual (MCBSTM32E)</Title> - <Path>d:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.3.0\Boards/Keil/MCBSTM32E/Documentation/mcbstm32e.chm</Path> + <Path>d:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.3.0\Boards\Keil\MCBSTM32E\Documentation\mcbstm32e.chm</Path> </Book> <Book> <Number>4</Number> @@ -182,97 +182,107 @@ <Ww> <count>0</count> <WinNumber>1</WinNumber> - <ItemText>dist_cm</ItemText> + <ItemText>taglist_num</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>1</WinNumber> - <ItemText>g_beep_on_time,0x0A</ItemText> + <ItemText>tagofflinetime</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>1</WinNumber> - <ItemText>g_beep_off_time,0x0A</ItemText> + <ItemText>tagid_list</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>1</WinNumber> - <ItemText>dis_after_filter</ItemText> + <ItemText>tagslotpos</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>1</WinNumber> - <ItemText>g_beep_off_time,0x0A</ItemText> + <ItemText>sync_timer,0x0A</ItemText> </Ww> <Ww> <count>5</count> <WinNumber>1</WinNumber> - <ItemText>status_reg</ItemText> + <ItemText>tyncpoll_time,0x0A</ItemText> </Ww> <Ww> <count>6</count> <WinNumber>1</WinNumber> - <ItemText>temp,0x0A</ItemText> + <ItemText>g_com_map,0x10</ItemText> </Ww> <Ww> <count>7</count> <WinNumber>1</WinNumber> - <ItemText>aa</ItemText> + <ItemText>tagslotpos</ItemText> </Ww> <Ww> <count>8</count> <WinNumber>1</WinNumber> - <ItemText>Anchor_App</ItemText> + <ItemText>max_slotpos,0x0A</ItemText> </Ww> <Ww> <count>9</count> <WinNumber>1</WinNumber> - <ItemText>g_alarm_dist,0x0A</ItemText> + <ItemText>dev_id,0x0A</ItemText> </Ww> <Ww> <count>10</count> <WinNumber>1</WinNumber> - <ItemText>g_frame_data</ItemText> + <ItemText>tyncpoll_time,0x0A</ItemText> </Ww> <Ww> <count>11</count> <WinNumber>1</WinNumber> - <ItemText>m_EUART_DMA_RXBuf</ItemText> + <ItemText>tagslotpos</ItemText> </Ww> <Ww> <count>12</count> <WinNumber>1</WinNumber> - <ItemText>g_frame_data_len</ItemText> + <ItemText>nearbase_distlist,0x0A</ItemText> </Ww> <Ww> <count>13</count> <WinNumber>1</WinNumber> - <ItemText>g_alarm_dev</ItemText> + <ItemText>mainbase_dist,0x0A</ItemText> </Ww> <Ww> <count>14</count> <WinNumber>1</WinNumber> - <ItemText>g_com_map[DIST_OFFSET]</ItemText> + <ItemText>nearbaseid_list</ItemText> </Ww> <Ww> <count>15</count> <WinNumber>1</WinNumber> - <ItemText>g_com_map</ItemText> + <ItemText>mUsartReceivePack</ItemText> </Ww> <Ww> <count>16</count> <WinNumber>1</WinNumber> - <ItemText>hex_dist,0x0A</ItemText> + <ItemText>sync_timer</ItemText> </Ww> <Ww> <count>17</count> <WinNumber>1</WinNumber> - <ItemText>timer3,0x0A</ItemText> + <ItemText>tx_near_msg[ANCTIMEMS]</ItemText> </Ww> <Ww> <count>18</count> <WinNumber>1</WinNumber> - <ItemText>time32_incr,0x0A</ItemText> + <ItemText>tx_near_msg</ItemText> + </Ww> + <Ww> + <count>19</count> + <WinNumber>1</WinNumber> + <ItemText>mainbase_id</ItemText> + </Ww> + <Ww> + <count>20</count> + <WinNumber>1</WinNumber> + <ItemText>nearbase_mindist,0x0A</ItemText> </Ww> </WatchWindow1> <MemoryWindow1> @@ -322,6 +332,7 @@ </DebugFlag> <LintExecutable></LintExecutable> <LintConfigFile></LintConfigFile> + <bLintAuto>0</bLintAuto> <DebugDescription> <Enable>1</Enable> <EnableLog>0</EnableLog> @@ -542,7 +553,7 @@ <Group> <GroupName>OnChipDevices</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> -- Gitblit v1.9.3