Skip to content

Commit 02f8dfc

Browse files
AlkaMotorsAlkaMotors
committed
dead time update, move zc timing
1 parent 51cc9fc commit 02f8dfc

File tree

129 files changed

+100212
-8045
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+100212
-8045
lines changed

‎Inc/targets.h

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
#ifdef F4A_AIO_F421
132132
#define FIRMWARE_NAME "F4A AIO "
133133
#define FILE_NAME "F4A_AIO_F421"
134-
#define DEAD_TIME 25
134+
#define DEAD_TIME 75
135135
#define HARDWARE_GROUP_AT_540
136136
#define HARDWARE_GROUP_AT_F
137137
// #define USE_SERIAL_TELEMETRY
@@ -142,7 +142,7 @@
142142
#ifdef F4A_4IN1_F421
143143
#define FIRMWARE_NAME "F4A 4in1 "
144144
#define FILE_NAME "F4A_4IN1_F421"
145-
#define DEAD_TIME 45
145+
#define DEAD_TIME 75
146146
#define HARDWARE_GROUP_AT_540
147147
#define HARDWARE_GROUP_AT_E
148148
#define USE_SERIAL_TELEMETRY
@@ -822,6 +822,18 @@
822822
#define SIXTY_FOUR_KB_MEMORY
823823
#endif
824824

825+
#ifdef FLYCOLOR_HV3_G071
826+
#define FILE_NAME "FLYCOLOR_HV3_G071"
827+
#define FIRMWARE_NAME "Flycolor HV3"
828+
#define DEAD_TIME 80
829+
#define MILLIVOLT_PER_AMP 33
830+
#define CURRENT_OFFSET 0
831+
#define TARGET_VOLTAGE_DIVIDER 210
832+
#define HARDWARE_GROUP_G0_N
833+
#define USE_SERIAL_TELEMETRY
834+
#define SIXTY_FOUR_KB_MEMORY
835+
#endif
836+
825837
#ifdef AIKON_PRO_G071
826838
#define FILE_NAME "AIKON_PRO_G071"
827839
#define FIRMWARE_NAME "AIKON PRO 50"

‎Keil_Projects/AM32_MultiProject.uvmpw

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
<project>
1111
<PathAndName>.\Am32e230.uvprojx</PathAndName>
12-
<NodeIsExpanded>1</NodeIsExpanded>
1312
<NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
1413
</project>
1514

@@ -20,6 +19,7 @@
2019

2120
<project>
2221
<PathAndName>.\Am32F051.uvprojx</PathAndName>
22+
<NodeIsActive>1</NodeIsActive>
2323
<NodeIsExpanded>1</NodeIsExpanded>
2424
<NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
2525
</project>
@@ -31,14 +31,11 @@
3131

3232
<project>
3333
<PathAndName>.\Am32F421.uvprojx</PathAndName>
34-
<NodeIsActive>1</NodeIsActive>
35-
<NodeIsExpanded>1</NodeIsExpanded>
3634
<NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
3735
</project>
3836

3937
<project>
4038
<PathAndName>.\Am32G071.uvprojx</PathAndName>
41-
<NodeIsExpanded>1</NodeIsExpanded>
4239
<NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
4340
</project>
4441

‎Keil_Projects/AM32_MultiProject.uvmpw.uvgui.alkaz

Lines changed: 83 additions & 83 deletions
Large diffs are not rendered by default.

‎Keil_Projects/Am32F031.uvguix.alkaz

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
<View>
1616
<WinId>38003</WinId>
1717
<ViewName>Registers</ViewName>
18-
<TableColWidths>211 212</TableColWidths>
18+
<TableColWidths>211 100</TableColWidths>
1919
</View>
2020
<View>
2121
<WinId>346</WinId>
2222
<ViewName>Code Coverage</ViewName>
23-
<TableColWidths>669 160</TableColWidths>
23+
<TableColWidths>669 986</TableColWidths>
2424
</View>
2525
<View>
2626
<WinId>204</WinId>
2727
<ViewName>Performance Analyzer</ViewName>
28-
<TableColWidths>829</TableColWidths>
28+
<TableColWidths>849 124 124 558</TableColWidths>
2929
</View>
3030
</SECTreeCtrl>
3131

@@ -110,8 +110,8 @@
110110
<MDIClientArea>
111111
<RegID>0</RegID>
112112
<MDITabState>
113-
<Len>1597</Len>
114-
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000E0000000D000000010000003B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C494F2E630000000004494F2E6300000000FFDC7800FFFFFFFF40433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C66756E6374696F6E732E68000000000B66756E6374696F6E732E6800000000BECEA100FFFFFFFF3E433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C746172676574732E680000000009746172676574732E6800000000F0A0A100FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C61743332663432315F69742E63000000000D61743332663432315F69742E6300000000BCA8E100FFFFFFFF3D433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C7369676E616C2E6300000000087369676E616C2E63000000009CC1B600FFFFFFFF3C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6473686F742E6300000000076473686F742E6300000000F7B88600FFFFFFFF40433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C66756E6374696F6E732E63000000000B66756E6374696F6E732E6300000000D9ADC200FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C653233305C5372635C7065726970686572616C732E63000000000D7065726970686572616C732E6300000000A5C2D700FFFFFFFF67433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4B65696C5F50726F6A656374735C4C697374696E67735C414D33325F52525F524F424F545F4455414C5F4553435F463432312E6D6170000000001F414D33325F52525F524F424F545F4455414C5F4553435F463432312E6D617000000000B3A6BE00FFFFFFFF43433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C4144432E6300000000054144432E6300000000EAD6A300FFFFFFFF50433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C73657269616C5F74656C656D657472792E63000000001273657269616C5F74656C656D657472792E6300000000F6FA7D00FFFFFFFF5B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4B65696C5F50726F6A656374735C4C697374696E67735C414D33325F47495053595F463432312E6D61700000000013414D33325F47495053595F463432312E6D617000000000B5E99D00FFFFFFFF4C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663035315C5372635C73746D3332663078785F69742E63000000000F73746D3332663078785F69742E632A000000005FC3CF00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000B50100007000000080070000DA020000</Data>
113+
<Len>1233</Len>
114+
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000C00000004000000010000003B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C494F2E630000000004494F2E6300000000FFDC7800FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C494F2E630000000004494F2E6300000000BECEA100FFFFFFFF3C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6473686F742E6300000000076473686F742E6300000000F0A0A100FFFFFFFF3E433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C746172676574732E680000000009746172676574732E6800000000BCA8E100FFFFFFFF46433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C5753323831322E6300000000085753323831322E63000000009CC1B600FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663431355C5372635C494F2E630000000004494F2E6300000000F7B88600FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663035315C5372635C494F2E630000000004494F2E6300000000D9ADC200FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C463033315C5372635C494F2E630000000004494F2E6300000000A5C2D700FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C653233305C5372635C494F2E630000000004494F2E6300000000B3A6BE00FFFFFFFF3D433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C7369676E616C2E6300000000087369676E616C2E6300000000EAD6A300FFFFFFFF40433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C66756E6374696F6E732E63000000000B66756E6374696F6E732E6300000000F6FA7D00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000B50100007000000080070000DA020000</Data>
115115
</MDITabState>
116116
</MDIClientArea>
117117
<ViewEx>
@@ -3605,7 +3605,7 @@
36053605
<Size>100</Size>
36063606
<ActiveTab>1</ActiveTab>
36073607
<Doc>
3608-
<Name>&lt;1&gt;..\Inc\targets.h</Name>
3608+
<Name>C:\Users\alkaz\OneDrive\Documents\AM32_MULTI_MCU\Inc\targets.h</Name>
36093609
<ColumnNumber>19</ColumnNumber>
36103610
<TopLine>648</TopLine>
36113611
<CurrentLine>654</CurrentLine>

‎Keil_Projects/Am32F051.uvguix.alkaz

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
<View>
1616
<WinId>38003</WinId>
1717
<ViewName>Registers</ViewName>
18-
<TableColWidths>211 212</TableColWidths>
18+
<TableColWidths>211 100</TableColWidths>
1919
</View>
2020
<View>
2121
<WinId>346</WinId>
2222
<ViewName>Code Coverage</ViewName>
23-
<TableColWidths>669 160</TableColWidths>
23+
<TableColWidths>669 986</TableColWidths>
2424
</View>
2525
<View>
2626
<WinId>204</WinId>
2727
<ViewName>Performance Analyzer</ViewName>
28-
<TableColWidths>829</TableColWidths>
28+
<TableColWidths>849 124 124 558</TableColWidths>
2929
</View>
3030
</SECTreeCtrl>
3131

@@ -93,8 +93,8 @@
9393
<flags>2</flags>
9494
<showCmd>3</showCmd>
9595
<MinPosition>
96-
<xPos>-1</xPos>
97-
<yPos>-1</yPos>
96+
<xPos>-32000</xPos>
97+
<yPos>-32000</yPos>
9898
</MinPosition>
9999
<MaxPosition>
100100
<xPos>-1</xPos>
@@ -110,8 +110,8 @@
110110
<MDIClientArea>
111111
<RegID>0</RegID>
112112
<MDITabState>
113-
<Len>1597</Len>
114-
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000E0000000D000000010000003B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C494F2E630000000004494F2E6300000000FFDC7800FFFFFFFF40433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C66756E6374696F6E732E68000000000B66756E6374696F6E732E6800000000BECEA100FFFFFFFF3E433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C746172676574732E680000000009746172676574732E6800000000F0A0A100FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C61743332663432315F69742E63000000000D61743332663432315F69742E6300000000BCA8E100FFFFFFFF3D433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C7369676E616C2E6300000000087369676E616C2E63000000009CC1B600FFFFFFFF3C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6473686F742E6300000000076473686F742E6300000000F7B88600FFFFFFFF40433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C66756E6374696F6E732E63000000000B66756E6374696F6E732E6300000000D9ADC200FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C653233305C5372635C7065726970686572616C732E63000000000D7065726970686572616C732E6300000000A5C2D700FFFFFFFF67433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4B65696C5F50726F6A656374735C4C697374696E67735C414D33325F52525F524F424F545F4455414C5F4553435F463432312E6D6170000000001F414D33325F52525F524F424F545F4455414C5F4553435F463432312E6D617000000000B3A6BE00FFFFFFFF43433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C4144432E6300000000054144432E6300000000EAD6A300FFFFFFFF50433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C73657269616C5F74656C656D657472792E63000000001273657269616C5F74656C656D657472792E6300000000F6FA7D00FFFFFFFF5B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4B65696C5F50726F6A656374735C4C697374696E67735C414D33325F47495053595F463432312E6D61700000000013414D33325F47495053595F463432312E6D617000000000B5E99D00FFFFFFFF4C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663035315C5372635C73746D3332663078785F69742E63000000000F73746D3332663078785F69742E632A000000005FC3CF00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000B50100007000000080070000DA020000</Data>
113+
<Len>1443</Len>
114+
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000E00000000000000010000003B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C494F2E630000000004494F2E6300000000FFDC7800FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C494F2E630000000004494F2E6300000000BECEA100FFFFFFFF3C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6473686F742E6300000000076473686F742E6300000000F0A0A100FFFFFFFF3E433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C746172676574732E680000000009746172676574732E6800000000BCA8E100FFFFFFFF46433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C5753323831322E6300000000085753323831322E63000000009CC1B600FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663431355C5372635C494F2E630000000004494F2E6300000000F7B88600FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663035315C5372635C494F2E630000000004494F2E6300000000D9ADC200FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C463033315C5372635C494F2E630000000004494F2E6300000000A5C2D700FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C653233305C5372635C494F2E630000000004494F2E6300000000B3A6BE00FFFFFFFF3D433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C7369676E616C2E6300000000087369676E616C2E6300000000EAD6A300FFFFFFFF40433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C66756E6374696F6E732E63000000000B66756E6374696F6E732E6300000000F6FA7D00FFFFFFFF49433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C70686173656F7574732E63000000000B70686173656F7574732E6300000000B5E99D00FFFFFFFF4C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663035315C5372635C73746D3332663078785F69742E63000000000E73746D3332663078785F69742E63000000005FC3CF00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000B50100007000000080070000DA020000</Data>
115115
</MDITabState>
116116
</MDIClientArea>
117117
<ViewEx>

‎Keil_Projects/Am32F051.uvoptx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,7 +1148,7 @@
11481148
<OPTFL>
11491149
<tvExp>1</tvExp>
11501150
<tvExpOptDlg>0</tvExpOptDlg>
1151-
<IsCurrentTarget>0</IsCurrentTarget>
1151+
<IsCurrentTarget>1</IsCurrentTarget>
11521152
</OPTFL>
11531153
<CpuCode>18</CpuCode>
11541154
<DebugOpt>
@@ -6262,7 +6262,7 @@
62626262
<OPTFL>
62636263
<tvExp>1</tvExp>
62646264
<tvExpOptDlg>0</tvExpOptDlg>
6265-
<IsCurrentTarget>1</IsCurrentTarget>
6265+
<IsCurrentTarget>0</IsCurrentTarget>
62666266
</OPTFL>
62676267
<CpuCode>18</CpuCode>
62686268
<DebugOpt>

0 commit comments

Comments
 (0)