Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-24 08:45:15 +03:00
Code Activity

Old EEPROM support removed

Browse source
This commit is contained in:
Bertrand Songis 2019-03-27 22:42:07 +01:00
parent d3be834567
commit d0b8292961
6 changed files with 543 additions and 1795 deletions
Download patch file Download diff file Expand all files Collapse all files

4
companion/src/firmwares/boards.cpp
View file

@ -99,6 +99,7 @@ const int Boards::getEEpromSize(Board::Type board)
case BOARD_TARANIS_XLITES: case BOARD_TARANIS_XLITES:
case BOARD_TARANIS_XLITE: case BOARD_TARANIS_XLITE:
case BOARD_TARANIS_X7: case BOARD_TARANIS_X7:
case BOARD_TARANIS_X3:
case BOARD_TARANIS_X9D: case BOARD_TARANIS_X9D:
case BOARD_TARANIS_X9DP: case BOARD_TARANIS_X9DP:
case BOARD_TARANIS_X9E: case BOARD_TARANIS_X9E:
@ -128,6 +129,7 @@ const int Boards::getFlashSize(Type board)
case BOARD_TARANIS_XLITES: case BOARD_TARANIS_XLITES:
case BOARD_TARANIS_XLITE: case BOARD_TARANIS_XLITE:
case BOARD_TARANIS_X7: case BOARD_TARANIS_X7:
case BOARD_TARANIS_X3:
case BOARD_TARANIS_X9D: case BOARD_TARANIS_X9D:
case BOARD_TARANIS_X9DP: case BOARD_TARANIS_X9DP:
case BOARD_TARANIS_X9E: case BOARD_TARANIS_X9E:
@ -429,6 +431,8 @@ const QString Boards::getBoardName(Board::Type board)
return "Taranis X9D+"; return "Taranis X9D+";
case BOARD_TARANIS_X9E: case BOARD_TARANIS_X9E:
return "Taranis X9E"; return "Taranis X9E";
case BOARD_TARANIS_X3:
return "Taranis X3";
case BOARD_SKY9X: case BOARD_SKY9X:
return "Sky9x"; return "Sky9x";
case BOARD_9XRPRO: case BOARD_9XRPRO:

6
companion/src/firmwares/boards.h
View file

@ -47,6 +47,7 @@ namespace Board {
BOARD_X10, BOARD_X10,
BOARD_TARANIS_XLITE, BOARD_TARANIS_XLITE,
BOARD_TARANIS_XLITES, BOARD_TARANIS_XLITES,
BOARD_TARANIS_X3,
BOARD_ENUM_COUNT BOARD_ENUM_COUNT
}; };
@ -190,12 +191,13 @@ class Boards
#define IS_TARANIS_XLITE(board) (board==Board::BOARD_TARANIS_XLITE || board==Board::BOARD_TARANIS_XLITES) #define IS_TARANIS_XLITE(board) (board==Board::BOARD_TARANIS_XLITE || board==Board::BOARD_TARANIS_XLITES)
#define IS_TARANIS_XLITES(board) (board==Board::BOARD_TARANIS_XLITES) #define IS_TARANIS_XLITES(board) (board==Board::BOARD_TARANIS_XLITES)
#define IS_TARANIS_X7(board) (board==Board::BOARD_TARANIS_X7) #define IS_TARANIS_X7(board) (board==Board::BOARD_TARANIS_X7)
#define IS_TARANIS_X3(board) (board==Board::BOARD_TARANIS_X3)
#define IS_TARANIS_X9(board) (board==Board::BOARD_TARANIS_X9D || board==Board::BOARD_TARANIS_X9DP || board==Board::BOARD_TARANIS_X9E) #define IS_TARANIS_X9(board) (board==Board::BOARD_TARANIS_X9D || board==Board::BOARD_TARANIS_X9DP || board==Board::BOARD_TARANIS_X9E)
#define IS_TARANIS_X9D(board) (board==Board::BOARD_TARANIS_X9D || board==Board::BOARD_TARANIS_X9DP) #define IS_TARANIS_X9D(board) (board==Board::BOARD_TARANIS_X9D || board==Board::BOARD_TARANIS_X9DP)
#define IS_TARANIS_PLUS(board) (board==Board::BOARD_TARANIS_X9DP || board==Board::BOARD_TARANIS_X9E) #define IS_TARANIS_PLUS(board) (board==Board::BOARD_TARANIS_X9DP || board==Board::BOARD_TARANIS_X9E)
#define IS_TARANIS_X9E(board) (board==Board::BOARD_TARANIS_X9E) #define IS_TARANIS_X9E(board) (board==Board::BOARD_TARANIS_X9E)
#define IS_TARANIS(board) (IS_TARANIS_X9(board) || IS_TARANIS_X7(board) || IS_TARANIS_XLITE(board) || IS_TARANIS_XLITES(board)) #define IS_TARANIS(board) (IS_TARANIS_X9(board) || IS_TARANIS_X7(board) || IS_TARANIS_X3(board) || IS_TARANIS_XLITE(board) || IS_TARANIS_XLITES(board))
#define IS_TARANIS_SMALL(board) (board==Board::BOARD_TARANIS_X7 || board==Board::BOARD_TARANIS_XLITE || board==Board::BOARD_TARANIS_XLITES) #define IS_TARANIS_SMALL(board) (board==Board::BOARD_TARANIS_X7 || board==Board::BOARD_TARANIS_XLITE || board==Board::BOARD_TARANIS_XLITES || board==Board::BOARD_TARANIS_X3)
#define IS_TARANIS_NOT_X9E(board) (IS_TARANIS(board) && !IS_TARANIS_X9E(board)) #define IS_TARANIS_NOT_X9E(board) (IS_TARANIS(board) && !IS_TARANIS_X9E(board))
#define IS_HORUS_X12S(board) (board==Board::BOARD_X12S) #define IS_HORUS_X12S(board) (board==Board::BOARD_X12S)
#define IS_HORUS_X10(board) (board==Board::BOARD_X10) #define IS_HORUS_X10(board) (board==Board::BOARD_X10)

2
companion/src/firmwares/generalsettings.cpp
View file

@ -122,7 +122,7 @@ GeneralSettings::GeneralSettings()
templateSetup = g.profile[g.sessionId()].channelOrder(); templateSetup = g.profile[g.sessionId()].channelOrder();
stickMode = g.profile[g.sessionId()].defaultMode(); stickMode = g.profile[g.sessionId()].defaultMode();
QString t_calib = g.profile[g.sessionId()].stickPotCalib(); QString t_calib; // TODO SEGFAULT = g.profile[g.sessionId()].stickPotCalib();
int potsnum = getBoardCapability(getCurrentBoard(), Board::Pots); int potsnum = getBoardCapability(getCurrentBoard(), Board::Pots);
if (!t_calib.isEmpty()) { if (!t_calib.isEmpty()) {
QString t_trainercalib=g.profile[g.sessionId()].trainerCalib(); QString t_trainercalib=g.profile[g.sessionId()].trainerCalib();

2321
companion/src/firmwares/opentx/opentxeeprom.cpp
View file

File diff suppressed because it is too large Load diff

2
companion/src/firmwares/opentx/opentxinterface.cpp
View file

@ -271,7 +271,7 @@ uint8_t OpenTxEepromInterface::getLastDataVersion(Board::Type board)
case BOARD_M128: case BOARD_M128:
return 217; return 217;
default: default:
return 218; return 219;
} }
} }

3
companion/src/simulation/simulatorwidget.cpp
View file

@ -80,6 +80,9 @@ SimulatorWidget::SimulatorWidget(QWidget * parent, SimulatorInterface * simulato
case Board::BOARD_TARANIS_XLITES: case Board::BOARD_TARANIS_XLITES:
radioUiWidget = new SimulatedUIWidgetXLITE(simulator, this); radioUiWidget = new SimulatedUIWidgetXLITE(simulator, this);
break; break;
case Board::BOARD_TARANIS_X3:
radioUiWidget = new SimulatedUIWidgetX7(simulator, this);
break;
case Board::BOARD_TARANIS_X9E: case Board::BOARD_TARANIS_X9E:
radioUiWidget = new SimulatedUIWidgetX9E(simulator, this); radioUiWidget = new SimulatedUIWidgetX9E(simulator, this);
break; break;