From 12083b20d128f9d4449e286a14f1ba4fc31432fd Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期六, 07 十一月 2020 12:52:37 +0800
Subject: [PATCH] 修改电机震动时间不对BUG
---
MDK-ARM/L051.uvoptx | 144 ++++++++++--------------------------------------
1 files changed, 30 insertions(+), 114 deletions(-)
diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx
index 36d5fdf..6aa4574 100644
--- a/MDK-ARM/L051.uvoptx
+++ b/MDK-ARM/L051.uvoptx
@@ -120,7 +120,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>DLGUARM</Key>
- <Name></Name>
+ <Name>d</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -140,7 +140,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>JL2CM3</Key>
- <Name>-U20090928 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BC11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name>
+ <Name>-U20090928 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BC11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8008 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -157,141 +157,67 @@
<Bp>
<Number>0</Number>
<Type>0</Type>
- <LineNumber>2802</LineNumber>
+ <LineNumber>116</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134264600</Address>
+ <Address>134249728</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
- <Filename>..\Src\decadriver\deca_device.c</Filename>
+ <Filename>../Src/main.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\L051\../Src/decadriver/deca_device.c\2802</Expression>
+ <Expression>\\L051\../Src/main.c\116</Expression>
</Bp>
<Bp>
<Number>1</Number>
<Type>0</Type>
- <LineNumber>55</LineNumber>
+ <LineNumber>139</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134258898</Address>
+ <Address>134249784</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
- <Filename>..\Src\OnChipDevices\Usart.c</Filename>
+ <Filename>../Src/main.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\L051\../Src/OnChipDevices/Usart.c\55</Expression>
+ <Expression>\\L051\../Src/main.c\139</Expression>
+ </Bp>
+ <Bp>
+ <Number>2</Number>
+ <Type>0</Type>
+ <LineNumber>141</LineNumber>
+ <EnabledFlag>1</EnabledFlag>
+ <Address>134249798</Address>
+ <ByteObject>0</ByteObject>
+ <HtxType>0</HtxType>
+ <ManyObjects>0</ManyObjects>
+ <SizeOfObject>0</SizeOfObject>
+ <BreakByAccess>0</BreakByAccess>
+ <BreakIfRCount>1</BreakIfRCount>
+ <Filename>../Src/main.c</Filename>
+ <ExecCommand></ExecCommand>
+ <Expression>\\L051\../Src/main.c\141</Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
- <ItemText>last_nearbase_num</ItemText>
+ <ItemText>motor_state</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
- <ItemText>nearbaseid_list</ItemText>
+ <ItemText>current_time,0x0A</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
- <ItemText>tyncpoll_time,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>3</count>
- <WinNumber>1</WinNumber>
- <ItemText>lptime,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>4</count>
- <WinNumber>1</WinNumber>
- <ItemText>lpcount,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>5</count>
- <WinNumber>1</WinNumber>
- <ItemText>count_offset,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>6</count>
- <WinNumber>1</WinNumber>
- <ItemText>offset,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>7</count>
- <WinNumber>1</WinNumber>
- <ItemText>ancsync_time,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>8</count>
- <WinNumber>1</WinNumber>
- <ItemText>offsettimeus,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>9</count>
- <WinNumber>1</WinNumber>
- <ItemText>target_time,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>10</count>
- <WinNumber>1</WinNumber>
- <ItemText>current_slotnum,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>11</count>
- <WinNumber>1</WinNumber>
- <ItemText>sync_timer,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>12</count>
- <WinNumber>1</WinNumber>
- <ItemText>end_count,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>13</count>
- <WinNumber>1</WinNumber>
- <ItemText>lastsync_timer,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>14</count>
- <WinNumber>1</WinNumber>
- <ItemText>true_nearbase_distlist</ItemText>
- </Ww>
- <Ww>
- <count>15</count>
- <WinNumber>1</WinNumber>
- <ItemText>bat_percent,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>16</count>
- <WinNumber>1</WinNumber>
- <ItemText>bat_volt</ItemText>
- </Ww>
- <Ww>
- <count>17</count>
- <WinNumber>1</WinNumber>
- <ItemText>nomove_count</ItemText>
- </Ww>
- <Ww>
- <count>18</count>
- <WinNumber>1</WinNumber>
- <ItemText>rx_buffer</ItemText>
- </Ww>
- <Ww>
- <count>19</count>
- <WinNumber>1</WinNumber>
- <ItemText>motor_state</ItemText>
- </Ww>
- <Ww>
- <count>20</count>
- <WinNumber>1</WinNumber>
- <ItemText>g_com_map</ItemText>
+ <ItemText>current_time,0x0A</ItemText>
</Ww>
</WatchWindow1>
<WatchWindow2>
@@ -351,16 +277,6 @@
<pszMrulep></pszMrulep>
<pSingCmdsp></pSingCmdsp>
<pMultCmdsp></pMultCmdsp>
- <SystemViewers>
- <Entry>
- <Name>System Viewer\GPIOB</Name>
- <WinId>35904</WinId>
- </Entry>
- <Entry>
- <Name>System Viewer\USART1</Name>
- <WinId>35905</WinId>
- </Entry>
- </SystemViewers>
<DebugDescription>
<Enable>1</Enable>
<EnableFlashSeq>0</EnableFlashSeq>
@@ -373,7 +289,7 @@
<Group>
<GroupName>Application/MDK-ARM</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
--
Gitblit v1.9.3