diff --git a/companion/src/appdata.cpp b/companion/src/appdata.cpp index 9807f0c13..68b1c4110 100644 --- a/companion/src/appdata.cpp +++ b/companion/src/appdata.cpp @@ -503,7 +503,6 @@ QString AppData::updatesDir() { return _updatesDir; } bool AppData::enableBackup() { return _enableBackup; } bool AppData::backupOnFlash() { return _backupOnFlash; } bool AppData::jsSupport() { return _jsSupport; } -bool AppData::rev4aSupport() { return _rev4aSupport; } bool AppData::maximized() { return _maximized; } bool AppData::showSplash() { return _showSplash; } bool AppData::snapToClpbrd() { return _snapToClpbrd; } @@ -557,7 +556,6 @@ void AppData::enableBackup (const bool x) { store(x, _enableBackup, void AppData::backupOnFlash (const bool x) { store(x, _backupOnFlash, "backupOnFlash" );} void AppData::maximized (const bool x) { store(x, _maximized, "maximized" );} void AppData::jsSupport (const bool x) { store(x, _jsSupport, "js_support" );} -void AppData::rev4aSupport (const bool x) { store(x, _rev4aSupport, "rev4asupport" );} void AppData::showSplash (const bool x) { store(x, _showSplash, "show_splash" );} void AppData::snapToClpbrd (const bool x) { store(x, _snapToClpbrd, "snapshot_to_clipboard" );} void AppData::autoCheckApp (const bool x) { store(x, _autoCheckApp, "startup_check_companion" );} @@ -676,7 +674,6 @@ AppData::AppData() getset( _enableBackup, "backupEnable" ,false ); getset( _backupOnFlash, "backupOnFlash" ,true ); getset( _jsSupport, "js_support" ,false ); - getset( _rev4aSupport, "rev4asupport" ,false ); getset( _maximized, "maximized" ,false ); getset( _showSplash, "show_splash" ,true ); getset( _snapToClpbrd, "snapshot_to_clipboard" ,false ); diff --git a/companion/src/appdata.h b/companion/src/appdata.h index b619de315..70129e892 100644 --- a/companion/src/appdata.h +++ b/companion/src/appdata.h @@ -230,7 +230,6 @@ class AppData: protected CompStoreObj bool _backupOnFlash; bool _maximized; bool _jsSupport; - bool _rev4aSupport; bool _showSplash; bool _snapToClpbrd; bool _autoCheckApp; @@ -284,7 +283,6 @@ class AppData: protected CompStoreObj bool enableBackup(); bool backupOnFlash(); bool jsSupport(); - bool rev4aSupport(); bool maximized(); bool showSplash(); bool snapToClpbrd(); @@ -339,7 +337,6 @@ class AppData: protected CompStoreObj void backupOnFlash (const bool); void maximized (const bool); void jsSupport (const bool); - void rev4aSupport (const bool); void showSplash (const bool); void snapToClpbrd (const bool); void autoCheckApp (const bool); diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp index fd5ddce45..3ea84d1d8 100644 --- a/companion/src/eeprominterface.cpp +++ b/companion/src/eeprominterface.cpp @@ -1226,8 +1226,6 @@ void RegisterEepromInterfaces() eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_9XRPRO)); eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_TARANIS)); eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_TARANIS_PLUS)); - if (g.rev4aSupport()) - eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_TARANIS_REV4a)); eepromInterfaces.push_back(new Gruvin9xInterface(BOARD_STOCK)); eepromInterfaces.push_back(new Gruvin9xInterface(BOARD_GRUVIN9X)); eepromInterfaces.push_back(new Ersky9xInterface()); diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h index a861210cb..39c4fa830 100644 --- a/companion/src/eeprominterface.h +++ b/companion/src/eeprominterface.h @@ -35,10 +35,9 @@ #define EESIZE_M128 4096 #define EESIZE_GRUVIN9X 4096 #define EESIZE_TARANIS (32*1024) -#define EESIZE_TARANIS_REV4a (64*1024) #define EESIZE_SKY9X (128*4096) #define EESIZE_9XRPRO (128*4096) -#define EESIZE_RLC_MAX EESIZE_TARANIS_REV4a +#define EESIZE_RLC_MAX EESIZE_TARANIS template t LIMIT(t mi, t x, t ma) { return std::min(std::max(mi, x), ma); } @@ -50,8 +49,7 @@ enum BoardEnum { BOARD_SKY9X, BOARD_9XRPRO, BOARD_TARANIS, - BOARD_TARANIS_PLUS, - BOARD_TARANIS_REV4a + BOARD_TARANIS_PLUS }; #define IS_9X(board) (board==BOARD_STOCK || board==BOARD_M128) @@ -59,7 +57,7 @@ enum BoardEnum { #define IS_2560(board) (board==BOARD_GRUVIN9X || board==BOARD_MEGA2560) #define IS_SKY9X(board) (board==BOARD_SKY9X || board==BOARD_9XRPRO) #define IS_9XRPRO(board) (board==BOARD_9XRPRO) -#define IS_TARANIS(board) (board==BOARD_TARANIS || board==BOARD_TARANIS_REV4a || board==BOARD_TARANIS_PLUS) +#define IS_TARANIS(board) (board==BOARD_TARANIS || board==BOARD_TARANIS_PLUS) #define IS_TARANIS_PLUS(board) (board==BOARD_TARANIS_PLUS) #define IS_ARM(board) (IS_TARANIS(board) || IS_SKY9X(board)) diff --git a/companion/src/file.cpp b/companion/src/file.cpp index 390bd2685..baef8e9ed 100644 --- a/companion/src/file.cpp +++ b/companion/src/file.cpp @@ -47,10 +47,7 @@ void EFile::EeFsCreate(uint8_t *eeprom, int size, BoardEnum board) eeFsBlockSize = 64; eeFsFirstBlock = 1; eeFsBlocksOffset = eeFsSize - eeFsBlockSize; - if (board == BOARD_TARANIS_REV4a) - eeFsBlocksMax = 1 + (EESIZE_TARANIS_REV4a-eeFsSize)/eeFsBlockSize; - else - eeFsBlocksMax = 1 + (EESIZE_TARANIS-eeFsSize)/eeFsBlockSize; + eeFsBlocksMax = 1 + (EESIZE_TARANIS-eeFsSize)/eeFsBlockSize; eeFsLinkSize = sizeof(int16_t); memset(eeprom, 0, size); eeFsArm->version = eeFsVersion; @@ -112,10 +109,7 @@ bool EFile::EeFsOpen(uint8_t *eeprom, int size, BoardEnum board) eeFsLinkSize = sizeof(int16_t); eeFsFirstBlock = 1; eeFsBlocksOffset = eeFsSize - eeFsBlockSize; - if (board == BOARD_TARANIS_REV4a) - eeFsBlocksMax = 1 + (EESIZE_TARANIS_REV4a-eeFsSize)/eeFsBlockSize; - else - eeFsBlocksMax = 1 + (EESIZE_TARANIS-eeFsSize)/eeFsBlockSize; + eeFsBlocksMax = 1 + (EESIZE_TARANIS-eeFsSize)/eeFsBlockSize; return eeFsArm->mySize == eeFsSize; } else { diff --git a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp index 09b5ef719..9cf031c30 100644 --- a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp +++ b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp @@ -66,7 +66,7 @@ namespace Open9xX9D { int taranisSimulatorBoard = 0; inline int geteepromsize() { - return taranisSimulatorBoard==BOARD_TARANIS_REV4a ? 64*1024 : 32*1024; + return 32*1024; } #define EESIZE geteepromsize() diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index 9643857b3..a4f556655 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -67,8 +67,6 @@ const char * OpenTxEepromInterface::getName() return "OpenTX for FrSky Taranis"; case BOARD_TARANIS_PLUS: return "OpenTX for FrSky Taranis Plus"; - case BOARD_TARANIS_REV4a: - return "OpenTX for FrSky Taranis Rev4a"; case BOARD_SKY9X: return "OpenTX for Sky9x board / 9X"; case BOARD_9XRPRO: @@ -94,8 +92,6 @@ const int OpenTxEepromInterface::getEEpromSize() case BOARD_TARANIS: case BOARD_TARANIS_PLUS: return EESIZE_TARANIS; - case BOARD_TARANIS_REV4a: - return EESIZE_TARANIS_REV4a; default: return 0; } @@ -367,7 +363,6 @@ int OpenTxEepromInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t switch(board) { case BOARD_TARANIS: case BOARD_TARANIS_PLUS: - case BOARD_TARANIS_REV4a: case BOARD_SKY9X: case BOARD_9XRPRO: version = 216; @@ -930,7 +925,6 @@ QString OpenTxFirmware::getFirmwareUrl(QString & id) case BOARD_SKY9X: case BOARD_TARANIS: case BOARD_TARANIS_PLUS: - case BOARD_TARANIS_REV4a: url.append(QString("/getfw.php?fw=%1.bin").arg(id)); break; default: @@ -947,24 +941,7 @@ QString OpenTxFirmware::getReleaseNotesUrl() url = OPENTX_FIRMWARE_DOWNLOADS; g.compileServer(url); } - url.append("/releasenotes-"); - switch(board) { - case BOARD_STOCK: - case BOARD_M128: - case BOARD_GRUVIN9X: - case BOARD_SKY9X: - case BOARD_9XRPRO: - url.append("9x.txt"); - break; - case BOARD_TARANIS: - case BOARD_TARANIS_PLUS: - case BOARD_TARANIS_REV4a: - url.append("taranis.txt"); - break; - default: - url.clear(); - break; - } + url.append("/releasenotes.txt"); return url; } @@ -975,31 +952,8 @@ QString OpenTxFirmware::getStampUrl() url= OPENTX_FIRMWARE_DOWNLOADS; g.compileServer(url); } - url.append("/stamp-opentx-"); - switch(board) { - case BOARD_STOCK: - url.append("9x.txt"); - break; - case BOARD_M128: - url.append("9x128.txt"); - break; - case BOARD_GRUVIN9X: - url.append("gruvin9x.txt"); - break; - case BOARD_SKY9X: - case BOARD_9XRPRO: - url.append("sky9x.txt"); - break; - case BOARD_TARANIS: - case BOARD_TARANIS_PLUS: - case BOARD_TARANIS_REV4a: - url.append("taranis.txt"); - break; - default: - url.clear(); - break; - } - return url; + url.append("/stamp-opentx.txt"); + return url; } SimulatorInterface * OpenTxFirmware::getSimulator() @@ -1016,7 +970,6 @@ SimulatorInterface * OpenTxFirmware::getSimulator() return new Open9xSky9xSimulator(); case BOARD_TARANIS: case BOARD_TARANIS_PLUS: - case BOARD_TARANIS_REV4a: return new OpentxTaranisSimulator(); default: return NULL; @@ -1290,18 +1243,6 @@ void registerOpenTxFirmwares() openTx->addOptions(fai_options); firmwares.push_back(openTx); - if (g.rev4aSupport()) { - openTx = new OpenTxFirmware("opentx-taranisrev4a", QObject::tr("OpenTX for FrSky Taranis Rev4a"), BOARD_TARANIS_REV4a, true); - openTx->addOption("noheli", QObject::tr("Disable HELI menu and cyclic mix support")); - openTx->addOption("notemplates", QObject::tr("Disable TEMPLATES menu")); - openTx->addOption("nogvars", QObject::tr("Disable Global variables")); - openTx->addOption("haptic", QObject::tr("Haptic module installed")); - openTx->addOption("ppmus", QObject::tr("Channel values displayed in us")); - openTx->addOption("sqt5font", QObject::tr("Use alternative SQT5 font")); - openTx->addOptions(fai_options); - firmwares.push_back(openTx); - } - default_firmware_variant = GetFirmwareVariant("opentx-9x-heli-templates-en"); current_firmware_variant = default_firmware_variant; } diff --git a/companion/src/firmwares/opentx/opentxinterface.h b/companion/src/firmwares/opentx/opentxinterface.h index 6d8559879..b331c5c7d 100644 --- a/companion/src/firmwares/opentx/opentxinterface.h +++ b/companion/src/firmwares/opentx/opentxinterface.h @@ -19,7 +19,7 @@ #include "eeprominterface.h" #define OPENTX_COMPANION_DOWNLOADS "http://downloads.open-tx.org/companion" -#define OPENTX_FIRMWARE_DOWNLOADS "http://downloads.open-tx.org/firmware" +#define OPENTX_FIRMWARE_DOWNLOADS "http://next.open-tx.org/firmware" class EFile; diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp index 6b4f3dac7..e4f0847e2 100644 --- a/companion/src/mdichild.cpp +++ b/companion/src/mdichild.cpp @@ -377,12 +377,6 @@ bool MdiChild::saveAs(bool isNew) } if (fileName.isEmpty()) return false; - if (fileName.contains("rev4a")) { - g.rev4aSupport( true ); - } - if (fileName.contains("norev4a")) { - g.rev4aSupport( false ); - } g.eepromDir( QFileInfo(fileName).dir().absolutePath() ); if (isNew) return saveFile(fileName);