From 3e9064e2e29466fe9aedeeb18ecd928918de899e Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Tue, 8 Jul 2014 12:03:48 +0200
Subject: [PATCH] 2.0.6 preparation

---
 companion/releasenotes.txt   |  7 +++++++
 companion/src/CMakeLists.txt |  2 +-
 radio/releasenotes.txt       | 29 +++++++++++++++++++++++++++++
 radio/src/Makefile           |  2 +-
 4 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/companion/releasenotes.txt b/companion/releasenotes.txt
index 910aa57f3..4685a47bf 100644
--- a/companion/releasenotes.txt
+++ b/companion/releasenotes.txt
@@ -1,3 +1,10 @@
+<h2>Version 2.0.6</h2>
+<ul>
+<li>Fix Mix curves bug on Sky9x boards</li>
+<li>Channels 17-32 are displayed in the simulator</li>
+<li>Backlight simulation bugfix</li>
+</ul>
+
 <h2>Version 2.0.5</h2>
 <ul>
 <li>Fix crash on startup</li>
diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index e582a2479..e22a9441a 100644
--- a/companion/src/CMakeLists.txt
+++ b/companion/src/CMakeLists.txt
@@ -2,7 +2,7 @@ PROJECT( companion )
 
 SET( C9X_VERSION_MAJOR "2" )
 SET( C9X_VERSION_MINOR "0" )
-SET( C9X_VERSION_REVISION "5" )
+SET( C9X_VERSION_REVISION "6" )
 SET( C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR}.${C9X_VERSION_REVISION} )
 
 CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
diff --git a/radio/releasenotes.txt b/radio/releasenotes.txt
index 364b51a0d..57cee8fbf 100644
--- a/radio/releasenotes.txt
+++ b/radio/releasenotes.txt
@@ -1,3 +1,32 @@
+<h2>Version 2.0.6 / 2014-07-08</h2>
+[Taranis]
+<ul>
+<li>Telemetry Type field is hidden when only S.PORT is available
+<li>Permanent timers may be not resetted on Flight Reset 
+<li>Instant Trim bugfix
+<li>No sound on trim press when trim option disabled
+<li>[Page] / [Page Long] allowed to change Telemetry screen
+<li>XXL font added for Lua telemetry screens
+<li>
+
+[9XR-PRO / Sky9x]
+<ul>
+<li>RTC time was not stored correctly
+<li>PPM polarity fix
+</ul>
+
+[Gruvin9x, 9X128, 9XR128]
+<ul>
+<li>12 logical switches instead of 15 (the extra ones were not accessible in custom functions)
+</ul>
+
+[All]
+<ul>
+<li>Logical switches were not resetted on Model load
+<li>SafetyCH function can be hidden (depending on Companion options)
+<li>MPH to km/h conversion improved
+</ul>
+
 <h2>Version 2.0.5 / 2014-06-26</h2>
 [Taranis]
 <ul>
diff --git a/radio/src/Makefile b/radio/src/Makefile
index 8e61d7d31..33adbab3e 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -296,7 +296,7 @@ SHELL = sh
 IMG2LBM = -python ../util/img2lbm.py
 BIN2LBM = -python ../util/bin2lbm.py
 TRANSLATE = -python ../util/translate.py
-VERSION = 2.0.5
+VERSION = 2.0.6
 
 SRC =
 CPPSRC =