firmware build

Tools/ArdupilotMegaPlanner/Firmware/AC2-HELHIL-1280.build.log

@@ -46,7 +46,7 @@ autogenerated:248: warning: 'long int read_baro_filtered()' declared 'static' bu
 autogenerated:249: warning: 'long int read_barometer()' declared 'static' but never defined
 autogenerated:250: warning: 'void read_airspeed()' declared 'static' but never defined
 autogenerated:251: warning: 'void zero_airspeed()' declared 'static' but never defined
-/root/apm/ardupilot-mega/ArduCopter/system.pde:434: warning: 'void set_failsafe(boolean)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/system.pde:438: warning: 'void set_failsafe(boolean)' defined but not used
 autogenerated:285: warning: 'void init_optflow()' declared 'static' but never defined
 autogenerated:292: warning: 'void fake_out_gps()' declared 'static' but never defined
 /root/apm/ardupilot-mega/ArduCopter/test.pde:1028: warning: 'void print_motor_out()' defined but not used

Tools/ArdupilotMegaPlanner/Firmware/AC2-HELHIL-2560.build.log

@@ -46,7 +46,7 @@ autogenerated:248: warning: 'long int read_baro_filtered()' declared 'static' bu
 autogenerated:249: warning: 'long int read_barometer()' declared 'static' but never defined
 autogenerated:250: warning: 'void read_airspeed()' declared 'static' but never defined
 autogenerated:251: warning: 'void zero_airspeed()' declared 'static' but never defined
-/root/apm/ardupilot-mega/ArduCopter/system.pde:434: warning: 'void set_failsafe(boolean)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/system.pde:438: warning: 'void set_failsafe(boolean)' defined but not used
 autogenerated:285: warning: 'void init_optflow()' declared 'static' but never defined
 autogenerated:292: warning: 'void fake_out_gps()' declared 'static' but never defined
 /root/apm/ardupilot-mega/ArduCopter/test.pde:1028: warning: 'void print_motor_out()' defined but not used

Tools/ArdupilotMegaPlanner/Firmware/AC2-Heli-1280.build.log

@@ -9,11 +9,11 @@ In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:77:
 /root/apm/ardupilot-mega/ArduCopter/heli.pde: In function 'void heli_init_swash()':
 /root/apm/ardupilot-mega/ArduCopter/heli.pde:60: warning: comparisons like X<=Y<=Z do not have their mathematical meaning
 /root/apm/ardupilot-mega/ArduCopter/setup.pde: In function 'int8_t setup_heli(uint8_t, const Menu::arg*)':
-/root/apm/ardupilot-mega/ArduCopter/setup.pde:467: warning: 'max_pitch' may be used uninitialized in this function
-/root/apm/ardupilot-mega/ArduCopter/setup.pde:467: warning: 'max_tail' may be used uninitialized in this function
 /root/apm/ardupilot-mega/ArduCopter/setup.pde:467: warning: 'min_tail' may be used uninitialized in this function
+/root/apm/ardupilot-mega/ArduCopter/setup.pde:467: warning: 'max_tail' may be used uninitialized in this function
 /root/apm/ardupilot-mega/ArduCopter/setup.pde:467: warning: 'max_coll' may be used uninitialized in this function
 /root/apm/ardupilot-mega/ArduCopter/setup.pde:467: warning: 'min_coll' may be used uninitialized in this function
+/root/apm/ardupilot-mega/ArduCopter/setup.pde:467: warning: 'max_pitch' may be used uninitialized in this function
 /root/apm/ardupilot-mega/ArduCopter/setup.pde:467: warning: 'max_roll' may be used uninitialized in this function
 autogenerated: At global scope:
 autogenerated:109: warning: 'void Log_Write_Optflow()' declared 'static' but never defined
@@ -34,7 +34,7 @@ autogenerated:238: warning: 'long int get_alt_distance(Location*, Location*)' de
 autogenerated:248: warning: 'long int read_baro_filtered()' declared 'static' but never defined
 /root/apm/ardupilot-mega/ArduCopter/sensors.pde:95: warning: 'void read_airspeed()' defined but not used
 /root/apm/ardupilot-mega/ArduCopter/sensors.pde:100: warning: 'void zero_airspeed()' defined but not used
-/root/apm/ardupilot-mega/ArduCopter/system.pde:434: warning: 'void set_failsafe(boolean)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/system.pde:438: warning: 'void set_failsafe(boolean)' defined but not used
 autogenerated:285: warning: 'void init_optflow()' declared 'static' but never defined
 autogenerated:292: warning: 'void fake_out_gps()' declared 'static' but never defined
 /root/apm/ardupilot-mega/ArduCopter/test.pde:1028: warning: 'void print_motor_out()' defined but not used

Tools/ArdupilotMegaPlanner/Firmware/AC2-Heli-1280.size.txt

@@ -677,9 +677,9 @@
 000003a0 t read_battery()
 0000045c T update_yaw_mode()
 0000046e T update_roll_pitch_mode()
-0000052e t heli_move_swash(int, int, int, int)
+0000053e t heli_move_swash(int, int, int, int)
 000005cc t __static_initialization_and_destruction_0(int, int)
-00000640 t init_ardupilot()
+00000620 t init_ardupilot()
 0000071a t update_nav_wp()
 000007ec t setup_heli(unsigned char, Menu::arg const*)
 00000870 t process_next_command()

Tools/ArdupilotMegaPlanner/Firmware/AC2-Heli-2560.build.log

@@ -9,11 +9,11 @@ In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:77:
 /root/apm/ardupilot-mega/ArduCopter/heli.pde: In function 'void heli_init_swash()':
 /root/apm/ardupilot-mega/ArduCopter/heli.pde:60: warning: comparisons like X<=Y<=Z do not have their mathematical meaning
 /root/apm/ardupilot-mega/ArduCopter/setup.pde: In function 'int8_t setup_heli(uint8_t, const Menu::arg*)':
-/root/apm/ardupilot-mega/ArduCopter/setup.pde:467: warning: 'max_pitch' may be used uninitialized in this function
-/root/apm/ardupilot-mega/ArduCopter/setup.pde:467: warning: 'max_tail' may be used uninitialized in this function
 /root/apm/ardupilot-mega/ArduCopter/setup.pde:467: warning: 'min_tail' may be used uninitialized in this function
+/root/apm/ardupilot-mega/ArduCopter/setup.pde:467: warning: 'max_tail' may be used uninitialized in this function
 /root/apm/ardupilot-mega/ArduCopter/setup.pde:467: warning: 'max_coll' may be used uninitialized in this function
 /root/apm/ardupilot-mega/ArduCopter/setup.pde:467: warning: 'min_coll' may be used uninitialized in this function
+/root/apm/ardupilot-mega/ArduCopter/setup.pde:467: warning: 'max_pitch' may be used uninitialized in this function
 /root/apm/ardupilot-mega/ArduCopter/setup.pde:467: warning: 'max_roll' may be used uninitialized in this function
 autogenerated: At global scope:
 autogenerated:109: warning: 'void Log_Write_Optflow()' declared 'static' but never defined
@@ -34,7 +34,7 @@ autogenerated:238: warning: 'long int get_alt_distance(Location*, Location*)' de
 autogenerated:248: warning: 'long int read_baro_filtered()' declared 'static' but never defined
 /root/apm/ardupilot-mega/ArduCopter/sensors.pde:95: warning: 'void read_airspeed()' defined but not used
 /root/apm/ardupilot-mega/ArduCopter/sensors.pde:100: warning: 'void zero_airspeed()' defined but not used
-/root/apm/ardupilot-mega/ArduCopter/system.pde:434: warning: 'void set_failsafe(boolean)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/system.pde:438: warning: 'void set_failsafe(boolean)' defined but not used
 autogenerated:285: warning: 'void init_optflow()' declared 'static' but never defined
 autogenerated:292: warning: 'void fake_out_gps()' declared 'static' but never defined
 /root/apm/ardupilot-mega/ArduCopter/test.pde:1028: warning: 'void print_motor_out()' defined but not used

Tools/ArdupilotMegaPlanner/Firmware/AC2-Heli-2560.size.txt

@@ -677,9 +677,9 @@
 000003a0 t read_battery()
 0000045c T update_yaw_mode()
 0000046e T update_roll_pitch_mode()
-0000052e t heli_move_swash(int, int, int, int)
+0000053e t heli_move_swash(int, int, int, int)
 000005cc t __static_initialization_and_destruction_0(int, int)
-0000063e t init_ardupilot()
+0000061e t init_ardupilot()
 0000071a t update_nav_wp()
 000007e8 t setup_heli(unsigned char, Menu::arg const*)
 00000870 t process_next_command()

Tools/ArdupilotMegaPlanner/Firmware/firmware2.xml

@@ -99,6 +99,7 @@
     <desc>
 #define AUTO_RESET_LOITER 0
 #define FRAME_CONFIG HELI_FRAME
+#define INSTANT_PWM ENABLED
 
 // DEFAULT PIDS
 

Tools/ArdupilotMegaPlanner/Firmware/git.log

@@ -1 +1,36 @@
-Already up-to-date.
+From https://code.google.com/p/ardupilot-mega
+   8a21477..b0bfa54  APM_Camera -> origin/APM_Camera
+   6f44fff..076459c  master     -> origin/master
+Updating 6f44fff..076459c
+Fast-forward
+ ArduCopter/control_modes.pde                       |   16 +
+ ArduCopter/defines.h                               |    1 +
+ ArduCopter/system.pde                              |    4 +
+ ArduPlane/ArduPlane.pde                            |   10 +-
+ ArduPlane/Parameters.h                             |    3 +
+ ArduPlane/config.h                                 |    8 +
+ Tools/ArduTracker/tags                             |148411 --------------------
+ Tools/ArdupilotMegaPlanner/GCSViews/Terminal.cs    |    2 +
+ Tools/ArdupilotMegaPlanner/Log.cs                  |  174 +-
+ Tools/ArdupilotMegaPlanner/MainV2.cs               |    9 +-
+ .../Properties/AssemblyInfo.cs                     |    2 +-
+ .../bin/Release/ArdupilotMegaPlanner.application   |    2 +-
+ .../bin/Release/ArdupilotMegaPlanner.exe           |  Bin 2194432 -> 2194944 bytes
+ Tools/ArdupilotMegaPlanner/bin/Release/Updater.exe |  Bin 8192 -> 8192 bytes
+ Tools/ArdupilotMegaPlanner/bin/Release/resedit.exe |  Bin 20480 -> 20480 bytes
+ .../ru-RU/ArdupilotMegaPlanner.resources.dll       |  Bin 53248 -> 53248 bytes
+ .../zh-Hans/ArdupilotMegaPlanner.resources.dll     |  Bin 380928 -> 380928 bytes
+ apo/ControllerQuad.h                               |   51 +-
+ apo/QuadArducopter.h                               |   10 +-
+ libraries/APO/AP_ArmingMechanism.cpp               |   57 +
+ libraries/APO/AP_ArmingMechanism.h                 |   67 +
+ libraries/APO/AP_BatteryMonitor.cpp                |    2 +
+ libraries/APO/AP_BatteryMonitor.h                  |   58 +-
+ libraries/APO/AP_Guide.h                           |    1 +
+ libraries/APO/AP_HardwareAbstractionLayer.h        |   13 +
+ libraries/APO/AP_Navigator.cpp                     |   20 +-
+ libraries/Desktop/support/FastSerial.cpp           |  283 +-
+ 27 files changed, 517 insertions(+), 148687 deletions(-)
+ delete mode 100644 Tools/ArduTracker/tags
+ create mode 100644 libraries/APO/AP_ArmingMechanism.cpp
+ create mode 100644 libraries/APO/AP_ArmingMechanism.h