From b2aceb4c0b5a06e7b9479aea26af95856c1fa82f Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期五, 11 十二月 2020 14:28:31 +0800 Subject: [PATCH] 修复错误注释bug --- 源码/核心板/MDK-ARM/Project.uvoptx | 59 +++++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 45 insertions(+), 14 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 35c7bb4..ebcb286 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" @@ -103,7 +103,7 @@ <bEvRecOn>1</bEvRecOn> <bSchkAxf>0</bSchkAxf> <bTchkAxf>0</bTchkAxf> - <nTsel>12</nTsel> + <nTsel>6</nTsel> <sDll></sDll> <sDllPa></sDllPa> <sDlgDll></sDlgDll> @@ -114,9 +114,14 @@ <tDlgDll></tDlgDll> <tDlgPa></tDlgPa> <tIfile></tIfile> - <pMon>BIN\CMSIS_AGDI.dll</pMon> + <pMon>Segger\JL2CM3.dll</pMon> </DebugOpt> <TargetDriverDllRegistry> + <SetRegEntry> + <Number>0</Number> + <Key>ULP2CM3</Key> + <Name>-UV0010M9E -O2254 -S8 -C0 -P00000000 -N00("") -D00(00000000) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP11 -TDX0 -TDD0 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM)</Name> + </SetRegEntry> <SetRegEntry> <Number>0</Number> <Key>CMSIS_AGDI</Key> @@ -125,7 +130,7 @@ <SetRegEntry> <Number>0</Number> <Key>DLGUARM</Key> - <Name></Name> + <Name>d</Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> @@ -162,9 +167,9 @@ <Bp> <Number>0</Number> <Type>0</Type> - <LineNumber>1159</LineNumber> + <LineNumber>948</LineNumber> <EnabledFlag>1</EnabledFlag> - <Address>134241732</Address> + <Address>134242450</Address> <ByteObject>0</ByteObject> <HtxType>0</HtxType> <ManyObjects>0</ManyObjects> @@ -173,7 +178,23 @@ <BreakIfRCount>1</BreakIfRCount> <Filename>E:\GIT\UWB_SmallModule\濠ф劗鐖淺Src\application\dw_app.c</Filename> <ExecCommand></ExecCommand> - <Expression>\\UWB_Projects\../Src/application/dw_app.c\1159</Expression> + <Expression>\\UWB_Projects\../Src/application/dw_app.c\948</Expression> + </Bp> + <Bp> + <Number>1</Number> + <Type>0</Type> + <LineNumber>151</LineNumber> + <EnabledFlag>1</EnabledFlag> + <Address>134257074</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>\\UWB_Projects\../Src/decadriver/deca_device.c\151</Expression> </Bp> </Breakpoint> <WatchWindow1> @@ -215,42 +236,52 @@ <Ww> <count>7</count> <WinNumber>1</WinNumber> - <ItemText>rx_buffer</ItemText> + <ItemText>pwtag</ItemText> </Ww> <Ww> <count>8</count> <WinNumber>1</WinNumber> - <ItemText>pwtag</ItemText> + <ItemText>mUsartReceivePack</ItemText> </Ww> <Ww> <count>9</count> <WinNumber>1</WinNumber> - <ItemText>mUsartReceivePack</ItemText> + <ItemText>rx_buffer[9]</ItemText> </Ww> <Ww> <count>10</count> <WinNumber>1</WinNumber> - <ItemText>rx_buffer[9]</ItemText> + <ItemText>g_com_map[NEARBASE_ID1]</ItemText> </Ww> <Ww> <count>11</count> <WinNumber>1</WinNumber> - <ItemText>g_com_map[NEARBASE_ID1]</ItemText> + <ItemText>time_monitor[3]-time_monitor[0],0x0A</ItemText> </Ww> <Ww> <count>12</count> <WinNumber>1</WinNumber> - <ItemText>time_monitor[3]-time_monitor[0],0x0A</ItemText> + <ItemText>dist_cm</ItemText> </Ww> <Ww> <count>13</count> <WinNumber>1</WinNumber> - <ItemText>dist_cm</ItemText> + <ItemText>time_monitor,0x0A</ItemText> </Ww> <Ww> <count>14</count> <WinNumber>1</WinNumber> - <ItemText>time_monitor,0x0A</ItemText> + <ItemText>usart_send,0x0A</ItemText> + </Ww> + <Ww> + <count>15</count> + <WinNumber>1</WinNumber> + <ItemText>rx_buffer</ItemText> + </Ww> + <Ww> + <count>16</count> + <WinNumber>1</WinNumber> + <ItemText>regtag_map</ItemText> </Ww> </WatchWindow1> <MemoryWindow1> -- Gitblit v1.9.3