diff --git a/ROMFS/cannode/init.d/rcS b/ROMFS/cannode/init.d/rcS index a9fec3c28a1..c6b462c38eb 100644 --- a/ROMFS/cannode/init.d/rcS +++ b/ROMFS/cannode/init.d/rcS @@ -95,17 +95,6 @@ then gyro_calibration start fi - -if param compare -s MBE_ENABLE 1 -then - # conservative mag bias estimation - param set-default MBE_LEARN_GAIN 5 - param set-default IMU_GYRO_CUTOFF 20 - # nodes have no GCS calibration flow, persist the estimated bias - param set-default SENS_MAG_AUTOCAL 1 - mag_bias_estimator start -fi - param set-default SENS_MAG_RATE 100 sensors start diff --git a/boards/ark/can-gps/default.px4board b/boards/ark/can-gps/default.px4board index 8b26a3b256e..5a2a72a5abf 100644 --- a/boards/ark/can-gps/default.px4board +++ b/boards/ark/can-gps/default.px4board @@ -22,7 +22,6 @@ CONFIG_UAVCANNODE_SAFETY_BUTTON=y CONFIG_UAVCANNODE_STATIC_PRESSURE=y CONFIG_UAVCANNODE_STATIC_TEMPERATURE=y CONFIG_MODULES_GYRO_CALIBRATION=y -CONFIG_MODULES_MAG_BIAS_ESTIMATOR=y CONFIG_MODULES_SENSORS=y # CONFIG_SENSORS_VEHICLE_AIRSPEED is not set # CONFIG_SENSORS_VEHICLE_AIR_DATA is not set diff --git a/boards/ark/can-gps/init/rc.board_defaults b/boards/ark/can-gps/init/rc.board_defaults index 90560b79854..1fa1d812894 100644 --- a/boards/ark/can-gps/init/rc.board_defaults +++ b/boards/ark/can-gps/init/rc.board_defaults @@ -3,7 +3,6 @@ # board specific defaults #------------------------------------------------------------------------------ -param set-default MBE_ENABLE 0 param set-default SENS_IMU_CLPNOTI 0 safety_button start diff --git a/boards/ark/can-rtk-gps/default.px4board b/boards/ark/can-rtk-gps/default.px4board index 125a41c646d..4bfc6d55b2c 100644 --- a/boards/ark/can-rtk-gps/default.px4board +++ b/boards/ark/can-rtk-gps/default.px4board @@ -25,7 +25,6 @@ CONFIG_UAVCANNODE_SAFETY_BUTTON=y CONFIG_UAVCANNODE_STATIC_PRESSURE=y CONFIG_UAVCANNODE_STATIC_TEMPERATURE=y CONFIG_MODULES_GYRO_CALIBRATION=y -CONFIG_MODULES_MAG_BIAS_ESTIMATOR=y CONFIG_MODULES_SENSORS=y # CONFIG_SENSORS_VEHICLE_AIRSPEED is not set # CONFIG_SENSORS_VEHICLE_AIR_DATA is not set diff --git a/boards/ark/can-rtk-gps/init/rc.board_defaults b/boards/ark/can-rtk-gps/init/rc.board_defaults index 3ac47e871fc..658cc31f511 100644 --- a/boards/ark/can-rtk-gps/init/rc.board_defaults +++ b/boards/ark/can-rtk-gps/init/rc.board_defaults @@ -7,7 +7,6 @@ param set-default CANNODE_SUB_MBD 1 param set-default CANNODE_SUB_RTCM 1 param set-default GPS_1_GNSS 63 param set-default GPS_UBX_BAUD1 921600 -param set-default MBE_ENABLE 0 param set-default SENS_IMU_CLPNOTI 0 safety_button start diff --git a/boards/ark/cannode/init/rc.board_defaults b/boards/ark/cannode/init/rc.board_defaults index 9fe7db23e0a..7d149ce5ad4 100644 --- a/boards/ark/cannode/init/rc.board_defaults +++ b/boards/ark/cannode/init/rc.board_defaults @@ -3,7 +3,6 @@ # board specific defaults #------------------------------------------------------------------------------ -param set-default MBE_ENABLE 0 param set-default SENS_IMU_CLPNOTI 0 pwm_out start diff --git a/boards/ark/septentrio-gps/default.px4board b/boards/ark/septentrio-gps/default.px4board index b80f92a543c..e2a1574331a 100644 --- a/boards/ark/septentrio-gps/default.px4board +++ b/boards/ark/septentrio-gps/default.px4board @@ -23,7 +23,6 @@ CONFIG_UAVCANNODE_STATIC_PRESSURE=y CONFIG_UAVCANNODE_STATIC_TEMPERATURE=y CONFIG_MODULES_EKF2=y CONFIG_MODULES_GYRO_CALIBRATION=y -CONFIG_MODULES_MAG_BIAS_ESTIMATOR=y CONFIG_MODULES_SENSORS=y # CONFIG_SENSORS_VEHICLE_AIRSPEED is not set # CONFIG_SENSORS_VEHICLE_AIR_DATA is not set diff --git a/boards/ark/septentrio-gps/init/rc.board_defaults b/boards/ark/septentrio-gps/init/rc.board_defaults index 79a37bcb956..d3ce8dd5468 100644 --- a/boards/ark/septentrio-gps/init/rc.board_defaults +++ b/boards/ark/septentrio-gps/init/rc.board_defaults @@ -5,7 +5,6 @@ param set-default CANNODE_SUB_MBD 1 param set-default CANNODE_SUB_RTCM 1 -param set-default MBE_ENABLE 0 param set-default SENS_IMU_CLPNOTI 0 safety_button start diff --git a/boards/ark/teseo-gps/init/rc.board_defaults b/boards/ark/teseo-gps/init/rc.board_defaults index 0185027bf9d..5244cec4b0b 100644 --- a/boards/ark/teseo-gps/init/rc.board_defaults +++ b/boards/ark/teseo-gps/init/rc.board_defaults @@ -5,7 +5,6 @@ param set-default CANNODE_SUB_MBD 1 param set-default CANNODE_SUB_RTCM 1 -param set-default MBE_ENABLE 0 param set-default SENS_IMU_CLPNOTI 0 tone_alarm start diff --git a/boards/freefly/can-rtk-gps/default.px4board b/boards/freefly/can-rtk-gps/default.px4board index 4086949fc83..c59248ae2e4 100644 --- a/boards/freefly/can-rtk-gps/default.px4board +++ b/boards/freefly/can-rtk-gps/default.px4board @@ -20,7 +20,6 @@ CONFIG_UAVCANNODE_SAFETY_BUTTON=y CONFIG_UAVCANNODE_STATIC_PRESSURE=y CONFIG_UAVCANNODE_STATIC_TEMPERATURE=y CONFIG_MODULES_GYRO_CALIBRATION=y -CONFIG_MODULES_MAG_BIAS_ESTIMATOR=y CONFIG_MODULES_SENSORS=y # CONFIG_SENSORS_VEHICLE_AIRSPEED is not set # CONFIG_SENSORS_VEHICLE_AIR_DATA is not set diff --git a/boards/holybro/can-gps-v1/default.px4board b/boards/holybro/can-gps-v1/default.px4board index 41b3ceeafd4..1d681d6abea 100644 --- a/boards/holybro/can-gps-v1/default.px4board +++ b/boards/holybro/can-gps-v1/default.px4board @@ -21,7 +21,6 @@ CONFIG_UAVCANNODE_SAFETY_BUTTON=y CONFIG_UAVCANNODE_STATIC_PRESSURE=y CONFIG_UAVCANNODE_STATIC_TEMPERATURE=y CONFIG_MODULES_GYRO_CALIBRATION=y -CONFIG_MODULES_MAG_BIAS_ESTIMATOR=y CONFIG_MODULES_SENSORS=y # CONFIG_SENSORS_VEHICLE_AIRSPEED is not set # CONFIG_SENSORS_VEHICLE_AIR_DATA is not set diff --git a/boards/matek/gnss-m9n-f4/default.px4board b/boards/matek/gnss-m9n-f4/default.px4board index 13ecd3e14ce..2ef62352b14 100644 --- a/boards/matek/gnss-m9n-f4/default.px4board +++ b/boards/matek/gnss-m9n-f4/default.px4board @@ -21,7 +21,6 @@ CONFIG_UAVCANNODE_SAFETY_BUTTON=y CONFIG_UAVCANNODE_STATIC_PRESSURE=y CONFIG_UAVCANNODE_STATIC_TEMPERATURE=y CONFIG_MODULES_GYRO_CALIBRATION=y -CONFIG_MODULES_MAG_BIAS_ESTIMATOR=y CONFIG_MODULES_SENSORS=y # CONFIG_SENSORS_VEHICLE_AIRSPEED is not set # CONFIG_SENSORS_VEHICLE_AIR_DATA is not set diff --git a/src/modules/mag_bias_estimator/params.yaml b/src/modules/mag_bias_estimator/params.yaml index ca26245f565..63274877f1f 100644 --- a/src/modules/mag_bias_estimator/params.yaml +++ b/src/modules/mag_bias_estimator/params.yaml @@ -9,7 +9,7 @@ parameters: This enables continuous calibration of the magnetometers before takeoff using gyro data. type: boolean - default: 1 + default: 0 reboot_required: true MBE_LEARN_GAIN: description: diff --git a/src/modules/sensors/sensor_params_mag.yaml b/src/modules/sensors/sensor_params_mag.yaml index 85c0dbc6b55..c4196636d84 100644 --- a/src/modules/sensors/sensor_params_mag.yaml +++ b/src/modules/sensors/sensor_params_mag.yaml @@ -79,8 +79,7 @@ parameters: short: Magnetometer auto calibration long: Automatically initialize magnetometer calibration from bias estimate if available. The estimate only captures hard-iron offsets, so a full - calibration is still recommended. Mainly intended for remote nodes - (e.g. CAN GPS units) that cannot be calibrated from a ground station. + calibration is still recommended. category: System type: boolean default: 0