Skip to content

Commit

Permalink
dead time update, move zc timing
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlkaMotors
AlkaMotors committed Jan 30, 2024
1 parent 51cc9fc commit 02f8dfc
Show file tree
Hide file tree
Showing 129 changed files with 100,212 additions and 8,045 deletions.
16 changes: 14 additions & 2 deletions Inc/targets.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
#ifdef F4A_AIO_F421
#define FIRMWARE_NAME "F4A AIO "
#define FILE_NAME "F4A_AIO_F421"
#define DEAD_TIME 25
#define DEAD_TIME 75
#define HARDWARE_GROUP_AT_540
#define HARDWARE_GROUP_AT_F
// #define USE_SERIAL_TELEMETRY
Expand All @@ -142,7 +142,7 @@
#ifdef F4A_4IN1_F421
#define FIRMWARE_NAME "F4A 4in1 "
#define FILE_NAME "F4A_4IN1_F421"
#define DEAD_TIME 45
#define DEAD_TIME 75
#define HARDWARE_GROUP_AT_540
#define HARDWARE_GROUP_AT_E
#define USE_SERIAL_TELEMETRY
Expand Down Expand Up @@ -822,6 +822,18 @@
#define SIXTY_FOUR_KB_MEMORY
#endif

#ifdef FLYCOLOR_HV3_G071
#define FILE_NAME "FLYCOLOR_HV3_G071"
#define FIRMWARE_NAME "Flycolor HV3"
#define DEAD_TIME 80
#define MILLIVOLT_PER_AMP 33
#define CURRENT_OFFSET 0
#define TARGET_VOLTAGE_DIVIDER 210
#define HARDWARE_GROUP_G0_N
#define USE_SERIAL_TELEMETRY
#define SIXTY_FOUR_KB_MEMORY
#endif

#ifdef AIKON_PRO_G071
#define FILE_NAME "AIKON_PRO_G071"
#define FIRMWARE_NAME "AIKON PRO 50"
Expand Down
5 changes: 1 addition & 4 deletions Keil_Projects/AM32_MultiProject.uvmpw
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

<project>
<PathAndName>.\Am32e230.uvprojx</PathAndName>
<NodeIsExpanded>1</NodeIsExpanded>
<NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
</project>

Expand All @@ -20,6 +19,7 @@

<project>
<PathAndName>.\Am32F051.uvprojx</PathAndName>
<NodeIsActive>1</NodeIsActive>
<NodeIsExpanded>1</NodeIsExpanded>
<NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
</project>
Expand All @@ -31,14 +31,11 @@

<project>
<PathAndName>.\Am32F421.uvprojx</PathAndName>
<NodeIsActive>1</NodeIsActive>
<NodeIsExpanded>1</NodeIsExpanded>
<NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
</project>

<project>
<PathAndName>.\Am32G071.uvprojx</PathAndName>
<NodeIsExpanded>1</NodeIsExpanded>
<NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
</project>

Expand Down
166 changes: 83 additions & 83 deletions Keil_Projects/AM32_MultiProject.uvmpw.uvgui.alkaz
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions Keil_Projects/Am32F031.uvguix.alkaz
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
<View>
<WinId>38003</WinId>
<ViewName>Registers</ViewName>
<TableColWidths>211 212</TableColWidths>
<TableColWidths>211 100</TableColWidths>
</View>
<View>
<WinId>346</WinId>
<ViewName>Code Coverage</ViewName>
<TableColWidths>669 160</TableColWidths>
<TableColWidths>669 986</TableColWidths>
</View>
<View>
<WinId>204</WinId>
<ViewName>Performance Analyzer</ViewName>
<TableColWidths>829</TableColWidths>
<TableColWidths>849 124 124 558</TableColWidths>
</View>
</SECTreeCtrl>

Expand Down Expand Up @@ -110,8 +110,8 @@
<MDIClientArea>
<RegID>0</RegID>
<MDITabState>
<Len>1597</Len>
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000E0000000D000000010000003B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C494F2E630000000004494F2E6300000000FFDC7800FFFFFFFF40433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C66756E6374696F6E732E68000000000B66756E6374696F6E732E6800000000BECEA100FFFFFFFF3E433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C746172676574732E680000000009746172676574732E6800000000F0A0A100FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C61743332663432315F69742E63000000000D61743332663432315F69742E6300000000BCA8E100FFFFFFFF3D433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C7369676E616C2E6300000000087369676E616C2E63000000009CC1B600FFFFFFFF3C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6473686F742E6300000000076473686F742E6300000000F7B88600FFFFFFFF40433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C66756E6374696F6E732E63000000000B66756E6374696F6E732E6300000000D9ADC200FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C653233305C5372635C7065726970686572616C732E63000000000D7065726970686572616C732E6300000000A5C2D700FFFFFFFF67433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4B65696C5F50726F6A656374735C4C697374696E67735C414D33325F52525F524F424F545F4455414C5F4553435F463432312E6D6170000000001F414D33325F52525F524F424F545F4455414C5F4553435F463432312E6D617000000000B3A6BE00FFFFFFFF43433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C4144432E6300000000054144432E6300000000EAD6A300FFFFFFFF50433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C73657269616C5F74656C656D657472792E63000000001273657269616C5F74656C656D657472792E6300000000F6FA7D00FFFFFFFF5B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4B65696C5F50726F6A656374735C4C697374696E67735C414D33325F47495053595F463432312E6D61700000000013414D33325F47495053595F463432312E6D617000000000B5E99D00FFFFFFFF4C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663035315C5372635C73746D3332663078785F69742E63000000000F73746D3332663078785F69742E632A000000005FC3CF00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000B50100007000000080070000DA020000</Data>
<Len>1233</Len>
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000C00000004000000010000003B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C494F2E630000000004494F2E6300000000FFDC7800FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C494F2E630000000004494F2E6300000000BECEA100FFFFFFFF3C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6473686F742E6300000000076473686F742E6300000000F0A0A100FFFFFFFF3E433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C746172676574732E680000000009746172676574732E6800000000BCA8E100FFFFFFFF46433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C5753323831322E6300000000085753323831322E63000000009CC1B600FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663431355C5372635C494F2E630000000004494F2E6300000000F7B88600FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663035315C5372635C494F2E630000000004494F2E6300000000D9ADC200FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C463033315C5372635C494F2E630000000004494F2E6300000000A5C2D700FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C653233305C5372635C494F2E630000000004494F2E6300000000B3A6BE00FFFFFFFF3D433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C7369676E616C2E6300000000087369676E616C2E6300000000EAD6A300FFFFFFFF40433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C66756E6374696F6E732E63000000000B66756E6374696F6E732E6300000000F6FA7D00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000B50100007000000080070000DA020000</Data>
</MDITabState>
</MDIClientArea>
<ViewEx>
Expand Down Expand Up @@ -3605,7 +3605,7 @@
<Size>100</Size>
<ActiveTab>1</ActiveTab>
<Doc>
<Name>&lt;1&gt;..\Inc\targets.h</Name>
<Name>C:\Users\alkaz\OneDrive\Documents\AM32_MULTI_MCU\Inc\targets.h</Name>
<ColumnNumber>19</ColumnNumber>
<TopLine>648</TopLine>
<CurrentLine>654</CurrentLine>
Expand Down
14 changes: 7 additions & 7 deletions Keil_Projects/Am32F051.uvguix.alkaz
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
<View>
<WinId>38003</WinId>
<ViewName>Registers</ViewName>
<TableColWidths>211 212</TableColWidths>
<TableColWidths>211 100</TableColWidths>
</View>
<View>
<WinId>346</WinId>
<ViewName>Code Coverage</ViewName>
<TableColWidths>669 160</TableColWidths>
<TableColWidths>669 986</TableColWidths>
</View>
<View>
<WinId>204</WinId>
<ViewName>Performance Analyzer</ViewName>
<TableColWidths>829</TableColWidths>
<TableColWidths>849 124 124 558</TableColWidths>
</View>
</SECTreeCtrl>

Expand Down Expand Up @@ -93,8 +93,8 @@
<flags>2</flags>
<showCmd>3</showCmd>
<MinPosition>
<xPos>-1</xPos>
<yPos>-1</yPos>
<xPos>-32000</xPos>
<yPos>-32000</yPos>
</MinPosition>
<MaxPosition>
<xPos>-1</xPos>
Expand All @@ -110,8 +110,8 @@
<MDIClientArea>
<RegID>0</RegID>
<MDITabState>
<Len>1597</Len>
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000E0000000D000000010000003B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C494F2E630000000004494F2E6300000000FFDC7800FFFFFFFF40433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C66756E6374696F6E732E68000000000B66756E6374696F6E732E6800000000BECEA100FFFFFFFF3E433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C746172676574732E680000000009746172676574732E6800000000F0A0A100FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C61743332663432315F69742E63000000000D61743332663432315F69742E6300000000BCA8E100FFFFFFFF3D433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C7369676E616C2E6300000000087369676E616C2E63000000009CC1B600FFFFFFFF3C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6473686F742E6300000000076473686F742E6300000000F7B88600FFFFFFFF40433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C66756E6374696F6E732E63000000000B66756E6374696F6E732E6300000000D9ADC200FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C653233305C5372635C7065726970686572616C732E63000000000D7065726970686572616C732E6300000000A5C2D700FFFFFFFF67433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4B65696C5F50726F6A656374735C4C697374696E67735C414D33325F52525F524F424F545F4455414C5F4553435F463432312E6D6170000000001F414D33325F52525F524F424F545F4455414C5F4553435F463432312E6D617000000000B3A6BE00FFFFFFFF43433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C4144432E6300000000054144432E6300000000EAD6A300FFFFFFFF50433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C73657269616C5F74656C656D657472792E63000000001273657269616C5F74656C656D657472792E6300000000F6FA7D00FFFFFFFF5B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4B65696C5F50726F6A656374735C4C697374696E67735C414D33325F47495053595F463432312E6D61700000000013414D33325F47495053595F463432312E6D617000000000B5E99D00FFFFFFFF4C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663035315C5372635C73746D3332663078785F69742E63000000000F73746D3332663078785F69742E632A000000005FC3CF00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000B50100007000000080070000DA020000</Data>
<Len>1443</Len>
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000E00000000000000010000003B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C494F2E630000000004494F2E6300000000FFDC7800FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C494F2E630000000004494F2E6300000000BECEA100FFFFFFFF3C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6473686F742E6300000000076473686F742E6300000000F0A0A100FFFFFFFF3E433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C746172676574732E680000000009746172676574732E6800000000BCA8E100FFFFFFFF46433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C5753323831322E6300000000085753323831322E63000000009CC1B600FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663431355C5372635C494F2E630000000004494F2E6300000000F7B88600FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663035315C5372635C494F2E630000000004494F2E6300000000D9ADC200FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C463033315C5372635C494F2E630000000004494F2E6300000000A5C2D700FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C653233305C5372635C494F2E630000000004494F2E6300000000B3A6BE00FFFFFFFF3D433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C7369676E616C2E6300000000087369676E616C2E6300000000EAD6A300FFFFFFFF40433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C66756E6374696F6E732E63000000000B66756E6374696F6E732E6300000000F6FA7D00FFFFFFFF49433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C70686173656F7574732E63000000000B70686173656F7574732E6300000000B5E99D00FFFFFFFF4C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663035315C5372635C73746D3332663078785F69742E63000000000E73746D3332663078785F69742E63000000005FC3CF00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000B50100007000000080070000DA020000</Data>
</MDITabState>
</MDIClientArea>
<ViewEx>
Expand Down
4 changes: 2 additions & 2 deletions Keil_Projects/Am32F051.uvoptx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1148,7 +1148,7 @@
<OPTFL>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>0</IsCurrentTarget>
<IsCurrentTarget>1</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
Expand Down Expand Up @@ -6262,7 +6262,7 @@
<OPTFL>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>1</IsCurrentTarget>
<IsCurrentTarget>0</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
Expand Down
Loading

0 comments on commit 02f8dfc

Please sign in to comment.