diff --git a/ROMFS/px4fmu_common/init.d/airframes/10016_3dr_iris b/ROMFS/px4fmu_common/init.d/airframes/10016_3dr_iris index e3e54c8da6..cbc9a768e3 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/10016_3dr_iris +++ b/ROMFS/px4fmu_common/init.d/airframes/10016_3dr_iris @@ -35,6 +35,6 @@ param set-default MC_YAWRATE_P 0.25 param set-default MC_YAWRATE_I 0.25 param set-default BAT1_V_DIV 12.27559 -param set-default BAT1_A_PER_V 15.39103 +param set-default BAT1_A_PER_V 15.391030303103 set MIXER quad_w diff --git a/boards/airmind/mindpx-v2/init/rc.board_defaults b/boards/airmind/mindpx-v2/init/rc.board_defaults new file mode 100644 index 0000000000..5d576dd747 --- /dev/null +++ b/boards/airmind/mindpx-v2/init/rc.board_defaults @@ -0,0 +1,7 @@ +#!/bin/sh +# +# board specific defaults +#------------------------------------------------------------------------------ + +param set-default BAT1_V_DIV 10.177939394 +param set-default BAT1_A_PER_V 15.391030303 diff --git a/boards/airmind/mindpx-v2/src/board_config.h b/boards/airmind/mindpx-v2/src/board_config.h index 310b2fef81..65d587f66c 100644 --- a/boards/airmind/mindpx-v2/src/board_config.h +++ b/boards/airmind/mindpx-v2/src/board_config.h @@ -72,12 +72,6 @@ #define ADC_RC_RSSI_CHANNEL 11 #define ADC_AIRSPEED_VOLTAGE_CHANNEL 15 -/* Define Battery 1 Voltage Divider and A per V - */ - -#define BOARD_BATTERY1_V_DIV (10.177939394f) -#define BOARD_BATTERY1_A_PER_V (15.391030303f) - /* Power supply control and monitoring GPIOs */ // #define GPIO_VDD_5V_PERIPH_EN (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTA|GPIO_PIN8) // #define GPIO_VDD_BRICK_VALID (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN5) diff --git a/boards/atl/mantis-edu/init/rc.board_defaults b/boards/atl/mantis-edu/init/rc.board_defaults index b86536ab91..54ea0280bb 100644 --- a/boards/atl/mantis-edu/init/rc.board_defaults +++ b/boards/atl/mantis-edu/init/rc.board_defaults @@ -5,6 +5,8 @@ param set-default SYS_AUTOSTART 4061 +param set-default BAT1_V_DIV 9.0 + param set-default COM_ARM_SDCARD 0 param set-default SENS_EXT_I2C_PRB 0 diff --git a/boards/atl/mantis-edu/src/board_config.h b/boards/atl/mantis-edu/src/board_config.h index 684884594a..5ee7b7c027 100644 --- a/boards/atl/mantis-edu/src/board_config.h +++ b/boards/atl/mantis-edu/src/board_config.h @@ -98,9 +98,6 @@ (1 << ADC_HW_REV_SENSE_CHANNEL) | \ (1 << ADC1_SPARE_1_CHANNEL)) -/* Define Battery 1 Voltage Divider and A per V */ -#define BOARD_BATTERY1_V_DIV (9.0f) /* measured with the provided PM board */ - /* HW has to large of R termination on ADC todo:change when HW value is chosen */ #define BOARD_ADC_OPEN_CIRCUIT_V (5.6f) diff --git a/boards/av/x-v1/init/rc.board_defaults b/boards/av/x-v1/init/rc.board_defaults index 661ad24816..120085d418 100644 --- a/boards/av/x-v1/init/rc.board_defaults +++ b/boards/av/x-v1/init/rc.board_defaults @@ -5,3 +5,5 @@ # system_power unavailable param set-default CBRK_SUPPLY_CHK 894281 + +param set-default BAT1_V_DIV 10.13 diff --git a/boards/av/x-v1/src/board_config.h b/boards/av/x-v1/src/board_config.h index 91dfa83b17..ed08d8ad00 100644 --- a/boards/av/x-v1/src/board_config.h +++ b/boards/av/x-v1/src/board_config.h @@ -88,12 +88,6 @@ #define ADC_CHANNELS \ ((1 << ADC_BATTERY1_VOLTAGE_CHANNEL)) -/* Define Battery 1 Voltage Divider and A per V - */ - -#define BOARD_BATTERY1_V_DIV (10.133333333f) -#define BOARD_BATTERY1_A_PER_V (36.367515152f) - /* HW has to large of R termination on ADC todo:change when HW value is chosen */ #define BOARD_ADC_OPEN_CIRCUIT_V (5.6f) diff --git a/boards/beaglebone/blue/init/rc.board_defaults b/boards/beaglebone/blue/init/rc.board_defaults new file mode 100644 index 0000000000..d5f8c3bd4e --- /dev/null +++ b/boards/beaglebone/blue/init/rc.board_defaults @@ -0,0 +1,6 @@ +#!/bin/sh +# +# board specific defaults +#------------------------------------------------------------------------------ + +param set-default BAT1_V_DIV 11.0 diff --git a/boards/beaglebone/blue/src/board_config.h b/boards/beaglebone/blue/src/board_config.h index 1f2f30af71..b6c5479161 100644 --- a/boards/beaglebone/blue/src/board_config.h +++ b/boards/beaglebone/blue/src/board_config.h @@ -42,8 +42,6 @@ #define BOARD_OVERRIDE_UUID "BBBLUEID00000000" // must be of length 16 #define PX4_SOC_ARCH_ID PX4_SOC_ARCH_ID_BBBLUE -#define BOARD_BATTERY1_V_DIV (11.0f) - #define BOARD_MAX_LEDS 4 // Number external of LED's this board has diff --git a/boards/emlid/navio2/init/rc.board_defaults b/boards/emlid/navio2/init/rc.board_defaults new file mode 100644 index 0000000000..65348c4f84 --- /dev/null +++ b/boards/emlid/navio2/init/rc.board_defaults @@ -0,0 +1,8 @@ +#!/bin/sh +# +# board specific defaults +#------------------------------------------------------------------------------ + +param set-default BAT1_V_DIV 10.177939394 +param set-default BAT1_A_PER_V 15.391030303 + diff --git a/boards/emlid/navio2/src/board_config.h b/boards/emlid/navio2/src/board_config.h index f1e4c3586c..6d8c1eff37 100644 --- a/boards/emlid/navio2/src/board_config.h +++ b/boards/emlid/navio2/src/board_config.h @@ -42,9 +42,6 @@ #define BOARD_OVERRIDE_UUID "RPIID00000000000" // must be of length 16 #define PX4_SOC_ARCH_ID PX4_SOC_ARCH_ID_RPI -#define BOARD_BATTERY1_V_DIV (10.177939394f) -#define BOARD_BATTERY1_A_PER_V (15.391030303f) - #define BOARD_MAX_LEDS 1 // Number of external LED's this board has diff --git a/boards/holybro/durandal-v1/init/rc.board_defaults b/boards/holybro/durandal-v1/init/rc.board_defaults index 08a6b82a3d..49254efb15 100644 --- a/boards/holybro/durandal-v1/init/rc.board_defaults +++ b/boards/holybro/durandal-v1/init/rc.board_defaults @@ -1,7 +1,13 @@ #!/bin/sh # -# Holybro Durandal V1 specific board defaults +# board specific defaults #------------------------------------------------------------------------------ +param set-default BAT1_V_DIV 18.1 +param set-default BAT2_V_DIV 18.1 + +param set-default BAT1_A_PER_V 36.367515152 +param set-default BAT2_A_PER_V 36.367515152 + # Enable IMU thermal control param set-default SENS_EN_THERMAL 1 diff --git a/boards/holybro/durandal-v1/src/board_config.h b/boards/holybro/durandal-v1/src/board_config.h index 7ffa7bfa9d..f18a2591e1 100644 --- a/boards/holybro/durandal-v1/src/board_config.h +++ b/boards/holybro/durandal-v1/src/board_config.h @@ -140,12 +140,6 @@ (1 << ADC_HW_REV_SENSE_CHANNEL) | \ (1 << ADC1_3V3_IN_CHANNEL)) -/* Define Battery 1 Voltage Divider and A per V - */ - -#define BOARD_BATTERY1_V_DIV (18.1f) /* measured with the provided PM board */ -#define BOARD_BATTERY1_A_PER_V (36.367515152f) - /* HW has to large of R termination on ADC todo:change when HW value is chosen */ #define BOARD_ADC_OPEN_CIRCUIT_V (5.6f) diff --git a/boards/holybro/kakutef7/init/rc.board_defaults b/boards/holybro/kakutef7/init/rc.board_defaults index ca65d4cf35..2968cb67ca 100644 --- a/boards/holybro/kakutef7/init/rc.board_defaults +++ b/boards/holybro/kakutef7/init/rc.board_defaults @@ -3,6 +3,9 @@ # board specific defaults #------------------------------------------------------------------------------ +param set-default BAT1_V_DIV 10.9 +param set-default BAT1_A_PER_V 17 + # system_power unavailable param set-default CBRK_SUPPLY_CHK 894281 diff --git a/boards/holybro/kakutef7/src/board_config.h b/boards/holybro/kakutef7/src/board_config.h index ead973eed5..9254c57c52 100644 --- a/boards/holybro/kakutef7/src/board_config.h +++ b/boards/holybro/kakutef7/src/board_config.h @@ -92,11 +92,6 @@ (1 << ADC_BATTERY_CURRENT_CHANNEL) | \ (1 << ADC_RSSI_IN_CHANNEL)) -/* Define Battery 1 Voltage Divider and A per V - */ -#define BOARD_BATTERY1_V_DIV (10.9f) -#define BOARD_BATTERY1_A_PER_V (17.f) - /* PWM */ #define DIRECT_PWM_OUTPUT_CHANNELS 6 diff --git a/boards/holybro/pix32v5/init/rc.board_defaults b/boards/holybro/pix32v5/init/rc.board_defaults index 3b99b63eb3..c2300a50a7 100644 --- a/boards/holybro/pix32v5/init/rc.board_defaults +++ b/boards/holybro/pix32v5/init/rc.board_defaults @@ -3,5 +3,11 @@ # board specific defaults #------------------------------------------------------------------------------ +param set-default BAT1_V_DIV 18.1 +param set-default BAT2_V_DIV 18.1 + +param set-default BAT1_A_PER_V 36.367515152 +param set-default BAT2_A_PER_V 36.367515152 + rgbled_pwm start safety_button start diff --git a/boards/holybro/pix32v5/src/board_config.h b/boards/holybro/pix32v5/src/board_config.h index 532477d544..879a7ad168 100644 --- a/boards/holybro/pix32v5/src/board_config.h +++ b/boards/holybro/pix32v5/src/board_config.h @@ -173,12 +173,6 @@ (1 << ADC1_SPARE_1_CHANNEL)) #endif -/* Define Battery 1 Voltage Divider and A per V - */ - -#define BOARD_BATTERY1_V_DIV (18.1f) /* measured with the provided PM board */ -#define BOARD_BATTERY1_A_PER_V (36.367515152f) - /* HW has to large of R termination on ADC todo:change when HW value is chosen */ #define BOARD_ADC_OPEN_CIRCUIT_V (5.6f) diff --git a/boards/matek/h743-slim/init/rc.board_defaults b/boards/matek/h743-slim/init/rc.board_defaults new file mode 100644 index 0000000000..6d776625a1 --- /dev/null +++ b/boards/matek/h743-slim/init/rc.board_defaults @@ -0,0 +1,10 @@ +#!/bin/sh +# +# board specific defaults +#------------------------------------------------------------------------------ + +param set-default BAT1_V_DIV 11 +param set-default BAT1_A_PER_V 40 + +param set-default BAT2_V_DIV 11 +param set-default BAT2_A_PER_V 40 diff --git a/boards/matek/h743-slim/src/board_config.h b/boards/matek/h743-slim/src/board_config.h index 36b56c4f6f..17a9705404 100644 --- a/boards/matek/h743-slim/src/board_config.h +++ b/boards/matek/h743-slim/src/board_config.h @@ -101,15 +101,6 @@ (1 << ADC_AIRSPEED_IN_CHANNEL) | \ (1 << ADC_RSSI_IN_CHANNEL)) - -/* Define Battery 1 Voltage Divider and A per V - */ - -#define BOARD_BATTERY1_V_DIV (11.0f) /* measured with the provided PM board */ -#define BOARD_BATTERY1_A_PER_V (40.0f) -#define BOARD_BATTERY2_V_DIV (11.0f) /* measured with the provided PM board */ - - /* CAN Silence * * Silent mode control \ ESC Mux select diff --git a/boards/modalai/fc-v2/init/rc.board_defaults b/boards/modalai/fc-v2/init/rc.board_defaults index 118e22528d..e68faa0f40 100644 --- a/boards/modalai/fc-v2/init/rc.board_defaults +++ b/boards/modalai/fc-v2/init/rc.board_defaults @@ -1,4 +1,4 @@ #!/bin/sh # -# ModalAI FC-v2 specific board defaults +# board specific defaults #------------------------------------------------------------------------------ diff --git a/boards/modalai/fc-v2/src/board_config.h b/boards/modalai/fc-v2/src/board_config.h index 252c7ac099..caadee90b7 100644 --- a/boards/modalai/fc-v2/src/board_config.h +++ b/boards/modalai/fc-v2/src/board_config.h @@ -171,12 +171,6 @@ #define SYSTEM_ADC_BASE STM32_ADC1_BASE -/* Define Battery 1 Voltage Divider and A per V - */ - -#define BOARD_BATTERY1_V_DIV (18.1f) /* measured with the provided PM board */ -#define BOARD_BATTERY1_A_PER_V (36.367515152f) - /* HW has to large of R termination on ADC todo:change when HW value is chosen */ #define BOARD_ADC_OPEN_CIRCUIT_V (5.6f) diff --git a/boards/mro/ctrl-zero-f7-oem/init/rc.board_defaults b/boards/mro/ctrl-zero-f7-oem/init/rc.board_defaults index 9c542a7730..32117f4a58 100644 --- a/boards/mro/ctrl-zero-f7-oem/init/rc.board_defaults +++ b/boards/mro/ctrl-zero-f7-oem/init/rc.board_defaults @@ -3,4 +3,7 @@ # board specific defaults #------------------------------------------------------------------------------ +param set-default BAT1_V_DIV 10.1 +param set-default BAT1_A_PER_V 17 + safety_button start diff --git a/boards/mro/ctrl-zero-f7-oem/src/board_config.h b/boards/mro/ctrl-zero-f7-oem/src/board_config.h index 12d15053d1..5f00959de0 100644 --- a/boards/mro/ctrl-zero-f7-oem/src/board_config.h +++ b/boards/mro/ctrl-zero-f7-oem/src/board_config.h @@ -95,10 +95,6 @@ (1 << ADC_SCALED_V5_CHANNEL) | \ (1 << ADC_RC_RSSI_CHANNEL)) -/* Define Battery 1 Voltage Divider and A per V */ -#define BOARD_BATTERY1_V_DIV (18.1f) /* measured with the provided PM board */ -#define BOARD_BATTERY1_A_PER_V (36.367515152f) - /* HW has to large of R termination on ADC todo:change when HW value is chosen */ #define BOARD_ADC_OPEN_CIRCUIT_V (5.6f) diff --git a/boards/mro/ctrl-zero-f7/init/rc.board_defaults b/boards/mro/ctrl-zero-f7/init/rc.board_defaults index 9c542a7730..32117f4a58 100644 --- a/boards/mro/ctrl-zero-f7/init/rc.board_defaults +++ b/boards/mro/ctrl-zero-f7/init/rc.board_defaults @@ -3,4 +3,7 @@ # board specific defaults #------------------------------------------------------------------------------ +param set-default BAT1_V_DIV 10.1 +param set-default BAT1_A_PER_V 17 + safety_button start diff --git a/boards/mro/ctrl-zero-f7/src/board_config.h b/boards/mro/ctrl-zero-f7/src/board_config.h index f920e55171..7dc7ce0455 100644 --- a/boards/mro/ctrl-zero-f7/src/board_config.h +++ b/boards/mro/ctrl-zero-f7/src/board_config.h @@ -95,10 +95,6 @@ (1 << ADC_SCALED_V5_CHANNEL) | \ (1 << ADC_RC_RSSI_CHANNEL)) -/* Define Battery 1 Voltage Divider and A per V */ -#define BOARD_BATTERY1_V_DIV (18.1f) /* measured with the provided PM board */ -#define BOARD_BATTERY1_A_PER_V (36.367515152f) - /* HW has to large of R termination on ADC todo:change when HW value is chosen */ #define BOARD_ADC_OPEN_CIRCUIT_V (5.6f) diff --git a/boards/mro/ctrl-zero-h7-oem/init/rc.board_defaults b/boards/mro/ctrl-zero-h7-oem/init/rc.board_defaults index 9d3f66d57d..32117f4a58 100644 --- a/boards/mro/ctrl-zero-h7-oem/init/rc.board_defaults +++ b/boards/mro/ctrl-zero-h7-oem/init/rc.board_defaults @@ -4,6 +4,6 @@ #------------------------------------------------------------------------------ param set-default BAT1_V_DIV 10.1 -param set-default BAT1_A_PER_V 24 +param set-default BAT1_A_PER_V 17 safety_button start diff --git a/boards/mro/ctrl-zero-h7/init/rc.board_defaults b/boards/mro/ctrl-zero-h7/init/rc.board_defaults index 9d3f66d57d..32117f4a58 100644 --- a/boards/mro/ctrl-zero-h7/init/rc.board_defaults +++ b/boards/mro/ctrl-zero-h7/init/rc.board_defaults @@ -4,6 +4,6 @@ #------------------------------------------------------------------------------ param set-default BAT1_V_DIV 10.1 -param set-default BAT1_A_PER_V 24 +param set-default BAT1_A_PER_V 17 safety_button start diff --git a/boards/mro/x21-777/init/rc.board_defaults b/boards/mro/x21-777/init/rc.board_defaults new file mode 100644 index 0000000000..5d576dd747 --- /dev/null +++ b/boards/mro/x21-777/init/rc.board_defaults @@ -0,0 +1,7 @@ +#!/bin/sh +# +# board specific defaults +#------------------------------------------------------------------------------ + +param set-default BAT1_V_DIV 10.177939394 +param set-default BAT1_A_PER_V 15.391030303 diff --git a/boards/mro/x21/init/rc.board_defaults b/boards/mro/x21/init/rc.board_defaults new file mode 100644 index 0000000000..5d576dd747 --- /dev/null +++ b/boards/mro/x21/init/rc.board_defaults @@ -0,0 +1,7 @@ +#!/bin/sh +# +# board specific defaults +#------------------------------------------------------------------------------ + +param set-default BAT1_V_DIV 10.177939394 +param set-default BAT1_A_PER_V 15.391030303 diff --git a/boards/nxp/fmuk66-e/init/rc.board_defaults b/boards/nxp/fmuk66-e/init/rc.board_defaults index 3b99b63eb3..eed00b78ec 100644 --- a/boards/nxp/fmuk66-e/init/rc.board_defaults +++ b/boards/nxp/fmuk66-e/init/rc.board_defaults @@ -3,5 +3,8 @@ # board specific defaults #------------------------------------------------------------------------------ +param set-default BAT1_V_DIV 10.177939394 +param set-default BAT1_A_PER_V 15.391030303 + rgbled_pwm start safety_button start diff --git a/boards/nxp/fmuk66-e/src/board_config.h b/boards/nxp/fmuk66-e/src/board_config.h index 44a6151aa8..4961977bc6 100644 --- a/boards/nxp/fmuk66-e/src/board_config.h +++ b/boards/nxp/fmuk66-e/src/board_config.h @@ -249,12 +249,6 @@ __END_DECLS /* PTB6 ADC1_SE12 */ ADC1_GPIO(12), \ /* PTB7 ADC1_SE13 */ ADC1_GPIO(13) - - -#define BOARD_BATTERY1_V_DIV (10.177939394f) -#define BOARD_BATTERY1_A_PER_V (15.391030303f) - - /* User GPIOs * */ diff --git a/boards/nxp/fmuk66-v3/init/rc.board_defaults b/boards/nxp/fmuk66-v3/init/rc.board_defaults index 750f120673..df700b4dc3 100644 --- a/boards/nxp/fmuk66-v3/init/rc.board_defaults +++ b/boards/nxp/fmuk66-v3/init/rc.board_defaults @@ -3,6 +3,9 @@ # board specific defaults #------------------------------------------------------------------------------ +param set-default BAT1_V_DIV 10.177939394 +param set-default BAT1_A_PER_V 15.391030303 + rgbled_pwm start safety_button start diff --git a/boards/nxp/fmuk66-v3/src/board_config.h b/boards/nxp/fmuk66-v3/src/board_config.h index 6da58c0b0b..dcba86c32d 100644 --- a/boards/nxp/fmuk66-v3/src/board_config.h +++ b/boards/nxp/fmuk66-v3/src/board_config.h @@ -253,12 +253,6 @@ __END_DECLS /* PTB6 ADC1_SE12 */ ADC1_GPIO(12), \ /* PTB7 ADC1_SE13 */ ADC1_GPIO(13) - - -#define BOARD_BATTERY1_V_DIV (10.177939394f) -#define BOARD_BATTERY1_A_PER_V (15.391030303f) - - /* User GPIOs * */ diff --git a/boards/nxp/fmurt1062-v1/init/rc.board_defaults b/boards/nxp/fmurt1062-v1/init/rc.board_defaults index 3b99b63eb3..9e96817679 100644 --- a/boards/nxp/fmurt1062-v1/init/rc.board_defaults +++ b/boards/nxp/fmurt1062-v1/init/rc.board_defaults @@ -3,5 +3,8 @@ # board specific defaults #------------------------------------------------------------------------------ +param set-default BAT1_V_DIV 10.1097 +param set-default BAT1_A_PER_V 15.391030303 + rgbled_pwm start safety_button start diff --git a/boards/nxp/fmurt1062-v1/src/board_config.h b/boards/nxp/fmurt1062-v1/src/board_config.h index cbc1820d80..418c3f33d4 100644 --- a/boards/nxp/fmurt1062-v1/src/board_config.h +++ b/boards/nxp/fmurt1062-v1/src/board_config.h @@ -179,11 +179,6 @@ (1 << ADC_HW_REV_SENSE_CHANNEL) | \ (1 << ADC1_SPARE_1_CHANNEL)) -/* Define Battery 1 Voltage Divider and A per V */ - -#define BOARD_BATTERY1_V_DIV (10.1097f) /* measured with the provided PM board */ -#define BOARD_BATTERY1_A_PER_V (15.391030303f) - /* HW has to large of R termination on ADC todo:change when HW value is chosen */ #define BOARD_ADC_OPEN_CIRCUIT_V (5.6f) diff --git a/boards/omnibus/f4sd/init/rc.board_defaults b/boards/omnibus/f4sd/init/rc.board_defaults index 97bbcd6ee6..5b492c4359 100644 --- a/boards/omnibus/f4sd/init/rc.board_defaults +++ b/boards/omnibus/f4sd/init/rc.board_defaults @@ -3,6 +3,9 @@ # board specific defaults #------------------------------------------------------------------------------ +param set-default BAT1_V_DIV 11.12 +param set-default BAT1_A_PER_V 31 + # system_power unavailable param set-default CBRK_SUPPLY_CHK 894281 diff --git a/boards/omnibus/f4sd/src/board_config.h b/boards/omnibus/f4sd/src/board_config.h index 8b39d66c88..78c89478ce 100644 --- a/boards/omnibus/f4sd/src/board_config.h +++ b/boards/omnibus/f4sd/src/board_config.h @@ -74,11 +74,6 @@ #define ADC_BATTERY_CURRENT_CHANNEL 11 #define ADC_RC_RSSI_CHANNEL 0 -/* Define Battery 1 Voltage Divider and A per V - */ -#define BOARD_BATTERY1_V_DIV (11.12f) -#define BOARD_BATTERY1_A_PER_V (31.f) - /* User GPIOs * * GPIO0-5 are the PWM servo outputs. diff --git a/boards/px4/fmu-v2/init/rc.board_defaults b/boards/px4/fmu-v2/init/rc.board_defaults new file mode 100644 index 0000000000..65348c4f84 --- /dev/null +++ b/boards/px4/fmu-v2/init/rc.board_defaults @@ -0,0 +1,8 @@ +#!/bin/sh +# +# board specific defaults +#------------------------------------------------------------------------------ + +param set-default BAT1_V_DIV 10.177939394 +param set-default BAT1_A_PER_V 15.391030303 + diff --git a/boards/px4/fmu-v2/src/board_config.h b/boards/px4/fmu-v2/src/board_config.h index 59d5228361..f3b462e42c 100644 --- a/boards/px4/fmu-v2/src/board_config.h +++ b/boards/px4/fmu-v2/src/board_config.h @@ -108,12 +108,6 @@ #define ADC_5V_RAIL_SENSE 4 #define ADC_AIRSPEED_VOLTAGE_CHANNEL 15 -/* Define Battery 1 Voltage Divider and A per V - */ - -#define BOARD_BATTERY1_V_DIV (10.177939394f) -#define BOARD_BATTERY1_A_PER_V (15.391030303f) - /* Power supply control and monitoring GPIOs */ #define GPIO_VDD_5V_PERIPH_EN (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTA|GPIO_PIN8) #define GPIO_VDD_BRICK_VALID (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN5) diff --git a/boards/px4/fmu-v3/init/rc.board_defaults b/boards/px4/fmu-v3/init/rc.board_defaults new file mode 100644 index 0000000000..5d576dd747 --- /dev/null +++ b/boards/px4/fmu-v3/init/rc.board_defaults @@ -0,0 +1,7 @@ +#!/bin/sh +# +# board specific defaults +#------------------------------------------------------------------------------ + +param set-default BAT1_V_DIV 10.177939394 +param set-default BAT1_A_PER_V 15.391030303 diff --git a/boards/px4/fmu-v3/src/board_config.h b/boards/px4/fmu-v3/src/board_config.h index e0a483b5ee..c986ecb714 100644 --- a/boards/px4/fmu-v3/src/board_config.h +++ b/boards/px4/fmu-v3/src/board_config.h @@ -108,12 +108,6 @@ #define ADC_5V_RAIL_SENSE 4 #define ADC_AIRSPEED_VOLTAGE_CHANNEL 15 -/* Define Battery 1 Voltage Divider and A per V - */ - -#define BOARD_BATTERY1_V_DIV (10.177939394f) -#define BOARD_BATTERY1_A_PER_V (15.391030303f) - /* Power supply control and monitoring GPIOs */ #define GPIO_VDD_5V_PERIPH_EN (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTA|GPIO_PIN8) #define GPIO_VDD_BRICK_VALID (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN5) diff --git a/boards/px4/fmu-v4/init/rc.board_defaults b/boards/px4/fmu-v4/init/rc.board_defaults index d08737ebc2..275644b21f 100644 --- a/boards/px4/fmu-v4/init/rc.board_defaults +++ b/boards/px4/fmu-v4/init/rc.board_defaults @@ -3,26 +3,7 @@ # board specific defaults #------------------------------------------------------------------------------ - -# start MAVLink on Wifi (ESP8266 port). Except for the TealOne airframe. -if ! param compare SYS_AUTOSTART 4250 -then - param set-default MAV_2_CONFIG 301 - param set-default MAV_2_RATE 20000 - param set-default SER_WIFI_BAUD 921600 -fi - -if param compare SER_WIFI_BAUD 1 -then - # Transitional support: The Wifi port has not been configured by the user, - # configure it for MAVLink via the ESP8266 Wifi module. Except for the TealOne airframe. - if ! param compare SYS_AUTOSTART 4250 - then - param set-default MAV_2_CONFIG 301 - param set-default MAV_2_RATE 20000 - param set-default SER_WIFI_BAUD 921600 - fi -fi - +param set-default BAT1_V_DIV 13.653333333 +param set-default BAT1_A_PER_V 36.367515152 safety_button start diff --git a/boards/px4/fmu-v4/src/board_config.h b/boards/px4/fmu-v4/src/board_config.h index 48dd3736f7..99b238d011 100644 --- a/boards/px4/fmu-v4/src/board_config.h +++ b/boards/px4/fmu-v4/src/board_config.h @@ -83,11 +83,6 @@ #define ADC_5V_RAIL_SENSE 4 #define ADC_RC_RSSI_CHANNEL 11 -/* Define Battery 1 Voltage Divider and A per V. */ -#define BOARD_BATTERY1_V_DIV (13.653333333f) -#define BOARD_BATTERY1_A_PER_V (36.367515152f) - - /* Power supply control and monitoring GPIOs. */ #define GPIO_VDD_BRICK_VALID (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN5) #define GPIO_VDD_USB_VALID (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTC|GPIO_PIN0) diff --git a/boards/px4/fmu-v4pro/init/rc.board_defaults b/boards/px4/fmu-v4pro/init/rc.board_defaults index f881b43a5c..8dd9df28d5 100644 --- a/boards/px4/fmu-v4pro/init/rc.board_defaults +++ b/boards/px4/fmu-v4pro/init/rc.board_defaults @@ -3,6 +3,12 @@ # board specific defaults #------------------------------------------------------------------------------ +param set-default BAT1_V_DIV 6.490196078 +param set-default BAT2_V_DIV 6.490196078 + +param set-default BAT1_A_PER_V 26.4 +param set-default BAT2_A_PER_V 26.4 + # Multi-EKF param set-default EKF2_MULTI_IMU 2 param set-default SENS_IMU_MODE 0 diff --git a/boards/px4/fmu-v4pro/src/board_config.h b/boards/px4/fmu-v4pro/src/board_config.h index 1a0de13ee0..e45c81f116 100644 --- a/boards/px4/fmu-v4pro/src/board_config.h +++ b/boards/px4/fmu-v4pro/src/board_config.h @@ -112,18 +112,6 @@ (1 << ADC_5V_RAIL_SENSE) | \ (1 << ADC_BATTERY2_VOLTAGE_CHANNEL) | (1 << ADC_BATTERY2_CURRENT_CHANNEL) -/* Define Battery 1 Voltage Divider and A per V - */ - -#define BOARD_BATTERY1_V_DIV (6.490196078f) -#define BOARD_BATTERY1_A_PER_V (26.4f) - -/* Define Battery 2 Voltage Divider and A per V - */ - -#define BOARD_BATTERY2_V_DIV (6.490196078f) -#define BOARD_BATTERY2_A_PER_V (26.4f) - /* Define LTC4417 UV set by resistors on the board that are different than FMUv2 3.7V */ #define BOARD_VALID_UV (4.01f) diff --git a/boards/px4/fmu-v5/init/rc.board_defaults b/boards/px4/fmu-v5/init/rc.board_defaults index 98a8edb101..64d3288df0 100644 --- a/boards/px4/fmu-v5/init/rc.board_defaults +++ b/boards/px4/fmu-v5/init/rc.board_defaults @@ -3,6 +3,11 @@ # board specific defaults #------------------------------------------------------------------------------ +param set-default BAT1_V_DIV 18.1 +param set-default BAT2_V_DIV 18.1 + +param set-default BAT1_A_PER_V 36.367515152 +param set-default BAT2_A_PER_V 36.367515152 if ver hwtypecmp V550 V560 then diff --git a/boards/px4/fmu-v5/src/board_config.h b/boards/px4/fmu-v5/src/board_config.h index f02f10e293..c6eedce45a 100644 --- a/boards/px4/fmu-v5/src/board_config.h +++ b/boards/px4/fmu-v5/src/board_config.h @@ -173,18 +173,10 @@ (1 << ADC1_SPARE_1_CHANNEL)) #endif -/* Define Battery 1 Voltage Divider and A per V - */ - -#define BOARD_BATTERY1_V_DIV (18.1f) /* measured with the provided PM board */ -#define BOARD_BATTERY1_A_PER_V (36.367515152f) - /* HW has to large of R termination on ADC todo:change when HW value is chosen */ - #define BOARD_ADC_OPEN_CIRCUIT_V (5.6f) /* HW Version and Revision drive signals Default to 1 to detect */ - #define BOARD_HAS_HW_VERSIONING #define GPIO_HW_REV_DRIVE /* PH14 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTH|GPIO_PIN14) diff --git a/boards/px4/fmu-v6u/src/board_config.h b/boards/px4/fmu-v6u/src/board_config.h index 6cdb6a5320..399a1a881f 100644 --- a/boards/px4/fmu-v6u/src/board_config.h +++ b/boards/px4/fmu-v6u/src/board_config.h @@ -164,18 +164,10 @@ #define SYSTEM_ADC_BASE STM32_ADC1_BASE -/* Define Battery 1 Voltage Divider and A per V - */ - -#define BOARD_BATTERY1_V_DIV (18.1f) /* measured with the provided PM board */ -#define BOARD_BATTERY1_A_PER_V (36.367515152f) - /* HW has to large of R termination on ADC todo:change when HW value is chosen */ - #define BOARD_ADC_OPEN_CIRCUIT_V (5.6f) /* HW Version and Revision drive signals Default to 1 to detect */ - #define BOARD_HAS_HW_VERSIONING #define GPIO_HW_VER_REV_DRIVE /* PG0 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTG|GPIO_PIN0) diff --git a/boards/px4/fmu-v6x/src/board_config.h b/boards/px4/fmu-v6x/src/board_config.h index f5310564ea..f2966995bf 100644 --- a/boards/px4/fmu-v6x/src/board_config.h +++ b/boards/px4/fmu-v6x/src/board_config.h @@ -202,18 +202,10 @@ #define SYSTEM_ADC_BASE STM32_ADC1_BASE -/* Define Battery 1 Voltage Divider and A per V - */ - -#define BOARD_BATTERY1_V_DIV (18.1f) /* measured with the provided PM board */ -#define BOARD_BATTERY1_A_PER_V (36.367515152f) - /* HW has to large of R termination on ADC todo:change when HW value is chosen */ - #define BOARD_ADC_OPEN_CIRCUIT_V (5.6f) /* HW Version and Revision drive signals Default to 1 to detect */ - #define BOARD_HAS_HW_VERSIONING #define GPIO_HW_VER_REV_DRIVE /* PG0 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTG|GPIO_PIN0) diff --git a/boards/px4/sitl/src/board_config.h b/boards/px4/sitl/src/board_config.h index bcea17de90..e27c3ee04f 100644 --- a/boards/px4/sitl/src/board_config.h +++ b/boards/px4/sitl/src/board_config.h @@ -42,9 +42,6 @@ #define BOARD_OVERRIDE_UUID "SIMULATIONID0000" // must be of length 16 #define PX4_SOC_ARCH_ID PX4_SOC_ARCH_ID_SITL -#define BOARD_BATTERY1_V_DIV (10.177939394f) -#define BOARD_BATTERY1_A_PER_V (15.391030303f) - #define BOARD_HAS_POWER_CONTROL 1 #define PX4_NUMBER_I2C_BUSES 1 diff --git a/boards/raspberrypi/pico/init/rc.board_defaults b/boards/raspberrypi/pico/init/rc.board_defaults index 641d73110c..ec0c720608 100644 --- a/boards/raspberrypi/pico/init/rc.board_defaults +++ b/boards/raspberrypi/pico/init/rc.board_defaults @@ -3,6 +3,9 @@ # board specific defaults #------------------------------------------------------------------------------ +param set-default BAT1_V_DIV 13.653333333 +param set-default BAT1_A_PER_V 36.367515152 + # system_power unavailable param set-default CBRK_SUPPLY_CHK 894281 diff --git a/boards/raspberrypi/pico/src/board_config.h b/boards/raspberrypi/pico/src/board_config.h index 9ecc797043..581233e7ac 100644 --- a/boards/raspberrypi/pico/src/board_config.h +++ b/boards/raspberrypi/pico/src/board_config.h @@ -65,10 +65,6 @@ #define ADC_BATTERY_CURRENT_CHANNEL 2 // Corresponding GPIO 28. Used in init.c for disabling GPIO_IE #define ADC_RC_RSSI_CHANNEL 0 -/* Define Battery 1 Voltage Divider and A per V. */ -#define BOARD_BATTERY1_V_DIV (13.653333333f) -#define BOARD_BATTERY1_A_PER_V (36.367515152f) - /* High-resolution timer */ #define HRT_TIMER 1 #define HRT_TIMER_CHANNEL 1 diff --git a/boards/scumaker/pilotpi/init/rc.board_defaults b/boards/scumaker/pilotpi/init/rc.board_defaults new file mode 100644 index 0000000000..1677fa4d82 --- /dev/null +++ b/boards/scumaker/pilotpi/init/rc.board_defaults @@ -0,0 +1,7 @@ +#!/bin/sh +# +# board specific defaults +#------------------------------------------------------------------------------ + +# 1K + 4.7K +param set-default BAT1_V_DIV 5.7 diff --git a/boards/scumaker/pilotpi/src/board_config.h b/boards/scumaker/pilotpi/src/board_config.h index 59912be08a..76abae2251 100644 --- a/boards/scumaker/pilotpi/src/board_config.h +++ b/boards/scumaker/pilotpi/src/board_config.h @@ -56,7 +56,6 @@ #define ADC_BATTERY_CURRENT_CHANNEL -1 #define ADC_AIRSPEED_VOLTAGE_CHANNEL 2 -#define BOARD_BATTERY1_V_DIV 5.7f // 1K + 4.7K #define ADC_DP_V_DIV 1.0f #define BOARD_ADC_OPEN_CIRCUIT_V 5.3f // Powered from USB diff --git a/boards/spracing/h7extreme/init/rc.board_defaults b/boards/spracing/h7extreme/init/rc.board_defaults index 1d809acc3e..e154e34980 100644 --- a/boards/spracing/h7extreme/init/rc.board_defaults +++ b/boards/spracing/h7extreme/init/rc.board_defaults @@ -3,6 +3,9 @@ # board specific defaults #------------------------------------------------------------------------------ +param set-default BAT1_V_DIV 10.9 +param set-default BAT1_A_PER_V 17 + # system_power unavailable param set-default CBRK_SUPPLY_CHK 894281 diff --git a/boards/spracing/h7extreme/src/board_config.h b/boards/spracing/h7extreme/src/board_config.h index 67b57c94fc..570d6e8785 100644 --- a/boards/spracing/h7extreme/src/board_config.h +++ b/boards/spracing/h7extreme/src/board_config.h @@ -88,11 +88,6 @@ #define ADC_CHANNELS (1 << 4) | (1 << 10) | (1 << 11) -/* Define Battery 1 Voltage Divider and A per V - */ -#define BOARD_BATTERY1_V_DIV (10.9f) -#define BOARD_BATTERY1_A_PER_V (17.f) - /* PWM */ #define DIRECT_PWM_OUTPUT_CHANNELS 8 diff --git a/boards/uvify/core/init/rc.board_defaults b/boards/uvify/core/init/rc.board_defaults index df7abbbbef..fedd27a160 100644 --- a/boards/uvify/core/init/rc.board_defaults +++ b/boards/uvify/core/init/rc.board_defaults @@ -3,5 +3,8 @@ # board specific defaults #------------------------------------------------------------------------------ +param set-default BAT1_V_DIV 10.14 +param set-default BAT1_A_PER_V 18.18 + # don't probe external I2C param set-default SENS_EXT_I2C_PRB 0 diff --git a/boards/uvify/core/src/board_config.h b/boards/uvify/core/src/board_config.h index ccb1a4a0a0..d10535d5e6 100644 --- a/boards/uvify/core/src/board_config.h +++ b/boards/uvify/core/src/board_config.h @@ -83,10 +83,6 @@ #define ADC_5V_RAIL_SENSE 4 #define ADC_RC_RSSI_CHANNEL 11 -/* Define Battery 1 Voltage Divider and A per V. */ -#define BOARD_BATTERY1_V_DIV (10.14f) -#define BOARD_BATTERY1_A_PER_V (18.18f) - /* Power supply control and monitoring GPIOs. */ #define GPIO_VDD_BRICK_VALID (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTB|GPIO_PIN5) #define GPIO_VDD_USB_VALID (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTC|GPIO_PIN0) diff --git a/posix-configs/rpi/pilotpi_fw.config b/posix-configs/rpi/pilotpi_fw.config index 638c0ad8bb..5c8b5c0190 100644 --- a/posix-configs/rpi/pilotpi_fw.config +++ b/posix-configs/rpi/pilotpi_fw.config @@ -8,6 +8,9 @@ param import # system_power not implemented param set CBRK_SUPPLY_CHK 894281 + +param set-default BAT1_V_DIV 5.7 + # broadcast to LAN # always keep current config param set SYS_AUTOCONFIG 0 diff --git a/posix-configs/rpi/pilotpi_mc.config b/posix-configs/rpi/pilotpi_mc.config index 3b191d3794..6a9836d425 100644 --- a/posix-configs/rpi/pilotpi_mc.config +++ b/posix-configs/rpi/pilotpi_mc.config @@ -8,6 +8,9 @@ param import # system_power not implemented param set CBRK_SUPPLY_CHK 894281 + +param set-default BAT1_V_DIV 5.7 + # broadcast to LAN # always keep current config param set SYS_AUTOCONFIG 0 diff --git a/posix-configs/rpi/px4.config b/posix-configs/rpi/px4.config index c5bad221e6..77e79cb20f 100644 --- a/posix-configs/rpi/px4.config +++ b/posix-configs/rpi/px4.config @@ -8,6 +8,8 @@ param select eeprom/parameters param import +param set BAT1_V_DIV 10.177939394 +param set BAT1_A_PER_V 15.391030303 param set CBRK_SUPPLY_CHK 894281 param set SYS_AUTOSTART 4001 param set MAV_TYPE 2 diff --git a/posix-configs/rpi/px4_fw.config b/posix-configs/rpi/px4_fw.config index bc758e86bb..dfdc176c04 100644 --- a/posix-configs/rpi/px4_fw.config +++ b/posix-configs/rpi/px4_fw.config @@ -8,6 +8,8 @@ param select eeprom/parameters param import +param set BAT1_V_DIV 10.177939394 +param set BAT1_A_PER_V 15.391030303 param set CBRK_SUPPLY_CHK 894281 param set SYS_AUTOSTART 2100 param set MAV_TYPE 1 diff --git a/src/modules/battery_status/analog_battery.cpp b/src/modules/battery_status/analog_battery.cpp index 7b5eb04061..41c7832d64 100644 --- a/src/modules/battery_status/analog_battery.cpp +++ b/src/modules/battery_status/analog_battery.cpp @@ -126,17 +126,5 @@ AnalogBattery::updateParams() param_get(_analog_param_handles.i_channel, &_analog_params.i_channel); param_get(_analog_param_handles.v_offs_cur, &_analog_params.v_offs_cur); - if (_analog_params.v_div < 0.0f) { - /* apply scaling according to defaults if set to default */ - _analog_params.v_div = BOARD_BATTERY1_V_DIV; - param_set_no_notification(_analog_param_handles.v_div, &_analog_params.v_div); - } - - if (_analog_params.a_per_v < 0.0f) { - /* apply scaling according to defaults if set to default */ - _analog_params.a_per_v = BOARD_BATTERY1_A_PER_V; - param_set_no_notification(_analog_param_handles.a_per_v, &_analog_params.a_per_v); - } - Battery::updateParams(); }