From 8b225699c9500e3f5c7103ac1b4b48cc0bbc459e Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Mon, 7 May 2012 18:35:48 +0000
Subject: [PATCH] Changelog updated

---
 changelog.txt   | 15 +++++++++++++++
 util/compile.py |  4 ++++
 2 files changed, 19 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index 6627d80f5..61a8ae496 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,18 @@
+******************************************
+CHANGELOG: 07-05-2012  BSS
+AutoSwitch feature added
+Mix Warning was not so regular (sometime 2 ticks instead of 3)
+
+******************************************
+CHANGELOG: 06-05-2012  BSS
+FW options now stored in a byte of the EEPROM
+[Arm] getSwitch() problem with Custom Switches
+
+******************************************
+CHANGELOG: 05-05-2012  BSS
+[FrSky] Speed in Gauges configuration was buggy
+[FrSky] We stored Min Speed instead of Max Speed
+
 ******************************************
 CHANGELOG: 04-05-2012  BSS
 Momentary Switches in Function Switches
diff --git a/util/compile.py b/util/compile.py
index 0326f35be..6cec85b24 100644
--- a/util/compile.py
+++ b/util/compile.py
@@ -7,6 +7,7 @@ BINARY_DIR = "../build/"
 options_stock = [[("", "EXT=STD"), ("frsky", "EXT=FRSKY"), ("jeti", "EXT=JETI"), ("ardupilot", "EXT=ARDUPILOT"), ("nmea", "EXT=NMEA")],
                  [("", "HELI=NO"), ("heli", "HELI=YES")],
                  [("", "TEMPLATES=NO"), ("templates", "TEMPLATES=YES")],
+                 [("", ""), ("nosplash", "SPLASH=NO")],
                  [("", ""), ("nofp", "FLIGHT_PHASES=NO")],
                  [("", "AUDIO=NO"), ("audio", "AUDIO=YES")],
                  [("", "HAPTIC=NO"), ("haptic", "HAPTIC=YES")],
@@ -14,6 +15,7 @@ options_stock = [[("", "EXT=STD"), ("frsky", "EXT=FRSKY"), ("jeti", "EXT=JETI"),
                  [("", "DSM2=NO"), ("DSM2", "DSM2=PPM")],
                  [("", ""), ("ppmca", "PPM_CENTER_ADJUSTABLE=YES")],
                  [("", "NAVIGATION=NO"), ("potscroll", "NAVIGATION=POTS")],
+                 [("", ""), ("autoswitch", "AUTOSWITCH=YES")],
                  [("", ""), ("pgbar", "EEPROM_PROGRESS_BAR=YES")],
                  [("", "UNITS=METRIC"), ("imperial", "UNITS=IMPERIAL")],
                 ]
@@ -25,6 +27,7 @@ options_v4 =    [[("", "EXT=FRSKY")],
                  [("", "SDCARD=NO"), ("sdcard", "SDCARD=YES")],
                  [("", "SOMO=NO"), ("SOMO", "SOMO=YES")],
                  [("", ""), ("ppmca", "PPM_CENTER_ADJUSTABLE=YES")],
+                 [("", ""), ("autoswitch", "AUTOSWITCH=YES")],
                  [("", ""), ("pgbar", "EEPROM_PROGRESS_BAR=YES")],
                  [("", "UNITS=METRIC"), ("imperial", "UNITS=IMPERIAL")],
                 ]
@@ -33,6 +36,7 @@ options_arm =   [[("", "EXT=FRSKY")],
                  [("", "HELI=NO"), ("heli", "HELI=YES")],
                  [("", "TEMPLATES=NO"), ("templates", "TEMPLATES=YES")],
                  [("", ""), ("nofp", "FLIGHT_PHASES=NO")],
+                 [("", ""), ("autoswitch", "AUTOSWITCH=YES")],
                  [("", "UNITS=METRIC"), ("imperial", "UNITS=IMPERIAL")],
                 ]