diff --git a/companion/src/constants.h b/companion/src/constants.h index 8f35dab24..2fd97f7a7 100644 --- a/companion/src/constants.h +++ b/companion/src/constants.h @@ -29,7 +29,7 @@ enum BoardEnum { BOARD_SKY9X, BOARD_9XRPRO, BOARD_AR9X, - BOARD_X7D, + BOARD_TARANIS_X7, BOARD_TARANIS_X9D, BOARD_TARANIS_X9DP, BOARD_TARANIS_X9E, diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp index 27adda99d..6848ab22a 100644 --- a/companion/src/eeprominterface.cpp +++ b/companion/src/eeprominterface.cpp @@ -1703,8 +1703,8 @@ QString getBoardName(BoardEnum board) return "Gruvin9x"; case BOARD_MEGA2560: return "MEGA2560"; - case BOARD_X7D: - return "X7D"; + case BOARD_TARANIS_X7: + return "Taranis X7"; case BOARD_TARANIS_X9D: return "Taranis X9D"; case BOARD_TARANIS_X9DP: diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h index 786c14d35..b9ea0cb2e 100644 --- a/companion/src/eeprominterface.h +++ b/companion/src/eeprominterface.h @@ -55,14 +55,14 @@ #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(board) (board==BOARD_TARANIS_X9D || board==BOARD_TARANIS_X9DP || board==BOARD_TARANIS_X9E || board==BOARD_X7D) +#define IS_TARANIS(board) (board==BOARD_TARANIS_X9D || board==BOARD_TARANIS_X9DP || board==BOARD_TARANIS_X9E || 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_HORUS(board) (board==BOARD_HORUS) #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_X7D)) +#define HAS_LARGE_LCD(board) (IS_HORUS(board) || (IS_TARANIS(board) && board != BOARD_TARANIS_X7)) const uint8_t modn12x3[4][4]= { {1, 2, 3, 4}, diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp index 073757b3f..10b5800bf 100644 --- a/companion/src/firmwares/opentx/opentxeeprom.cpp +++ b/companion/src/firmwares/opentx/opentxeeprom.cpp @@ -31,11 +31,11 @@ #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_X7D ? 2 : (IS_TARANIS(board) ? (IS_TARANIS_X9E(board) ? 4 : (version >= 216 ? 3 : 2)) : 3))) -#define MAX_SLIDERS(board) (IS_HORUS(board) ? 4 : (board == BOARD_X7D ? 0 : (IS_TARANIS(board) ? (IS_TARANIS_X9E(board) ? 4 : 2) : 0))) +#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_MOUSE_ANALOGS(board) (IS_HORUS(board) ? 2 : 0) -#define MAX_SWITCHES(board, version) (IS_HORUS(board) ? 8 : (board == BOARD_X7D ? 6 : (IS_TARANIS(board) ? (IS_TARANIS_X9E(board) ? 18 : 8) : 7))) -#define MAX_SWITCHES_POSITION(board, version) (IS_HORUS(board) ? 24 : (board == BOARD_X7D ? 6*3 : (IS_TARANIS_X9E(board) ? 18*3 : (IS_TARANIS(board) ? 8*3 : 9)))) +#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_POSITION(board, version) (IS_HORUS(board) ? 24 : (board == BOARD_TARANIS_X7 ? 6*3 : (IS_TARANIS_X9E(board) ? 18*3 : (IS_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)) #define MAX_TIMERS(board, version) ((IS_ARM(board) && version >= 217) ? 3 : 2) diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index a219d5bd1..49ae22330 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -72,8 +72,8 @@ const char * OpenTxEepromInterface::getName() return "OpenTX for FrSky Taranis X9D+"; case BOARD_TARANIS_X9E: return "OpenTX for FrSky Taranis X9E"; - case BOARD_X7D: - return "OpenTX for FrSky X7D"; + case BOARD_TARANIS_X7: + return "OpenTX for FrSky Taranis X7"; case BOARD_SKY9X: return "OpenTX for Sky9x board / 9X"; case BOARD_9XRPRO: @@ -104,7 +104,7 @@ const int OpenTxEepromInterface::getEEpromSize() case BOARD_9XRPRO: case BOARD_AR9X: return EESIZE_9XRPRO; - case BOARD_X7D: + case BOARD_TARANIS_X7: case BOARD_TARANIS_X9D: case BOARD_TARANIS_X9DP: case BOARD_TARANIS_X9E: @@ -574,7 +574,7 @@ int OpenTxFirmware::getCapability(Capability capability) case Pots: if (IS_HORUS(board)) return 3; - else if (board == BOARD_X7D) + else if (board == BOARD_TARANIS_X7) return 2; else if (IS_TARANIS_X9E(board)) return 4; @@ -585,7 +585,7 @@ int OpenTxFirmware::getCapability(Capability capability) case Sliders: if (IS_HORUS(board)) return 4; - else if (board == BOARD_X7D) + else if (board == BOARD_TARANIS_X7) return 0; else if (IS_TARANIS_X9E(board)) return 4; @@ -596,7 +596,7 @@ int OpenTxFirmware::getCapability(Capability capability) case Switches: if (IS_TARANIS_X9E(board)) return 18; - else if (board == BOARD_X7D) + else if (board == BOARD_TARANIS_X7) return 6; else if (IS_TARANIS(board)) return 8; @@ -860,7 +860,7 @@ QString OpenTxFirmware::getAnalogInputName(unsigned int index) Firmware::Switch OpenTxFirmware::getSwitch(unsigned int index) { - if (board == BOARD_X7D) { + if (board == BOARD_TARANIS_X7) { const Switch switches[] = {{SWITCH_3POS, "SA"}, {SWITCH_3POS, "SB"}, {SWITCH_3POS, "SC"}, @@ -1331,8 +1331,8 @@ void registerOpenTxFirmwares() addOpenTxTaranisOptions(firmware); firmwares.push_back(firmware); - /* FrSky X7D board */ - firmware = new OpenTxFirmware("opentx-x7d", QObject::tr("FrSky X7D"), BOARD_X7D); + /* FrSky X7 board */ + firmware = new OpenTxFirmware("opentx-x7", QObject::tr("FrSky Taranis X7"), BOARD_TARANIS_X7); addOpenTxTaranisOptions(firmware); firmwares.push_back(firmware); diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index e5ad559ef..300b60800 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -62,7 +62,7 @@ set(FATFS_SRC if(PCB STREQUAL HORUS) include(targets/horus/CMakeLists.txt) -elseif(PCB STREQUAL X9E OR PCB STREQUAL X9D+ OR PCB STREQUAL X9D OR PCB STREQUAL X7D) +elseif(PCB STREQUAL X9E OR PCB STREQUAL X9D+ OR PCB STREQUAL X9D OR PCB STREQUAL X7) include(targets/taranis/CMakeLists.txt) elseif(PCB STREQUAL SKY9X OR PCB STREQUAL 9XRPRO OR PCB STREQUAL AR9X) include(targets/sky9x/CMakeLists.txt) @@ -380,7 +380,7 @@ if(NOT MSVC) set(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CPP_FLAGS} -g") set(CMAKE_EXE_LINKER_FLAGS "-mcpu=${MCU} -mthumb -lm -T${RADIO_SRC_DIRECTORY}/${LINKER_SCRIPT} -Wl,-Map=firmware.map,--cref,--no-warn-mismatch,--gc-sections") - if(PCB STREQUAL X9D OR PCB STREQUAL X9D+ OR PCB STREQUAL X9E OR PCB STREQUAL X7D) + if(PCB STREQUAL X9D OR PCB STREQUAL X9D+ OR PCB STREQUAL X9E OR PCB STREQUAL X7) add_subdirectory(targets/${TARGET_DIR}/bootloader) include_directories(${CMAKE_CURRENT_BINARY_DIR}/targets/${TARGET_DIR}/bootloader) set(FIRMWARE_DEPENDENCIES ${FIRMWARE_DEPENDENCIES} bootloader) diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h index ec3cb6e2b..0cc962979 100644 --- a/radio/src/dataconstants.h +++ b/radio/src/dataconstants.h @@ -159,7 +159,7 @@ enum CurveType { #define LEN_FUNCTION_NAME 8 #define MAX_CURVES 32 #define MAX_CURVE_POINTS 512 -#elif defined(PCBSKY9X) || defined(PCBX7D) +#elif defined(PCBSKY9X) || defined(PCBX7) #define LEN_MODEL_NAME 10 #define LEN_TIMER_NAME 3 #define LEN_FLIGHT_MODE_NAME 6 @@ -572,7 +572,7 @@ enum SwitchSources { SWSRC_SD0, SWSRC_SD1, SWSRC_SD2, -#if !defined(PCBX7D) +#if !defined(PCBX7) SWSRC_SE0, SWSRC_SE1, SWSRC_SE2, @@ -580,7 +580,7 @@ enum SwitchSources { SWSRC_SF0, SWSRC_SF1, SWSRC_SF2, -#if !defined(PCBX7D) +#if !defined(PCBX7) SWSRC_SG0, SWSRC_SG1, SWSRC_SG2, @@ -765,7 +765,7 @@ enum MixSources { MIXSRC_SLIDER3, LUA_EXPORT("lcs", "Left center slider (X9E only)") MIXSRC_SLIDER4, LUA_EXPORT("rcs", "Right center slider (X9E only)") MIXSRC_LAST_POT = MIXSRC_SLIDER4, -#elif defined(PCBX7D) +#elif defined(PCBX7) MIXSRC_POT1 = MIXSRC_FIRST_POT, LUA_EXPORT("s1", "Potentiometer 1") MIXSRC_POT2, LUA_EXPORT("s2", "Potentiometer 2") MIXSRC_LAST_POT = MIXSRC_POT2, @@ -838,11 +838,11 @@ enum MixSources { MIXSRC_SB, LUA_EXPORT("sb", "Switch B") MIXSRC_SC, LUA_EXPORT("sc", "Switch C") MIXSRC_SD, LUA_EXPORT("sd", "Switch D") -#if !defined(PCBX7D) +#if !defined(PCBX7) MIXSRC_SE, LUA_EXPORT("se", "Switch E") #endif MIXSRC_SF, LUA_EXPORT("sf", "Switch F") -#if !defined(PCBX7D) +#if !defined(PCBX7) MIXSRC_SG, LUA_EXPORT("sg", "Switch G") #endif MIXSRC_SH, LUA_EXPORT("sh", "Switch H") diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h index 21423d526..7cfc67b4c 100644 --- a/radio/src/datastructs.h +++ b/radio/src/datastructs.h @@ -920,7 +920,7 @@ PACK(struct TrainerData { char switchNames[NUM_SWITCHES][LEN_SWITCH_NAME]; \ char anaNames[NUM_STICKS+NUM_POTS+NUM_SLIDERS][LEN_ANA_NAME]; #elif defined(PCBTARANIS) - #if defined(PCBX9E) || defined(PCBX7D) + #if defined(PCBX9E) || defined(PCBX7) #define BLUETOOTH_FIELDS \ uint8_t bluetoothEnable; \ char bluetoothName[LEN_BLUETOOTH_NAME]; @@ -1055,7 +1055,7 @@ static inline void check_struct() /* LEN_FUNCTION_NAME is the difference in CustomFunctionData */ -#if defined(PCBX7D) +#if defined(PCBX7) // TODO #elif defined(PCBTARANIS) CHKSIZE(MixData, 22); @@ -1076,7 +1076,7 @@ static inline void check_struct() #if defined(PCBX9E) CHKSIZE(RadioData, 952); CHKSIZE(ModelData, 6520); -#elif defined(PCBX7D) +#elif defined(PCBX7) CHKSIZE(RadioData, 839); CHKSIZE(ModelData, 6504); #else diff --git a/radio/src/gui/128x64/gui.h b/radio/src/gui/128x64/gui.h index d15422ce9..38e149530 100644 --- a/radio/src/gui/128x64/gui.h +++ b/radio/src/gui/128x64/gui.h @@ -27,7 +27,7 @@ #define MENUS_SCROLLBAR_WIDTH 0 -#if defined(PCBX7D) +#if defined(PCBX7) #define HEADER_LINE 0 #define HEADER_LINE_COLUMNS #else @@ -232,7 +232,7 @@ void title(const pm_char * s); #define MENU_TAB(...) static const pm_uint8_t mstate_tab[] PROGMEM = __VA_ARGS__ #endif -#if defined(PCBX7D) +#if defined(PCBX7) #define MENU_CHECK(tab, menu, lines_count) \ check(event, menu, tab, DIM(tab), mstate_tab, DIM(mstate_tab)-1, lines_count) #else @@ -245,7 +245,7 @@ void title(const pm_char * s); MENU_CHECK(tab, menu, lines_count); \ TITLE(title) -#if defined(PCBX7D) +#if defined(PCBX7) #define SIMPLE_MENU_NOTITLE(tab, menu, lines_count) \ check_simple(event, menu, tab, DIM(tab), lines_count); #define SUBMENU_NOTITLE(lines_count, ...) { \ @@ -408,7 +408,7 @@ void drawStatusLine(); #endif // TODO enum -#if defined(PCBX7D) +#if defined(PCBX7) #define EDIT_MODE_INIT 0 #else #define EDIT_MODE_INIT -1 diff --git a/radio/src/gui/128x64/menu_radio.cpp b/radio/src/gui/128x64/menu_radio.cpp index da14ebd4e..c82d1bd97 100644 --- a/radio/src/gui/128x64/menu_radio.cpp +++ b/radio/src/gui/128x64/menu_radio.cpp @@ -23,7 +23,7 @@ #if defined(CPUARM) void menuRadioSpecialFunctions(event_t event) { -#if defined(PCBX7D) +#if defined(PCBX7) const CustomFunctionData * cfn = &g_eeGeneral.customFn[menuVerticalPosition]; if (!CFN_SWITCH(cfn) && menuHorizontalPosition < 0 && event==EVT_KEY_BREAK(KEY_ENTER)) { menuHorizontalPosition = 0; @@ -32,7 +32,7 @@ void menuRadioSpecialFunctions(event_t event) MENU(STR_MENUSPECIALFUNCS, menuTabGeneral, MENU_RADIO_SPECIAL_FUNCTIONS, HEADER_LINE+MAX_SPECIAL_FUNCTIONS, { HEADER_LINE_COLUMNS NAVIGATION_LINE_BY_LINE|4/*repeated*/ }); -#if defined(PCBX7D) +#if defined(PCBX7) if (!CFN_SWITCH(cfn) && menuHorizontalPosition < 0) { menuHorizontalPosition = 0; } @@ -40,7 +40,7 @@ void menuRadioSpecialFunctions(event_t event) menuSpecialFunctions(event, g_eeGeneral.customFn, &globalFunctionsContext); -#if defined(PCBX7D) +#if defined(PCBX7) if (!CFN_SWITCH(cfn) && menuHorizontalPosition == 0 && s_editMode <= 0) { menuHorizontalPosition = -1; } diff --git a/radio/src/gui/128x64/menus.h b/radio/src/gui/128x64/menus.h index a94c7379e..e222d993b 100644 --- a/radio/src/gui/128x64/menus.h +++ b/radio/src/gui/128x64/menus.h @@ -23,7 +23,7 @@ #include "keys.h" -#if defined(PCBX7D) +#if defined(PCBX7) typedef int8_t horzpos_t; #define NAVIGATION_LINE_BY_LINE 0x40 #define IS_LINE_SELECTED(sub, k) ((sub)==(k) && menuHorizontalPosition < 0) diff --git a/radio/src/gui/128x64/model_flightmodes.cpp b/radio/src/gui/128x64/model_flightmodes.cpp index cdb2725b1..09f05a9f0 100644 --- a/radio/src/gui/128x64/model_flightmodes.cpp +++ b/radio/src/gui/128x64/model_flightmodes.cpp @@ -260,7 +260,7 @@ void menuModelFlightModesAll(event_t event) trimsCheckTimer = 200; // 2 seconds } // no break -#if !defined(PCBX7D) +#if !defined(PCBX7) case EVT_KEY_FIRST(KEY_RIGHT): #endif if (sub >= 0 && sub < MAX_FLIGHT_MODES) { diff --git a/radio/src/gui/128x64/model_logical_switches.cpp b/radio/src/gui/128x64/model_logical_switches.cpp index 25e5b4bce..6c7419960 100644 --- a/radio/src/gui/128x64/model_logical_switches.cpp +++ b/radio/src/gui/128x64/model_logical_switches.cpp @@ -233,7 +233,7 @@ void menuModelLogicalSwitches(event_t event) #if defined(ROTARY_ENCODER_NAVIGATION) case EVT_ROTARY_BREAK: #endif -#if !defined(PCBX7D) +#if !defined(PCBX7) case EVT_KEY_FIRST(KEY_RIGHT): #endif case EVT_KEY_FIRST(KEY_ENTER): diff --git a/radio/src/gui/128x64/model_select.cpp b/radio/src/gui/128x64/model_select.cpp index fab6512c8..19da27514 100644 --- a/radio/src/gui/128x64/model_select.cpp +++ b/radio/src/gui/128x64/model_select.cpp @@ -260,7 +260,7 @@ void menuModelSelect(event_t event) } break; -#if defined(PCBX7D) +#if defined(PCBX7) case EVT_KEY_LONG(KEY_PAGE): chainMenu(menuTabModel[DIM(menuTabModel)-1]); killEvents(event); @@ -292,7 +292,7 @@ void menuModelSelect(event_t event) #endif #endif -#if defined(PCBX7D) +#if defined(PCBX7) case EVT_ROTARY_LEFT: case EVT_ROTARY_RIGHT: #endif @@ -333,7 +333,7 @@ void menuModelSelect(event_t event) lcdDrawNumber(17*FW, 0, reusableBuffer.modelsel.eepromfree, RIGHT); #endif -#if defined(PCBX7D) +#if defined(PCBX7) drawScreenIndex(MENU_MODEL_SELECT, DIM(menuTabModel), 0); #elif defined(ROTARY_ENCODER_NAVIGATION) drawScreenIndex(MENU_MODEL_SELECT, DIM(menuTabModel), (sub == g_eeGeneral.currModel) ? ((IS_ROTARY_ENCODER_NAVIGATION_ENABLE() && s_editMode < 0) ? INVERS|BLINK : INVERS) : 0); diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 640f2b18f..f023bef46 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -55,7 +55,7 @@ enum MenuModelSetupItems { ITEM_MODEL_SWITCHES_WARNING, ITEM_MODEL_BEEP_CENTER, CASE_CPUARM(ITEM_MODEL_USE_GLOBAL_FUNCTIONS) -#if defined(PCBX7D) +#if defined(PCBX7) ITEM_MODEL_INTERNAL_MODULE_LABEL, ITEM_MODEL_INTERNAL_MODULE_MODE, ITEM_MODEL_INTERNAL_MODULE_CHANNELS, @@ -87,7 +87,7 @@ enum MenuModelSetupItems { ITEM_MODEL_PPM1_PROTOCOL, ITEM_MODEL_PPM1_PARAMS, #endif -#if defined(PCBX7D) +#if defined(PCBX7) ITEM_MODEL_TRAINER_LABEL, ITEM_MODEL_TRAINER_MODE, ITEM_MODEL_TRAINER_CHANNELS, @@ -107,7 +107,7 @@ enum MenuModelSetupItems { #define MODEL_SETUP_RANGE_OFS 4*FW+3 #define MODEL_SETUP_SET_FAILSAFE_OFS 7*FW-2 -#if defined(PCBX7D) +#if defined(PCBX7) #define CURRENT_MODULE_EDITED(k) (k>=ITEM_MODEL_TRAINER_LABEL ? TRAINER_MODULE : (k>=ITEM_MODEL_EXTERNAL_MODULE_LABEL ? EXTERNAL_MODULE : INTERNAL_MODULE)) #elif defined(PCBSKY9X) && !defined(REVA) #define CURRENT_MODULE_EDITED(k) (k>=ITEM_MODEL_EXTRA_MODULE_LABEL ? EXTRA_MODULE : EXTERNAL_MODULE) @@ -152,7 +152,7 @@ enum MenuModelSetupItems { #define EXTRA_MODULE_ROWS #endif -#if defined(PCBX7D) +#if defined(PCBX7) #define TRAINER_CHANNELS_ROWS() IF_TRAINER_ON(1) #define TRAINER_MODULE_ROWS LABEL(Trainer), 0, TRAINER_CHANNELS_ROWS(), IF_TRAINER_ON(2) #else @@ -169,7 +169,7 @@ enum MenuModelSetupItems { void menuModelSetup(event_t event) { -#if defined(PCBX7D) +#if defined(PCBX7) MENU_TAB({ HEADER_LINE_COLUMNS 0, TIMER_ROWS, TIMER_ROWS, TIMER_ROWS, 0, 1, 0, 0, 0, 0, 0, CASE_CPUARM(LABEL(PreflightCheck)) CASE_CPUARM(0) 0, NUM_SWITCHES-1, NUM_STICKS+NUM_POTS+NUM_SLIDERS+NUM_ROTARY_ENCODERS-1, 0, LABEL(InternalModule), INTERNAL_MODULE_MODE_ROWS, @@ -550,7 +550,7 @@ void menuModelSetup(event_t event) break; #endif -#if defined(PCBX7D) +#if defined(PCBX7) case ITEM_MODEL_INTERNAL_MODULE_LABEL: lcdDrawTextAlignedLeft(y, TR_INTERNALRF); break; @@ -739,7 +739,7 @@ void menuModelSetup(event_t event) break; #endif -#if defined(PCBX7D) +#if defined(PCBX7) case ITEM_MODEL_TRAINER_LABEL: lcdDrawTextAlignedLeft(y, STR_TRAINER); break; @@ -751,7 +751,7 @@ void menuModelSetup(event_t event) break; #endif -#if defined(PCBX7D) +#if defined(PCBX7) case ITEM_MODEL_INTERNAL_MODULE_CHANNELS: case ITEM_MODEL_TRAINER_CHANNELS: #endif @@ -787,7 +787,7 @@ void menuModelSetup(event_t event) } #endif -#if defined(PCBX7D) +#if defined(PCBX7) case ITEM_MODEL_TRAINER_SETTINGS: case ITEM_MODEL_INTERNAL_MODULE_BIND: #endif @@ -877,7 +877,7 @@ void menuModelSetup(event_t event) } #endif -#if defined(PCBX7D) +#if defined(PCBX7) case ITEM_MODEL_INTERNAL_MODULE_FAILSAFE: #endif #if defined(CPUARM) diff --git a/radio/src/gui/128x64/model_special_functions.cpp b/radio/src/gui/128x64/model_special_functions.cpp index 7164d2dde..9f84d0ae0 100644 --- a/radio/src/gui/128x64/model_special_functions.cpp +++ b/radio/src/gui/128x64/model_special_functions.cpp @@ -371,7 +371,7 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF break; } } -#if defined(PCBX7D) +#if defined(PCBX7) if (sub==k && menuHorizontalPosition<0 && CFN_SWITCH(cfn)) { lcdInvertLine(i+1); } @@ -381,7 +381,7 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF void menuModelSpecialFunctions(event_t event) { -#if defined(PCBX7D) +#if defined(PCBX7) const CustomFunctionData * cfn = &g_model.customFn[menuVerticalPosition]; if (!CFN_SWITCH(cfn) && menuHorizontalPosition < 0 && event==EVT_KEY_BREAK(KEY_ENTER)) { menuHorizontalPosition = 0; @@ -389,14 +389,14 @@ void menuModelSpecialFunctions(event_t event) #endif MENU(STR_MENUCUSTOMFUNC, menuTabModel, MENU_MODEL_SPECIAL_FUNCTIONS, HEADER_LINE+MAX_SPECIAL_FUNCTIONS, { HEADER_LINE_COLUMNS NAVIGATION_LINE_BY_LINE|4/*repeated*/ }); -#if defined(PCBX7D) +#if defined(PCBX7) if (!CFN_SWITCH(cfn) && menuHorizontalPosition < 0) { menuHorizontalPosition = 0; } #endif menuSpecialFunctions(event, g_model.customFn, &modelFunctionsContext); -#if defined(PCBX7D) +#if defined(PCBX7) if (!CFN_SWITCH(cfn) && menuHorizontalPosition == 0 && s_editMode <= 0) { menuHorizontalPosition = -1; } diff --git a/radio/src/gui/128x64/model_telemetry.cpp b/radio/src/gui/128x64/model_telemetry.cpp index 2ebb5ecd1..2c5ab615d 100644 --- a/radio/src/gui/128x64/model_telemetry.cpp +++ b/radio/src/gui/128x64/model_telemetry.cpp @@ -475,7 +475,7 @@ void menuModelTelemetryFrsky(event_t event) switch (event) { case EVT_KEY_BREAK(KEY_DOWN): case EVT_KEY_BREAK(KEY_UP): -#if !defined(PCBX7D) +#if !defined(PCBX7) case EVT_KEY_BREAK(KEY_LEFT): case EVT_KEY_BREAK(KEY_RIGHT): #endif diff --git a/radio/src/gui/128x64/navigation.cpp b/radio/src/gui/128x64/navigation.cpp index bbfc25af4..ea40a7504 100644 --- a/radio/src/gui/128x64/navigation.cpp +++ b/radio/src/gui/128x64/navigation.cpp @@ -53,7 +53,7 @@ int8_t checkIncDecMovedSwitch(int8_t val) int8_t checkIncDec_Ret; -#if defined(PCBX7D) +#if defined(PCBX7) #define DBLKEYS_PRESSED_RGT_LFT(in) (false) #define DBLKEYS_PRESSED_UP_DWN(in) (false) #define DBLKEYS_PRESSED_RGT_UP(in) (false) @@ -70,7 +70,7 @@ INIT_STOPS(stops100, 3, -100, 0, 100) INIT_STOPS(stops1000, 3, -1000, 0, 1000) INIT_STOPS(stopsSwitch, 15, SWSRC_FIRST, CATEGORY_END(-SWSRC_FIRST_LOGICAL_SWITCH), CATEGORY_END(-SWSRC_FIRST_TRIM), CATEGORY_END(-SWSRC_LAST_SWITCH+1), 0, CATEGORY_END(SWSRC_LAST_SWITCH), CATEGORY_END(SWSRC_FIRST_TRIM-1), CATEGORY_END(SWSRC_FIRST_LOGICAL_SWITCH-1), SWSRC_LAST) -#if defined(PCBX7D) +#if defined(PCBX7) int checkIncDec(event_t event, int val, int i_min, int i_max, unsigned int i_flags, IsValueAvailable isValueAvailable, const CheckIncDecStops &stops) { int newval = val; @@ -510,7 +510,7 @@ int8_t checkIncDecGen(event_t event, int8_t i_val, int8_t i_min, int8_t i_max) tmr10ms_t menuEntryTime; #endif -#if defined(PCBX7D) +#if defined(PCBX7) #define MAXCOL_RAW(row) (horTab ? pgm_read_byte(horTab+min(row, (vertpos_t)horTabMax)) : (const uint8_t)0) #define MAXCOL(row) (MAXCOL_RAW(row) >= HIDDEN_ROW ? MAXCOL_RAW(row) : (const uint8_t)(MAXCOL_RAW(row) & (~NAVIGATION_LINE_BY_LINE))) #define COLATTR(row) (MAXCOL_RAW(row) == (uint8_t)-1 ? (const uint8_t)0 : (const uint8_t)(MAXCOL_RAW(row) & NAVIGATION_LINE_BY_LINE)) @@ -975,7 +975,7 @@ void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t break; #endif -#if !defined(PCBX7D) +#if !defined(PCBX7) case EVT_KEY_REPT(KEY_DOWN): if (!IS_ROTARY_RIGHT(event) && l_posVert==maxrow) break; // no break @@ -1020,7 +1020,7 @@ void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t break; #endif -#if !defined(PCBX7D) +#if !defined(PCBX7) case EVT_KEY_REPT(KEY_UP): if (!IS_ROTARY_LEFT(event) && l_posVert==0) break; // no break diff --git a/radio/src/gui/128x64/radio_diaganas.cpp b/radio/src/gui/128x64/radio_diaganas.cpp index 3f7b61d79..437a0f996 100644 --- a/radio/src/gui/128x64/radio_diaganas.cpp +++ b/radio/src/gui/128x64/radio_diaganas.cpp @@ -62,7 +62,7 @@ void menuRadioDiagAnalogs(event_t event) lcdDrawNumber(64+5+6*FW-3, 1+4*FH, BandGap, RIGHT); #endif -#if defined(PCBX7D) +#if defined(PCBX7) lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT + 1 + (NUM_STICKS+NUM_POTS+NUM_SLIDERS+1)/2 * FH + 2, STR_BATT_CALIB); putsVolts(LEN_CALIB_FIELDS*FW+FW, MENU_HEADER_HEIGHT + 1 + (NUM_STICKS+NUM_POTS+NUM_SLIDERS+1)/2 * FH + 2, getBatteryVoltage(), (menuVerticalPosition==HEADER_LINE ? INVERS | (s_editMode > 0 ? BLINK : 0) : 0) | PREC2 | LEFT); #elif defined(PCBSKY9X) diff --git a/radio/src/gui/128x64/radio_hardware.cpp b/radio/src/gui/128x64/radio_hardware.cpp index cd20f6e5d..736770485 100644 --- a/radio/src/gui/128x64/radio_hardware.cpp +++ b/radio/src/gui/128x64/radio_hardware.cpp @@ -35,7 +35,7 @@ enum MenuRadioHardwareItems { #define GENERAL_HW_PARAM_OFS (2+(15*FW)) void menuRadioHardware(event_t event) { -#if defined(PCBX7D) +#if defined(PCBX7) #else MENU(STR_HARDWARE, menuTabGeneral, MENU_RADIO_HARDWARE, ITEM_RADIO_HARDWARE_MAX+1, {0, 0, (uint8_t)-1, 0, 0, 0, IF_ROTARY_ENCODERS(0) CASE_BLUETOOTH(0)}); diff --git a/radio/src/gui/128x64/view_about.cpp b/radio/src/gui/128x64/view_about.cpp index cc0b322bb..3bf1a563d 100644 --- a/radio/src/gui/128x64/view_about.cpp +++ b/radio/src/gui/128x64/view_about.cpp @@ -42,7 +42,7 @@ enum AboutScreens { #define ABOUT_X 2 #define ABOUT_INDENT 4 -#if defined(PCBX7D) +#if defined(PCBX7) #define EVT_KEY_PREVIOUS_VIEW EVT_KEY_LONG(KEY_PAGE) #define EVT_KEY_NEXT_VIEW EVT_KEY_BREAK(KEY_PAGE) #else diff --git a/radio/src/gui/128x64/view_main.cpp b/radio/src/gui/128x64/view_main.cpp index ae77e3e30..fdcef2143 100644 --- a/radio/src/gui/128x64/view_main.cpp +++ b/radio/src/gui/128x64/view_main.cpp @@ -211,7 +211,7 @@ void displayVoltageOrAlarm() #define displayVoltageOrAlarm() displayBattVoltage() #endif -#if defined(PCBX7D) +#if defined(PCBX7) #define EVT_KEY_CONTEXT_MENU EVT_KEY_LONG(KEY_ENTER) #define EVT_KEY_NEXT_VIEW EVT_KEY_BREAK(KEY_PAGE) #define EVT_KEY_NEXT_PAGE EVT_ROTARY_RIGHT @@ -508,7 +508,7 @@ void menuMainView(event_t event) doMainScreenGraphics(); // Switches -#if defined(PCBX7D) +#if defined(PCBX7) for (int i=0; i RESX) v = RESX; -#if defined(PCBTARANIS) && !defined(PCBX7D) +#if defined(PCBTARANIS) && !defined(PCBX7) // TODO why not in the driver? if (i==POT1 || i==SLIDER1) { v = -v; diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index fe445b9cb..fadb35834 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -251,7 +251,7 @@ void generalDefault() g_eeGeneral.slidersConfig = 0x03; // LS and RS = sliders with detent #endif -#if defined(PCBX7D) +#if defined(PCBX7) g_eeGeneral.switchConfig = 0x000006ff; // 4x3POS, 1x2POS, 1xTOGGLE #elif defined(PCBTARANIS) || defined(PCBHORUS) g_eeGeneral.switchConfig = 0x00007bff; // 6x3POS, 1x2POS, 1xTOGGLE diff --git a/radio/src/opentx.h b/radio/src/opentx.h index 38f42b743..ad151b803 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -318,7 +318,7 @@ void memswap(void * a, void * b, uint8_t size); #define IS_MULTIPOS_CALIBRATED(cal) (false) #endif -#if defined(PCBFLAMENCO) || defined(PCBHORUS) || defined(PCBX9E) || defined(PCBX7D) +#if defined(PCBFLAMENCO) || defined(PCBHORUS) || defined(PCBX9E) || defined(PCBX7) #define PWR_BUTTON_DELAY #define PWR_PRESS_SHUTDOWN 300 // 3s #endif @@ -1364,7 +1364,7 @@ void opentxClose(uint8_t shutdown=true); void opentxInit(); void opentxResume(); -#if defined(PCBHORUS) || defined(PCBX7D) +#if defined(PCBHORUS) || defined(PCBX7) #define LED_ERROR_BEGIN() ledRed() #define LED_ERROR_END() ledBlue() #else diff --git a/radio/src/strhelpers.cpp b/radio/src/strhelpers.cpp index cd1f65531..581e698cb 100644 --- a/radio/src/strhelpers.cpp +++ b/radio/src/strhelpers.cpp @@ -237,7 +237,7 @@ char * getSwitchString(char * dest, swsrc_t idx) } else { *s++ = 'S'; -#if defined(PCBX7D) +#if defined(PCBX7) if (swinfo.quot == 5) *s++ = 'H'; else if (swinfo.quot == 4) diff --git a/radio/src/switches.cpp b/radio/src/switches.cpp index 0d4488b96..ceca3ed8d 100644 --- a/radio/src/switches.cpp +++ b/radio/src/switches.cpp @@ -225,11 +225,11 @@ void getSwitchesPosition(bool startup) CHECK_3POS(1, SW_SB); CHECK_3POS(2, SW_SC); CHECK_3POS(3, SW_SD); -#if !defined(PCBX7D) +#if !defined(PCBX7) CHECK_3POS(4, SW_SE); #endif CHECK_2POS(SW_SF); -#if !defined(PCBX7D) +#if !defined(PCBX7) CHECK_3POS(5, SW_SG); #endif CHECK_2POS(SW_SH); diff --git a/radio/src/targets/simu/opentxsimulator.cpp b/radio/src/targets/simu/opentxsimulator.cpp index be9d796a4..6740ef789 100644 --- a/radio/src/targets/simu/opentxsimulator.cpp +++ b/radio/src/targets/simu/opentxsimulator.cpp @@ -257,8 +257,8 @@ class OpenTxSimulatorFactory: public SimulatorFactory return BOARD_HORUS; #elif defined(PCBFLAMENCO) return BOARD_FLAMENCO; -#elif defined(PCBX7D) - return BOARD_X7D; +#elif defined(PCBX7) + return BOARD_TARANIS_X7; #elif defined(PCBTARANIS) return BOARD_TARANIS_X9D; #else diff --git a/radio/src/targets/simu/simpgmspace.cpp b/radio/src/targets/simu/simpgmspace.cpp index c377bae5f..9e7163cc2 100644 --- a/radio/src/targets/simu/simpgmspace.cpp +++ b/radio/src/targets/simu/simpgmspace.cpp @@ -240,11 +240,11 @@ void simuSetSwitch(uint8_t swtch, int8_t state) SWITCH_3_CASE(1, SWITCHES_GPIO_REG_B_L, SWITCHES_GPIO_REG_B_H, SWITCHES_GPIO_PIN_B_L, SWITCHES_GPIO_PIN_B_H) SWITCH_3_CASE(2, SWITCHES_GPIO_REG_C_L, SWITCHES_GPIO_REG_C_H, SWITCHES_GPIO_PIN_C_L, SWITCHES_GPIO_PIN_C_H) SWITCH_3_CASE(3, SWITCHES_GPIO_REG_D_L, SWITCHES_GPIO_REG_D_H, SWITCHES_GPIO_PIN_D_L, SWITCHES_GPIO_PIN_D_H) -#if !defined(PCBX7D) +#if !defined(PCBX7) SWITCH_3_CASE(4, SWITCHES_GPIO_REG_E_L, SWITCHES_GPIO_REG_E_H, SWITCHES_GPIO_PIN_E_L, SWITCHES_GPIO_PIN_E_H) #endif SWITCH_CASE(5, SWITCHES_GPIO_REG_F, SWITCHES_GPIO_PIN_F) -#if !defined(PCBX7D) +#if !defined(PCBX7) SWITCH_3_CASE(6, SWITCHES_GPIO_REG_G_L, SWITCHES_GPIO_REG_G_H, SWITCHES_GPIO_PIN_G_L, SWITCHES_GPIO_PIN_G_H) #endif SWITCH_CASE(7, SWITCHES_GPIO_REG_H, SWITCHES_GPIO_PIN_H) diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt index f79a80f87..207fc5dc0 100644 --- a/radio/src/targets/taranis/CMakeLists.txt +++ b/radio/src/targets/taranis/CMakeLists.txt @@ -54,13 +54,13 @@ elseif(PCB STREQUAL X9D) set(LCD_DRIVER lcd_driver_aspi.cpp) set(SERIAL2_DRIVER ../common/arm/stm32/serial2_driver.cpp) set(GVAR_SCREEN model_gvars.cpp) -elseif(PCB STREQUAL X7D) +elseif(PCB STREQUAL X7) set(CPU_TYPE STM32F2) set(LINKER_SCRIPT targets/taranis/stm32f2_flash.ld) set(HAPTIC YES) - set(LUA_EXPORT lua_export_x7d) - set(FLAVOUR x7d) - add_definitions(-DPCBX7D -DSOFTWARE_VOLUME) + set(LUA_EXPORT lua_export_x7) + set(FLAVOUR x7) + add_definitions(-DPCBX7 -DSOFTWARE_VOLUME) add_definitions(-DEEPROM_VARIANT=0) set(FIRMWARE_TARGET_SRC ${FIRMWARE_TARGET_SRC} @@ -93,7 +93,7 @@ set(GUI_SRC ${GUI_SRC} ../screenshot.cpp ) -if(PCB STREQUAL X7D) +if(PCB STREQUAL X7) set(LED_DRIVER led_driver.cpp) endif() diff --git a/radio/src/targets/taranis/adc_driver.cpp b/radio/src/targets/taranis/adc_driver.cpp index 731773f84..40cb30043 100644 --- a/radio/src/targets/taranis/adc_driver.cpp +++ b/radio/src/targets/taranis/adc_driver.cpp @@ -30,7 +30,7 @@ const int8_t ana_direction[NUMBER_ANALOG] = {1,1,-1,-1, -1,-1,-1,1, -1,1,1,1, -1}; #elif defined(PCBX9DP) const int8_t ana_direction[NUMBER_ANALOG] = {1,-1,1,-1, -1,1,-1, -1,1, 1}; -#elif defined(PCBX7D) +#elif defined(PCBX7) const int8_t ana_direction[NUMBER_ANALOG] = {-1,1,-1,1, 1,1, 1}; #elif defined(REV4a) const int8_t ana_direction[NUMBER_ANALOG] = {1,-1,1,-1, -1,-1,0, -1,1, 1}; @@ -79,7 +79,7 @@ void adcInit() #if defined(PCBX9E) ADC1->SQR2 = (ADC_CHANNEL_POT4<<0) + (ADC_CHANNEL_SLIDER3<<5) + (ADC_CHANNEL_SLIDER4<<10) + (ADC_CHANNEL_BATT<<15); // conversions 7 and more ADC1->SQR3 = (ADC_CHANNEL_STICK_LH<<0) + (ADC_CHANNEL_STICK_LV<<5) + (ADC_CHANNEL_STICK_RV<<10) + (ADC_CHANNEL_STICK_RH<<15) + (ADC_CHANNEL_POT2<<20) + (ADC_CHANNEL_POT3<<25); // conversions 1 to 6 -#elif defined(PCBX7D) +#elif defined(PCBX7) ADC1->SQR2 = (ADC_CHANNEL_BATT<<0); // conversions 7 and more ADC1->SQR3 = (ADC_CHANNEL_STICK_LH<<0) + (ADC_CHANNEL_STICK_LV<<5) + (ADC_CHANNEL_STICK_RV<<10) + (ADC_CHANNEL_STICK_RH<<15) + (ADC_CHANNEL_POT1<<25) + (ADC_CHANNEL_POT2<<20); // conversions 1 to 6 #else diff --git a/radio/src/targets/taranis/backlight_driver.cpp b/radio/src/targets/taranis/backlight_driver.cpp index bc9b3945e..feddb269c 100644 --- a/radio/src/targets/taranis/backlight_driver.cpp +++ b/radio/src/targets/taranis/backlight_driver.cpp @@ -97,7 +97,7 @@ uint8_t isBacklightEnabled() { return (BACKLIGHT_TIMER->CCR4 != 0 || BACKLIGHT_TIMER->CCR2 != 0); } -#elif defined(PCBX7D) +#elif defined(PCBX7) void backlightInit() { GPIO_InitTypeDef GPIO_InitStructure; diff --git a/radio/src/targets/taranis/board.cpp b/radio/src/targets/taranis/board.cpp index 6f3ebab90..c4aa418b3 100644 --- a/radio/src/targets/taranis/board.cpp +++ b/radio/src/targets/taranis/board.cpp @@ -123,7 +123,7 @@ void boardInit() pwrInit(); #endif -#if defined(PCBX7D) +#if defined(PCBX7) ledInit(); ledGreen(); #endif @@ -139,7 +139,7 @@ void boardInit() i2cInit(); usbInit(); -#if defined(DEBUG) && !defined(PCBX7D) +#if defined(DEBUG) && !defined(PCBX7) serial2Init(0, 0); // default serial mode (None if DEBUG not defined) TRACE("\nTaranis board started :)"); #endif @@ -148,7 +148,7 @@ void boardInit() hapticInit(); #endif -#if defined(PCBX9E) || defined(PCBX7D) +#if defined(PCBX9E) || defined(PCBX7) bluetoothInit(BLUETOOTH_DEFAULT_BAUDRATE); #endif @@ -205,7 +205,7 @@ void boardInit() void boardOff() { -#if defined(PCBX7D) +#if defined(PCBX7) ledOff(); #endif @@ -215,7 +215,7 @@ void boardOff() toplcdOff(); #endif -#if defined(PCBX9E) || defined(PCBX7D) +#if defined(PCBX9E) || defined(PCBX7) while (pwrPressed()) { wdt_reset(); } diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h index ccdcbdcdb..a0c4b9c0b 100644 --- a/radio/src/targets/taranis/board.h +++ b/radio/src/targets/taranis/board.h @@ -262,7 +262,7 @@ enum EnumSwitchesPositions SW_SD0, SW_SD1, SW_SD2, -#if !defined(PCBX7D) +#if !defined(PCBX7) SW_SE0, SW_SE1, SW_SE2, @@ -270,7 +270,7 @@ enum EnumSwitchesPositions SW_SF0, SW_SF1, SW_SF2, -#if !defined(PCBX7D) +#if !defined(PCBX7) SW_SG0, SW_SG1, SW_SG2, @@ -311,7 +311,7 @@ enum EnumSwitchesPositions SW_SR2, #endif }; -#if defined(PCBX7D) +#if defined(PCBX7) #define NUM_SWITCHES 6 #elif defined(PCBX9E) #define NUM_SWITCHES 18 // yes, it's a lot! @@ -326,7 +326,7 @@ uint32_t readTrims(void); #define TRIMS_PRESSED() (readTrims()) #define KEYS_PRESSED() (readKeys()) -#if defined(PCBX9E) || defined(PCBX7D) +#if defined(PCBX9E) || defined(PCBX7) // Rotary Encoder driver #define ROTARY_ENCODER_NAVIGATION void checkRotaryEncoder(void); @@ -356,7 +356,7 @@ enum Analogs { POT_FIRST, POT1 = POT_FIRST, POT2, -#if defined(PCBX7D) +#if defined(PCBX7) POT_LAST = POT2, #elif defined(PCBX9E) POT3, @@ -487,7 +487,7 @@ void hapticOff(void); // Second serial port driver #define DEBUG_BAUDRATE 115200 -#if !defined(PCBX7D) +#if !defined(PCBX7) #define SERIAL2 extern uint8_t serial2Mode; void serial2Init(unsigned int mode, unsigned int protocol); @@ -516,7 +516,7 @@ void ledGreen(void); void ledBlue(void); // LCD driver -#if defined(PCBX7D) +#if defined(PCBX7) #define LCD_W 128 #define LCD_H 64 #define LCD_DEPTH 1 @@ -538,7 +538,7 @@ void lcdInitFinish(void); void lcdOff(void); // TODO lcdRefreshWait() stub in simpgmspace and remove LCD_DUAL_BUFFER -#if (defined(PCBX9E) || defined(PCBX9DP) || defined(PCBX7D)) && !defined(LCD_DUAL_BUFFER) && !defined(SIMU) +#if (defined(PCBX9E) || defined(PCBX9DP) || defined(PCBX7)) && !defined(LCD_DUAL_BUFFER) && !defined(SIMU) void lcdRefreshWait(); #else #define lcdRefreshWait() diff --git a/radio/src/targets/taranis/bootloader/boot.cpp b/radio/src/targets/taranis/bootloader/boot.cpp index 56df122f5..0a103ba8b 100644 --- a/radio/src/targets/taranis/bootloader/boot.cpp +++ b/radio/src/targets/taranis/bootloader/boot.cpp @@ -21,7 +21,7 @@ #include "opentx.h" #include "stamp.h" -#if defined(PCBX7D) +#if defined(PCBX7) #define BOOTLOADER_TITLE " X7 Bootloader - " VERSION #elif defined(PCBTARANIS) #define BOOTLOADER_TITLE " Taranis Bootloader - " VERSION @@ -29,7 +29,7 @@ #error "Not implemented" #endif -#if defined(PCBX9E) || defined(PCBX7D) +#if defined(PCBX9E) || defined(PCBX7) #define BOOT_KEY_UP KEY_MINUS #define BOOT_KEY_DOWN KEY_PLUS #else @@ -122,7 +122,7 @@ void interrupt10ms(void) ++index; } -#if defined(PCBX9E) || defined(PCBX7D) +#if defined(PCBX9E) || defined(PCBX7) checkRotaryEncoder(); static rotenc_t rePreviousValue; rotenc_t reNewValue = (rotencValue[0] / 2); @@ -613,7 +613,7 @@ int main() } if (state != ST_FLASHING && state != ST_USB) { -#if defined(PCBX9E) || defined(PCBX7D) +#if defined(PCBX9E) || defined(PCBX7) if (pwrPressed()) { #else if (pwrCheck() == e_power_off) { diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index e7fd34b56..092b4dbe5 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -22,7 +22,7 @@ #define _HAL_H_ // Keys -#if defined(PCBX7D) +#if defined(PCBX7) #define KEYS_GPIO_REG_PAGE GPIOD->IDR #define KEYS_GPIO_PIN_PAGE GPIO_Pin_3 // PD.03 #define KEYS_GPIO_REG_MENU GPIOD->IDR @@ -41,7 +41,7 @@ #if defined(PCBX9E) #define KEYS_GPIO_REG_ENTER GPIOF->IDR #define KEYS_GPIO_PIN_ENTER GPIO_Pin_0 // PF.00 -#elif defined(PCBX7D) +#elif defined(PCBX7) #define KEYS_GPIO_REG_ENTER GPIOE->IDR #define KEYS_GPIO_PIN_ENTER GPIO_Pin_10 // PE.10 #else @@ -59,7 +59,7 @@ #define ENC_GPIO_PIN_A GPIO_Pin_12 // PD.12 #define ENC_GPIO_PIN_B GPIO_Pin_13 // PD.13 #define ROTARY_ENCODER_POSITION() (ENC_GPIO->IDR >> 12) & 0x03 -#elif defined(PCBX7D) +#elif defined(PCBX7) #define ENC_GPIO GPIOE #define ENC_GPIO_PIN_A GPIO_Pin_9 // PE.09 #define ENC_GPIO_PIN_B GPIO_Pin_11 // PE.11 @@ -67,7 +67,7 @@ #endif // This is for SIMU: reuse rotary encoder pins to map UP and DOWN keyboard keys -#if defined(SIMU) && (defined(PCBX9E) || defined(PCBX7D)) +#if defined(SIMU) && (defined(PCBX9E) || defined(PCBX7)) #define KEYS_GPIO_REG_PLUS ENC_GPIO->IDR #define KEYS_GPIO_PIN_PLUS ENC_GPIO_PIN_A #define KEYS_GPIO_REG_MINUS ENC_GPIO->IDR @@ -92,7 +92,7 @@ #define TRIMS_GPIO_PIN_RVU GPIO_Pin_2 // PC.02 #define TRIMS_GPIO_REG_RHR GPIOC->IDR #define TRIMS_GPIO_PIN_RHR GPIO_Pin_13 // PC.13 -#elif defined(PCBX7D) +#elif defined(PCBX7) #define TRIMS_GPIO_REG_LHL GPIOD->IDR #define TRIMS_GPIO_PIN_LHL GPIO_Pin_15 // PD.15 #define TRIMS_GPIO_REG_LHR GPIOC->IDR @@ -134,7 +134,7 @@ #define SWITCHES_GPIO_PIN_A_H GPIO_Pin_10 // PD.10 #define SWITCHES_GPIO_REG_A_L GPIOD->IDR #define SWITCHES_GPIO_PIN_A_L GPIO_Pin_14 // PD.14 -#elif defined(PCBX7D) +#elif defined(PCBX7) #define SWITCHES_GPIO_REG_A_L GPIOE->IDR #define SWITCHES_GPIO_PIN_A_L GPIO_Pin_7 // PE.07 #define SWITCHES_GPIO_REG_A_H GPIOE->IDR @@ -151,7 +151,7 @@ #define SWITCHES_GPIO_PIN_B_H GPIO_Pin_11 // PG.11 #define SWITCHES_GPIO_REG_B_L GPIOG->IDR #define SWITCHES_GPIO_PIN_B_L GPIO_Pin_10 // PG.10 -#elif defined(PCBX7D) +#elif defined(PCBX7) #define SWITCHES_GPIO_REG_B_L GPIOE->IDR #define SWITCHES_GPIO_PIN_B_L GPIO_Pin_15 // PE.15 #define SWITCHES_GPIO_REG_B_H GPIOA->IDR @@ -168,7 +168,7 @@ #define SWITCHES_GPIO_PIN_C_H GPIO_Pin_13 // PF.13 #define SWITCHES_GPIO_REG_C_L GPIOF->IDR #define SWITCHES_GPIO_PIN_C_L GPIO_Pin_14 // PF.14 -#elif defined(PCBX7D) +#elif defined(PCBX7) #define SWITCHES_GPIO_REG_C_L GPIOD->IDR #define SWITCHES_GPIO_PIN_C_L GPIO_Pin_11 // PD.11 #define SWITCHES_GPIO_REG_C_H GPIOE->IDR @@ -190,7 +190,7 @@ #define SWITCHES_GPIO_PIN_D_H GPIO_Pin_7 // PE.07 #define SWITCHES_GPIO_REG_D_L GPIOE->IDR #define SWITCHES_GPIO_PIN_D_L GPIO_Pin_13 // PE.13 -#elif defined(PCBX7D) +#elif defined(PCBX7) #define SWITCHES_GPIO_REG_D_L GPIOE->IDR #define SWITCHES_GPIO_PIN_D_L GPIO_Pin_1 // PE.01 #define SWITCHES_GPIO_REG_D_H GPIOE->IDR @@ -207,7 +207,7 @@ #define SWITCHES_GPIO_PIN_E_H GPIO_Pin_7 // PE.07 #define SWITCHES_GPIO_REG_E_L GPIOE->IDR #define SWITCHES_GPIO_PIN_E_L GPIO_Pin_13 // PE.13 -#elif !defined(PCBX7D) +#elif !defined(PCBX7) #define SWITCHES_GPIO_REG_E_H GPIOB->IDR #define SWITCHES_GPIO_PIN_E_H GPIO_Pin_3 // PB.03 #define SWITCHES_GPIO_REG_E_L GPIOB->IDR @@ -217,7 +217,7 @@ #if defined(PCBX9E) #define SWITCHES_GPIO_REG_F GPIOE->IDR #define SWITCHES_GPIO_PIN_F GPIO_Pin_11 // PE.11 -#elif defined(PCBX7D) +#elif defined(PCBX7) #define SWITCHES_GPIO_REG_F GPIOE->IDR #define SWITCHES_GPIO_PIN_F GPIO_Pin_14 // PE.14 #else @@ -230,7 +230,7 @@ #define SWITCHES_GPIO_PIN_G_H GPIO_Pin_3 // PF.03 #define SWITCHES_GPIO_REG_G_L GPIOF->IDR #define SWITCHES_GPIO_PIN_G_L GPIO_Pin_4 // PF.04 -#elif !defined(PCBX7D) +#elif !defined(PCBX7) #define SWITCHES_GPIO_REG_G_H GPIOE->IDR #define SWITCHES_GPIO_PIN_G_H GPIO_Pin_9 // PE.09 #define SWITCHES_GPIO_REG_G_L GPIOE->IDR @@ -243,7 +243,7 @@ #elif defined(PCBX9DP) #define SWITCHES_GPIO_REG_H GPIOD->IDR #define SWITCHES_GPIO_PIN_H GPIO_Pin_14 // PD.14 -#elif defined(PCBX7D) +#elif defined(PCBX7) #define SWITCHES_GPIO_REG_H GPIOD->IDR #define SWITCHES_GPIO_PIN_H GPIO_Pin_14 // PD.14 #else @@ -310,7 +310,7 @@ #define KEYS_GPIOC_PINS (TRIMS_GPIO_PIN_RVD | TRIMS_GPIO_PIN_RVU | TRIMS_GPIO_PIN_RHL | TRIMS_GPIO_PIN_RHR) #define KEYS_GPIOD_PINS (KEYS_GPIO_PIN_MENU | KEYS_GPIO_PIN_EXIT | KEYS_GPIO_PIN_PAGE | SWITCHES_GPIO_PIN_H) #define KEYS_GPIOE_PINS (KEYS_GPIO_PIN_PLUS | KEYS_GPIO_PIN_ENTER | KEYS_GPIO_PIN_MINUS | TRIMS_GPIO_PIN_LHR | TRIMS_GPIO_PIN_LHL | TRIMS_GPIO_PIN_LVD | TRIMS_GPIO_PIN_LVU | SWITCHES_GPIO_PIN_F | SWITCHES_GPIO_PIN_A_L | SWITCHES_GPIO_PIN_B_H | SWITCHES_GPIO_PIN_B_L | SWITCHES_GPIO_PIN_C_H | SWITCHES_GPIO_PIN_D_H | SWITCHES_GPIO_PIN_D_L | SWITCHES_GPIO_PIN_G_H | SWITCHES_GPIO_PIN_G_L) -#elif defined(PCBX7D) +#elif defined(PCBX7) #define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOB|RCC_AHB1Periph_GPIOC|RCC_AHB1Periph_GPIOD|RCC_AHB1Periph_GPIOE) #define KEYS_GPIOA_PINS SWITCHES_GPIO_PIN_B_H #define KEYS_GPIOC_PINS (TRIMS_GPIO_PIN_LHR | TRIMS_GPIO_PIN_RVD | TRIMS_GPIO_PIN_RVU) @@ -335,7 +335,7 @@ #endif #define ADC_GPIO_PIN_STICK_RV GPIO_Pin_0 // PA.00 #define ADC_GPIO_PIN_STICK_RH GPIO_Pin_1 // PA.01 -#if defined(PCBX7D) +#if defined(PCBX7) #define ADC_GPIO_PIN_STICK_LV GPIO_Pin_2 // PA.02 #define ADC_GPIO_PIN_STICK_LH GPIO_Pin_3 // PA.03 #define ADC_CHANNEL_STICK_LV ADC_Channel_2 // ADC1_IN2 @@ -395,7 +395,7 @@ #define ADC_CHANNEL_SLIDER1 ADC_Channel_14 #define ADC_CHANNEL_SLIDER2 ADC_Channel_15 #define ADC_CHANNEL_BATT ADC_Channel_10 -#elif defined(PCBX7D) +#elif defined(PCBX7) #define ADC_GPIO_PIN_POT1 GPIO_Pin_6 // PA.06 #define ADC_GPIO_PIN_POT2 GPIO_Pin_0 // PB.00 #define ADC_GPIO_PIN_BATT GPIO_Pin_0 // PC.00 @@ -424,13 +424,13 @@ // PWR and LED driver #define PWR_RCC_AHB1Periph (RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD) -#if defined(PCBX9E) || defined(PCBX7D) +#if defined(PCBX9E) || defined(PCBX7) #define PWR_PRESS_BUTTON #endif #define PWR_GPIO GPIOD #define PWR_SWITCH_GPIO_PIN GPIO_Pin_1 // PD.01 #define PWR_ON_GPIO_PIN GPIO_Pin_0 // PD.00 -#if defined(PCBX7D) +#if defined(PCBX7) #define LED_GREEN_GPIO GPIOC #define LED_GREEN_GPIO_PIN GPIO_Pin_4 // PC.04 #define LED_RED_GPIO GPIOC @@ -442,7 +442,7 @@ // Internal Module #define INTMODULE_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_DMA2) #define INTMODULE_RCC_APB2Periph RCC_APB2Periph_TIM1 -#if defined(PCBX9E) || defined(PCBX9DP) || defined(PCBX7D) +#if defined(PCBX9E) || defined(PCBX9DP) || defined(PCBX7) #define INTMODULE_PWR_GPIO GPIOC #define INTMODULE_PWR_GPIO_PIN GPIO_Pin_6 // PC.06 #else @@ -506,7 +506,7 @@ #define TRAINER_TIMER_FREQ (PERI1_FREQUENCY * TIMER_MULT_APB1) // Serial Port -#if defined(PCBX7D) +#if defined(PCBX7) #define SERIAL_RCC_AHB1Periph 0 #define SERIAL_RCC_APB1Periph 0 #else @@ -596,7 +596,7 @@ #define BACKLIGHT_GPIO_PinSource_2 GPIO_PinSource13 #define BACKLIGHT_GPIO_AF_1 GPIO_AF_TIM4 #define BACKLIGHT_GPIO_AF_2 GPIO_AF_TIM4 -#elif defined(PCBX7D) +#elif defined(PCBX7) #define BACKLIGHT_RCC_AHB1Periph RCC_AHB1Periph_GPIOD #define BACKLIGHT_RCC_APB1Periph RCC_APB1Periph_TIM4 #define BACKLIGHT_RCC_APB2Periph 0 @@ -640,7 +640,7 @@ #define LCD_DMA_FLAG_INT DMA_HIFCR_CTCIF7 #define LCD_SPI SPI3 #define LCD_GPIO_AF GPIO_AF_SPI3 -#elif defined(PCBX9DP) || defined(PCBX7D) +#elif defined(PCBX9DP) || defined(PCBX7) #define LCD_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_DMA1) #define LCD_RCC_APB1Periph RCC_APB1Periph_SPI3 #define LCD_SPI_GPIO GPIOC @@ -735,7 +735,7 @@ #define AUDIO_DMA DMA1 // Haptic -#if defined(PCBX9E) || defined(PCBX9DP) || defined(PCBX7D) +#if defined(PCBX9E) || defined(PCBX9DP) || defined(PCBX7) #define HAPTIC_RCC_AHB1Periph RCC_AHB1Periph_GPIOB #define HAPTIC_RCC_APB2Periph RCC_APB2Periph_TIM10 #define HAPTIC_GPIO_PinSource GPIO_PinSource8 @@ -778,7 +778,7 @@ #define BT_BCTS_GPIO_PIN GPIO_Pin_6 // PG.06 #define BT_TX_GPIO_PinSource GPIO_PinSource14 #define BT_RX_GPIO_PinSource GPIO_PinSource9 -#elif defined(PCBX7D) +#elif defined(PCBX7) #define BT_RCC_AHB1Periph (RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOE | RCC_AHB1Periph_DMA1) #define BT_RCC_APB1Periph RCC_APB1Periph_USART3 #define BT_EN_GPIO GPIOE diff --git a/radio/src/targets/taranis/keys_driver.cpp b/radio/src/targets/taranis/keys_driver.cpp index b1c9a4296..0794419d9 100644 --- a/radio/src/targets/taranis/keys_driver.cpp +++ b/radio/src/targets/taranis/keys_driver.cpp @@ -37,7 +37,7 @@ uint32_t readKeys() if (~KEYS_GPIO_REG_EXIT & KEYS_GPIO_PIN_EXIT) result |= 1 << KEY_EXIT; -#if !defined(PCBX9E) && !defined(PCBX7D) +#if !defined(PCBX9E) && !defined(PCBX7) if (~KEYS_GPIO_REG_PLUS & KEYS_GPIO_PIN_PLUS) result |= 1 << KEY_PLUS; if (~KEYS_GPIO_REG_MINUS & KEYS_GPIO_PIN_MINUS) @@ -175,7 +175,7 @@ uint32_t switchState(uint8_t index) ADD_3POS_CASE(B, 1); ADD_3POS_CASE(C, 2); ADD_3POS_CASE(D, 3); -#if defined(PCBX7D) +#if defined(PCBX7) ADD_2POS_CASE(F); ADD_2POS_CASE(H); #else diff --git a/radio/src/targets/taranis/lcd_driver_spi.cpp b/radio/src/targets/taranis/lcd_driver_spi.cpp index 5338cd210..7a8f27a7d 100644 --- a/radio/src/targets/taranis/lcd_driver_spi.cpp +++ b/radio/src/targets/taranis/lcd_driver_spi.cpp @@ -89,7 +89,7 @@ void lcdHardwareInit() LCD_DMA->HIFCR = LCD_DMA_FLAGS; // Write ones to clear bits LDC_DMA_Stream->CR = DMA_SxCR_PL_0 | DMA_SxCR_MINC | DMA_SxCR_DIR_0; LDC_DMA_Stream->PAR = (uint32_t)&LCD_SPI->DR; -#if defined(PCBX7D) +#if defined(PCBX7) LDC_DMA_Stream->NDTR = LCD_W; #else LDC_DMA_Stream->M0AR = (uint32_t)displayBuf; @@ -100,7 +100,7 @@ void lcdHardwareInit() NVIC_EnableIRQ(LCD_DMA_Stream_IRQn); } -#if defined(PCBX7D) +#if defined(PCBX7) void lcdStart() { lcdWriteCommand(0xe2); // (14) Soft reset @@ -176,7 +176,7 @@ void lcdRefresh(bool wait) lcdInitFinish(); } -#if defined(PCBX7D) +#if defined(PCBX7) uint8_t * p = displayBuf; for (uint8_t y=0; y < 8; y++, p+=LCD_W) { lcdWriteCommand(0x10); // Column addr 0 @@ -260,7 +260,7 @@ void lcdOff() void lcdReset() { LCD_RST_LOW(); -#if defined(PCBX7D) +#if defined(PCBX7) delay_ms(150); #else delay_ms(1); // Only 3 us needed according to data-sheet, we use 1 ms @@ -328,7 +328,7 @@ void lcdSetRefVolt(uint8_t val) lcdInitFinish(); } -#if !defined(PCBX7D) +#if !defined(PCBX7) WAIT_FOR_DMA_END(); #endif diff --git a/radio/src/targets/taranis/pwr_driver.cpp b/radio/src/targets/taranis/pwr_driver.cpp index fcd274fc5..d7f58a802 100644 --- a/radio/src/targets/taranis/pwr_driver.cpp +++ b/radio/src/targets/taranis/pwr_driver.cpp @@ -66,7 +66,7 @@ void pwrOff() while (1) { wdt_reset(); #if defined(PWR_PRESS_BUTTON) - // X9E/X7D needs watchdog reset because CPU is still running while + // X9E/X7 needs watchdog reset because CPU is still running while // the power key is held pressed by the user. // The power key should be released by now, but we must make sure if (!pwrPressed()) { diff --git a/radio/src/tests/switches.cpp b/radio/src/tests/switches.cpp index 2a87f7b1d..0681d653a 100644 --- a/radio/src/tests/switches.cpp +++ b/radio/src/tests/switches.cpp @@ -191,7 +191,7 @@ TEST(evalLogicalSwitches, playFile) } #endif -#if defined(PCBTARANIS) && !defined(PCBX7D) +#if defined(PCBTARANIS) && !defined(PCBX7) TEST(getSwitch, edgeInstant) { MODEL_RESET(); diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index aed57ca60..2cae73df1 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -538,7 +538,7 @@ #elif defined(PCBX9E) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0""\310S3\0""\310S4\0""\311LS\0""\311RS\0""\311LS2""\311RS2" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0""\312SI\0""\312SJ\0""\312SK\0""\312SL\0""\312SM\0""\312SN\0""\312SO\0""\312SP\0""\312SQ\0""\312SR\0" -#elif defined(PCBX7D) +#elif defined(PCBX7) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SF\0""\312SH\0" #elif defined(PCBTARANIS) diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index a198f87d2..6655f906a 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -537,7 +537,7 @@ #elif defined(PCBX9E) #define TR_POTS_VSRCRAW "\310F1\0""\310F2\0""\310F3\0""\310F4\0""\311S1\0""\311S2\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0""\312SI\0""\312SJ\0""\312SK\0""\312SL\0""\312SM\0""\312SN\0""\312SO\0""\312SP\0""\312SQ\0""\312SR\0" -#elif defined(PCBX7D) +#elif defined(PCBX7) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SF\0""\312SH\0" #elif defined(PCBTARANIS) diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index b430fc897..0a5b4492e 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -510,7 +510,7 @@ #elif defined(PCBX9E) #define TR_POTS_VSRCRAW "\310F1\0""\310F2\0""\310F3\0""\310F4\0""\311S1\0""\311S2\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0""\312SI\0""\312SJ\0""\312SK\0""\312SL\0""\312SM\0""\312SN\0""\312SO\0""\312SP\0""\312SQ\0""\312SR\0" -#elif defined(PCBX7D) +#elif defined(PCBX7) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SF\0""\312SH\0" #elif defined(PCBTARANIS) diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 35379ea01..869cf41b7 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -515,7 +515,7 @@ #elif defined(PCBX9E) #define TR_POTS_VSRCRAW "\310F1\0""\310F2\0""\310F3\0""\310F4\0""\311S1\0""\311S2\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0""\312SI\0""\312SJ\0""\312SK\0""\312SL\0""\312SM\0""\312SN\0""\312SO\0""\312SP\0""\312SQ\0""\312SR\0" -#elif defined(PCBX7D) +#elif defined(PCBX7) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SF\0""\312SH\0" #elif defined(PCBTARANIS) diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index e42000368..65f75cd9a 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -515,7 +515,7 @@ #elif defined(PCBX9E) #define TR_POTS_VSRCRAW "\310F1\0""\310F2\0""\310F3\0""\310F4\0""\311S1\0""\311S2\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0""\312SI\0""\312SJ\0""\312SK\0""\312SL\0""\312SM\0""\312SN\0""\312SO\0""\312SP\0""\312SQ\0""\312SR\0" -#elif defined(PCBX7D) +#elif defined(PCBX7) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SF\0""\312SH\0" #elif defined(PCBTARANIS) diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index cf6bf60ad..0c932ad31 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -522,7 +522,7 @@ #elif defined(PCBX9E) #define TR_POTS_VSRCRAW "\310F1\0""\310F2\0""\310F3\0""\310F4\0""\311S1\0""\311S2\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0""\312SI\0""\312SJ\0""\312SK\0""\312SL\0""\312SM\0""\312SN\0""\312SO\0""\312SP\0""\312SQ\0""\312SR\0" -#elif defined(PCBX7D) +#elif defined(PCBX7) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SF\0""\312SH\0" #elif defined(PCBTARANIS) diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 4425aee70..598b4587e 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -522,7 +522,7 @@ #elif defined(PCBX9E) #define TR_POTS_VSRCRAW "\310F1\0""\310F2\0""\310F3\0""\310F4\0""\311S1\0""\311S2\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0""\312SI\0""\312SJ\0""\312SK\0""\312SL\0""\312SM\0""\312SN\0""\312SO\0""\312SP\0""\312SQ\0""\312SR\0" -#elif defined(PCBX7D) +#elif defined(PCBX7) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SF\0""\312SH\0" #elif defined(PCBTARANIS) diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 497399b69..8130532b0 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -506,7 +506,7 @@ #elif defined(PCBX9E) #define TR_POTS_VSRCRAW "\310F1\0""\310F2\0""\310F3\0""\310F4\0""\311S1\0""\311S2\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0""\312SI\0""\312SJ\0""\312SK\0""\312SL\0""\312SM\0""\312SN\0""\312SO\0""\312SP\0""\312SQ\0""\312SR\0" -#elif defined(PCBX7D) +#elif defined(PCBX7) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SF\0""\312SH\0" #elif defined(PCBTARANIS) diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 64ff8d928..ded71ccd0 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -524,7 +524,7 @@ #elif defined(PCBX9E) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0""\310S3\0""\310S4\0""\311LS\0""\311RS\0""\311LS2""\311RS2" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0""\312SI\0""\312SJ\0""\312SK\0""\312SL\0""\312SM\0""\312SN\0""\312SO\0""\312SP\0""\312SQ\0""\312SR\0" -#elif defined(PCBX7D) +#elif defined(PCBX7) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SF\0""\312SH\0" #elif defined(PCBTARANIS) diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index f2851ee7b..80960e5a0 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -510,7 +510,7 @@ #elif defined(PCBX9E) #define TR_POTS_VSRCRAW "\310F1\0""\310F2\0""\310F3\0""\310F4\0""\311S1\0""\311S2\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0""\312SI\0""\312SJ\0""\312SK\0""\312SL\0""\312SM\0""\312SN\0""\312SO\0""\312SP\0""\312SQ\0""\312SR\0" -#elif defined(PCBX7D) +#elif defined(PCBX7) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SF\0""\312SH\0" #elif defined(PCBTARANIS) diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 640ab7643..41f3c5def 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -529,7 +529,7 @@ #elif defined(PCBX9E) #define TR_POTS_VSRCRAW "\310F1\0""\310F2\0""\310F3\0""\310F4\0""\311S1\0""\311S2\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0""\312SI\0""\312SJ\0""\312SK\0""\312SL\0""\312SM\0""\312SN\0""\312SO\0""\312SP\0""\312SQ\0""\312SR\0" -#elif defined(PCBX7D) +#elif defined(PCBX7) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SF\0""\312SH\0" #elif defined(PCBTARANIS) diff --git a/radio/util/build-firmware.py b/radio/util/build-firmware.py index 1e496740c..4597be510 100755 --- a/radio/util/build-firmware.py +++ b/radio/util/build-firmware.py @@ -98,8 +98,8 @@ elif options[optcount] == "ar9x": maxsize = 65536 * 4 board = BOARD_SKY9X board_family = BOARD_FAMILY_ARM -elif options[optcount] == "x7d": - command_options["PCB"] = "X7D" +elif options[optcount] == "x7": + command_options["PCB"] = "X7" firmware_options = options_taranisplus maxsize = 65536 * 8 board = BOARD_TARANIS diff --git a/tools/build-companion.sh b/tools/build-companion.sh index 821929481..453272dbd 100755 --- a/tools/build-companion.sh +++ b/tools/build-companion.sh @@ -56,7 +56,7 @@ make -j${JOBS} libsimulator cmake ${COMMON_OPTIONS} -DPCB=9XRPRO ${SRCDIR} make -j${JOBS} libsimulator -cmake -DALLOW_NIGHTLY_BUILDS=YES -DVERSION_SUFFIX=$3 -DGVARS=NO -DHELI=YES -DPCB=X7D ${SRCDIR} +cmake -DALLOW_NIGHTLY_BUILDS=YES -DVERSION_SUFFIX=$3 -DGVARS=NO -DHELI=YES -DPCB=X7 ${SRCDIR} make -j${JOBS} libsimulator cmake ${STM32_OPTIONS} -DPCB=X9D ${SRCDIR} diff --git a/tools/commit-tests.sh b/tools/commit-tests.sh index c151dbffa..636699c2d 100755 --- a/tools/commit-tests.sh +++ b/tools/commit-tests.sh @@ -84,9 +84,9 @@ make -j${CORES} firmware make -j${CORES} simu make -j${CORES} gtests ; ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure -# OpenTX on X7D +# OpenTX on X7 rm -rf * -cmake ${COMMON_OPTIONS} -DPCB=X7D -DHELI=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR} +cmake ${COMMON_OPTIONS} -DPCB=X7 -DHELI=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR} make -j${CORES} firmware make -j${CORES} simu make -j${CORES} gtests ; ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure