From 394bc1689f64b8bf7417fe8bb2e10b295217e289 Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 18 Dec 2017 20:54:22 +0100 Subject: [PATCH] Massive cleaning (#5538) --- companion/src/boards.cpp | 4 - companion/src/boards.h | 4 +- .../src/firmwares/opentx/opentxinterface.cpp | 2 - jenkins/nightly-22/release-firmware.sh | 2 +- radio/src/CMakeLists.txt | 2 +- radio/src/audio_arm.cpp | 4 +- radio/src/cli.cpp | 67 ---------- radio/src/dataconstants.h | 72 +---------- radio/src/datastructs.h | 13 -- radio/src/gui/CMakeLists.txt | 2 +- radio/src/gui/gui_common.cpp | 2 +- radio/src/gui/gui_common_arm.cpp | 2 +- radio/src/haptic.cpp | 2 +- radio/src/keys.h | 2 +- radio/src/logs.cpp | 11 +- radio/src/lua/api_general.cpp | 2 - radio/src/mixer.cpp | 8 +- radio/src/myeeprom.h | 8 +- radio/src/opentx.cpp | 34 +----- radio/src/opentx.h | 20 ++- radio/src/pulses/pulses.h | 4 +- radio/src/simu.cpp | 22 +--- radio/src/stamp.cpp | 4 +- radio/src/storage/storage.h | 2 +- radio/src/switches.cpp | 115 +----------------- radio/src/targets/simu/opentxsimulator.cpp | 4 +- radio/src/targets/simu/simpgmspace.cpp | 27 +--- radio/src/translations/cz.h.txt | 16 +-- radio/src/translations/de.h.txt | 28 +---- radio/src/translations/en.h.txt | 28 +---- radio/src/translations/es.h.txt | 9 +- radio/src/translations/fi.h.txt | 9 +- radio/src/translations/fr.h.txt | 11 +- radio/src/translations/it.h.txt | 9 +- radio/src/translations/nl.h.txt | 28 +---- radio/src/translations/pl.h.txt | 9 +- radio/src/translations/pt.h.txt | 7 +- radio/src/translations/se.h.txt | 27 +--- 38 files changed, 75 insertions(+), 547 deletions(-) diff --git a/companion/src/boards.cpp b/companion/src/boards.cpp index 97435ac00..00bc06385 100644 --- a/companion/src/boards.cpp +++ b/companion/src/boards.cpp @@ -72,8 +72,6 @@ const int Boards::getEEpromSize(Board::Type board) case BOARD_TARANIS_X9D: case BOARD_TARANIS_X9DP: case BOARD_TARANIS_X9E: - case BOARD_FLAMENCO: - return EESIZE_TARANIS; case BOARD_UNKNOWN: return EESIZE_MAX; default: @@ -100,8 +98,6 @@ const int Boards::getFlashSize(Type board) case BOARD_TARANIS_X9DP: case BOARD_TARANIS_X9E: case BOARD_TARANIS_X7: - case BOARD_FLAMENCO: - return FSIZE_TARANIS; case BOARD_X12S: case BOARD_X10: return FSIZE_HORUS; diff --git a/companion/src/boards.h b/companion/src/boards.h index ce9e15695..7ce3a4213 100644 --- a/companion/src/boards.h +++ b/companion/src/boards.h @@ -42,7 +42,6 @@ namespace Board { BOARD_TARANIS_X9D, BOARD_TARANIS_X9DP, BOARD_TARANIS_X9E, - BOARD_FLAMENCO, BOARD_X12S, BOARD_X10, BOARD_ENUM_COUNT @@ -183,8 +182,7 @@ class Boards #define IS_HORUS_X10(board) (board==Board::BOARD_X10) #define IS_HORUS(board) (IS_HORUS_X12S(board) || IS_HORUS_X10(board)) #define IS_HORUS_OR_TARANIS(board) (IS_HORUS(board) || IS_TARANIS(board)) -#define IS_FLAMENCO(board) (board==Board::BOARD_FLAMENCO) -#define IS_STM32(board) (IS_TARANIS(board) || IS_HORUS(board) || IS_FLAMENCO(board)) +#define IS_STM32(board) (IS_TARANIS(board) || IS_HORUS(board)) #define IS_ARM(board) (IS_STM32(board) || IS_SKY9X(board)) #define HAS_LARGE_LCD(board) (IS_HORUS(board) || (IS_TARANIS(board) && !IS_TARANIS_X7(board))) diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index 2e94022e0..eefb659e3 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -88,8 +88,6 @@ const char * OpenTxEepromInterface::getName() return "OpenTX for 9XR-PRO"; case BOARD_AR9X: return "OpenTX for ar9x board / 9X"; - case BOARD_FLAMENCO: - return "OpenTX for Flamenco experimental"; case BOARD_X12S: return "OpenTX for FrSky Horus"; case BOARD_X10: diff --git a/jenkins/nightly-22/release-firmware.sh b/jenkins/nightly-22/release-firmware.sh index 1298a3009..033e1633f 100755 --- a/jenkins/nightly-22/release-firmware.sh +++ b/jenkins/nightly-22/release-firmware.sh @@ -25,7 +25,7 @@ tar czf ./opentx.tgz opentx/radio/src opentx/radio/util # make lua fields for all radio variants cd opentx/radio/src -make lua/lua_exports_taranis.inc lua/lua_exports_taranis_x9e.inc lua/lua_exports_horus.inc lua/lua_exports_flamenco.inc +make lua/lua_exports_taranis.inc lua/lua_exports_taranis_x9e.inc lua/lua_exports_horus.inc DESTDIR=/var/www/html/downloads-${version}/nightlies/firmware diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index 1d27bca09..414facee5 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -165,7 +165,7 @@ else() add_definitions(-DEEPROM -DEEPROM_RAW) endif() -if(ARCH STREQUAL ARM AND NOT PCB STREQUAL X12S AND NOT PCB STREQUAL X10 AND NOT PCB STREQUAL FLAMENCO) +if(ARCH STREQUAL ARM AND NOT PCB STREQUAL X12S AND NOT PCB STREQUAL X10) set(SRC ${SRC} storage/eeprom_conversions.cpp) endif() diff --git a/radio/src/audio_arm.cpp b/radio/src/audio_arm.cpp index 50a283e26..b1d89704b 100644 --- a/radio/src/audio_arm.cpp +++ b/radio/src/audio_arm.cpp @@ -196,7 +196,7 @@ const char * const audioFilenames[] = { "midstck2", "midstck3", "midstck4", -#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) +#if defined(PCBTARANIS) || defined(PCBHORUS) "midpot1", "midpot2", "midslid1", @@ -1102,7 +1102,7 @@ void audioEvent(unsigned int index) case AU_STICK4_MIDDLE: case AU_POT1_MIDDLE: case AU_POT2_MIDDLE: -#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) +#if defined(PCBTARANIS) || defined(PCBHORUS) case AU_SLIDER1_MIDDLE: case AU_SLIDER2_MIDDLE: #if defined(PCBX9E) diff --git a/radio/src/cli.cpp b/radio/src/cli.cpp index 2653f3699..66fecaf44 100644 --- a/radio/src/cli.cpp +++ b/radio/src/cli.cpp @@ -745,33 +745,6 @@ int cliReboot(const char ** argv) return 0; } -#if defined(PCBFLAMENCO) -int cliReadBQ24195(const char ** argv) -{ - int index = 0; - if (toInt(argv, 1, &index) > 0) { - serialPrint("BQ24195[%d] = 0x%02x", index, i2cReadBQ24195(index)); - } - else { - serialPrint("%s: Invalid arguments \"%s\" \"%s\"", argv[0], argv[1]); - } - return 0; -} - -int cliWriteBQ24195(const char ** argv) -{ - int index = 0; - int data = 0; - if (toInt(argv, 1, &index) > 0 && toInt(argv, 2, &data) > 0) { - i2cWriteBQ24195(index, data); - } - else { - serialPrint("%s: Invalid arguments \"%s\" \"%s\"", argv[0], argv[1], argv[2]); - } - return 0; -} -#endif - const MemArea memAreas[] = { { "RCC", RCC, sizeof(RCC_TypeDef) }, { "GPIOA", GPIOA, sizeof(GPIO_TypeDef) }, @@ -1006,42 +979,6 @@ int cliDisplay(const char ** argv) getCPUUniqueID(str); serialPrint("uid = %s", str); } -#endif -#if defined(PCBFLAMENCO) - else if (!strcmp(argv[1], "bq24195")) { - { - uint8_t reg = i2cReadBQ24195(0x00); - serialPrint(reg & 0x80 ? "HIZ enable" : "HIZ disable"); - } - { - uint8_t reg = i2cReadBQ24195(0x08); - serialPrint(reg & 0x01 ? "VBatt < VSysMin" : "VBatt > VSysMin"); - serialPrint(reg & 0x02 ? "Thermal sensor bad" : "Thermal sensor ok"); - serialPrint(reg & 0x04 ? "Power ok" : "Power bad"); - serialPrint(reg & 0x08 ? "Connected to charger" : "Not connected to charger"); - static const char * const CHARGE_STATUS[] = { "Not Charging", "Precharge", "Fast Charging", "Charge done" }; - serialPrint(CHARGE_STATUS[(reg & 0x30) >> 4]); - static const char * const INPUT_STATUS[] = { "Unknown input", "USB host input", "USB adapter port input", "OTG input" }; - serialPrint(INPUT_STATUS[(reg & 0xC0) >> 6]); - } - { - uint8_t reg = i2cReadBQ24195(0x09); - if (reg & 0x80) serialPrint("Watchdog timer expiration"); - uint8_t chargerFault = (reg & 0x30) >> 4; - if (chargerFault == 0x01) - serialPrint("Input fault"); - else if (chargerFault == 0x02) - serialPrint("Thermal shutdown"); - else if (chargerFault == 0x03) - serialPrint("Charge safety timer expiration"); - if (reg & 0x08) serialPrint("Battery over voltage fault"); - uint8_t ntcFault = (reg & 0x07); - if (ntcFault == 0x05) - serialPrint("NTC cold"); - else if (ntcFault == 0x06) - serialPrint("NTC hot"); - } - } #endif else if (!strcmp(argv[1], "tim")) { int timerNumber; @@ -1241,10 +1178,6 @@ const CliCommand cliCommands[] = { { "meminfo", cliMemoryInfo, "" }, { "test", cliTest, "new | std::exception | graphics | memspd" }, { "trace", cliTrace, "on | off" }, -#if defined(PCBFLAMENCO) - { "read_bq24195", cliReadBQ24195, "" }, - { "write_bq24195", cliWriteBQ24195, " " }, -#endif { "help", cliHelp, "[]" }, { "debugvars", cliDebugVars, "" }, { "repeat", cliRepeat, " " }, diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h index e01827c6d..bde00a8aa 100644 --- a/radio/src/dataconstants.h +++ b/radio/src/dataconstants.h @@ -46,18 +46,6 @@ #define MAX_TRAINER_CHANNELS 16 #define MAX_TELEMETRY_SENSORS 32 #define MAX_CUSTOM_SCREENS 5 -#elif defined(PCBFLAMENCO) - #define MAX_MODELS 60 - #define MAX_OUTPUT_CHANNELS 32 // number of real output channels CH1-CH32 - #define MAX_FLIGHT_MODES 9 - #define MAX_MIXERS 64 - #define MAX_EXPOS 64 - #define MAX_LOGICAL_SWITCHES 32 - #define MAX_SPECIAL_FUNCTIONS 64 // number of functions assigned to switches - #define MAX_SCRIPTS 7 - #define MAX_INPUTS 32 - #define MAX_TRAINER_CHANNELS 16 - #define MAX_TELEMETRY_SENSORS 32 #elif defined(PCBTARANIS) #define MAX_MODELS 60 #define MAX_OUTPUT_CHANNELS 32 // number of real output channels CH1-CH32 @@ -148,17 +136,6 @@ enum CurveType { #define LEN_FUNCTION_NAME 6 #define MAX_CURVES 32 #define MAX_CURVE_POINTS 512 -#elif defined(PCBFLAMENCO) - #define LEN_MODEL_NAME 12 - #define LEN_TIMER_NAME 8 - #define LEN_FLIGHT_MODE_NAME 10 - #define LEN_EXPOMIX_NAME 6 - #define LEN_CHANNEL_NAME 6 - #define LEN_INPUT_NAME 4 - #define LEN_CURVE_NAME 3 - #define LEN_FUNCTION_NAME 8 - #define MAX_CURVES 32 - #define MAX_CURVE_POINTS 512 #elif defined(PCBSKY9X) || defined(PCBX7) #define LEN_MODEL_NAME 10 #define LEN_TIMER_NAME 3 @@ -195,10 +172,6 @@ enum CurveType { #define NUM_MODULES 1 #endif -#if defined(PCBFLAMENCO) - #define NUM_SWITCHES 5 // TODO in board.h -#endif - #define XPOTS_MULTIPOS_COUNT 6 #if defined(PCBSKY9X) && defined(REVX) @@ -264,16 +237,7 @@ enum BeeperMode { e_mode_all }; -#if defined(PCBFLAMENCO) - enum ModuleIndex { - EXTERNAL_MODULE, - TRAINER_MODULE, - }; - enum TrainerMode { - TRAINER_MODE_MASTER, - TRAINER_MODE_SLAVE - }; -#elif defined(PCBTARANIS) || defined(PCBHORUS) +#if defined(PCBTARANIS) || defined(PCBHORUS) enum ModuleIndex { INTERNAL_MODULE, EXTERNAL_MODULE, @@ -565,25 +529,7 @@ enum SwitchSources { SWSRC_FIRST_SWITCH, -#if defined(PCBFLAMENCO) - SWSRC_SA0 = SWSRC_FIRST_SWITCH, - SWSRC_SA1, - SWSRC_SA2, - SWSRC_SB0, - SWSRC_SB2, - SWSRC_SC0, - SWSRC_SC1, - SWSRC_SC2, - SWSRC_SC3, - SWSRC_SC4, - SWSRC_SC5, - SWSRC_SE0, - SWSRC_SE2, - SWSRC_SF0, - SWSRC_SF1, - SWSRC_SF2, - SWSRC_LAST_SWITCH = SWSRC_SF2, -#elif defined(PCBTARANIS) || defined(PCBHORUS) +#if defined(PCBTARANIS) || defined(PCBHORUS) SWSRC_SA0 = SWSRC_FIRST_SWITCH, SWSRC_SA1, SWSRC_SA2, @@ -773,11 +719,6 @@ enum MixSources { MIXSRC_LS, LUA_EXPORT("ls", "Left rear slider") MIXSRC_RS, LUA_EXPORT("rs", "Right rear slider") MIXSRC_LAST_POT = MIXSRC_RS, -#elif defined(PCBFLAMENCO) - MIXSRC_POT1 = MIXSRC_FIRST_POT, LUA_EXPORT("sd", "Potentiometer D") - MIXSRC_SLIDER1, LUA_EXPORT("ls", "Left slider") - MIXSRC_SLIDER2, LUA_EXPORT("rs", "Right slider") - MIXSRC_LAST_POT = MIXSRC_SLIDER2, #elif defined(PCBX9E) MIXSRC_POT1 = MIXSRC_FIRST_POT, LUA_EXPORT("s1", "Potentiometer 1") MIXSRC_POT2, LUA_EXPORT("s2", "Potentiometer 2") @@ -850,14 +791,7 @@ enum MixSources { MIXSRC_FIRST_SWITCH, -#if defined(PCBFLAMENCO) - MIXSRC_SA = MIXSRC_FIRST_SWITCH, LUA_EXPORT("sa", "Switch A") - MIXSRC_SB, LUA_EXPORT("sb", "Switch B") - MIXSRC_SC, LUA_EXPORT("sc", "Switch C") - MIXSRC_SE, LUA_EXPORT("se", "Switch E") - MIXSRC_SF, LUA_EXPORT("sf", "Switch F") - MIXSRC_LAST_SWITCH = MIXSRC_SF, -#elif defined(PCBTARANIS) || defined(PCBHORUS) +#if defined(PCBTARANIS) || defined(PCBHORUS) MIXSRC_SA = MIXSRC_FIRST_SWITCH, LUA_EXPORT("sa", "Switch A") MIXSRC_SB, LUA_EXPORT("sb", "Switch B") MIXSRC_SC, LUA_EXPORT("sc", "Switch C") diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h index 0a18c8c6b..b652e9b55 100644 --- a/radio/src/datastructs.h +++ b/radio/src/datastructs.h @@ -794,8 +794,6 @@ PACK(struct CustomScreenData { #define MODELDATA_EXTRA NOBACKUP(uint8_t spare:3); NOBACKUP(uint8_t trainerMode:3); NOBACKUP(uint8_t potsWarnMode:2); ModuleData moduleData[NUM_MODULES+1]; NOBACKUP(ScriptData scriptsData[MAX_SCRIPTS]); NOBACKUP(char inputNames[MAX_INPUTS][LEN_INPUT_NAME]); NOBACKUP(uint8_t potsWarnEnabled); NOBACKUP(int8_t potsWarnPosition[NUM_POTS+NUM_SLIDERS]); #elif defined(PCBX10) #define MODELDATA_EXTRA NOBACKUP(uint8_t spare:3); NOBACKUP(uint8_t trainerMode:3); NOBACKUP(uint8_t potsWarnMode:2); ModuleData moduleData[NUM_MODULES+1]; NOBACKUP(ScriptData scriptsData[MAX_SCRIPTS]); NOBACKUP(char inputNames[MAX_INPUTS][LEN_INPUT_NAME]); NOBACKUP(uint8_t potsWarnEnabled); NOBACKUP(int8_t potsWarnPosition[NUM_POTS+NUM_SLIDERS]); NOBACKUP(uint8_t potsWarnSpares[NUM_DUMMY_ANAS]); -#elif defined(PCBFLAMENCO) - #define MODELDATA_EXTRA uint8_t spare:3; uint8_t trainerMode:3; uint8_t potsWarnMode:2; ModuleData moduleData[NUM_MODULES+1]; ScriptData scriptsData[MAX_SCRIPTS]; char inputNames[MAX_INPUTS][LEN_INPUT_NAME]; uint8_t potsWarnEnabled; int8_t potsWarnPosition[NUM_POTS+NUM_SLIDERS]; #elif defined(PCBTARANIS) #define MODELDATA_EXTRA uint8_t spare:3; uint8_t trainerMode:3; uint8_t potsWarnMode:2; ModuleData moduleData[NUM_MODULES+1]; ScriptData scriptsData[MAX_SCRIPTS]; char inputNames[MAX_INPUTS][LEN_INPUT_NAME]; uint8_t potsWarnEnabled; int8_t potsWarnPosition[NUM_POTS+NUM_SLIDERS]; #elif defined(PCBSKY9X) @@ -929,15 +927,6 @@ PACK(struct TrainerData { NOBACKUP(uint8_t spare:1); \ NOBACKUP(uint8_t blOffBright:7); \ NOBACKUP(char bluetoothName[LEN_BLUETOOTH_NAME]); -#elif defined(PCBFLAMENCO) - #define EXTRA_GENERAL_FIELDS \ - EXTRA_GENERAL_FIELDS_ARM \ - uint8_t serial2Mode:4; \ - uint8_t spareExtra:4; \ - uint32_t switchConfig; \ - uint8_t potsType; /*two bits for every pot*/\ - 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(PCBX7) #define BLUETOOTH_FIELDS \ @@ -1121,8 +1110,6 @@ static inline void check_struct() CHKSIZE(ModelData, 6507); #endif -#elif defined(PCBFLAMENCO) - #elif defined(PCBHORUS) CHKSIZE(MixData, 20); CHKSIZE(ExpoData, 17); diff --git a/radio/src/gui/CMakeLists.txt b/radio/src/gui/CMakeLists.txt index 622666374..5c3ad1cf9 100644 --- a/radio/src/gui/CMakeLists.txt +++ b/radio/src/gui/CMakeLists.txt @@ -60,7 +60,7 @@ if(ARCH STREQUAL ARM) ) endif() -if(PCB STREQUAL FLAMENCO OR PCB STREQUAL X12S OR PCB STREQUAL X10) +if(PCB STREQUAL X12S OR PCB STREQUAL X10) if(HELI) set(HELI_SRC gui/common/colorlcd/model_heli.cpp) endif() diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp index 8c7dd2215..27d35566f 100644 --- a/radio/src/gui/gui_common.cpp +++ b/radio/src/gui/gui_common.cpp @@ -20,7 +20,7 @@ #include "opentx.h" -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBFLAMENCO) +#if defined(PCBTARANIS) || defined(PCBHORUS) uint8_t switchToMix(uint8_t source) { div_t qr = div(source-1, 3); diff --git a/radio/src/gui/gui_common_arm.cpp b/radio/src/gui/gui_common_arm.cpp index 4f34d72dd..6d7f6e2a2 100644 --- a/radio/src/gui/gui_common_arm.cpp +++ b/radio/src/gui/gui_common_arm.cpp @@ -489,7 +489,7 @@ bool isSourceAvailableInResetSpecialFunction(int index) bool isModuleAvailable(int module) { -#if defined(CROSSFIRE) && !defined(PCBFLAMENCO) +#if defined(CROSSFIRE) if (module == MODULE_TYPE_CROSSFIRE && g_model.moduleData[INTERNAL_MODULE].type != MODULE_TYPE_NONE) { return false; } diff --git a/radio/src/haptic.cpp b/radio/src/haptic.cpp index 4866f1887..888900d3f 100644 --- a/radio/src/haptic.cpp +++ b/radio/src/haptic.cpp @@ -38,7 +38,7 @@ void hapticQueue::heartbeat() #else if (buzzTimeLeft > 0) { buzzTimeLeft--; // time gets counted down -#if defined(PCBSKY9X) || defined(PCBX9DP) || defined(PCBX9E) || defined(PCBFLAMENCO) || defined(PCBHORUS) +#if defined(PCBSKY9X) || defined(PCBX9DP) || defined(PCBX9E) || defined(PCBHORUS) // TODO define HAPTIC_PWM option hapticOn(HAPTIC_STRENGTH() * 20); #else diff --git a/radio/src/keys.h b/radio/src/keys.h index eed19a8e2..a6803de1d 100644 --- a/radio/src/keys.h +++ b/radio/src/keys.h @@ -52,7 +52,7 @@ #define IS_KEY_REPT(evt) (((evt) & _MSK_KEY_FLAGS) == _MSK_KEY_REPT) #define IS_KEY_BREAK(evt) (((evt) & _MSK_KEY_FLAGS) == _MSK_KEY_BREAK) -#if (defined(PCBHORUS) || defined(PCBFLAMENCO) || defined(PCBTARANIS)) && defined(ROTARY_ENCODER_NAVIGATION) +#if (defined(PCBHORUS) || defined(PCBTARANIS)) && defined(ROTARY_ENCODER_NAVIGATION) typedef uint16_t event_t; #define EVT_ROTARY_BREAK EVT_KEY_BREAK(KEY_ENTER) #define EVT_ROTARY_LONG EVT_KEY_LONG(KEY_ENTER) diff --git a/radio/src/logs.cpp b/radio/src/logs.cpp index 85b76e866..e4c9224d6 100644 --- a/radio/src/logs.cpp +++ b/radio/src/logs.cpp @@ -27,7 +27,7 @@ uint8_t logDelay; void writeHeader(); -#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) +#if defined(PCBTARANIS) || defined(PCBHORUS) #define GET_2POS_STATE(sw) (switchState(SW_ ## sw ## 0) ? -1 : 1) #else #define GET_2POS_STATE(sw) (switchState(SW_ ## sw) ? -1 : 1) @@ -342,14 +342,7 @@ void logsWrite() f_printf(&g_oLogFile, "%d,", calibratedAnalogs[i]); } -#if defined(PCBFLAMENCO) - f_printf(&g_oLogFile, "%d,%d,%d,%d,", - GET_3POS_STATE(SA), - GET_3POS_STATE(SB), - // GET_3POS_STATE(SC), - GET_2POS_STATE(SE), - GET_3POS_STATE(SF)); -#elif defined(PCBX7) +#if defined(PCBX7) f_printf(&g_oLogFile, "%d,%d,%d,%d,%d,%d,0x%08X%08X,", GET_3POS_STATE(SA), GET_3POS_STATE(SB), diff --git a/radio/src/lua/api_general.cpp b/radio/src/lua/api_general.cpp index 615663f39..b63ee7e2e 100644 --- a/radio/src/lua/api_general.cpp +++ b/radio/src/lua/api_general.cpp @@ -29,8 +29,6 @@ #include "lua/lua_exports_x12s.inc" // this line must be after lua headers #elif defined(PCBX10) #include "lua/lua_exports_x10.inc" -#elif defined(PCBFLAMENCO) - #include "lua/lua_exports_flamenco.inc" #elif defined(PCBX9E) #include "lua/lua_exports_x9e.inc" #elif defined(PCBX7) diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp index 5c1562d04..576c2a545 100644 --- a/radio/src/mixer.cpp +++ b/radio/src/mixer.cpp @@ -382,13 +382,7 @@ getvalue_t getValue(mixsrc_t i) return calc1000toRESX((int16_t)8 * getTrimValue(mixerCurrentFlightMode, i-MIXSRC_FIRST_TRIM)); } -#if defined(PCBFLAMENCO) - else if (i==MIXSRC_SA) return (switchState(SW_SA0) ? -1024 : (switchState(SW_SA1) ? 0 : 1024)); - else if (i==MIXSRC_SB) return (switchState(SW_SB0) ? -1024 : 1024); - else if (i==MIXSRC_SC) return (switchState(SW_SC0) ? -1024 : (switchState(SW_SC1) ? 0 : 1024)); - else if (i==MIXSRC_SE) return (switchState(SW_SE0) ? -1024 : 1024); - else if (i==MIXSRC_SF) return (switchState(SW_SF0) ? -1024 : (switchState(SW_SF1) ? 0 : 1024)); -#elif defined(PCBTARANIS) || defined(PCBHORUS) +#if defined(PCBTARANIS) || defined(PCBHORUS) 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 bf9dcb27d..abe8596f0 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -137,7 +137,7 @@ #define CFN_GVAR_CST_MAX 125 #endif -#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBFLAMENCO) +#if defined(PCBTARANIS) || defined(PCBHORUS) enum SwitchConfig { SWITCH_NONE, SWITCH_TOGGLE, @@ -604,11 +604,7 @@ enum FailsafeModes { enum ThrottleSources { THROTTLE_SOURCE_THR, THROTTLE_SOURCE_FIRST_POT, -#if defined(PCBFLAMENCO) - THROTTLE_SOURCE_SD, - THROTTLE_SOURCE_LS, - THROTTLE_SOURCE_RS, -#elif defined(PCBX9E) +#if defined(PCBX9E) THROTTLE_SOURCE_F1 = THROTTLE_SOURCE_FIRST_POT, THROTTLE_SOURCE_F2, THROTTLE_SOURCE_F3, diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 6cfa55a5e..5590014a4 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -234,11 +234,7 @@ void generalDefault() g_eeGeneral.contrast = LCD_CONTRAST_DEFAULT; #endif -#if defined(PCBFLAMENCO) - g_eeGeneral.vBatWarn = 33; - g_eeGeneral.vBatMin = -60; // 0 is 9.0V - g_eeGeneral.vBatMax = -78; // 0 is 12.0V -#elif defined(PCBHORUS) +#if defined(PCBHORUS) #if PCBREV >= 13 g_eeGeneral.potsConfig = 0x1B; // S1 = pot, 6P = multipos, S2 = pot with detent #else @@ -283,15 +279,11 @@ void generalDefault() g_eeGeneral.stickMode = DEFAULT_MODE-1; #endif -#if defined(PCBFLAMENCO) - g_eeGeneral.templateSetup = 21; /* AETR */ -#elif defined(PCBTARANIS) +#if defined(PCBTARANIS) g_eeGeneral.templateSetup = 17; /* TAER */ #endif -#if defined(PCBFLAMENCO) - g_eeGeneral.inactivityTimer = 50; -#elif !defined(CPUM64) +#if !defined(CPUM64) g_eeGeneral.backlightMode = e_backlight_mode_all; g_eeGeneral.lightAutoOff = 2; g_eeGeneral.inactivityTimer = 10; @@ -895,23 +887,9 @@ void checkBacklight() } } -#if defined(PCBFLAMENCO) -void checkUsbChip() -{ - uint8_t reg = i2cReadBQ24195(0x00); - if (reg & 0x80) { - i2cWriteBQ24195(0x00, reg & 0x7F); - } -} -#endif - void doLoopCommonActions() { checkBacklight(); - -#if defined(PCBFLAMENCO) - checkUsbChip(); -#endif } void backlightOn() @@ -2661,7 +2639,7 @@ int main() bluetoothInit(BLUETOOTH_DEFAULT_BAUDRATE); //BT is turn on for a brief period to differentiate X7 and X7S #endif -#if defined(GUI) && !defined(PCBTARANIS) && !defined(PCBFLAMENCO) && !defined(PCBHORUS) +#if defined(GUI) && !defined(PCBTARANIS) && !defined(PCBHORUS) // TODO remove this lcdInit(); #endif @@ -2728,10 +2706,6 @@ int main() uint8_t shutdown_state = 0; #endif -#if defined(PCBFLAMENCO) - // TODO not here it's an ARM board ... menuEntryTime = get_tmr10ms() - 200; -#endif - while (1) { #if defined(CPUM2560) if ((shutdown_state=pwrCheck()) > e_power_trainer) diff --git a/radio/src/opentx.h b/radio/src/opentx.h index a0efa94a7..59bcf05ae 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -288,8 +288,7 @@ #include "debug.h" -#if defined(PCBFLAMENCO) -#elif defined(PCBTARANIS) || defined(PCBHORUS) +#if defined(PCBTARANIS) || defined(PCBHORUS) #define SWSRC_THR SWSRC_SF2 #define SWSRC_GEA SWSRC_SG2 #define SWSRC_ID0 SWSRC_SA0 @@ -325,11 +324,6 @@ void memswap(void * a, void * b, uint8_t size); #define IS_POT_WITHOUT_DETENT(x) (false) #define IS_POT_SLIDER_AVAILABLE(x) (true) #define IS_MULTIPOS_CALIBRATED(cal) (false) -#elif defined(PCBFLAMENCO) - #define IS_POT_MULTIPOS(x) (false) - #define IS_POT_WITHOUT_DETENT(x) (false) - #define IS_POT_SLIDER_AVAILABLE(x) (true) - #define IS_MULTIPOS_CALIBRATED(cal) (false) #else #define IS_POT_MULTIPOS(x) (false) #define IS_POT_WITHOUT_DETENT(x) (true) @@ -538,7 +532,7 @@ extern uint8_t channel_order(uint8_t x); #define SPLASH_TIMEOUT 0 /* we use the splash duration to load stuff from the SD */ #elif defined(FSPLASH) #define SPLASH_TIMEOUT (g_eeGeneral.splashMode == 0 ? 60000/*infinite=10mn*/ : ((4*100) * (g_eeGeneral.splashMode & 0x03))) -#elif defined(PCBTARANIS) || defined(PCBFLAMENCO) +#elif defined(PCBTARANIS) #define SPLASH_TIMEOUT (g_eeGeneral.splashMode==-4 ? 1500 : (g_eeGeneral.splashMode<=0 ? (400-g_eeGeneral.splashMode*200) : (400-g_eeGeneral.splashMode*100))) #else #define SPLASH_TIMEOUT (4*100) // 4 seconds @@ -565,7 +559,7 @@ extern uint8_t channel_order(uint8_t x); #define HEART_TIMER_10MS 1 #define HEART_TIMER_PULSES 2 // when multiple modules this is the first one -#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) +#if defined(PCBTARANIS) || defined(PCBHORUS) #define HEART_WDT_CHECK (HEART_TIMER_10MS + (HEART_TIMER_PULSES << 0) + (HEART_TIMER_PULSES << 1)) #else #define HEART_WDT_CHECK (HEART_TIMER_10MS + HEART_TIMER_PULSES) @@ -608,7 +602,7 @@ int zchar2str(char *dest, const char *src, int size); #include "keys.h" #include "pwr.h" -#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) +#if defined(PCBTARANIS) || defined(PCBHORUS) div_t switchInfo(int switchPosition); extern uint8_t potsPos[NUM_XPOTS]; #endif @@ -719,7 +713,7 @@ void logicalSwitchesReset(); #define LS_RECURSIVE_EVALUATION_RESET() s_last_switch_used = 0 #endif -#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) +#if defined(PCBTARANIS) || defined(PCBHORUS) void getSwitchesPosition(bool startup); #else #define getSwitchesPosition(...) @@ -1284,7 +1278,7 @@ enum AUDIO_SOUNDS { AU_STICK3_MIDDLE, AU_STICK4_MIDDLE, #endif -#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) +#if defined(PCBTARANIS) || defined(PCBHORUS) AU_POT1_MIDDLE, AU_POT2_MIDDLE, AU_SLIDER1_MIDDLE, @@ -1435,7 +1429,7 @@ union ReusableBuffer int16_t loVals[NUM_STICKS+NUM_POTS+NUM_SLIDERS+NUM_MOUSE_ANALOGS]; int16_t hiVals[NUM_STICKS+NUM_POTS+NUM_SLIDERS+NUM_MOUSE_ANALOGS]; uint8_t state; -#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) +#if defined(PCBTARANIS) || defined(PCBHORUS) struct { uint8_t stepsCount; int16_t steps[XPOTS_MULTIPOS_COUNT]; diff --git a/radio/src/pulses/pulses.h b/radio/src/pulses/pulses.h index d5f145033..4399d8163 100644 --- a/radio/src/pulses/pulses.h +++ b/radio/src/pulses/pulses.h @@ -2,7 +2,7 @@ * Copyright (C) OpenTX * * Based on code named - * th9x - http://code.google.com/p/th9x + * th9x - http://code.google.com/p/th9x * er9x - http://code.google.com/p/er9x * gruvin9x - http://code.google.com/p/gruvin9x * @@ -39,7 +39,7 @@ enum ModuleFlag #define IS_RANGECHECK_ENABLE() (moduleFlag[0] == MODULE_RANGECHECK) #endif -#if defined(DSM2) && !defined(PCBTARANIS) && !defined(PCBFLAMENCO) +#if defined(DSM2) && !defined(PCBTARANIS) #define DSM2_BIND_TIMEOUT 255 // 255*11ms extern uint8_t dsm2BindTimer; #endif diff --git a/radio/src/simu.cpp b/radio/src/simu.cpp index d3ba4744e..2346870e6 100644 --- a/radio/src/simu.cpp +++ b/radio/src/simu.cpp @@ -250,11 +250,6 @@ void Open9xSim::updateKeysAndSwitches(bool start) KEY_Down, KEY_DOWN, KEY_Right, KEY_RIGHT, KEY_Left, KEY_LEFT, -#elif defined(PCBFLAMENCO) - KEY_Page_Up, KEY_MENU, - KEY_Page_Down, KEY_PAGE, - KEY_Return, KEY_ENTER, - KEY_BackSpace, KEY_EXIT, #elif defined(PCBTARANIS) KEY_Page_Up, KEY_MENU, KEY_Page_Down, KEY_PAGE, @@ -309,14 +304,7 @@ void Open9xSim::updateKeysAndSwitches(bool start) } \ simuSetSwitch(swtch, state_##swtch-states); -#if defined(PCBFLAMENCO) - SWITCH_KEY(A, 0, 3); - SWITCH_KEY(B, 1, 2); - // SWITCH_KEY(C, 2, 3); - // SWITCH_KEY(D, 3, 3); - SWITCH_KEY(E, 4, 2); - SWITCH_KEY(F, 5, 3); -#elif defined(PCBX9E) +#if defined(PCBX9E) SWITCH_KEY(A, 0, 3); SWITCH_KEY(B, 1, 3); SWITCH_KEY(C, 2, 3); @@ -482,12 +470,6 @@ void Open9xSim::refreshDisplay() setPixel(x, y, color); } } -#elif defined(PCBFLAMENCO) - display_t z = simuLcdBuf[y * LCD_W + x]; - if (1) { - FXColor color = FXRGB(255*((z&0xF00)>>8)/0x0f, 255*((z&0x0F0)>>4)/0x0f, 255*(z&0x00F)/0x0f); - setPixel(x, y, color); - } #elif LCD_W >= 212 display_t * p = &simuLcdBuf[y / 2 * LCD_W + x]; uint8_t z = (y & 1) ? (*p >> 4) : (*p & 0x0F); @@ -586,7 +568,7 @@ uint16_t anaIn(uint8_t chan) #elif defined(PCBX9E) else if (chan == TX_VOLTAGE) return 1420; //~10.6V -#elif defined(PCBTARANIS) || defined(PCBFLAMENCO) +#elif defined(PCBTARANIS) else if (chan == TX_VOLTAGE) return 1000; //~7.4V #elif defined(PCBSKY9X) diff --git a/radio/src/stamp.cpp b/radio/src/stamp.cpp index fb022f364..ade0a1a11 100644 --- a/radio/src/stamp.cpp +++ b/radio/src/stamp.cpp @@ -2,7 +2,7 @@ * Copyright (C) OpenTX * * Based on code named - * th9x - http://code.google.com/p/th9x + * th9x - http://code.google.com/p/th9x * er9x - http://code.google.com/p/er9x * gruvin9x - http://code.google.com/p/gruvin9x * @@ -32,8 +32,6 @@ #if defined(PCBHORUS) #define TAB "\037\075" -#elif defined(PCBFLAMENCO) -#define TAB "\037\050" #endif #if defined(COLORLCD) diff --git a/radio/src/storage/storage.h b/radio/src/storage/storage.h index f1b0dd495..822787815 100644 --- a/radio/src/storage/storage.h +++ b/radio/src/storage/storage.h @@ -25,7 +25,7 @@ #define WRITE_DELAY_10MS 100 #elif defined(RAMBACKUP) #define WRITE_DELAY_10MS 1500 /* 15s */ -#elif defined(PCBTARANIS) || defined(PCBFLAMENCO) +#elif defined(PCBTARANIS) #define WRITE_DELAY_10MS 500 #elif defined(PCBSKY9X) && !defined(REV0) #define WRITE_DELAY_10MS 500 diff --git a/radio/src/switches.cpp b/radio/src/switches.cpp index df3134ed0..f63b72b16 100644 --- a/radio/src/switches.cpp +++ b/radio/src/switches.cpp @@ -22,11 +22,7 @@ #define CS_LAST_VALUE_INIT -32768 -#if defined(PCBFLAMENCO) - #define SWITCH_WARNING_LIST_X 60 - #define SWITCH_WARNING_LIST_Y 4*FH+3 - #define SWITCH_WARNING_LIST_INTERVAL 20 -#elif defined(PCBHORUS) +#if defined(PCBHORUS) #define SWITCH_WARNING_LIST_X WARNING_LINE_X #define SWITCH_WARNING_LIST_Y WARNING_LINE_Y+3*FH #define SWITCH_WARNING_LIST_INTERVAL 35 @@ -71,84 +67,6 @@ volatile GETSWITCH_RECURSIVE_TYPE s_last_switch_value = 0; #endif -#if defined(PCBFLAMENCO) -tmr10ms_t potsLastposStart[1]; -uint8_t potsPos[1]; -tmr10ms_t switchesMidposStart[2]; -uint64_t switchesPos = 0; -div_t switchInfo(int switchPosition) -{ - const div_t infos[] = { - { 0, 0 }, { 0, 1 }, { 0, 2 }, - { 1, 0 }, { 1, 1 }, - { 2, 0 }, { 2, 1 }, { 2, 2 }, { 2, 3 }, { 2, 4 }, { 2, 5 }, - { 4, 0 }, { 4, 1 }, - { 5, 0 }, { 5, 1 }, { 5, 2 }, - }; - return infos[switchPosition-SWSRC_FIRST_SWITCH]; -} - -uint32_t check2PosSwitchPosition(uint8_t sw) -{ - uint32_t index = (switchState(sw) ? sw : sw + 1); - uint32_t result = ((uint32_t)1 << index); - - if (!(switchesPos & result)) { - PLAY_SWITCH_MOVED(index); - } - - return result; -} - -uint32_t check3PosSwitchPosition(int idx, uint8_t sw, bool startup) -{ - uint32_t result; - uint32_t index; - - if (switchState(sw)) { - index = sw; - result = (1 << index); - switchesMidposStart[idx] = 0; - } - else if (switchState(sw+2)) { - index = sw + 2; - result = (1 << index); - switchesMidposStart[idx] = 0; - } - else if (startup || (switchesPos & (1 << (sw + 1))) || g_eeGeneral.switchesDelay==SWITCHES_DELAY_NONE || (switchesMidposStart[idx] && (tmr10ms_t)(get_tmr10ms() - switchesMidposStart[idx]) > SWITCHES_DELAY())) { - index = sw + 1; - result = (1 << index); - switchesMidposStart[idx] = 0; - } - else { - index = sw + 1; - if (!switchesMidposStart[idx]) { - switchesMidposStart[idx] = get_tmr10ms(); - } - result = (switchesPos & (0x7 << sw)); - } - - if (!(switchesPos & result)) { - PLAY_SWITCH_MOVED(index); - } - - return result; -} - -#define CHECK_2POS(sw) newPos |= check2PosSwitchPosition(sw ## 0) -#define CHECK_3POS(idx, sw) newPos |= check3PosSwitchPosition(idx, sw ## 0, startup) - -void getSwitchesPosition(bool startup) -{ - uint64_t newPos = 0; - CHECK_3POS(0, SW_SA); - CHECK_2POS(SW_SB); - CHECK_2POS(SW_SE); - CHECK_3POS(1, SW_SF); - switchesPos = newPos; -} -#endif - #if defined(PCBTARANIS) || defined(PCBHORUS) #if defined(PCBX9E) tmr10ms_t switchesMidposStart[16]; @@ -542,7 +460,7 @@ bool getSwitch(swsrc_t swtch) result = true; } else if (cs_idx <= SWSRC_LAST_SWITCH) { -#if defined(PCBTARANIS) || defined(PCBHORUS) // TODO || defined(PCBFLAMENCO) +#if defined(PCBTARANIS) || defined(PCBHORUS) if (flags & GETSWITCH_MIDPOS_DELAY) result = SWITCH_POSITION(cs_idx-SWSRC_FIRST_SWITCH); else @@ -658,28 +576,7 @@ swsrc_t getMovedSwitch() static tmr10ms_t s_move_last_time = 0; swsrc_t result = 0; -#if defined(PCBFLAMENCO) -#if 0 - for (int i=0; i> (i*3); - uint8_t next = (1024+getValue(MIXSRC_SA+i)) / 1024; - if (prev != next) { - switches_states = (switches_states & (~mask)) | ((swarnstate_t)next << (i*3)); - if (i == 0) - result = 1+next; - else if (i == 1) - result = 1+(3*1)+(next!=0); - else if (i == 3) - result = 12+(next!=0); - else if (i == 4) - result = 14+next; - else - result = 0; - } - } -#endif -#elif defined(PCBTARANIS) || defined(PCBHORUS) +#if defined(PCBTARANIS) || defined(PCBHORUS) for (int i=0; i