diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-HELHIL-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-HELHIL-1280.size.txt index f438ab94b8..e8146f2219 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-HELHIL-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-HELHIL-1280.size.txt @@ -668,7 +668,7 @@ 0000071a t update_nav_wp() 000007ec t setup_heli(unsigned char, Menu::arg const*) 00000870 t process_next_command() -000009b4 W Parameters::Parameters() +000009b8 W Parameters::Parameters() 00000a1f b g -00000ffc T loop +0000100a T loop 00001604 T GCS_MAVLINK::handleMessage(__mavlink_message*) diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-HELHIL-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-HELHIL-2560.size.txt index 225d2ab9f3..c3ae322200 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-HELHIL-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-HELHIL-2560.size.txt @@ -668,7 +668,7 @@ 0000071a t update_nav_wp() 000007e8 t setup_heli(unsigned char, Menu::arg const*) 00000870 t process_next_command() -000009b4 W Parameters::Parameters() +000009b8 W Parameters::Parameters() 00000a1f b g -00000ffc T loop +0000100a T loop 00001604 T GCS_MAVLINK::handleMessage(__mavlink_message*) diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Heli-1280.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Heli-1280.build.log index d4b20f5b10..7131865864 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Heli-1280.build.log +++ b/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: '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_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_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: 'min_coll' 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 diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Heli-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Heli-1280.size.txt index 452bb7716e..68bdfdcb08 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Heli-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Heli-1280.size.txt @@ -683,7 +683,7 @@ 0000071a t update_nav_wp() 000007ec t setup_heli(unsigned char, Menu::arg const*) 00000870 t process_next_command() -000009b4 W Parameters::Parameters() +000009b8 W Parameters::Parameters() 00000a1f b g 000012ec T GCS_MAVLINK::handleMessage(__mavlink_message*) -0000158a T loop +00001598 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Heli-2560.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Heli-2560.build.log index d4b20f5b10..7131865864 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Heli-2560.build.log +++ b/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: '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_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_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: 'min_coll' 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 diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Heli-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Heli-2560.size.txt index 6610371c36..b936dfb003 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Heli-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Heli-2560.size.txt @@ -683,7 +683,7 @@ 0000071a t update_nav_wp() 000007e8 t setup_heli(unsigned char, Menu::arg const*) 00000870 t process_next_command() -000009b4 W Parameters::Parameters() +000009b8 W Parameters::Parameters() 00000a1f b g 000012ec T GCS_MAVLINK::handleMessage(__mavlink_message*) -0000158a T loop +00001598 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/git.log b/Tools/ArdupilotMegaPlanner/Firmware/git.log index 7c268f1edf..2a7bfed917 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/git.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/git.log @@ -1,60 +1 @@ -From https://code.google.com/p/ardupilot-mega - b4f49d1..8a21477 APM_Camera -> origin/APM_Camera - 55624f7..ec24ff5 master -> origin/master -Updating 55624f7..ec24ff5 -Fast-forward - ArduBoat/BoatGeneric.h | 50 +- - ArduBoat/ControllerBoat.h | 2 +- - ArduCopter/Camera.pde | 2 +- - ArduCopter/config.h | 13 +- - ArduCopter/navigation.pde | 2 +- - ArduRover/ArduRover.cpp | 2 + - ArduRover/ArduRover.pde | 4 +- - ArduRover/CarStampede.h | 48 +- - ArduRover/ControllerCar.h | 2 +- - ArduRover/ControllerTank.h | 2 +- - ArduRover/TankGeneric.h | 48 +- - Tools/ArdupilotMegaPlanner/Common.cs | 3 +- - Tools/ArdupilotMegaPlanner/CurrentState.cs | 2 +- - Tools/ArdupilotMegaPlanner/GCSViews/Firmware.cs | 6 +- - .../GCSViews/FlightData.Designer.cs | 11 +- - Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs | 28 + - .../ArdupilotMegaPlanner/GCSViews/FlightData.resx | 16 +- - Tools/ArdupilotMegaPlanner/GCSViews/Simulation.cs | 30 +- - Tools/ArdupilotMegaPlanner/MAVLink.cs | 62 ++ - Tools/ArdupilotMegaPlanner/MAVLinkTypes.cs | 112 +++- - Tools/ArdupilotMegaPlanner/MAVLinkTypesenum.cs | 4 +- - .../Properties/AssemblyInfo.cs | 2 +- - .../bin/Release/ArdupilotMegaPlanner.application | 2 +- - .../bin/Release/ArdupilotMegaPlanner.exe | Bin 2189824 -> 2194432 bytes - .../bin/Release/GCSViews/FlightData.resx | 16 +- - 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 - Tools/ArdupilotMegaPlanner/mavlinklist.pl | 4 +- - apo/ControllerQuad.h | 300 +++++---- - apo/PlaneEasystar.h | 53 +- - apo/QuadArducopter.h | 27 +- - apo/QuadMikrokopter.h | 98 --- - apo/apo.pde | 1 + - libraries/APO/APO.h | 1 + - libraries/APO/APO_DefaultSetup.h | 6 +- - libraries/APO/AP_Autopilot.cpp | 80 +-- - libraries/APO/AP_Autopilot.h | 49 +- - libraries/APO/AP_BatteryMonitor.cpp | 10 + - libraries/APO/AP_BatteryMonitor.h | 51 ++ - libraries/APO/AP_CommLink.cpp | 706 ++++++++++++++++++++ - libraries/APO/AP_CommLink.h | 696 +------------------- - libraries/APO/AP_Controller.cpp | 25 + - libraries/APO/AP_Controller.h | 48 +- - libraries/APO/AP_Guide.cpp | 229 +++++++ - libraries/APO/AP_Guide.h | 231 +------ - libraries/APO/AP_HardwareAbstractionLayer.h | 19 +- - libraries/APO/AP_Navigator.cpp | 186 +++++ - libraries/APO/AP_Navigator.h | 199 +----- - libraries/AP_Common/AP_Loop.h | 4 +- - 51 files changed, 1966 insertions(+), 1526 deletions(-) - delete mode 100644 apo/QuadMikrokopter.h - create mode 100644 libraries/APO/AP_BatteryMonitor.cpp - create mode 100644 libraries/APO/AP_BatteryMonitor.h +Already up-to-date.