@@ -23872,6 +23872,15 @@ def CompassLearnCopyFromEKF(self):
2387223872 self.assert_prearm_failure("Check mag field", other_prearm_failures_fatal=False)
2387323873 self.context_pop()
2387423874 self.wait_ready_to_arm()
23875+ new_compass_ofs_x = self.learn_compass_offsets_in_flight()
23876+
23877+ self.do_RTL()
23878+ self.assert_parameter_value("COMPASS_OFS_X", new_compass_ofs_x, epsilon=30)
23879+ self.reboot_sitl()
23880+ self.assert_parameter_value("COMPASS_OFS_X", new_compass_ofs_x, epsilon=30)
23881+
23882+ def learn_compass_offsets_in_flight(self):
23883+ '''take off and fly so the EKF learns a new compass X offset, returns the offset it should learn'''
2387523884 self.takeoff(30, mode='ALT_HOLD')
2387623885 # prevent EKF switching to good compass:
2387723886 self.set_parameters({
@@ -23912,11 +23921,21 @@ def CompassLearnCopyFromEKF(self):
2391223921 self.set_rc(1, 1500)
2391323922 self.set_rc(2, 1500)
2391423923 self.set_rc(4, 1500)
23924+ return new_compass_ofs_x
2391523925
23916- self.do_RTL()
23917- self.assert_parameter_value("COMPASS_OFS_X", new_compass_ofs_x, epsilon=30)
23926+ def CompassLearnDisabledDoesNotSave(self):
23927+ '''check EKF-learned compass offsets are not saved if COMPASS_LEARN is turned off before landing'''
23928+ self.context_preserve_parameters([
23929+ "COMPASS_OFS_X", "COMPASS_OFS_Y", "COMPASS_OFS_Z",
23930+ "COMPASS_OFS2_X", "COMPASS_OFS2_Y", "COMPASS_OFS2_Z",
23931+ "COMPASS_OFS3_X", "COMPASS_OFS3_Y", "COMPASS_OFS3_Z",
23932+ ])
2391823933 self.reboot_sitl()
23919- self.assert_parameter_value("COMPASS_OFS_X", new_compass_ofs_x, epsilon=30)
23934+ self.wait_ready_to_arm()
23935+ self.learn_compass_offsets_in_flight()
23936+ self.set_parameter("COMPASS_LEARN", 0)
23937+ self.do_RTL()
23938+ self.assert_parameter_value("COMPASS_OFS_X", 20, epsilon=30)
2392023939
2392123940 def CompassLearnCopyFromEKFAffinity(self):
2392223941 '''check EKF-learned offsets are saved for several compasses at once'''
@@ -25581,6 +25600,7 @@ def tests2d(self):
2558125600 self.CommonOrigin,
2558225601 self.RC_OPTIONS_1_FS_THR_ENABLE_0,
2558325602 self.CompassLearnCopyFromEKFAffinity,
25603+ self.CompassLearnDisabledDoesNotSave,
2558425604 self.AHRSAutoTrim,
2558525605 self.AHRSTrim,
2558625606 self.PeriphMultiUARTTunnel,
0 commit comments