From 42de4efc401706a6eb0d59061e4cd859f1927a78 Mon Sep 17 00:00:00 2001 From: Amilcar Lucas Date: Sun, 11 Sep 2011 04:07:36 +0200 Subject: [PATCH] Revert "Fix RC range reversal" This reverts commit d5046b1097b0b5455aa1a59e9dd80533e589432e. --- ArduPlane/APM_Config.h~ | 35 ----------------------------------- ArduPlane/ArduPlane.pde | 4 ++-- ArduPlane/Parameters.h | 2 +- ArduPlane/serialsent.raw | Bin 390 -> 0 bytes ArduPlane/upload1 | 2 -- 5 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 ArduPlane/APM_Config.h~ delete mode 100644 ArduPlane/serialsent.raw delete mode 100755 ArduPlane/upload1 diff --git a/ArduPlane/APM_Config.h~ b/ArduPlane/APM_Config.h~ deleted file mode 100644 index 4ebb342fd1..0000000000 --- a/ArduPlane/APM_Config.h~ +++ /dev/null @@ -1,35 +0,0 @@ -// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- - -// This file is just a placeholder for your configuration file. If you wish to change any of the setup parameters from -// their default values, place the appropriate #define statements here. - -// For example if you wanted the Port 3 baud rate to be 38400 you would add a statement like the one below (uncommented) -//#define SERIAL3_BAUD 38400 -//#define GCS_PROTOCOL GCS_PROTOCOL_NONE - - -// You may also put an include statement here to point at another configuration file. This is convenient if you maintain -// different configuration files for different aircraft or HIL simulation. See the examples below -//#include "APM_Config_mavlink_hil.h" -//#include "Skywalker.h" - -// The following are the recommended settings for Xplane simulation. Remove the leading "/* and trailing "*/" to enable: - -/* -#define HIL_PROTOCOL HIL_PROTOCOL_MAVLINK -#define HIL_MODE HIL_MODE_ATTITUDE -#define HIL_PORT 0 -#define GCS_PROTOCOL GCS_PROTOCOL_MAVLINK -#define GCS_PORT 3 -*/ - - -// ----- Camera definitions ------ -// ------------------------------ -#define CAMERA ENABLED -#define CAM_DEBUG DISABLED - -// - Options to reduce code size - -// ------------------------------- -// Disable text based terminal configuration -#define CLI_ENABLED DISABLED diff --git a/ArduPlane/ArduPlane.pde b/ArduPlane/ArduPlane.pde index f6b39a036c..e99afc1db1 100644 --- a/ArduPlane/ArduPlane.pde +++ b/ArduPlane/ArduPlane.pde @@ -1,6 +1,6 @@ /// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- -#define THISFIRMWARE "ArduPilotMega V2.24" +#define THISFIRMWARE "ArduPilotMega V2.23" /* Authors: Doug Weibel, Jose Julio, Jordi Munoz, Jason Short Thanks to: Chris Anderson, HappyKillMore, Bill Premerlani, James Cohen, JB from rotorFX, Automatik, Fefenin, Peter Meister, Remzibi @@ -581,7 +581,7 @@ static void medium_loop() // For now point the camera manually via the RC inputs (later remove these two lines) // for simple dcm tests, replace k_manual with k_stabilise - camera_mount.set_mode(AP_Mount::k_stabilise); + camera_mount.set_mode(AP_Mount::k_manual); camera_mount.update_mount(); g.camera.trigger_pic_cleanup(); diff --git a/ArduPlane/Parameters.h b/ArduPlane/Parameters.h index 7b62d9a8fa..f0d930b1fb 100644 --- a/ArduPlane/Parameters.h +++ b/ArduPlane/Parameters.h @@ -17,7 +17,7 @@ public: // The increment will prevent old parameters from being used incorrectly // by newer code. // - static const uint16_t k_format_version = 12; + static const uint16_t k_format_version = 11; // The parameter software_type is set up solely for ground station use // and identifies the software type (eg ArduPilotMega versus ArduCopterMega) diff --git a/ArduPlane/serialsent.raw b/ArduPlane/serialsent.raw deleted file mode 100644 index 3df7365eb225e7b20e9ca1741e8f05dd09522656..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 390 zcmWG#WBSkN#K_3Rz{r@njw_Un8P4@<0&-cvTs8(~#^>xnE-RdSKpV(q19Q0;xENdI zfn0VtcabrW%K_$c17(kbjN*iIAAv050&^LGCfi;Fa=GDLslPxj517jgl%2@{