AP_Progmem: fix dependencies for all sketches touched by AP_HAL_AVR

2012-10-26 20:55:17 -07:00 · 2012-10-26 20:55:17 -07:00 · a4f1f6a5db
parent a399851ca2
commit a4f1f6a5db
40 changed files with 39 additions and 38 deletions
--- a/APMrover2/APMrover2.pde
+++ b/APMrover2/APMrover2.pde
@ -78,6 +78,7 @@ version 2.1 of the License, or (at your option) any later version.
 // Libraries
 #include <FastSerial.h>
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Menu.h>
 #include <AP_Param.h>
 #include <Arduino_Mega_ISR_Registry.h>
--- a/ArduCopter/ArduCopter.pde
+++ b/ArduCopter/ArduCopter.pde
@ -64,6 +64,7 @@
 // Libraries
 #include <FastSerial.h>
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Menu.h>
 #include <AP_Param.h>
 #include <Arduino_Mega_ISR_Registry.h>
--- a/ArduPlane/ArduPlane.pde
+++ b/ArduPlane/ArduPlane.pde
@ -27,6 +27,7 @@
 // Libraries
 #include <FastSerial.h>
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Menu.h>
 #include <AP_Param.h>
 #include <Arduino_Mega_ISR_Registry.h>
--- a/libraries/AC_PID/examples/AC_PID_test/AC_PID_test.pde
+++ b/libraries/AC_PID/examples/AC_PID_test/AC_PID_test.pde
@ -4,7 +4,7 @@
 */

 #include <AP_Common.h>
-
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
 #include <AP_Math.h>
--- a/libraries/AP_ADC/examples/AP_ADC_test/AP_ADC_test.pde
+++ b/libraries/AP_ADC/examples/AP_ADC_test/AP_ADC_test.pde
@ -7,8 +7,7 @@
 #include <math.h>

 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>

--- a/libraries/AP_Airspeed/examples/Airspeed/Airspeed.pde
+++ b/libraries/AP_Airspeed/examples/Airspeed/Airspeed.pde
@ -9,6 +9,7 @@
 */

 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_Math.h>
 #include <AP_HAL.h>
--- 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
@ -3,6 +3,7 @@
 *       Code by Jordi MuÒoz and Jose Julio. DIYDrones.com
 */

+
 #include <FastSerial.h>
 #include <AP_Common.h>
 #include <I2C.h>
@ -12,6 +13,8 @@
 #include <Arduino_Mega_ISR_Registry.h>
 #include <AP_PeriodicProcess.h>
 #include <AP_InertialSensor.h>
+#include <math.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_Math.h>
 #include <AP_HAL.h>
--- 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
@ -1,5 +1,6 @@

 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_Math.h>
 #include <AP_HAL.h>
--- a/libraries/AP_Common/c++.cpp
+++ b/libraries/AP_Common/c++.cpp
@ -8,8 +8,6 @@
 //

 #include <stdlib.h>
-#include <stdint.h>
-#include "c++.h"

 void * operator new(size_t size)
 {
--- a/libraries/AP_Compass/examples/AP_Compass_test/AP_Compass_test.pde
+++ b/libraries/AP_Compass/examples/AP_Compass_test/AP_Compass_test.pde
@ -4,6 +4,7 @@
 */

 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
@ -12,9 +13,6 @@
 #include <AP_Declination.h>
 #include <AP_Compass.h> // Compass Library

-#define ToRad(x) (x*0.01745329252)  // *pi/180
-#define ToDeg(x) (x*57.2957795131)  // *180/pi
-
 const AP_HAL::HAL& hal = AP_HAL_AVR_APM2;

 AP_Compass_HMC5843 compass;
--- a/libraries/AP_Declination/examples/AP_Declination_test/AP_Declination_test.pde
+++ b/libraries/AP_Declination/examples/AP_Declination_test/AP_Declination_test.pde
@ -1,6 +1,7 @@
 /// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-

 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_HAL.h>
 #include <AP_Math.h>
--- a/libraries/AP_GPS/examples/GPS_AUTO_test/GPS_AUTO_test.pde
+++ b/libraries/AP_GPS/examples/GPS_AUTO_test/GPS_AUTO_test.pde
@ -6,6 +6,7 @@
 #include <stdlib.h>

 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
--- a/libraries/AP_GPS/examples/GPS_MTK_test/GPS_MTK_test.pde
+++ b/libraries/AP_GPS/examples/GPS_MTK_test/GPS_MTK_test.pde
@ -8,6 +8,7 @@

 #include <stdlib.h>
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
--- a/libraries/AP_GPS/examples/GPS_UBLOX_test/GPS_UBLOX_test.pde
+++ b/libraries/AP_GPS/examples/GPS_UBLOX_test/GPS_UBLOX_test.pde
@ -8,6 +8,7 @@

 #include <stdlib.h>
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
--- a/libraries/AP_HAL_AVR/Console.h
+++ b/libraries/AP_HAL_AVR/Console.h
@ -4,7 +4,6 @@

 #include <stdlib.h>

-#include <AP_Common.h>
 #include <AP_HAL.h>
 #include "AP_HAL_AVR_Namespace.h"

--- a/libraries/AP_HAL_AVR/UARTDriver.cpp
+++ b/libraries/AP_HAL_AVR/UARTDriver.cpp
@ -14,7 +14,6 @@

 #include <avr/pgmspace.h>

-#include <AP_Common.h>
 #include <AP_HAL.h>

 #include "vprintf.h"
--- a/libraries/AP_HAL_AVR/UARTDriver.h
+++ b/libraries/AP_HAL_AVR/UARTDriver.h
@ -7,7 +7,6 @@

 #include <avr/interrupt.h>

-#include <AP_Common.h>
 #include <AP_HAL.h>
 #include "AP_HAL_AVR_Namespace.h"

--- a/libraries/AP_HAL_AVR/examples/APM1/APM1.pde
+++ b/libraries/AP_HAL_AVR/examples/APM1/APM1.pde
@ -1,7 +1,6 @@

 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>

--- a/libraries/AP_HAL_AVR/examples/AnalogIn/AnalogIn.pde
+++ b/libraries/AP_HAL_AVR/examples/AnalogIn/AnalogIn.pde
@ -1,7 +1,6 @@

 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>

--- a/libraries/AP_HAL_AVR/examples/Blink/Blink.pde
+++ b/libraries/AP_HAL_AVR/examples/Blink/Blink.pde
@ -1,7 +1,6 @@

 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>

--- a/libraries/AP_HAL_AVR/examples/Console/Console.pde
+++ b/libraries/AP_HAL_AVR/examples/Console/Console.pde
@ -7,8 +7,7 @@
 //

 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>

--- a/libraries/AP_HAL_AVR/examples/DataflashTest/DataflashTest.pde
+++ b/libraries/AP_HAL_AVR/examples/DataflashTest/DataflashTest.pde
@ -1,7 +1,6 @@

 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>

--- a/libraries/AP_HAL_AVR/examples/FastSerial/FastSerial.pde
+++ b/libraries/AP_HAL_AVR/examples/FastSerial/FastSerial.pde
@ -7,8 +7,7 @@
 //

 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>

--- a/libraries/AP_HAL_AVR/examples/I2CDriver_HMC5883L/I2CDriver_HMC5883L.pde
+++ b/libraries/AP_HAL_AVR/examples/I2CDriver_HMC5883L/I2CDriver_HMC5883L.pde
@ -5,9 +5,8 @@
 *******************************************/

 #include <AP_Common.h>
-#include <AP_Param.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
-#include <AP_Math.h>
 #include <AP_HAL_AVR.h>

 const AP_HAL_AVR::HAL_AVR& hal = AP_HAL_AVR_APM2;
--- a/libraries/AP_HAL_AVR/examples/LCDTest/LCDTest.pde
+++ b/libraries/AP_HAL_AVR/examples/LCDTest/LCDTest.pde
@ -38,8 +38,7 @@
 // include the library code:

 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>

--- a/libraries/AP_HAL_AVR/examples/RCInputTest/RCInputTest.pde
+++ b/libraries/AP_HAL_AVR/examples/RCInputTest/RCInputTest.pde
@ -1,7 +1,6 @@

 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>

--- a/libraries/AP_HAL_AVR/examples/RCPassthroughTest/RCPassthroughTest.pde
+++ b/libraries/AP_HAL_AVR/examples/RCPassthroughTest/RCPassthroughTest.pde
@ -1,7 +1,6 @@

 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>

--- a/libraries/AP_HAL_AVR/examples/SPIDriver_MPU6000/SPIDriver_MPU6000.pde
+++ b/libraries/AP_HAL_AVR/examples/SPIDriver_MPU6000/SPIDriver_MPU6000.pde
@ -5,8 +5,7 @@
 *******************************************/

 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>

--- a/libraries/AP_HAL_AVR/examples/Scheduler/Scheduler.pde
+++ b/libraries/AP_HAL_AVR/examples/Scheduler/Scheduler.pde
@ -1,7 +1,6 @@

 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>

--- a/libraries/AP_HAL_AVR/examples/Storage/Storage.pde
+++ b/libraries/AP_HAL_AVR/examples/Storage/Storage.pde
@ -1,7 +1,6 @@

 #include <AP_Common.h>
-#include <AP_Param.h>
-#include <AP_Math.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>

--- a/libraries/AP_InertialSensor/examples/MPU6000/MPU6000.pde
+++ b/libraries/AP_InertialSensor/examples/MPU6000/MPU6000.pde
@ -6,6 +6,7 @@

 #include <stdarg.h>
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
 #include <AP_Math.h>
--- a/libraries/AP_LeadFilter/examples/AP_LeadFilter/AP_LeadFilter.pde
+++ b/libraries/AP_LeadFilter/examples/AP_LeadFilter/AP_LeadFilter.pde
@ -6,6 +6,7 @@
 */

 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_Math.h>
 #include <AP_HAL.h>
--- a/libraries/AP_Math/examples/eulers/eulers.pde
+++ b/libraries/AP_Math/examples/eulers/eulers.pde
@ -5,6 +5,7 @@

 #include <stdlib.h>
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_Math.h>
 #include <AP_HAL.h>
--- a/libraries/AP_Math/examples/location/location.pde
+++ b/libraries/AP_Math/examples/location/location.pde
@ -4,6 +4,7 @@
 //

 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_HAL.h>
 #include <AP_Math.h>
--- a/libraries/AP_Math/examples/polygon/polygon.pde
+++ b/libraries/AP_Math/examples/polygon/polygon.pde
@ -4,6 +4,7 @@
 //

 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
 #include <AP_Math.h>
 #include <AP_HAL.h>
--- a/libraries/AP_Math/examples/rotations/rotations.pde
+++ b/libraries/AP_Math/examples/rotations/rotations.pde
@ -4,8 +4,9 @@
 //
 #include <stdlib.h>
 #include <AP_Common.h>
-#include <AP_HAL.h>
+#include <AP_Progmem.h>
 #include <AP_Param.h>
+#include <AP_HAL.h>
 #include <AP_Math.h>
 #include <AP_Declination.h> // ArduPilot Mega Declination Helper Library

--- a/libraries/Filter/examples/Derivative/Derivative.pde
+++ b/libraries/Filter/examples/Derivative/Derivative.pde
@ -4,6 +4,7 @@

 #include <stdlib.h>
 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
 #include <AP_Param.h>
--- a/libraries/Filter/examples/Filter/Filter.pde
+++ b/libraries/Filter/examples/Filter/Filter.pde
@ -4,6 +4,7 @@
 */

 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>

--- a/libraries/Filter/examples/LowPassFilter/LowPassFilter.pde
+++ b/libraries/Filter/examples/LowPassFilter/LowPassFilter.pde
@ -4,6 +4,7 @@
 */

 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>
 #include <AP_Param.h>
--- a/libraries/GCS_Console/examples/Console/Console.pde
+++ b/libraries/GCS_Console/examples/Console/Console.pde
@ -7,6 +7,7 @@
 //

 #include <AP_Common.h>
+#include <AP_Progmem.h>
 #include <AP_HAL.h>
 #include <AP_HAL_AVR.h>