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

Prevent 'system_hse_mhz' from showing in non-F4 'diff'/'dump'.

Browse source
This commit is contained in:
mikeller 2019-05-12 23:19:35 +12:00
parent a8e9dd94e8
commit 411467d9ef
19 changed files with 14 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1278,7 +1278,9 @@ const clivalue_t valueTable[] = {
#endif #endif
// PG_SYSTEM_CONFIG // PG_SYSTEM_CONFIG
#if defined(STM32F4)
{ "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
#if defined(USE_TASK_STATISTICS) #if defined(USE_TASK_STATISTICS)
{ "task_statistics", VAR_INT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_SYSTEM_CONFIG, offsetof(systemConfig_t, task_statistics) }, { "task_statistics", VAR_INT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_SYSTEM_CONFIG, offsetof(systemConfig_t, task_statistics) },
#endif #endif

10
src/main/target/common_post.h
View file

@ -217,9 +217,13 @@
#ifdef USE_UNIFIED_TARGET #ifdef USE_UNIFIED_TARGET
#define USE_CONFIGURATION_STATE #define USE_CONFIGURATION_STATE
#endif
// Setup crystal frequency for backward compatibility // Setup crystal frequency on F4 for backward compatibility
// Should be set to zero for generic targets and set with CLI variable set system_hse_value. // Should be set to zero for generic targets to ensure USB is working
// when unconfigured for targets with non-standard crystal.
// Can be set at runtime with with CLI parameter 'system_hse_value'.
#if !defined(STM32F4) || defined(USE_UNIFIED_TARGET)
#define SYSTEM_HSE_VALUE 0 #define SYSTEM_HSE_VALUE 0
#else #else
#ifdef TARGET_XTAL_MHZ #ifdef TARGET_XTAL_MHZ
@ -227,7 +231,7 @@
#else #else
#define SYSTEM_HSE_VALUE (HSE_VALUE/1000000U) #define SYSTEM_HSE_VALUE (HSE_VALUE/1000000U)
#endif #endif
#endif // USE_UNIFIED_TARGET #endif // !STM32F4 || USE_UNIFIED_TARGET
// Number of pins that needs pre-init // Number of pins that needs pre-init
#ifdef USE_SPI #ifdef USE_SPI

1
unified_targets/configs/CLRACINGF7.config
View file

@ -83,7 +83,6 @@ dma pin B08 0 # pin B08: DMA1 Stream 7 Channel 2
dma pin B01 0 # pin B01: DMA1 Stream 2 Channel 5 dma pin B01 0 # pin B01: DMA1 Stream 2 Channel 5
# master # master
set system_hse_mhz = 8
set dashboard_i2c_bus = 1 set dashboard_i2c_bus = 1
resource RX_BIND_PLUG 1 B02 resource RX_BIND_PLUG 1 B02
resource CAMERA_CONTROL 1 B03 resource CAMERA_CONTROL 1 B03

3
unified_targets/configs/ELINF722.config
View file

@ -141,7 +141,6 @@ set osd_ah_sbar_pos = 2254
set osd_ah_pos = 2126 set osd_ah_pos = 2126
set osd_compass_bar_pos = 106 set osd_compass_bar_pos = 106
set osd_warnings_pos = 2377 set osd_warnings_pos = 2377
set system_hse_mhz = 8
set vcd_video_system = NTSC set vcd_video_system = NTSC
set max7456_spi_bus = 2 set max7456_spi_bus = 2
set dashboard_i2c_bus = 1 set dashboard_i2c_bus = 1
@ -150,4 +149,4 @@ set flash_spi_bus = 3
set gyro_1_bustype = SPI set gyro_1_bustype = SPI
set gyro_1_spibus = 1 set gyro_1_spibus = 1
set gyro_1_sensor_align = CW0 set gyro_1_sensor_align = CW0
set gyro_2_spibus = 1 set gyro_2_spibus = 1

3
unified_targets/configs/FLYWOOF7DUAL.config
View file

@ -120,7 +120,6 @@ set battery_meter = ADC
set ibata_scale = 170 set ibata_scale = 170
set beeper_inversion = ON set beeper_inversion = ON
set beeper_od = OFF set beeper_od = OFF
set system_hse_mhz = 8
set max7456_spi_bus = 2 set max7456_spi_bus = 2
set dashboard_i2c_bus = 1 set dashboard_i2c_bus = 1
set pinio_box = 40,41,255,255 set pinio_box = 40,41,255,255
@ -129,4 +128,4 @@ set gyro_1_bustype = SPI
set gyro_1_spibus = 1 set gyro_1_spibus = 1
set gyro_1_sensor_align = CW270FLIP set gyro_1_sensor_align = CW270FLIP
set gyro_2_spibus = 1 set gyro_2_spibus = 1
set gyro_2_sensor_align = CW270 set gyro_2_sensor_align = CW270

1
unified_targets/configs/FOXEERF722DUAL.config
View file

@ -91,7 +91,6 @@ set current_meter = ADC
set battery_meter = ADC set battery_meter = ADC
set beeper_inversion = ON set beeper_inversion = ON
set beeper_od = OFF set beeper_od = OFF
set system_hse_mhz = 8
set max7456_spi_bus = 3 set max7456_spi_bus = 3
set dashboard_i2c_bus = 1 set dashboard_i2c_bus = 1
set flash_spi_bus = 2 set flash_spi_bus = 2

1
unified_targets/configs/HGLRCF745.config
View file

@ -112,7 +112,6 @@ set beeper_frequency = 0
set sdcard_detect_inverted = ON set sdcard_detect_inverted = ON
set sdcard_mode = SPI set sdcard_mode = SPI
set sdcard_spi_bus = 4 set sdcard_spi_bus = 4
set system_hse_mhz = 8
set max7456_clock = DEFAULT set max7456_clock = DEFAULT
set max7456_spi_bus = 2 set max7456_spi_bus = 2
set max7456_preinit_opu = OFF set max7456_preinit_opu = OFF

1
unified_targets/configs/JHEF7DUAL.config
View file

@ -92,7 +92,6 @@ set battery_meter = ADC
set ibata_scale = 450 set ibata_scale = 450
set beeper_inversion = ON set beeper_inversion = ON
set beeper_od = OFF set beeper_od = OFF
set system_hse_mhz = 8
set max7456_spi_bus = 2 set max7456_spi_bus = 2
set dashboard_i2c_bus = 1 set dashboard_i2c_bus = 1
set flash_spi_bus = 3 set flash_spi_bus = 3

1
unified_targets/configs/KAKUTEF7.config
View file

@ -91,7 +91,6 @@ set beeper_od = OFF
set sdcard_detect_inverted = ON set sdcard_detect_inverted = ON
set sdcard_mode = SPI set sdcard_mode = SPI
set sdcard_spi_bus = 1 set sdcard_spi_bus = 1
set system_hse_mhz = 8
set max7456_spi_bus = 2 set max7456_spi_bus = 2
set dashboard_i2c_bus = 1 set dashboard_i2c_bus = 1
set gyro_1_bustype = SPI set gyro_1_bustype = SPI

1
unified_targets/configs/KAKUTEF7MINI.config
View file

@ -85,7 +85,6 @@ set current_meter = ADC
set battery_meter = ADC set battery_meter = ADC
set beeper_inversion = ON set beeper_inversion = ON
set beeper_od = OFF set beeper_od = OFF
set system_hse_mhz = 8
set max7456_spi_bus = 2 set max7456_spi_bus = 2
set dashboard_i2c_bus = 1 set dashboard_i2c_bus = 1
set flash_spi_bus = 1 set flash_spi_bus = 1

6
unified_targets/configs/MATEKF722.config
View file

@ -1,4 +1,4 @@
# Betaflight / STM32F7X2 (S7X2) 4.0.0 Mar 15 2019 / 08:10:21 (d50e721) MSP API: 1.41 # Betaflight / STM32F7X2 (S7X2) 4.1.0 May 12 2019 / 23:09:44 (a8e9dd94e) MSP API: 1.42
board_name MATEKF722 board_name MATEKF722
manufacturer_id MTKS manufacturer_id MTKS
@ -96,6 +96,7 @@ set mag_bustype = I2C
set mag_i2c_device = 1 set mag_i2c_device = 1
set baro_bustype = I2C set baro_bustype = I2C
set baro_i2c_device = 1 set baro_i2c_device = 1
set blackbox_device = SDCARD
set dshot_burst = ON set dshot_burst = ON
set current_meter = ADC set current_meter = ADC
set battery_meter = ADC set battery_meter = ADC
@ -104,10 +105,9 @@ set beeper_inversion = ON
set beeper_od = OFF set beeper_od = OFF
set sdcard_mode = SPI set sdcard_mode = SPI
set sdcard_spi_bus = 3 set sdcard_spi_bus = 3
set system_hse_mhz = 8
set max7456_spi_bus = 2 set max7456_spi_bus = 2
set dashboard_i2c_bus = 1 set dashboard_i2c_bus = 1
set gyro_1_bustype = SPI set gyro_1_bustype = SPI
set gyro_1_spibus = 1 set gyro_1_spibus = 1
set gyro_1_sensor_align = CW180 set gyro_1_sensor_align = CW180
set gyro_2_spibus = 1 set gyro_2_spibus = 1

1
unified_targets/configs/MATEKF722SE.config
View file

@ -113,7 +113,6 @@ set beeper_inversion = ON
set beeper_od = OFF set beeper_od = OFF
set sdcard_mode = SPI set sdcard_mode = SPI
set sdcard_spi_bus = 3 set sdcard_spi_bus = 3
set system_hse_mhz = 8
set max7456_spi_bus = 2 set max7456_spi_bus = 2
set flash_spi_bus = 3 set flash_spi_bus = 3
set gyro_1_bustype = SPI set gyro_1_bustype = SPI

3
unified_targets/configs/NERO.config
View file

@ -7,9 +7,6 @@ manufacturer_id BKMN
defaults nosave defaults nosave
# External crystal frequency
set system_hse_mhz = 8
# Basic I/O # Basic I/O
resource LED 1 B06 resource LED 1 B06
resource LED 2 B05 resource LED 2 B05

1
unified_targets/configs/OMNIBUSF4NANOV7.config
View file

@ -81,7 +81,6 @@ set ibata_scale = 179
set beeper_inversion = ON set beeper_inversion = ON
set beeper_od = OFF set beeper_od = OFF
set pid_process_denom = 1 set pid_process_denom = 1
set system_hse_mhz = 8
set max7456_spi_bus = 2 set max7456_spi_bus = 2
set flash_spi_bus = 1 set flash_spi_bus = 1
set gyro_1_bustype = SPI set gyro_1_bustype = SPI

1
unified_targets/configs/OMNIBUSF7NANOV7.config
View file

@ -81,7 +81,6 @@ set ibata_scale = 179
set beeper_inversion = ON set beeper_inversion = ON
set beeper_od = OFF set beeper_od = OFF
set pid_process_denom = 1 set pid_process_denom = 1
set system_hse_mhz = 8
set max7456_spi_bus = 2 set max7456_spi_bus = 2
set flash_spi_bus = 1 set flash_spi_bus = 1
set gyro_1_bustype = SPI set gyro_1_bustype = SPI

1
unified_targets/configs/OMNIBUSF7V2.config
View file

@ -100,7 +100,6 @@ set beeper_od = OFF
set sdcard_detect_inverted = ON set sdcard_detect_inverted = ON
set sdcard_mode = SPI set sdcard_mode = SPI
set sdcard_spi_bus = 4 set sdcard_spi_bus = 4
set system_hse_mhz = 8
set max7456_spi_bus = 2 set max7456_spi_bus = 2
set dashboard_i2c_bus = 2 set dashboard_i2c_bus = 2
set gyro_1_bustype = SPI set gyro_1_bustype = SPI

1
unified_targets/configs/RUSHCORE7.config
View file

@ -84,7 +84,6 @@ set current_meter = ADC
set battery_meter = ADC set battery_meter = ADC
set beeper_inversion = ON set beeper_inversion = ON
set beeper_od = OFF set beeper_od = OFF
set system_hse_mhz = 8
set max7456_spi_bus = 2 set max7456_spi_bus = 2
set dashboard_i2c_bus = 1 set dashboard_i2c_bus = 1
set flash_spi_bus = 3 set flash_spi_bus = 3

1
unified_targets/configs/SPRACINGF7DUAL.config
View file

@ -120,7 +120,6 @@ set beeper_inversion = ON
set beeper_od = OFF set beeper_od = OFF
set sdcard_mode = SPI set sdcard_mode = SPI
set sdcard_spi_bus = 3 set sdcard_spi_bus = 3
set system_hse_mhz = 8
set max7456_spi_bus = 2 set max7456_spi_bus = 2
set dashboard_i2c_bus = 1 set dashboard_i2c_bus = 1
set gyro_1_bustype = SPI set gyro_1_bustype = SPI

1
unified_targets/configs/TRANSTECF7.config
View file

@ -93,7 +93,6 @@ set blackbox_device = NONE
set dshot_burst = ON set dshot_burst = ON
set current_meter = ADC set current_meter = ADC
set battery_meter = ADC set battery_meter = ADC
set system_hse_mhz = 8
set max7456_spi_bus = 2 set max7456_spi_bus = 2
set dashboard_i2c_bus = 1 set dashboard_i2c_bus = 1
set gyro_1_spibus = 1 set gyro_1_spibus = 1