Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-15 04:15:44 +03:00
Code Issues Wiki Activity

[G4] CLI and config changes for overclocking

Browse source
This commit is contained in:
jflyper 2019-09-26 20:44:17 +09:00
parent 575460ac52
commit 08f1f91c50
5 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/cli/cli.c
View file

@ -4673,8 +4673,8 @@ static void cliStatus(const char *cmdName, char *cmdline)
cliPrintf("MCU %s Clock=%dMHz", getMcuTypeById(getMcuTypeId()), (SystemCoreClock / 1000000)); cliPrintf("MCU %s Clock=%dMHz", getMcuTypeById(getMcuTypeId()), (SystemCoreClock / 1000000));
#ifdef STM32F4 #if defined(STM32F4) || defined(STM32G4)
// Only F4 is capable of switching between HSE/HSI (for now) // Only F4 and G4 is capable of switching between HSE/HSI (for now)
int sysclkSource = SystemSYSCLKSource(); int sysclkSource = SystemSYSCLKSource();
const char *SYSCLKSource[] = { "HSI", "HSE", "PLLP", "PLLR" }; const char *SYSCLKSource[] = { "HSI", "HSE", "PLLP", "PLLR" };

4
src/main/cli/settings.c
View file

@ -351,7 +351,7 @@ static const char * const lookupTableRatesType[] = {
#ifdef USE_OVERCLOCK #ifdef USE_OVERCLOCK
static const char * const lookupOverclock[] = { static const char * const lookupOverclock[] = {
"OFF", "OFF",
#if defined(STM32F40_41xxx) #if defined(STM32F40_41xxx) || defined(STM32G4)
"192MHZ", "216MHZ", "240MHZ" "192MHZ", "216MHZ", "240MHZ"
#elif defined(STM32F411xE) #elif defined(STM32F411xE)
"108MHZ", "120MHZ" "108MHZ", "120MHZ"
@ -1429,7 +1429,7 @@ const clivalue_t valueTable[] = {
#endif // end of #ifdef USE_OSD #endif // end of #ifdef USE_OSD
// PG_SYSTEM_CONFIG // PG_SYSTEM_CONFIG
#if defined(STM32F4) #if defined(STM32F4) || defined(STM32G4)
{ "system_hse_mhz", VAR_UINT8 | HARDWARE_VALUE, .config.minmaxUnsigned = { 0, 30 }, PG_SYSTEM_CONFIG, offsetof(systemConfig_t, hseMhz) }, { "system_hse_mhz", VAR_UINT8 | HARDWARE_VALUE, .config.minmaxUnsigned = { 0, 30 }, PG_SYSTEM_CONFIG, offsetof(systemConfig_t, hseMhz) },
#endif #endif
#if defined(USE_TASK_STATISTICS) #if defined(USE_TASK_STATISTICS)

2
src/main/config/config.c
View file

@ -126,7 +126,7 @@ PG_RESET_TEMPLATE(systemConfig_t, systemConfig,
.cpu_overclock = DEFAULT_CPU_OVERCLOCK, .cpu_overclock = DEFAULT_CPU_OVERCLOCK,
.powerOnArmingGraceTime = 5, .powerOnArmingGraceTime = 5,
.boardIdentifier = TARGET_BOARD_IDENTIFIER, .boardIdentifier = TARGET_BOARD_IDENTIFIER,
.hseMhz = SYSTEM_HSE_VALUE, // Not used for non-F4 targets .hseMhz = SYSTEM_HSE_VALUE, // Only used for F4 and G4 targets
.configurationState = CONFIGURATION_STATE_DEFAULTS_BARE, .configurationState = CONFIGURATION_STATE_DEFAULTS_BARE,
.schedulerOptimizeRate = SCHEDULER_OPTIMIZE_RATE_AUTO, .schedulerOptimizeRate = SCHEDULER_OPTIMIZE_RATE_AUTO,
.enableStickArming = false, .enableStickArming = false,

4
src/main/config/config.h
View file

@ -55,8 +55,8 @@ typedef struct systemConfig_s {
uint8_t cpu_overclock; uint8_t cpu_overclock;
uint8_t powerOnArmingGraceTime; // in seconds uint8_t powerOnArmingGraceTime; // in seconds
char boardIdentifier[sizeof(TARGET_BOARD_IDENTIFIER) + 1]; char boardIdentifier[sizeof(TARGET_BOARD_IDENTIFIER) + 1];
uint8_t hseMhz; // Not used for non-F4 targets uint8_t hseMhz; // Only used for F4 and G4 targets
uint8_t configurationState; // The state of the configuration (defaults / configured) uint8_t configurationState; // The state of the configuration (defaults / configured)
uint8_t schedulerOptimizeRate; uint8_t schedulerOptimizeRate;
uint8_t enableStickArming; // boolean that determines whether stick arming can be used uint8_t enableStickArming; // boolean that determines whether stick arming can be used
} systemConfig_t; } systemConfig_t;

5
src/main/fc/init.c
View file

@ -529,8 +529,9 @@ void init(void)
} }
#endif #endif
#ifdef STM32F4 #if defined(STM32F4) || defined(STM32G4)
// Only F4 has non-8MHz boards // F4 has non-8MHz boards
// G4 for Betaflight allow 24 or 27MHz oscillator
systemClockSetHSEValue(systemConfig()->hseMhz * 1000000U); systemClockSetHSEValue(systemConfig()->hseMhz * 1000000U);
#endif #endif