Skip to content

Commit 389ebaf

Browse files
AlkaMotorsAlkaMotors
committed
Change all mcu's to pullup
except neutronrc_g071
1 parent b2b2793 commit 389ebaf

36 files changed

+12395
-1473
lines changed

‎Inc/functions.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@ void delayMillis(uint32_t millis);
1717
long map(long x, long in_min, long in_max, long out_min, long out_max);
1818
#ifdef ARTERY
1919
void gpio_mode_QUICK(gpio_type* gpio_periph, uint32_t mode, uint32_t pull_up_down, uint32_t pin);
20+
void gpio_mode_set(gpio_type* gpio_periph, uint32_t mode, uint32_t pull_up_down, uint32_t pin);
2021
#endif
2122
#endif /* FUNCTIONS_H_ */

‎Inc/targets.h

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,20 @@
278278

279279
/***************************************End Generic *****************************************/
280280

281+
#ifdef GIPSY_F421
282+
#define FIRMWARE_NAME "GiPSy F421 "
283+
#define FILE_NAME "GIPSY_F421"
284+
#define DEAD_TIME 80
285+
#define HARDWARE_GROUP_AT_B
286+
#define HARDWARE_GROUP_AT_045
287+
#define USE_SERIAL_TELEMETRY
288+
#define TARGET_VOLTAGE_DIVIDER 1010
289+
#define MILLIVOLT_PER_AMP 50
290+
#define ADC_CHANNEL_CURRENT ADC_CHANNEL_3
291+
#define ADC_CHANNEL_VOLTAGE ADC_CHANNEL_6
292+
#endif
293+
294+
281295
#ifdef TEKKO32_F421
282296
#define FIRMWARE_NAME "Tekko32 F4 "
283297
#define FILE_NAME "TEKKO32_F421"
@@ -731,13 +745,11 @@
731745
#define FILE_NAME "GEN_64K_G071"
732746
#define FIRMWARE_NAME "G071 64kESC "
733747
#define DEAD_TIME 60
734-
#define MILLIVOLT_PER_AMP 67
748+
#define MILLIVOLT_PER_AMP 20
735749
#define CURRENT_OFFSET 0
736750
#define HARDWARE_GROUP_G0_A
737751
#define USE_SERIAL_TELEMETRY
738752
#define SIXTY_FOUR_KB_MEMORY
739-
#define LOOP_FREQUENCY_HZ 500
740-
#define CUSTOM_RAMP
741753
#endif
742754

743755
#ifdef TMOTOR_G071

‎Keil_Projects/AM32_MultiProject.uvmpw

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
<project>
1111
<PathAndName>.\Am32e230.uvprojx</PathAndName>
12+
<NodeIsExpanded>1</NodeIsExpanded>
1213
<NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
1314
</project>
1415

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

2021
<project>
2122
<PathAndName>.\Am32F051.uvprojx</PathAndName>
23+
<NodeIsExpanded>1</NodeIsExpanded>
2224
<NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
2325
</project>
2426

@@ -29,18 +31,19 @@
2931

3032
<project>
3133
<PathAndName>.\Am32F421.uvprojx</PathAndName>
34+
<NodeIsActive>1</NodeIsActive>
35+
<NodeIsExpanded>1</NodeIsExpanded>
3236
<NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
3337
</project>
3438

3539
<project>
3640
<PathAndName>.\Am32G071.uvprojx</PathAndName>
41+
<NodeIsExpanded>1</NodeIsExpanded>
3742
<NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
3843
</project>
3944

4045
<project>
4146
<PathAndName>.\Am32G431.uvprojx</PathAndName>
42-
<NodeIsActive>1</NodeIsActive>
43-
<NodeIsExpanded>1</NodeIsExpanded>
4447
</project>
4548

4649
</ProjectWorkspace>

‎Keil_Projects/AM32_MultiProject.uvmpw.uvgui.alkaz

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

‎Keil_Projects/Am32F031.uvguix.alkaz

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@
9393
<flags>2</flags>
9494
<showCmd>3</showCmd>
9595
<MinPosition>
96-
<xPos>-32000</xPos>
97-
<yPos>-32000</yPos>
96+
<xPos>-1</xPos>
97+
<yPos>-1</yPos>
9898
</MinPosition>
9999
<MaxPosition>
100100
<xPos>-1</xPos>
@@ -110,8 +110,8 @@
110110
<MDIClientArea>
111111
<RegID>0</RegID>
112112
<MDITabState>
113-
<Len>1452</Len>
114-
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000D00000002000000010000003B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF43433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C463033315C5372635C4144432E6300000000054144432E6300000000FFDC7800FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C7065726970686572616C732E63000000000D7065726970686572616C732E6300000000BECEA100FFFFFFFF49433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C653233305C5372635C70686173656F7574732E63000000000B70686173656F7574732E6300000000F0A0A100FFFFFFFF3E433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C696E635C746172676574732E680000000009746172676574732E6800000000BCA8E100FFFFFFFF49433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C463033315C5372635C70686173656F7574732E63000000000B70686173656F7574732E63000000009CC1B600FFFFFFFF49433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663035315C5372635C70686173656F7574732E63000000000B70686173656F7574732E6300000000F7B88600FFFFFFFF49433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663431355C5372635C70686173656F7574732E63000000000B70686173656F7574732E6300000000D9ADC200FFFFFFFF49433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C70686173656F7574732E63000000000B70686173656F7574732E6300000000A5C2D700FFFFFFFF49433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C70686173656F7574732E63000000000B70686173656F7574732E6300000000B3A6BE00FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C494F2E630000000004494F2E6300000000EAD6A300FFFFFFFF4C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C73746D3332673078785F69742E63000000000E73746D3332673078785F69742E6300000000F6FA7D00FFFFFFFF4A433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663035315C5372635C636F6D70617261746F722E63000000000C636F6D70617261746F722E6300000000B5E99D00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000B5010000700000008007000093030000</Data>
113+
<Len>1597</Len>
114+
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000E0000000D000000010000003B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C494F2E630000000004494F2E6300000000FFDC7800FFFFFFFF40433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C66756E6374696F6E732E68000000000B66756E6374696F6E732E6800000000BECEA100FFFFFFFF3E433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C746172676574732E680000000009746172676574732E6800000000F0A0A100FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C61743332663432315F69742E63000000000D61743332663432315F69742E6300000000BCA8E100FFFFFFFF3D433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C7369676E616C2E6300000000087369676E616C2E63000000009CC1B600FFFFFFFF3C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6473686F742E6300000000076473686F742E6300000000F7B88600FFFFFFFF40433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C66756E6374696F6E732E63000000000B66756E6374696F6E732E6300000000D9ADC200FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C653233305C5372635C7065726970686572616C732E63000000000D7065726970686572616C732E6300000000A5C2D700FFFFFFFF67433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4B65696C5F50726F6A656374735C4C697374696E67735C414D33325F52525F524F424F545F4455414C5F4553435F463432312E6D6170000000001F414D33325F52525F524F424F545F4455414C5F4553435F463432312E6D617000000000B3A6BE00FFFFFFFF43433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C4144432E6300000000054144432E6300000000EAD6A300FFFFFFFF50433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C73657269616C5F74656C656D657472792E63000000001273657269616C5F74656C656D657472792E6300000000F6FA7D00FFFFFFFF5B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4B65696C5F50726F6A656374735C4C697374696E67735C414D33325F47495053595F463432312E6D61700000000013414D33325F47495053595F463432312E6D617000000000B5E99D00FFFFFFFF4C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663035315C5372635C73746D3332663078785F69742E63000000000F73746D3332663078785F69742E632A000000005FC3CF00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000B50100007000000080070000DA020000</Data>
115115
</MDITabState>
116116
</MDIClientArea>
117117
<ViewEx>
@@ -3605,7 +3605,7 @@
36053605
<Size>100</Size>
36063606
<ActiveTab>1</ActiveTab>
36073607
<Doc>
3608-
<Name>C:\Users\alkaz\OneDrive\Documents\AM32_MULTI_MCU\inc\targets.h</Name>
3608+
<Name>&lt;1&gt;..\Inc\targets.h</Name>
36093609
<ColumnNumber>19</ColumnNumber>
36103610
<TopLine>648</TopLine>
36113611
<CurrentLine>654</CurrentLine>

‎Keil_Projects/Am32F031.uvoptx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<LExpSel>0</LExpSel>
7474
</OPTXL>
7575
<OPTFL>
76-
<tvExp>0</tvExp>
76+
<tvExp>1</tvExp>
7777
<tvExpOptDlg>0</tvExpOptDlg>
7878
<IsCurrentTarget>1</IsCurrentTarget>
7979
</OPTFL>
@@ -373,7 +373,7 @@
373373

374374
<Group>
375375
<GroupName>f031</GroupName>
376-
<tvExp>0</tvExp>
376+
<tvExp>1</tvExp>
377377
<tvExpOptDlg>0</tvExpOptDlg>
378378
<cbSel>0</cbSel>
379379
<RteFlg>0</RteFlg>

‎Keil_Projects/Am32F051.uvguix.alkaz

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@
9393
<flags>2</flags>
9494
<showCmd>3</showCmd>
9595
<MinPosition>
96-
<xPos>-32000</xPos>
97-
<yPos>-32000</yPos>
96+
<xPos>-1</xPos>
97+
<yPos>-1</yPos>
9898
</MinPosition>
9999
<MaxPosition>
100100
<xPos>-1</xPos>
@@ -110,8 +110,8 @@
110110
<MDIClientArea>
111111
<RegID>0</RegID>
112112
<MDITabState>
113-
<Len>1452</Len>
114-
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000D00000002000000010000003B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF43433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C463033315C5372635C4144432E6300000000054144432E6300000000FFDC7800FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C7065726970686572616C732E63000000000D7065726970686572616C732E6300000000BECEA100FFFFFFFF49433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C653233305C5372635C70686173656F7574732E63000000000B70686173656F7574732E6300000000F0A0A100FFFFFFFF3E433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C696E635C746172676574732E680000000009746172676574732E6800000000BCA8E100FFFFFFFF49433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C463033315C5372635C70686173656F7574732E63000000000B70686173656F7574732E63000000009CC1B600FFFFFFFF49433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663035315C5372635C70686173656F7574732E63000000000B70686173656F7574732E6300000000F7B88600FFFFFFFF49433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663431355C5372635C70686173656F7574732E63000000000B70686173656F7574732E6300000000D9ADC200FFFFFFFF49433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C70686173656F7574732E63000000000B70686173656F7574732E6300000000A5C2D700FFFFFFFF49433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C70686173656F7574732E63000000000B70686173656F7574732E6300000000B3A6BE00FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C494F2E630000000004494F2E6300000000EAD6A300FFFFFFFF4C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C73746D3332673078785F69742E63000000000E73746D3332673078785F69742E6300000000F6FA7D00FFFFFFFF4A433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663035315C5372635C636F6D70617261746F722E63000000000C636F6D70617261746F722E6300000000B5E99D00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000B5010000700000008007000093030000</Data>
113+
<Len>1597</Len>
114+
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000E0000000D000000010000003B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C494F2E630000000004494F2E6300000000FFDC7800FFFFFFFF40433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C66756E6374696F6E732E68000000000B66756E6374696F6E732E6800000000BECEA100FFFFFFFF3E433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C746172676574732E680000000009746172676574732E6800000000F0A0A100FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C61743332663432315F69742E63000000000D61743332663432315F69742E6300000000BCA8E100FFFFFFFF3D433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C7369676E616C2E6300000000087369676E616C2E63000000009CC1B600FFFFFFFF3C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6473686F742E6300000000076473686F742E6300000000F7B88600FFFFFFFF40433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C66756E6374696F6E732E63000000000B66756E6374696F6E732E6300000000D9ADC200FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C653233305C5372635C7065726970686572616C732E63000000000D7065726970686572616C732E6300000000A5C2D700FFFFFFFF67433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4B65696C5F50726F6A656374735C4C697374696E67735C414D33325F52525F524F424F545F4455414C5F4553435F463432312E6D6170000000001F414D33325F52525F524F424F545F4455414C5F4553435F463432312E6D617000000000B3A6BE00FFFFFFFF43433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C4144432E6300000000054144432E6300000000EAD6A300FFFFFFFF50433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C73657269616C5F74656C656D657472792E63000000001273657269616C5F74656C656D657472792E6300000000F6FA7D00FFFFFFFF5B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4B65696C5F50726F6A656374735C4C697374696E67735C414D33325F47495053595F463432312E6D61700000000013414D33325F47495053595F463432312E6D617000000000B5E99D00FFFFFFFF4C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663035315C5372635C73746D3332663078785F69742E63000000000F73746D3332663078785F69742E632A000000005FC3CF00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000B50100007000000080070000DA020000</Data>
115115
</MDITabState>
116116
</MDIClientArea>
117117
<ViewEx>

0 commit comments

Comments
 (0)