新底盘
This commit is contained in:
commit
17bb7459b6
3
MDK-ARM/.vscode/keil-assistant.log
vendored
3
MDK-ARM/.vscode/keil-assistant.log
vendored
@ -8,5 +8,8 @@
|
|||||||
|
|
||||||
[info] Log at : 2025/10/19|16:41:15|GMT+0800
|
[info] Log at : 2025/10/19|16:41:15|GMT+0800
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
[info] Log at : 2025/10/19|16:44:00|GMT+0800
|
[info] Log at : 2025/10/19|16:44:00|GMT+0800
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> fc2ac5c99d3c57c83c4929b0969c6dc753eef3ac
|
||||||
|
|||||||
@ -11,17 +11,21 @@
|
|||||||
<View>
|
<View>
|
||||||
<WinId>38003</WinId>
|
<WinId>38003</WinId>
|
||||||
<ViewName>Registers</ViewName>
|
<ViewName>Registers</ViewName>
|
||||||
|
<<<<<<< HEAD
|
||||||
<TableColWidths>115 121</TableColWidths>
|
<TableColWidths>115 121</TableColWidths>
|
||||||
|
=======
|
||||||
|
<TableColWidths>115 100</TableColWidths>
|
||||||
|
>>>>>>> fc2ac5c99d3c57c83c4929b0969c6dc753eef3ac
|
||||||
</View>
|
</View>
|
||||||
<View>
|
<View>
|
||||||
<WinId>346</WinId>
|
<WinId>346</WinId>
|
||||||
<ViewName>Code Coverage</ViewName>
|
<ViewName>Code Coverage</ViewName>
|
||||||
<TableColWidths>770 160</TableColWidths>
|
<TableColWidths>770 539</TableColWidths>
|
||||||
</View>
|
</View>
|
||||||
<View>
|
<View>
|
||||||
<WinId>204</WinId>
|
<WinId>204</WinId>
|
||||||
<ViewName>Performance Analyzer</ViewName>
|
<ViewName>Performance Analyzer</ViewName>
|
||||||
<TableColWidths>930</TableColWidths>
|
<TableColWidths>930 139 139 101</TableColWidths>
|
||||||
</View>
|
</View>
|
||||||
</SECTreeCtrl>
|
</SECTreeCtrl>
|
||||||
|
|
||||||
@ -42,7 +46,7 @@
|
|||||||
<WinId>1937</WinId>
|
<WinId>1937</WinId>
|
||||||
<ViewName>Watch 2</ViewName>
|
<ViewName>Watch 2</ViewName>
|
||||||
<UserString></UserString>
|
<UserString></UserString>
|
||||||
<TableColWidths>64 64 64</TableColWidths>
|
<TableColWidths>170 64 64</TableColWidths>
|
||||||
</View>
|
</View>
|
||||||
<View>
|
<View>
|
||||||
<WinId>1935</WinId>
|
<WinId>1935</WinId>
|
||||||
@ -100,8 +104,13 @@
|
|||||||
<MDIClientArea>
|
<MDIClientArea>
|
||||||
<RegID>0</RegID>
|
<RegID>0</RegID>
|
||||||
<MDITabState>
|
<MDITabState>
|
||||||
|
<<<<<<< HEAD
|
||||||
<Len>1216</Len>
|
<Len>1216</Len>
|
||||||
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000D000000010000000100000030433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C7461736B5C746573742E630000000006746573742E6300000000FFDC7800FFFFFFFF35433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C6D6F64756C655C636861737369732E630000000009636861737369732E6300000000BECEA100FFFFFFFF34433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C6D6F64756C655C636F6E6669672E630000000008636F6E6669672E6300000000F0A0A100FFFFFFFF34433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C6D6F64756C655C636F6E6669672E680000000008636F6E6669672E6800000000BCA8E100FFFFFFFF30433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C7461736B5C696E69742E630000000006696E69742E63000000009CC1B600FFFFFFFF35433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C6D6F64756C655C636861737369732E680000000009636861737369732E6800000000F7B88600FFFFFFFF36433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C6465766963655C6D6F746F725F726D2E63000000000A6D6F746F725F726D2E6300000000D9ADC200FFFFFFFF3A433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C636F6D706F6E656E745C757365725F6D6174682E68000000000B757365725F6D6174682E6800000000A5C2D700FFFFFFFF3A433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C636F6D706F6E656E745C757365725F6D6174682E63000000000B757365725F6D6174682E6300000000B3A6BE00FFFFFFFF3D433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C4D444B2D41524D5C737461727475705F73746D33326634303778782E730000000015737461727475705F73746D33326634303778782E7300000000EAD6A300FFFFFFFF2F433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000F6FA7D00FFFFFFFF35433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C7461736B5C79616F6B6F6E6771692E63000000000B79616F6B6F6E6771692E6300000000B5E99D00FFFFFFFF34433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C636F6D706F6E656E745C7069642E6300000000057069642E63000000005FC3CF00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000FA000000660000000006000029030000</Data>
|
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000D000000010000000100000030433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C7461736B5C746573742E630000000006746573742E6300000000FFDC7800FFFFFFFF35433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C6D6F64756C655C636861737369732E630000000009636861737369732E6300000000BECEA100FFFFFFFF34433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C6D6F64756C655C636F6E6669672E630000000008636F6E6669672E6300000000F0A0A100FFFFFFFF34433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C6D6F64756C655C636F6E6669672E680000000008636F6E6669672E6800000000BCA8E100FFFFFFFF30433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C7461736B5C696E69742E630000000006696E69742E63000000009CC1B600FFFFFFFF35433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C6D6F64756C655C636861737369732E680000000009636861737369732E6800000000F7B88600FFFFFFFF36433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C6465766963655C6D6F746F725F726D2E63000000000A6D6F746F725F726D2E6300000000D9ADC200FFFFFFFF3A433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C636F6D706F6E656E745C757365725F6D6174682E68000000000B757365725F6D6174682E6800000000A5C2D700FFFFFFFF3A433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C636F6D706F6E656E745C757365725F6D6174682E63000000000B757365725F6D6174682E6300000000B3A6BE00FFFFFFFF3D433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C4D444B2D41524D5C737461727475705F73746D33326634303778782E730000000015737461727475705F73746D33326634303778782E7300000000EAD6A300FFFFFFFF2F433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000F6FA7D00FFFFFFFF35433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C7461736B5C79616F6B6F6E6771692E63000000000B79616F6B6F6E6771692E6300000000B5E99D00FFFFFFFF34433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C636F6D706F6E656E745C7069642E6300000000057069642E63000000005FC3CF00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000FA000000660000000006000029030000</Data>
|
||||||
|
=======
|
||||||
|
<Len>1141</Len>
|
||||||
|
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000C0000000A0000000100000030433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C7461736B5C746573742E630000000006746573742E6300000000FFDC7800FFFFFFFF35433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C6D6F64756C655C636861737369732E630000000009636861737369732E6300000000BECEA100FFFFFFFF34433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C6D6F64756C655C636F6E6669672E630000000008636F6E6669672E6300000000F0A0A100FFFFFFFF34433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C6D6F64756C655C636F6E6669672E680000000008636F6E6669672E6800000000BCA8E100FFFFFFFF30433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C7461736B5C696E69742E630000000006696E69742E63000000009CC1B600FFFFFFFF35433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C6D6F64756C655C636861737369732E680000000009636861737369732E6800000000F7B88600FFFFFFFF36433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C6465766963655C6D6F746F725F726D2E63000000000A6D6F746F725F726D2E6300000000D9ADC200FFFFFFFF3A433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C636F6D706F6E656E745C757365725F6D6174682E68000000000B757365725F6D6174682E6800000000A5C2D700FFFFFFFF3A433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C636F6D706F6E656E745C757365725F6D6174682E63000000000B757365725F6D6174682E6300000000B3A6BE00FFFFFFFF3D433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C4D444B2D41524D5C737461727475705F73746D33326634303778782E730000000015737461727475705F73746D33326634303778782E7300000000EAD6A300FFFFFFFF2F433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000F6FA7D00FFFFFFFF35433A5C55736572735CD5C5D0DED2D55C4465736B746F705C636861737369735C557365725C7461736B5C79616F6B6F6E6771692E63000000000B79616F6B6F6E6771692E6300000000B5E99D00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F40000006600000000060000D8020000</Data>
|
||||||
|
>>>>>>> fc2ac5c99d3c57c83c4929b0969c6dc753eef3ac
|
||||||
</MDITabState>
|
</MDITabState>
|
||||||
</MDIClientArea>
|
</MDIClientArea>
|
||||||
<ViewEx>
|
<ViewEx>
|
||||||
@ -1755,8 +1764,13 @@
|
|||||||
<RegID>59392</RegID>
|
<RegID>59392</RegID>
|
||||||
<Name>File</Name>
|
<Name>File</Name>
|
||||||
<Buttons>
|
<Buttons>
|
||||||
|
<<<<<<< HEAD
|
||||||
<Len>2297</Len>
|
<Len>2297</Len>
|
||||||
<Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000B4D697865725F4170706C7996000000000000001400085049445F43616C6308736574706F696E740B4D697865725F4170706C7904373030300D436861737369735F494D555F740B5553415254335F4952514810436861737369735F506172616D735F740F47696D62616C5F506172616D735F740C4D6F7665566563746F725F74124D4F544F525F444D5F5365744F75747075740C726D5F6D6F746F725F79617706646D5F7069740B5363616C6553756D546F31065363616C6553055363616C650B5363616C6553756D546F6C026662096D6F746F725F72706D04524D5F4302524D0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000</Data>
|
<Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000B4D697865725F4170706C7996000000000000001400085049445F43616C6308736574706F696E740B4D697865725F4170706C7904373030300D436861737369735F494D555F740B5553415254335F4952514810436861737369735F506172616D735F740F47696D62616C5F506172616D735F740C4D6F7665566563746F725F74124D4F544F525F444D5F5365744F75747075740C726D5F6D6F746F725F79617706646D5F7069740B5363616C6553756D546F31065363616C6553055363616C650B5363616C6553756D546F6C026662096D6F746F725F72706D04524D5F4302524D0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000</Data>
|
||||||
|
=======
|
||||||
|
<Len>2320</Len>
|
||||||
|
<Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000C4D6F7665566563746F725F74960000000000000014000C4D6F7665566563746F725F74124D4F544F525F444D5F5365744F75747075740C726D5F6D6F746F725F79617706646D5F7069740B5363616C6553756D546F31065363616C6553055363616C650B5363616C6553756D546F6C085049445F43616C63026662096D6F746F725F72706D04524D5F4302524D115553415254335F49525148616E646C65720B436861737369735F636D6412495744475F52656C6F6164436F756E74657210436861737369735F4F75747075745F7409666F725F73686F6F740B6D6F746F725F706172616D124D4F544F525F524D5F5365744F75747075740000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000</Data>
|
||||||
|
>>>>>>> fc2ac5c99d3c57c83c4929b0969c6dc753eef3ac
|
||||||
</Buttons>
|
</Buttons>
|
||||||
<OriginalItems>
|
<OriginalItems>
|
||||||
<Len>1423</Len>
|
<Len>1423</Len>
|
||||||
@ -1772,7 +1786,7 @@
|
|||||||
<Name>Build</Name>
|
<Name>Build</Name>
|
||||||
<Buttons>
|
<Buttons>
|
||||||
<Len>672</Len>
|
<Len>672</Len>
|
||||||
<Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E00000000000000000000000000000000010000000100000001809E8A0000000000001F0000000000000000000000000000000001000000010000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000000000000000000000000000000000000000000100000001000000960000000300205000000000057A7A7A7A6896000000000000000100057A7A7A7A68000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64CF010000</Data>
|
<Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000002001D000000000000000000000000000000000100000001000000018030800000000000001E00000000000000000000000000000000010000000100000001809E8A0000000000001F0000000000000000000000000000000001000000010000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000000000000000000000000000000000000000000100000001000000960000000300205000000000057A7A7A7A6896000000000000000100057A7A7A7A68000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64CF010000</Data>
|
||||||
</Buttons>
|
</Buttons>
|
||||||
<OriginalItems>
|
<OriginalItems>
|
||||||
<Len>583</Len>
|
<Len>583</Len>
|
||||||
@ -3456,8 +3470,13 @@
|
|||||||
<RegID>59392</RegID>
|
<RegID>59392</RegID>
|
||||||
<Name>File</Name>
|
<Name>File</Name>
|
||||||
<Buttons>
|
<Buttons>
|
||||||
|
<<<<<<< HEAD
|
||||||
<Len>2323</Len>
|
<Len>2323</Len>
|
||||||
<Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000B5553415254335F49525148960000000000000014000B5553415254335F4952514810436861737369735F506172616D735F740F47696D62616C5F506172616D735F740C4D6F7665566563746F725F74124D4F544F525F444D5F5365744F75747075740C726D5F6D6F746F725F79617706646D5F7069740B5363616C6553756D546F31065363616C6553055363616C650B5363616C6553756D546F6C085049445F43616C63026662096D6F746F725F72706D04524D5F4302524D115553415254335F49525148616E646C65720B436861737369735F636D6412495744475F52656C6F6164436F756E74657210436861737369735F4F75747075745F740000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020003001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000</Data>
|
<Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000B5553415254335F49525148960000000000000014000B5553415254335F4952514810436861737369735F506172616D735F740F47696D62616C5F506172616D735F740C4D6F7665566563746F725F74124D4F544F525F444D5F5365744F75747075740C726D5F6D6F746F725F79617706646D5F7069740B5363616C6553756D546F31065363616C6553055363616C650B5363616C6553756D546F6C085049445F43616C63026662096D6F746F725F72706D04524D5F4302524D115553415254335F49525148616E646C65720B436861737369735F636D6412495744475F52656C6F6164436F756E74657210436861737369735F4F75747075745F740000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020003001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000</Data>
|
||||||
|
=======
|
||||||
|
<Len>2320</Len>
|
||||||
|
<Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000C4D6F7665566563746F725F74960000000000000014000C4D6F7665566563746F725F74124D4F544F525F444D5F5365744F75747075740C726D5F6D6F746F725F79617706646D5F7069740B5363616C6553756D546F31065363616C6553055363616C650B5363616C6553756D546F6C085049445F43616C63026662096D6F746F725F72706D04524D5F4302524D115553415254335F49525148616E646C65720B436861737369735F636D6412495744475F52656C6F6164436F756E74657210436861737369735F4F75747075745F7409666F725F73686F6F740B6D6F746F725F706172616D124D4F544F525F524D5F5365744F75747075740000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020001001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000</Data>
|
||||||
|
>>>>>>> fc2ac5c99d3c57c83c4929b0969c6dc753eef3ac
|
||||||
</Buttons>
|
</Buttons>
|
||||||
<OriginalItems>
|
<OriginalItems>
|
||||||
<Len>1423</Len>
|
<Len>1423</Len>
|
||||||
@ -3489,7 +3508,7 @@
|
|||||||
<Name>Debug</Name>
|
<Name>Debug</Name>
|
||||||
<Buttons>
|
<Buttons>
|
||||||
<Len>2362</Len>
|
<Len>2362</Len>
|
||||||
<Data>00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000020000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
|
<Data>00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000004002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000004002800000000000000000000000000000000010000000100000001801B80000000000400290000000000000000000000000000000001000000010000000180E57F0000000004002A00000000000000000000000000000000010000000100000001801C800000000004002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000004002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000020000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
|
||||||
</Buttons>
|
</Buttons>
|
||||||
<OriginalItems>
|
<OriginalItems>
|
||||||
<Len>898</Len>
|
<Len>898</Len>
|
||||||
@ -3513,30 +3532,48 @@
|
|||||||
<ActiveMDIGroup>0</ActiveMDIGroup>
|
<ActiveMDIGroup>0</ActiveMDIGroup>
|
||||||
<MDIGroup>
|
<MDIGroup>
|
||||||
<Size>100</Size>
|
<Size>100</Size>
|
||||||
<ActiveTab>1</ActiveTab>
|
<ActiveTab>10</ActiveTab>
|
||||||
<Doc>
|
<Doc>
|
||||||
<Name>..\User\task\test.c</Name>
|
<Name>..\User\task\test.c</Name>
|
||||||
|
<<<<<<< HEAD
|
||||||
<ColumnNumber>39</ColumnNumber>
|
<ColumnNumber>39</ColumnNumber>
|
||||||
<TopLine>91</TopLine>
|
<TopLine>91</TopLine>
|
||||||
<CurrentLine>121</CurrentLine>
|
<CurrentLine>121</CurrentLine>
|
||||||
|
=======
|
||||||
|
<ColumnNumber>25</ColumnNumber>
|
||||||
|
<TopLine>30</TopLine>
|
||||||
|
<CurrentLine>22</CurrentLine>
|
||||||
|
>>>>>>> fc2ac5c99d3c57c83c4929b0969c6dc753eef3ac
|
||||||
<Folding>1</Folding>
|
<Folding>1</Folding>
|
||||||
<ContractedFolders></ContractedFolders>
|
<ContractedFolders></ContractedFolders>
|
||||||
<PaneID>0</PaneID>
|
<PaneID>0</PaneID>
|
||||||
</Doc>
|
</Doc>
|
||||||
<Doc>
|
<Doc>
|
||||||
<Name>..\User\module\chassis.c</Name>
|
<Name>..\User\module\chassis.c</Name>
|
||||||
|
<<<<<<< HEAD
|
||||||
<ColumnNumber>34</ColumnNumber>
|
<ColumnNumber>34</ColumnNumber>
|
||||||
<TopLine>179</TopLine>
|
<TopLine>179</TopLine>
|
||||||
<CurrentLine>203</CurrentLine>
|
<CurrentLine>203</CurrentLine>
|
||||||
|
=======
|
||||||
|
<ColumnNumber>37</ColumnNumber>
|
||||||
|
<TopLine>115</TopLine>
|
||||||
|
<CurrentLine>142</CurrentLine>
|
||||||
|
>>>>>>> fc2ac5c99d3c57c83c4929b0969c6dc753eef3ac
|
||||||
<Folding>1</Folding>
|
<Folding>1</Folding>
|
||||||
<ContractedFolders></ContractedFolders>
|
<ContractedFolders></ContractedFolders>
|
||||||
<PaneID>0</PaneID>
|
<PaneID>0</PaneID>
|
||||||
</Doc>
|
</Doc>
|
||||||
<Doc>
|
<Doc>
|
||||||
<Name>..\User\module\config.c</Name>
|
<Name>..\User\module\config.c</Name>
|
||||||
|
<<<<<<< HEAD
|
||||||
<ColumnNumber>16</ColumnNumber>
|
<ColumnNumber>16</ColumnNumber>
|
||||||
<TopLine>40</TopLine>
|
<TopLine>40</TopLine>
|
||||||
<CurrentLine>71</CurrentLine>
|
<CurrentLine>71</CurrentLine>
|
||||||
|
=======
|
||||||
|
<ColumnNumber>2</ColumnNumber>
|
||||||
|
<TopLine>1</TopLine>
|
||||||
|
<CurrentLine>89</CurrentLine>
|
||||||
|
>>>>>>> fc2ac5c99d3c57c83c4929b0969c6dc753eef3ac
|
||||||
<Folding>1</Folding>
|
<Folding>1</Folding>
|
||||||
<ContractedFolders></ContractedFolders>
|
<ContractedFolders></ContractedFolders>
|
||||||
<PaneID>0</PaneID>
|
<PaneID>0</PaneID>
|
||||||
@ -3553,7 +3590,11 @@
|
|||||||
<Doc>
|
<Doc>
|
||||||
<Name>..\User\task\init.c</Name>
|
<Name>..\User\task\init.c</Name>
|
||||||
<ColumnNumber>0</ColumnNumber>
|
<ColumnNumber>0</ColumnNumber>
|
||||||
|
<<<<<<< HEAD
|
||||||
<TopLine>2</TopLine>
|
<TopLine>2</TopLine>
|
||||||
|
=======
|
||||||
|
<TopLine>1</TopLine>
|
||||||
|
>>>>>>> fc2ac5c99d3c57c83c4929b0969c6dc753eef3ac
|
||||||
<CurrentLine>41</CurrentLine>
|
<CurrentLine>41</CurrentLine>
|
||||||
<Folding>1</Folding>
|
<Folding>1</Folding>
|
||||||
<ContractedFolders></ContractedFolders>
|
<ContractedFolders></ContractedFolders>
|
||||||
@ -3561,9 +3602,15 @@
|
|||||||
</Doc>
|
</Doc>
|
||||||
<Doc>
|
<Doc>
|
||||||
<Name>..\User\module\chassis.h</Name>
|
<Name>..\User\module\chassis.h</Name>
|
||||||
|
<<<<<<< HEAD
|
||||||
<ColumnNumber>17</ColumnNumber>
|
<ColumnNumber>17</ColumnNumber>
|
||||||
<TopLine>102</TopLine>
|
<TopLine>102</TopLine>
|
||||||
<CurrentLine>134</CurrentLine>
|
<CurrentLine>134</CurrentLine>
|
||||||
|
=======
|
||||||
|
<ColumnNumber>18</ColumnNumber>
|
||||||
|
<TopLine>21</TopLine>
|
||||||
|
<CurrentLine>45</CurrentLine>
|
||||||
|
>>>>>>> fc2ac5c99d3c57c83c4929b0969c6dc753eef3ac
|
||||||
<Folding>1</Folding>
|
<Folding>1</Folding>
|
||||||
<ContractedFolders></ContractedFolders>
|
<ContractedFolders></ContractedFolders>
|
||||||
<PaneID>0</PaneID>
|
<PaneID>0</PaneID>
|
||||||
@ -3607,7 +3654,11 @@
|
|||||||
<Doc>
|
<Doc>
|
||||||
<Name>../Core/Src/main.c</Name>
|
<Name>../Core/Src/main.c</Name>
|
||||||
<ColumnNumber>0</ColumnNumber>
|
<ColumnNumber>0</ColumnNumber>
|
||||||
|
<<<<<<< HEAD
|
||||||
<TopLine>71</TopLine>
|
<TopLine>71</TopLine>
|
||||||
|
=======
|
||||||
|
<TopLine>63</TopLine>
|
||||||
|
>>>>>>> fc2ac5c99d3c57c83c4929b0969c6dc753eef3ac
|
||||||
<CurrentLine>72</CurrentLine>
|
<CurrentLine>72</CurrentLine>
|
||||||
<Folding>1</Folding>
|
<Folding>1</Folding>
|
||||||
<ContractedFolders></ContractedFolders>
|
<ContractedFolders></ContractedFolders>
|
||||||
@ -3615,6 +3666,7 @@
|
|||||||
</Doc>
|
</Doc>
|
||||||
<Doc>
|
<Doc>
|
||||||
<Name>..\User\task\yaokongqi.c</Name>
|
<Name>..\User\task\yaokongqi.c</Name>
|
||||||
|
<<<<<<< HEAD
|
||||||
<ColumnNumber>29</ColumnNumber>
|
<ColumnNumber>29</ColumnNumber>
|
||||||
<TopLine>21</TopLine>
|
<TopLine>21</TopLine>
|
||||||
<CurrentLine>50</CurrentLine>
|
<CurrentLine>50</CurrentLine>
|
||||||
@ -3627,6 +3679,11 @@
|
|||||||
<ColumnNumber>14</ColumnNumber>
|
<ColumnNumber>14</ColumnNumber>
|
||||||
<TopLine>34</TopLine>
|
<TopLine>34</TopLine>
|
||||||
<CurrentLine>61</CurrentLine>
|
<CurrentLine>61</CurrentLine>
|
||||||
|
=======
|
||||||
|
<ColumnNumber>80</ColumnNumber>
|
||||||
|
<TopLine>1</TopLine>
|
||||||
|
<CurrentLine>23</CurrentLine>
|
||||||
|
>>>>>>> fc2ac5c99d3c57c83c4929b0969c6dc753eef3ac
|
||||||
<Folding>1</Folding>
|
<Folding>1</Folding>
|
||||||
<ContractedFolders></ContractedFolders>
|
<ContractedFolders></ContractedFolders>
|
||||||
<PaneID>0</PaneID>
|
<PaneID>0</PaneID>
|
||||||
|
|||||||
@ -189,11 +189,14 @@
|
|||||||
<count>2</count>
|
<count>2</count>
|
||||||
<WinNumber>2</WinNumber>
|
<WinNumber>2</WinNumber>
|
||||||
<ItemText>dr16,0x0A</ItemText>
|
<ItemText>dr16,0x0A</ItemText>
|
||||||
|
<<<<<<< HEAD
|
||||||
</Ww>
|
</Ww>
|
||||||
<Ww>
|
<Ww>
|
||||||
<count>3</count>
|
<count>3</count>
|
||||||
<WinNumber>2</WinNumber>
|
<WinNumber>2</WinNumber>
|
||||||
<ItemText>chassis,0x0A</ItemText>
|
<ItemText>chassis,0x0A</ItemText>
|
||||||
|
=======
|
||||||
|
>>>>>>> fc2ac5c99d3c57c83c4929b0969c6dc753eef3ac
|
||||||
</Ww>
|
</Ww>
|
||||||
</WatchWindow2>
|
</WatchWindow2>
|
||||||
<Tracepoint>
|
<Tracepoint>
|
||||||
@ -202,7 +205,7 @@
|
|||||||
<DebugFlag>
|
<DebugFlag>
|
||||||
<trace>0</trace>
|
<trace>0</trace>
|
||||||
<periodic>1</periodic>
|
<periodic>1</periodic>
|
||||||
<aLwin>1</aLwin>
|
<aLwin>0</aLwin>
|
||||||
<aCover>0</aCover>
|
<aCover>0</aCover>
|
||||||
<aSer1>0</aSer1>
|
<aSer1>0</aSer1>
|
||||||
<aSer2>0</aSer2>
|
<aSer2>0</aSer2>
|
||||||
|
|||||||
@ -21,7 +21,11 @@ Target DLL: CMSIS_AGDI.dll V1.28.3.0
|
|||||||
Dialog DLL: TCM.DLL V1.32.0.0
|
Dialog DLL: TCM.DLL V1.32.0.0
|
||||||
|
|
||||||
<h2>Project:</h2>
|
<h2>Project:</h2>
|
||||||
|
<<<<<<< HEAD
|
||||||
C:\Users\ÕÅÐÞÒÕ\Desktop\chassis\MDK-ARM\zzzzh.uvprojx
|
C:\Users\ÕÅÐÞÒÕ\Desktop\chassis\MDK-ARM\zzzzh.uvprojx
|
||||||
|
=======
|
||||||
|
c:\Users\ÕÅÐÞÒÕ\Desktop\chassis\MDK-ARM\zzzzh.uvprojx
|
||||||
|
>>>>>>> fc2ac5c99d3c57c83c4929b0969c6dc753eef3ac
|
||||||
Project File Date: 10/19/2025
|
Project File Date: 10/19/2025
|
||||||
|
|
||||||
<h2>Output:</h2>
|
<h2>Output:</h2>
|
||||||
@ -50,7 +54,7 @@ Package Vendor: Keil
|
|||||||
<h2>Collection of Component Files used:</h2>
|
<h2>Collection of Component Files used:</h2>
|
||||||
|
|
||||||
* Component: ARM::CMSIS:CORE:5.0.1
|
* Component: ARM::CMSIS:CORE:5.0.1
|
||||||
Build Time Elapsed: 00:00:02
|
Build Time Elapsed: 00:00:05
|
||||||
</pre>
|
</pre>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -2025,7 +2025,11 @@ I (..\User\component\ahrs.h)(0x68EE5C62)
|
|||||||
I (..\User\device\motor_rm.h)(0x68EE5C18)
|
I (..\User\device\motor_rm.h)(0x68EE5C18)
|
||||||
I (..\User\device\motor.h)(0x68EE5C18)
|
I (..\User\device\motor.h)(0x68EE5C18)
|
||||||
I (..\User\device\device.h)(0x68EE5C63)
|
I (..\User\device\device.h)(0x68EE5C63)
|
||||||
|
<<<<<<< HEAD
|
||||||
F (..\User\module\chassis.c)(0x68F647A9)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -c
-fno-rtti -funsigned-char -fshort-enums -fshort-wchar
-D__MICROLIB -gdwarf-3 -O3 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Middlewares/Third_Party/FreeRTOS/Source/include -I ../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2 -I ../Middlewares/Third_Party/FreeRTOS/Source/portable/RVDS/ARM_CM4F -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../User
-I./RTE/_zzzzh
-ID:/keil/ARM/PACK/ARM/CMSIS/5.0.1/CMSIS/Include
-ID:/keil/ARM/PACK/Keil/STM32F4xx_DFP/2.14.0/Drivers/CMSIS/Device/ST/STM32F4xx/Include
-D__UVISION_VERSION="524" -D_RTE_ -DSTM32F407xx -DUSE_HAL_DRIVER -DSTM32F407xx
-o zzzzh/chassis.o -MD)
|
F (..\User\module\chassis.c)(0x68F647A9)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -c
-fno-rtti -funsigned-char -fshort-enums -fshort-wchar
-D__MICROLIB -gdwarf-3 -O3 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Middlewares/Third_Party/FreeRTOS/Source/include -I ../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2 -I ../Middlewares/Third_Party/FreeRTOS/Source/portable/RVDS/ARM_CM4F -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../User
-I./RTE/_zzzzh
-ID:/keil/ARM/PACK/ARM/CMSIS/5.0.1/CMSIS/Include
-ID:/keil/ARM/PACK/Keil/STM32F4xx_DFP/2.14.0/Drivers/CMSIS/Device/ST/STM32F4xx/Include
-D__UVISION_VERSION="524" -D_RTE_ -DSTM32F407xx -DUSE_HAL_DRIVER -DSTM32F407xx
-o zzzzh/chassis.o -MD)
|
||||||
|
=======
|
||||||
|
F (..\User\module\chassis.c)(0x68F4A0FB)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -c
-fno-rtti -funsigned-char -fshort-enums -fshort-wchar
-D__MICROLIB -gdwarf-3 -O3 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Middlewares/Third_Party/FreeRTOS/Source/include -I ../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2 -I ../Middlewares/Third_Party/FreeRTOS/Source/portable/RVDS/ARM_CM4F -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../User
-I./RTE/_zzzzh
-ID:/keil/ARM/PACK/ARM/CMSIS/5.0.1/CMSIS/Include
-ID:/keil/ARM/PACK/Keil/STM32F4xx_DFP/2.14.0/Drivers/CMSIS/Device/ST/STM32F4xx/Include
-D__UVISION_VERSION="524" -D_RTE_ -DSTM32F407xx -DUSE_HAL_DRIVER -DSTM32F407xx
-o zzzzh/chassis.o -MD)
|
||||||
|
>>>>>>> fc2ac5c99d3c57c83c4929b0969c6dc753eef3ac
|
||||||
I (..\Middlewares\Third_Party\FreeRTOS\Source\CMSIS_RTOS_V2\cmsis_os2.h)(0x68C65D59)
|
I (..\Middlewares\Third_Party\FreeRTOS\Source\CMSIS_RTOS_V2\cmsis_os2.h)(0x68C65D59)
|
||||||
I (D:\keil\ARM\ARMCLANG\include\stdint.h)(0x588CAFD2)
|
I (D:\keil\ARM\ARMCLANG\include\stdint.h)(0x588CAFD2)
|
||||||
I (D:\keil\ARM\ARMCLANG\include\stddef.h)(0x588CAFD2)
|
I (D:\keil\ARM\ARMCLANG\include\stddef.h)(0x588CAFD2)
|
||||||
|
|||||||
@ -49,7 +49,10 @@ static float Chassis_CalcWz(const float min, const float max, uint32_t now) {
|
|||||||
int8_t Chassis_Init(Chassis_t *c, const Chassis_Params_t *param,
|
int8_t Chassis_Init(Chassis_t *c, const Chassis_Params_t *param,
|
||||||
AHRS_Eulr_t *mech_zero, float target_freq) {
|
AHRS_Eulr_t *mech_zero, float target_freq) {
|
||||||
if (!c) return CHASSIS_ERR_NULL;
|
if (!c) return CHASSIS_ERR_NULL;
|
||||||
|
<<<<<<< HEAD
|
||||||
BSP_CAN_Init();
|
BSP_CAN_Init();
|
||||||
|
=======
|
||||||
|
>>>>>>> fc2ac5c99d3c57c83c4929b0969c6dc753eef3ac
|
||||||
c->param = param;
|
c->param = param;
|
||||||
c->mode = CHASSIS_MODE_RELAX;
|
c->mode = CHASSIS_MODE_RELAX;
|
||||||
c->mech_zero = *mech_zero;
|
c->mech_zero = *mech_zero;
|
||||||
@ -59,6 +62,12 @@ if (param->reverse.yaw) {
|
|||||||
CircleReverse(&(c->mech_zero.yaw));
|
CircleReverse(&(c->mech_zero.yaw));
|
||||||
c->feedback.imu.eulr.yaw = -c->feedback.imu.eulr.yaw + M_2PI;
|
c->feedback.imu.eulr.yaw = -c->feedback.imu.eulr.yaw + M_2PI;
|
||||||
}
|
}
|
||||||
|
c->limit.vx.max = param->limit.max_vx;
|
||||||
|
c->limit.vx.min = -param->limit.max_vx;
|
||||||
|
c->limit.vy.max = param->limit.max_vy;
|
||||||
|
c->limit.vy.min = -param->limit.max_vy;
|
||||||
|
c->limit.wz.max = param->limit.max_wz;
|
||||||
|
c->limit.wz.min = -param->limit.max_wz;
|
||||||
|
|
||||||
Mixer_Mode_t mixer_mode;
|
Mixer_Mode_t mixer_mode;
|
||||||
switch (param->type) {
|
switch (param->type) {
|
||||||
@ -128,6 +137,7 @@ int8_t Chassis_UpdateFeedback(Chassis_t *c, const Chassis_Feedback_t *feedback)
|
|||||||
|
|
||||||
for (uint8_t i = 0; i < c->num_wheel; i++) {
|
for (uint8_t i = 0; i < c->num_wheel; i++) {
|
||||||
MOTOR_RM_Update(&(c->param->motor_param[i]));
|
MOTOR_RM_Update(&(c->param->motor_param[i]));
|
||||||
|
<<<<<<< HEAD
|
||||||
MOTOR_RM_t *rm_motor = MOTOR_RM_GetMotor(&(c->param->motor_param[i]));
|
MOTOR_RM_t *rm_motor = MOTOR_RM_GetMotor(&(c->param->motor_param[i]));
|
||||||
c->motors[i] = rm_motor;
|
c->motors[i] = rm_motor;
|
||||||
MOTOR_RM_t *rm = c->motors[i];
|
MOTOR_RM_t *rm = c->motors[i];
|
||||||
@ -137,6 +147,20 @@ int8_t Chassis_UpdateFeedback(Chassis_t *c, const Chassis_Feedback_t *feedback)
|
|||||||
{
|
{
|
||||||
return CHASSIS_ERR_NULL;
|
return CHASSIS_ERR_NULL;
|
||||||
}
|
}
|
||||||
|
=======
|
||||||
|
// MOTOR_RM_t *rm_motor = c->motors[i];
|
||||||
|
// if (rm_motor) {
|
||||||
|
// c->feedback.motor[i] = rm_motor->feedback;
|
||||||
|
// }
|
||||||
|
// else
|
||||||
|
// {
|
||||||
|
// return CHASSIS_ERR_NULL;
|
||||||
|
// }
|
||||||
|
MOTOR_RM_t *rm_motor = MOTOR_RM_GetMotor(&(c->param->motor_param[i]));
|
||||||
|
if (rm_motor != NULL) {
|
||||||
|
c->feedback.motor[i] = rm_motor->feedback;
|
||||||
|
}
|
||||||
|
>>>>>>> fc2ac5c99d3c57c83c4929b0969c6dc753eef3ac
|
||||||
}
|
}
|
||||||
return CHASSIS_OK;
|
return CHASSIS_OK;
|
||||||
}
|
}
|
||||||
@ -155,7 +179,9 @@ int8_t Chassis_Control(Chassis_t *c, const ChassisCmd_t *c_cmd, uint32_t now) {
|
|||||||
if (c->dt > 0.050f) c->dt = 0.050f;
|
if (c->dt > 0.050f) c->dt = 0.050f;
|
||||||
|
|
||||||
Chassis_SetMode(c, c_cmd->mode, now);
|
Chassis_SetMode(c, c_cmd->mode, now);
|
||||||
|
Clip(&c->move_vec.vx, c->limit.vx.min, c->limit.vx.max);
|
||||||
|
Clip(&c->move_vec.vy, c->limit.vy.min, c->limit.vy.max);
|
||||||
|
Clip(&c->move_vec.wz, c->limit.wz.min, c->limit.wz.max);
|
||||||
switch (c->mode) {
|
switch (c->mode) {
|
||||||
case CHASSIS_MODE_BREAK:
|
case CHASSIS_MODE_BREAK:
|
||||||
c->move_vec.vx = c->move_vec.vy = 0.0f;
|
c->move_vec.vx = c->move_vec.vy = 0.0f;
|
||||||
@ -181,7 +207,10 @@ int8_t Chassis_Control(Chassis_t *c, const ChassisCmd_t *c_cmd, uint32_t now) {
|
|||||||
break;
|
break;
|
||||||
case CHASSIS_MODE_OPEN:
|
case CHASSIS_MODE_OPEN:
|
||||||
c->move_vec.wz = c_cmd->ctrl_vec.wz;
|
c->move_vec.wz = c_cmd->ctrl_vec.wz;
|
||||||
|
<<<<<<< HEAD
|
||||||
break;
|
break;
|
||||||
|
=======
|
||||||
|
>>>>>>> fc2ac5c99d3c57c83c4929b0969c6dc753eef3ac
|
||||||
case CHASSIS_MODE_FOLLOW_GIMBAL:
|
case CHASSIS_MODE_FOLLOW_GIMBAL:
|
||||||
c->move_vec.wz = PID_Calc(&c->pid.follow, c->mech_zero.yaw, c->feedback.imu.eulr.yaw, 0.0f, c->dt);
|
c->move_vec.wz = PID_Calc(&c->pid.follow, c->mech_zero.yaw, c->feedback.imu.eulr.yaw, 0.0f, c->dt);
|
||||||
break;
|
break;
|
||||||
@ -200,6 +229,10 @@ int8_t Chassis_Control(Chassis_t *c, const ChassisCmd_t *c_cmd, uint32_t now) {
|
|||||||
for (uint8_t i = 0; i < c->num_wheel; i++) {
|
for (uint8_t i = 0; i < c->num_wheel; i++) {
|
||||||
float rf = c->setpoint.motor_rpm[i];
|
float rf = c->setpoint.motor_rpm[i];
|
||||||
float fb = LowPassFilter2p_Apply(&c->filter.in[i], (float)c->feedback.motor[i].rotor_speed);
|
float fb = LowPassFilter2p_Apply(&c->filter.in[i], (float)c->feedback.motor[i].rotor_speed);
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
//float out_current = 0.0f;
|
||||||
|
>>>>>>> fc2ac5c99d3c57c83c4929b0969c6dc753eef3ac
|
||||||
float out_current = PID_Calc(&c->pid.motor[i], rf, fb, 0.0f, c->dt);
|
float out_current = PID_Calc(&c->pid.motor[i], rf, fb, 0.0f, c->dt);
|
||||||
switch (c->mode) {
|
switch (c->mode) {
|
||||||
case CHASSIS_MODE_BREAK:
|
case CHASSIS_MODE_BREAK:
|
||||||
@ -210,7 +243,11 @@ int8_t Chassis_Control(Chassis_t *c, const ChassisCmd_t *c_cmd, uint32_t now) {
|
|||||||
out_current = PID_Calc(&c->pid.motor[i], c->setpoint.motor_rpm[i], fb, 0.0f, c->dt);
|
out_current = PID_Calc(&c->pid.motor[i], c->setpoint.motor_rpm[i], fb, 0.0f, c->dt);
|
||||||
break;
|
break;
|
||||||
case CHASSIS_MODE_OPEN:
|
case CHASSIS_MODE_OPEN:
|
||||||
|
<<<<<<< HEAD
|
||||||
out_current = c->setpoint.motor_rpm[i] / 3000.0f;
|
out_current = c->setpoint.motor_rpm[i] / 3000.0f;
|
||||||
|
=======
|
||||||
|
out_current = c->setpoint.motor_rpm[i] / 7000.0f;
|
||||||
|
>>>>>>> fc2ac5c99d3c57c83c4929b0969c6dc753eef3ac
|
||||||
break;
|
break;
|
||||||
case CHASSIS_MODE_RELAX:
|
case CHASSIS_MODE_RELAX:
|
||||||
out_current = 0.0f;
|
out_current = 0.0f;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user