Rename "calibrate_*" to "send_calibrate_*" (non-blocking methods)

pietrodn · peterbarker · commit c3cfa7fab0b7 · 2018-12-31T21:38:48.000+11:00
diff --git a/dronekit/__init__.py b/dronekit/__init__.py
@@ -2398,7 +2398,7 @@ def reboot(self):
 
         self.send_mavlink(reboot_msg)
 
-    def calibrate_gyro(self):
+    def send_calibrate_gyro(self):
         """Request gyroscope calibration."""
 
         calibration_command = self.message_factory.command_long_encode(
@@ -2415,7 +2415,7 @@ def calibrate_gyro(self):
         )
         self.send_mavlink(calibration_command)
 
-    def calibrate_magnetometer(self):
+    def send_calibrate_magnetometer(self):
         """Request magnetometer calibration."""
 
         # ArduPilot requires the MAV_CMD_DO_START_MAG_CAL command, only present in the ardupilotmega.xml definition
@@ -2448,7 +2448,7 @@ def calibrate_magnetometer(self):
 
         self.send_mavlink(calibration_command)
 
-    def calibrate_accelerometer(self, simple=False):
+    def send_calibrate_accelerometer(self, simple=False):
         """Request accelerometer calibration.
 
         :param simple: if True, perform simple accelerometer calibration
@@ -2468,7 +2468,7 @@ def calibrate_accelerometer(self, simple=False):
         )
         self.send_mavlink(calibration_command)
 
-    def calibrate_vehicle_level(self):
+    def send_calibrate_vehicle_level(self):
         """Request vehicle level (accelerometer trim) calibration."""
 
         calibration_command = self.message_factory.command_long_encode(
@@ -2485,7 +2485,7 @@ def calibrate_vehicle_level(self):
         )
         self.send_mavlink(calibration_command)
 
-    def calibrate_barometer(self):
+    def send_calibrate_barometer(self):
         """Request barometer calibration."""
 
         calibration_command = self.message_factory.command_long_encode(
diff --git a/dronekit/test/sitl/test_sensor_calibration.py b/dronekit/test/sitl/test_sensor_calibration.py
@@ -13,7 +13,7 @@ def test_gyro_calibration(connpath):
     vehicle = connect(connpath, wait_ready=True)
 
     with assert_command_ack(vehicle, mavutil.mavlink.MAV_CMD_PREFLIGHT_CALIBRATION, timeout=30):
-        vehicle.calibrate_gyro()
+        vehicle.send_calibrate_gyro()
 
     vehicle.close()
 
@@ -30,7 +30,7 @@ def test_magnetometer_calibration(connpath):
         timeout=30,
         ack_result=mavutil.mavlink.MAV_RESULT_UNSUPPORTED,  # TODO: change when APM is upgraded
     ):
-        vehicle.calibrate_magnetometer()
+        vehicle.send_calibrate_magnetometer()
 
     vehicle.close()
 
@@ -47,7 +47,7 @@ def test_simple_accelerometer_calibration(connpath):
         timeout=30,
         ack_result=mavutil.mavlink.MAV_RESULT_FAILED,
     ):
-        vehicle.calibrate_accelerometer(simple=True)
+        vehicle.send_calibrate_accelerometer(simple=True)
 
     vehicle.close()
 
@@ -66,7 +66,7 @@ def test_accelerometer_calibration(connpath):
         timeout=30,
         ack_result=mavutil.mavlink.MAV_RESULT_FAILED,
     ):
-        vehicle.calibrate_accelerometer(simple=False)
+        vehicle.send_calibrate_accelerometer(simple=False)
 
     vehicle.close()
 
@@ -78,7 +78,7 @@ def test_board_level_calibration(connpath):
     vehicle = connect(connpath, wait_ready=True)
 
     with assert_command_ack(vehicle, mavutil.mavlink.MAV_CMD_PREFLIGHT_CALIBRATION, timeout=30):
-        vehicle.calibrate_vehicle_level()
+        vehicle.send_calibrate_vehicle_level()
 
     vehicle.close()
 
@@ -90,6 +90,6 @@ def test_barometer_calibration(connpath):
     vehicle = connect(connpath, wait_ready=True)
 
     with assert_command_ack(vehicle, mavutil.mavlink.MAV_CMD_PREFLIGHT_CALIBRATION, timeout=30):
-        vehicle.calibrate_barometer()
+        vehicle.send_calibrate_barometer()
 
     vehicle.close()
