@@ -23162,6 +23162,15 @@ def CompassLearnCopyFromEKF(self):
2316223162 self.assert_prearm_failure("Check mag field", other_prearm_failures_fatal=False)
2316323163 self.context_pop()
2316423164 self.wait_ready_to_arm()
23165+ new_compass_ofs_x = self.learn_compass_offsets_in_flight()
23166+
23167+ self.do_RTL()
23168+ self.assert_parameter_value("COMPASS_OFS_X", new_compass_ofs_x, epsilon=30)
23169+ self.reboot_sitl()
23170+ self.assert_parameter_value("COMPASS_OFS_X", new_compass_ofs_x, epsilon=30)
23171+
23172+ def learn_compass_offsets_in_flight(self):
23173+ '''take off and fly so the EKF learns a new compass X offset, returns the offset it should learn'''
2316523174 self.takeoff(30, mode='ALT_HOLD')
2316623175 # prevent EKF switching to good compass:
2316723176 self.set_parameters({
@@ -23202,11 +23211,21 @@ def CompassLearnCopyFromEKF(self):
2320223211 self.set_rc(1, 1500)
2320323212 self.set_rc(2, 1500)
2320423213 self.set_rc(4, 1500)
23214+ return new_compass_ofs_x
2320523215
23206- self.do_RTL()
23207- self.assert_parameter_value("COMPASS_OFS_X", new_compass_ofs_x, epsilon=30)
23216+ def CompassLearnDisabledDoesNotSave(self):
23217+ '''check EKF-learned compass offsets are not saved if COMPASS_LEARN is turned off before landing'''
23218+ self.context_preserve_parameters([
23219+ "COMPASS_OFS_X", "COMPASS_OFS_Y", "COMPASS_OFS_Z",
23220+ "COMPASS_OFS2_X", "COMPASS_OFS2_Y", "COMPASS_OFS2_Z",
23221+ "COMPASS_OFS3_X", "COMPASS_OFS3_Y", "COMPASS_OFS3_Z",
23222+ ])
2320823223 self.reboot_sitl()
23209- self.assert_parameter_value("COMPASS_OFS_X", new_compass_ofs_x, epsilon=30)
23224+ self.wait_ready_to_arm()
23225+ self.learn_compass_offsets_in_flight()
23226+ self.set_parameter("COMPASS_LEARN", 0)
23227+ self.do_RTL()
23228+ self.assert_parameter_value("COMPASS_OFS_X", 20, epsilon=30)
2321023229
2321123230 def CompassLearnCopyFromEKFAffinity(self):
2321223231 '''check EKF-learned offsets are saved for several compasses at once'''
@@ -24869,6 +24888,7 @@ def tests2d(self):
2486924888 self.CommonOrigin,
2487024889 self.RC_OPTIONS_1_FS_THR_ENABLE_0,
2487124890 self.CompassLearnCopyFromEKFAffinity,
24891+ self.CompassLearnDisabledDoesNotSave,
2487224892 self.AHRSAutoTrim,
2487324893 self.AHRSTrim,
2487424894 self.PeriphMultiUARTTunnel,
0 commit comments