From f8f53109542bc2c2639b826da824e63e681e6c6f Mon Sep 17 00:00:00 2001
From: Charles <charles.sirois14@gmail.com>
Date: Thu, 20 Feb 2020 18:57:11 -0500
Subject: [PATCH] BSP Update
---
Standard_BoardB/BSP | 2 +-
.../MDK-ARM/Standard_robot.uvguix.charl | 212 ++++-----
.../MDK-ARM/Standard_robot/Standard_robot.hex | 446 +++++++++---------
Standard_robot/Src/main.c | 6 +-
4 files changed, 333 insertions(+), 333 deletions(-)
diff --git a/Standard_BoardB/BSP b/Standard_BoardB/BSP
index 4bb6bbb..59eb0b2 160000
--- a/Standard_BoardB/BSP
+++ b/Standard_BoardB/BSP
@@ -1 +1 @@
-Subproject commit 4bb6bbb21f61e56e42b63a921e65b79f56a41566
+Subproject commit 59eb0b220f53250dd186e39a8169e51af4370773
diff --git a/Standard_robot/MDK-ARM/Standard_robot.uvguix.charl b/Standard_robot/MDK-ARM/Standard_robot.uvguix.charl
index 1af8b01..64a0d9a 100644
--- a/Standard_robot/MDK-ARM/Standard_robot.uvguix.charl
+++ b/Standard_robot/MDK-ARM/Standard_robot.uvguix.charl
@@ -111,7 +111,7 @@
<RegID>0</RegID>
<MDITabState>
<Len>820</Len>
- <Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000700000000000000010000003C443A5C636861726C5C446F63756D656E74735C4769745C524D2D436F6E74726F6C655C5374616E646172645F726F626F745C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF44443A5C636861726C5C446F63756D656E74735C4769745C524D2D436F6E74726F6C655C5374616E646172645F726F626F745C4253505C4465766963655C6D6F746F722E6300000000076D6F746F722E6300000000FFDC7800FFFFFFFF44443A5C636861726C5C446F63756D656E74735C4769745C524D2D436F6E74726F6C655C5374616E646172645F726F626F745C4253505C4465766963655C6D6F746F722E6800000000076D6F746F722E6800000000BECEA100FFFFFFFF46443A5C636861726C5C446F63756D656E74735C4769745C524D2D436F6E74726F6C655C5374616E646172645F726F626F745C4253505C4472697665725C6273705F63616E2E6300000000096273705F63616E2E6300000000F0A0A100FFFFFFFF46443A5C636861726C5C446F63756D656E74735C4769745C524D2D436F6E74726F6C655C5374616E646172645F726F626F745C4253505C4472697665725C6273705F63616E2E6800000000096273705F63616E2E6800000000BCA8E100FFFFFFFF45443A5C636861726C5C446F63756D656E74735C4769745C524D2D436F6E74726F6C655C5374616E646172645F726F626F745C4253505C416C676F726974686D5C7069642E6300000000057069642E63000000009CC1B600FFFFFFFF45443A5C636861726C5C446F63756D656E74735C4769745C524D2D436F6E74726F6C655C5374616E646172645F726F626F745C4253505C416C676F726974686D5C7069642E6800000000057069642E6800000000F7B88600FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F3000000660000005805000091020000</Data>
+ <Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000700000000000000010000003C443A5C636861726C5C446F63756D656E74735C4769745C524D2D436F6E74726F6C655C5374616E646172645F726F626F745C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF44443A5C636861726C5C446F63756D656E74735C4769745C524D2D436F6E74726F6C655C5374616E646172645F726F626F745C4253505C4465766963655C6D6F746F722E6300000000076D6F746F722E6300000000FFDC7800FFFFFFFF44443A5C636861726C5C446F63756D656E74735C4769745C524D2D436F6E74726F6C655C5374616E646172645F726F626F745C4253505C4465766963655C6D6F746F722E6800000000076D6F746F722E6800000000BECEA100FFFFFFFF46443A5C636861726C5C446F63756D656E74735C4769745C524D2D436F6E74726F6C655C5374616E646172645F726F626F745C4253505C4472697665725C6273705F63616E2E6300000000096273705F63616E2E6300000000F0A0A100FFFFFFFF46443A5C636861726C5C446F63756D656E74735C4769745C524D2D436F6E74726F6C655C5374616E646172645F726F626F745C4253505C4472697665725C6273705F63616E2E6800000000096273705F63616E2E6800000000BCA8E100FFFFFFFF45443A5C636861726C5C446F63756D656E74735C4769745C524D2D436F6E74726F6C655C5374616E646172645F726F626F745C4253505C416C676F726974686D5C7069642E6300000000057069642E63000000009CC1B600FFFFFFFF45443A5C636861726C5C446F63756D656E74735C4769745C524D2D436F6E74726F6C655C5374616E646172645F726F626F745C4253505C416C676F726974686D5C7069642E6800000000057069642E6800000000F7B88600FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000AF0000006600000058050000E6020000</Data>
</MDITabState>
</MDIClientArea>
<ViewEx>
@@ -134,7 +134,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000009D02000030010000</Data>
+ <Data>D8000000EF000000D102000064010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -150,11 +150,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000066000000EC00000061020000</Data>
+ <Data>0300000066000000A8000000B6020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -170,11 +170,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000066000000EC00000061020000</Data>
+ <Data>0300000066000000A8000000B6020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000006E0100008F020000</Data>
+ <Data>D8000000EF000000A2010000C3020000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -194,7 +194,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000009D02000030010000</Data>
+ <Data>D8000000EF000000D102000064010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -214,7 +214,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000009D02000030010000</Data>
+ <Data>D8000000EF000000D102000064010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -234,7 +234,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000009D02000030010000</Data>
+ <Data>D8000000EF000000D102000064010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -254,7 +254,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000009D02000030010000</Data>
+ <Data>D8000000EF000000D102000064010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -274,7 +274,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -294,7 +294,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000009D02000030010000</Data>
+ <Data>D8000000EF000000D102000064010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -314,7 +314,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -334,7 +334,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -354,7 +354,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -374,7 +374,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000009D02000030010000</Data>
+ <Data>D8000000EF000000D102000064010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -394,7 +394,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000009D02000030010000</Data>
+ <Data>D8000000EF000000D102000064010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -414,7 +414,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000009D02000030010000</Data>
+ <Data>D8000000EF000000D102000064010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -434,7 +434,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000009D02000030010000</Data>
+ <Data>D8000000EF000000D102000064010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -450,11 +450,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000066000000EC00000061020000</Data>
+ <Data>0300000066000000A8000000B6020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000006E0100008F020000</Data>
+ <Data>D8000000EF000000A2010000C3020000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -470,11 +470,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000066000000EC00000061020000</Data>
+ <Data>0300000066000000A8000000B6020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000006E0100008F020000</Data>
+ <Data>D8000000EF000000A2010000C3020000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -490,11 +490,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>00000000920200005805000048030000</Data>
+ <Data>00000000E70200005805000048030000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000009D02000030010000</Data>
+ <Data>D8000000EF000000D102000064010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -514,7 +514,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000009D02000030010000</Data>
+ <Data>D8000000EF000000D102000064010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -530,11 +530,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000095020000EF030000DA020000</Data>
+ <Data>03000000EA020000EF0300002F030000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000009D02000030010000</Data>
+ <Data>D8000000EF000000D102000064010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -554,7 +554,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000009D02000030010000</Data>
+ <Data>D8000000EF000000D102000064010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -574,7 +574,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000009D02000030010000</Data>
+ <Data>D8000000EF000000D102000064010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -614,7 +614,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -634,7 +634,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000009D02000030010000</Data>
+ <Data>D8000000EF000000D102000064010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -654,7 +654,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000009D02000030010000</Data>
+ <Data>D8000000EF000000D102000064010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -674,7 +674,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000009D02000030010000</Data>
+ <Data>D8000000EF000000D102000064010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -694,7 +694,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -714,7 +714,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000009D02000030010000</Data>
+ <Data>D8000000EF000000D102000064010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -734,7 +734,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -754,7 +754,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -774,7 +774,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -794,7 +794,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -814,7 +814,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -834,7 +834,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -854,7 +854,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -874,7 +874,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -894,7 +894,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -914,7 +914,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -934,7 +934,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -954,7 +954,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -974,7 +974,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -994,7 +994,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1014,7 +1014,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1034,7 +1034,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1054,7 +1054,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1074,7 +1074,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1094,7 +1094,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1114,7 +1114,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1134,7 +1134,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1154,7 +1154,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000006E0100008F020000</Data>
+ <Data>D8000000EF000000A2010000C3020000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1170,11 +1170,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0000000092020000F2030000F3020000</Data>
+ <Data>00000000E7020000F203000048030000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000009D02000030010000</Data>
+ <Data>D8000000EF000000D102000064010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1190,11 +1190,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000095020000EF030000DA020000</Data>
+ <Data>03000000EA020000EF0300002F030000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000006E0100008F020000</Data>
+ <Data>D8000000EF000000A2010000C3020000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1214,7 +1214,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1234,7 +1234,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1250,11 +1250,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000095020000EF030000DA020000</Data>
+ <Data>03000000EA020000EF0300002F030000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000006E0100008F020000</Data>
+ <Data>D8000000EF000000A2010000C3020000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1270,11 +1270,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000095020000EF030000DA020000</Data>
+ <Data>03000000EA020000EF0300002F030000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000006E0100008F020000</Data>
+ <Data>D8000000EF000000A2010000C3020000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1294,7 +1294,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000009D02000030010000</Data>
+ <Data>D8000000EF000000D102000064010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1314,7 +1314,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1334,7 +1334,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1354,7 +1354,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1374,7 +1374,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1394,7 +1394,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1414,7 +1414,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1434,7 +1434,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1454,7 +1454,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1474,7 +1474,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1494,7 +1494,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1514,7 +1514,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1534,7 +1534,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1554,7 +1554,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1574,13 +1574,13 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
<RegID>50014</RegID>
<PaneID>50014</PaneID>
- <IsVisible>1</IsVisible>
+ <IsVisible>0</IsVisible>
<IsFloating>0</IsFloating>
<IsTabbed>0</IsTabbed>
<IsActivated>0</IsActivated>
@@ -1590,11 +1590,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B200000066000000EF03000081000000</Data>
+ <Data>4A03000066000000EF0300002B010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>0A0000000A0000006E0000006E000000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1614,7 +1614,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1634,7 +1634,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1654,7 +1654,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1674,7 +1674,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1694,7 +1694,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1794,12 +1794,12 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A4000000BB0000004F01000066010000</Data>
+ <Data>D8000000EF000000830100009A010000</Data>
</RectRecentFloat>
</Window>
<DockMan>
<Len>3312</Len>
- <Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFAF000000C4000000F2030000C8000000000000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000A4000000BB0000009D02000030010000AF0000004F000000F2030000C40000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF430300004F00000047030000BD010000000000000200001004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A4000000BB0000004F01000066010000470300004F000000F2030000BD01000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFEF0000004F000000F30000007A0200000100000002000010040000000100000057FFFFFFA4040000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000A4000000BB0000004F01000066010000000000004F000000EF0000007A0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF00000000A9010000F2030000AD01000000000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000A4000000BB0000004F0100006601000000000000AD010000F20300003602000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFF9010000AD010000FD0100003602000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000007A020000580500007E02000001000000010000100400000001000000E2FDFFFFD0000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000A4000000BB0000009D02000030010000000000007E02000058050000480300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data>
+ <Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFAF000000C4000000F2030000C8000000000000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000D8000000EF000000D102000064010000AF0000004F000000F2030000C40000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF430300004F00000047030000BD010000000000000200001004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000D8000000EF000000830100009A010000470300004F000000F2030000BD01000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFAB0000004F000000AF000000CF020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000D8000000EF000000830100009A010000000000004F000000AB000000CF0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF00000000A9010000F2030000AD01000000000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000D8000000EF000000830100009A01000000000000AD010000F20300003602000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFF9010000AD010000FD0100003602000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000CF02000058050000D3020000010000000100001004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000D8000000EF000000D10200006401000000000000D302000058050000480300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data>
</DockMan>
<ToolBar>
<RegID>59392</RegID>
@@ -1865,18 +1865,18 @@
<ActiveTab>0</ActiveTab>
<Doc>
<Name>../Src/main.c</Name>
- <ColumnNumber>30</ColumnNumber>
- <TopLine>134</TopLine>
- <CurrentLine>148</CurrentLine>
+ <ColumnNumber>32</ColumnNumber>
+ <TopLine>149</TopLine>
+ <CurrentLine>162</CurrentLine>
<Folding>1</Folding>
<ContractedFolders>188,229,234,241</ContractedFolders>
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>..\BSP\Device\motor.c</Name>
- <ColumnNumber>8</ColumnNumber>
- <TopLine>13</TopLine>
- <CurrentLine>25</CurrentLine>
+ <ColumnNumber>17</ColumnNumber>
+ <TopLine>8</TopLine>
+ <CurrentLine>33</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
@@ -1884,7 +1884,7 @@
<Doc>
<Name>..\BSP\Device\motor.h</Name>
<ColumnNumber>24</ColumnNumber>
- <TopLine>42</TopLine>
+ <TopLine>37</TopLine>
<CurrentLine>46</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
@@ -1892,9 +1892,9 @@
</Doc>
<Doc>
<Name>..\BSP\Driver\bsp_can.c</Name>
- <ColumnNumber>0</ColumnNumber>
- <TopLine>26</TopLine>
- <CurrentLine>69</CurrentLine>
+ <ColumnNumber>11</ColumnNumber>
+ <TopLine>28</TopLine>
+ <CurrentLine>60</CurrentLine>
<Folding>1</Folding>
<ContractedFolders>30,49,88,95</ContractedFolders>
<PaneID>0</PaneID>
@@ -1902,7 +1902,7 @@
<Doc>
<Name>..\BSP\Driver\bsp_can.h</Name>
<ColumnNumber>0</ColumnNumber>
- <TopLine>16</TopLine>
+ <TopLine>11</TopLine>
<CurrentLine>20</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
@@ -1911,7 +1911,7 @@
<Doc>
<Name>..\BSP\Algorithm\pid.c</Name>
<ColumnNumber>40</ColumnNumber>
- <TopLine>8</TopLine>
+ <TopLine>13</TopLine>
<CurrentLine>47</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
@@ -1920,7 +1920,7 @@
<Doc>
<Name>../BSP/Algorithm/pid.h</Name>
<ColumnNumber>13</ColumnNumber>
- <TopLine>21</TopLine>
+ <TopLine>16</TopLine>
<CurrentLine>39</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
diff --git a/Standard_robot/MDK-ARM/Standard_robot/Standard_robot.hex b/Standard_robot/MDK-ARM/Standard_robot/Standard_robot.hex
index 2fa347e..b84195b 100644
--- a/Standard_robot/MDK-ARM/Standard_robot/Standard_robot.hex
+++ b/Standard_robot/MDK-ARM/Standard_robot/Standard_robot.hex
@@ -101,7 +101,7 @@
:100630001C464FF00043524263EB0403994208BF4B
:10064000904230BD064C074D06E0E06840F00103E3
:1006500094E8070098471034AC42F6D3FFF7AAFDA0
-:100660005447000874470008202A06DBCB17203ABD
+:100660005847000878470008202A06DBCB17203AB5
:1006700041FA02F043EAE07306E041FA02F3D040A7
:10068000C2F12002914008431946704710B5141E6C
:1006900073F1000408DA401C41F1000192185B413B
@@ -138,7 +138,7 @@
:10088000014800F0C6BA0000F8000020014800F05E
:100890000DBD0000F801002001681823CAB2103A0B
:1008A000B2FBF3F2054B6FF30901032A9B5CC365AE
-:1008B00000D9091D81650846704700004A470008B5
+:1008B00000D9091D81650846704700004E470008B1
:1008C00010B5014600208B698A6A4FF0C07453B19D
:1008D000B3F5005F15D072B1012A0CD0022A0AD0FC
:1008E000032A09D104E01AB1012A06D0022A03D151
@@ -283,8 +283,8 @@
:101190001146142000F038FB142000F027FB06B0A5
:1011A00010BD00000064004040380240000C0240C6
:1011B0007047000010B5016888B0D1F8B011124A2C
-:1011C000490D00910168114C91420FD10099A1F293
-:1011D000052107290AD22288C9B2521C22800C4A52
+:1011C000490D00910168114C91420FD10099A1F590
+:1011D000017107290AD22288C9B2521C22800C4A06
:1011E00002EBC1036A460021FFF79FFD2088B0F59E
:1011F000FA7F06D1002020800648016881F48041F2
:10120000016008B010BD000000640040080000202C
@@ -408,11 +408,11 @@
:10196000296920F4604040EAC100206000F038F8A6
:101970002168084AC1F30311515CC8400649086058
:1019800006480068FFF7FAFE0020C4E7003C02406A
-:1019900008380240BE3E000804000020100000206D
+:1019900008380240C23E0008040000201000002069
:1019A0000448054900680968044AC1F38221515C72
-:1019B000C84070470400002008380240CE3E0008AE
+:1019B000C84070470400002008380240D23E0008AA
:1019C0000448054900680968044AC1F34231515C82
-:1019D000C84070470400002008380240CE3E00088E
+:1019D000C84070470400002008380240D23E00088A
:1019E000154810B5006810F00C02144813D01449C3
:1019F000042A0FD0082A0ED10F4C241F2268236816
:101A000002F03F025B0207D52068C0F38810A0FBFC
@@ -897,7 +897,7 @@
:1037F0001E469046C80301D5302700E020278804E4
:1038000004D505E041463846B0476D1C641EF9D525
:103810002846BDE8F0810A68531C0B6010707047A1
-:10382000401F044AC0B202EBC00002680A60406850
+:10382000001F044AC0B202EBC00002680A60406890
:10383000486070475806002038B5C0B2049C009418
:1038400000F002F838BD000030B589B00C9C28B3F8
:1038500040F2FF100290002008250490CDE90505F4
@@ -911,7 +911,7 @@
:1038D000A7FC02210248FDF72BF90BB000BD000048
:1038E000F800002090ED120ABDEEC00A10EE100A9A
:1038F00000B270471CB5044600886946FFF790FF88
-:1039000001219DF802300DA2084600F0EFF9A07BDE
+:1039000001219DF802300DA2084600F0F1F9A07BDC
:10391000012801D000201CBDBDF8000040BAE080A5
:10392000BDF8020040BA2081BDF8040040BA6081B1
:103930009DF80600207301201CBD000056616C3A02
@@ -920,229 +920,229 @@
:1039600010BD00000A0000200004024008B5FDF769
:10397000EBFEFFF71FF8FEF72DFEFEF715FEFEF734
:103980007FFFFEF7BBFDFEF7EDFEFEF7E9FDFEF75C
-:103990000DFF01223C213C48FDF7C3FE00F014F965
-:1039A000002000F0CDF800F099F800F0C3F90022F3
-:1039B0004FF480713548FDF7B4FE0A20FDF7B0FDE5
-:1039C000002000F0BDF800F0B5F93148FFF76CFFBA
-:1039D000304C01200025A0732571608040F2052045
-:1039E0002D4E20802B48FFF785FFFFF7ABFF80B1FE
-:1039F00094ED120ADFED290A294930EE200A10EE73
-:103A0000100A84ED120A884203DD9FED260A84ED38
-:103A1000120A012124A2084600F068F9B4F9063020
-:103A200023A20121022000F061F9B4F9063024A29A
-:103A30000121032000F05AF9B4F9083023A2012132
-:103A4000042000F053F93088401C00B23080FA287E
-:103A500005D121483580416981F40061416100232D
-:103A60001A460C490120009500F0FEF9002309498F
-:103A70001A464C311846009500F0F6F900F05AF954
-:103A80000A20FDF74DFDADE7001C02400018024082
-:103A9000F8000020180000200000002000401C4614
-:103AA0000060EA4600000000474D3630323000002A
-:103AB0002020566F6C746167653A2025660000000F
-:103AC0002020416E676C653A2025660020205370E7
-:103AD0006565643A20256600001002402DE9F04734
-:103AE000002000F02DF8DFF8549000245FF000066D
-:103AF00009EBC60000EBD400002507784FFA86F8E2
-:103B0000380604EB050041B201D5012200E0002295
-:103B1000404600F035F878066D1C070EEDB2082D12
-:103B2000EED3761CF6B2802EE2D30834E4B2402CF9
-:103B3000DCD3BDE8F04700F0FDB800004A430008C0
-:103B4000F0B500210D4BFF260C46002201280FD0B6
-:103B500003EBC20580B16F5CC7F1FF076F54521CC5
-:103B6000D2B2802AF2D9491CC9B20829EDD3F0BDDE
-:103B700003EBC2056E54F2E76C54F0E758020020E4
-:103B800070B5802817D2002915DB3F2913DCCB172D
-:103B900001EB5375C5F3C70325F007050124094E52
-:103BA000491B8C4006EBC000012A05D0C15C022AEB
-:103BB00005D0A143C15470BDC15C2143FAE7614007
-:103BC000F8E700005802002070B5474D4FF48064BC
-:103BD000002221462846FDF7A4FD4FF4FA70FDF7B8
-:103BE0009FFC012221462846FDF79BFD0021AE20C7
-:103BF00000F024F90021084600F020F900211020EF
-:103C000000F01CF90021402000F018F9002181206B
-:103C100000F014F90021CF2000F010F90021A120BC
-:103C200000F00CF90021C82000F008F90021A620BE
-:103C300000F004F90021A82000F000F900213F2045
-:103C400000F0FCF80021D32000F0F8F8002108462D
-:103C500000F0F4F80021D52000F0F0F800218020D9
-:103C600000F0ECF80021D92000F0E8F80021F12064
-:103C700000F0E4F80021DA2000F0E0F80021122042
-:103C800000F0DCF80021DB2000F0D8F80021402013
-:103C900000F0D4F80021202000F0D0F8002102200C
-:103CA00000F0CCF800218D2000F0C8F8002114208D
-:103CB00000F0C4F80021A42000F0C0F80021A620E4
-:103CC00000F0BCF80021AF2000F0B8F80021AF20D0
-:103CD00000F0B4F80020FFF733FFBDE8704000218A
-:103CE000084600F041B80000000402400FB430B5AF
-:103CF000A1B00C46054680216846FCF7ABFA042DBE
-:103D000013D8142C11D8002C0FD027AA6846269956
-:103D1000FFF7F6F8C4F11500C0B200210DF800104D
-:103D20006A462146284600F071F821B030BC5DF8A3
-:103D300014FB000070B50B4E00242146002000F05B
-:103D400013F8002506EBC5000121005D00F076F8B0
-:103D50006D1CEDB2802DF5D3641CE4B2082CECD3BD
-:103D600070BD00005802002010B5801CC4B2B031F4
-:103D7000C8B2002100F062F8102040EA14100021BF
-:103D800000F05CF804F0F000BDE81040002100F005
-:103D900055B800002DE9F04F01EB410100EB400068
-:103DA00049068006040E203A4FEA1169D0B216493E
-:103DB00000EB4000A046002501EB800B00261BF81D
-:103DC00005704FFA89FA380601D5012200E0002279
-:103DD00061B25046FFF7D4FE7806641C070EE4B2C9
-:103DE000A4EB08000C2809D0761CF6B2082EEAD302
-:103DF0006D1CEDB20C2DE1D3BDE8F08F09F101008F
-:103E0000444600F0FF09F3E7D63E0008F0B5174638
-:103E10000C46064600250CE021463046FFF7BAFF67
-:103E2000641CE4B2142C02D90024761CF6B26D1C7A
-:103E3000EDB27A5D002AEFD1F0BD000013B508485D
-:103E40004FF4007309B1012200E000221946FDF78A
-:103E500068FC0A23012269460248FEF729F81CBDC6
-:103E600000040240200100202DE9F84F00252F46D4
-:103E70003E46DDF828B0994692463446804619B150
-:103E80000846FFF72FFD0446BAF1000002D0FFF705
-:103E900029FD0646B9F1000002D0FFF723FD0746D1
-:103EA000BBF1000002D0FFF71DFD05463B46324640
-:103EB000214640460095FFF7BFFCBDE8F88F0000A3
-:103EC00000000000000001020304060708090000CA
-:103ED00000000102030400000000000000000000D8
-:103EE0000000000000003F40000000000000000053
-:103EF0003000400030004000000009000BC03D00D1
-:103F00000BC03D00090018C024407FE022403180F2
-:103F10000000180024C01B000D8032400180038087
-:103F20001C4027401C80074000401000600000003B
-:103F30000000000000000000000000001F80204082
-:103F400040200000402020401F80000000000900A9
-:103F500006001F80060009000000040004003F80E6
-:103F600004000400000000100060000000000000D9
-:103F7000000004000400040004000400000000002D
-:103F800000400000000000000000002001C006000A
-:103F90003800400000001F802040204020401F804B
-:103FA0000000000010403FC000400000000018C0AA
-:103FB000214022402440184000001080204024402E
-:103FC00024401B80000002000D0011003FC0014092
-:103FD00000003C80244024402440238000001F80B7
-:103FE000244024403440038000003000200027C0DB
-:103FF0003800200000001B802440244024401B8007
-:1040000000001C0022C0224022401F80000000004F
-:1040100000000840000000000000000000000460F4
-:10402000000000000000000004000A0011002080D1
-:1040300040400900090009000900090000000000D3
-:104040004040208011000A00040018002000234096
-:104050002400180000001F802040274029401F40F6
-:104060000000004007C039000F0001C000402040A0
-:104070003FC0244024401B8000001F80204020407F
-:1040800020403080000020403FC0204020401F8062
-:10409000000020403FC024402E4030C0000020409F
-:1040A0003FC024402E00300000000F001080204050
-:1040B00022403380020020403FC0040004003FC083
-:1040C0002040204020403FC02040204000000060B1
-:1040D000202020203FC02000200020403FC024405E
-:1040E0000B0030C0204020403FC020400040004036
-:1040F00000C03FC03C0003C03C003FC00000204067
-:104100003FC00C4023003FC020001F8020402040C3
-:1041100020401F80000020403FC0244024001800A1
-:1041200000001F802140214020E01FA0000020400F
-:104130003FC02440260019C0004018C0244024403D
-:10414000224031800000300020403FC0204030003D
-:10415000000020003F80004000403F802000200001
-:104160003E0001C0070038002000380007C03C00B6
-:1041700007C038000000204039C0060039C0204088
-:1041800000002000384007C03840200000003040C8
-:1041900021C02640384020C00000000000007FE021
-:1041A000402040200000000070000C000380004010
-:1041B00000000000402040207FE0000000000000E0
-:1041C000200040002000000000000010001000103F
-:1041D000001000100010000000004000000000006F
-:1041E0000000000002800540054003C000402000A0
-:1041F0003FC00440044003800000000003800440EE
-:1042000004400640000000000380044024403FC0FA
-:10421000004000000380054005400340000000000E
-:1042200004401FC0244024402000000002E005504C
-:1042300005500650042020403FC00440040003C045
-:1042400000400000044027C00040000000000010B3
-:104250000010041027E00000000020403FC0014093
-:10426000070004C00440204020403FC00040004000
-:10427000000007C0040007C0040003C000000440A1
-:1042800007C00440040003C0004000000380044055
-:10429000044003800000041007F004500440038031
-:1042A0000000000003800440045007F000100440A8
-:1042B00007C0024004000400000000000640054062
-:1042C000054004C00000000004001F8004400040BE
-:1042D0000000040007800040044007C000400400C4
-:1042E000070004C0018006000400060001C00700AA
-:1042F00001C006000000044006C0010006C00440E2
-:1043000000000410071004E0018006000400000013
-:10431000044005C006400440000000000000040006
-:104320007BE040200000000000000000FFF00000E3
-:104330000000000040207BE004000000000040007E
-:10434000800040002000200040000000000000002D
+:103990000DFF01223C213D48FDF7C3FE00F016F962
+:1039A000002000F0CFF800F09BF800F0C5F90022ED
+:1039B0004FF480713648FDF7B4FE0A20FDF7B0FDE4
+:1039C000002000F0BFF800F0B7F93248FFF76CFFB5
+:1039D000314C01200025A0732571608040F2052044
+:1039E00020804FF4FA772D4EFFF7ACFF80B194EDB5
+:1039F000120ADFED2B0A2B4930EE200A10EE100AD6
+:103A000084ED120A884203DD9FED270A84ED120A35
+:103A10002148FFF76FFF012124A2084600F068F952
+:103A2000B4F9063023A20121022000F061F9B4F9B3
+:103A3000063024A20121032000F05AF93B4624A2BB
+:103A40000121042000F054F93088401C00B230807D
+:103A5000FA2805D121483580416981F4006141612E
+:103A600000231A460C490120009500F0FFF90023BD
+:103A700009491A464C311846009500F0F7F900F054
+:103A80005BF90A20FDF74CFDAEE70000001C024088
+:103A900000180240F800002018000020000000205C
+:103AA00000401C460060EA4600000000474D3630EA
+:103AB000323000002020566F6C746167653A202513
+:103AC000660000002020416E676C653A2025660084
+:103AD000202053706565643A20256600001002407E
+:103AE0002DE9F047002000F02DF8DFF85490002475
+:103AF0005FF0000609EBC60000EBD4000025077854
+:103B00004FFA86F8380604EB050041B201D50122D0
+:103B100000E00022404600F035F878066D1C070EE4
+:103B2000EDB2082DEED3761CF6B2802EE2D3083427
+:103B3000E4B2402CDCD3BDE8F04700F0FDB8000053
+:103B40004E430008F0B500210D4BFF260C46002225
+:103B500001280FD003EBC20580B16F5CC7F1FF07EE
+:103B60006F54521CD2B2802AF2D9491CC9B208291A
+:103B7000EDD3F0BD03EBC2056E54F2E76C54F0E7F1
+:103B80005802002070B5802817D2002915DB3F2984
+:103B900013DCCB1701EB5375C5F3C70325F00705FD
+:103BA0000124094E491B8C4006EBC000012A05D0B8
+:103BB000C15C022A05D0A143C15470BDC15C214340
+:103BC000FAE76140F8E700005802002070B5474D61
+:103BD0004FF48064002221462846FDF7A2FD4FF4F1
+:103BE000FA70FDF79DFC012221462846FDF799FD5C
+:103BF0000021AE2000F024F90021084600F020F951
+:103C00000021102000F01CF90021402000F018F9DC
+:103C10000021812000F014F90021CF2000F010F9DC
+:103C20000021A12000F00CF90021C82000F008F9C3
+:103C30000021A62000F004F90021A82000F000F9DE
+:103C400000213F2000F0FCF80021D32000F0F8F81C
+:103C50000021084600F0F4F80021D52000F0F0F82B
+:103C60000021802000F0ECF80021D92000F0E8F8D5
+:103C70000021F12000F0E4F80021DA2000F0E0F863
+:103C80000021122000F0DCF80021DB2000F0D8F841
+:103C90000021402000F0D4F80021202000F0D0F8CE
+:103CA0000021022000F0CCF800218D2000F0C8F89F
+:103CB0000021142000F0C4F80021A42000F0C0F876
+:103CC0000021A62000F0BCF80021AF2000F0B8F8D9
+:103CD0000021AF2000F0B4F80020FFF733FFBDE86B
+:103CE00070400021084600F041B800000004024086
+:103CF0000FB430B5A1B00C46054680216846FCF7EC
+:103D0000A9FA042D13D8142C11D8002C0FD027AAEF
+:103D100068462699FFF7F4F8C4F11500C0B20021F7
+:103D20000DF800106A462146284600F071F821B0CF
+:103D300030BC5DF814FB000070B50B4E002421462A
+:103D4000002000F013F8002506EBC5000121005DFE
+:103D500000F076F86D1CEDB2802DF5D3641CE4B252
+:103D6000082CECD370BD00005802002010B5801C58
+:103D7000C4B2B031C8B2002100F062F8102040EAAD
+:103D80001410002100F05CF804F0F000BDE81040D1
+:103D9000002100F055B800002DE9F04F01EB410182
+:103DA00000EB400049068006040E203A4FEA1169F4
+:103DB000D0B2164900EB4000A046002501EB800B75
+:103DC00000261BF805704FFA89FA380601D5012242
+:103DD00000E0002261B25046FFF7D4FE7806641C72
+:103DE000070EE4B2A4EB08000C2809D0761CF6B24A
+:103DF000082EEAD36D1CEDB20C2DE1D3BDE8F08F97
+:103E000009F10100444600F0FF09F3E7DA3E00083B
+:103E1000F0B517460C46064600250CE02146304614
+:103E2000FFF7BAFF641CE4B2142C02D90024761CFC
+:103E3000F6B26D1CEDB27A5D002AEFD1F0BD000044
+:103E400013B508484FF4007309B1012200E00022C5
+:103E50001946FDF766FC0A23012269460248FEF76F
+:103E600027F81CBD00040240200100202DE9F84F76
+:103E700000252F463E46DDF828B099469246344646
+:103E8000804619B10846FFF72DFD0446BAF100003F
+:103E900002D0FFF727FD0646B9F1000002D0FFF778
+:103EA00021FD0746BBF1000002D0FFF71BFD0546D0
+:103EB0003B463246214640460095FFF7BDFCBDE833
+:103EC000F88F000000000000000001020304060754
+:103ED00008090000000001020304000000000000C7
+:103EE000000000000000000000003F400000000053
+:103EF00000000000300040003000400000000900D9
+:103F00000BC03D000BC03D00090018C024407FE0FD
+:103F1000224031800000180024C01B000D80324078
+:103F2000018003801C4027401C8007400040100097
+:103F30006000000000000000000000000000000021
+:103F40001F80204040200000402020401F800000B3
+:103F50000000090006001F800600090000000400A0
+:103F600004003F8004000400000000100060000016
+:103F7000000000000000040004000400040004002D
+:103F800000000000004000000000000000000020D1
+:103F900001C006003800400000001F802040204083
+:103FA00020401F800000000010403FC00040000083
+:103FB000000018C02140224024401840000010801A
+:103FC0002040244024401B80000002000D0011000E
+:103FD0003FC0014000003C80244024402440238016
+:103FE00000001F8024402440344003800000300043
+:103FF000200027C03800200000001B8024402440FF
+:1040000024401B8000001C0022C0224022401F8050
+:104010000000000000000840000000000000000058
+:1040200000000460000000000000000004000A001E
+:104030001100208040400900090009000900090022
+:10404000000000004040208011000A000400180019
+:10405000200023402400180000001F80204027403B
+:1040600029401F400000004007C039000F0001C078
+:10407000004020403FC0244024401B8000001F809F
+:104080002040204020403080000020403FC02040A1
+:1040900020401F80000020403FC024402E4030C000
+:1040A000000020403FC024402E00300000000F00E0
+:1040B0001080204022403380020020403FC0040096
+:1040C00004003FC02040204020403FC0204020400E
+:1040D00000000060202020203FC020002000204061
+:1040E0003FC024400B0030C0204020403FC0204053
+:1040F0000040004000C03FC03C0003C03C003FC047
+:10410000000020403FC00C4023003FC020001F8023
+:104110002040204020401F80000020403FC024401D
+:104120002400180000001F802140214020E01FA033
+:10413000000020403FC02440260019C0004018C0A5
+:1041400024402440224031800000300020403FC005
+:1041500020403000000020003F80004000403F80B1
+:10416000200020003E0001C0070038002000380079
+:1041700007C03C0007C038000000204039C00600DE
+:1041800039C0204000002000384007C038402000DF
+:104190000000304021C02640384020C00000000010
+:1041A00000007FE0402040200000000070000C0074
+:1041B0000380004000000000402040207FE000001D
+:1041C000000000002000400020000000000000105F
+:1041D000001000100010001000100000000040004F
+:1041E000000000000000000002800540054003C000
+:1041F000004020003FC00440044003800000000055
+:104200000380044004400640000000000380044096
+:1042100024403FC0004000000380054005400340AB
+:104220000000000004401FC0244024402000000083
+:1042300002E0055005500650042020403FC00440D5
+:10424000040003C000400000044027C000400000FC
+:10425000000000100010041027E0000000002040C3
+:104260003FC00140070004C00440204020403FC040
+:1042700000400040000007C0040007C0040003C065
+:104280000000044007C00440040003C000400000D8
+:1042900003800440044003800000041007F0045031
+:1042A000044003800000000003800440045007F035
+:1042B0000010044007C00240040004000000000099
+:1042C00006400540054004C00000000004001F80B7
+:1042D000044000400000040007800040044007C084
+:1042E00000400400070004C001800600040006002E
+:1042F00001C0070001C006000000044006C0010024
+:1043000006C0044000000410071004E0018006000D
+:1043100004000000044005C0064004400000000006
+:10432000000004007BE040200000000000000000CE
+:10433000FFF000000000000040207BE004000000CF
+:1043400000004000800040002000200040000000ED
:10435000000000000000000000000000000000005D
:10436000000000000000000000000000000000004D
:10437000000000000000000000000000000000003D
:10438000000000000000000000000000000000002D
-:104390000006000000000000001E000000000000F9
-:1043A00000DE00000000000000D800000000000057
-:1043B00000D800000000000000D80000000000004D
-:1043C00000DE00000000000000FE00000000000011
-:1043D00000F6000000000000007200000000000075
-:1043E0000000000000000000007C00000000000051
-:1043F00000FE00000000000000C6000000000000F9
-:1044000000C600000000000000C600000000000020
-:1044100000FE000000000000007C00000000000022
-:104420000000000000000000001E0000000000006E
-:1044300000DE00000000000000D6000000000000C8
-:1044400000D600000000000000D6000000000000C0
-:1044500000D600000000000000DE40000000000068
-:1044600000FE600000000010006C700000000030D2
-:1044700000007800000000F0007C7C00000007F0E5
-:1044800000FE7E0000003FF000C67F000001FFF04C
-:1044900000C67F80000FFFF000C67FC0007FFFF0E6
-:1044A00000FE7FE003FFFFF0007C7FF03FFFFFF0A6
-:1044B00000027FF83FFFFFF000067FFC3FFFFFF0A8
-:1044C000001E7FFE3FFFFFF000BC7FFF3FFFFFF0BD
-:1044D00000E07FFFBFFFFF8000F87FFFFFFFFC00D1
-:1044E000003E7FFFFFFFE000000E7FFFFFFF0000A8
-:1044F00000B87FFFFFF8000000E07FFFFFF0000042
-:1045000000FE7FFFFFF00000001E7FFFFFF00000B5
-:1045100000027FFFFFF0000000007FEFFFF00200CD
-:1045200000067FE7FFF00200000E7FE3FFF00200CD
-:10453000001C7FE1FFF8030000BA7FE0FFFC0300EE
-:1045400000F67FE07FFE038000E67FE03FFF038010
-:1045500000F67FE03FFF83C0003E7FE03FFFC3C027
-:10456000000E7FE03FFFE3E000027FE03FFFF3E06B
-:1045700000007FE03FFFFBF000027FE03FFFFFF025
-:1045800000667FE03FFFFFF800F67FE03FFFFFF8A7
-:1045900000D67FE03FFFFFFC00D67FF07FFFFFFCEF
-:1045A00000D67FF8FFF7FFFE00D67FFFFFF3FFFE88
-:1045B00000DE3FFFFFE1FFFF008C3FFFFFE0FFCF8A
-:1045C00000401FFFFFC07FC780C01FFFFFC03FC369
-:1045D00080C00FFFFF801FC1C0FE07FFFF000FC09C
-:1045E000C0FE03FFFE0007C060C001FFFC0003C067
-:1045F00020C0007FF00001C00086000F800000C0D6
-:10460000001600000000004000D60000000000007E
-:1046100000D600000000000000D6000000000000EE
-:1046200000D600000000000000D6000000000000DE
-:1046300000D000000000000000C0000000000000EA
-:104640000006000000000000001E00000000000046
-:1046500000DE00000000000000D8000000000000A4
-:1046600000D800000000000000D80000000000009A
-:1046700000DE00000000000000DE0000000000007E
-:1046800000F60000000000000072000000000000C2
-:1046900000000000000000000062000000000000B8
-:1046A00000F600000000000000F60000000000001E
-:1046B00000D600000000000000D60000000000004E
-:1046C00000D600000000000000DE00000000000036
-:1046D000008C00000000000000000000000000004E
+:10439000000000000006000000000000001E0000F9
+:1043A0000000000000DE00000000000000D8000057
+:1043B0000000000000D800000000000000D800004D
+:1043C0000000000000DE00000000000000FE000011
+:1043D0000000000000F60000000000000072000075
+:1043E000000000000000000000000000007C000051
+:1043F0000000000000FE00000000000000C60000F9
+:104400000000000000C600000000000000C6000020
+:104410000000000000FE000000000000007C000022
+:10442000000000000000000000000000001E00006E
+:104430000000000000DE00000000000000D60000C8
+:104440000000000000D600000000000000D60000C0
+:104450000000000000D600000000000000DE400068
+:104460000000000000FE600000000010006C700002
+:104470000000003000007800000000F0007C7C00AC
+:10448000000007F000FE7E0000003FF000C67F0045
+:104490000001FFF000C67F80000FFFF000C67FC064
+:1044A000007FFFF000FE7FE003FFFFF0007C7FF065
+:1044B0003FFFFFF000027FF83FFFFFF000067FFCA8
+:1044C0003FFFFFF0001E7FFE3FFFFFF000BC7FFFBD
+:1044D0003FFFFFF000E07FFFBFFFFF8000F87FFF9E
+:1044E000FFFFFC00003E7FFFFFFFE000000E7FFFAC
+:1044F000FFFF000000B87FFFFFF8000000E07FFF33
+:10450000FFF0000000FE7FFFFFF00000001E7FFFB5
+:10451000FFF0000000027FFFFFF0000000007FEFCF
+:10452000FFF0020000067FE7FFF00200000E7FE3CD
+:10453000FFF00200001C7FE1FFF8030000BA7FE0FB
+:10454000FFFC030000F67FE07FFE038000E67FE0D3
+:104550003FFF038000F67FE03FFF83C0003E7FE027
+:104560003FFFC3C0000E7FE03FFFE3E000027FE0BB
+:104570003FFFF3E000007FE03FFFFBF000027FE041
+:104580003FFFFFF000667FE03FFFFFF800F67FE0AF
+:104590003FFFFFF800D67FE03FFFFFFC00D67FF033
+:1045A0007FFFFFFC00D67FF8FFF7FFFE00D67FFFFE
+:1045B000FFF3FFFE00DE3FFFFFE1FFFF008C3FFF48
+:1045C000FFE0FFCF00401FFFFFC07FC780C01FFF7D
+:1045D000FFC03FC380C00FFFFF801FC1C0FE07FFA9
+:1045E000FF000FC0C0FE03FFFE0007C060C001FF58
+:1045F000FC0003C020C0007FF00001C00086000F57
+:10460000800000C0001600000000004000D600003E
+:104610000000000000D600000000000000D60000EE
+:104620000000000000D600000000000000D60000DE
+:104630000000000000D000000000000000C00000EA
+:10464000000000000006000000000000001E000046
+:104650000000000000DE00000000000000D80000A4
+:104660000000000000D800000000000000D800009A
+:104670000000000000DE00000000000000DE00007E
+:104680000000000000F600000000000000720000C2
+:1046900000000000000000000000000000620000B8
+:1046A0000000000000F600000000000000F600001E
+:1046B0000000000000D600000000000000D600004E
+:1046C0000000000000D600000000000000DE000036
+:1046D00000000000008C000000000000000000004E
:1046E00000000000000000000000000000000000CA
:1046F00000000000000000000000000000000000BA
:1047000000000000000000000000000000000000A9
:104710000000000000000000000000000000000099
:104720000000000000000000000000000000000089
:104730000000000000000000000000000000000079
-:104740000000000000000000000000061016000637
-:104750001016000074470008000000201800000038
-:10476000442F00088C47000818000020780A000039
-:10477000542F0008000000000024F4000000000096
-:0C4780000100000010000000000000001C
+:104740000000000000000000000000000000000663
+:104750001016000610160000784700080000002020
+:1047600018000000442F000890470008180000209F
+:10477000780A0000542F0008000000000024F40014
+:104780000000000001000000100000000000000018
:04000005080001AD41
:00000001FF
diff --git a/Standard_robot/Src/main.c b/Standard_robot/Src/main.c
index c5c827b..fe985f0 100644
--- a/Standard_robot/Src/main.c
+++ b/Standard_robot/Src/main.c
@@ -147,7 +147,7 @@ int main(void)
/* USER CODE END WHILE */
/* USER CODE BEGIN 3 */
- get_motor_data(&gm6020);
+
/* scan is key be pressd down to change target speed and pwm pulse */
if (key_scan())
@@ -158,11 +158,11 @@ int main(void)
gm6020.voltage = 0;
}
}
-
+ get_motor_data(&gm6020);
oled_printf(1, 1, "GM6020");
oled_printf(2, 1," Voltage: %f", gm6020.info.GM6020_info.angle);
oled_printf(3, 1," Angle: %f", gm6020.info.GM6020_info.angle);
- oled_printf(4, 1," Speed: %f", gm6020.info.GM6020_info.speed);
+ oled_printf(4, 1," Speed: %f", 500);
/* led blink */
led_cnt ++;
--
GitLab