Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-18 05:45:31 +03:00
Code Issues Wiki Activity

Fixed current meter default, removed 'BOARD_HAS_VOLTAGE_DIVIDER', 'BOARD_HAS_CURRENT_SENSOR'.

Browse source
This commit is contained in:
Michael Keller 2017-05-10 07:33:10 +12:00
parent 04967e9f39
commit a987285ef7
41 changed files with 56 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/sensors/battery.c
View file

@ -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,

2
src/main/target/AIR32/target.h
View file

@ -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

2
src/main/target/AIRHEROF3/target.h
View file

@ -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

4
src/main/target/ALIENFLIGHTF4/target.h
View file

@ -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

4
src/main/target/ALIENFLIGHTNGF7/target.h
View file

@ -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

3
src/main/target/BEEROTORF4/target.h
View file

@ -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

4
src/main/target/BETAFLIGHTF3/target.h
View file

@ -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

2
src/main/target/BLUEJAYF4/target.h
View file

@ -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

4
src/main/target/CLRACINGF7/target.h
View file

@ -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

2
src/main/target/DOGE/target.h
View file

@ -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.

2
src/main/target/F4BY/target.h
View file

@ -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

4
src/main/target/FURYF3/target.h
View file

@ -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

2
src/main/target/FURYF4/target.h
View file

@ -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

2
src/main/target/FURYF7/target.h
View file

@ -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

2
src/main/target/IMPULSERCF3/target.h
View file

@ -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

2
src/main/target/IRCFUSIONF3/target.h
View file

@ -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

2
src/main/target/ISHAPEDF3/target.h
View file

@ -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

2
src/main/target/KAKUTEF4/target.h
View file

@ -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

2
src/main/target/KIWIF4/target.h
View file

@ -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

4
src/main/target/KROOZX/target.h
View file

@ -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

2
src/main/target/LUX_RACE/target.h
View file

@ -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

2
src/main/target/MOTOLAB/target.h
View file

@ -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

2
src/main/target/MULTIFLITEPICO/target.h
View file

@ -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

2
src/main/target/NAZE/target.h
View file

@ -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

2
src/main/target/NERO/target.h
View file

@ -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

4
src/main/target/OMNIBUS/target.h
View file

@ -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

2
src/main/target/PIKOBLX/target.h
View file

@ -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

2
src/main/target/RACEBASE/target.h
View file

@ -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

2
src/main/target/RCEXPLORERF3/target.h
View file

@ -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

2
src/main/target/RG_SSD_F3/target.h
View file

@ -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

2
src/main/target/SIRINFPV/target.h
View file

@ -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

4
src/main/target/SPRACINGF3/target.h
View file

@ -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

3
src/main/target/SPRACINGF3EVO/target.h
View file

@ -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

2
src/main/target/SPRACINGF3MINI/target.h
View file

@ -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

4
src/main/target/SPRACINGF3NEO/target.h
View file

@ -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

4
src/main/target/SPRACINGF3OSD/target.h
View file

@ -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

2
src/main/target/SPRACINGF4EVO/target.h
View file

@ -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

4
src/main/target/TINYFISH/target.h
View file

@ -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

2
src/main/target/VRRACE/target.h
View file

@ -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

2
src/main/target/X_RACERSPI/target.h
View file

@ -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

2
src/main/target/YUPIF4/target.h
View file

@ -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