From 1ffc4b9f7f0f8bf0a1daeb7c5e041ddf77bbbcd6 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 17 Mar 2018 15:20:42 +0100 Subject: [PATCH] Fix for S6R that are not showing quick mode for unknown reason (#5768) --- CMakeLists.txt | 2 +- radio/sdcard/horus/SxR/SxR.lua | 3 +++ radio/sdcard/taranis-x7/SxR/SxR.lua | 3 +++ radio/sdcard/taranis-x9/SxR/SxR.lua | 3 +++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 31411dc3d..f6760c105 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ set(VERSION_REVISION "2") set(VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX}) set(VERSION_FAMILY ${VERSION_MAJOR}.${VERSION_MINOR}) set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}${VERSION_SUFFIX}) -set(SDCARD_REVISION "0014") +set(SDCARD_REVISION "0015") set(SDCARD_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}V${SDCARD_REVISION}) cmake_minimum_required(VERSION 2.8) diff --git a/radio/sdcard/horus/SxR/SxR.lua b/radio/sdcard/horus/SxR/SxR.lua index f61ed8d03..0e76fb781 100755 --- a/radio/sdcard/horus/SxR/SxR.lua +++ b/radio/sdcard/horus/SxR/SxR.lua @@ -194,6 +194,9 @@ local function refreshNext() local field = fields[refreshIndex + 1] if fieldId == field[3] then local value = math.floor(value / 256) + if field[3] == 0xAA then + value = bit32.band(value, 0x0001) + end if field[3] >= 0x9E and field[3] <= 0xA0 then local b1 = value % 256 local b2 = math.floor(value / 256) diff --git a/radio/sdcard/taranis-x7/SxR/SxR.lua b/radio/sdcard/taranis-x7/SxR/SxR.lua index 084556009..9f0340c47 100644 --- a/radio/sdcard/taranis-x7/SxR/SxR.lua +++ b/radio/sdcard/taranis-x7/SxR/SxR.lua @@ -159,6 +159,9 @@ local function refreshNext() local field = fields[refreshIndex + 1] if fieldId == field[3] then local value = math.floor(value / 256) + if field[3] == 0xAA then + value = bit32.band(value, 0x0001) + end if field[3] >= 0x9E and field[3] <= 0xA0 then local b1 = value % 256 local b2 = math.floor(value / 256) diff --git a/radio/sdcard/taranis-x9/SxR/SxR.lua b/radio/sdcard/taranis-x9/SxR/SxR.lua index 3a46ab47e..2a2fb4ef1 100644 --- a/radio/sdcard/taranis-x9/SxR/SxR.lua +++ b/radio/sdcard/taranis-x9/SxR/SxR.lua @@ -161,6 +161,9 @@ local function refreshNext() local field = fields[refreshIndex + 1] if fieldId == field[3] then local value = math.floor(value / 256) + if field[3] == 0xAA then + value = bit32.band(value, 0x0001) + end if field[3] >= 0x9E and field[3] <= 0xA0 then local b1 = value % 256 local b2 = math.floor(value / 256)