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 | 148 +++++++++++++++++++++++++----------------------- 1 files changed, 77 insertions(+), 71 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 6ee4d17..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> @@ -143,6 +143,11 @@ <TargetDriverDllRegistry> <SetRegEntry> <Number>0</Number> + <Key>DLGUARM</Key> + <Name></Name> + </SetRegEntry> + <SetRegEntry> + <Number>0</Number> <Key>UL2CM3</Key> <Name>-UV0010M9E -O2254 -S0 -C0 -P00 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FN1 -FC1000 -FD20000000 -FF0STM32F10x_128 -FL020000 -FS08000000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM)</Name> </SetRegEntry> @@ -172,72 +177,7 @@ <Name>-T0</Name> </SetRegEntry> </TargetDriverDllRegistry> - <Breakpoint> - <Bp> - <Number>0</Number> - <Type>0</Type> - <LineNumber>57</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>134248160</Address> - <ByteObject>0</ByteObject> - <HtxType>0</HtxType> - <ManyObjects>0</ManyObjects> - <SizeOfObject>0</SizeOfObject> - <BreakByAccess>0</BreakByAccess> - <BreakIfRCount>1</BreakIfRCount> - <Filename>E:\GIT\UWB_SmallModule\濠ф劗鐖淺Src\stm32f10x_it.c</Filename> - <ExecCommand></ExecCommand> - <Expression></Expression> - </Bp> - <Bp> - <Number>1</Number> - <Type>0</Type> - <LineNumber>132</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>134254218</Address> - <ByteObject>0</ByteObject> - <HtxType>0</HtxType> - <ManyObjects>0</ManyObjects> - <SizeOfObject>0</SizeOfObject> - <BreakByAccess>0</BreakByAccess> - <BreakIfRCount>1</BreakIfRCount> - <Filename>E:\GIT\UWB_SmallModule\濠ф劗鐖淺Src\decadriver\deca_device.c</Filename> - <ExecCommand></ExecCommand> - <Expression></Expression> - </Bp> - <Bp> - <Number>2</Number> - <Type>0</Type> - <LineNumber>79</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>134248258</Address> - <ByteObject>0</ByteObject> - <HtxType>0</HtxType> - <ManyObjects>0</ManyObjects> - <SizeOfObject>0</SizeOfObject> - <BreakByAccess>0</BreakByAccess> - <BreakIfRCount>1</BreakIfRCount> - <Filename>E:\GIT\UWB_SmallModule\濠ф劗鐖淺Src\stm32f10x_it.c</Filename> - <ExecCommand></ExecCommand> - <Expression></Expression> - </Bp> - <Bp> - <Number>3</Number> - <Type>0</Type> - <LineNumber>476</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>134249658</Address> - <ByteObject>0</ByteObject> - <HtxType>0</HtxType> - <ManyObjects>0</ManyObjects> - <SizeOfObject>0</SizeOfObject> - <BreakByAccess>0</BreakByAccess> - <BreakIfRCount>1</BreakIfRCount> - <Filename>E:\GIT\UWB_SmallModule\濠ф劗鐖淺Src\application\dw_app.c</Filename> - <ExecCommand></ExecCommand> - <Expression>\\UWB_Projects\../Src/application/dw_app.c\476</Expression> - </Bp> - </Breakpoint> + <Breakpoint/> <WatchWindow1> <Ww> <count>0</count> @@ -272,12 +212,77 @@ <Ww> <count>6</count> <WinNumber>1</WinNumber> - <ItemText>g_com_map</ItemText> + <ItemText>g_com_map,0x10</ItemText> </Ww> <Ww> <count>7</count> <WinNumber>1</WinNumber> <ItemText>tagslotpos</ItemText> + </Ww> + <Ww> + <count>8</count> + <WinNumber>1</WinNumber> + <ItemText>max_slotpos,0x0A</ItemText> + </Ww> + <Ww> + <count>9</count> + <WinNumber>1</WinNumber> + <ItemText>dev_id,0x0A</ItemText> + </Ww> + <Ww> + <count>10</count> + <WinNumber>1</WinNumber> + <ItemText>tyncpoll_time,0x0A</ItemText> + </Ww> + <Ww> + <count>11</count> + <WinNumber>1</WinNumber> + <ItemText>tagslotpos</ItemText> + </Ww> + <Ww> + <count>12</count> + <WinNumber>1</WinNumber> + <ItemText>nearbase_distlist,0x0A</ItemText> + </Ww> + <Ww> + <count>13</count> + <WinNumber>1</WinNumber> + <ItemText>mainbase_dist,0x0A</ItemText> + </Ww> + <Ww> + <count>14</count> + <WinNumber>1</WinNumber> + <ItemText>nearbaseid_list</ItemText> + </Ww> + <Ww> + <count>15</count> + <WinNumber>1</WinNumber> + <ItemText>mUsartReceivePack</ItemText> + </Ww> + <Ww> + <count>16</count> + <WinNumber>1</WinNumber> + <ItemText>sync_timer</ItemText> + </Ww> + <Ww> + <count>17</count> + <WinNumber>1</WinNumber> + <ItemText>tx_near_msg[ANCTIMEMS]</ItemText> + </Ww> + <Ww> + <count>18</count> + <WinNumber>1</WinNumber> + <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> @@ -327,6 +332,7 @@ </DebugFlag> <LintExecutable></LintExecutable> <LintConfigFile></LintConfigFile> + <bLintAuto>0</bLintAuto> <DebugDescription> <Enable>1</Enable> <EnableLog>0</EnableLog> -- Gitblit v1.9.3