From a575608110c41615523044c033f3ed76ce91a20c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 4 May 2018 11:20:58 +1000 Subject: [PATCH] Rover: fixed build warnings --- APMrover2/Parameters.cpp | 2 +- APMrover2/control_modes.cpp | 2 +- APMrover2/system.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/APMrover2/Parameters.cpp b/APMrover2/Parameters.cpp index 59c73da27d..68386b56f8 100644 --- a/APMrover2/Parameters.cpp +++ b/APMrover2/Parameters.cpp @@ -640,7 +640,7 @@ void Rover::load_parameters(void) Parameters::k_param_rc_13_old, Parameters::k_param_rc_14_old }; const uint16_t old_aux_chan_mask = 0x3FFA; SRV_Channels::upgrade_parameters(old_rc_keys, old_aux_chan_mask, &rcmap); - hal.console->printf("load_all took %uus\n", micros() - before); + hal.console->printf("load_all took %uus\n", unsigned(micros() - before)); // set a more reasonable default NAVL1_PERIOD for rovers L1_controller.set_default_period(NAVL1_PERIOD); } diff --git a/APMrover2/control_modes.cpp b/APMrover2/control_modes.cpp index 2f9a21e349..9ed3885611 100644 --- a/APMrover2/control_modes.cpp +++ b/APMrover2/control_modes.cpp @@ -178,7 +178,7 @@ void Rover::read_aux_switch() // save command if (mission.add_cmd(cmd)) { - hal.console->printf("Added waypoint %u", static_cast(mission.num_commands())); + hal.console->printf("Added waypoint %u", unsigned(mission.num_commands())); } } } diff --git a/APMrover2/system.cpp b/APMrover2/system.cpp index b3c91d0cfc..ca4df91fd3 100644 --- a/APMrover2/system.cpp +++ b/APMrover2/system.cpp @@ -25,7 +25,7 @@ void Rover::init_ardupilot() hal.console->printf("\n\nInit %s" "\n\nFree RAM: %u\n", fwver.fw_string, - hal.util->available_memory()); + (unsigned)hal.util->available_memory()); // // Check the EEPROM format version before loading any parameters from EEPROM.