Skip to content

Commit

Permalink
Rc car mode braking fix
Browse files Browse the repository at this point in the history
  • Loading branch information
AlkaMotors committed Apr 15, 2024
1 parent e9fc66b commit 3a88000
Show file tree
Hide file tree
Showing 64 changed files with 39,270 additions and 26,465 deletions.
41 changes: 33 additions & 8 deletions Inc/targets.h
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,12 @@
#ifdef AT32SLOTCAR_F421
#define FIRMWARE_NAME "AT32_SC "
#define FILE_NAME "AT32SLOTCAR_F421"
#define DEAD_TIME 180
#define DEAD_TIME 60
#define HARDWARE_GROUP_AT_B
#define HARDWARE_GROUP_AT_045
//#define FIXED_DUTY_MODE
//#define FIXED_DUTY_MODE_POWER 100
#define DEBUG
#endif
/****************************************Generic********************************************/

Expand Down Expand Up @@ -469,20 +472,33 @@
#define USE_SERIAL_TELEMETRY
#endif

#ifdef SPEEDYBEE_65A_F421
#define FIRMWARE_NAME "SPEEDY 65A "
#define FILE_NAME "SPEEDYBEE_65A_F421"
#define DEAD_TIME 80
#define HARDWARE_GROUP_AT_C
#define HARDWARE_GROUP_AT_540
#define USE_SERIAL_TELEMETRY
#endif

/*****************************************************AT32F415 targets
* ************************************************/

#ifdef AM60_V2_F421
#ifdef SKYSTARS_AM60_V2_F421
#define FIRMWARE_NAME "F421 Am60 "
#define FILE_NAME "AM60_V2_F421"
#define FILE_NAME "SKYSTARS_AM60_V2_F421"
#define DEAD_TIME 70
#define HARDWARE_GROUP_AT_B
#define HARDWARE_GROUP_AT_045
#define USE_SERIAL_TELEMETRY
#endif


#ifdef SKYSTARS_MVP60_F421
#define FIRMWARE_NAME "Skystars 60A"
#define FILE_NAME "SKYSTARS_MVP60_F421"
#define DEAD_TIME 70
#define HARDWARE_GROUP_AT_B
#define HARDWARE_GROUP_AT_045
#define USE_SERIAL_TELEMETRY
#endif

/*****************************************************AT32F415 targets ************************************************/

Expand Down Expand Up @@ -522,6 +538,15 @@
#define USE_SERIAL_TELEMETRY
#endif

#ifdef SDMODEL_F051
#define FILE_NAME "SDMODEL_F051"
#define FIRMWARE_NAME "SDModel F051"
#define DEAD_TIME 45
#define HARDWARE_GROUP_F0_U
#define HARDWARE_GROUP_F0_045
#define USE_SERIAL_TELEMETRY
#endif

#ifdef IFLIGHT_F051
#define FILE_NAME "IFLIGHT_F051"
#define FIRMWARE_NAME "IFlight_50A "
Expand Down Expand Up @@ -2195,7 +2220,7 @@
#define APPLICATION_ADDRESS 0x08001000
#define MAIN_COMP COMP1
#define EXTI_LINE LL_EXTI_LINE_21
#define TARGET_MIN_BEMF_COUNTS 4
#define TARGET_MIN_BEMF_COUNTS 3
#define COMPARATOR_IRQ ADC1_COMP_IRQn
#define USE_ADC
#ifndef CURRENT_ADC_PIN
Expand Down Expand Up @@ -2242,7 +2267,7 @@
#define APPLICATION_ADDRESS 0x08001000
#define MAIN_COMP COMP2
#define EXTI_LINE LL_EXTI_LINE_18
#define TARGET_MIN_BEMF_COUNTS 3
#define TARGET_MIN_BEMF_COUNTS 2
#define COMPARATOR_IRQ ADC1_COMP_IRQn
#define USE_ADC
#ifndef CURRENT_ADC_CHANNEL
Expand Down
3 changes: 1 addition & 2 deletions Keil_Projects/AM32_MultiProject.uvmpw
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

<project>
<PathAndName>.\Am32F051.uvprojx</PathAndName>
<NodeIsActive>1</NodeIsActive>
<NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
</project>

Expand All @@ -29,8 +30,6 @@

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

Expand Down
210 changes: 132 additions & 78 deletions Keil_Projects/AM32_MultiProject.uvmpw.uvgui.alkaz

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions Keil_Projects/Am32F031.uvguix.alkaz
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
</View>
<View>
<WinId>466</WinId>
<ViewName>Source Browser - *** Not Enabled ***</ViewName>
<ViewName>Source Browser</ViewName>
<UserString>500</UserString>
<TableColWidths>300</TableColWidths>
</View>
Expand All @@ -93,25 +93,25 @@
<flags>2</flags>
<showCmd>3</showCmd>
<MinPosition>
<xPos>-1</xPos>
<yPos>-1</yPos>
<xPos>-32000</xPos>
<yPos>-32000</yPos>
</MinPosition>
<MaxPosition>
<xPos>-1</xPos>
<yPos>-1</yPos>
</MaxPosition>
<NormalPosition>
<Top>163</Top>
<Left>554</Left>
<Right>1879</Right>
<Bottom>1013</Bottom>
<Top>169</Top>
<Left>294</Left>
<Right>1619</Right>
<Bottom>1019</Bottom>
</NormalPosition>
</WindowPosition>
<MDIClientArea>
<RegID>0</RegID>
<MDITabState>
<Len>1512</Len>
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000D00000008000000010000006D433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C447269766572735C53544D3332473078785F48414C5F4472697665725C5372635C73746D3332673078785F6C6C5F7263632E63000000001273746D3332673078785F6C6C5F7263632E6300000000C5D4F200FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C494F2E630000000004494F2E6300000000FFDC7800FFFFFFFF3D433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C7369676E616C2E6300000000087369676E616C2E6300000000BECEA100FFFFFFFF3E433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C746172676574732E680000000009746172676574732E6800000000F0A0A100FFFFFFFF5C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C447269766572735C647269766572735C7372635C61743332663432315F746D722E63000000000E61743332663432315F746D722E6300000000BCA8E100FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C7065726970686572616C732E63000000000D7065726970686572616C732E63000000009CC1B600FFFFFFFF50433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C73657269616C5F74656C656D657472792E63000000001273657269616C5F74656C656D657472792E6300000000F7B88600FFFFFFFF46433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C5753323831322E6300000000085753323831322E6300000000D9ADC200FFFFFFFF3B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6D61696E2E6300000000066D61696E2E6300000000A5C2D700FFFFFFFF4A433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C636F6D70617261746F722E63000000000C636F6D70617261746F722E6300000000B3A6BE00FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C61743332663432315F69742E63000000000D61743332663432315F69742E6300000000EAD6A300FFFFFFFF43433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C4144432E6300000000054144432E6300000000F6FA7D00FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C6D63755C663432315C496E635C7065726970686572616C732E68000000000D7065726970686572616C732E6800000000B5E99D00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000B50100007000000080070000DA020000</Data>
<Len>2088</Len>
<Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000013000000020000000100000042433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C494F2E630000000004494F2E6300000000C5D4F200FFFFFFFF3D433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C7369676E616C2E6300000000087369676E616C2E6300000000FFDC7800FFFFFFFF3E433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C696E635C746172676574732E680000000009746172676574732E6800000000BECEA100FFFFFFFF5C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C447269766572735C647269766572735C7372635C61743332663432315F746D722E63000000000E61743332663432315F746D722E6300000000F0A0A100FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C7065726970686572616C732E63000000000D7065726970686572616C732E6300000000BCA8E100FFFFFFFF50433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C73657269616C5F74656C656D657472792E63000000001273657269616C5F74656C656D657472792E63000000009CC1B600FFFFFFFF46433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C5753323831322E6300000000085753323831322E6300000000F7B88600FFFFFFFF3B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6D61696E2E6300000000066D61696E2E6300000000D9ADC200FFFFFFFF4A433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C636F6D70617261746F722E63000000000C636F6D70617261746F722E6300000000A5C2D700FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C61743332663432315F69742E63000000000D61743332663432315F69742E6300000000B3A6BE00FFFFFFFF43433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C4144432E6300000000054144432E6300000000EAD6A300FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C6D63755C663432315C496E635C7065726970686572616C732E68000000000D7065726970686572616C732E6800000000F6FA7D00FFFFFFFF50433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C653233305C5372635C73657269616C5F74656C656D657472792E63000000001273657269616C5F74656C656D657472792E6300000000B5E99D00FFFFFFFF4A433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C653233305C5372635C636F6D70617261746F722E63000000000C636F6D70617261746F722E63000000005FC3CF00FFFFFFFF3D433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C736F756E64732E630000000008736F756E64732E6300000000C1838300FFFFFFFF49433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C70686173656F7574732E63000000000B70686173656F7574732E6300000000CACAD500FFFFFFFF4A433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C636F6D70617261746F722E63000000000C636F6D70617261746F722E6300000000C5D4F200FFFFFFFF49433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C70686173656F7574732E63000000000B70686173656F7574732E6300000000FFDC7800FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663035315C5372635C7065726970686572616C732E63000000000D7065726970686572616C732E6300000000BECEA100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000B50100005400000080070000DA020000</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>&lt;1&gt;..\inc\targets.h</Name>
<ColumnNumber>19</ColumnNumber>
<TopLine>648</TopLine>
<CurrentLine>654</CurrentLine>
Expand Down
Loading

0 comments on commit 3a88000

Please sign in to comment.