commander: cherry-pick fixes

src/modules/commander/accelerometer_calibration.cpp

@@ -440,7 +440,7 @@ calibrate_return do_accel_calibration_measurements(int mavlink_fd, float (&accel
 				device_id_primary = device_id[i];
 			}
 		} else {
-			mavlink_and_console_log_critical(mavlink_log_pub, "[cal] Accel #%u no device id, abort", i);
+			mavlink_and_console_log_critical(mavlink_fd, "[cal] Accel #%u no device id, abort", i);
 			result = calibrate_return_error;
 			break;
 		}

src/modules/commander/gyro_calibration.cpp

@@ -256,7 +256,7 @@ int do_gyro_calibration(int mavlink_fd)
 				device_id_primary = worker_data.device_id[s];
 			}
 		} else {
-			mavlink_and_console_log_critical(mavlink_log_pub, "[cal] Gyro #%u no device id, abort", s);
+			mavlink_and_console_log_critical(mavlink_fd, "[cal] Gyro #%u no device id, abort", s);
 		}
 	}
 

src/modules/commander/mag_calibration.cpp

@@ -483,7 +483,7 @@ calibrate_return mag_calibrate_all(int mavlink_fd, int32_t (&device_ids)[max_mag
 			device_ids[cur_mag] = mag_report.device_id;
 #endif
 			if (worker_data.sub_mag[cur_mag] < 0) {
-				mavlink_and_console_log_critical(mavlink_log_pub, "[cal] Mag #%u not found, abort", cur_mag);
+				mavlink_and_console_log_critical(mavlink_fd, "[cal] Mag #%u not found, abort", cur_mag);
 				result = calibrate_return_error;
 				break;
 			}
@@ -498,7 +498,7 @@ calibrate_return mag_calibrate_all(int mavlink_fd, int32_t (&device_ids)[max_mag
 					device_id_primary = device_ids[cur_mag];
 				}
 			} else {
-				mavlink_and_console_log_critical(mavlink_log_pub, "[cal] Mag #%u no device id, abort", cur_mag);
+				mavlink_and_console_log_critical(mavlink_fd, "[cal] Mag #%u no device id, abort", cur_mag);
 				result = calibrate_return_error;
 				break;
 			}