diff --git a/APMrover2/APMrover2.pde b/APMrover2/APMrover2.pde index 23a979ad52..865c0b5c8c 100644 --- a/APMrover2/APMrover2.pde +++ b/APMrover2/APMrover2.pde @@ -79,6 +79,7 @@ version 2.1 of the License, or (at your option) any later version. #include #include #include +#include #include #include // ArduPilot Mega RC Library #include // ArduPilot GPS library diff --git a/ArduCopter/ArduCopter.pde b/ArduCopter/ArduCopter.pde index e10571e2b0..de3be2a05d 100644 --- a/ArduCopter/ArduCopter.pde +++ b/ArduCopter/ArduCopter.pde @@ -65,6 +65,7 @@ #include #include #include +#include #include #include // ArduPilot Mega RC Library #include // ArduPilot GPS library diff --git a/ArduPlane/ArduPlane.pde b/ArduPlane/ArduPlane.pde index 9fb4e9536c..a0de0b0f9a 100644 --- a/ArduPlane/ArduPlane.pde +++ b/ArduPlane/ArduPlane.pde @@ -28,6 +28,7 @@ #include #include #include +#include #include #include // ArduPilot Mega RC Library #include // ArduPilot GPS library diff --git a/libraries/AC_PID/AC_PID.h b/libraries/AC_PID/AC_PID.h index 8d9f3a0170..af442ee87f 100644 --- a/libraries/AC_PID/AC_PID.h +++ b/libraries/AC_PID/AC_PID.h @@ -7,6 +7,7 @@ #define AC_PID_h #include +#include #include // for fabs() /// @class AC_PID diff --git a/libraries/AC_PID/examples/AC_PID_test/AC_PID_test.pde b/libraries/AC_PID/examples/AC_PID_test/AC_PID_test.pde index 7990d98a49..453318fce4 100644 --- a/libraries/AC_PID/examples/AC_PID_test/AC_PID_test.pde +++ b/libraries/AC_PID/examples/AC_PID_test/AC_PID_test.pde @@ -8,6 +8,7 @@ #include #include #include +#include #include // ArduPilot RC Library #include // ArduPilot Mega RC Library diff --git a/libraries/APM_OBC/APM_OBC.h b/libraries/APM_OBC/APM_OBC.h index f252234d0d..36f53cb1dd 100644 --- a/libraries/APM_OBC/APM_OBC.h +++ b/libraries/APM_OBC/APM_OBC.h @@ -12,6 +12,7 @@ */ #include +#include #include diff --git a/libraries/APM_PI/APM_PI.h b/libraries/APM_PI/APM_PI.h index b227d379d0..b2478759b1 100644 --- a/libraries/APM_PI/APM_PI.h +++ b/libraries/APM_PI/APM_PI.h @@ -7,6 +7,7 @@ #define APM_PI_h #include +#include //#include // for fabs() /// @class APM_PI diff --git a/libraries/APO/AP_Autopilot.h b/libraries/APO/AP_Autopilot.h index f05d79fe81..71196f6ff0 100644 --- a/libraries/APO/AP_Autopilot.h +++ b/libraries/APO/AP_Autopilot.h @@ -8,7 +8,7 @@ #ifndef AP_AUTOPILOT_H_ #define AP_AUTOPILOT_H_ -#include "../AP_Common/AP_Loop.h" +#include "AP_Loop.h" /** * ArduPilotOne namespace to protect variables diff --git a/libraries/AP_AHRS/AP_AHRS.h b/libraries/AP_AHRS/AP_AHRS.h index c971dc8f40..4a74ac90c1 100644 --- a/libraries/AP_AHRS/AP_AHRS.h +++ b/libraries/AP_AHRS/AP_AHRS.h @@ -16,6 +16,7 @@ #include #include #include +#include #if defined(ARDUINO) && ARDUINO >= 100 #include "Arduino.h" diff --git a/libraries/AP_AHRS/examples/AHRS_Test/AHRS_Test.pde b/libraries/AP_AHRS/examples/AHRS_Test/AHRS_Test.pde index 874522fc47..90c758deec 100644 --- a/libraries/AP_AHRS/examples/AHRS_Test/AHRS_Test.pde +++ b/libraries/AP_AHRS/examples/AHRS_Test/AHRS_Test.pde @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include diff --git a/libraries/AP_Airspeed/examples/Airspeed/Airspeed.pde b/libraries/AP_Airspeed/examples/Airspeed/Airspeed.pde index 57af9bbb96..a62630be48 100644 --- a/libraries/AP_Airspeed/examples/Airspeed/Airspeed.pde +++ b/libraries/AP_Airspeed/examples/Airspeed/Airspeed.pde @@ -10,6 +10,7 @@ #include #include +#include #include #include #include diff --git a/libraries/AP_AnalogSource/examples/AnalogSource_Arduino/AnalogSource_Arduino.pde b/libraries/AP_AnalogSource/examples/AnalogSource_Arduino/AnalogSource_Arduino.pde index 1d9f0312fc..66c8f28f39 100644 --- a/libraries/AP_AnalogSource/examples/AnalogSource_Arduino/AnalogSource_Arduino.pde +++ b/libraries/AP_AnalogSource/examples/AnalogSource_Arduino/AnalogSource_Arduino.pde @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include 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 index 6e41c656f3..aeb9662d1f 100644 --- 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 @@ -13,6 +13,7 @@ #include #include #include +#include #include #include 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 index a26e8c8b67..1b58b6a393 100644 --- 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 @@ -2,6 +2,7 @@ #include #include #include +#include #include // ArduPilot Mega Vector/Matrix math Library #include #include diff --git a/libraries/AP_Common/AP_Common.h b/libraries/AP_Common/AP_Common.h index 0cfdbc3da1..71e0208b55 100644 --- a/libraries/AP_Common/AP_Common.h +++ b/libraries/AP_Common/AP_Common.h @@ -38,13 +38,6 @@ typedef struct { //#include "AP_Vector.h" //#include "AP_Loop.h" -// default to AP_Param system, unless USE_AP_VAR is defined -#ifdef USE_AP_VAR - #include "AP_Var.h" -#else - #include "AP_Param.h" -#endif - //////////////////////////////////////////////////////////////////////////////// /// @name Warning control //@{ diff --git a/libraries/AP_Compass/Compass.h b/libraries/AP_Compass/Compass.h index aa2b5d8e18..637f32f737 100644 --- a/libraries/AP_Compass/Compass.h +++ b/libraries/AP_Compass/Compass.h @@ -3,9 +3,10 @@ #define Compass_h #include -#include "../AP_Common/AP_Common.h" -#include "../AP_Math/AP_Math.h" -#include "../AP_Declination/AP_Declination.h" // ArduPilot Mega Declination Helper Library +#include +#include +#include +#include // ArduPilot Mega Declination Helper Library // compass product id #define AP_COMPASS_TYPE_UNKNOWN 0x00 diff --git a/libraries/AP_Compass/examples/AP_Compass_test/AP_Compass_test.pde b/libraries/AP_Compass/examples/AP_Compass_test/AP_Compass_test.pde index 3e949b0525..4d1cd3b9aa 100644 --- a/libraries/AP_Compass/examples/AP_Compass_test/AP_Compass_test.pde +++ b/libraries/AP_Compass/examples/AP_Compass_test/AP_Compass_test.pde @@ -5,6 +5,7 @@ #include #include +#include #include // Compass Library #include // ArduPilot Mega Vector/Matrix math Library #include diff --git a/libraries/AP_Declination/examples/AP_Declination_test/AP_Declination_test.pde b/libraries/AP_Declination/examples/AP_Declination_test/AP_Declination_test.pde index 3ecebe18d1..25b9794d03 100644 --- a/libraries/AP_Declination/examples/AP_Declination_test/AP_Declination_test.pde +++ b/libraries/AP_Declination/examples/AP_Declination_test/AP_Declination_test.pde @@ -3,6 +3,7 @@ // AVR runtime #include #include +#include #include #include #include diff --git a/libraries/AP_GPS/examples/GPS_406_test/GPS_406_test.pde b/libraries/AP_GPS/examples/GPS_406_test/GPS_406_test.pde index d6cfdbb116..ce545eb272 100644 --- a/libraries/AP_GPS/examples/GPS_406_test/GPS_406_test.pde +++ b/libraries/AP_GPS/examples/GPS_406_test/GPS_406_test.pde @@ -9,6 +9,7 @@ #include #include #include +#include #include FastSerialPort0(Serial); diff --git a/libraries/AP_GPS/examples/GPS_AUTO_test/GPS_AUTO_test.pde b/libraries/AP_GPS/examples/GPS_AUTO_test/GPS_AUTO_test.pde index 5b002349d5..460b65e538 100644 --- a/libraries/AP_GPS/examples/GPS_AUTO_test/GPS_AUTO_test.pde +++ b/libraries/AP_GPS/examples/GPS_AUTO_test/GPS_AUTO_test.pde @@ -5,6 +5,7 @@ #include #include +#include #include #include diff --git a/libraries/AP_GPS/examples/GPS_MTK_test/GPS_MTK_test.pde b/libraries/AP_GPS/examples/GPS_MTK_test/GPS_MTK_test.pde index ce885e6dce..3f55e24c19 100644 --- 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 #include +#include #include #include diff --git a/libraries/AP_GPS/examples/GPS_NMEA_test/GPS_NMEA_test.pde b/libraries/AP_GPS/examples/GPS_NMEA_test/GPS_NMEA_test.pde index d58cea2e8c..471f9b3b0b 100644 --- a/libraries/AP_GPS/examples/GPS_NMEA_test/GPS_NMEA_test.pde +++ b/libraries/AP_GPS/examples/GPS_NMEA_test/GPS_NMEA_test.pde @@ -6,6 +6,7 @@ #include #include #include +#include #include FastSerialPort0(Serial); diff --git a/libraries/AP_GPS/examples/GPS_UBLOX_test/GPS_UBLOX_test.pde b/libraries/AP_GPS/examples/GPS_UBLOX_test/GPS_UBLOX_test.pde index f768ea32e7..f847326187 100644 --- 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 #include +#include #include #include diff --git a/libraries/AP_InertialSensor/examples/MPU6000/MPU6000.pde b/libraries/AP_InertialSensor/examples/MPU6000/MPU6000.pde index 393e478e22..2280abde29 100644 --- a/libraries/AP_InertialSensor/examples/MPU6000/MPU6000.pde +++ b/libraries/AP_InertialSensor/examples/MPU6000/MPU6000.pde @@ -12,6 +12,7 @@ #include #include #include +#include #define APM_HARDWARE_APM1 1 #define APM_HARDWARE_APM2 2 diff --git a/libraries/AP_LeadFilter/examples/AP_LeadFilter/AP_LeadFilter.pde b/libraries/AP_LeadFilter/examples/AP_LeadFilter/AP_LeadFilter.pde index 52c4cd942d..34c6eca1fb 100644 --- a/libraries/AP_LeadFilter/examples/AP_LeadFilter/AP_LeadFilter.pde +++ b/libraries/AP_LeadFilter/examples/AP_LeadFilter/AP_LeadFilter.pde @@ -7,6 +7,7 @@ #include #include // ArduPilot Mega Common Library +#include #include #include // ArduPilot Mega Vector/Matrix math Library #include // GPS Lead filter diff --git a/libraries/AP_Limits/AP_Limit_Module.h b/libraries/AP_Limits/AP_Limit_Module.h index 9b32381381..9a812b12d3 100644 --- a/libraries/AP_Limits/AP_Limit_Module.h +++ b/libraries/AP_Limits/AP_Limit_Module.h @@ -10,6 +10,7 @@ #define AP_LIMIT_MODULE_H_ #include +#include // The module IDs are defined as powers of 2, to make a bit-field enum moduleid { diff --git a/libraries/AP_Limits/AP_Limits.h b/libraries/AP_Limits/AP_Limits.h index 92df35ae20..866d27bdf5 100644 --- a/libraries/AP_Limits/AP_Limits.h +++ b/libraries/AP_Limits/AP_Limits.h @@ -13,8 +13,8 @@ #endif #include +#include #include -#include // MAVLink messages, trying to pull into library //#include "../GCS_MAVLink/include/mavlink/v1.0/protocol.h" diff --git a/libraries/AP_Math/AP_Math.h b/libraries/AP_Math/AP_Math.h index 5794252b6f..c7a6f7eee8 100644 --- a/libraries/AP_Math/AP_Math.h +++ b/libraries/AP_Math/AP_Math.h @@ -6,6 +6,7 @@ // Assorted useful math operations for ArduPilot(Mega) #include +#include #include #include #include "rotations.h" diff --git a/libraries/AP_Math/examples/eulers/eulers.pde b/libraries/AP_Math/examples/eulers/eulers.pde index 7150fcb781..72fb6c9cec 100644 --- a/libraries/AP_Math/examples/eulers/eulers.pde +++ b/libraries/AP_Math/examples/eulers/eulers.pde @@ -5,6 +5,7 @@ #include #include +#include #include FastSerialPort(Serial, 0); diff --git a/libraries/AP_Math/examples/location/location.pde b/libraries/AP_Math/examples/location/location.pde index 44a13b561c..2f549fe2fb 100644 --- a/libraries/AP_Math/examples/location/location.pde +++ b/libraries/AP_Math/examples/location/location.pde @@ -5,6 +5,7 @@ #include #include +#include #include #ifdef DESKTOP_BUILD diff --git a/libraries/AP_Math/examples/polygon/polygon.pde b/libraries/AP_Math/examples/polygon/polygon.pde index 2596fadc3c..56f23196a8 100644 --- a/libraries/AP_Math/examples/polygon/polygon.pde +++ b/libraries/AP_Math/examples/polygon/polygon.pde @@ -5,6 +5,7 @@ #include #include +#include #include FastSerialPort(Serial, 0); diff --git a/libraries/AP_Math/examples/rotations/rotations.pde b/libraries/AP_Math/examples/rotations/rotations.pde index 54848939a5..b093dffa97 100644 --- a/libraries/AP_Math/examples/rotations/rotations.pde +++ b/libraries/AP_Math/examples/rotations/rotations.pde @@ -5,6 +5,7 @@ #include #include +#include #include FastSerialPort(Serial, 0); diff --git a/libraries/AP_Motors/examples/AP_Motors_test/AP_Motors_test.pde b/libraries/AP_Motors/examples/AP_Motors_test/AP_Motors_test.pde index 3b955adcf0..683a7e95b7 100644 --- a/libraries/AP_Motors/examples/AP_Motors_test/AP_Motors_test.pde +++ b/libraries/AP_Motors/examples/AP_Motors_test/AP_Motors_test.pde @@ -12,6 +12,7 @@ // Libraries #include #include +#include #include #include // ArduPilot Mega Vector/Matrix math Library #include // RC Channel Library @@ -111,4 +112,4 @@ void print_motor_output() Serial.printf("\t%d %d",i,motors.motor_out[i]); } } -} \ No newline at end of file +} diff --git a/libraries/AP_OpticalFlow/examples/AP_OpticalFlow_test/AP_OpticalFlow_test.pde b/libraries/AP_OpticalFlow/examples/AP_OpticalFlow_test/AP_OpticalFlow_test.pde index e9fc63a34b..be11a25c88 100644 --- a/libraries/AP_OpticalFlow/examples/AP_OpticalFlow_test/AP_OpticalFlow_test.pde +++ b/libraries/AP_OpticalFlow/examples/AP_OpticalFlow_test/AP_OpticalFlow_test.pde @@ -5,6 +5,7 @@ #include #include +#include #include // ArduPilot Mega Vector/Matrix math Library #include // Arduino SPI library #include // SPI3 library diff --git a/libraries/AP_PID/examples/AP_pid/AP_pid.pde b/libraries/AP_PID/examples/AP_pid/AP_pid.pde new file mode 100644 index 0000000000..33f3f292e8 --- /dev/null +++ b/libraries/AP_PID/examples/AP_pid/AP_pid.pde @@ -0,0 +1,52 @@ +/* + * Example of PID library. + * 2010 Code by Jason Short. DIYDrones.com + */ + +#include +#include +#include +#include +#include // ArduPilot RC Library +#include // ArduPilot Mega RC Library + +long radio_in; +long radio_trim; + +Arduino_Mega_ISR_Registry isr_registry; +AP_PID pid; +APM_RC_APM1 APM_RC; + +void setup() +{ + Serial.begin(115200); + Serial.println("ArduPilot Mega AP_PID library test"); + + isr_registry.init(); + APM_RC.Init(&isr_registry); // APM Radio initialization + + delay(1000); + //rc.trim(); + radio_trim = APM_RC.InputCh(0); + + pid.kP(1); + pid.kI(0); + pid.kD(0.5); + pid.imax(50); + pid.kP(0); + pid.kI(0); + pid.kD(0); + pid.imax(0); + Serial.printf("P %f I %f D %f imax %f\n", pid.kP(), pid.kI(), pid.kD(), pid.imax()); +} + +void loop() +{ + delay(20); + //rc.read_pwm(); + long error = APM_RC.InputCh(0) - radio_trim; + long control = pid.get_pid(error, 20, 1); + + Serial.print("control: "); + Serial.println(control,DEC); +} diff --git a/libraries/AP_RangeFinder/examples/AP_RangeFinder_test/AP_RangeFinder_test.pde b/libraries/AP_RangeFinder/examples/AP_RangeFinder_test/AP_RangeFinder_test.pde index 6476e1d955..155258204d 100644 --- a/libraries/AP_RangeFinder/examples/AP_RangeFinder_test/AP_RangeFinder_test.pde +++ b/libraries/AP_RangeFinder/examples/AP_RangeFinder_test/AP_RangeFinder_test.pde @@ -6,6 +6,7 @@ // includes #include #include +#include #include #include #include // Arduino I2C lib diff --git a/libraries/Filter/examples/Derivative/Derivative.pde b/libraries/Filter/examples/Derivative/Derivative.pde index 8638faa508..9b593d3f72 100644 --- a/libraries/Filter/examples/Derivative/Derivative.pde +++ b/libraries/Filter/examples/Derivative/Derivative.pde @@ -4,6 +4,7 @@ #include #include +#include #include #include #include diff --git a/libraries/Filter/examples/Filter/Filter.pde b/libraries/Filter/examples/Filter/Filter.pde index 662f370f3e..05bfe63244 100644 --- a/libraries/Filter/examples/Filter/Filter.pde +++ b/libraries/Filter/examples/Filter/Filter.pde @@ -5,6 +5,7 @@ #include #include +#include #include // ArduPilot Mega Vector/Matrix math Library #include // Filter library #include // ModeFilter class (inherits from Filter class) diff --git a/libraries/Filter/examples/LowPassFilter/LowPassFilter.pde b/libraries/Filter/examples/LowPassFilter/LowPassFilter.pde index 66a18a0e2f..d97ff6a1bc 100644 --- a/libraries/Filter/examples/LowPassFilter/LowPassFilter.pde +++ b/libraries/Filter/examples/LowPassFilter/LowPassFilter.pde @@ -5,6 +5,7 @@ #include #include +#include #include // ArduPilot Mega Vector/Matrix math Library #include // Filter library #include // LowPassFilter class (inherits from Filter class) diff --git a/libraries/GCS_MAVLink/GCS_MAVLink.h b/libraries/GCS_MAVLink/GCS_MAVLink.h index bd2198994f..1dfdd83043 100644 --- a/libraries/GCS_MAVLink/GCS_MAVLink.h +++ b/libraries/GCS_MAVLink/GCS_MAVLink.h @@ -6,6 +6,7 @@ #ifndef GCS_MAVLink_h #define GCS_MAVLink_h +#include #include // we have separate helpers disabled to make it possible diff --git a/libraries/PID/PID.h b/libraries/PID/PID.h index 71c5d7b1ce..3aba9bed4b 100644 --- a/libraries/PID/PID.h +++ b/libraries/PID/PID.h @@ -7,6 +7,7 @@ #define PID_h #include +#include #include // for fabs() /// @class PID diff --git a/libraries/PID/examples/pid/pid.pde b/libraries/PID/examples/pid/pid.pde index 836de0f7d4..a9fc03202d 100644 --- a/libraries/PID/examples/pid/pid.pde +++ b/libraries/PID/examples/pid/pid.pde @@ -6,6 +6,7 @@ #include #include #include +#include #include #include // ArduPilot RC Library #include // ArduPilot Mega RC Library diff --git a/libraries/RC_Channel/RC_Channel.h b/libraries/RC_Channel/RC_Channel.h index e941cf0154..6f582d06ba 100644 --- a/libraries/RC_Channel/RC_Channel.h +++ b/libraries/RC_Channel/RC_Channel.h @@ -7,6 +7,7 @@ #define RC_Channel_h #include +#include #include #define RC_CHANNEL_TYPE_ANGLE 0 diff --git a/libraries/RC_Channel/examples/RC_Channel/RC_Channel.pde b/libraries/RC_Channel/examples/RC_Channel/RC_Channel.pde index 372bed8383..ed362eefe6 100644 --- a/libraries/RC_Channel/examples/RC_Channel/RC_Channel.pde +++ b/libraries/RC_Channel/examples/RC_Channel/RC_Channel.pde @@ -7,6 +7,7 @@ #include #include // ArduPilot Mega Common Library +#include #include #include // ArduPilot Mega Vector/Matrix math Library #include // ArduPilot Mega RC Library @@ -145,46 +146,65 @@ print_radio_values() void setup_radio() { - Serial.println("\n\nRadio Setup:"); - - for (byte i = 0; i < 100; i++) { - delay(20); - read_radio(); - } - - for (byte i=0; i<8; i++) { - rc[i].radio_min = rc[i].radio_in; - rc[i].radio_max = rc[i].radio_in; - } - - rc_1.radio_trim = rc_1.radio_in; - rc_2.radio_trim = rc_2.radio_in; - rc_4.radio_trim = rc_4.radio_in; - // 3 is not trimed - rc_5.radio_trim = 1500; - rc_6.radio_trim = 1500; - rc_7.radio_trim = 1500; - rc_8.radio_trim = 1500; - - Serial.println("\nMove all controls to each extreme. Hit Enter to save:"); - while(1) { - - delay(20); - // Filters radio input - adjust filters in the radio.pde file - // ---------------------------------------------------------- - read_radio(); - - for (byte i=0; i<8; i++) { - rc[i].update_min_max(); + Serial.println("\n\nRadio Setup:"); + uint8_t i; + + for(i = 0; i < 100;i++){ + delay(20); + read_radio(); } + + rc_1.radio_min = rc_1.radio_in; + rc_2.radio_min = rc_2.radio_in; + rc_3.radio_min = rc_3.radio_in; + rc_4.radio_min = rc_4.radio_in; + rc_5.radio_min = rc_5.radio_in; + rc_6.radio_min = rc_6.radio_in; + rc_7.radio_min = rc_7.radio_in; + rc_8.radio_min = rc_8.radio_in; - if(Serial.available() > 0) { - //rc_3.radio_max += 250; - Serial.flush(); + rc_1.radio_max = rc_1.radio_in; + rc_2.radio_max = rc_2.radio_in; + rc_3.radio_max = rc_3.radio_in; + rc_4.radio_max = rc_4.radio_in; + rc_5.radio_max = rc_5.radio_in; + rc_6.radio_max = rc_6.radio_in; + rc_7.radio_max = rc_7.radio_in; + rc_8.radio_max = rc_8.radio_in; - Serial.println("Radio calibrated, Showing control values:"); - break; - } - } - return; + rc_1.radio_trim = rc_1.radio_in; + rc_2.radio_trim = rc_2.radio_in; + rc_4.radio_trim = rc_4.radio_in; + // 3 is not trimed + rc_5.radio_trim = 1500; + rc_6.radio_trim = 1500; + rc_7.radio_trim = 1500; + rc_8.radio_trim = 1500; + + Serial.println("\nMove all controls to each extreme. Hit Enter to save:"); + while(1){ + + delay(20); + // Filters radio input - adjust filters in the radio.pde file + // ---------------------------------------------------------- + read_radio(); + + rc_1.update_min_max(); + rc_2.update_min_max(); + rc_3.update_min_max(); + rc_4.update_min_max(); + rc_5.update_min_max(); + rc_6.update_min_max(); + rc_7.update_min_max(); + rc_8.update_min_max(); + + if(Serial.available() > 0){ + //rc_3.radio_max += 250; + Serial.flush(); + + Serial.println("Radio calibrated, Showing control values:"); + break; + } + } + return; }