From 9a19975fecbbd56ffe54d929afad11681f58b278 Mon Sep 17 00:00:00 2001 From: ajjjjjjjj Date: Sun, 19 Dec 2021 15:34:12 +0100 Subject: [PATCH 1/2] Fixed many reboot issues. Fixed mixer scheduler regression. Fixed and optimized lcd driver. Reduced RTOS task max count. Increased telemetry slots count. ExpressLRS V2.0 - better mimic ELRSV2.lua, fixed minor issues. Updated button and USB modes labels. Reduced FLASH and RAM usage. Renamed PCBI^ to PCBI6X to reduce confussion. Use OpenI6X branding and valid version. Code cleanup. --- .circleci/config.yml | 18 ++++---- CMakeLists.txt | 4 +- radio/src/buzzer.cpp | 24 ++--------- radio/src/buzzer.h | 11 +---- radio/src/cli.cpp | 8 ++-- radio/src/dataconstants.h | 42 +++++++++---------- radio/src/datastructs.h | 12 +++--- radio/src/debug.h | 2 +- radio/src/gui/128x64/menus.h | 10 ++--- radio/src/gui/128x64/model_setup.cpp | 30 ++++++------- radio/src/gui/128x64/popups.cpp | 2 +- radio/src/gui/128x64/radio_diagkeys.cpp | 2 +- radio/src/gui/128x64/radio_hardware.cpp | 4 +- radio/src/gui/128x64/radio_setup.cpp | 4 +- radio/src/gui/128x64/splash.cpp | 4 +- radio/src/gui/128x64/view_about.cpp | 4 +- radio/src/gui/128x64/view_channels.cpp | 2 +- radio/src/gui/128x64/view_main.cpp | 12 +++--- radio/src/gui/128x64/view_statistics.cpp | 2 +- radio/src/gui/128x64/widgets.cpp | 2 +- radio/src/gui/common/stdlcd/CMakeLists.txt | 4 +- radio/src/gui/common/stdlcd/radio_tools.cpp | 2 +- radio/src/gui/gui_common.cpp | 2 +- radio/src/gui/gui_common_arm.cpp | 8 ++-- radio/src/main.cpp | 26 ++++++------ radio/src/mixer.cpp | 2 +- radio/src/myeeprom.h | 12 +++--- radio/src/opentx.cpp | 36 +++++++--------- radio/src/opentx.h | 16 ++++--- radio/src/pulses/crossfire.cpp | 4 +- radio/src/pulses/modules.h | 10 ++--- radio/src/pulses/pulses_arm.cpp | 10 ++--- radio/src/pulses/pulses_arm.h | 2 +- radio/src/serial.cpp | 2 +- radio/src/stamp.cpp | 4 +- radio/src/storage/eeprom_conversions.cpp | 2 +- radio/src/storage/storage.h | 2 +- radio/src/switches.cpp | 8 ++-- .../targets/common/arm/stm32/adc_driver.cpp | 2 +- .../common/arm/stm32/bootloader/boot.cpp | 8 ++-- .../targets/common/arm/stm32/usb_driver.cpp | 11 +++-- .../src/targets/common/arm/stm32/usb_driver.h | 4 +- .../src/targets/common/arm/stm32/usbd_conf.h | 4 +- .../src/targets/common/arm/stm32/usbd_desc.c | 8 ++-- .../common/arm/stm32/usbd_hid_joystick.c | 6 +-- .../common/arm/stm32/usbd_storage_msd.cpp | 14 ++++--- radio/src/targets/flysky/CMakeLists.txt | 14 +++---- radio/src/targets/flysky/board.cpp | 2 +- radio/src/targets/flysky/board.h | 5 ++- .../targets/flysky/bootloader/boot_menu.cpp | 2 +- radio/src/targets/flysky/lcd_driver.cpp | 40 ++++++------------ radio/src/targets/flysky/tools/elrsV2.cpp | 40 +++++++++++------- radio/src/tasks.cpp | 6 +-- radio/src/telemetry/crossfire.cpp | 4 +- radio/src/telemetry/telemetry.cpp | 2 +- radio/src/telemetry/telemetry.h | 6 +-- radio/src/telemetry/telemetry_sensors.cpp | 4 +- radio/src/thirdparty/CoOS/OsConfig.h | 2 +- radio/src/translations.cpp | 6 +-- radio/src/translations.h | 4 +- radio/src/translations/cz.h.txt | 8 ++-- radio/src/translations/de.h.txt | 8 ++-- radio/src/translations/en.h.txt | 24 +++++------ radio/src/translations/es.h.txt | 8 ++-- radio/src/translations/fi.h.txt | 8 ++-- radio/src/translations/fr.h.txt | 8 ++-- radio/src/translations/it.h.txt | 4 +- radio/src/translations/nl.h.txt | 8 ++-- radio/src/translations/pl.h.txt | 8 ++-- radio/src/translations/pt.h.txt | 8 ++-- radio/src/translations/se.h.txt | 8 ++-- 71 files changed, 307 insertions(+), 338 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3b97d7c11ec..de818f52480 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,26 +9,26 @@ jobs: machine: true steps: - checkout - - run: docker run -it -e "BOARD_NAME=I6X" -e "CMAKE_FLAGS=PCB=I6X HELI=NO GVARS=NO LUA_COMPILER=NO MULTIMODULE=NO DEBUG=NO PCBI6_ELRSV2=YES" -v $PWD:/opentx vitass/opentx-fw-build + - run: docker run -it -e "BOARD_NAME=I6X" -e "CMAKE_FLAGS=PCB=I6X HELI=NO GVARS=NO LUA_COMPILER=NO MULTIMODULE=NO DEBUG=NO PCBI6X_ELRSV2=YES" -v $PWD:/opentx vitass/opentx-fw-build - store_artifacts: - path: opentx-i6x-2.3.0.bin - destination: opentx-i6x-elrsv2-<< pipeline.git.tag >>.bin + path: opentx-i6x-1.1.0.bin + destination: openi6x-elrsv2-<< pipeline.git.tag >>.bin build-gvars: machine: true steps: - checkout - run: docker run -it -e "BOARD_NAME=I6X" -e "CMAKE_FLAGS=PCB=I6X HELI=NO GVARS=YES LUA_COMPILER=NO MULTIMODULE=NO DEBUG=NO" -v $PWD:/opentx vitass/opentx-fw-build - store_artifacts: - path: opentx-i6x-2.3.0.bin - destination: opentx-i6x-gvars-<< pipeline.git.tag >>.bin - build-heli: + path: opentx-i6x-1.1.0.bin + destination: openi6x-gvars-<< pipeline.git.tag >>.bin + build-gvars-heli: machine: true steps: - checkout - run: docker run -it -e "BOARD_NAME=I6X" -e "CMAKE_FLAGS=PCB=I6X HELI=YES GVARS=YES LUA_COMPILER=NO MULTIMODULE=NO DEBUG=NO" -v $PWD:/opentx vitass/opentx-fw-build - store_artifacts: - path: opentx-i6x-2.3.0.bin - destination: opentx-i6x-heli-<< pipeline.git.tag >>.bin + path: opentx-i6x-1.1.0.bin + destination: openi6x-gvars-heli-<< pipeline.git.tag >>.bin publish-github-release: docker: - image: cibuilds/github:0.13 @@ -57,7 +57,7 @@ workflows: # ignore: /.*/ # tags: # only: /.*-release$/ - - build-heli + - build-gvars-heli # filters: # branches: # ignore: /.*/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 06518cbcb7f..937541bcd62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ project(OpenTX) -set(VERSION_MAJOR "2") -set(VERSION_MINOR "3") +set(VERSION_MAJOR "1") +set(VERSION_MINOR "1") set(VERSION_REVISION "0") set(VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX}) set(VERSION_FAMILY ${VERSION_MAJOR}.${VERSION_MINOR}) diff --git a/radio/src/buzzer.cpp b/radio/src/buzzer.cpp index 33c664dc686..cd5446ff0f7 100644 --- a/radio/src/buzzer.cpp +++ b/radio/src/buzzer.cpp @@ -20,30 +20,14 @@ #include "opentx.h" -void pushPrompt(uint16_t value) -{ - TRACE("pushPrompt %u", value); -} - -void pushCustomPrompt(uint8_t value) -{ - pushPrompt(PROMPT_CUSTOM_BASE + value); -} - -void pushNumberPrompt(uint8_t value) -{ - pushPrompt(PROMPT_I18N_BASE + value); -} - -void pushUnit(uint8_t unit, uint8_t idx, uint8_t id){ - TRACE("pushUnit %u", unit); -} +#define pushPrompt(value) +#define pushCustomPrompt(value) +#define pushNumberPrompt(value) void audioEvent(unsigned int index){ - TRACE("audioEvent %u", index); +// TRACE("audioEvent %u", index); } bool isPlaying(){ - TRACE("isPlaying"); return false; } diff --git a/radio/src/buzzer.h b/radio/src/buzzer.h index 6ffc806fde3..de5b697b971 100644 --- a/radio/src/buzzer.h +++ b/radio/src/buzzer.h @@ -27,13 +27,6 @@ extern void pushUnit(uint8_t unit, uint8_t idx, uint8_t id); extern bool isPlaying(); extern void audioEvent(unsigned int index); -extern uint8_t g_beepCnt; -extern uint8_t beepAgain; -extern uint8_t beepAgainOrig; -extern uint8_t beepOn; -extern bool warble; -extern bool warbleC; - #if defined(HAPTIC) extern uint8_t hapticTick; #endif /* HAPTIC */ @@ -75,8 +68,6 @@ void buzzerEvent(unsigned int index); #define AUDIO_TRAINER_LOST() buzzerEvent(AU_TRAINER_LOST) #define AUDIO_TRAINER_BACK() buzzerEvent(AU_TRAINER_BACK) -#define IS_AUDIO_BUSY() (g_beepCnt || beepAgain || beepOn) - #define AUDIO_RESET() #define AUDIO_FLUSH() @@ -99,7 +90,7 @@ void buzzerEvent(unsigned int index); #define PUSH_NUMBER_PROMPT(p) pushPrompt(PROMPT_I18N_BASE+(p)) #define PUSH_SYSTEM_PROMPT(p) pushPrompt(PROMPT_SYSTEM_BASE+(p)) #define PLAY_NUMBER(n, u, a) -#define PUSH_UNIT_PROMPT(p, i) pushUnit((p), (i), id) +#define PUSH_UNIT_PROMPT(p, i) #define PLAY_DURATION(d, att) {} #define PLAY_TIME #define IS_PLAY_TIME() (0) diff --git a/radio/src/cli.cpp b/radio/src/cli.cpp index 417675e8ece..25416fa148d 100644 --- a/radio/src/cli.cpp +++ b/radio/src/cli.cpp @@ -709,7 +709,7 @@ int cliTrace(const char ** argv) int cliStackInfo(const char ** argv) { - #if !defined(PCBI6) + #if !defined(PCBI6X) serialPrint("[MAIN] %d available / %d", stackAvailable(), stackSize() * 4); // stackSize() returns size in 32bit chunks #endif serialPrint("[MENUS] %d available / %d", menusStack.available(), menusStack.size()); @@ -792,7 +792,7 @@ const MemArea memAreas[] = { { "GPIOD", GPIOD, sizeof(GPIO_TypeDef) }, { "GPIOE", GPIOE, sizeof(GPIO_TypeDef) }, { "GPIOF", GPIOF, sizeof(GPIO_TypeDef) }, - #if !defined(PCBI6) + #if !defined(PCBI6X) { "GPIOG", GPIOG, sizeof(GPIO_TypeDef) }, #endif { "USART1", USART1, sizeof(USART_TypeDef) }, @@ -1035,7 +1035,7 @@ int cliDisplay(const char ** argv) case 2: tim = TIM2; break; -#if !defined(PCBI6) +#if !defined(PCBI6X) case 13: tim = TIM13; break; @@ -1063,7 +1063,7 @@ int cliDisplay(const char ** argv) serialPrint(" CCR4 0x%x", tim->CCR4); } } -#if !defined(PCBI6) +#if !defined(PCBI6X) else if (!strcmp(argv[1], "dma")) { serialPrint("DMA1_Stream7"); serialPrint(" CR 0x%x", DMA1_Stream7->CR); diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h index 40e9562c862..00142f98c32 100644 --- a/radio/src/dataconstants.h +++ b/radio/src/dataconstants.h @@ -69,7 +69,7 @@ #define MAX_INPUTS 32 #define MAX_TRAINER_CHANNELS 16 #define MAX_TELEMETRY_SENSORS 32 -#elif defined(PCBI6) +#elif defined(PCBI6X) #define MAX_MODELS 16 #define MAX_OUTPUT_CHANNELS 16 // number of real output channels CH1-CH16 #define MAX_FLIGHT_MODES 5 @@ -79,12 +79,12 @@ #define MAX_SPECIAL_FUNCTIONS 11 // number of functions assigned to switches #define MAX_TRAINER_CHANNELS 8 #define MAX_INPUTS 16 -#if defined(PCBI6_ELRSV2) - #define MAX_TELEMETRY_SENSORS 22 +#if defined(PCBI6X_ELRSV2) + #define MAX_TELEMETRY_SENSORS 24 // 48b each #else - #define MAX_TELEMETRY_SENSORS 28 + #define MAX_TELEMETRY_SENSORS 30 #endif - #define MAX_SCRIPTS 0 + #define MAX_SCRIPTS 0 #else #define MAX_MODELS 16 #define MAX_OUTPUT_CHANNELS 16 // number of real output channels CH1-CH16 @@ -149,7 +149,7 @@ enum CurveType { #define MAX_CURVE_POINTS 512 #endif -#if defined(PCBTARANIS) || defined(PCBSKY9X) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBSKY9X) || defined(PCBHORUS) || defined(PCBI6X) #define NUM_MODULES 2 #else #define NUM_MODULES 1 @@ -203,7 +203,7 @@ enum BeeperMode { e_mode_all }; -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) enum ModuleIndex { INTERNAL_MODULE, EXTERNAL_MODULE, @@ -239,7 +239,7 @@ enum BeeperMode { #define TRAINER_MODE_MAX() HAS_WIRELESS_TRAINER_HARDWARE() ? TRAINER_MODE_MASTER_BATTERY_COMPARTMENT : TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE #endif -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) #define IS_INTERNAL_MODULE_ENABLED() (g_model.moduleData[INTERNAL_MODULE].type != MODULE_TYPE_NONE) #elif defined(PCBSKY9X) #define IS_INTERNAL_MODULE_ENABLED() (false) @@ -376,7 +376,7 @@ enum SwitchSources { SWSRC_FIRST_SWITCH, -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) SWSRC_SA0 = SWSRC_FIRST_SWITCH, SWSRC_SA1, SWSRC_SA2, @@ -389,22 +389,22 @@ enum SwitchSources { SWSRC_SD0, SWSRC_SD1, SWSRC_SD2, -#if !defined(PCBX7) && !defined(PCBXLITE) && !defined(PCBI6) +#if !defined(PCBX7) && !defined(PCBXLITE) && !defined(PCBI6X) SWSRC_SE0, SWSRC_SE1, SWSRC_SE2, #endif -#if !defined(PCBXLITE) && !defined(PCBI6) +#if !defined(PCBXLITE) && !defined(PCBI6X) SWSRC_SF0, SWSRC_SF1, SWSRC_SF2, #endif -#if !defined(PCBX7) && !defined(PCBXLITE) && !defined(PCBI6) +#if !defined(PCBX7) && !defined(PCBXLITE) && !defined(PCBI6X) SWSRC_SG0, SWSRC_SG1, SWSRC_SG2, #endif -#if !defined(PCBXLITE) && !defined(PCBI6) +#if !defined(PCBXLITE) && !defined(PCBI6X) SWSRC_SH0, SWSRC_SH1, SWSRC_SH2, @@ -444,7 +444,7 @@ enum SwitchSources { #if defined(PCBX9E) SWSRC_TRAINER = SWSRC_SH2, SWSRC_LAST_SWITCH = SWSRC_SR2, -#elif defined(PCBXLITE) || defined(PCBI6) +#elif defined(PCBXLITE) || defined(PCBI6X) SWSRC_TRAINER = SWSRC_SD2, SWSRC_LAST_SWITCH = SWSRC_SD2, #else @@ -574,7 +574,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(PCBX7) || defined(PCBXLITE) || defined(PCBI6) +#elif defined(PCBX7) || defined(PCBXLITE) || defined(PCBI6X) MIXSRC_POT1 = MIXSRC_FIRST_POT, LUA_EXPORT("s1", "Potentiometer 1") MIXSRC_POT2, LUA_EXPORT("s2", "Potentiometer 2") MIXSRC_LAST_POT = MIXSRC_POT2, @@ -625,7 +625,7 @@ enum MixSources { MIXSRC_FIRST_SWITCH, -#if defined(PCBXLITE) || defined(PCBI6) +#if defined(PCBXLITE) || defined(PCBI6X) MIXSRC_SA = MIXSRC_FIRST_SWITCH, LUA_EXPORT("sa", "Switch A") MIXSRC_SB, LUA_EXPORT("sb", "Switch B") MIXSRC_SC, LUA_EXPORT("sc", "Switch C") @@ -749,16 +749,16 @@ enum Functions { // then the other functions FUNC_FIRST_WITHOUT_ENABLE, FUNC_PLAY_SOUND = FUNC_FIRST_WITHOUT_ENABLE, - // FUNC_PLAY_TRACK, - // FUNC_PLAY_VALUE, + FUNC_PLAY_TRACK, + FUNC_PLAY_VALUE, FUNC_RESERVE4, FUNC_PLAY_SCRIPT, FUNC_RESERVE5, - // FUNC_BACKGND_MUSIC, - // FUNC_BACKGND_MUSIC_PAUSE, + FUNC_BACKGND_MUSIC, + FUNC_BACKGND_MUSIC_PAUSE, FUNC_VARIO, FUNC_HAPTIC, - // FUNC_LOGS, + FUNC_LOGS, FUNC_BACKLIGHT, #if defined(PCBTARANIS) FUNC_SCREENSHOT, diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h index 49b1a17d8a1..d9549925312 100644 --- a/radio/src/datastructs.h +++ b/radio/src/datastructs.h @@ -413,7 +413,7 @@ PACK(struct ModuleData { uint8_t failsafeMode : 4; // only 3 bits used uint8_t subType : 3; uint8_t invertedSerial : 1; // telemetry serial inverted from standard -#if defined(PCBI6) +#if defined(PCBI6X) uint8_t rxID[4]; uint16_t servoFreq; #endif @@ -492,7 +492,7 @@ typedef uint32_t swarnenable_t; typedef uint16_t swconfig_t; typedef uint16_t swarnstate_t; typedef uint8_t swarnenable_t; -#elif defined(PCBI6) +#elif defined(PCBI6X) typedef uint8_t swconfig_t; typedef uint8_t swarnstate_t; typedef uint8_t swarnenable_t; @@ -566,7 +566,7 @@ PACK(struct CustomScreenData { char inputNames[MAX_INPUTS][LEN_INPUT_NAME]; \ uint8_t potsWarnEnabled; \ int8_t potsWarnPosition[NUM_POTS + NUM_SLIDERS]; -#elif defined(PCBI6) +#elif defined(PCBI6X) #define MODELDATA_EXTRA \ NOBACKUP(uint8_t spare : 3); \ NOBACKUP(uint8_t trainerMode : 3); \ @@ -701,7 +701,7 @@ PACK(struct TrainerData { NOBACKUP(uint8_t spare : 1); \ NOBACKUP(uint8_t blOffBright : 7); \ NOBACKUP(char bluetoothName[LEN_BLUETOOTH_NAME]); -#elif defined(PCBTARANIS) || defined(PCBI6) +#elif defined(PCBTARANIS) || defined(PCBI6X) #if defined(BLUETOOTH) #define BLUETOOTH_FIELDS \ uint8_t spare; \ @@ -887,7 +887,7 @@ static inline void check_struct() { CHKSIZE(FrSkyTelemetryData, 88); CHKSIZE(ModelHeader, 12); CHKTYPE(CurveData, 4); -#elif defined(PCBI6) +#elif defined(PCBI6X) CHKSIZE(LimitData, 11); CHKSIZE(MixData, 20); CHKSIZE(ExpoData, 17); @@ -924,7 +924,7 @@ static inline void check_struct() { CHKSIZE(LogicalSwitchData, 9); CHKSIZE(TelemetrySensor, 14); -#if defined(PCBI6) +#if defined(PCBI6X) CHKSIZE(ModuleData, 44); #else CHKSIZE(ModuleData, 70); diff --git a/radio/src/debug.h b/radio/src/debug.h index 33c74fdea42..8d8cc1a42c9 100644 --- a/radio/src/debug.h +++ b/radio/src/debug.h @@ -248,7 +248,7 @@ enum InterruptNames { #endif // #if defined(DEBUG_USB_INTERRUPTS) INT_LAST }; -#elif defined(PCBTARANIS) || defined(PCBI6) +#elif defined(PCBTARANIS) || defined(PCBI6X) enum InterruptNames { INT_TICK, INT_5MS, diff --git a/radio/src/gui/128x64/menus.h b/radio/src/gui/128x64/menus.h index 95ea1211198..3a812e9c8b9 100644 --- a/radio/src/gui/128x64/menus.h +++ b/radio/src/gui/128x64/menus.h @@ -70,7 +70,7 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF enum MenuRadioIndexes { -#if defined(PCBI6_ELRSV2) +#if defined(PCBI6X_ELRSV2) MENU_RADIO_TOOLS, #endif MENU_RADIO_SETUP, @@ -81,7 +81,7 @@ enum MenuRadioIndexes #if defined(MENU_DIAGKEYS) MENU_RADIO_SWITCHES_TEST, #endif -#if defined(MENU_ANALOGS) +#if defined(MENU_DIAGANAS) MENU_RADIO_ANALOGS_TEST, #endif MENU_RADIO_HARDWARE, @@ -89,7 +89,7 @@ enum MenuRadioIndexes MENU_RADIO_PAGES_COUNT }; -#if defined(PCBI6_ELRSV2) +#if defined(PCBI6X_ELRSV2) void menuRadioTools(event_t event); #endif void menuRadioSetup(event_t event); @@ -103,7 +103,7 @@ void menuRadioHardware(event_t event); void menuRadioCalibration(event_t event); static const MenuHandlerFunc menuTabGeneral[] = { -#if defined(PCBI6_ELRSV2) +#if defined(PCBI6X_ELRSV2) menuRadioTools, #endif menuRadioSetup, @@ -181,7 +181,7 @@ static const MenuHandlerFunc menuTabModel[] = { void menuStatisticsView(event_t event); void menuStatisticsDebug(event_t event); void menuStatisticsDebug2(event_t event); -#if !defined(PCBI6) +#if !defined(PCBI6X) void menuAboutView(event_t event); #endif #endif // _MENUS_H_ diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 2b2003c1fd9..aaf944964d6 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -23,7 +23,7 @@ uint8_t g_moduleIdx; void menuModelFailsafe(event_t event); -#if defined(PCBTARANIS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBI6X) uint8_t getSwitchWarningsCount() { int count = 0; @@ -70,10 +70,10 @@ enum MenuModelSetupItems { #endif ITEM_MODEL_BEEP_CENTER, ITEM_MODEL_USE_GLOBAL_FUNCTIONS, -#if defined(PCBTARANIS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBI6X) ITEM_MODEL_INTERNAL_MODULE_LABEL, ITEM_MODEL_INTERNAL_MODULE_MODE, - #if defined(PCBI6) + #if defined(PCBI6X) ITEM_MODEL_INTERNAL_MODULE_SUBTYPE, ITEM_MODEL_INTERNAL_MODULE_SERVOFREQ, #else @@ -140,7 +140,7 @@ enum MenuModelSetupItems { #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) -#elif defined(PCBI6) +#elif defined(PCBI6X) #define CURRENT_MODULE_EDITED(k) (k>=ITEM_MODEL_EXTERNAL_MODULE_LABEL ? EXTERNAL_MODULE : INTERNAL_MODULE) #else #define CURRENT_MODULE_EDITED(k) (EXTERNAL_MODULE) @@ -151,7 +151,7 @@ enum MenuModelSetupItems { #else #define SW_WARN_ROWS uint8_t(NAVIGATION_LINE_BY_LINE|(getSwitchWarningsCount()-1)), uint8_t(getSwitchWarningsCount() > 5 ? TITLE_ROW : HIDDEN_ROW) #endif -#if !defined(TARANIS_INTERNAL_PPM) && !defined(PCBI6) +#if !defined(TARANIS_INTERNAL_PPM) && !defined(PCBI6X) #define INTERNAL_MODULE_MODE_ROWS 0 // (OFF / RF protocols) #else #define INTERNAL_MODULE_MODE_ROWS (isModuleXJT(INTERNAL_MODULE)||isModuleA7105(INTERNAL_MODULE) ? (uint8_t)1 : (uint8_t)0) // Module type + RF protocols @@ -329,10 +329,10 @@ void menuModelSetup(event_t event) 0, LABEL(InternalModule), INTERNAL_MODULE_MODE_ROWS, -#if !defined(PCBI6) +#if !defined(PCBI6X) INTERNAL_MODULE_CHANNELS_ROWS, #endif -#if defined(PCBI6) +#if defined(PCBI6X) IF_INTERNAL_MODULE_ON(1), // Subtype IF_INTERNAL_MODULE_ON(1), // Servo Freq #endif @@ -747,7 +747,7 @@ void menuModelSetup(event_t event) if (attr) g_model.noGlobalFunctions = !checkIncDecModel(event, !g_model.noGlobalFunctions, 0, 1); break; -#if defined(PCBTARANIS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBI6X) case ITEM_MODEL_INTERNAL_MODULE_LABEL: lcdDrawTextAlignedLeft(y, TR_INTERNALRF); break; @@ -768,7 +768,7 @@ void menuModelSetup(event_t event) } break; #endif -#if defined(PCBI6) +#if defined(PCBI6X) case ITEM_MODEL_INTERNAL_MODULE_MODE: lcdDrawTextAlignedLeft(y, STR_MODE); lcdDrawTextAtIndex( @@ -857,7 +857,7 @@ void menuModelSetup(event_t event) event, g_model.moduleData[EXTERNAL_MODULE].type, MODULE_TYPE_NONE, - #if defined(PCBI6) + #if defined(PCBI6X) IS_TRAINER_EXTERNAL_MODULE() ? MODULE_TYPE_NONE : MODULE_TYPE_COUNT-2, // exclude AFHDS2A #else IS_TRAINER_EXTERNAL_MODULE() ? MODULE_TYPE_NONE : MODULE_TYPE_COUNT-1, @@ -1056,7 +1056,7 @@ void menuModelSetup(event_t event) #if defined(PCBX7) case ITEM_MODEL_TRAINER_PARAMS: #endif -#if defined(PCBTARANIS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBI6X) case ITEM_MODEL_INTERNAL_MODULE_BIND: #endif #if defined(PCBSKY9X) @@ -1133,7 +1133,7 @@ void menuModelSetup(event_t event) } } lcdDrawText(MODEL_SETUP_2ND_COLUMN+xOffsetBind, y, STR_MODULE_BIND, l_posHorz==1 ? attr : 0); -#if defined(PCBTARANIS) || defined(DSM2) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(DSM2) || defined(PCBI6X) lcdDrawText(MODEL_SETUP_2ND_COLUMN+MODEL_SETUP_RANGE_OFS+xOffsetBind, y, STR_MODULE_RANGE, l_posHorz==2 ? attr : 0); #endif uint8_t newFlag = 0; @@ -1227,7 +1227,7 @@ void menuModelSetup(event_t event) } #endif -#if defined(PCBTARANIS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBI6X) case ITEM_MODEL_INTERNAL_MODULE_FAILSAFE: #endif case ITEM_MODEL_EXTERNAL_MODULE_FAILSAFE: { @@ -1442,7 +1442,7 @@ void menuModelSetup(event_t event) } } -#if defined(PXX) || defined(PCBI6) +#if defined(PXX) || defined(PCBI6X) if (IS_RANGECHECK_ENABLE()) { showMessageBox("RSSI: "); lcdDrawNumber(16+4*FW, 5*FH, TELEMETRY_RSSI(), BOLD); @@ -1452,7 +1452,7 @@ void menuModelSetup(event_t event) // some field just finished being edited if (old_editMode > 0 && s_editMode == 0) { switch(menuVerticalPosition) { -#if defined(PCBTARANIS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBI6X) case ITEM_MODEL_INTERNAL_MODULE_BIND: if (menuHorizontalPosition == 0) checkModelIdUnique(g_eeGeneral.currModel, INTERNAL_MODULE); diff --git a/radio/src/gui/128x64/popups.cpp b/radio/src/gui/128x64/popups.cpp index d5abe7a875a..c4de2a03bda 100644 --- a/radio/src/gui/128x64/popups.cpp +++ b/radio/src/gui/128x64/popups.cpp @@ -54,7 +54,7 @@ const unsigned char ASTERISK_BITMAP[] = { void drawAlertBox(const char * title, const char * text, const char * action) { lcdClear(); -#if !defined(PCBI6)// || !defined(DEBUG) +#if !defined(PCBI6X) lcdDraw1bitBitmap(2, 0, ASTERISK_BITMAP, 0, 0); #else lcdDrawRect(2, 2, 32 - 4, 32 - 4); diff --git a/radio/src/gui/128x64/radio_diagkeys.cpp b/radio/src/gui/128x64/radio_diagkeys.cpp index 7ba1555930d..84ba89bec5f 100644 --- a/radio/src/gui/128x64/radio_diagkeys.cpp +++ b/radio/src/gui/128x64/radio_diagkeys.cpp @@ -69,7 +69,7 @@ void menuRadioDiagKeys(event_t event) #endif } -#if defined(PCBTARANIS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBI6X) if (i < NUM_SWITCHES) { if (SWITCH_EXISTS(i)) { getvalue_t val = getValue(MIXSRC_FIRST_SWITCH+i); diff --git a/radio/src/gui/128x64/radio_hardware.cpp b/radio/src/gui/128x64/radio_hardware.cpp index 01acf4fdabd..91f33a9e10b 100644 --- a/radio/src/gui/128x64/radio_hardware.cpp +++ b/radio/src/gui/128x64/radio_hardware.cpp @@ -94,7 +94,7 @@ void menuRadioHardware(event_t event) } #endif // PCBSKY9X -#if defined(PCBTARANIS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBI6X) enum MenuRadioHardwareItems { ITEM_RADIO_HARDWARE_LABEL_STICKS, ITEM_RADIO_HARDWARE_STICK1, @@ -142,7 +142,7 @@ enum MenuRadioHardwareItems { #endif #if defined(PCBXLITE) #define SWITCH_TYPE_MAX(sw) (SWITCH_3POS) -#elif defined(PCBI6) +#elif defined(PCBI6X) #define SWITCH_TYPE_MAX(sw) ((MIXSRC_SC-MIXSRC_FIRST_SWITCH == sw) ? SWITCH_3POS : SWITCH_2POS) #else #define SWITCH_TYPE_MAX(sw) ((MIXSRC_SF-MIXSRC_FIRST_SWITCH == sw || MIXSRC_SH-MIXSRC_FIRST_SWITCH == sw) ? SWITCH_2POS : SWITCH_3POS) diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp index dae1126fe46..acff72fd7a1 100644 --- a/radio/src/gui/128x64/radio_setup.cpp +++ b/radio/src/gui/128x64/radio_setup.cpp @@ -96,7 +96,7 @@ enum MenuRadioSetupItems { // ITEM_SETUP_IMPERIAL, IF_FAI_CHOICE(ITEM_SETUP_FAI) ITEM_SETUP_SWITCHES_DELAY, -#if defined(PCBI6) +#if defined(PCBI6X) ITEM_SETUP_USB_ENABLE, #endif CASE_STM32(ITEM_SETUP_USB_MODE) @@ -533,7 +533,7 @@ void menuRadioSetup(event_t event) lcdDrawText(lcdLastRightPos, y, STR_MS, attr); if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.switchesDelay, -15, 100-15); break; -#if defined(PCBI6) +#if defined(PCBI6X) case ITEM_SETUP_USB_ENABLE: globalData.usbDetect = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_USBDETECT, STR_USBDETECTMODES, globalData.usbDetect, USB_DETECT_AUTO, USB_MAX_DETECT, attr, event); break; diff --git a/radio/src/gui/128x64/splash.cpp b/radio/src/gui/128x64/splash.cpp index 98f3eb5ac2d..75b7a2876b6 100644 --- a/radio/src/gui/128x64/splash.cpp +++ b/radio/src/gui/128x64/splash.cpp @@ -23,7 +23,7 @@ #if defined(SPLASH) const unsigned char splashdata[] = { 'S','P','S',0, -#if defined(PCBI6) +#if defined(PCBI6X) #include "bitmaps/128x64/splash_i6x_trim.lbm" #else #include "bitmaps/128x64/splash.lbm" @@ -35,7 +35,7 @@ const unsigned char * const splash_lbm = splashdata+4; void drawSplash() { lcdClear(); -#if defined(PCBI6) +#if defined(PCBI6X) lcdDrawSolidFilledRect(0, 0, LCD_W, LCD_H); lcdDraw1bitBitmap(8, 16, splash_lbm, 0, 0); #else diff --git a/radio/src/gui/128x64/view_about.cpp b/radio/src/gui/128x64/view_about.cpp index 7cf924b315c..3ced159d2b4 100644 --- a/radio/src/gui/128x64/view_about.cpp +++ b/radio/src/gui/128x64/view_about.cpp @@ -20,7 +20,7 @@ #include "opentx.h" -#if !defined(PCBI6) +#if !defined(PCBI6X) const unsigned char about_bmp[] = { #include "about.lbm" }; @@ -52,7 +52,7 @@ enum AboutScreens { #define EVT_KEY_NEXT_VIEW EVT_KEY_FIRST(KEY_DOWN) #endif -#if !defined(PCBI6) +#if !defined(PCBI6X) void menuAboutView(event_t event) { static uint8_t screenIndex; diff --git a/radio/src/gui/128x64/view_channels.cpp b/radio/src/gui/128x64/view_channels.cpp index 407139e5be1..45dd348e086 100644 --- a/radio/src/gui/128x64/view_channels.cpp +++ b/radio/src/gui/128x64/view_channels.cpp @@ -35,7 +35,7 @@ void menuChannelsView(event_t event) popMenu(); break; -#if defined(PCBI6) +#if defined(PCBI6X) case EVT_KEY_FIRST(KEY_UP): case EVT_KEY_FIRST(KEY_DOWN): #else diff --git a/radio/src/gui/128x64/view_main.cpp b/radio/src/gui/128x64/view_main.cpp index 0610966b162..c1ebcc5ca79 100644 --- a/radio/src/gui/128x64/view_main.cpp +++ b/radio/src/gui/128x64/view_main.cpp @@ -50,7 +50,7 @@ #if defined(TELEMETRY_FRSKY) #define RSSSI_X (30) #define RSSSI_Y (31) -#if defined(PCBI6) +#if defined(PCBI6X) #define RSSI_MAX 100 #else #define RSSI_MAX 105 @@ -255,7 +255,7 @@ void displayVoltageOrAlarm() #define EVT_KEY_NEXT_VIEW EVT_KEY_BREAK(KEY_DOWN) #define EVT_KEY_NEXT_PAGE EVT_KEY_BREAK(KEY_RIGHT) #define EVT_KEY_PREVIOUS_PAGE EVT_KEY_BREAK(KEY_LEFT) - #if defined(PCBI6) + #if defined(PCBI6X) #define EVT_KEY_GENERAL_MENU EVT_KEY_LONG(KEY_RIGHT) #define EVT_KEY_MODEL_MENU EVT_KEY_LONG(KEY_MENU) #else @@ -281,7 +281,7 @@ void onMainViewMenu(const char *result) timerReset(2); } #endif -#if !defined(PCBI6) +#if !defined(PCBI6X) else if (result == STR_VIEW_NOTES) { pushModelNotes(); } @@ -306,7 +306,7 @@ void onMainViewMenu(const char *result) else if (result == STR_STATISTICS) { chainMenu(menuStatisticsView); } -#if !defined(PCBI6) +#if !defined(PCBI6X) else if (result == STR_ABOUT_US) { chainMenu(menuAboutView); } @@ -361,7 +361,7 @@ void menuMainView(event_t event) POPUP_MENU_ADD_ITEM(STR_RESET_SUBMENU); POPUP_MENU_ADD_ITEM(STR_STATISTICS); -#if !defined(PCBI6) +#if !defined(PCBI6X) POPUP_MENU_ADD_ITEM(STR_ABOUT_US); #endif POPUP_MENU_START(onMainViewMenu); @@ -520,7 +520,7 @@ void menuMainView(event_t event) doMainScreenGraphics(); // Switches -#if defined(PCBTARANIS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBI6X) for (int i=0; i= SWSRC_FIRST_SWITCH && swtch <= SWSRC_LAST_SWITCH) { UNUSED(negative); return true; @@ -465,7 +465,7 @@ bool isR9MModeAvailable(int mode) { #endif } -#if defined(PCBI6) +#if defined(PCBI6X) bool isSubtypeAvailable(int i){ return true; } @@ -481,7 +481,7 @@ bool isModuleAvailable(int module) { return false; } #endif -#if !defined(PCBI6) +#if !defined(PCBI6X) #if !defined(DSM2) if (module == MODULE_TYPE_DSM2) { return false; @@ -520,7 +520,7 @@ bool isTelemetryProtocolAvailable(int protocol) { if (protocol == PROTOCOL_PULSES_CROSSFIRE) { return false; } -#if defined(PCBI6) +#if defined(PCBI6X) if (protocol == PROTOCOL_FLYSKY_IBUS) { return true; } diff --git a/radio/src/main.cpp b/radio/src/main.cpp index 5c699bd6014..8b2c0acc576 100644 --- a/radio/src/main.cpp +++ b/radio/src/main.cpp @@ -24,7 +24,8 @@ uint8_t currentSpeakerVolume = 255; uint8_t requiredSpeakerVolume = 255; uint8_t mainRequestFlags = 0; -#if !defined(LUA) && defined(PCBI6_ELRSV2) +#if !defined(LUA) && defined(PCBI6X_ELRSV2) +extern void ELRSV2_stop(); uint8_t cScriptRunning = 0; #endif @@ -35,8 +36,8 @@ void onUSBConnectMenu(const char *result) if (result == STR_USB_MASS_STORAGE) { setSelectedUsbMode(USB_MASS_STORAGE_MODE); } - else -#endif + else +#endif if (result == STR_USB_JOYSTICK) { setSelectedUsbMode(USB_JOYSTICK_MODE); } @@ -50,13 +51,12 @@ void onUSBConnectMenu(const char *result) void handleUsbConnection() { -#if defined(STM32) && !defined(SIMU)// && !defined(STM32F0) +#if defined(STM32) && !defined(SIMU) if (!usbStarted() && usbPlugged() && !(getSelectedUsbMode() == USB_UNSELECTED_MODE)) { usbStart(); -#if !defined(PCBI6) || defined(PCBI6_USB_MSD) +#if !defined(PCBI6X) || defined(PCBI6X_USB_MSD) if (getSelectedUsbMode() == USB_MASS_STORAGE_MODE) { -#if defined(PCBI6_ELRSV2) - extern void ELRSV2_stop(); +#if defined(PCBI6X_ELRSV2) ELRSV2_stop(); #endif opentxClose(false); @@ -67,10 +67,10 @@ void handleUsbConnection() if (!usbStarted() && usbPlugged() && getSelectedUsbMode() == USB_UNSELECTED_MODE) { if((g_eeGeneral.USBMode == USB_UNSELECTED_MODE) && (popupMenuNoItems == 0)) { POPUP_MENU_ADD_ITEM(STR_USB_JOYSTICK); -#if !defined(PCBI6) || defined(PCBI6_USB_MSD) +#if !defined(PCBI6X) || defined(PCBI6X_USB_MSD) POPUP_MENU_ADD_ITEM(STR_USB_MASS_STORAGE); #endif -#if defined(DEBUG) && !defined(PCBI6) +#if defined(DEBUG) && !defined(PCBI6X) POPUP_MENU_ADD_ITEM(STR_USB_SERIAL); #endif POPUP_MENU_START(onUSBConnectMenu); @@ -81,7 +81,7 @@ void handleUsbConnection() } if (usbStarted() && !usbPlugged()) { usbStop(); -#if !defined(PCBI6) || defined(PCBI6_USB_MSD) +#if !defined(PCBI6X) || defined(PCBI6X_USB_MSD) if (getSelectedUsbMode() == USB_MASS_STORAGE_MODE) { opentxResume(); } @@ -133,7 +133,7 @@ void checkEeprom() void checkBatteryAlarms() { // TRACE("checkBatteryAlarms()"); -#if defined(PCBI6) +#if defined(PCBI6X) if (IS_TXBATT_WARNING()) { #else if (IS_TXBATT_WARNING() && g_vbat100mV>50) { @@ -345,7 +345,7 @@ void handleGui(event_t event) { // todo drawStatusLine(); here??? } else -#elif defined(PCBI6_ELRSV2) +#elif defined(PCBI6X_ELRSV2) if (cScriptRunning == 1) { // standalone c script is active menuHandlers[menuLevel](event); @@ -461,7 +461,7 @@ void perMain() } #endif -#if defined(STM32) +#if defined(STM32) && defined(SDCARD) bool sdcardPresent = SD_CARD_PRESENT(); if (sdcardPresent && !globalData.sdcardPresent) { sdMount(); diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp index 598a6992d33..b553678f966 100644 --- a/radio/src/mixer.cpp +++ b/radio/src/mixer.cpp @@ -343,7 +343,7 @@ getvalue_t getValue(mixsrc_t i) return calc1000toRESX((int16_t)8 * getTrimValue(mixerCurrentFlightMode, i-MIXSRC_FIRST_TRIM)); } -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) else if ((i >= MIXSRC_FIRST_SWITCH) && (i <= MIXSRC_LAST_SWITCH)) { mixsrc_t sw = i-MIXSRC_FIRST_SWITCH; if (SWITCH_EXISTS(sw)) { diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index 7c7bcc26229..2e393840ba8 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -91,7 +91,7 @@ #define MODEL_GVAR_MIN(idx) (CFN_GVAR_CST_MIN + g_model.gvars[idx].min) #define MODEL_GVAR_MAX(idx) (CFN_GVAR_CST_MAX - g_model.gvars[idx].max) -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) enum SwitchConfig { SWITCH_NONE, SWITCH_TOGGLE, @@ -343,7 +343,7 @@ enum Protocols { #if defined(PXX2) PROTO_PXX2, #endif -#if defined(PCBI6) +#if defined(PCBI6X) PROTO_AFHDS2A_SPI, #endif PROTO_NONE @@ -448,7 +448,7 @@ enum MMRFrskySubtypes { }; #define HAS_RF_PROTOCOL_FAILSAFE(rf) ((rf) == RF_PROTO_X16) -#if defined(PCBI6) +#if defined(PCBI6X) #define HAS_RF_PROTOCOL_MODELINDEX(rf) (1) #else #define HAS_RF_PROTOCOL_MODELINDEX(rf) (((rf) == RF_PROTO_X16) || ((rf) == RF_PROTO_LR12)) @@ -463,12 +463,12 @@ enum DSM2Protocols { enum ModuleTypes { MODULE_TYPE_NONE = 0, MODULE_TYPE_PPM, -#if !defined(PCBI6) +#if !defined(PCBI6X) MODULE_TYPE_XJT, MODULE_TYPE_DSM2, #endif MODULE_TYPE_CROSSFIRE, -#if !defined(PCBI6) +#if !defined(PCBI6X) MODULE_TYPE_MULTIMODULE, MODULE_TYPE_R9M, MODULE_TYPE_SBUS, @@ -477,7 +477,7 @@ enum ModuleTypes { MODULE_TYPE_COUNT }; -#if defined(PCBI6) +#if defined(PCBI6X) enum AFHDS2A_Subtype { AFHDS2A_SUBTYPE_FIRST, AFHDS2A_SUBTYPE_PWM_IBUS = AFHDS2A_SUBTYPE_FIRST, diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index e678d085832..457ac05d767 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -41,7 +41,7 @@ safetych_t safetyCh[MAX_OUTPUT_CHANNELS]; // __DMA for the MSC_BOT_Data member union ReusableBuffer reusableBuffer __DMA; -#if defined(STM32) && (!defined(PCBI6) || defined(PCBI6_USB_MSD)) +#if defined(STM32) && (!defined(PCBI6X) || defined(PCBI6X_USB_MSD)) uint8_t *MSC_BOT_Data = reusableBuffer.MSC_BOT_Data; #endif @@ -241,7 +241,7 @@ void generalDefault() { #endif g_eeGeneral.slidersConfig = 0x0f; // 4 sliders g_eeGeneral.blOffBright = 20; -#elif defined(PCBXLITE) || defined(PCBI6) +#elif defined(PCBXLITE) || defined(PCBI6X) g_eeGeneral.potsConfig = 0x0F; // S1 and S2 = pot without detent #elif defined(PCBX7) g_eeGeneral.potsConfig = 0x07; // S1 = pot without detent, S2 = pot with detent @@ -252,7 +252,7 @@ void generalDefault() { #if defined(PCBXLITE) g_eeGeneral.switchConfig = (SWITCH_2POS << 6) + (SWITCH_2POS << 4) + (SWITCH_3POS << 2) + (SWITCH_3POS << 0); // 2x3POS, 2x2POS -#elif defined(PCBI6) +#elif defined(PCBI6X) g_eeGeneral.switchConfig = (SWITCH_2POS << 6) + (SWITCH_3POS << 4) + (SWITCH_2POS << 2) + (SWITCH_2POS << 0); #elif defined(PCBX7) g_eeGeneral.switchConfig = 0x000006ff; // 4x3POS, 1x2POS, 1xTOGGLE @@ -303,7 +303,7 @@ void generalDefault() { strcpy(g_eeGeneral.themeName, theme->getName()); theme->init(); #endif -#if defined(PCBI6) +#if defined(PCBI6X) for (uint8_t i = 0; i < NUM_CALIBRATED_ANALOGS; ++i) { g_eeGeneral.calib[i].mid = 0x400; g_eeGeneral.calib[i].spanNeg = 0x300; @@ -464,7 +464,7 @@ void modelDefault(uint8_t id) { g_model.moduleData[INTERNAL_MODULE].channelsCount = defaultModuleChannels_M8(INTERNAL_MODULE); #elif defined(PCBSKY9X) g_model.moduleData[EXTERNAL_MODULE].type = MODULE_TYPE_PPM; -#elif defined(PCBI6) +#elif defined(PCBI6X) g_model.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_AFHDS2A_SPI; g_model.moduleData[INTERNAL_MODULE].channelsStart = 0; g_model.moduleData[INTERNAL_MODULE].channelsCount = MAX_OUTPUT_CHANNELS; @@ -1418,7 +1418,7 @@ void doMixerPeriodicUpdates() s_cnt_1s -= 10; sessionTimer += 1; inactivity.counter++; -#if defined(PCBI6) +#if defined(PCBI6X) if ((((uint8_t)inactivity.counter) & 0x07) == 0x01 && g_eeGeneral.inactivityTimer && inactivity.counter > ((uint16_t)g_eeGeneral.inactivityTimer * 60)) #else if ((((uint8_t)inactivity.counter) & 0x07) == 0x01 && g_eeGeneral.inactivityTimer && g_vbat100mV > 50 && inactivity.counter > ((uint16_t)g_eeGeneral.inactivityTimer * 60)) @@ -1465,7 +1465,7 @@ void doMixerPeriodicUpdates() } } -#if defined(PXX) || defined(DSM2) || defined(PCBI6) +#if defined(PXX) || defined(DSM2) || defined(PCBI6X) static uint8_t countRangecheck = 0; for (uint8_t i = 0; i < NUM_MODULES; ++i) { #if defined(MULTIMODULE) @@ -1488,24 +1488,17 @@ void doMixerPeriodicUpdates() s_mixer_first_run_done = true; } -#define OPENTX_START_NO_SPLASH 0x01 -#define OPENTX_START_NO_CHECKS 0x02 - #if !defined(OPENTX_START_DEFAULT_ARGS) #define OPENTX_START_DEFAULT_ARGS 0 #endif -void opentxStart(const uint8_t startType = OPENTX_START_DEFAULT_ARGS) { - TRACE("opentxStart(%u)", startType); +void opentxStart(const uint8_t startOptions = OPENTX_START_DEFAULT_ARGS) { + TRACE("opentxStart(%u)", startOptions); + + uint8_t calibration_needed = !(startOptions & OPENTX_START_NO_CALIBRATION) && (g_eeGeneral.chkSum != evalChkSum()); - if (startType & OPENTX_START_NO_CHECKS) { - return; - } - uint8_t calibration_needed = (g_eeGeneral.chkSum != evalChkSum()); - //TRACE("gonna do chksum. saved: %d calculated: %d", g_eeGeneral.chkSum, evalChkSum()); - //TRACE("calibration needed %d", calibration_needed); #if defined(GUI) - if (!calibration_needed && !(startType & OPENTX_START_NO_SPLASH)) { + if (!calibration_needed && !(startOptions & OPENTX_START_NO_SPLASH)) { doSplash(); } #endif @@ -1527,7 +1520,7 @@ void opentxStart(const uint8_t startType = OPENTX_START_DEFAULT_ARGS) { #if defined(GUI) if (calibration_needed) { chainMenu(menuFirstCalib); - } else { + } else if (!(startOptions & OPENTX_START_NO_CHECKS)) { checkAlarm(); checkAll(); PLAY_MODEL_NAME(); @@ -1604,7 +1597,8 @@ void opentxResume() { loadFontCache(); #endif - opentxStart(OPENTX_START_NO_SPLASH); + // removed to avoid the double warnings (throttle, switch, etc.) + // opentxStart(OPENTX_START_NO_SPLASH | OPENTX_START_NO_CALIBRATION | OPENTX_START_NO_CHECKS); referenceSystemAudioFiles(); diff --git a/radio/src/opentx.h b/radio/src/opentx.h index 4a474b87f40..f5a1a1df6b8 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -357,7 +357,7 @@ extern uint8_t channel_order(uint8_t x); #if defined(COLORLCD) #define SPLASH_NEEDED() (false) -#elif defined(PCBTARANIS) || defined(PCBI6) +#elif defined(PCBTARANIS) || defined(PCBI6X) #define SPLASH_NEEDED() (g_eeGeneral.splashMode != 3) #else #define SPLASH_NEEDED() (g_model.moduleData[EXTERNAL_MODULE].type != MODULE_TYPE_DSM2 && !g_eeGeneral.splashMode) @@ -433,7 +433,7 @@ int zchar2str(char *dest, const char *src, int size); #include "keys.h" #include "pwr.h" -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) div_t switchInfo(int switchPosition); extern uint8_t potsPos[NUM_XPOTS]; #endif @@ -501,7 +501,7 @@ void evalLogicalSwitches(bool isCurrentFlightmode=true); void logicalSwitchesCopyState(uint8_t src, uint8_t dst); #define LS_RECURSIVE_EVALUATION_RESET() -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) void getSwitchesPosition(bool startup); #else #define getSwitchesPosition(...) @@ -567,7 +567,7 @@ void flightReset(uint8_t check=true); PACK(struct GlobalData { uint8_t unexpectedShutdown:1; uint8_t sdcardPresent:1; -#if defined(PCBI6) +#if defined(PCBI6X) uint8_t usbDetect:1; uint8_t spare:5; #else @@ -956,7 +956,7 @@ inline void customFunctionsReset() } #include "telemetry/telemetry.h" -#if defined(PCBI6) +#if defined(PCBI6X) #include "crc_driver.h" #else #include "crc.h" @@ -1089,6 +1089,10 @@ void opentxClose(uint8_t shutdown=true); void opentxInit(); void opentxResume(); +constexpr uint8_t OPENTX_START_NO_SPLASH = 0x01; +constexpr uint8_t OPENTX_START_NO_CALIBRATION = 0x02; +constexpr uint8_t OPENTX_START_NO_CHECKS = 0x04; + #if defined(STATUS_LEDS) #define LED_ERROR_BEGIN() ledRed() #define LED_ERROR_END() ledBlue() @@ -1178,7 +1182,7 @@ union ReusableBuffer uint8_t maxNameLen; } modelFailsafe; -#if defined(STM32) && (!defined(PCBI6) || defined(PCBI6_USB_MSD) || defined(PCBI6_ELRSV2)) +#if defined(STM32) && (!defined(PCBI6X) || defined(PCBI6X_USB_MSD) || defined(PCBI6X_ELRSV2)) // Data for the USB mass storage driver. If USB mass storage runs no menu is not allowed to be displayed uint8_t MSC_BOT_Data[MSC_MEDIA_PACKET]; #endif diff --git a/radio/src/pulses/crossfire.cpp b/radio/src/pulses/crossfire.cpp index bf274d8d149..2937822adf3 100644 --- a/radio/src/pulses/crossfire.cpp +++ b/radio/src/pulses/crossfire.cpp @@ -39,7 +39,7 @@ uint8_t createCrossfireModelIDFrame(uint8_t* frame) { *buf++ = SUBCOMMAND_CRSF; /* sub command */ *buf++ = COMMAND_MODEL_SELECT_ID; /* command of set model/receiver id */ *buf++ = g_model.header.modelId[EXTERNAL_MODULE]; /* model ID */ -#if defined(PCBI6) +#if defined(PCBI6X) *buf++ = crc8_BA_hw(frame + 2, 6); *buf++ = crc8_hw(frame + 2, 7); #else @@ -68,7 +68,7 @@ uint8_t createCrossfireChannelsFrame(uint8_t* frame, int16_t* pulses) { bitsavailable -= 8; } } -#if defined(PCBI6) +#if defined(PCBI6X) *buf++ = crc8_hw(crc_start, 23); #else *buf++ = crc8(crc_start, 23); diff --git a/radio/src/pulses/modules.h b/radio/src/pulses/modules.h index a3a04327f68..9c10d3a13eb 100644 --- a/radio/src/pulses/modules.h +++ b/radio/src/pulses/modules.h @@ -25,7 +25,7 @@ #define CROSSFIRE_CHANNELS_COUNT 16 -#if defined(PCBI6) +#if defined(PCBI6X) inline bool isModuleA7105(uint8_t idx){ return idx == INTERNAL_MODULE; } @@ -65,7 +65,7 @@ inline bool isModuleXJT(uint8_t idx) #else inline bool isModuleXJT(uint8_t idx) { - #if defined(PCBI6) + #if defined(PCBI6X) return false; #else return idx == EXTERNAL_MODULE && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_XJT; @@ -116,7 +116,7 @@ inline bool isModulePPM(uint8_t idx) inline bool isModuleR9M(uint8_t idx) { - #if defined(PCBI6) + #if defined(PCBI6X) return false; #else return g_model.moduleData[idx].type == MODULE_TYPE_R9M; @@ -156,7 +156,7 @@ inline bool isModulePXX(uint8_t idx) inline bool isModuleDSM2(uint8_t idx) { - #if defined(PCBI6) + #if defined(PCBI6X) return false; #else return idx == EXTERNAL_MODULE && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_DSM2; @@ -165,7 +165,7 @@ inline bool isModuleDSM2(uint8_t idx) inline bool isModuleSBUS(uint8_t idx) { - #if defined(PCBI6) + #if defined(PCBI6X) return false; #else return idx == EXTERNAL_MODULE && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_SBUS; diff --git a/radio/src/pulses/pulses_arm.cpp b/radio/src/pulses/pulses_arm.cpp index b90b0e633dd..5df3d9fd4c1 100755 --- a/radio/src/pulses/pulses_arm.cpp +++ b/radio/src/pulses/pulses_arm.cpp @@ -42,7 +42,7 @@ uint8_t getRequiredProtocol(uint8_t port) { uint8_t required_protocol; switch (port) { -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) case INTERNAL_MODULE: switch (g_model.moduleData[INTERNAL_MODULE].type) { #if defined(TARANIS_INTERNAL_PPM) @@ -76,7 +76,7 @@ uint8_t getRequiredProtocol(uint8_t port) { required_protocol = PROTO_PXX_EXTERNAL_MODULE; // either PXX or PXX2 depending on compilation options break; #endif -#if !defined(PCBI6) +#if !defined(PCBI6X) case MODULE_TYPE_SBUS: required_protocol = PROTO_SBUS; break; @@ -188,7 +188,7 @@ bool setupPulses(uint8_t port) { case PROTO_AFHDS2A_SPI: disable_afhds2a(port); break; -#if !defined(PCBI6) +#if !defined(PCBI6X) case PROTO_SBUS: disable_serial(port); break; @@ -213,7 +213,7 @@ bool setupPulses(uint8_t port) { break; #endif -#if !defined(PCBI6) +#if !defined(PCBI6X) case PROTO_SBUS: setupPulsesSbus(port); scheduleNextMixerCalculation(port, SBUS_PERIOD); @@ -311,7 +311,7 @@ bool setupPulses(uint8_t port) { init_serial(port, MULTIMODULE_BAUDRATE, MULTIMODULE_PERIOD * 2000); break; #endif -#if !defined(PCBI6) +#if !defined(PCBI6X) case PROTO_SBUS: init_serial(port, SBUS_BAUDRATE, SBUS_PERIOD_HALF_US); break; diff --git a/radio/src/pulses/pulses_arm.h b/radio/src/pulses/pulses_arm.h index 2d6daeb6295..068343ba3d9 100644 --- a/radio/src/pulses/pulses_arm.h +++ b/radio/src/pulses/pulses_arm.h @@ -139,7 +139,7 @@ void Hubsan_Init(); inline void startPulses() { s_pulses_paused = false; -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) setupPulses(INTERNAL_MODULE); setupPulses(EXTERNAL_MODULE); #else diff --git a/radio/src/serial.cpp b/radio/src/serial.cpp index 78d5e5d8c1f..050e9af078b 100644 --- a/radio/src/serial.cpp +++ b/radio/src/serial.cpp @@ -26,7 +26,7 @@ #define PRINTF_BUFFER_SIZE 128 void serialPutc(char c) { -#if !defined(BOOT) && defined(USB_SERIAL) && !defined(PCBI6) +#if !defined(BOOT) && defined(USB_SERIAL) && !defined(PCBI6X) if (getSelectedUsbMode() == USB_SERIAL_MODE) usbSerialPutc(c); #endif diff --git a/radio/src/stamp.cpp b/radio/src/stamp.cpp index 2715a46addf..5e59f974543 100644 --- a/radio/src/stamp.cpp +++ b/radio/src/stamp.cpp @@ -63,14 +63,14 @@ #elif defined(JUMPER_RELEASE) const char vers_stamp[] = "FW" TAB ": opentx-" FLAVOUR "\036VERS" TAB ": Factory (" GIT_STR ")" "\036BUILT BY : OpenTX" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR; #else - const char vers_stamp[] = "FW" TAB ": opentx-" FLAVOUR "\036VERS" TAB ": " VERSION DISPLAY_VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR; + const char vers_stamp[] = "FW" TAB ": openi6x" "\036VERS" TAB ": " VERSION DISPLAY_VERSION " (" GIT_STR ")" "\036DATE" TAB ": " DATE " " TIME "\036EEPR" TAB ": " EEPROM_STR; #endif /** * Retrieves the version of the bootloader or firmware * @return */ -#if defined(STM32) +#if defined(STM32) && !defined(PCBI6X) // FLASH space opt __SECTION_USED(".fwversiondata") const char firmware_version[] = "opentx-" FLAVOUR "-" VERSION " (" GIT_STR ")"; __SECTION_USED(".bootversiondata") const char boot_version[] = "opentx-" FLAVOUR "-" VERSION " (" GIT_STR ")"; diff --git a/radio/src/storage/eeprom_conversions.cpp b/radio/src/storage/eeprom_conversions.cpp index c9860e8e488..77ff80c7aff 100644 --- a/radio/src/storage/eeprom_conversions.cpp +++ b/radio/src/storage/eeprom_conversions.cpp @@ -497,7 +497,7 @@ PACK(typedef struct { uint8_t nPotsToWarn; \ int8_t potPosition[NUM_POTS+NUM_SLIDERS]; \ uint8_t spare[2]; -#elif defined(PCBSKY9X) || defined(PCBI6) +#elif defined(PCBSKY9X) || defined(PCBI6X) #define MODELDATA_EXTRA_216 \ uint8_t externalModule; \ ModuleData_v216 moduleData[NUM_MODULES+1]; \ diff --git a/radio/src/storage/storage.h b/radio/src/storage/storage.h index 45fca356d5a..f3c8e5bb7d8 100644 --- a/radio/src/storage/storage.h +++ b/radio/src/storage/storage.h @@ -29,7 +29,7 @@ #define WRITE_DELAY_10MS 500 #elif defined(PCBSKY9X) && !defined(REV0) #define WRITE_DELAY_10MS 500 -#elif defined(PCBI6) +#elif defined(PCBI6X) #define WRITE_DELAY_10MS 500 #else #define WRITE_DELAY_10MS 200 diff --git a/radio/src/switches.cpp b/radio/src/switches.cpp index 792d306f0dd..87cd6e07431 100644 --- a/radio/src/switches.cpp +++ b/radio/src/switches.cpp @@ -57,7 +57,7 @@ LogicalSwitchesFlightModeContext lswFm[MAX_FLIGHT_MODES]; #define LS_LAST_VALUE(fm, idx) lswFm[fm].lsw[idx].lastValue -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) #if defined(PCBX9E) tmr10ms_t switchesMidposStart[16]; #else @@ -128,7 +128,7 @@ uint64_t check3PosSwitchPosition(uint8_t idx, uint8_t sw, bool startup) void getSwitchesPosition(bool startup){ uint64_t newPos = 0; -#if defined(PCBI6) +#if defined(PCBI6X) CHECK_2POS(SW_SA); CHECK_2POS(SW_SB); CHECK_3POS(2, SW_SC); @@ -506,7 +506,7 @@ swsrc_t getMovedSwitch() static tmr10ms_t s_move_last_time = 0; swsrc_t result = 0; -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) for (int i=0; i= MAX_OUTPUT_CHANNELS) break; if ( channelOutputs[i+8] > 0 ) { HID_Buffer[0] |= (1 << i); } @@ -197,7 +196,7 @@ void usbJoystickUpdate() int16_t value = channelOutputs[i] + 1024; if ( value > 2047 ) value = 2047; else if ( value < 0 ) value = 0; -#if defined(PCBI6) +#if defined(PCBI6X) HID_Buffer[i*2 +2] = static_cast(value & 0xFF); HID_Buffer[i*2 +3] = static_cast((value >> 8) & 0x07); #else @@ -207,10 +206,10 @@ void usbJoystickUpdate() } -#if defined(PCBI6) +#if defined(PCBI6X) // HID_Buffer index 8 & 9 causes mess. Looks like clock issue but cannot confirm. // i reduced buttons to 16 so it will affect only one analog and remapped it [3] -> [5] - HID_Buffer[12] = HID_Buffer[8]; // ch[3] remap to ch[5] + HID_Buffer[12] = HID_Buffer[8]; // ch[3] remap to ch[5] // channel 5 void HID_Buffer[13] = HID_Buffer[9]; HID_Buffer[8] = 0; HID_Buffer[9] = 0; diff --git a/radio/src/targets/common/arm/stm32/usb_driver.h b/radio/src/targets/common/arm/stm32/usb_driver.h index a3d3c3c92f2..7474138648a 100644 --- a/radio/src/targets/common/arm/stm32/usb_driver.h +++ b/radio/src/targets/common/arm/stm32/usb_driver.h @@ -27,14 +27,14 @@ enum usbMode { USB_JOYSTICK_MODE, USB_MASS_STORAGE_MODE, USB_SERIAL_MODE, -#if defined(USB_SERIAL) && !defined(PCBI6) +#if defined(USB_SERIAL) && !defined(PCBI6X) USB_MAX_MODE = USB_SERIAL_MODE #else USB_MAX_MODE = USB_MASS_STORAGE_MODE #endif }; -#if defined(PCBI6) +#if defined(PCBI6X) enum usbDetect { USB_DETECT_AUTO, USB_DETECT_ON, diff --git a/radio/src/targets/common/arm/stm32/usbd_conf.h b/radio/src/targets/common/arm/stm32/usbd_conf.h index 212cf87926e..8488d9b2e2d 100644 --- a/radio/src/targets/common/arm/stm32/usbd_conf.h +++ b/radio/src/targets/common/arm/stm32/usbd_conf.h @@ -27,7 +27,7 @@ #define USBD_CFG_MAX_NUM 1 #define USBD_ITF_MAX_NUM 1 -#if defined(PCBI6) +#if defined(PCBI6X) #define USB_MAX_STR_DESC_SIZ 20 #else #define USB_MAX_STR_DESC_SIZ 64 @@ -57,7 +57,7 @@ #define HID_IN_EP 0x81 #define HID_OUT_EP 0x01 -#if defined(PCBI6) +#if defined(PCBI6X) #define HID_IN_PACKET 18 #else #define HID_IN_PACKET 19 diff --git a/radio/src/targets/common/arm/stm32/usbd_desc.c b/radio/src/targets/common/arm/stm32/usbd_desc.c index 58ae4011c14..1733d380ca2 100644 --- a/radio/src/targets/common/arm/stm32/usbd_desc.c +++ b/radio/src/targets/common/arm/stm32/usbd_desc.c @@ -137,7 +137,7 @@ uint8_t * USBD_USR_DeviceDescriptor( uint8_t speed , uint16_t *length) pid = USBD_HID_PID; vid = USBD_HID_VID; break; -#if !defined(PCBI6) +#if !defined(PCBI6X) case USB_SERIAL_MODE: pid = USBD_CDC_PID; break; @@ -207,7 +207,7 @@ uint8_t * USBD_USR_ProductStrDescriptor( uint8_t speed , uint16_t *length) case USB_JOYSTICK_MODE: USBD_GetString ((uint8_t*)USBD_HID_PRODUCT_FS_STRING, USBD_StrDesc, length); break; -#if !defined(PCBI6) +#if !defined(PCBI6X) case USB_SERIAL_MODE: USBD_GetString ((uint8_t*)USBD_CDC_PRODUCT_FS_STRING, USBD_StrDesc, length); break; @@ -259,7 +259,7 @@ uint8_t * USBD_USR_ConfigStrDescriptor( uint8_t speed , uint16_t *length) case USB_JOYSTICK_MODE: USBD_GetString ((uint8_t*)USBD_HID_CONFIGURATION_FS_STRING, USBD_StrDesc, length); break; -#if !defined(PCBI6) +#if !defined(PCBI6X) case USB_SERIAL_MODE: USBD_GetString ((uint8_t*)USBD_CDC_CONFIGURATION_FS_STRING, USBD_StrDesc, length); break; @@ -285,7 +285,7 @@ uint8_t * USBD_USR_InterfaceStrDescriptor( uint8_t speed , uint16_t *length) case USB_JOYSTICK_MODE: USBD_GetString ((uint8_t*)USBD_HID_INTERFACE_FS_STRING, USBD_StrDesc, length); break; -#if !defined(PCBI6) +#if !defined(PCBI6X) case USB_SERIAL_MODE: USBD_GetString ((uint8_t*)USBD_CDC_INTERFACE_FS_STRING, USBD_StrDesc, length); break; diff --git a/radio/src/targets/common/arm/stm32/usbd_hid_joystick.c b/radio/src/targets/common/arm/stm32/usbd_hid_joystick.c index 9b35b4b569e..bb9c9f40079 100644 --- a/radio/src/targets/common/arm/stm32/usbd_hid_joystick.c +++ b/radio/src/targets/common/arm/stm32/usbd_hid_joystick.c @@ -117,14 +117,14 @@ __ALIGN_BEGIN static const uint8_t HID_JOYSTICK_ReportDesc[] __ALIGN_END = 0xa1, 0x00, // COLLECTION (Physical) 0x05, 0x09, // USAGE_PAGE (Button) 0x19, 0x01, // USAGE_MINIMUM (Button 1) -#if defined(PCBI6) +#if defined(PCBI6X) 0x29, 0x10, // USAGE_MAXIMUM (Button 16) #else 0x29, 0x18, // USAGE_MAXIMUM (Button 24) #endif 0x15, 0x00, // LOGICAL_MINIMUM (0) 0x25, 0x01, // LOGICAL_MAXIMUM (1) -#if defined(PCBI6) +#if defined(PCBI6X) 0x95, 0x10, // REPORT_COUNT (16) #else 0x95, 0x18, // REPORT_COUNT (24) @@ -135,7 +135,7 @@ __ALIGN_BEGIN static const uint8_t HID_JOYSTICK_ReportDesc[] __ALIGN_END = 0x09, 0x30, // USAGE (X) 0x09, 0x31, // USAGE (Y) 0x09, 0x32, // USAGE (Z) -#if defined(PCBI6) +#if defined(PCBI6X) 0x09, 0x35, // USAGE (Rz) 0x09, 0x33, // USAGE (Rx) 0x09, 0x34, // USAGE (Ry) diff --git a/radio/src/targets/common/arm/stm32/usbd_storage_msd.cpp b/radio/src/targets/common/arm/stm32/usbd_storage_msd.cpp index ae6946d5f9a..f77563fdb34 100644 --- a/radio/src/targets/common/arm/stm32/usbd_storage_msd.cpp +++ b/radio/src/targets/common/arm/stm32/usbd_storage_msd.cpp @@ -277,23 +277,27 @@ int8_t STORAGE_GetMaxLun (void) /* Firmware.txt */ const char firmware_txt[] = #if defined(BOOT) - "OpenTX Bootloader" + "OpenI6X Bootloader" #else - "OpenTX Firmware" + "OpenI6X Firmware" #endif +#if !defined(PCBI6X) " for " FLAVOUR "\r\n\r\n" +#else + "\r\n\r\n" +#endif #if defined(BOOT) "BOOTVER " #else "FWVERSION " #endif - "opentx-" FLAVOUR "-" VERSION " (" GIT_STR ")\r\n" + "openi6x-" VERSION " (" GIT_STR ")\r\n" "DATE " DATE "\r\n" "TIME " TIME "\r\n" #if defined(SDCARD) "req SD ver " REQUIRED_SDCARD_VERSION "\r\n" #endif -#if !defined(PCBI6) +#if !defined(PCBI6X) #if !defined(BOOT) "BOOTVER " #else @@ -537,7 +541,7 @@ int32_t fat12Read(uint8_t * buffer, uint16_t sector, uint16_t count) } else if (sector == 4) { memcpy(buffer, firmware_txt, sizeof(firmware_txt)); -#if !defined(PCBI6) +#if !defined(PCBI6X) memcpy(buffer + sizeof(firmware_txt) - 1, getOtherVersion(), strlen(getOtherVersion())); #endif } diff --git a/radio/src/targets/flysky/CMakeLists.txt b/radio/src/targets/flysky/CMakeLists.txt index 8aa204ed59d..004199c1957 100644 --- a/radio/src/targets/flysky/CMakeLists.txt +++ b/radio/src/targets/flysky/CMakeLists.txt @@ -1,7 +1,7 @@ option(SHUTDOWN_CONFIRMATION "Shutdown confirmation" OFF) option(LCD_DUAL_BUFFER "Dual LCD Buffer" OFF) option(TARANIS_INTERNAL_PPM "Taranis internal module hack to output PPM" OFF) -option(PCBI6_ELRSV2 "Enable ExpressLRS v2 menu" OFF) # ~6kB FLASH +option(PCBI6X_ELRSV2 "Enable ExpressLRS v2 configuration tool" OFF) # ~6kB FLASH if(PCB STREQUAL I6X) set(PWR_BUTTON "PRESS") @@ -36,8 +36,8 @@ if(PCB STREQUAL I6X) set(SERIAL2_DRIVER serial2_driver.cpp) endif() -if(PCBI6_ELRSV2) - add_definitions(-DPCBI6_ELRSV2) +if(PCBI6X_ELRSV2) + add_definitions(-DPCBI6X_ELRSV2) endif() set(TARGET_SRC @@ -49,14 +49,14 @@ set(TARGET_SRC ) set(HSE_VALUE 8000000) -set(SDCARD NO) +set(SDCARD NO) # ~24kB FLASH set(EEPROM EEPROM_RLC) set(TARGET_DIR flysky) set(PPM_LIMITS_SYMETRICAL YES) -add_definitions(-DPCBI6 -DBUZZER) -add_definitions(-DPCBI6_USB_MSD) +add_definitions(-DPCBI6X -DBUZZER) +add_definitions(-DPCBI6X_USB_MSD) +add_definitions(-DMENU_DIAGANAS) # add_definitions(-DMENU_DIAGKEYS) -# add_definitions(-DMENU_DIAGANAS) set(GUI_SRC ${GUI_SRC} model_input_edit.cpp diff --git a/radio/src/targets/flysky/board.cpp b/radio/src/targets/flysky/board.cpp index 05ccde8236c..24fbe54bc00 100644 --- a/radio/src/targets/flysky/board.cpp +++ b/radio/src/targets/flysky/board.cpp @@ -248,7 +248,7 @@ extern "C" void INTERRUPT_xMS_IRQHandler() void boardInit() { #if defined(STM32F0) && defined(BOOT) - // Move vect table to beggining of RAM + // Move vect table to beginning of RAM RCC->APB2ENR |= RCC_APB2ENR_SYSCFGEN; for (uint32_t i = 0; i < VECTOR_TABLE_SIZE; i++) { ram_vector[i] = g_pfnVectors[i]; diff --git a/radio/src/targets/flysky/board.h b/radio/src/targets/flysky/board.h index f83fe8a4c39..604868002bb 100644 --- a/radio/src/targets/flysky/board.h +++ b/radio/src/targets/flysky/board.h @@ -209,7 +209,7 @@ void extmoduleSendNextFrame(); // Trainer driver #define SLAVE_MODE() (false) // (g_model.trainerMode == TRAINER_MODE_SLAVE) -#if defined(PCBX9E) || defined(PCBI6) +#if defined(PCBX9E) || defined(PCBI6X) #define TRAINER_CONNECTED() (true) #elif defined(PCBX7) #define TRAINER_CONNECTED() (GPIO_ReadInputDataBit(TRAINER_DETECT_GPIO, TRAINER_DETECT_GPIO_PIN) == Bit_SET) @@ -503,10 +503,11 @@ void ledBlue(void); #define LCD_CONTRAST_MAX 63 #define LCD_CONTRAST_DEFAULT 38 +#define lcdRefreshWait() + void lcdInit(void); void lcdInitFinish(void); void lcdOff(void); -void lcdRefreshWait(void); void lcdSetRefVolt(unsigned char val); void lcdSetContrast(void); void lcdRefresh(); diff --git a/radio/src/targets/flysky/bootloader/boot_menu.cpp b/radio/src/targets/flysky/bootloader/boot_menu.cpp index 14c7799b049..535fd1d05f5 100644 --- a/radio/src/targets/flysky/bootloader/boot_menu.cpp +++ b/radio/src/targets/flysky/bootloader/boot_menu.cpp @@ -28,7 +28,7 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str) { lcdDrawText(FW, 3*FH, "Restore EEPROM", opt == 0 ? INVERS : 0); lcdDrawText(FW, 4*FH, "Exit"); #else - lcdDrawText(FW, 4*FH, "Exit", opt == 0 ? INVERS : 0); // only Exit option on PCBI6 + lcdDrawText(FW, 4*FH, "Exit", opt == 0 ? INVERS : 0); // only Exit option on PCBI6X #endif lcdDrawText(FW, 5 * FH + FH / 2, STR_OR_PLUGIN_USB_CABLE); diff --git a/radio/src/targets/flysky/lcd_driver.cpp b/radio/src/targets/flysky/lcd_driver.cpp index b92d8ab300f..2cb53676bcf 100644 --- a/radio/src/targets/flysky/lcd_driver.cpp +++ b/radio/src/targets/flysky/lcd_driver.cpp @@ -165,27 +165,26 @@ void lcdInit() LCD_RD_HI(); LCD_RS_HI(); lcdReset(); + lcdClear(); + lcdRefresh(); } -static void lcdRefreshInternal(uint8_t clear) -{ +void lcdRefresh() { uint8_t *p = displayBuf; - int page = 0; + int page = 0xB0; do { - int line = 4; - lcdSendCtl(page | 0xB0); //page selection - lcdSendCtl(line); //line -> contoler is 132 lines while lcd only 128 - lcdSendCtl(0x10u); + uint8_t line = LCD_W; + lcdSendCtl(page); // page selection + lcdSendCtl(4); // start at line 4 -> controller is 132 lines while lcd 128 + lcdSendCtl(0x10u);// column address 0 do { - lcdSendGFX(clear ? 0 : *p++); - ++line; - } while (line < 132); + lcdSendGFX(*p++); + } while (--line); ++page; - } while (page < 8); + } while (page < 0xB8); } - void lcdOff(){ // switch display off lcdSendCtl(LCD_CMD_DISPLAY_OFF); @@ -194,25 +193,11 @@ void lcdOff(){ } void lcdSetRefVolt(uint8_t val){ - if(valLCD_CONTRAST_MAX){ - val = LCD_CONTRAST_MAX; - } + limit(LCD_CONTRAST_MIN, val, LCD_CONTRAST_MAX); lcdSendCtl(LCD_CMD_EV); lcdSendCtl(val); } -void lcdRefresh(){ - lcdRefreshInternal(0); -} - -void lcdRefreshWait(){ - lcdRefreshInternal(0); -} - - void lcdReset(){ // wait for voltages to be stable delay_ms(100); @@ -223,5 +208,4 @@ void lcdReset(){ for (uint8_t i=0; itype == 10) { @@ -174,6 +176,7 @@ void incrField(int8_t step) { field->value = limit(min, field->value + step, max); } } + void selectField(int8_t step) { int8_t newLineIndex = lineIndex; FieldProps * field; @@ -262,13 +265,15 @@ void fieldCommandSave(FieldProps * field) { } } -void fieldCommandDisplay(FieldProps * field, uint8_t y, uint8_t attr) { +void fieldUnifiedDisplay(FieldProps * field, uint8_t y, uint8_t attr) { const char* backPat = "[----BACK----]"; const char* folderPat = "> %.*s"; const char* cmdPat = "[%.*s]"; + uint8_t textIndent = textXoffset + 9; char *pat; - if (field->type == 11) { + if (field->type == 11) { pat = (char *)folderPat; + textIndent = textXoffset; } else if (field->type == 14) { pat = (char *)backPat; } else { @@ -276,7 +281,7 @@ void fieldCommandDisplay(FieldProps * field, uint8_t y, uint8_t attr) { } char stringTmp[24]; sprintf((char *)&stringTmp, pat, field->nameLength, (char *)&namesBuffer[field->nameOffset]); - lcdDrawText(10, y, (char *)&stringTmp, attr | BOLD); + lcdDrawText(textIndent, y, (char *)&stringTmp, attr | BOLD); } void UIbackExec(FieldProps * field = 0) { @@ -293,7 +298,7 @@ void parseDeviceInfoMessage(uint8_t* data) { TRACE("parseDeviceInfoMessage %x", id); offset = strlen((char*)&data[3]) + 1 + 3; if ( deviceId == id) { - strcpy(deviceName, (char *)&data[3]); + memcpy(deviceName, (char *)&data[3], 16); deviceIsELRS_TX = 1; uint8_t newFieldCount = data[offset+12]; reloadAllField(); @@ -311,10 +316,10 @@ void parseDeviceInfoMessage(uint8_t* data) { const FieldFunctions functions[] = { { .load=fieldTextSelectionLoad, .save=fieldTextSelectionSave, .display=fieldTextSelectionDisplay }, { .load=nullptr, .save=nullptr, .display=fieldStringDisplay }, - { .load=nullptr, .save=fieldFolderOpen, .display=fieldCommandDisplay }, + { .load=nullptr, .save=fieldFolderOpen, .display=fieldUnifiedDisplay }, { .load=nullptr, .save=nullptr, .display=fieldStringDisplay }, - { .load=fieldCommandLoad, .save=fieldCommandSave, .display=fieldCommandDisplay }, - { .load=nullptr, .save=UIbackExec, .display=fieldCommandDisplay } + { .load=fieldCommandLoad, .save=fieldCommandSave, .display=fieldUnifiedDisplay }, + { .load=nullptr, .save=UIbackExec, .display=fieldUnifiedDisplay } }; void parseParameterInfoMessage(uint8_t* data, uint8_t length) { @@ -467,7 +472,7 @@ void lcd_title() { if (titleShowWarn) { lcdDrawText(textXoffset, 1, elrsFlagsInfo, INVERS); } else { - sprintf(deviceName, (allParamsLoaded == 1) ? deviceName : "Loading..."); + sprintf(deviceName, (allParamsLoaded == 1) ? "%.16s" : "Loading...", deviceName); lcdDrawText(textXoffset, 1, deviceName, INVERS); } } @@ -549,7 +554,7 @@ void runDevicePage(event_t event) { if (elrsFlags > 0x1F) { lcd_warn(); } else { - for (uint32_t y = 1; y < maxLineIndex+1; y++) { + for (uint32_t y = 1; y < maxLineIndex+2; y++) { if (pageOffset+y >= fieldsLen) break; field = getField(pageOffset+y); if (field == 0) { @@ -572,18 +577,18 @@ uint8_t popupCompat(char * title, event_t event) { lcdDrawRect(10, 16, LCD_W-20, 40); lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y, title, 23); lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH, STR_POPUPS); + if (event == EVT_VIRTUAL_EXIT) { return 1; } else if (event == EVT_VIRTUAL_ENTER) { return 2; } - return 0; } void runPopupPage(event_t event) { - if (event == EVT_VIRTUAL_EXIT) { - crossfireTelemetryPush4(0x2D, fieldPopup->id, 5); + if (event == EVT_VIRTUAL_EXIT) { + crossfireTelemetryPush4(0x2D, fieldPopup->id, 5); fieldTimeout = getTime() + 200; } @@ -617,8 +622,11 @@ void ELRSV2_stop() { registerCrossfireTelemetryCallback(nullptr); reloadAllField(); UIbackExec(); - cScriptRunning = 0; - popMenu(); + fieldPopup = 0; + if (cScriptRunning) { + cScriptRunning = 0; + popMenu(); + } } void ELRSV2_run(event_t event) { diff --git a/radio/src/tasks.cpp b/radio/src/tasks.cpp index 9dbc393efb1..a536b5d2456 100644 --- a/radio/src/tasks.cpp +++ b/radio/src/tasks.cpp @@ -107,7 +107,7 @@ TASK_FUNCTION(mixerTask) { mixerSchedulerStart(); while (true) { - int timeout = 0; + int timeout = 0; for (; timeout < MIXER_MAX_PERIOD; timeout += MIXER_FREQUENT_ACTIONS_PERIOD) { // run periodicals before waiting for the trigger @@ -146,7 +146,7 @@ TASK_FUNCTION(mixerTask) { RTOS_LOCK_MUTEX(mixerMutex); doMixerCalculations(); - + sendSynchronousPulses(1 << EXTERNAL_MODULE); doMixerPeriodicUpdates(); @@ -174,7 +174,7 @@ TASK_FUNCTION(mixerTask) { } } -#define MENU_TASK_PERIOD_TICKS 25 // 50ms +#define MENU_TASK_PERIOD_TICKS (50 / RTOS_MS_PER_TICK) // 50ms #if defined(COLORLCD) && defined(CLI) bool perMainEnabled = true; diff --git a/radio/src/telemetry/crossfire.cpp b/radio/src/telemetry/crossfire.cpp index 31a74490690..c95817d5f8f 100644 --- a/radio/src/telemetry/crossfire.cpp +++ b/radio/src/telemetry/crossfire.cpp @@ -82,7 +82,7 @@ void processCrossfireTelemetryValue(uint8_t index, int32_t value) { bool checkCrossfireTelemetryFrameCRC() { uint8_t len = telemetryRxBuffer[1]; -#if defined(PCBI6) +#if defined(PCBI6X) uint8_t crc = crc8_hw(&telemetryRxBuffer[2], len - 1); #else uint8_t crc = crc8(&telemetryRxBuffer[2], len - 1); @@ -312,7 +312,7 @@ bool crossfireTelemetryPush(uint8_t command, uint8_t *data, uint8_t length) { for (int i = 0; i < length; i++) { telemetryOutputPushByte(data[i]); } -#if defined(PCBI6) +#if defined(PCBI6X) telemetryOutputPushByte(crc8_hw(outputTelemetryBuffer + 2, 1 + length)); #else telemetryOutputPushByte(crc8(outputTelemetryBuffer + 2, 1 + length)); diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp index 00ad4a5fc14..5bfbca17f62 100644 --- a/radio/src/telemetry/telemetry.cpp +++ b/radio/src/telemetry/telemetry.cpp @@ -59,7 +59,7 @@ void processTelemetryData(uint8_t data) } #endif #if defined(TELEMETRY_FRSKY) -#if !defined(PCBI6) +#if !defined(PCBI6X) processFrskyTelemetryData(data); #endif #endif diff --git a/radio/src/telemetry/telemetry.h b/radio/src/telemetry/telemetry.h index bc0c00ef67a..5c07ea09bd8 100644 --- a/radio/src/telemetry/telemetry.h +++ b/radio/src/telemetry/telemetry.h @@ -37,7 +37,7 @@ #include "flysky_ibus.h" #include "multi.h" #endif -#if defined(PCBI6) +#if defined(PCBI6X) #include "flysky_ibus.h" #endif @@ -237,7 +237,7 @@ inline uint8_t modelTelemetryProtocol() } #endif -#if defined(PCBI6) +#if defined(PCBI6X) if (IS_INTERNAL_MODULE_ENABLED()) { return PROTOCOL_FLYSKY_IBUS; } @@ -274,7 +274,7 @@ extern Fifo * luaInputTelemetryFifo; #endif #if defined(STM32) - #if defined(PCBI6) + #if defined(PCBI6X) #define IS_TELEMETRY_INTERNAL_MODULE() (true) #else #define IS_TELEMETRY_INTERNAL_MODULE() (g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_XJT) diff --git a/radio/src/telemetry/telemetry_sensors.cpp b/radio/src/telemetry/telemetry_sensors.cpp index 1059290fb7f..88e1a1d2123 100644 --- a/radio/src/telemetry/telemetry_sensors.cpp +++ b/radio/src/telemetry/telemetry_sensors.cpp @@ -490,7 +490,7 @@ int setTelemetryValue(TelemetryProtocol protocol, uint16_t id, uint8_t subId, ui frskySportSetDefault(index, id, subId, instance); break; #endif -#if defined(TELEMETRY_FRSKY) && !defined(PCBI6) +#if defined(TELEMETRY_FRSKY) && !defined(PCBI6X) case TELEM_PROTO_FRSKY_D: frskyDSetDefault(index, id); break; @@ -505,7 +505,7 @@ int setTelemetryValue(TelemetryProtocol protocol, uint16_t id, uint8_t subId, ui spektrumSetDefault(index, id, subId, instance); break; #endif -#if defined(MULTIMODULE) || defined(PCBI6) +#if defined(MULTIMODULE) || defined(PCBI6X) case TELEM_PROTO_FLYSKY_IBUS: flySkySetDefault(index, id, subId, instance); break; diff --git a/radio/src/thirdparty/CoOS/OsConfig.h b/radio/src/thirdparty/CoOS/OsConfig.h index b49fdf8589e..181dfc1293f 100644 --- a/radio/src/thirdparty/CoOS/OsConfig.h +++ b/radio/src/thirdparty/CoOS/OsConfig.h @@ -62,7 +62,7 @@ Defines the lowest priority that be assigned. /*!< Max number of tasks that can be running. */ -#define CFG_MAX_USER_TASKS (5) +#define CFG_MAX_USER_TASKS (2) /*!< Idle task stack size(word). diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 209bb8b6f4a..0a9e23e415d 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -39,7 +39,7 @@ const char STR_OPEN9X[] = #endif ISTR(TRNMODE) ISTR(TRNCHN) -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) ISTR(UART3MODES) ISTR(SWTYPES) ISTR(POTTYPES) @@ -692,7 +692,7 @@ const char STR_BLCOLOR[] = TR_BLCOLOR; const char STR_MODS_FORBIDDEN[] = TR_MODS_FORBIDDEN; #endif -#if defined(PCBTARANIS) || defined(DSM2) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(DSM2) || defined(PCBI6X) const char STR_MODULE_RANGE[] = TR_MODULE_RANGE; #endif @@ -709,7 +709,7 @@ const char STR_BLCOLOR[] = TR_BLCOLOR; const char STR_ABOUTUS[] = TR_ABOUTUS; const char STR_ABOUT_OPENTX_1[] = TR_ABOUT_OPENTX_1; const char STR_ABOUT_OPENTX_2[] = TR_ABOUT_OPENTX_2; -#if !defined(PCBI6) +#if !defined(PCBI6X) const char STR_ABOUT_OPENTX_3[] = TR_ABOUT_OPENTX_3; const char STR_ABOUT_OPENTX_4[] = TR_ABOUT_OPENTX_4; const char STR_ABOUT_OPENTX_5[] = TR_ABOUT_OPENTX_5; diff --git a/radio/src/translations.h b/radio/src/translations.h index 4c8b00f631e..e376f7abfd0 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -126,7 +126,7 @@ extern const char STR_OPEN9X[]; #define OFS_TRNMODE (OFS_VBEEPMODE + sizeof(TR_VBEEPMODE)) #endif #define OFS_TRNCHN (OFS_TRNMODE + sizeof(TR_TRNMODE)) -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) #define OFS_UART3MODES (OFS_TRNCHN + sizeof(TR_TRNCHN)) #define OFS_SWTYPES (OFS_UART3MODES + sizeof(TR_UART3MODES)) #define OFS_POTTYPES (OFS_SWTYPES + sizeof(TR_SWTYPES)) @@ -958,7 +958,7 @@ extern const char STR_BLCOLOR[]; extern const char STR_MODS_FORBIDDEN[]; #endif -#if defined(PCBTARANIS) || defined(DSM2) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(DSM2) || defined(PCBI6X) extern const char STR_MODULE_RANGE[]; #endif diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 4b68d6baf0f..8fa8d257bcc 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -100,7 +100,7 @@ #define TR_USBMODES TR("Ask\0 ""Joyst\0""Storag""Serial", "Ask\0 ""Joystick""Storage\0""Serial\0 ") #define LEN_TARANIS_PROTOCOLS "\004" -#if defined(PCBI6) +#if defined(PCBI6X) #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""CRSF" #else #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2""CRSF""MULT""R9M\0""SBUS" @@ -422,7 +422,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(PCBXLITE) || defined(PCBI6) +#elif defined(PCBXLITE) || defined(PCBI6X) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0" #elif defined(PCBX7) @@ -457,13 +457,13 @@ #define TR_ROTENC_SWITCHES #endif -#if !defined(PCBTARANIS) && !defined(PCBHORUS) && !defined(PCBI6) +#if !defined(PCBTARANIS) && !defined(PCBHORUS) && !defined(PCBI6X) #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif #define TR_ON_ONE_SWITCHES "ZAP""One" -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) // only special switches here #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #elif defined(PCBSKY9X) diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index d71cc3f422a..129f00ca105 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -102,7 +102,7 @@ #define TR_USBMODES TR("Fragen""Joyst\0""Storag""Serial", "Fragen\0 ""Joystick""Speicher""Seriell\0") #define LEN_TARANIS_PROTOCOLS "\004" -#if defined(PCBI6) +#if defined(PCBI6X) #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""CRSF" #else #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2""CRSF""MULT""R9M\0""SBUS" @@ -436,7 +436,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(PCBXLITE) || defined(PCBI6) +#elif defined(PCBXLITE) || defined(PCBI6X) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0" #elif defined(PCBX7) @@ -471,13 +471,13 @@ #define TR_ROTENC_SWITCHES #endif -#if !defined(PCBTARANIS) && !defined(PCBHORUS) && !defined(PCBI6) +#if !defined(PCBTARANIS) && !defined(PCBHORUS) && !defined(PCBI6X) #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif #define TR_ON_ONE_SWITCHES "ON\0""One" -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) // only special switches here #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #elif defined(PCBSKY9X) diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 39915fe1fdd..f72e954d61c 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -98,7 +98,7 @@ #define LEN_COUNTRYCODES TR("\002", "\007") #define TR_COUNTRYCODES TR("US""JP""EU", "America""Japan\0 ""Europe\0") -#if defined(PCBI6) +#if defined(PCBI6X) #define LEN_USBDETECTMODES TR("\004", "\004") #define TR_USBDETECTMODES TR("Auto""Once", "Auto""Once") #endif @@ -107,7 +107,7 @@ #define TR_USBMODES TR("Ask\0 ""Joyst\0""Storag""Serial", "Ask\0 ""Joystick""Storage\0""Serial\0 ") #define LEN_TARANIS_PROTOCOLS "\004" -#if defined(PCBI6) +#if defined(PCBI6X) #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""CRSF" #else #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2""CRSF""MULT""R9M\0""SBUS" @@ -432,7 +432,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(PCBI6) +#elif defined(PCBI6X) #define TR_POTS_VSRCRAW "\310P1\0""\310P2\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0" #elif defined(PCBXLITE) @@ -470,13 +470,13 @@ #define TR_ROTENC_SWITCHES #endif -#if !defined(PCBTARANIS) && !defined(PCBHORUS) && !defined(PCBI6) +#if !defined(PCBTARANIS) && !defined(PCBHORUS) && !defined(PCBI6X) #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif #define TR_ON_ONE_SWITCHES "ON\0""One" -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) // only special switches here #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #elif defined(PCBSKY9X) @@ -546,7 +546,7 @@ #if defined(PCBTARANIS) || defined(PCBHORUS) #define TR_ENTER "[ENTER]" -#elif defined(PCBI6) +#elif defined(PCBI6X) #define TR_ENTER "[ OK ]" #else #define TR_ENTER "[MENU]" @@ -554,8 +554,8 @@ #if defined(PCBHORUS) #define TR_EXIT "[RTN]" -#elif defined(PCBI6) - #define TR_EXIT "[CNCL]" +#elif defined(PCBI6X) + #define TR_EXIT "[CANCEL]" #else #define TR_EXIT "[EXIT]" #endif @@ -968,9 +968,9 @@ #define TR_RESET_TELEMETRY "Reset telemetry" #define TR_STATISTICS "Statistics" #define TR_ABOUT_US "About" -#define TR_USB_JOYSTICK "USB Joystick (HID)" -#define TR_USB_MASS_STORAGE "USB Storage (SD)" -#define TR_USB_SERIAL "USB Serial (Debug)" +#define TR_USB_JOYSTICK "USB Joystick" +#define TR_USB_MASS_STORAGE "USB Storage" +#define TR_USB_SERIAL "USB Serial" #define TR_SETUP_SCREENS "Setup screens" #define TR_MONITOR_SCREENS "Monitors" #define TR_AND_SWITCH "AND switch" @@ -1088,7 +1088,7 @@ // About screen #define TR_ABOUTUS TR(" ABOUT ", "ABOUT") -#if defined(PCBI6) +#if defined(PCBI6X) #define TR_ABOUT_OPENTX_1 TR("OpenI6X", "") #define TR_ABOUT_OPENTX_2 TR("is\001based\001on\001OpenTX", "") diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 3c84e04f718..f5927bedd90 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -102,7 +102,7 @@ #define TR_USBMODES TR("Ask\0 ""Joyst\0""Storag""Serial", "Ask\0 ""Joystick""Storage\0""Serial\0 ") #define LEN_TARANIS_PROTOCOLS "\004" -#if defined(PCBI6) +#if defined(PCBI6X) #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""CRSF" #define LEN_TELEMETRY_PROTOCOLS "\013" @@ -431,7 +431,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(PCBXLITE) || defined(PCBI6) +#elif defined(PCBXLITE) || defined(PCBI6X) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0" #elif defined(PCBX7) @@ -466,13 +466,13 @@ #define TR_ROTENC_SWITCHES #endif -#if !defined(PCBTARANIS) && !defined(PCBHORUS) && !defined(PCBI6) +#if !defined(PCBTARANIS) && !defined(PCBHORUS) && !defined(PCBI6X) #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif #define TR_ON_ONE_SWITCHES "ON\0""One" -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) // only special switches here #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #elif defined(PCBSKY9X) diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 114a32b1a05..7da0f2bf2de 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -102,7 +102,7 @@ #define TR_USBMODES TR("Ask\0 ""Joyst\0""Storag""Serial", "Ask\0 ""Joystick""Storage\0""Serial\0 ") #define LEN_TARANIS_PROTOCOLS "\004" -#if defined(PCBI6) +#if defined(PCBI6X) #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""CRSF" #else #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2""CRSF""MULT""R9M\0""SBUS" @@ -426,7 +426,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(PCBXLITE) || defined(PCBI6) +#elif defined(PCBXLITE) || defined(PCBI6X) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0" #elif defined(PCBX7) @@ -461,13 +461,13 @@ #define TR_ROTENC_SWITCHES #endif -#if !defined(PCBTARANIS) && !defined(PCBHORUS) && !defined(PCBI6) +#if !defined(PCBTARANIS) && !defined(PCBHORUS) && !defined(PCBI6X) #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif #define TR_ON_ONE_SWITCHES "ON\0""One" -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) // only special switches here #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #elif defined(PCBSKY9X) diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 45be8d7c34a..3b27d2dffad 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -102,7 +102,7 @@ #define TR_USBMODES TR("Popup\0""Joyst\0""Storag""Série\0", "Demander""Joystick""Stockage""Série\0 ") #define LEN_TARANIS_PROTOCOLS "\004" -#if defined(PCBI6) +#if defined(PCBI6X) #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""CRSF" #else #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2""CRSF""MULT""R9M\0""SBUS" @@ -439,7 +439,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(PCBXLITE) || defined(PCBI6) +#elif defined(PCBXLITE) || defined(PCBI6X) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0" #elif defined(PCBX7) @@ -474,13 +474,13 @@ #define TR_ROTENC_SWITCHES #endif -#if !defined(PCBTARANIS) && !defined(PCBHORUS) && !defined(PCBI6) +#if !defined(PCBTARANIS) && !defined(PCBHORUS) && !defined(PCBI6X) #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif #define TR_ON_ONE_SWITCHES "ON\0""Un" -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) // only special switches here #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #elif defined(PCBSKY9X) diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index c8dcfe9a638..2697ce9437d 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -102,7 +102,7 @@ #define TR_USBMODES TR("Ask\0 ""Joyst\0""Storag""Serial", "Ask\0 ""Joystick""Storage\0""Serial\0 ") #define LEN_TARANIS_PROTOCOLS "\004" -#if defined(PCBI6) +#if defined(PCBI6X) #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""CRSF" #define LEN_TELEMETRY_PROTOCOLS "\013" @@ -432,7 +432,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(PCBXLITE) || defined(PCBI6) +#elif defined(PCBXLITE) || defined(PCBI6X) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0" #elif defined(PCBX7) diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 37202f86221..3b1e0a24207 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -104,7 +104,7 @@ #define TR_USBMODES TR("Ask\0 ""Joyst\0""Storag""Serial", "Ask\0 ""Joystick""Storage\0""Serial\0 ") #define LEN_TARANIS_PROTOCOLS "\004" -#if defined(PCBI6) +#if defined(PCBI6X) #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""CRSF" #else #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2""CRSF""MULT""R9M\0""SBUS" @@ -421,7 +421,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(PCBXLITE) || defined(PCBI6) +#elif defined(PCBXLITE) || defined(PCBI6X) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0" #elif defined(PCBX7) @@ -456,13 +456,13 @@ #define TR_ROTENC_SWITCHES #endif -#if !defined(PCBTARANIS) && !defined(PCBHORUS) && !defined(PCBI6) +#if !defined(PCBTARANIS) && !defined(PCBHORUS) && !defined(PCBI6X) #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif #define TR_ON_ONE_SWITCHES "ON\0""One" -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) // only special switches here #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #elif defined(PCBSKY9X) diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index bc017ec213b..e5272edcee3 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -102,7 +102,7 @@ #define TR_USBMODES TR("Ask\0 ""Joyst\0""Storag""Serial", "Ask\0 ""Joystick""Storage\0""Serial\0 ") #define LEN_TARANIS_PROTOCOLS "\004" -#if defined(PCBI6) +#if defined(PCBI6X) #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""CRSF" #else #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2""CRSF""MULT""R9M\0""SBUS" @@ -429,7 +429,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(PCBXLITE) || defined(PCBI6) +#elif defined(PCBXLITE) || defined(PCBI6X) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0" #elif defined(PCBX7) @@ -464,13 +464,13 @@ #define TR_ROTENC_SWITCHES #endif -#if !defined(PCBTARANIS) && !defined(PCBHORUS) && !defined(PCBI6) +#if !defined(PCBTARANIS) && !defined(PCBHORUS) && !defined(PCBI6X) #define TR_2POS_SWITCHES "GAZ""SK ""SW ""LOT""GEA""TRN" #endif #define TR_ON_ONE_SWITCHES "ON\0""One" -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) // only special switches here #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #elif defined(PCBSKY9X) diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 8c9239e333f..2eafc5194d7 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -102,7 +102,7 @@ #define TR_USBMODES TR("Ask\0 ""Joyst\0""Storag""Serial", "Ask\0 ""Joystick""Storage\0""Serial\0 ") #define LEN_TARANIS_PROTOCOLS "\004" -#if defined(PCBI6) +#if defined(PCBI6X) #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""CRSF" #else #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2""CRSF""MULT""R9M\0""SBUS" @@ -425,7 +425,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(PCBXLITE) || defined(PCBI6) +#elif defined(PCBXLITE) || defined(PCBI6X) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0" #elif defined(PCBX7) @@ -460,13 +460,13 @@ #define TR_ROTENC_SWITCHES #endif -#if !defined(PCBTARANIS) && !defined(PCBHORUS) && !defined(PCBI6) +#if !defined(PCBTARANIS) && !defined(PCBHORUS) && !defined(PCBI6X) #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif #define TR_ON_ONE_SWITCHES "ON\0""One" -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) // only special switches here #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #elif defined(PCBSKY9X) diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 2ff2e595c9b..e94ef95c7ff 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -102,7 +102,7 @@ #define TR_USBMODES TR("Ask\0 ""Joyst\0""Storag""Serial", "Ask\0 ""Joystick""Storage\0""Serial\0 ") #define LEN_TARANIS_PROTOCOLS "\004" -#if defined(PCBI6) +#if defined(PCBI6X) #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""CRSF" #else #define TR_TARANIS_PROTOCOLS "OFF\0""PPM\0""XJT\0""DSM2""CRSF""MULT""R9M\0""SBUS" @@ -433,7 +433,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(PCBXLITE) || defined(PCBI6) +#elif defined(PCBXLITE) || defined(PCBI6X) #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0" #elif defined(PCBX7) @@ -469,14 +469,14 @@ #endif -#if !defined(PCBTARANIS) && !defined(PCBHORUS) && !defined(PCBI6) +#if !defined(PCBTARANIS) && !defined(PCBHORUS) && !defined(PCBI6X) #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #endif #define TR_ON_ONE_SWITCHES "På\0""Ett" -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6) +#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBI6X) // only special switches here #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #elif defined(PCBSKY9X) From cd954a43165009566367a5a5f98da22043d647a6 Mon Sep 17 00:00:00 2001 From: ajjjjjjjj Date: Sun, 19 Dec 2021 15:48:08 +0100 Subject: [PATCH 2/2] Fixed custom func regression --- radio/src/dataconstants.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h index 00142f98c32..7b822a10d4c 100644 --- a/radio/src/dataconstants.h +++ b/radio/src/dataconstants.h @@ -749,16 +749,16 @@ enum Functions { // then the other functions FUNC_FIRST_WITHOUT_ENABLE, FUNC_PLAY_SOUND = FUNC_FIRST_WITHOUT_ENABLE, - FUNC_PLAY_TRACK, - FUNC_PLAY_VALUE, +// FUNC_PLAY_TRACK, +// FUNC_PLAY_VALUE, FUNC_RESERVE4, FUNC_PLAY_SCRIPT, FUNC_RESERVE5, - FUNC_BACKGND_MUSIC, - FUNC_BACKGND_MUSIC_PAUSE, +// FUNC_BACKGND_MUSIC, +// FUNC_BACKGND_MUSIC_PAUSE, FUNC_VARIO, FUNC_HAPTIC, - FUNC_LOGS, +// FUNC_LOGS, FUNC_BACKLIGHT, #if defined(PCBTARANIS) FUNC_SCREENSHOT,