Merge pull request ShikOfTheRa#231 from ShikOfTheRa/SHIKI-dev

Baseflight Fixedwing final amendments
tonofsteel · May 3, 2016 · 7708786 · 7708786
2 parents ded9896 + 6c72918
commit 7708786
Show file tree

Hide file tree

Showing 6 changed files with 603 additions and 31 deletions.
diff --git a/MW_OSD/Config.h b/MW_OSD/Config.h
@@ -29,9 +29,9 @@
 //#define BASEFLIGHT                // Uncomment this if you are using latest BASEFLIGHT version from repository (Stable 2015.08.27 at time of this MWOSD release)
 //#define TAULABS                   // Uncomment this if you are using the latest Tau Labs MSP Module
 //#define DRONIN                    // Uncomment this if you are using the latest DRONIN MSP Module
-#define CLEANFLIGHT               // Uncomment this if you are using latest CLEANFLIGHT version from repository (1.11.0 at time of this MWOSD release)
+//#define CLEANFLIGHT               // Uncomment this if you are using latest CLEANFLIGHT version from repository (1.11.0 at time of this MWOSD release)
 //#define BETAFLIGHT                // Uncomment this if you are using BETAFLIGHT (same as CLEANFLIGHT t time of this MWOSD release)
-//#define FIXEDWING_BF              // Uncomment this if you are using fixed wing Baseflight 
+#define FIXEDWING_BF              // Uncomment this if you are using fixed wing Baseflight 
 //#define HARAKIRI                  // Uncomment this if you are using HARAKIRI (for BOXNAMES compatibility)
 //#define NAZA                      // Uncomment this if you are using NAZA flight controller
 //#define iNAV                      // Uncomment this if you are using latest iNAV version from repository (1.01 at time of this MWOSD release)
@@ -46,6 +46,7 @@
 //#define CLEANFLIGHT172            // Uncomment this if you are using CLEANFLIGHT versions up to and including 1.7.2
 //#define CLEANFLIGHT180            // Uncomment this if you are using CLEANFLIGHT versions 1.8.0 & 1.8.1 
 //#define APM                       // Uncomment this if you are using APM MAVLINK compatible FC (Requires testing)
+//#define TELEMETRY_LTM             // Uncomment this if you are using an LTM telemetry feed (DO not use - under development)
 
 /********************       AIRCRAFT/INSTALLATION TYPE settings      *********************/
 //Choose ONLY ONE option:

diff --git a/MW_OSD/GlobalVariables.h b/MW_OSD/GlobalVariables.h
@@ -885,33 +885,7 @@ const char configMsg115[] PROGMEM = "THR CLIMB";
 const char configMsg116[] PROGMEM = "THR CRUISE";
 const char configMsg117[] PROGMEM = "THR IDLE";
 const char configMsg118[] PROGMEM = "RTH ALT";
-/*
-fw_gps_maxcorr = 20        // Max Roll input from GPS (For Flying wings set to >=35)
-fw_gps_maxclimb = 15      // Max Climb input
-fw_gps_maxdive = 15       // Max Dive input
-fw_gps_rudder = 15          // Max Rudder input if rudder is available
-fw_climb_throttle = 1900     //  Limits Throttle during climbs
-fw_cruise_throttle = 1500   // Suitable average throttle
-fw_idle_throttle = 1300       //  Lowest throttle during Descending
-fw_roll_comp = 100             //  How much Elevator compensates Roll in GPS modes
-fw_rth_alt = 50                   //  Min Altitude to keep during RTH. (Max 200m)
-small_angle  = 180            // Will allow the Plane to be Armed in any position.
-
-           serialize8(mcfg.fw_althold_dir);
-            // serialize8(cfg.fw_vector_thrust); // Future Gui setting?
-            serialize16(cfg.fw_gps_maxcorr);
-            serialize16(cfg.fw_gps_rudder);
-            serialize16(cfg.fw_gps_maxclimb);
-            serialize16(cfg.fw_gps_maxdive);
-            serialize16(cfg.fw_climb_throttle);
-            serialize16(cfg.fw_cruise_throttle);
-            serialize16(cfg.fw_idle_throttle);
-            serialize16(cfg.fw_scaler_throttle);
-            serialize32(cfg.fw_roll_comp); // Float is Not compatible with Gui. Change to serialize8
-            serialize8(cfg.fw_rth_alt);
-
-
-*/
+
 
 // POSITION OF EACH CHARACTER OR LOGO IN THE MAX7456
 const unsigned char speedUnitAdd[2] ={