From b0ab2671cd9b25ee30b5e00cab329f1817631bd9 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 7 Jul 2014 18:21:21 +1000 Subject: [PATCH] AP_Baro: removed old device specific example code not needed any more --- .../AP_Baro_BMP085_test.pde | 100 ------------------ .../examples/AP_Baro_BMP085_test/Makefile | 2 - .../AP_Baro_BMP085_test/nocore.inoflag | 0 .../AP_Baro_MS5611_test.pde | 73 ------------- .../examples/AP_Baro_MS5611_test/Makefile | 2 - .../AP_Baro_MS5611_test/nocore.inoflag | 0 .../AP_Baro_PX4_test/AP_Baro_PX4_test.pde | 58 ---------- .../examples/AP_Baro_PX4_test/Makefile | 2 - 8 files changed, 237 deletions(-) delete mode 100644 libraries/AP_Baro/examples/AP_Baro_BMP085_test/AP_Baro_BMP085_test.pde delete mode 100644 libraries/AP_Baro/examples/AP_Baro_BMP085_test/Makefile delete mode 100644 libraries/AP_Baro/examples/AP_Baro_BMP085_test/nocore.inoflag delete mode 100644 libraries/AP_Baro/examples/AP_Baro_MS5611_test/AP_Baro_MS5611_test.pde delete mode 100644 libraries/AP_Baro/examples/AP_Baro_MS5611_test/Makefile delete mode 100644 libraries/AP_Baro/examples/AP_Baro_MS5611_test/nocore.inoflag delete mode 100644 libraries/AP_Baro/examples/AP_Baro_PX4_test/AP_Baro_PX4_test.pde delete mode 100644 libraries/AP_Baro/examples/AP_Baro_PX4_test/Makefile diff --git a/libraries/AP_Baro/examples/AP_Baro_BMP085_test/AP_Baro_BMP085_test.pde b/libraries/AP_Baro/examples/AP_Baro_BMP085_test/AP_Baro_BMP085_test.pde deleted file mode 100644 index 64b4e1b448..0000000000 --- a/libraries/AP_Baro/examples/AP_Baro_BMP085_test/AP_Baro_BMP085_test.pde +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Example of APM_BMP085 (absolute pressure sensor) library. - * Code by Jordi MuÒoz and Jose Julio. DIYDrones.com - */ - - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* Build this example sketch only for the APM1. */ -const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER; - -AP_Baro_BMP085 bmp085; - -uint32_t timer; - -void setup() -{ - hal.console->println("ArduPilot Mega BMP085 library test"); - hal.console->println("Initialising barometer..."); - - hal.scheduler->delay(100); - - if (!bmp085.init()) { - hal.console->println("Barometer initialisation FAILED\n"); - } - hal.console->println("initialisation complete."); - hal.scheduler->delay(1000); - timer = hal.scheduler->micros(); -} - -void loop() -{ - float tmp_float; - static uint32_t last_print; - - // accumulate values at 100Hz - if ((hal.scheduler->micros()- timer) > 10000L) { - bmp085.accumulate(); - timer = hal.scheduler->micros(); - } - - // print at 10Hz - if ((hal.scheduler->millis()- last_print) >= 100) { - uint32_t start = hal.scheduler->micros(); - last_print = hal.scheduler->millis(); - bmp085.read(); - uint32_t read_time = hal.scheduler->micros() - start; - if (! bmp085.healthy) { - hal.console->println("not healthy"); - return; - } - hal.console->print("Pressure:"); - hal.console->print( bmp085.get_pressure()); - hal.console->print(" Temperature:"); - hal.console->print( bmp085.get_temperature()); - hal.console->print(" Altitude:"); - tmp_float = ( bmp085.get_pressure() / 101325.0); - tmp_float = pow(tmp_float, 0.190295); - float alt = 44330.0 * (1.0 - tmp_float); - hal.console->print(alt); - hal.console->printf(" t=%lu samples=%u", - read_time, - (unsigned)bmp085.get_pressure_samples()); - hal.console->println(); - } - hal.scheduler->delay(1); -} - -AP_HAL_MAIN(); diff --git a/libraries/AP_Baro/examples/AP_Baro_BMP085_test/Makefile b/libraries/AP_Baro/examples/AP_Baro_BMP085_test/Makefile deleted file mode 100644 index 87e4482ca3..0000000000 --- a/libraries/AP_Baro/examples/AP_Baro_BMP085_test/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -BOARD = mega -include ../../../../mk/apm.mk diff --git a/libraries/AP_Baro/examples/AP_Baro_BMP085_test/nocore.inoflag b/libraries/AP_Baro/examples/AP_Baro_BMP085_test/nocore.inoflag deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/libraries/AP_Baro/examples/AP_Baro_MS5611_test/AP_Baro_MS5611_test.pde b/libraries/AP_Baro/examples/AP_Baro_MS5611_test/AP_Baro_MS5611_test.pde deleted file mode 100644 index b8f1a70e1b..0000000000 --- a/libraries/AP_Baro/examples/AP_Baro_MS5611_test/AP_Baro_MS5611_test.pde +++ /dev/null @@ -1,73 +0,0 @@ - -#include -#include -#include -#include -#include -#include -#include -#include -#include <../../../AP_HAL_Linux/GPIO.h> - -#include -#include -const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER; - -#if CONFIG_HAL_BOARD == HAL_BOARD_APM2 || CONFIG_HAL_BOARD == HAL_BOARD_LINUX || CONFIG_HAL_BOARD == HAL_BOARD_ERLE - -AP_Baro_MS5611 baro(&AP_Baro_MS5611::spi); -static uint32_t timer; - -void setup() -{ - hal.console->println("MS5611 Barometer library test"); - - hal.scheduler->delay(1000); - -#if CONFIG_HAL_BOARD == HAL_BOARD_APM2 - hal.gpio->pinMode(63, HAL_GPIO_OUTPUT); - hal.gpio->write(63, 1); -#endif - -#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX || CONFIG_HAL_BOARD == HAL_BOARD_ERLE - hal.gpio->pinMode(BBB_P9_28, HAL_GPIO_OUTPUT); - hal.gpio->write(BBB_P9_28, 1); -#endif - - baro.init(); - baro.calibrate(); - - timer = hal.scheduler->micros(); -} - -void loop() -{ - if((hal.scheduler->micros() - timer) > 100000UL) { - timer = hal.scheduler->micros(); - baro.read(); - uint32_t read_time = hal.scheduler->micros() - timer; - if (!baro.healthy) { - hal.console->println("not healthy"); - return; - } - hal.console->print("Pressure:"); - hal.console->print(baro.get_pressure()); - hal.console->print(" Temperature:"); - hal.console->print(baro.get_temperature()); - hal.console->print(" Altitude:"); - hal.console->print(baro.get_altitude()); - hal.console->printf(" climb=%.2f t=%u samples=%u", - baro.get_climb_rate(), - (unsigned)read_time, - (unsigned)baro.get_pressure_samples()); - hal.console->println(); - } -} - -#else // Non-APM2 -#warning AP_Baro_MS5611_test built as stub for APM1 -void setup () {} -void loop () {} -#endif - -AP_HAL_MAIN(); diff --git a/libraries/AP_Baro/examples/AP_Baro_MS5611_test/Makefile b/libraries/AP_Baro/examples/AP_Baro_MS5611_test/Makefile deleted file mode 100644 index 212822b4be..0000000000 --- a/libraries/AP_Baro/examples/AP_Baro_MS5611_test/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -BOARD = mega2560 -include ../../../../mk/apm.mk diff --git a/libraries/AP_Baro/examples/AP_Baro_MS5611_test/nocore.inoflag b/libraries/AP_Baro/examples/AP_Baro_MS5611_test/nocore.inoflag deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/libraries/AP_Baro/examples/AP_Baro_PX4_test/AP_Baro_PX4_test.pde b/libraries/AP_Baro/examples/AP_Baro_PX4_test/AP_Baro_PX4_test.pde deleted file mode 100644 index eb94aecca9..0000000000 --- a/libraries/AP_Baro/examples/AP_Baro_PX4_test/AP_Baro_PX4_test.pde +++ /dev/null @@ -1,58 +0,0 @@ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER; - -#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 - -AP_Baro_PX4 baro; -static uint32_t timer; - -void setup() -{ - hal.console->println("PX4 Barometer library test"); - - baro.init(); - baro.calibrate(); - - timer = hal.scheduler->micros(); -} - -void loop() -{ - hal.scheduler->delay(100); - baro.read(); - - if (!baro.healthy) { - hal.console->println("not healthy"); - return; - } - hal.console->print("Pressure:"); - hal.console->print(baro.get_pressure()); - hal.console->print(" Temperature:"); - hal.console->print(baro.get_temperature()); - hal.console->print(" Altitude:"); - hal.console->print(baro.get_altitude()); - hal.console->printf(" climb=%.2f samples=%u", - baro.get_climb_rate(), - (unsigned)baro.get_pressure_samples()); - hal.console->println(); -} - -#else // Non-PX4 -#warning AP_Baro_PX4_test is PX4 specific -void setup () {} -void loop () {} -#endif - -AP_HAL_MAIN(); diff --git a/libraries/AP_Baro/examples/AP_Baro_PX4_test/Makefile b/libraries/AP_Baro/examples/AP_Baro_PX4_test/Makefile deleted file mode 100644 index 212822b4be..0000000000 --- a/libraries/AP_Baro/examples/AP_Baro_PX4_test/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -BOARD = mega2560 -include ../../../../mk/apm.mk