Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-12 19:10:19 +03:00
Code Issues Wiki Activity

Massive cleaning (#5538)

Browse source
This commit is contained in:
3djc 2017-12-18 20:54:22 +01:00 • committed by Bertrand Songis
parent 6839939140
commit 394bc1689f
38 changed files with 75 additions and 547 deletions
Download patch file Download diff file Expand all files Collapse all files

4
companion/src/boards.cpp
View file

@ -72,8 +72,6 @@ const int Boards::getEEpromSize(Board::Type board)
case BOARD_TARANIS_X9D: case BOARD_TARANIS_X9D:
case BOARD_TARANIS_X9DP: case BOARD_TARANIS_X9DP:
case BOARD_TARANIS_X9E: case BOARD_TARANIS_X9E:
case BOARD_FLAMENCO:
return EESIZE_TARANIS;
case BOARD_UNKNOWN: case BOARD_UNKNOWN:
return EESIZE_MAX; return EESIZE_MAX;
default: default:
@ -100,8 +98,6 @@ const int Boards::getFlashSize(Type board)
case BOARD_TARANIS_X9DP: case BOARD_TARANIS_X9DP:
case BOARD_TARANIS_X9E: case BOARD_TARANIS_X9E:
case BOARD_TARANIS_X7: case BOARD_TARANIS_X7:
case BOARD_FLAMENCO:
return FSIZE_TARANIS;
case BOARD_X12S: case BOARD_X12S:
case BOARD_X10: case BOARD_X10:
return FSIZE_HORUS; return FSIZE_HORUS;

4
companion/src/boards.h
View file

@ -42,7 +42,6 @@ namespace Board {
BOARD_TARANIS_X9D, BOARD_TARANIS_X9D,
BOARD_TARANIS_X9DP, BOARD_TARANIS_X9DP,
BOARD_TARANIS_X9E, BOARD_TARANIS_X9E,
BOARD_FLAMENCO,
BOARD_X12S, BOARD_X12S,
BOARD_X10, BOARD_X10,
BOARD_ENUM_COUNT BOARD_ENUM_COUNT
@ -183,8 +182,7 @@ class Boards
#define IS_HORUS_X10(board) (board==Board::BOARD_X10) #define IS_HORUS_X10(board) (board==Board::BOARD_X10)
#define IS_HORUS(board) (IS_HORUS_X12S(board) || IS_HORUS_X10(board)) #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_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))
#define IS_STM32(board) (IS_TARANIS(board) || IS_HORUS(board) || IS_FLAMENCO(board))
#define IS_ARM(board) (IS_STM32(board) || IS_SKY9X(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))) #define HAS_LARGE_LCD(board) (IS_HORUS(board) || (IS_TARANIS(board) && !IS_TARANIS_X7(board)))

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

@ -88,8 +88,6 @@ const char * OpenTxEepromInterface::getName()
return "OpenTX for 9XR-PRO"; return "OpenTX for 9XR-PRO";
case BOARD_AR9X: case BOARD_AR9X:
return "OpenTX for ar9x board / 9X"; return "OpenTX for ar9x board / 9X";
case BOARD_FLAMENCO:
return "OpenTX for Flamenco experimental";
case BOARD_X12S: case BOARD_X12S:
return "OpenTX for FrSky Horus"; return "OpenTX for FrSky Horus";
case BOARD_X10: case BOARD_X10:

2
jenkins/nightly-22/release-firmware.sh
View file

@ -25,7 +25,7 @@ tar czf ./opentx.tgz opentx/radio/src opentx/radio/util
# make lua fields for all radio variants # make lua fields for all radio variants
cd opentx/radio/src 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 DESTDIR=/var/www/html/downloads-${version}/nightlies/firmware

2
radio/src/CMakeLists.txt
View file

@ -165,7 +165,7 @@ else()
add_definitions(-DEEPROM -DEEPROM_RAW) add_definitions(-DEEPROM -DEEPROM_RAW)
endif() 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) set(SRC ${SRC} storage/eeprom_conversions.cpp)
endif() endif()

4
radio/src/audio_arm.cpp
View file

@ -196,7 +196,7 @@ const char * const audioFilenames[] = {
"midstck2", "midstck2",
"midstck3", "midstck3",
"midstck4", "midstck4",
#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) #if defined(PCBTARANIS) || defined(PCBHORUS)
"midpot1", "midpot1",
"midpot2", "midpot2",
"midslid1", "midslid1",
@ -1102,7 +1102,7 @@ void audioEvent(unsigned int index)
case AU_STICK4_MIDDLE: case AU_STICK4_MIDDLE:
case AU_POT1_MIDDLE: case AU_POT1_MIDDLE:
case AU_POT2_MIDDLE: case AU_POT2_MIDDLE:
#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) #if defined(PCBTARANIS) || defined(PCBHORUS)
case AU_SLIDER1_MIDDLE: case AU_SLIDER1_MIDDLE:
case AU_SLIDER2_MIDDLE: case AU_SLIDER2_MIDDLE:
#if defined(PCBX9E) #if defined(PCBX9E)

67
radio/src/cli.cpp
View file

@ -745,33 +745,6 @@ int cliReboot(const char ** argv)
return 0; 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[] = { const MemArea memAreas[] = {
{ "RCC", RCC, sizeof(RCC_TypeDef) }, { "RCC", RCC, sizeof(RCC_TypeDef) },
{ "GPIOA", GPIOA, sizeof(GPIO_TypeDef) }, { "GPIOA", GPIOA, sizeof(GPIO_TypeDef) },
@ -1006,42 +979,6 @@ int cliDisplay(const char ** argv)
getCPUUniqueID(str); getCPUUniqueID(str);
serialPrint("uid = %s", 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 #endif
else if (!strcmp(argv[1], "tim")) { else if (!strcmp(argv[1], "tim")) {
int timerNumber; int timerNumber;
@ -1241,10 +1178,6 @@ const CliCommand cliCommands[] = {
{ "meminfo", cliMemoryInfo, "" }, { "meminfo", cliMemoryInfo, "" },
{ "test", cliTest, "new | std::exception | graphics | memspd" }, { "test", cliTest, "new | std::exception | graphics | memspd" },
{ "trace", cliTrace, "on | off" }, { "trace", cliTrace, "on | off" },
#if defined(PCBFLAMENCO)
{ "read_bq24195", cliReadBQ24195, "<register>" },
{ "write_bq24195", cliWriteBQ24195, "<register> <data>" },
#endif
{ "help", cliHelp, "[<command>]" }, { "help", cliHelp, "[<command>]" },
{ "debugvars", cliDebugVars, "" }, { "debugvars", cliDebugVars, "" },
{ "repeat", cliRepeat, "<interval> <command>" }, { "repeat", cliRepeat, "<interval> <command>" },

72
radio/src/dataconstants.h
View file

@ -46,18 +46,6 @@
#define MAX_TRAINER_CHANNELS 16 #define MAX_TRAINER_CHANNELS 16
#define MAX_TELEMETRY_SENSORS 32 #define MAX_TELEMETRY_SENSORS 32
#define MAX_CUSTOM_SCREENS 5 #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) #elif defined(PCBTARANIS)
#define MAX_MODELS 60 #define MAX_MODELS 60
#define MAX_OUTPUT_CHANNELS 32 // number of real output channels CH1-CH32 #define MAX_OUTPUT_CHANNELS 32 // number of real output channels CH1-CH32
@ -148,17 +136,6 @@ enum CurveType {
#define LEN_FUNCTION_NAME 6 #define LEN_FUNCTION_NAME 6
#define MAX_CURVES 32 #define MAX_CURVES 32
#define MAX_CURVE_POINTS 512 #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) #elif defined(PCBSKY9X) || defined(PCBX7)
#define LEN_MODEL_NAME 10 #define LEN_MODEL_NAME 10
#define LEN_TIMER_NAME 3 #define LEN_TIMER_NAME 3
@ -195,10 +172,6 @@ enum CurveType {
#define NUM_MODULES 1 #define NUM_MODULES 1
#endif #endif
#if defined(PCBFLAMENCO)
#define NUM_SWITCHES 5 // TODO in board.h
#endif
#define XPOTS_MULTIPOS_COUNT 6 #define XPOTS_MULTIPOS_COUNT 6
#if defined(PCBSKY9X) && defined(REVX) #if defined(PCBSKY9X) && defined(REVX)
@ -264,16 +237,7 @@ enum BeeperMode {
e_mode_all e_mode_all
}; };
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
enum ModuleIndex {
EXTERNAL_MODULE,
TRAINER_MODULE,
};
enum TrainerMode {
TRAINER_MODE_MASTER,
TRAINER_MODE_SLAVE
};
#elif defined(PCBTARANIS) || defined(PCBHORUS)
enum ModuleIndex { enum ModuleIndex {
INTERNAL_MODULE, INTERNAL_MODULE,
EXTERNAL_MODULE, EXTERNAL_MODULE,
@ -565,25 +529,7 @@ enum SwitchSources {
SWSRC_FIRST_SWITCH, SWSRC_FIRST_SWITCH,
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
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)
SWSRC_SA0 = SWSRC_FIRST_SWITCH, SWSRC_SA0 = SWSRC_FIRST_SWITCH,
SWSRC_SA1, SWSRC_SA1,
SWSRC_SA2, SWSRC_SA2,
@ -773,11 +719,6 @@ enum MixSources {
MIXSRC_LS, LUA_EXPORT("ls", "Left rear slider") MIXSRC_LS, LUA_EXPORT("ls", "Left rear slider")
MIXSRC_RS, LUA_EXPORT("rs", "Right rear slider") MIXSRC_RS, LUA_EXPORT("rs", "Right rear slider")
MIXSRC_LAST_POT = MIXSRC_RS, 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) #elif defined(PCBX9E)
MIXSRC_POT1 = MIXSRC_FIRST_POT, LUA_EXPORT("s1", "Potentiometer 1") MIXSRC_POT1 = MIXSRC_FIRST_POT, LUA_EXPORT("s1", "Potentiometer 1")
MIXSRC_POT2, LUA_EXPORT("s2", "Potentiometer 2") MIXSRC_POT2, LUA_EXPORT("s2", "Potentiometer 2")
@ -850,14 +791,7 @@ enum MixSources {
MIXSRC_FIRST_SWITCH, MIXSRC_FIRST_SWITCH,
#if defined(PCBFLAMENCO) #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")
MIXSRC_SE, LUA_EXPORT("se", "Switch E")
MIXSRC_SF, LUA_EXPORT("sf", "Switch F")
MIXSRC_LAST_SWITCH = MIXSRC_SF,
#elif defined(PCBTARANIS) || defined(PCBHORUS)
MIXSRC_SA = MIXSRC_FIRST_SWITCH, LUA_EXPORT("sa", "Switch A") MIXSRC_SA = MIXSRC_FIRST_SWITCH, LUA_EXPORT("sa", "Switch A")
MIXSRC_SB, LUA_EXPORT("sb", "Switch B") MIXSRC_SB, LUA_EXPORT("sb", "Switch B")
MIXSRC_SC, LUA_EXPORT("sc", "Switch C") MIXSRC_SC, LUA_EXPORT("sc", "Switch C")

13
radio/src/datastructs.h
View file

@ -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]); #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) #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]); #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) #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]; #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) #elif defined(PCBSKY9X)
@ -929,15 +927,6 @@ PACK(struct TrainerData {
NOBACKUP(uint8_t spare:1); \ NOBACKUP(uint8_t spare:1); \
NOBACKUP(uint8_t blOffBright:7); \ NOBACKUP(uint8_t blOffBright:7); \
NOBACKUP(char bluetoothName[LEN_BLUETOOTH_NAME]); 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) #elif defined(PCBTARANIS)
#if defined(PCBX9E) || defined(PCBX7) #if defined(PCBX9E) || defined(PCBX7)
#define BLUETOOTH_FIELDS \ #define BLUETOOTH_FIELDS \
@ -1121,8 +1110,6 @@ static inline void check_struct()
CHKSIZE(ModelData, 6507); CHKSIZE(ModelData, 6507);
#endif #endif
#elif defined(PCBFLAMENCO)
#elif defined(PCBHORUS) #elif defined(PCBHORUS)
CHKSIZE(MixData, 20); CHKSIZE(MixData, 20);
CHKSIZE(ExpoData, 17); CHKSIZE(ExpoData, 17);

2
radio/src/gui/CMakeLists.txt
View file

@ -60,7 +60,7 @@ if(ARCH STREQUAL ARM)
) )
endif() endif()
if(PCB STREQUAL FLAMENCO OR PCB STREQUAL X12S OR PCB STREQUAL X10) if(PCB STREQUAL X12S OR PCB STREQUAL X10)
if(HELI) if(HELI)
set(HELI_SRC gui/common/colorlcd/model_heli.cpp) set(HELI_SRC gui/common/colorlcd/model_heli.cpp)
endif() endif()

2
radio/src/gui/gui_common.cpp
View file

@ -20,7 +20,7 @@
#include "opentx.h" #include "opentx.h"
#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
uint8_t switchToMix(uint8_t source) uint8_t switchToMix(uint8_t source)
{ {
div_t qr = div(source-1, 3); div_t qr = div(source-1, 3);

2
radio/src/gui/gui_common_arm.cpp
View file

@ -489,7 +489,7 @@ bool isSourceAvailableInResetSpecialFunction(int index)
bool isModuleAvailable(int module) 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) { if (module == MODULE_TYPE_CROSSFIRE && g_model.moduleData[INTERNAL_MODULE].type != MODULE_TYPE_NONE) {
return false; return false;
} }

2
radio/src/haptic.cpp
View file

@ -38,7 +38,7 @@ void hapticQueue::heartbeat()
#else #else
if (buzzTimeLeft > 0) { if (buzzTimeLeft > 0) {
buzzTimeLeft--; // time gets counted down 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 // TODO define HAPTIC_PWM option
hapticOn(HAPTIC_STRENGTH() * 20); hapticOn(HAPTIC_STRENGTH() * 20);
#else #else

2
radio/src/keys.h
View file

@ -52,7 +52,7 @@
#define IS_KEY_REPT(evt) (((evt) & _MSK_KEY_FLAGS) == _MSK_KEY_REPT) #define IS_KEY_REPT(evt) (((evt) & _MSK_KEY_FLAGS) == _MSK_KEY_REPT)
#define IS_KEY_BREAK(evt) (((evt) & _MSK_KEY_FLAGS) == _MSK_KEY_BREAK) #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; typedef uint16_t event_t;
#define EVT_ROTARY_BREAK EVT_KEY_BREAK(KEY_ENTER) #define EVT_ROTARY_BREAK EVT_KEY_BREAK(KEY_ENTER)
#define EVT_ROTARY_LONG EVT_KEY_LONG(KEY_ENTER) #define EVT_ROTARY_LONG EVT_KEY_LONG(KEY_ENTER)

11
radio/src/logs.cpp
View file

@ -27,7 +27,7 @@ uint8_t logDelay;
void writeHeader(); 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) #define GET_2POS_STATE(sw) (switchState(SW_ ## sw ## 0) ? -1 : 1)
#else #else
#define GET_2POS_STATE(sw) (switchState(SW_ ## sw) ? -1 : 1) #define GET_2POS_STATE(sw) (switchState(SW_ ## sw) ? -1 : 1)
@ -342,14 +342,7 @@ void logsWrite()
f_printf(&g_oLogFile, "%d,", calibratedAnalogs[i]); f_printf(&g_oLogFile, "%d,", calibratedAnalogs[i]);
} }
#if defined(PCBFLAMENCO) #if defined(PCBX7)
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)
f_printf(&g_oLogFile, "%d,%d,%d,%d,%d,%d,0x%08X%08X,", f_printf(&g_oLogFile, "%d,%d,%d,%d,%d,%d,0x%08X%08X,",
GET_3POS_STATE(SA), GET_3POS_STATE(SA),
GET_3POS_STATE(SB), GET_3POS_STATE(SB),

2
radio/src/lua/api_general.cpp
View file

@ -29,8 +29,6 @@
#include "lua/lua_exports_x12s.inc" // this line must be after lua headers #include "lua/lua_exports_x12s.inc" // this line must be after lua headers
#elif defined(PCBX10) #elif defined(PCBX10)
#include "lua/lua_exports_x10.inc" #include "lua/lua_exports_x10.inc"
#elif defined(PCBFLAMENCO)
#include "lua/lua_exports_flamenco.inc"
#elif defined(PCBX9E) #elif defined(PCBX9E)
#include "lua/lua_exports_x9e.inc" #include "lua/lua_exports_x9e.inc"
#elif defined(PCBX7) #elif defined(PCBX7)

8
radio/src/mixer.cpp
View file

@ -382,13 +382,7 @@ getvalue_t getValue(mixsrc_t i)
return calc1000toRESX((int16_t)8 * getTrimValue(mixerCurrentFlightMode, i-MIXSRC_FIRST_TRIM)); return calc1000toRESX((int16_t)8 * getTrimValue(mixerCurrentFlightMode, i-MIXSRC_FIRST_TRIM));
} }
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
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)
else if ((i >= MIXSRC_FIRST_SWITCH) && (i <= MIXSRC_LAST_SWITCH)) { else if ((i >= MIXSRC_FIRST_SWITCH) && (i <= MIXSRC_LAST_SWITCH)) {
mixsrc_t sw = i-MIXSRC_FIRST_SWITCH; mixsrc_t sw = i-MIXSRC_FIRST_SWITCH;
if (SWITCH_EXISTS(sw)) { if (SWITCH_EXISTS(sw)) {

8
radio/src/myeeprom.h
View file

@ -137,7 +137,7 @@
#define CFN_GVAR_CST_MAX 125 #define CFN_GVAR_CST_MAX 125
#endif #endif
#if defined(PCBTARANIS) || defined(PCBHORUS) || defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
enum SwitchConfig { enum SwitchConfig {
SWITCH_NONE, SWITCH_NONE,
SWITCH_TOGGLE, SWITCH_TOGGLE,
@ -604,11 +604,7 @@ enum FailsafeModes {
enum ThrottleSources { enum ThrottleSources {
THROTTLE_SOURCE_THR, THROTTLE_SOURCE_THR,
THROTTLE_SOURCE_FIRST_POT, THROTTLE_SOURCE_FIRST_POT,
#if defined(PCBFLAMENCO) #if defined(PCBX9E)
THROTTLE_SOURCE_SD,
THROTTLE_SOURCE_LS,
THROTTLE_SOURCE_RS,
#elif defined(PCBX9E)
THROTTLE_SOURCE_F1 = THROTTLE_SOURCE_FIRST_POT, THROTTLE_SOURCE_F1 = THROTTLE_SOURCE_FIRST_POT,
THROTTLE_SOURCE_F2, THROTTLE_SOURCE_F2,
THROTTLE_SOURCE_F3, THROTTLE_SOURCE_F3,

34
radio/src/opentx.cpp
View file

@ -234,11 +234,7 @@ void generalDefault()
g_eeGeneral.contrast = LCD_CONTRAST_DEFAULT; g_eeGeneral.contrast = LCD_CONTRAST_DEFAULT;
#endif #endif
#if defined(PCBFLAMENCO) #if defined(PCBHORUS)
g_eeGeneral.vBatWarn = 33;
g_eeGeneral.vBatMin = -60; // 0 is 9.0V
g_eeGeneral.vBatMax = -78; // 0 is 12.0V
#elif defined(PCBHORUS)
#if PCBREV >= 13 #if PCBREV >= 13
g_eeGeneral.potsConfig = 0x1B; // S1 = pot, 6P = multipos, S2 = pot with detent g_eeGeneral.potsConfig = 0x1B; // S1 = pot, 6P = multipos, S2 = pot with detent
#else #else
@ -283,15 +279,11 @@ void generalDefault()
g_eeGeneral.stickMode = DEFAULT_MODE-1; g_eeGeneral.stickMode = DEFAULT_MODE-1;
#endif #endif
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS)
g_eeGeneral.templateSetup = 21; /* AETR */
#elif defined(PCBTARANIS)
g_eeGeneral.templateSetup = 17; /* TAER */ g_eeGeneral.templateSetup = 17; /* TAER */
#endif #endif
#if defined(PCBFLAMENCO) #if !defined(CPUM64)
g_eeGeneral.inactivityTimer = 50;
#elif !defined(CPUM64)
g_eeGeneral.backlightMode = e_backlight_mode_all; g_eeGeneral.backlightMode = e_backlight_mode_all;
g_eeGeneral.lightAutoOff = 2; g_eeGeneral.lightAutoOff = 2;
g_eeGeneral.inactivityTimer = 10; 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() void doLoopCommonActions()
{ {
checkBacklight(); checkBacklight();
#if defined(PCBFLAMENCO)
checkUsbChip();
#endif
} }
void backlightOn() 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 bluetoothInit(BLUETOOTH_DEFAULT_BAUDRATE); //BT is turn on for a brief period to differentiate X7 and X7S
#endif #endif
#if defined(GUI) && !defined(PCBTARANIS) && !defined(PCBFLAMENCO) && !defined(PCBHORUS) #if defined(GUI) && !defined(PCBTARANIS) && !defined(PCBHORUS)
// TODO remove this // TODO remove this
lcdInit(); lcdInit();
#endif #endif
@ -2728,10 +2706,6 @@ int main()
uint8_t shutdown_state = 0; uint8_t shutdown_state = 0;
#endif #endif
#if defined(PCBFLAMENCO)
// TODO not here it's an ARM board ... menuEntryTime = get_tmr10ms() - 200;
#endif
while (1) { while (1) {
#if defined(CPUM2560) #if defined(CPUM2560)
if ((shutdown_state=pwrCheck()) > e_power_trainer) if ((shutdown_state=pwrCheck()) > e_power_trainer)

20
radio/src/opentx.h
View file

@ -288,8 +288,7 @@
#include "debug.h" #include "debug.h"
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
#elif defined(PCBTARANIS) || defined(PCBHORUS)
#define SWSRC_THR SWSRC_SF2 #define SWSRC_THR SWSRC_SF2
#define SWSRC_GEA SWSRC_SG2 #define SWSRC_GEA SWSRC_SG2
#define SWSRC_ID0 SWSRC_SA0 #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_WITHOUT_DETENT(x) (false)
#define IS_POT_SLIDER_AVAILABLE(x) (true) #define IS_POT_SLIDER_AVAILABLE(x) (true)
#define IS_MULTIPOS_CALIBRATED(cal) (false) #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 #else
#define IS_POT_MULTIPOS(x) (false) #define IS_POT_MULTIPOS(x) (false)
#define IS_POT_WITHOUT_DETENT(x) (true) #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 */ #define SPLASH_TIMEOUT 0 /* we use the splash duration to load stuff from the SD */
#elif defined(FSPLASH) #elif defined(FSPLASH)
#define SPLASH_TIMEOUT (g_eeGeneral.splashMode == 0 ? 60000/*infinite=10mn*/ : ((4*100) * (g_eeGeneral.splashMode & 0x03))) #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))) #define SPLASH_TIMEOUT (g_eeGeneral.splashMode==-4 ? 1500 : (g_eeGeneral.splashMode<=0 ? (400-g_eeGeneral.splashMode*200) : (400-g_eeGeneral.splashMode*100)))
#else #else
#define SPLASH_TIMEOUT (4*100) // 4 seconds #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_10MS 1
#define HEART_TIMER_PULSES 2 // when multiple modules this is the first one #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)) #define HEART_WDT_CHECK (HEART_TIMER_10MS + (HEART_TIMER_PULSES << 0) + (HEART_TIMER_PULSES << 1))
#else #else
#define HEART_WDT_CHECK (HEART_TIMER_10MS + HEART_TIMER_PULSES) #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 "keys.h"
#include "pwr.h" #include "pwr.h"
#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) #if defined(PCBTARANIS) || defined(PCBHORUS)
div_t switchInfo(int switchPosition); div_t switchInfo(int switchPosition);
extern uint8_t potsPos[NUM_XPOTS]; extern uint8_t potsPos[NUM_XPOTS];
#endif #endif
@ -719,7 +713,7 @@ void logicalSwitchesReset();
#define LS_RECURSIVE_EVALUATION_RESET() s_last_switch_used = 0 #define LS_RECURSIVE_EVALUATION_RESET() s_last_switch_used = 0
#endif #endif
#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) #if defined(PCBTARANIS) || defined(PCBHORUS)
void getSwitchesPosition(bool startup); void getSwitchesPosition(bool startup);
#else #else
#define getSwitchesPosition(...) #define getSwitchesPosition(...)
@ -1284,7 +1278,7 @@ enum AUDIO_SOUNDS {
AU_STICK3_MIDDLE, AU_STICK3_MIDDLE,
AU_STICK4_MIDDLE, AU_STICK4_MIDDLE,
#endif #endif
#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) #if defined(PCBTARANIS) || defined(PCBHORUS)
AU_POT1_MIDDLE, AU_POT1_MIDDLE,
AU_POT2_MIDDLE, AU_POT2_MIDDLE,
AU_SLIDER1_MIDDLE, AU_SLIDER1_MIDDLE,
@ -1435,7 +1429,7 @@ union ReusableBuffer
int16_t loVals[NUM_STICKS+NUM_POTS+NUM_SLIDERS+NUM_MOUSE_ANALOGS]; int16_t loVals[NUM_STICKS+NUM_POTS+NUM_SLIDERS+NUM_MOUSE_ANALOGS];
int16_t hiVals[NUM_STICKS+NUM_POTS+NUM_SLIDERS+NUM_MOUSE_ANALOGS]; int16_t hiVals[NUM_STICKS+NUM_POTS+NUM_SLIDERS+NUM_MOUSE_ANALOGS];
uint8_t state; uint8_t state;
#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) #if defined(PCBTARANIS) || defined(PCBHORUS)
struct { struct {
uint8_t stepsCount; uint8_t stepsCount;
int16_t steps[XPOTS_MULTIPOS_COUNT]; int16_t steps[XPOTS_MULTIPOS_COUNT];

2
radio/src/pulses/pulses.h
View file

@ -39,7 +39,7 @@ enum ModuleFlag
#define IS_RANGECHECK_ENABLE() (moduleFlag[0] == MODULE_RANGECHECK) #define IS_RANGECHECK_ENABLE() (moduleFlag[0] == MODULE_RANGECHECK)
#endif #endif
#if defined(DSM2) && !defined(PCBTARANIS) && !defined(PCBFLAMENCO) #if defined(DSM2) && !defined(PCBTARANIS)
#define DSM2_BIND_TIMEOUT 255 // 255*11ms #define DSM2_BIND_TIMEOUT 255 // 255*11ms
extern uint8_t dsm2BindTimer; extern uint8_t dsm2BindTimer;
#endif #endif

22
radio/src/simu.cpp
View file

@ -250,11 +250,6 @@ void Open9xSim::updateKeysAndSwitches(bool start)
KEY_Down, KEY_DOWN, KEY_Down, KEY_DOWN,
KEY_Right, KEY_RIGHT, KEY_Right, KEY_RIGHT,
KEY_Left, KEY_LEFT, 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) #elif defined(PCBTARANIS)
KEY_Page_Up, KEY_MENU, KEY_Page_Up, KEY_MENU,
KEY_Page_Down, KEY_PAGE, KEY_Page_Down, KEY_PAGE,
@ -309,14 +304,7 @@ void Open9xSim::updateKeysAndSwitches(bool start)
} \ } \
simuSetSwitch(swtch, state_##swtch-states); simuSetSwitch(swtch, state_##swtch-states);
#if defined(PCBFLAMENCO) #if defined(PCBX9E)
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)
SWITCH_KEY(A, 0, 3); SWITCH_KEY(A, 0, 3);
SWITCH_KEY(B, 1, 3); SWITCH_KEY(B, 1, 3);
SWITCH_KEY(C, 2, 3); SWITCH_KEY(C, 2, 3);
@ -482,12 +470,6 @@ void Open9xSim::refreshDisplay()
setPixel(x, y, color); 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 #elif LCD_W >= 212
display_t * p = &simuLcdBuf[y / 2 * LCD_W + x]; display_t * p = &simuLcdBuf[y / 2 * LCD_W + x];
uint8_t z = (y & 1) ? (*p >> 4) : (*p & 0x0F); uint8_t z = (y & 1) ? (*p >> 4) : (*p & 0x0F);
@ -586,7 +568,7 @@ uint16_t anaIn(uint8_t chan)
#elif defined(PCBX9E) #elif defined(PCBX9E)
else if (chan == TX_VOLTAGE) else if (chan == TX_VOLTAGE)
return 1420; //~10.6V return 1420; //~10.6V
#elif defined(PCBTARANIS) || defined(PCBFLAMENCO) #elif defined(PCBTARANIS)
else if (chan == TX_VOLTAGE) else if (chan == TX_VOLTAGE)
return 1000; //~7.4V return 1000; //~7.4V
#elif defined(PCBSKY9X) #elif defined(PCBSKY9X)

2
radio/src/stamp.cpp
View file

@ -32,8 +32,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define TAB "\037\075" #define TAB "\037\075"
#elif defined(PCBFLAMENCO)
#define TAB "\037\050"
#endif #endif
#if defined(COLORLCD) #if defined(COLORLCD)

2
radio/src/storage/storage.h
View file

@ -25,7 +25,7 @@
#define WRITE_DELAY_10MS 100 #define WRITE_DELAY_10MS 100
#elif defined(RAMBACKUP) #elif defined(RAMBACKUP)
#define WRITE_DELAY_10MS 1500 /* 15s */ #define WRITE_DELAY_10MS 1500 /* 15s */
#elif defined(PCBTARANIS) || defined(PCBFLAMENCO) #elif defined(PCBTARANIS)
#define WRITE_DELAY_10MS 500 #define WRITE_DELAY_10MS 500
#elif defined(PCBSKY9X) && !defined(REV0) #elif defined(PCBSKY9X) && !defined(REV0)
#define WRITE_DELAY_10MS 500 #define WRITE_DELAY_10MS 500

115
radio/src/switches.cpp
View file

@ -22,11 +22,7 @@
#define CS_LAST_VALUE_INIT -32768 #define CS_LAST_VALUE_INIT -32768
#if defined(PCBFLAMENCO) #if defined(PCBHORUS)
#define SWITCH_WARNING_LIST_X 60
#define SWITCH_WARNING_LIST_Y 4*FH+3
#define SWITCH_WARNING_LIST_INTERVAL 20
#elif defined(PCBHORUS)
#define SWITCH_WARNING_LIST_X WARNING_LINE_X #define SWITCH_WARNING_LIST_X WARNING_LINE_X
#define SWITCH_WARNING_LIST_Y WARNING_LINE_Y+3*FH #define SWITCH_WARNING_LIST_Y WARNING_LINE_Y+3*FH
#define SWITCH_WARNING_LIST_INTERVAL 35 #define SWITCH_WARNING_LIST_INTERVAL 35
@ -71,84 +67,6 @@ volatile GETSWITCH_RECURSIVE_TYPE s_last_switch_value = 0;
#endif #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(PCBTARANIS) || defined(PCBHORUS)
#if defined(PCBX9E) #if defined(PCBX9E)
tmr10ms_t switchesMidposStart[16]; tmr10ms_t switchesMidposStart[16];
@ -542,7 +460,7 @@ bool getSwitch(swsrc_t swtch)
result = true; result = true;
} }
else if (cs_idx <= SWSRC_LAST_SWITCH) { 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) if (flags & GETSWITCH_MIDPOS_DELAY)
result = SWITCH_POSITION(cs_idx-SWSRC_FIRST_SWITCH); result = SWITCH_POSITION(cs_idx-SWSRC_FIRST_SWITCH);
else else
@ -658,28 +576,7 @@ swsrc_t getMovedSwitch()
static tmr10ms_t s_move_last_time = 0; static tmr10ms_t s_move_last_time = 0;
swsrc_t result = 0; swsrc_t result = 0;
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
#if 0
for (int i=0; i<NUM_SWITCHES; i++) {
swarnstate_t mask = ((swarnstate_t)0x07 << (i*3));
uint8_t prev = (switches_states & mask) >> (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)
for (int i=0; i<NUM_SWITCHES; i++) { for (int i=0; i<NUM_SWITCHES; i++) {
if (SWITCH_EXISTS(i)) { if (SWITCH_EXISTS(i)) {
swarnstate_t mask = ((swarnstate_t)0x03 << (i*2)); swarnstate_t mask = ((swarnstate_t)0x03 << (i*2));
@ -729,7 +626,7 @@ void checkSwitches()
#endif #endif
swarnstate_t states = g_model.switchWarningState; swarnstate_t states = g_model.switchWarningState;
#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) #if defined(PCBTARANIS) || defined(PCBHORUS)
uint8_t bad_pots = 0, last_bad_pots = 0xff; uint8_t bad_pots = 0, last_bad_pots = 0xff;
#endif #endif
@ -738,7 +635,7 @@ void checkSwitches()
#if defined(TELEMETRY_MOD_14051) || defined(TELEMETRY_MOD_14051_SWAPPED) #if defined(TELEMETRY_MOD_14051) || defined(TELEMETRY_MOD_14051_SWAPPED)
#define GETADC_COUNT (MUX_MAX+1) #define GETADC_COUNT (MUX_MAX+1)
#elif defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) #elif defined(PCBTARANIS) || defined(PCBHORUS)
#define GETADC_COUNT 1 #define GETADC_COUNT 1
#endif #endif
#ifdef GETADC_COUNT #ifdef GETADC_COUNT
@ -822,7 +719,7 @@ void checkSwitches()
LED_ERROR_BEGIN(); LED_ERROR_BEGIN();
// first - display warning // first - display warning
#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) #if defined(PCBTARANIS) || defined(PCBHORUS)
if ((last_bad_switches != switches_states) || (last_bad_pots != bad_pots)) { if ((last_bad_switches != switches_states) || (last_bad_pots != bad_pots)) {
drawAlertBox(STR_SWITCHWARN, NULL, STR_PRESSANYKEYTOSKIP); drawAlertBox(STR_SWITCHWARN, NULL, STR_PRESSANYKEYTOSKIP);
if (last_bad_switches == 0xff || last_bad_pots == 0xff) { if (last_bad_switches == 0xff || last_bad_pots == 0xff) {

4
radio/src/targets/simu/opentxsimulator.cpp
View file

@ -578,7 +578,7 @@ const int OpenTxSimulator::voltageToAdc(const int volts)
int ret = 0; int ret = 0;
#if defined(PCBHORUS) || defined(PCBX7) #if defined(PCBHORUS) || defined(PCBX7)
ret = (float)volts * 16.2f; ret = (float)volts * 16.2f;
#elif defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBSKY9X) #elif defined(PCBTARANIS) || defined(PCBSKY9X)
ret = (float)volts * 13.3f; ret = (float)volts * 13.3f;
#elif defined(PCBGRUVIN9X) #elif defined(PCBGRUVIN9X)
ret = (float)volts * 1.63f; ret = (float)volts * 1.63f;
@ -616,8 +616,6 @@ class OpenTxSimulatorFactory: public SimulatorFactory
return Board::BOARD_X12S; return Board::BOARD_X12S;
#elif defined(PCBX10) #elif defined(PCBX10)
return Board::BOARD_X10; return Board::BOARD_X10;
#elif defined(PCBFLAMENCO)
return Board::BOARD_FLAMENCO;
#elif defined(PCBX7) #elif defined(PCBX7)
return Board::BOARD_TARANIS_X7; return Board::BOARD_TARANIS_X7;
#elif defined(PCBTARANIS) #elif defined(PCBTARANIS)

27
radio/src/targets/simu/simpgmspace.cpp
View file

@ -218,9 +218,6 @@ void simuSetKey(uint8_t key, bool state)
KEY_CASE(KEY_RADIO, KEYS_GPIO_REG_LEFT, KEYS_GPIO_PIN_LEFT) KEY_CASE(KEY_RADIO, KEYS_GPIO_REG_LEFT, KEYS_GPIO_PIN_LEFT)
KEY_CASE(KEY_MODEL, KEYS_GPIO_REG_UP, KEYS_GPIO_PIN_UP) KEY_CASE(KEY_MODEL, KEYS_GPIO_REG_UP, KEYS_GPIO_PIN_UP)
KEY_CASE(KEY_EXIT, KEYS_GPIO_REG_DOWN, KEYS_GPIO_PIN_DOWN) KEY_CASE(KEY_EXIT, KEYS_GPIO_REG_DOWN, KEYS_GPIO_PIN_DOWN)
#elif defined(PCBFLAMENCO)
KEY_CASE(KEY_ENTER, KEYS_GPIO_REG_ENTER, KEYS_GPIO_PIN_ENTER)
KEY_CASE(KEY_PAGE, KEYS_GPIO_REG_PAGE, KEYS_GPIO_PIN_PAGE)
#elif defined(PCBTARANIS) #elif defined(PCBTARANIS)
KEY_CASE(KEY_ENTER, KEYS_GPIO_REG_ENTER, KEYS_GPIO_PIN_ENTER) KEY_CASE(KEY_ENTER, KEYS_GPIO_REG_ENTER, KEYS_GPIO_PIN_ENTER)
KEY_CASE(KEY_PAGE, KEYS_GPIO_REG_PAGE, KEYS_GPIO_PIN_PAGE) KEY_CASE(KEY_PAGE, KEYS_GPIO_REG_PAGE, KEYS_GPIO_PIN_PAGE)
@ -270,14 +267,7 @@ void simuSetSwitch(uint8_t swtch, int8_t state)
// TRACE_SIMPGMSPACE("simuSetSwitch(%d, %d)", swtch, state); // TRACE_SIMPGMSPACE("simuSetSwitch(%d, %d)", swtch, state);
switch (swtch) { switch (swtch) {
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
// SWITCH_3_CASE(0, SWITCHES_GPIO_REG_A_L, SWITCHES_GPIO_REG_A_H, SWITCHES_GPIO_PIN_A_L, SWITCHES_GPIO_PIN_A_H)
// SWITCH_CASE(1, SWITCHES_GPIO_REG_B, SWITCHES_GPIO_PIN_B)
// SWITCH_3_CASE(2, SWITCHES_GPIO_REG_C_L, SWITCHES_GPIO_REG_C_H, SWITCHES_GPIO_PIN_C_L, SWITCHES_GPIO_PIN_C_H)
// SWITCH_3_CASE(3, SWITCHES_GPIO_REG_D_L, SWITCHES_GPIO_REG_D_H, SWITCHES_GPIO_PIN_D_L, SWITCHES_GPIO_PIN_D_H)
// SWITCH_CASE(4, SWITCHES_GPIO_REG_E, SWITCHES_GPIO_PIN_E)
// SWITCH_3_CASE(5, SWITCHES_GPIO_REG_F_H, SWITCHES_GPIO_REG_F_L, SWITCHES_GPIO_PIN_F_H, SWITCHES_GPIO_PIN_F_L)
#elif defined(PCBTARANIS) || defined(PCBHORUS)
SWITCH_3_CASE(0, SWITCHES_GPIO_REG_A_L, SWITCHES_GPIO_REG_A_H, SWITCHES_GPIO_PIN_A_L, SWITCHES_GPIO_PIN_A_H) SWITCH_3_CASE(0, SWITCHES_GPIO_REG_A_L, SWITCHES_GPIO_REG_A_H, SWITCHES_GPIO_PIN_A_L, SWITCHES_GPIO_PIN_A_H)
#if !defined(PCBX10) #if !defined(PCBX10)
SWITCH_3_CASE(1, SWITCHES_GPIO_REG_B_L, SWITCHES_GPIO_REG_B_H, SWITCHES_GPIO_PIN_B_L, SWITCHES_GPIO_PIN_B_H) SWITCH_3_CASE(1, SWITCHES_GPIO_REG_B_L, SWITCHES_GPIO_REG_B_H, SWITCHES_GPIO_PIN_B_L, SWITCHES_GPIO_PIN_B_H)
@ -586,7 +576,7 @@ uint16_t stackAvailable()
bool simuLcdRefresh = true; bool simuLcdRefresh = true;
display_t simuLcdBuf[DISPLAY_BUFFER_SIZE]; display_t simuLcdBuf[DISPLAY_BUFFER_SIZE];
#if !defined(PCBFLAMENCO) && !defined(PCBHORUS) #if !defined(PCBHORUS)
void lcdSetRefVolt(uint8_t val) void lcdSetRefVolt(uint8_t val)
{ {
} }
@ -606,10 +596,6 @@ void lcdRefresh()
{ {
static bool lightEnabled = (bool)isBacklightEnabled(); static bool lightEnabled = (bool)isBacklightEnabled();
#if defined(PCBFLAMENCO)
TW8823_SendScreen();
#endif
if (bool(isBacklightEnabled()) != lightEnabled || memcmp(simuLcdBuf, displayBuf, DISPLAY_BUFFER_SIZE)) { if (bool(isBacklightEnabled()) != lightEnabled || memcmp(simuLcdBuf, displayBuf, DISPLAY_BUFFER_SIZE)) {
memcpy(simuLcdBuf, displayBuf, DISPLAY_BUFFER_SIZE); memcpy(simuLcdBuf, displayBuf, DISPLAY_BUFFER_SIZE);
lightEnabled = (bool)isBacklightEnabled(); lightEnabled = (bool)isBacklightEnabled();
@ -625,7 +611,6 @@ void telemetryPortInit()
{ {
} }
#if !defined(PCBFLAMENCO)
display_t simuLcdBackupBuf[DISPLAY_BUFFER_SIZE]; display_t simuLcdBackupBuf[DISPLAY_BUFFER_SIZE];
void lcdStoreBackupBuffer() void lcdStoreBackupBuffer()
{ {
@ -637,7 +622,7 @@ int lcdRestoreBackupBuffer()
memcpy(displayBuf, simuLcdBackupBuf, sizeof(displayBuf)); memcpy(displayBuf, simuLcdBackupBuf, sizeof(displayBuf));
return 1; return 1;
} }
#endif
#if defined(CPUARM) #if defined(CPUARM)
void pwrOff() void pwrOff()
@ -720,12 +705,6 @@ void flashWrite(uint32_t *address, uint32_t *buffer) { SIMU_SLEEP(100); }
uint32_t isBootloaderStart(const uint8_t * block) { return 1; } uint32_t isBootloaderStart(const uint8_t * block) { return 1; }
#endif // defined(PCBTARANIS) #endif // defined(PCBTARANIS)
#if defined(PCBFLAMENCO)
void i2cWriteTW8823(unsigned char, unsigned char) { }
uint8_t i2cReadBQ24195(uint8_t) { return 0; }
void i2cWriteBQ24195(uint8_t, uint8_t) { }
#endif
#if defined(PCBHORUS) #if defined(PCBHORUS)
void LCD_ControlLight(uint16_t dutyCycle) { } void LCD_ControlLight(uint16_t dutyCycle) { }
#endif #endif

16
radio/src/translations/cz.h.txt
View file

@ -131,8 +131,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define TR_RETA123 "SVPK12345LR" #define TR_RETA123 "SVPK12345LR"
#elif defined(PCBFLAMENCO)
#define TR_RETA123 "SVPK123LR"
#elif defined(PCBX9E) #elif defined(PCBX9E)
#define TR_RETA123 "SVPK1234LRLR" #define TR_RETA123 "SVPK1234LRLR"
#elif defined(PCBTARANIS) || defined(REVX) #elif defined(PCBTARANIS) || defined(REVX)
@ -424,9 +422,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define LEN_VKEYS "\006" #define LEN_VKEYS "\006"
#define TR_VKEYS "Menu\0 ""Exit\0 ""Enter\0""Nahoru""Dolů\0 ""Vpravo""Vlevo" #define TR_VKEYS "Menu\0 ""Exit\0 ""Enter\0""Nahoru""Dolů\0 ""Vpravo""Vlevo"
#elif defined(PCBFLAMENCO)
#define LEN_VKEYS "\005"
#define TR_VKEYS "Menu\0""Exit\0""Enter""Page\0""Plus\0""Mínus"
#elif defined(PCBTARANIS) #elif defined(PCBTARANIS)
#define LEN_VKEYS "\005" #define LEN_VKEYS "\005"
#define TR_VKEYS "Menu\0""Exit\0""Enter""Page\0""Plus\0""Mínus" #define TR_VKEYS "Menu\0""Exit\0""Enter""Page\0""Plus\0""Mínus"
@ -468,9 +463,6 @@
#elif defined(PCBX10) #elif defined(PCBX10)
#define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\311LS\0""\311RS\0""None""None""\310EX1""\310EX2" #define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\311LS\0""\311RS\0""None""None""\310EX1""\310EX2"
#define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0"
#elif defined(PCBFLAMENCO)
#define TR_POTS_VSRCRAW "SD\0 ""LS\0 ""RS\0 "
#define TR_SW_VSRCRAW "SA\0 ""SB\0 ""SC\0 ""SE\0 ""SF\0 "
#elif defined(PCBX9E) #elif defined(PCBX9E)
#define TR_POTS_VSRCRAW "\310S1\0""\310S2\0""\310S3\0""\310S4\0""\311LS\0""\311RS\0""\311LS2""\311RS2" #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0""\310S3\0""\310S4\0""\311LS\0""\311RS\0""\311LS2""\311RS2"
#define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0""\312SI\0""\312SJ\0""\312SK\0""\312SL\0""\312SM\0""\312SN\0""\312SO\0""\312SP\0""\312SQ\0""\312SR\0" #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"
@ -519,9 +511,7 @@
#define TR_ON_ONE_SWITCHES "ZAP""One" #define TR_ON_ONE_SWITCHES "ZAP""One"
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_VSWITCHES "---" TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
#elif defined(PCBTARANIS) || defined(PCBHORUS)
// only special switches here // only special switches here
#define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES
#elif defined(PCBSKY9X) #elif defined(PCBSKY9X)
@ -609,9 +599,7 @@
#define TR_EXIT "[EXIT]" #define TR_EXIT "[EXIT]"
#endif #endif
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" TR_ENTER
#elif defined(PCBTARANIS)
#define TR_POPUPS TR(TR_EXIT "\010" TR_ENTER, TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER) #define TR_POPUPS TR(TR_EXIT "\010" TR_ENTER, TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER)
#else #else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT #define TR_POPUPS TR_ENTER "\010" TR_EXIT

28
radio/src/translations/de.h.txt
View file

@ -138,8 +138,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define TR_RETA123 "SHGQ12345LR" #define TR_RETA123 "SHGQ12345LR"
#elif defined(PCBFLAMENCO)
#define TR_RETA123 "SHGQ123LR"
#elif defined(PCBX9E) #elif defined(PCBX9E)
#define TR_RETA123 "SHGQ1234LRLR" #define TR_RETA123 "SHGQ1234LRLR"
#elif defined(PCBTARANIS) || defined(REVX) #elif defined(PCBTARANIS) || defined(REVX)
@ -463,9 +461,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define LEN_VKEYS "\006" #define LEN_VKEYS "\006"
#define TR_VKEYS "Menu\0 ""Exit\0 ""Enter\0""Up\0 ""Down\0 ""Right\0""Left" #define TR_VKEYS "Menu\0 ""Exit\0 ""Enter\0""Up\0 ""Down\0 ""Right\0""Left"
#elif defined(PCBFLAMENCO)
#define LEN_VKEYS "\005"
#define TR_VKEYS "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus"
#elif defined(PCBTARANIS) #elif defined(PCBTARANIS)
#define LEN_VKEYS "\005" #define LEN_VKEYS "\005"
#define TR_VKEYS "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus" #define TR_VKEYS "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus"
@ -491,9 +486,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0""\310JSx""\310JSy" #define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0""\310JSx""\310JSy"
#define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0"
#elif defined(PCBFLAMENCO)
#define TR_POTS_VSRCRAW "SD\0 ""LS\0 ""RS\0 "
#define TR_SW_VSRCRAW "SA\0 ""SB\0 ""SC\0 ""SE\0 ""SF\0 "
#elif defined(PCBX9E) #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_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" #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"
@ -536,17 +528,13 @@
#define TR_ROTENC_SWITCHES #define TR_ROTENC_SWITCHES
#endif #endif
#if defined(PCBFLAMENCO) #if !defined(PCBTARANIS) && !defined(PCBHORUS)
#define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB\301""SC1""SC2""SC3""SC4""SC5""SC6""SE\300""SE\301""SF\300""SF-""SF\301"
#elif !defined(PCBTARANIS) && !defined(PCBHORUS)
#define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN"
#endif #endif
#define TR_ON_ONE_SWITCHES "ON\0""One" #define TR_ON_ONE_SWITCHES "ON\0""One"
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_VSWITCHES "---" TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
#elif defined(PCBTARANIS) || defined(PCBHORUS)
// only special switches here // only special switches here
#define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES
#elif defined(PCBSKY9X) #elif defined(PCBSKY9X)
@ -622,7 +610,7 @@
#define BREAKSPACE " " #define BREAKSPACE " "
#endif #endif
#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) #if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_ENTER "[ENTER]" #define TR_ENTER "[ENTER]"
#else #else
#define TR_ENTER "[MENU]" #define TR_ENTER "[MENU]"
@ -630,9 +618,7 @@
#define TR_EXIT "[EXIT]" #define TR_EXIT "[EXIT]"
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" TR_ENTER
#elif defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER #define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
#else #else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT #define TR_POPUPS TR_ENTER "\010" TR_EXIT
@ -1223,11 +1209,7 @@
#define TR_ABOUT_MARTIN_1 "Martin Hotar" #define TR_ABOUT_MARTIN_1 "Martin Hotar"
#define TR_ABOUT_MARTIN_2 "Grafikdesigner" #define TR_ABOUT_MARTIN_2 "Grafikdesigner"
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_ABOUT_HARDWARE_1 "XXX"
#define TR_ABOUT_HARDWARE_2 "Hardware designer/producer"
#define TR_ABOUT_HARDWARE_3 ""
#elif defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_ABOUT_HARDWARE_1 "FrSky" #define TR_ABOUT_HARDWARE_1 "FrSky"
#define TR_ABOUT_HARDWARE_2 "Hardware designer/producer" #define TR_ABOUT_HARDWARE_2 "Hardware designer/producer"
#define TR_ABOUT_HARDWARE_3 "Firmware contributor" #define TR_ABOUT_HARDWARE_3 "Firmware contributor"

28
radio/src/translations/en.h.txt
View file

@ -137,8 +137,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define TR_RETA123 "RETA12345LR" #define TR_RETA123 "RETA12345LR"
#elif defined(PCBFLAMENCO)
#define TR_RETA123 "RETA123LR"
#elif defined(PCBX9E) #elif defined(PCBX9E)
#define TR_RETA123 "RETA1234LRLR" #define TR_RETA123 "RETA1234LRLR"
#elif defined(PCBTARANIS) || defined(REVX) #elif defined(PCBTARANIS) || defined(REVX)
@ -433,9 +431,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define LEN_VKEYS "\006" #define LEN_VKEYS "\006"
#define TR_VKEYS "Menu\0 ""Exit\0 ""Enter\0""Up\0 ""Down\0 ""Right\0""Left" #define TR_VKEYS "Menu\0 ""Exit\0 ""Enter\0""Up\0 ""Down\0 ""Right\0""Left"
#elif defined(PCBFLAMENCO)
#define LEN_VKEYS "\005"
#define TR_VKEYS "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus"
#elif defined(PCBTARANIS) #elif defined(PCBTARANIS)
#define LEN_VKEYS "\005" #define LEN_VKEYS "\005"
#define TR_VKEYS "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus" #define TR_VKEYS "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus"
@ -474,9 +469,6 @@
#elif defined(PCBX10) #elif defined(PCBX10)
#define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\311LS\0""\311RS\0""None""None""\310EX1""\310EX2" #define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\311LS\0""\311RS\0""None""None""\310EX1""\310EX2"
#define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0"
#elif defined(PCBFLAMENCO)
#define TR_POTS_VSRCRAW "SD\0 ""LS\0 ""RS\0 "
#define TR_SW_VSRCRAW "SA\0 ""SB\0 ""SC\0 ""SE\0 ""SF\0 "
#elif defined(PCBX9E) #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_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" #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"
@ -519,17 +511,13 @@
#define TR_ROTENC_SWITCHES #define TR_ROTENC_SWITCHES
#endif #endif
#if defined(PCBFLAMENCO) #if !defined(PCBTARANIS) && !defined(PCBHORUS)
#define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB\301""SC1""SC2""SC3""SC4""SC5""SC6""SE\300""SE\301""SF\300""SF-""SF\301"
#elif !defined(PCBTARANIS) && !defined(PCBHORUS)
#define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN"
#endif #endif
#define TR_ON_ONE_SWITCHES "ON\0""One" #define TR_ON_ONE_SWITCHES "ON\0""One"
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_VSWITCHES "---" TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
#elif defined(PCBTARANIS) || defined(PCBHORUS)
// only special switches here // only special switches here
#define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES
#elif defined(PCBSKY9X) #elif defined(PCBSKY9X)
@ -605,7 +593,7 @@
#define BREAKSPACE " " #define BREAKSPACE " "
#endif #endif
#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) #if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_ENTER "[ENTER]" #define TR_ENTER "[ENTER]"
#else #else
#define TR_ENTER "[MENU]" #define TR_ENTER "[MENU]"
@ -617,9 +605,7 @@
#define TR_EXIT "[EXIT]" #define TR_EXIT "[EXIT]"
#endif #endif
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" TR_ENTER
#elif defined(PCBTARANIS)
#define TR_POPUPS TR(TR_EXIT "\010" TR_ENTER, TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER) #define TR_POPUPS TR(TR_EXIT "\010" TR_ENTER, TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER)
#else #else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT #define TR_POPUPS TR_ENTER "\010" TR_EXIT
@ -1210,11 +1196,7 @@
#define TR_ABOUT_MARTIN_1 "Martin Hotar" #define TR_ABOUT_MARTIN_1 "Martin Hotar"
#define TR_ABOUT_MARTIN_2 "Graphics designer" #define TR_ABOUT_MARTIN_2 "Graphics designer"
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_ABOUT_HARDWARE_1 "XXX"
#define TR_ABOUT_HARDWARE_2 "Hardware designer/producer"
#define TR_ABOUT_HARDWARE_3 ""
#elif defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_ABOUT_HARDWARE_1 "FrSky" #define TR_ABOUT_HARDWARE_1 "FrSky"
#define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer")
#define TR_ABOUT_HARDWARE_3 "Firmware contributor" #define TR_ABOUT_HARDWARE_3 "Firmware contributor"

9
radio/src/translations/es.h.txt
View file

@ -133,8 +133,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define TR_RETA123 "RETA12345LR" #define TR_RETA123 "RETA12345LR"
#elif defined(PCBFLAMENCO)
#define TR_RETA123 "RETA123LR"
#elif defined(PCBX9E) #elif defined(PCBX9E)
#define TR_RETA123 "RETA1234LRLR" #define TR_RETA123 "RETA1234LRLR"
#elif defined(PCBTARANIS) || defined(REVX) #elif defined(PCBTARANIS) || defined(REVX)
@ -468,9 +466,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0""\310JSx""\310JSy" #define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0""\310JSx""\310JSy"
#define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0"
#elif defined(PCBFLAMENCO)
#define TR_POTS_VSRCRAW "SD\0 ""LS\0 ""RS\0 "
#define TR_SW_VSRCRAW "SA\0 ""SB\0 ""SC\0 ""SE\0 ""SF\0 "
#elif defined(PCBX9E) #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_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" #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"
@ -515,9 +510,7 @@
#define TR_ON_ONE_SWITCHES "ON\0""One" #define TR_ON_ONE_SWITCHES "ON\0""One"
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_VSWITCHES "---" TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
#elif defined(PCBTARANIS) || defined(PCBHORUS)
// only special switches here // only special switches here
#define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES
#elif defined(PCBSKY9X) #elif defined(PCBSKY9X)

9
radio/src/translations/fi.h.txt
View file

@ -133,8 +133,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define TR_RETA123 "RETA12345LR" #define TR_RETA123 "RETA12345LR"
#elif defined(PCBFLAMENCO)
#define TR_RETA123 "RETA123LR"
#elif defined(PCBX9E) #elif defined(PCBX9E)
#define TR_RETA123 "RETA1234LRLR" #define TR_RETA123 "RETA1234LRLR"
#elif defined(PCBTARANIS) || defined(REVX) #elif defined(PCBTARANIS) || defined(REVX)
@ -468,9 +466,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0""\310JSx""\310JSy" #define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0""\310JSx""\310JSy"
#define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0"
#elif defined(PCBFLAMENCO)
#define TR_POTS_VSRCRAW "SD\0 ""LS\0 ""RS\0 "
#define TR_SW_VSRCRAW "SA\0 ""SB\0 ""SC\0 ""SE\0 ""SF\0 "
#elif defined(PCBX9E) #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_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" #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"
@ -519,9 +514,7 @@
#define TR_ON_ONE_SWITCHES "ON\0""One" #define TR_ON_ONE_SWITCHES "ON\0""One"
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_VSWITCHES "---" TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
#elif defined(PCBTARANIS) || defined(PCBHORUS)
// only special switches here // only special switches here
#define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES
#elif defined(PCBSKY9X) #elif defined(PCBSKY9X)

11
radio/src/translations/fr.h.txt
View file

@ -133,8 +133,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define TR_RETA123 "DPGA12345LR" #define TR_RETA123 "DPGA12345LR"
#elif defined(PCBFLAMENCO)
#define TR_RETA123 "DPGA123LR"
#elif defined(PCBX9E) #elif defined(PCBX9E)
#define TR_RETA123 "DPGA1234LRLR" #define TR_RETA123 "DPGA1234LRLR"
#elif defined(PCBTARANIS) || defined(REVX) #elif defined(PCBTARANIS) || defined(REVX)
@ -489,9 +487,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0""\310JSx""\310JSy" #define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0""\310JSx""\310JSy"
#define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0"
#elif defined(PCBFLAMENCO)
#define TR_POTS_VSRCRAW "SD\0 ""LS\0 ""RS\0 "
#define TR_SW_VSRCRAW "SA\0 ""SB\0 ""SC\0 ""SE\0 ""SF\0 "
#elif defined(PCBX9E) #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_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" #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"
@ -540,9 +535,7 @@
#define TR_ON_ONE_SWITCHES "ON\0""Un" #define TR_ON_ONE_SWITCHES "ON\0""Un"
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_VSWITCHES "---" TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
#elif defined(PCBTARANIS) || defined(PCBHORUS)
// only special switches here // only special switches here
#define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES
#elif defined(PCBSKY9X) #elif defined(PCBSKY9X)
@ -618,7 +611,7 @@
#define BREAKSPACE " " #define BREAKSPACE " "
#endif #endif
#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) #if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_ENTER "[ENTER]" #define TR_ENTER "[ENTER]"
#else #else
#define TR_ENTER "[MENU]" #define TR_ENTER "[MENU]"

9
radio/src/translations/it.h.txt
View file

@ -133,8 +133,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define TR_RETA123 "DEMA12345LR" #define TR_RETA123 "DEMA12345LR"
#elif defined(PCBFLAMENCO)
#define TR_RETA123 "DEMA123LR"
#elif defined(PCBX9E) #elif defined(PCBX9E)
#define TR_RETA123 "DEMA123SDSD" #define TR_RETA123 "DEMA123SDSD"
#elif defined(PCBTARANIS) || defined(REVX) #elif defined(PCBTARANIS) || defined(REVX)
@ -475,9 +473,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0""\310JSx""\310JSy" #define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0""\310JSx""\310JSy"
#define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0"
#elif defined(PCBFLAMENCO)
#define TR_POTS_VSRCRAW "SD\0 ""LS\0 ""RS\0 "
#define TR_SW_VSRCRAW "SA\0 ""SB\0 ""SC\0 ""SE\0 ""SF\0 "
#elif defined(PCBX9E) #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_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" #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"
@ -526,9 +521,7 @@
#define TR_ON_ONE_SWITCHES "ON\0""One" #define TR_ON_ONE_SWITCHES "ON\0""One"
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_VSWITCHES "---" TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
#elif defined(PCBTARANIS) || defined(PCBHORUS)
// only special switches here // only special switches here
#define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES
#elif defined(PCBSKY9X) #elif defined(PCBSKY9X)

28
radio/src/translations/nl.h.txt
View file

@ -138,8 +138,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define TR_RETA123 "RETA12345LR" #define TR_RETA123 "RETA12345LR"
#elif defined(PCBFLAMENCO)
#define TR_RETA123 "RETA123LR"
#elif defined(PCBX9E) #elif defined(PCBX9E)
#define TR_RETA123 "RETA1234LRLR" #define TR_RETA123 "RETA1234LRLR"
#elif defined(PCBTARANIS) || defined(REVX) #elif defined(PCBTARANIS) || defined(REVX)
@ -433,9 +431,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define LEN_VKEYS "\006" #define LEN_VKEYS "\006"
#define TR_VKEYS "Menu\0 ""Exit\0 ""Enter\0""Up\0 ""Down\0 ""Right\0""Left" #define TR_VKEYS "Menu\0 ""Exit\0 ""Enter\0""Up\0 ""Down\0 ""Right\0""Left"
#elif defined(PCBFLAMENCO)
#define LEN_VKEYS "\005"
#define TR_VKEYS "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus"
#elif defined(PCBTARANIS) #elif defined(PCBTARANIS)
#define LEN_VKEYS "\005" #define LEN_VKEYS "\005"
#define TR_VKEYS "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus" #define TR_VKEYS "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus"
@ -465,9 +460,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0""\310JSx""\310JSy" #define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0""\310JSx""\310JSy"
#define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0"
#elif defined(PCBFLAMENCO)
#define TR_POTS_VSRCRAW "SD\0 ""LS\0 ""RS\0 "
#define TR_SW_VSRCRAW "SA\0 ""SB\0 ""SC\0 ""SE\0 ""SF\0 "
#elif defined(PCBX9E) #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_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" #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"
@ -510,17 +502,13 @@
#define TR_ROTENC_SWITCHES #define TR_ROTENC_SWITCHES
#endif #endif
#if defined(PCBFLAMENCO) #if !defined(PCBTARANIS) && !defined(PCBHORUS)
#define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB\301""SC1""SC2""SC3""SC4""SC5""SC6""SE\300""SE\301""SF\300""SF-""SF\301"
#elif !defined(PCBTARANIS) && !defined(PCBHORUS)
#define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN"
#endif #endif
#define TR_ON_ONE_SWITCHES "ON\0""One" #define TR_ON_ONE_SWITCHES "ON\0""One"
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_VSWITCHES "---" TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
#elif defined(PCBTARANIS) || defined(PCBHORUS)
// only special switches here // only special switches here
#define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES
#elif defined(PCBSKY9X) #elif defined(PCBSKY9X)
@ -598,7 +586,7 @@
#define BREAKSPACE " " #define BREAKSPACE " "
#endif #endif
#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) #if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_ENTER "[ENTER]" #define TR_ENTER "[ENTER]"
#else #else
#define TR_ENTER "[MENU]" #define TR_ENTER "[MENU]"
@ -610,9 +598,7 @@
#define TR_EXIT "[EXIT]" #define TR_EXIT "[EXIT]"
#endif #endif
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" TR_ENTER
#elif defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER #define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
#else #else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT #define TR_POPUPS TR_ENTER "\010" TR_EXIT
@ -1210,11 +1196,7 @@
#define TR_ABOUT_MARTIN_1 "Martin Hotar" #define TR_ABOUT_MARTIN_1 "Martin Hotar"
#define TR_ABOUT_MARTIN_2 "Graphics designer" #define TR_ABOUT_MARTIN_2 "Graphics designer"
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_ABOUT_HARDWARE_1 "XXX"
#define TR_ABOUT_HARDWARE_2 "Hardware designer/producer"
#define TR_ABOUT_HARDWARE_3 ""
#elif defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_ABOUT_HARDWARE_1 "FrSky" #define TR_ABOUT_HARDWARE_1 "FrSky"
#define TR_ABOUT_HARDWARE_2 "Hardware designer/producer" #define TR_ABOUT_HARDWARE_2 "Hardware designer/producer"
#define TR_ABOUT_HARDWARE_3 "Firmware contributor" #define TR_ABOUT_HARDWARE_3 "Firmware contributor"

9
radio/src/translations/pl.h.txt
View file

@ -135,8 +135,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define TR_RETA123 "KWGL12345LR" #define TR_RETA123 "KWGL12345LR"
#elif defined(PCBFLAMENCO)
#define TR_RETA123 "KWGL123LR"
#elif defined(PCBX9E) #elif defined(PCBX9E)
#define TR_RETA123 "KWGL1234LRLR" #define TR_RETA123 "KWGL1234LRLR"
#elif defined(PCBTARANIS) || defined(REVX) #elif defined(PCBTARANIS) || defined(REVX)
@ -477,9 +475,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0""\310JSx""\310JSy" #define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0""\310JSx""\310JSy"
#define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0"
#elif defined(PCBFLAMENCO)
#define TR_POTS_VSRCRAW "SD\0 ""LS\0 ""RS\0 "
#define TR_SW_VSRCRAW "SA\0 ""SB\0 ""SC\0 ""SE\0 ""SF\0 "
#elif defined(PCBX9E) #elif defined(PCBX9E)
#define TR_POTS_VSRCRAW "\310S1\0""\310S2\0""\310S3\0""\310S4\0""\311LS\0""\311RS\0""\311LS2""\311RS2" #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0""\310S3\0""\310S4\0""\311LS\0""\311RS\0""\311LS2""\311RS2"
#define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0""\312SI\0""\312SJ\0""\312SK\0""\312SL\0""\312SM\0""\312SN\0""\312SO\0""\312SP\0""\312SQ\0""\312SR\0" #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"
@ -528,9 +523,7 @@
#define TR_ON_ONE_SWITCHES "ON\0""One" #define TR_ON_ONE_SWITCHES "ON\0""One"
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_VSWITCHES "---" TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
#elif defined(PCBTARANIS) || defined(PCBHORUS)
// only special switches here // only special switches here
#define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES
#elif defined(PCBSKY9X) #elif defined(PCBSKY9X)

7
radio/src/translations/pt.h.txt
View file

@ -465,9 +465,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0""\310JSx""\310JSy" #define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0""\310JSx""\310JSy"
#define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0"
#elif defined(PCBFLAMENCO)
#define TR_POTS_VSRCRAW "SD\0 ""LS\0 ""RS\0 "
#define TR_SW_VSRCRAW "SA\0 ""SB\0 ""SC\0 ""SE\0 ""SF\0 "
#elif defined(PCBX9E) #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_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" #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"
@ -516,9 +513,7 @@
#define TR_ON_ONE_SWITCHES "ON\0""One" #define TR_ON_ONE_SWITCHES "ON\0""One"
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_VSWITCHES "---" TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "ON\0""One"
#elif defined(PCBTARANIS) || defined(PCBHORUS)
// only special switches here // only special switches here
#define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES
#elif defined(PCBSKY9X) #elif defined(PCBSKY9X)

27
radio/src/translations/se.h.txt
View file

@ -131,9 +131,7 @@
#define LEN_RETA123 "\001" #define LEN_RETA123 "\001"
#if defined(PCBFLAMENCO) #if defined(PCBX9E)
#define TR_RETA123 "RHGS123HV"
#elif defined(PCBX9E)
#define TR_RETA123 "RHGS1234HVHV" #define TR_RETA123 "RHGS1234HVHV"
#elif defined(PCBTARANIS) || defined(REVX) #elif defined(PCBTARANIS) || defined(REVX)
#define TR_RETA123 "RHGS123HV" #define TR_RETA123 "RHGS123HV"
@ -482,9 +480,6 @@
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0""\310JSx""\310JSy" #define TR_POTS_VSRCRAW "\310S1\0""\3106P\0""\310S2\0""\313L1\0""\313L2\0""\311LS\0""\311RS\0""\310JSx""\310JSy"
#define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0" #define TR_SW_VSRCRAW "\312SA\0""\312SB\0""\312SC\0""\312SD\0""\312SE\0""\312SF\0""\312SG\0""\312SH\0"
#elif defined(PCBFLAMENCO)
#define TR_POTS_VSRCRAW "SD\0 ""LS\0 ""RS\0 "
#define TR_SW_VSRCRAW "SA\0 ""SB\0 ""SC\0 ""SE\0 ""SF\0 "
#elif defined(PCBX9E) #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_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" #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"
@ -528,18 +523,14 @@
#endif #endif
#if defined(PCBFLAMENCO) #if !defined(PCBTARANIS) && !defined(PCBHORUS)
#define TR_PHYS_SWITCHES "SA\300""SA-""SA\301""SB\300""SB\301""SC1""SC2""SC3""SC4""SC5""SC6""SE\300""SE\301""SF\300""SF-""SF\301"
#elif !defined(PCBTARANIS) && !defined(PCBHORUS)
#define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" #define TR_2POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN"
#endif #endif
#define TR_ON_ONE_SWITCHES "På\0""Ett" #define TR_ON_ONE_SWITCHES "På\0""Ett"
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_VSWITCHES "---" TR_PHYS_SWITCHES TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW "På\0""Ett"
#elif defined(PCBTARANIS) || defined(PCBHORUS)
// only special switches here // only special switches here
#define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES #define TR_VSWITCHES "---" TR_TRIMS_SWITCHES TR_ON_ONE_SWITCHES
#elif defined(PCBSKY9X) #elif defined(PCBSKY9X)
@ -615,7 +606,7 @@
#define BREAKSPACE " " #define BREAKSPACE " "
#endif #endif
#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) #if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_ENTER "[ENTER]" #define TR_ENTER "[ENTER]"
#else #else
#define TR_ENTER "[MENU]" #define TR_ENTER "[MENU]"
@ -627,9 +618,7 @@
#define TR_EXIT "[EXIT]" #define TR_EXIT "[EXIT]"
#endif #endif
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" TR_ENTER
#elif defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER #define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
#else #else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT #define TR_POPUPS TR_ENTER "\010" TR_EXIT
@ -1220,11 +1209,7 @@
#define TR_ABOUT_MARTIN_1 "Martin Hotar" #define TR_ABOUT_MARTIN_1 "Martin Hotar"
#define TR_ABOUT_MARTIN_2 "Grafikdesigner" #define TR_ABOUT_MARTIN_2 "Grafikdesigner"
#if defined(PCBFLAMENCO) #if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_ABOUT_HARDWARE_1 "XXX"
#define TR_ABOUT_HARDWARE_2 "Hardware designer/producer"
#define TR_ABOUT_HARDWARE_3 ""
#elif defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_ABOUT_HARDWARE_1 "FrSky" #define TR_ABOUT_HARDWARE_1 "FrSky"
#define TR_ABOUT_HARDWARE_2 "Hårdvarudesign/producent" #define TR_ABOUT_HARDWARE_2 "Hårdvarudesign/producent"
#define TR_ABOUT_HARDWARE_3 "" #define TR_ABOUT_HARDWARE_3 ""