From fd33cc9d2bd5034ff254357fcebe951c1cc7e673 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Sun, 13 Nov 2016 11:20:37 +0100
Subject: [PATCH] This merges S6R dir on Taranis (two different lua still exist
 for config and calib) (#4020)

---
 CMakeLists.txt                                      |   2 +-
 .../{S6R_Calibrate => S6R}/S6R_Calibrate.lua        |   0
 .../taranis/{S6R_Calibrate => S6R}/bmp/back.bmp     | Bin
 .../taranis/{S6R_Calibrate => S6R}/bmp/done.bmp     | Bin
 .../taranis/{S6R_Calibrate => S6R}/bmp/down.bmp     | Bin
 .../taranis/{S6R_Calibrate => S6R}/bmp/forward.bmp  | Bin
 .../taranis/{S6R_Calibrate => S6R}/bmp/left.bmp     | Bin
 .../taranis/{S6R_Calibrate => S6R}/bmp/right.bmp    | Bin
 .../taranis/{S6R_Calibrate => S6R}/bmp/up.bmp       | Bin
 9 files changed, 1 insertion(+), 1 deletion(-)
 rename radio/sdcard/taranis/{S6R_Calibrate => S6R}/S6R_Calibrate.lua (100%)
 rename radio/sdcard/taranis/{S6R_Calibrate => S6R}/bmp/back.bmp (100%)
 rename radio/sdcard/taranis/{S6R_Calibrate => S6R}/bmp/done.bmp (100%)
 rename radio/sdcard/taranis/{S6R_Calibrate => S6R}/bmp/down.bmp (100%)
 rename radio/sdcard/taranis/{S6R_Calibrate => S6R}/bmp/forward.bmp (100%)
 rename radio/sdcard/taranis/{S6R_Calibrate => S6R}/bmp/left.bmp (100%)
 rename radio/sdcard/taranis/{S6R_Calibrate => S6R}/bmp/right.bmp (100%)
 rename radio/sdcard/taranis/{S6R_Calibrate => S6R}/bmp/up.bmp (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9e220ed8..b79b92b05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(VERSION_FAMILY ${VERSION_MAJOR}.${VERSION_MINOR})
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}${VERSION_SUFFIX})
 message(STATUS "OpenTX ${VERSION}")
 
-set(SDCARD_REVISION "0003")
+set(SDCARD_REVISION "0004")
 set(SDCARD_VERSION  ${VERSION_MAJOR}.${VERSION_MINOR}V${SDCARD_REVISION})
 
 cmake_minimum_required(VERSION 2.8)
diff --git a/radio/sdcard/taranis/S6R_Calibrate/S6R_Calibrate.lua b/radio/sdcard/taranis/S6R/S6R_Calibrate.lua
similarity index 100%
rename from radio/sdcard/taranis/S6R_Calibrate/S6R_Calibrate.lua
rename to radio/sdcard/taranis/S6R/S6R_Calibrate.lua
diff --git a/radio/sdcard/taranis/S6R_Calibrate/bmp/back.bmp b/radio/sdcard/taranis/S6R/bmp/back.bmp
similarity index 100%
rename from radio/sdcard/taranis/S6R_Calibrate/bmp/back.bmp
rename to radio/sdcard/taranis/S6R/bmp/back.bmp
diff --git a/radio/sdcard/taranis/S6R_Calibrate/bmp/done.bmp b/radio/sdcard/taranis/S6R/bmp/done.bmp
similarity index 100%
rename from radio/sdcard/taranis/S6R_Calibrate/bmp/done.bmp
rename to radio/sdcard/taranis/S6R/bmp/done.bmp
diff --git a/radio/sdcard/taranis/S6R_Calibrate/bmp/down.bmp b/radio/sdcard/taranis/S6R/bmp/down.bmp
similarity index 100%
rename from radio/sdcard/taranis/S6R_Calibrate/bmp/down.bmp
rename to radio/sdcard/taranis/S6R/bmp/down.bmp
diff --git a/radio/sdcard/taranis/S6R_Calibrate/bmp/forward.bmp b/radio/sdcard/taranis/S6R/bmp/forward.bmp
similarity index 100%
rename from radio/sdcard/taranis/S6R_Calibrate/bmp/forward.bmp
rename to radio/sdcard/taranis/S6R/bmp/forward.bmp
diff --git a/radio/sdcard/taranis/S6R_Calibrate/bmp/left.bmp b/radio/sdcard/taranis/S6R/bmp/left.bmp
similarity index 100%
rename from radio/sdcard/taranis/S6R_Calibrate/bmp/left.bmp
rename to radio/sdcard/taranis/S6R/bmp/left.bmp
diff --git a/radio/sdcard/taranis/S6R_Calibrate/bmp/right.bmp b/radio/sdcard/taranis/S6R/bmp/right.bmp
similarity index 100%
rename from radio/sdcard/taranis/S6R_Calibrate/bmp/right.bmp
rename to radio/sdcard/taranis/S6R/bmp/right.bmp
diff --git a/radio/sdcard/taranis/S6R_Calibrate/bmp/up.bmp b/radio/sdcard/taranis/S6R/bmp/up.bmp
similarity index 100%
rename from radio/sdcard/taranis/S6R_Calibrate/bmp/up.bmp
rename to radio/sdcard/taranis/S6R/bmp/up.bmp