From e97034f8e93033de86e355d2ec9b681359d0fc72 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Mon, 6 Jul 2015 12:30:40 -0300 Subject: [PATCH] ArduPlane: use ARRAY_SIZE macro --- ArduPlane/ArduPlane.cpp | 2 +- ArduPlane/Log.cpp | 2 +- ArduPlane/Parameters.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ArduPlane/ArduPlane.cpp b/ArduPlane/ArduPlane.cpp index 5074103ab7..4569cafac6 100644 --- a/ArduPlane/ArduPlane.cpp +++ b/ArduPlane/ArduPlane.cpp @@ -92,7 +92,7 @@ void Plane::setup() init_ardupilot(); // initialise the main loop scheduler - scheduler.init(&scheduler_tasks[0], sizeof(scheduler_tasks)/sizeof(scheduler_tasks[0])); + scheduler.init(&scheduler_tasks[0], ARRAY_SIZE(scheduler_tasks)); } void Plane::loop() diff --git a/ArduPlane/Log.cpp b/ArduPlane/Log.cpp index 491995dc38..717e5d7d9a 100644 --- a/ArduPlane/Log.cpp +++ b/ArduPlane/Log.cpp @@ -523,7 +523,7 @@ void Plane::start_logging() */ void Plane::log_init(void) { - DataFlash.Init(log_structure, sizeof(log_structure)/sizeof(log_structure[0])); + DataFlash.Init(log_structure, ARRAY_SIZE(log_structure)); if (!DataFlash.CardInserted()) { gcs_send_text_P(SEVERITY_LOW, PSTR("No dataflash card inserted")); g.log_bitmask.set(0); diff --git a/ArduPlane/Parameters.cpp b/ArduPlane/Parameters.cpp index 3624529825..f778f873be 100644 --- a/ArduPlane/Parameters.cpp +++ b/ArduPlane/Parameters.cpp @@ -1257,7 +1257,7 @@ void Plane::load_parameters(void) uint32_t before = micros(); // Load all auto-loaded EEPROM variables AP_Param::load_all(); - AP_Param::convert_old_parameters(&conversion_table[0], sizeof(conversion_table)/sizeof(conversion_table[0])); + AP_Param::convert_old_parameters(&conversion_table[0], ARRAY_SIZE(conversion_table)); cliSerial->printf_P(PSTR("load_all took %luus\n"), micros() - before); } }