Revert "new HoTT code for memory optimization"

This reverts commit b7ac985.
3yc · Apr 8, 2013 · a371529 · a371529
1 parent b7ac985
commit a371529
Show file tree

Hide file tree

Showing 4 changed files with 342 additions and 223 deletions.
diff --git a/APM_Config.h b/APM_Config.h
@@ -8,11 +8,11 @@
 // valid! You should switch to using a HAL_BOARD flag in your local config.mk.
 
 //#define MAG_ORIENTATION		AP_COMPASS_COMPONENTS_DOWN_PINS_FORWARD
-//#define HIL_MODE				HIL_MODE_SENSORS
+//#define HIL_MODE				HIL_MODE_ATTITUDE
 //#define DMP_ENABLED ENABLED
 //#define SECONDARY_DMP_ENABLED ENABLED       // allows running DMP in parallel with DCM for testing purposes
 
-#define FRAME_CONFIG HEXA_FRAME
+#define FRAME_CONFIG Y6_FRAME
 /*
  *  options:
  *  QUAD_FRAME
@@ -24,14 +24,14 @@
  *  HELI_FRAME
  */
 
-#define FRAME_ORIENTATION PLUS_FRAME
+#define FRAME_ORIENTATION X_FRAME
 /*
  *  PLUS_FRAME
  *  X_FRAME
  *  V_FRAME
  */
 
-#define CH7_OPTION		CH7_DO_NOTHING
+//#define CH7_OPTION		CH7_SAVE_WP
 /*
  *  CH7_DO_NOTHING
  *  CH7_FLIP
@@ -43,7 +43,8 @@
  */
 
 // Inertia based contollers
-#define RTL_YAW YAW_HOLD
+//#define INERTIAL_NAV_XY ENABLED
+#define INERTIAL_NAV_Z ENABLED
 
 //#define MOTORS_JD880
 //#define MOTORS_JD850
@@ -67,15 +68,26 @@
 // #define LOITER_REPOSITIONING    ENABLED                         // Experimental Do Not Use
 // #define LOITER_RP               ROLL_PITCH_LOITER_PR
 
+
+
+
 //
 //	HoTT definitions
 //
 #define HOTT_TELEMETRY
 #define HOTT_TELEMETRY_SERIAL_PORT	2
 #define HOTT_SIM_GPS_SENSOR
 #define HOTT_SIM_EAM_SENSOR
-#define HOTT_SIM_VARIO_SENSOR
+//#define HOTT_SIM_VARIO_SENSOR
 //#define HOTT_SIM_GAM_SENSOR
+
+
 #define HOTT_SIM_TEXTMODE
-//Textmode address to simulate
-#define HOTT_SIM_TEXTMODE_ADDRESS	HOTT_TELEMETRY_GPS_SENSOR_ID
+//#define HOTT_SIM_GPS_TEXTMODE
+#define HOTT_SIM_EAM_TEXTMODE
+//#define HOTT_SIM_VARIO_TEXTMODE
+//#define HOTT_SIM_GAM_TEXTMODE
+
+#define HOTT_TEXT_MODE_DEBUG // useful to display memory and sat_count in last line
+
+