From 8eadee07198e87937252e4ef14a089337bf4de5b Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Sun, 29 Jan 2017 10:02:38 +0100 Subject: [PATCH] Projectkk2glider/misc fixes (#4331) * Re #4326: default backlight mode keys+sticks * Re #4329: when saving radio/model data work on a copy of it, because Export() can change values. Fixes switch warnings change for Horus --- companion/src/eeprominterface.cpp | 3 +++ companion/src/firmwares/opentx/opentxinterface.cpp | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp index a5f339710..55a32bdf1 100644 --- a/companion/src/eeprominterface.cpp +++ b/companion/src/eeprominterface.cpp @@ -1075,6 +1075,9 @@ GeneralSettings::GeneralSettings() switchConfig[i] = getSwitchInfo(board, i).config; } + backlightMode = 3; // keys and sticks + // backlightBright = 0; // 0 = 100% + if (IS_HORUS(board)) { backlightOffBright = 20; } diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index bf2d9ef45..6b088271a 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -155,7 +155,8 @@ bool OpenTxEepromInterface::saveToByteArray(const T & src, QByteArray & data, ui version = getLastDataVersion(getBoard()); } QByteArray raw; - M manager((T&)src, board, version, 0); + T srcCopy(src); // work on a copy of radio data, because Export() will modify it! + M manager(srcCopy, board, version, 0); // manager.Dump(); manager.Export(raw); data.resize(8);