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 | 78 ++++++++++++--------------------------
1 files changed, 25 insertions(+), 53 deletions(-)
diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx
index 4f3eca7..6aa4574 100644
--- a/MDK-ARM/L051.uvoptx
+++ b/MDK-ARM/L051.uvoptx
@@ -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,94 +157,76 @@
<Bp>
<Number>0</Number>
<Type>0</Type>
- <LineNumber>175</LineNumber>
+ <LineNumber>116</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134264734</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\175</Expression>
+ <Expression>\\L051\../Src/main.c\116</Expression>
</Bp>
<Bp>
<Number>1</Number>
<Type>0</Type>
- <LineNumber>608</LineNumber>
+ <LineNumber>139</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134259728</Address>
+ <Address>134249784</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
- <Filename>..\Src\application\dw_app.c</Filename>
+ <Filename>../Src/main.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\L051\../Src/application/dw_app.c\608</Expression>
+ <Expression>\\L051\../Src/main.c\139</Expression>
</Bp>
<Bp>
<Number>2</Number>
<Type>0</Type>
- <LineNumber>267</LineNumber>
+ <LineNumber>141</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134257598</Address>
+ <Address>134249798</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
- <Filename>..\Src\application\dw_app.c</Filename>
+ <Filename>../Src/main.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\L051\../Src/application/dw_app.c\267</Expression>
+ <Expression>\\L051\../Src/main.c\141</Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
- <ItemText>headerBuffer</ItemText>
+ <ItemText>motor_state</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
- <ItemText>bodyBuffer</ItemText>
+ <ItemText>current_time,0x0A</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
- <ItemText>buffer</ItemText>
- </Ww>
- <Ww>
- <count>3</count>
- <WinNumber>1</WinNumber>
- <ItemText>bodyBuffer</ItemText>
- </Ww>
- <Ww>
- <count>4</count>
- <WinNumber>1</WinNumber>
- <ItemText>status_reg</ItemText>
- </Ww>
- <Ww>
- <count>5</count>
- <WinNumber>1</WinNumber>
- <ItemText>tx_poll_msg</ItemText>
- </Ww>
- <Ww>
- <count>6</count>
- <WinNumber>1</WinNumber>
- <ItemText>last_value</ItemText>
- </Ww>
- <Ww>
- <count>7</count>
- <WinNumber>1</WinNumber>
- <ItemText>bat_volt</ItemText>
+ <ItemText>current_time,0x0A</ItemText>
</Ww>
</WatchWindow1>
+ <WatchWindow2>
+ <Ww>
+ <count>0</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>current_slotnum</ItemText>
+ </Ww>
+ </WatchWindow2>
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
@@ -295,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>
@@ -317,7 +289,7 @@
<Group>
<GroupName>Application/MDK-ARM</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -573,7 +545,7 @@
<Group>
<GroupName>Drivers/STM32L0xx_HAL_Driver</GroupName>
- <tvExp>1</tvExp>
+ <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
--
Gitblit v1.9.3