diff --git a/src/main/sensors/battery.c b/src/main/sensors/battery.c index a0e7af7956..403dcb451a 100644 --- a/src/main/sensors/battery.c +++ b/src/main/sensors/battery.c @@ -70,9 +70,7 @@ static batteryState_e batteryState; static batteryState_e voltageState; static batteryState_e consumptionState; -#ifdef BOARD_HAS_CURRENT_SENSOR -#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC -#else +#ifndef DEFAULT_CURRENT_METER_SOURCE #ifdef USE_VIRTUAL_CURRENT_METER #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_VIRTUAL #else @@ -84,9 +82,7 @@ static batteryState_e consumptionState; #endif #endif -#ifdef BOARD_HAS_VOLTAGE_DIVIDER -#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC -#else +#ifndef DEFAULT_VOLTAGE_METER_SOURCE #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_NONE #endif @@ -102,7 +98,7 @@ PG_RESET_TEMPLATE(batteryConfig_t, batteryConfig, // current .batteryCapacity = 0, - .currentMeterSource = DEFAULT_VOLTAGE_METER_SOURCE, + .currentMeterSource = DEFAULT_CURRENT_METER_SOURCE, // warnings / alerts .useVBatAlerts = true, diff --git a/src/main/target/AIR32/target.h b/src/main/target/AIR32/target.h index 6e673db741..f32e90f244 100644 --- a/src/main/target/AIR32/target.h +++ b/src/main/target/AIR32/target.h @@ -91,7 +91,7 @@ #define USE_FLASH_M25P16 #define USE_ADC -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define ADC_INSTANCE ADC2 #define VBAT_ADC_PIN PA5 //#define CURRENT_METER_ADC_PIN PA5 diff --git a/src/main/target/AIRHEROF3/target.h b/src/main/target/AIRHEROF3/target.h index 704065e302..b0a6b87197 100755 --- a/src/main/target/AIRHEROF3/target.h +++ b/src/main/target/AIRHEROF3/target.h @@ -78,7 +78,7 @@ #define UART3_TX_PIN PB10 // PB10 (AF7) #define UART3_RX_PIN PB11 // PB11 (AF7) -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define USE_ADC #define ADC_INSTANCE ADC2 #define VBAT_ADC_PIN PA4 diff --git a/src/main/target/ALIENFLIGHTF4/target.h b/src/main/target/ALIENFLIGHTF4/target.h index 68dbd1c2db..18200a4d1f 100644 --- a/src/main/target/ALIENFLIGHTF4/target.h +++ b/src/main/target/ALIENFLIGHTF4/target.h @@ -148,8 +148,8 @@ #define I2C1_SDA PB7 #define USE_ADC -//#define BOARD_HAS_VOLTAGE_DIVIDER -//#define BOARD_HAS_CURRENT_SENSOR +//#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC +//#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define VBAT_ADC_PIN PC0 #define CURRENT_METER_ADC_PIN PC1 #define RSSI_ADC_PIN PC4 diff --git a/src/main/target/ALIENFLIGHTNGF7/target.h b/src/main/target/ALIENFLIGHTNGF7/target.h index 0a8df26261..00e888e5d0 100644 --- a/src/main/target/ALIENFLIGHTNGF7/target.h +++ b/src/main/target/ALIENFLIGHTNGF7/target.h @@ -158,8 +158,8 @@ #define I2C1_SDA PB7 #define USE_ADC -//#define BOARD_HAS_VOLTAGE_DIVIDER -//#define BOARD_HAS_CURRENT_SENSOR +//#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC +//#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define VBAT_ADC_PIN PC0 #define CURRENT_METER_ADC_PIN PC1 #define RSSI_ADC_PIN PC4 diff --git a/src/main/target/BEEROTORF4/target.h b/src/main/target/BEEROTORF4/target.h index efdabef619..409bf75103 100644 --- a/src/main/target/BEEROTORF4/target.h +++ b/src/main/target/BEEROTORF4/target.h @@ -131,7 +131,6 @@ #define I2C1_SCL PB6 #define I2C1_SDA PB7 -#define BOARD_HAS_VOLTAGE_DIVIDER #define USE_ADC #define ADC1_DMA_STREAM DMA2_Stream0 @@ -147,6 +146,8 @@ #define DEFAULT_FEATURES ( FEATURE_TELEMETRY | FEATURE_OSD | FEATURE_AIRMODE ) #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC +#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_UART SERIAL_PORT_USART2 diff --git a/src/main/target/BETAFLIGHTF3/target.h b/src/main/target/BETAFLIGHTF3/target.h index 4ec9b06927..27e2a5c360 100755 --- a/src/main/target/BETAFLIGHTF3/target.h +++ b/src/main/target/BETAFLIGHTF3/target.h @@ -110,8 +110,8 @@ #define SDCARD_DMA_CHANNEL_TX DMA1_Channel5 #define SDCARD_DMA_CHANNEL_TX_COMPLETE_FLAG DMA1_FLAG_TC5 -#define BOARD_HAS_VOLTAGE_DIVIDER -#define BOARD_HAS_CURRENT_SENSOR +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC +#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define USE_ADC #define ADC_INSTANCE ADC2 #define VBAT_ADC_PIN PA4 diff --git a/src/main/target/BLUEJAYF4/target.h b/src/main/target/BLUEJAYF4/target.h index 027eb69797..cd5516755a 100644 --- a/src/main/target/BLUEJAYF4/target.h +++ b/src/main/target/BLUEJAYF4/target.h @@ -26,7 +26,7 @@ #define USE_HARDWARE_REVISION_DETECTION #define HW_PIN PB2 -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define LED0 PB6 #define LED1 PB5 diff --git a/src/main/target/CLRACINGF7/target.h b/src/main/target/CLRACINGF7/target.h index 3ffc917ef2..220df0107a 100644 --- a/src/main/target/CLRACINGF7/target.h +++ b/src/main/target/CLRACINGF7/target.h @@ -103,8 +103,8 @@ #define USE_ADC -#define BOARD_HAS_VOLTAGE_DIVIDER -#define BOARD_HAS_CURRENT_SENSOR +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC +#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define CURRENT_METER_ADC_PIN PC1 #define VBAT_ADC_PIN PC2 #define RSSI_ADC_PIN PC3 diff --git a/src/main/target/DOGE/target.h b/src/main/target/DOGE/target.h index bc9ebb3872..cd6206c225 100644 --- a/src/main/target/DOGE/target.h +++ b/src/main/target/DOGE/target.h @@ -112,7 +112,7 @@ #define UART3_TX_PIN PB10 #define UART3_RX_PIN PB11 -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define USE_ADC #define ADC_INSTANCE ADC2 #define ADC24_DMA_REMAP // moves ADC2 DMA from DMA2ch1 to DMA2ch3. diff --git a/src/main/target/F4BY/target.h b/src/main/target/F4BY/target.h index 4fed5a79fb..df1f436278 100644 --- a/src/main/target/F4BY/target.h +++ b/src/main/target/F4BY/target.h @@ -133,7 +133,7 @@ #define I2C2_SCL PB10 #define I2C2_SDA PB11 -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define USE_ADC #define VBAT_ADC_PIN PC3 #define CURRENT_METER_ADC_PIN PC2 diff --git a/src/main/target/FURYF3/target.h b/src/main/target/FURYF3/target.h index 21fb5b0f90..a58c27a134 100644 --- a/src/main/target/FURYF3/target.h +++ b/src/main/target/FURYF3/target.h @@ -95,7 +95,7 @@ #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT #define DEFAULT_FEATURES (FEATURE_OSD) - #define BOARD_HAS_CURRENT_SENSOR + #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #else #define USE_SDCARD @@ -159,7 +159,7 @@ #define UART3_TX_PIN PB10 // PB10 (AF7) #define UART3_RX_PIN PB11 // PB11 (AF7) -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define USE_ADC #define ADC_INSTANCE ADC1 #define VBAT_ADC_PIN PA0 diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h index fe691c1a71..45d9c65113 100644 --- a/src/main/target/FURYF4/target.h +++ b/src/main/target/FURYF4/target.h @@ -170,7 +170,7 @@ #define I2C1_SDA PB7 #define USE_ADC -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define VBAT_ADC_PIN PC1 #define RSSI_ADC_PIN PC2 #define CURRENT_METER_ADC_PIN PC3 diff --git a/src/main/target/FURYF7/target.h b/src/main/target/FURYF7/target.h index 26577662d8..e7c09271b1 100644 --- a/src/main/target/FURYF7/target.h +++ b/src/main/target/FURYF7/target.h @@ -126,7 +126,7 @@ #define I2C1_SDA PB7 #define USE_ADC -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define VBAT_ADC_PIN PC1 #define RSSI_ADC_PIN PC2 #define CURRENT_METER_ADC_PIN PC3 diff --git a/src/main/target/IMPULSERCF3/target.h b/src/main/target/IMPULSERCF3/target.h index 275642d368..5f09f84c33 100644 --- a/src/main/target/IMPULSERCF3/target.h +++ b/src/main/target/IMPULSERCF3/target.h @@ -80,7 +80,7 @@ #define MPU6000_CS_PIN PA4 #define MPU6000_SPI_INSTANCE SPI1 -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define USE_ADC #define ADC_INSTANCE ADC1 #define CURRENT_METER_ADC_PIN PA0 diff --git a/src/main/target/IRCFUSIONF3/target.h b/src/main/target/IRCFUSIONF3/target.h index a57556b510..bec37f4b37 100644 --- a/src/main/target/IRCFUSIONF3/target.h +++ b/src/main/target/IRCFUSIONF3/target.h @@ -72,7 +72,7 @@ #define M25P16_CS_PIN PB12 #define M25P16_SPI_INSTANCE SPI2 -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define USE_ADC #define ADC_INSTANCE ADC2 #define VBAT_ADC_PIN PA4 diff --git a/src/main/target/ISHAPEDF3/target.h b/src/main/target/ISHAPEDF3/target.h index a72867e8b4..10c283ce37 100644 --- a/src/main/target/ISHAPEDF3/target.h +++ b/src/main/target/ISHAPEDF3/target.h @@ -89,7 +89,7 @@ #define M25P16_CS_PIN PB12 #define M25P16_SPI_INSTANCE SPI2 -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define USE_ADC #define ADC_INSTANCE ADC2 #define VBAT_ADC_PIN PA4 diff --git a/src/main/target/KAKUTEF4/target.h b/src/main/target/KAKUTEF4/target.h index 059a369a81..ced4a1a54d 100644 --- a/src/main/target/KAKUTEF4/target.h +++ b/src/main/target/KAKUTEF4/target.h @@ -117,7 +117,7 @@ #define USE_I2C_DEVICE_1 #define I2C_DEVICE (I2CDEV_1) -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define USE_ADC #define VBAT_ADC_PIN PC3 #define VBAT_ADC_CHANNEL ADC_Channel_13 diff --git a/src/main/target/KIWIF4/target.h b/src/main/target/KIWIF4/target.h index cc20cb1dc3..3d7b8658be 100644 --- a/src/main/target/KIWIF4/target.h +++ b/src/main/target/KIWIF4/target.h @@ -165,7 +165,7 @@ #define LED_STRIP #define USE_ADC -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define VBAT_ADC_PIN PC1 #define RSSI_ADC_PIN PC2 #define CURRENT_METER_ADC_PIN PC3 diff --git a/src/main/target/KROOZX/target.h b/src/main/target/KROOZX/target.h index c743697e40..a493c79b28 100755 --- a/src/main/target/KROOZX/target.h +++ b/src/main/target/KROOZX/target.h @@ -85,8 +85,8 @@ #define OSD_CH_SWITCH PC5 -#define BOARD_HAS_VOLTAGE_DIVIDER -#define BOARD_HAS_CURRENT_SENSOR +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC +#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define USE_ADC #define ADC_INSTANCE ADC1 #define VBAT_ADC_PIN PC3 diff --git a/src/main/target/LUX_RACE/target.h b/src/main/target/LUX_RACE/target.h index c2ca8fed7a..88e86f5ad8 100644 --- a/src/main/target/LUX_RACE/target.h +++ b/src/main/target/LUX_RACE/target.h @@ -22,7 +22,7 @@ #else #define TARGET_BOARD_IDENTIFIER "LUX" #endif -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT diff --git a/src/main/target/MOTOLAB/target.h b/src/main/target/MOTOLAB/target.h index 7755696a63..b1125bce03 100644 --- a/src/main/target/MOTOLAB/target.h +++ b/src/main/target/MOTOLAB/target.h @@ -90,7 +90,7 @@ #define USE_FLASHFS #define USE_FLASH_M25P16 -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define USE_ADC #define ADC_INSTANCE ADC2 #define VBAT_ADC_PIN PA5 diff --git a/src/main/target/MULTIFLITEPICO/target.h b/src/main/target/MULTIFLITEPICO/target.h index 7db666246a..d646884666 100755 --- a/src/main/target/MULTIFLITEPICO/target.h +++ b/src/main/target/MULTIFLITEPICO/target.h @@ -99,7 +99,7 @@ //#define M25P16_CS_PIN PB12 //#define M25P16_SPI_INSTANCE SPI2 -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define USE_ADC #define ADC_INSTANCE ADC2 #define VBAT_ADC_PIN PA4 diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h index 7b193638ab..49cd192575 100644 --- a/src/main/target/NAZE/target.h +++ b/src/main/target/NAZE/target.h @@ -24,7 +24,7 @@ #define USE_HARDWARE_REVISION_DETECTION #define TARGET_BUS_INIT -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define LED0 PB3 #define LED1 PB4 diff --git a/src/main/target/NERO/target.h b/src/main/target/NERO/target.h index a5ae8e5336..3756f95f10 100644 --- a/src/main/target/NERO/target.h +++ b/src/main/target/NERO/target.h @@ -22,7 +22,7 @@ #define HW_PIN PB2 -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define LED0 PB6 #define LED1 PB5 diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h index 5df35d1866..f750a7ba26 100644 --- a/src/main/target/OMNIBUS/target.h +++ b/src/main/target/OMNIBUS/target.h @@ -145,8 +145,8 @@ // #define AFATFS_USE_INTROSPECTIVE_LOGGING #define USE_ADC -#define BOARD_HAS_VOLTAGE_DIVIDER -#define BOARD_HAS_CURRENT_SENSOR +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC +#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define VBAT_ADC_PIN PA0 #define CURRENT_METER_ADC_PIN PA1 #define ADC_INSTANCE ADC1 diff --git a/src/main/target/PIKOBLX/target.h b/src/main/target/PIKOBLX/target.h index 8bd3c9fd26..35555c41aa 100644 --- a/src/main/target/PIKOBLX/target.h +++ b/src/main/target/PIKOBLX/target.h @@ -69,7 +69,7 @@ #define USE_SPI #define USE_SPI_DEVICE_2 -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define USE_ADC #define ADC_INSTANCE ADC2 #define CURRENT_METER_ADC_PIN PB2 diff --git a/src/main/target/RACEBASE/target.h b/src/main/target/RACEBASE/target.h index 8931a45939..6a51c7333e 100755 --- a/src/main/target/RACEBASE/target.h +++ b/src/main/target/RACEBASE/target.h @@ -93,7 +93,7 @@ #define USE_FLASHFS #define USE_FLASH_M25P16 -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define USE_ADC #define ADC_INSTANCE ADC2 #define VBAT_ADC_PIN PA4 diff --git a/src/main/target/RCEXPLORERF3/target.h b/src/main/target/RCEXPLORERF3/target.h index 92d59bc51c..6283a241f0 100644 --- a/src/main/target/RCEXPLORERF3/target.h +++ b/src/main/target/RCEXPLORERF3/target.h @@ -94,7 +94,7 @@ #define SPI2_MOSI_PIN PB15 #define USE_ADC -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define ADC_INSTANCE ADC2 #define VBAT_ADC_PIN PA5 diff --git a/src/main/target/RG_SSD_F3/target.h b/src/main/target/RG_SSD_F3/target.h index 75eb5a96a3..688996f258 100644 --- a/src/main/target/RG_SSD_F3/target.h +++ b/src/main/target/RG_SSD_F3/target.h @@ -116,7 +116,7 @@ #define I2C2_SDA_CLK_SOURCE RCC_AHBPeriph_GPIOA #define USE_ADC -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define ADC_INSTANCE ADC2 diff --git a/src/main/target/SIRINFPV/target.h b/src/main/target/SIRINFPV/target.h index 66b2118a18..d6abafecd6 100644 --- a/src/main/target/SIRINFPV/target.h +++ b/src/main/target/SIRINFPV/target.h @@ -135,7 +135,7 @@ // Performance logging for SD card operations: // #define AFATFS_USE_INTROSPECTIVE_LOGGING -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define USE_ADC #define ADC_INSTANCE ADC1 #define VBAT_ADC_PIN PA0 diff --git a/src/main/target/SPRACINGF3/target.h b/src/main/target/SPRACINGF3/target.h index c1ab6f9830..78075a08e1 100644 --- a/src/main/target/SPRACINGF3/target.h +++ b/src/main/target/SPRACINGF3/target.h @@ -168,8 +168,8 @@ #define M25P16_CS_PIN PB12 #define M25P16_SPI_INSTANCE SPI2 -#define BOARD_HAS_VOLTAGE_DIVIDER -#define BOARD_HAS_CURRENT_SENSOR +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC +#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define USE_ADC #define ADC_INSTANCE ADC2 #define VBAT_ADC_PIN PA4 diff --git a/src/main/target/SPRACINGF3EVO/target.h b/src/main/target/SPRACINGF3EVO/target.h index f4acbf5b98..b9a8708a4c 100755 --- a/src/main/target/SPRACINGF3EVO/target.h +++ b/src/main/target/SPRACINGF3EVO/target.h @@ -148,7 +148,7 @@ #define MPU6500_CS_PIN PB9 #define MPU6500_SPI_INSTANCE SPI1 -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define USE_ADC #define ADC_INSTANCE ADC2 @@ -156,6 +156,7 @@ #ifdef AIORACERF3 #define VBAT_ADC_PIN PA5 #define CURRENT_METER_ADC_PIN PA4 +#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #else #define VBAT_ADC_PIN PA4 #define CURRENT_METER_ADC_PIN PA5 diff --git a/src/main/target/SPRACINGF3MINI/target.h b/src/main/target/SPRACINGF3MINI/target.h index 0e5fe0e43f..54d0a96d83 100644 --- a/src/main/target/SPRACINGF3MINI/target.h +++ b/src/main/target/SPRACINGF3MINI/target.h @@ -166,7 +166,7 @@ #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT #endif -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define USE_ADC #define ADC_INSTANCE ADC2 #define VBAT_ADC_PIN PA4 diff --git a/src/main/target/SPRACINGF3NEO/target.h b/src/main/target/SPRACINGF3NEO/target.h index b2b21f02d5..773c39ab34 100755 --- a/src/main/target/SPRACINGF3NEO/target.h +++ b/src/main/target/SPRACINGF3NEO/target.h @@ -145,8 +145,8 @@ #define MPU6500_CS_PIN SPI1_NSS_PIN #define MPU6500_SPI_INSTANCE SPI1 -#define BOARD_HAS_VOLTAGE_DIVIDER -#define BOARD_HAS_CURRENT_SENSOR +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC +#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define USE_ADC #define ADC_INSTANCE ADC1 diff --git a/src/main/target/SPRACINGF3OSD/target.h b/src/main/target/SPRACINGF3OSD/target.h index 2b0b1a0531..bd2d30a798 100644 --- a/src/main/target/SPRACINGF3OSD/target.h +++ b/src/main/target/SPRACINGF3OSD/target.h @@ -76,8 +76,8 @@ #define MAX7456_DMA_CHANNEL_RX DMA1_Channel4 #define MAX7456_DMA_IRQ_HANDLER_ID DMA1_CH4_HANDLER -#define BOARD_HAS_VOLTAGE_DIVIDER -#define BOARD_HAS_CURRENT_SENSOR +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC +#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define USE_ADC #define ADC_INSTANCE ADC1 diff --git a/src/main/target/SPRACINGF4EVO/target.h b/src/main/target/SPRACINGF4EVO/target.h index b3c70e5bac..b404e149b1 100644 --- a/src/main/target/SPRACINGF4EVO/target.h +++ b/src/main/target/SPRACINGF4EVO/target.h @@ -158,7 +158,7 @@ // PC4 - NC - Free for ADC12_IN14 / VTX CS // PC5 - NC - Free for ADC12_IN15 / VTX Enable / OSD VSYNC -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define OSD #define USE_OSD_OVER_MSP_DISPLAYPORT diff --git a/src/main/target/TINYFISH/target.h b/src/main/target/TINYFISH/target.h index 90b31b31b6..aac627dc68 100644 --- a/src/main/target/TINYFISH/target.h +++ b/src/main/target/TINYFISH/target.h @@ -93,8 +93,8 @@ #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT #define USE_ADC -#define BOARD_HAS_VOLTAGE_DIVIDER -#define BOARD_HAS_CURRENT_SENSOR +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC +#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define VBAT_ADC_PIN PB1 #define CURRENT_METER_ADC_PIN PB0 #define ADC_INSTANCE ADC3 diff --git a/src/main/target/VRRACE/target.h b/src/main/target/VRRACE/target.h index deef0916e2..814cd2acbe 100644 --- a/src/main/target/VRRACE/target.h +++ b/src/main/target/VRRACE/target.h @@ -152,7 +152,7 @@ */ #define USE_ADC -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define VBAT_ADC_PIN PC0 #define RSSI_ADC_PIN PB1 #define CURRENT_METER_ADC_PIN PA5 diff --git a/src/main/target/X_RACERSPI/target.h b/src/main/target/X_RACERSPI/target.h index 90fd89d5ca..ff34683003 100644 --- a/src/main/target/X_RACERSPI/target.h +++ b/src/main/target/X_RACERSPI/target.h @@ -96,7 +96,7 @@ #define M25P16_CS_PIN PB12 #define M25P16_SPI_INSTANCE SPI2 -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define USE_ADC #define ADC_INSTANCE ADC2 #define VBAT_ADC_PIN PA4 diff --git a/src/main/target/YUPIF4/target.h b/src/main/target/YUPIF4/target.h index d68f3d957a..57efe4daea 100644 --- a/src/main/target/YUPIF4/target.h +++ b/src/main/target/YUPIF4/target.h @@ -128,7 +128,7 @@ // ADC inputs -#define BOARD_HAS_VOLTAGE_DIVIDER +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define USE_ADC #define VBAT_ADC_PIN PC1 #define RSSI_ADC_GPIO_PIN PC0