From 54d1cb8f9a1c94e413e60378a060667e3114208b Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 21 Jan 2017 23:56:11 +0100 Subject: [PATCH] [Companion] X7 EEPROM import fix + cosmetics + compilation error fixed on Manjaro --- companion/src/eeprominterface.h | 61 ++++++++++--------- .../src/firmwares/opentx/opentxeeprom.cpp | 14 ++--- companion/src/helpers.h | 4 +- radio/src/gui/128x64/lcd.cpp | 2 +- 4 files changed, 39 insertions(+), 42 deletions(-) diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h index 493b81fb6..4b6b0b1e1 100644 --- a/companion/src/eeprominterface.h +++ b/companion/src/eeprominterface.h @@ -29,38 +29,39 @@ #include #include -#define EESIZE_STOCK 2048 -#define EESIZE_M128 4096 -#define EESIZE_GRUVIN9X 4096 -#define EESIZE_TARANIS (32*1024) -#define EESIZE_SKY9X (128*4096) -#define EESIZE_9XRPRO (128*4096) -#define EESIZE_MAX EESIZE_9XRPRO +#define EESIZE_STOCK 2048 +#define EESIZE_M128 4096 +#define EESIZE_GRUVIN9X 4096 +#define EESIZE_TARANIS (32*1024) +#define EESIZE_SKY9X (128*4096) +#define EESIZE_9XRPRO (128*4096) +#define EESIZE_MAX EESIZE_9XRPRO -#define FSIZE_STOCK (64*1024) -#define FSIZE_M128 (128*1024) -#define FSIZE_GRUVIN9X (256*1024) -#define FSIZE_TARANIS (512*1024) -#define FSIZE_SKY9X (256*1024) -#define FSIZE_9XRPRO (512*1024) -#define FSIZE_HORUS (2048*1024) -#define FSIZE_MAX FSIZE_HORUS +#define FSIZE_STOCK (64*1024) +#define FSIZE_M128 (128*1024) +#define FSIZE_GRUVIN9X (256*1024) +#define FSIZE_TARANIS (512*1024) +#define FSIZE_SKY9X (256*1024) +#define FSIZE_9XRPRO (512*1024) +#define FSIZE_HORUS (2048*1024) +#define FSIZE_MAX FSIZE_HORUS -#define IS_9X(board) (board==BOARD_STOCK || board==BOARD_M128) -#define IS_STOCK(board) (board==BOARD_STOCK) -#define IS_2560(board) (board==BOARD_GRUVIN9X || board==BOARD_MEGA2560) -#define IS_SKY9X(board) (board==BOARD_SKY9X || board==BOARD_9XRPRO || board==BOARD_AR9X) -#define IS_9XRPRO(board) (board==BOARD_9XRPRO) -#define IS_TARANIS_X7(board) (board==BOARD_TARANIS_X7) -#define IS_TARANIS_PLUS(board) (board==BOARD_TARANIS_X9DP || board==BOARD_TARANIS_X9E) -#define IS_TARANIS_X9E(board) (board==BOARD_TARANIS_X9E) -#define IS_TARANIS(board) (board==BOARD_TARANIS_X9D || board==BOARD_TARANIS_X9DP || board==BOARD_TARANIS_X9E || board==BOARD_TARANIS_X7) -#define IS_HORUS(board) (board==BOARD_HORUS) -#define IS_HORUS_OR_TARANIS(board) (IS_HORUS(board) || IS_TARANIS(board)) -#define IS_FLAMENCO(board) (board==BOARD_FLAMENCO) -#define IS_STM32(board) (IS_TARANIS(board) || IS_HORUS(board) || IS_FLAMENCO(board)) -#define IS_ARM(board) (IS_STM32(board) || IS_SKY9X(board)) -#define HAS_LARGE_LCD(board) (IS_HORUS(board) || (IS_TARANIS(board) && board != BOARD_TARANIS_X7)) +#define IS_9X(board) (board==BOARD_STOCK || board==BOARD_M128) +#define IS_STOCK(board) (board==BOARD_STOCK) +#define IS_2560(board) (board==BOARD_GRUVIN9X || board==BOARD_MEGA2560) +#define IS_SKY9X(board) (board==BOARD_SKY9X || board==BOARD_9XRPRO || board==BOARD_AR9X) +#define IS_9XRPRO(board) (board==BOARD_9XRPRO) +#define IS_TARANIS_X7(board) (board==BOARD_TARANIS_X7) +#define IS_TARANIS_X9(board) (board==BOARD_TARANIS_X9D || board==BOARD_TARANIS_X9DP || board==BOARD_TARANIS_X9E) +#define IS_TARANIS_PLUS(board) (board==BOARD_TARANIS_X9DP || board==BOARD_TARANIS_X9E) +#define IS_TARANIS_X9E(board) (board==BOARD_TARANIS_X9E) +#define IS_TARANIS(board) (IS_TARANIS_X9(board) || IS_TARANIS_X7(board)) +#define IS_HORUS(board) (board==BOARD_HORUS) +#define IS_HORUS_OR_TARANIS(board) (IS_HORUS(board) || IS_TARANIS(board)) +#define IS_FLAMENCO(board) (board==BOARD_FLAMENCO) +#define IS_STM32(board) (IS_TARANIS(board) || IS_HORUS(board) || IS_FLAMENCO(board)) +#define IS_ARM(board) (IS_STM32(board) || IS_SKY9X(board)) +#define HAS_LARGE_LCD(board) (IS_HORUS(board) || (IS_TARANIS(board) && board != BOARD_TARANIS_X7)) QString RotaryEncoderString(int index); diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp index b1dc91e59..8d33e0018 100644 --- a/companion/src/firmwares/opentx/opentxeeprom.cpp +++ b/companion/src/firmwares/opentx/opentxeeprom.cpp @@ -30,10 +30,10 @@ #define HAS_PERSISTENT_TIMERS(board) (IS_ARM(board) || IS_2560(board)) #define MAX_VIEWS(board) (HAS_LARGE_LCD(board) ? 2 : 256) -#define MAX_POTS(board, version) (IS_HORUS(board) ? 3 : (board == BOARD_TARANIS_X7 ? 2 : (IS_TARANIS(board) ? (IS_TARANIS_X9E(board) ? 4 : (version >= 216 ? 3 : 2)) : 3))) -#define MAX_SLIDERS(board) (IS_HORUS(board) ? 4 : (board == BOARD_TARANIS_X7 ? 0 : (IS_TARANIS(board) ? (IS_TARANIS_X9E(board) ? 4 : 2) : 0))) +#define MAX_POTS(board, version) (IS_HORUS(board) ? 3 : (IS_TARANIS_X7(board) ? 2 : (IS_TARANIS(board) ? (IS_TARANIS_X9E(board) ? 4 : (version >= 216 ? 3 : 2)) : 3))) +#define MAX_SLIDERS(board) (IS_HORUS(board) ? 4 : (IS_TARANIS_X7(board) ? 0 : (IS_TARANIS(board) ? (IS_TARANIS_X9E(board) ? 4 : 2) : 0))) #define MAX_MOUSE_ANALOGS(board) (IS_HORUS(board) ? 2 : 0) -#define MAX_SWITCHES(board, version) (IS_HORUS(board) ? 8 : (board == BOARD_TARANIS_X7 ? 6 : (IS_TARANIS(board) ? (IS_TARANIS_X9E(board) ? 18 : 8) : 7))) +#define MAX_SWITCHES(board, version) (IS_HORUS(board) ? 8 : (IS_TARANIS_X7(board) ? 6 : (IS_TARANIS(board) ? (IS_TARANIS_X9E(board) ? 18 : 8) : 7))) #define MAX_SWITCHES_POSITION(board, version) (IS_TARANIS_X7(board) ? 6*3 : (IS_TARANIS_X9E(board) ? 18*3 : (IS_HORUS_OR_TARANIS(board) ? 8*3 : 9))) #define MAX_ROTARY_ENCODERS(board) (IS_2560(board) ? 2 : (IS_SKY9X(board) ? 1 : 0)) #define MAX_FLIGHT_MODES(board, version) (IS_ARM(board) ? 9 : (IS_DBLRAM(board, version) ? 6 : 5)) @@ -2590,12 +2590,8 @@ class FrskyScreenField: public DataField { numbers.Append(new TelemetrySourceField<8>(screen.body.lines[i].source[j], board, version)); } } - - if (!IS_TARANIS(board)) { - if (IS_ARM(board)) - numbers.Append(new SpareBitsField<12*8>()); - else - numbers.Append(new SpareBitsField<4*8>()); + for (unsigned i=numbers.size(); i()); } if (IS_TARANIS(board) && version >= 217) { diff --git a/companion/src/helpers.h b/companion/src/helpers.h index 1be052c7f..eab93e8a7 100644 --- a/companion/src/helpers.h +++ b/companion/src/helpers.h @@ -140,8 +140,8 @@ void populateGvarUseCB(QComboBox *b, unsigned int phase); #define POPULATE_VIRTUAL_INPUTS (1<<7) #define POPULATE_SCRIPT_OUTPUTS (1<<8) -#define GVARS_VARIANT 0x0001 -#define FRSKY_VARIANT 0x0002 +#define GVARS_VARIANT 0x0001 +#define FRSKY_VARIANT 0x0002 void populateGVCB(QComboBox & b, int value, const ModelData & model); void populateSourceCB(QComboBox *b, const RawSource &source, const GeneralSettings generalSettings, const ModelData * model, unsigned int flags); diff --git a/radio/src/gui/128x64/lcd.cpp b/radio/src/gui/128x64/lcd.cpp index e49a7face..e9c6a55fa 100644 --- a/radio/src/gui/128x64/lcd.cpp +++ b/radio/src/gui/128x64/lcd.cpp @@ -822,7 +822,7 @@ void drawTimer(coord_t x, coord_t y, putstime_t tme, LcdFlags att, LcdFlags att2 tme = -tme; } - qr = div(tme, 60); + qr = div((int)tme, 60); #if defined(CPUARM) char separator = ':';