Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-24 16:55:20 +03:00
Code Issues Wiki Activity

Fixes #5502 (#5575)

Browse source 
* Fixes #5502

* RAS renamed to SWR
This commit is contained in:
Bertrand Songis 2018-01-02 10:41:15 +01:00 • committed by GitHub
parent b22fa48e90
commit 269831e0c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 315 additions and 307 deletions
Download patch file Download diff file Expand all files Collapse all files

6
companion/src/firmwares/opentx/opentxeeprom.cpp
View file

@ -348,11 +348,11 @@ class SourcesConversionTable: public ConversionTable {
for (int i=0; i<TELEMETRY_SOURCE_ACC; i++) { for (int i=0; i<TELEMETRY_SOURCE_ACC; i++) {
if (version < 216) { if (version < 216) {
if (i==TELEMETRY_SOURCE_TX_TIME || i==TELEMETRY_SOURCE_SWR || i==TELEMETRY_SOURCE_A3 || i==TELEMETRY_SOURCE_A4 || i==TELEMETRY_SOURCE_ASPEED || i==TELEMETRY_SOURCE_DTE || i==TELEMETRY_SOURCE_CELL_MIN || i==TELEMETRY_SOURCE_CELLS_MIN || i==TELEMETRY_SOURCE_VFAS_MIN) if (i==TELEMETRY_SOURCE_TX_TIME || i==TELEMETRY_SOURCE_RAS || i==TELEMETRY_SOURCE_A3 || i==TELEMETRY_SOURCE_A4 || i==TELEMETRY_SOURCE_ASPEED || i==TELEMETRY_SOURCE_DTE || i==TELEMETRY_SOURCE_CELL_MIN || i==TELEMETRY_SOURCE_CELLS_MIN || i==TELEMETRY_SOURCE_VFAS_MIN)
continue; continue;
} }
if (!IS_ARM(board)) { if (!IS_ARM(board)) {
if (i==TELEMETRY_SOURCE_TX_TIME || i==TELEMETRY_SOURCE_SWR || i==TELEMETRY_SOURCE_A3 || i==TELEMETRY_SOURCE_A4 || i==TELEMETRY_SOURCE_A3_MIN || i==TELEMETRY_SOURCE_A4_MIN) if (i==TELEMETRY_SOURCE_TX_TIME || i==TELEMETRY_SOURCE_RAS || i==TELEMETRY_SOURCE_A3 || i==TELEMETRY_SOURCE_A4 || i==TELEMETRY_SOURCE_A3_MIN || i==TELEMETRY_SOURCE_A4_MIN)
continue; continue;
} }
addConversion(RawSource(SOURCE_TYPE_TELEMETRY, i), val++); addConversion(RawSource(SOURCE_TYPE_TELEMETRY, i), val++);
@ -486,7 +486,7 @@ class TelemetrySourcesConversionTable: public ConversionTable {
if (IS_ARM(board) && version >= 217) if (IS_ARM(board) && version >= 217)
addConversion(1+TELEMETRY_SOURCE_TIMER3, val++); addConversion(1+TELEMETRY_SOURCE_TIMER3, val++);
if (IS_ARM(board) && version >= 216) if (IS_ARM(board) && version >= 216)
addConversion(1+TELEMETRY_SOURCE_SWR, val++); addConversion(1+TELEMETRY_SOURCE_RAS, val++);
addConversion(1+TELEMETRY_SOURCE_RSSI_TX, val++); addConversion(1+TELEMETRY_SOURCE_RSSI_TX, val++);
addConversion(1+TELEMETRY_SOURCE_RSSI_RX, val++); addConversion(1+TELEMETRY_SOURCE_RSSI_RX, val++);
if (IS_ARM(board) && version >= 216) if (IS_ARM(board) && version >= 216)

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

@ -1057,45 +1057,46 @@ QString OpenTxFirmware::getStampUrl()
void addOpenTxCommonOptions(OpenTxFirmware * firmware) void addOpenTxCommonOptions(OpenTxFirmware * firmware)
{ {
firmware->addOption("ppmus", QCoreApplication::translate("Firmare", "Channel values displayed in us")); firmware->addOption("ppmus", QCoreApplication::translate("Firmware", "Channel values displayed in us"));
firmware->addOption("nooverridech", QCoreApplication::translate("Firmare", "No OverrideCH functions available")); firmware->addOption("nooverridech", QCoreApplication::translate("Firmware", "No OverrideCH functions available"));
Option fai_options[] = {{"faichoice", QCoreApplication::translate("Firmare", "Possibility to enable FAI MODE (no telemetry) at field")}, Option fai_options[] = {{"faichoice", QCoreApplication::translate("Firmware", "Possibility to enable FAI MODE (no telemetry) at field")},
{"faimode", QCoreApplication::translate("Firmare", "FAI MODE (no telemetry) always enabled")}, {"faimode", QCoreApplication::translate("Firmware", "FAI MODE (no telemetry) always enabled")},
{NULL}}; {NULL}};
firmware->addOptions(fai_options); firmware->addOptions(fai_options);
} }
void addOpenTxArmOptions(OpenTxFirmware * firmware) void addOpenTxArmOptions(OpenTxFirmware * firmware)
{ {
firmware->addOption("multimodule", QCoreApplication::translate("Firmare", "Support for the DIY-Multiprotocol-TX-Module")); firmware->addOption("multimodule", QCoreApplication::translate("Firmware", "Support for the DIY-Multiprotocol-TX-Module"));
firmware->addOption("eu", QCoreApplication::translate("Firmare", "Removes D8 FrSky protocol support which is not legal for use in the EU on radios sold after Jan 1st, 2015")); firmware->addOption("eu", QCoreApplication::translate("Firmware", "Removes D8 FrSky protocol support which is not legal for use in the EU on radios sold after Jan 1st, 2015"));
} }
void addOpenTxFrskyOptions(OpenTxFirmware * firmware) void addOpenTxFrskyOptions(OpenTxFirmware * firmware)
{ {
addOpenTxCommonOptions(firmware); addOpenTxCommonOptions(firmware);
addOpenTxArmOptions(firmware); addOpenTxArmOptions(firmware);
firmware->addOption("noheli", QCoreApplication::translate("Firmare", "Disable HELI menu and cyclic mix support")); firmware->addOption("noheli", QCoreApplication::translate("Firmware", "Disable HELI menu and cyclic mix support"));
firmware->addOption("nogvars", QCoreApplication::translate("Firmare", "Disable Global variables")); firmware->addOption("nogvars", QCoreApplication::translate("Firmware", "Disable Global variables"));
firmware->addOption("lua", QCoreApplication::translate("Firmare", "Enable Lua custom scripts screen")); firmware->addOption("lua", QCoreApplication::translate("Firmware", "Enable Lua custom scripts screen"));
firmware->addOption("luac", QCoreApplication::translate("Firmare", "Enable Lua compiler")); firmware->addOption("luac", QCoreApplication::translate("Firmware", "Enable Lua compiler"));
} }
void addOpenTxTaranisOptions(OpenTxFirmware * firmware) void addOpenTxTaranisOptions(OpenTxFirmware * firmware)
{ {
addOpenTxFrskyOptions(firmware); addOpenTxFrskyOptions(firmware);
firmware->addOption("internalppm", QCoreApplication::translate("Firmare", "Support for PPM internal module hack")); firmware->addOption("internalppm", QCoreApplication::translate("Firmware", "Support for PPM internal module hack"));
firmware->addOption("sqt5font", QCoreApplication::translate("Firmare", "Use alternative SQT5 font")); firmware->addOption("sqt5font", QCoreApplication::translate("Firmware", "Use alternative SQT5 font"));
firmware->addOption("noras", QCoreApplication::translate("Firmware", "Disable RAS (SWR)"));
} }
void addOpenTxLcdOptions(OpenTxFirmware * firmware) void addOpenTxLcdOptions(OpenTxFirmware * firmware)
{ {
Option lcd_options[] = { Option lcd_options[] = {
{"ST7565P", QCoreApplication::translate("Firmare", "ST7565P LCD or compatible")}, {"ST7565P", QCoreApplication::translate("Firmware", "ST7565P LCD or compatible")},
{"ST7565R", QCoreApplication::translate("Firmare", "ST7565R LCD or compatible")}, {"ST7565R", QCoreApplication::translate("Firmware", "ST7565R LCD or compatible")},
{"ERC12864FSF", QCoreApplication::translate("Firmare", "ERC12864FSF LCD")}, {"ERC12864FSF", QCoreApplication::translate("Firmware", "ERC12864FSF LCD")},
{"ST7920", QCoreApplication::translate("Firmare", "ST7920 LCD")}, {"ST7920", QCoreApplication::translate("Firmware", "ST7920 LCD")},
{"KS108", QCoreApplication::translate("Firmare", "KS108 LCD")}, {"KS108", QCoreApplication::translate("Firmware", "KS108 LCD")},
{NULL} {NULL}
}; };
firmware->addOptions(lcd_options); firmware->addOptions(lcd_options);
@ -1104,8 +1105,8 @@ void addOpenTxLcdOptions(OpenTxFirmware * firmware)
void addOpenTxVoiceOptions(OpenTxFirmware * firmware) void addOpenTxVoiceOptions(OpenTxFirmware * firmware)
{ {
Option voice_options[] = { Option voice_options[] = {
{"WTV20", QCoreApplication::translate("Firmare", "WTV20 voice module")}, {"WTV20", QCoreApplication::translate("Firmware", "WTV20 voice module")},
{"JQ6500", QCoreApplication::translate("Firmare", "JQ6500 voice module")}, {"JQ6500", QCoreApplication::translate("Firmware", "JQ6500 voice module")},
{NULL} {NULL}
}; };
firmware->addOptions(voice_options); firmware->addOptions(voice_options);
@ -1126,303 +1127,303 @@ void registerOpenTxFirmwares()
{ {
OpenTxFirmware * firmware; OpenTxFirmware * firmware;
Option ext_options[] = {{"frsky", QCoreApplication::translate("Firmare", "Support for frsky telemetry mod"), FRSKY_VARIANT}, Option ext_options[] = {{"frsky", QCoreApplication::translate("Firmware", "Support for frsky telemetry mod"), FRSKY_VARIANT},
{"telemetrez", QCoreApplication::translate("Firmare", "Support for telemetry easy board"), FRSKY_VARIANT}, {"telemetrez", QCoreApplication::translate("Firmware", "Support for telemetry easy board"), FRSKY_VARIANT},
{"jeti", QCoreApplication::translate("Firmare", "Support for jeti telemetry mod"), 0}, {"jeti", QCoreApplication::translate("Firmware", "Support for jeti telemetry mod"), 0},
{"ardupilot", QCoreApplication::translate("Firmare", "Support for receiving ardupilot data"), 0}, {"ardupilot", QCoreApplication::translate("Firmware", "Support for receiving ardupilot data"), 0},
{"nmea", QCoreApplication::translate("Firmare", "Support for receiving NMEA data"), 0}, {"nmea", QCoreApplication::translate("Firmware", "Support for receiving NMEA data"), 0},
{"mavlink", QCoreApplication::translate("Firmare", "Support for MAVLINK devices"), MAVLINK_VARIANT}, {"mavlink", QCoreApplication::translate("Firmware", "Support for MAVLINK devices"), MAVLINK_VARIANT},
{NULL}}; {NULL}};
Option extr_options[] = {{"frsky", QCoreApplication::translate("Firmare", "Support for frsky telemetry mod"), FRSKY_VARIANT}, Option extr_options[] = {{"frsky", QCoreApplication::translate("Firmware", "Support for frsky telemetry mod"), FRSKY_VARIANT},
{"jeti", QCoreApplication::translate("Firmare", "Support for jeti telemetry mod"), 0}, {"jeti", QCoreApplication::translate("Firmware", "Support for jeti telemetry mod"), 0},
{"ardupilot", QCoreApplication::translate("Firmare", "Support for receiving ardupilot data"), 0}, {"ardupilot", QCoreApplication::translate("Firmware", "Support for receiving ardupilot data"), 0},
{"nmea", QCoreApplication::translate("Firmare", "Support for receiving NMEA data"), 0}, {"nmea", QCoreApplication::translate("Firmware", "Support for receiving NMEA data"), 0},
{"mavlink", QCoreApplication::translate("Firmare", "Support for MAVLINK devices"), MAVLINK_VARIANT}, {"mavlink", QCoreApplication::translate("Firmware", "Support for MAVLINK devices"), MAVLINK_VARIANT},
{NULL}}; {NULL}};
Option nav_options[] = {{"rotenc", QCoreApplication::translate("Firmare", "Rotary Encoder use in menus navigation")}, Option nav_options[] = {{"rotenc", QCoreApplication::translate("Firmware", "Rotary Encoder use in menus navigation")},
{"potscroll", QCoreApplication::translate("Firmare", "Pots use in menus navigation")}, {"potscroll", QCoreApplication::translate("Firmware", "Pots use in menus navigation")},
{NULL}}; {NULL}};
Option dsm2_options[] = {{"DSM2", QCoreApplication::translate("Firmare", "Support for DSM2 modules"), 0}, Option dsm2_options[] = {{"DSM2", QCoreApplication::translate("Firmware", "Support for DSM2 modules"), 0},
{"DSM2PPM", QCoreApplication::translate("Firmare", "Support for DSM2 modules using ppm instead of true serial"), 0}, {"DSM2PPM", QCoreApplication::translate("Firmware", "Support for DSM2 modules using ppm instead of true serial"), 0},
{NULL}}; {NULL}};
/* FrSky Taranis X9D+ board */ /* FrSky Taranis X9D+ board */
firmware = new OpenTxFirmware("opentx-x9d+", QCoreApplication::translate("Firmare", "FrSky Taranis X9D+"), BOARD_TARANIS_X9DP); firmware = new OpenTxFirmware("opentx-x9d+", QCoreApplication::translate("Firmware", "FrSky Taranis X9D+"), BOARD_TARANIS_X9DP);
addOpenTxTaranisOptions(firmware); addOpenTxTaranisOptions(firmware);
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* FrSky Taranis X9D board */ /* FrSky Taranis X9D board */
firmware = new OpenTxFirmware("opentx-x9d", QCoreApplication::translate("Firmare", "FrSky Taranis X9D"), BOARD_TARANIS_X9D); firmware = new OpenTxFirmware("opentx-x9d", QCoreApplication::translate("Firmware", "FrSky Taranis X9D"), BOARD_TARANIS_X9D);
firmware->addOption("haptic", QCoreApplication::translate("Firmare", "Haptic module installed")); firmware->addOption("haptic", QCoreApplication::translate("Firmware", "Haptic module installed"));
addOpenTxTaranisOptions(firmware); addOpenTxTaranisOptions(firmware);
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* FrSky Taranis X9E board */ /* FrSky Taranis X9E board */
firmware = new OpenTxFirmware("opentx-x9e", QCoreApplication::translate("Firmare", "FrSky Taranis X9E"), BOARD_TARANIS_X9E); firmware = new OpenTxFirmware("opentx-x9e", QCoreApplication::translate("Firmware", "FrSky Taranis X9E"), BOARD_TARANIS_X9E);
firmware->addOption("shutdownconfirm", QCoreApplication::translate("Firmare", "Confirmation before radio shutdown")); firmware->addOption("shutdownconfirm", QCoreApplication::translate("Firmware", "Confirmation before radio shutdown"));
firmware->addOption("horussticks", QCoreApplication::translate("Firmare", "Horus gimbals installed (Hall sensors)")); firmware->addOption("horussticks", QCoreApplication::translate("Firmware", "Horus gimbals installed (Hall sensors)"));
addOpenTxTaranisOptions(firmware); addOpenTxTaranisOptions(firmware);
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* FrSky X7 board */ /* FrSky X7 board */
firmware = new OpenTxFirmware("opentx-x7", QCoreApplication::translate("Firmare", "FrSky Taranis X7 / X7S"), BOARD_TARANIS_X7); firmware = new OpenTxFirmware("opentx-x7", QCoreApplication::translate("Firmware", "FrSky Taranis X7 / X7S"), BOARD_TARANIS_X7);
// No mixersmon for now // No mixersmon for now
addOpenTxFrskyOptions(firmware); addOpenTxFrskyOptions(firmware);
firmware->addOption("internalppm", QCoreApplication::translate("Firmare", "Support for PPM internal module hack")); firmware->addOption("internalppm", QCoreApplication::translate("Firmware", "Support for PPM internal module hack"));
firmware->addOption("sqt5font", QCoreApplication::translate("Firmare", "Use alternative SQT5 font")); firmware->addOption("sqt5font", QCoreApplication::translate("Firmware", "Use alternative SQT5 font"));
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* FrSky X10 board */ /* FrSky X10 board */
firmware = new OpenTxFirmware("opentx-x10", QCoreApplication::translate("Firmare", "FrSky Horus X10 / X10S"), BOARD_X10); firmware = new OpenTxFirmware("opentx-x10", QCoreApplication::translate("Firmware", "FrSky Horus X10 / X10S"), BOARD_X10);
addOpenTxFrskyOptions(firmware); addOpenTxFrskyOptions(firmware);
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* FrSky Horus board */ /* FrSky Horus board */
firmware = new OpenTxFirmware("opentx-x12s", QCoreApplication::translate("Firmare", "FrSky Horus X12S"), BOARD_X12S); firmware = new OpenTxFirmware("opentx-x12s", QCoreApplication::translate("Firmware", "FrSky Horus X12S"), BOARD_X12S);
addOpenTxFrskyOptions(firmware); addOpenTxFrskyOptions(firmware);
firmware->addOption("pcbdev", QCoreApplication::translate("Firmare", "Use ONLY with first DEV pcb version")); firmware->addOption("pcbdev", QCoreApplication::translate("Firmware", "Use ONLY with first DEV pcb version"));
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* 9XR-Pro */ /* 9XR-Pro */
firmware = new OpenTxFirmware("opentx-9xrpro", QCoreApplication::translate("Firmare", "Turnigy 9XR-PRO"), BOARD_9XRPRO); firmware = new OpenTxFirmware("opentx-9xrpro", QCoreApplication::translate("Firmware", "Turnigy 9XR-PRO"), BOARD_9XRPRO);
firmware->addOption("heli", QCoreApplication::translate("Firmare", "Enable HELI menu and cyclic mix support")); firmware->addOption("heli", QCoreApplication::translate("Firmware", "Enable HELI menu and cyclic mix support"));
firmware->addOption("nofp", QCoreApplication::translate("Firmare", "No flight modes")); firmware->addOption("nofp", QCoreApplication::translate("Firmware", "No flight modes"));
firmware->addOption("gvars", QCoreApplication::translate("Firmare", "Global variables"), GVARS_VARIANT); firmware->addOption("gvars", QCoreApplication::translate("Firmware", "Global variables"), GVARS_VARIANT);
firmware->addOption("potscroll", QCoreApplication::translate("Firmare", "Pots use in menus navigation")); firmware->addOption("potscroll", QCoreApplication::translate("Firmware", "Pots use in menus navigation"));
firmware->addOption("autosource", QCoreApplication::translate("Firmare", "In model setup menus automatically set source by moving the control")); firmware->addOption("autosource", QCoreApplication::translate("Firmware", "In model setup menus automatically set source by moving the control"));
firmware->addOption("autoswitch", QCoreApplication::translate("Firmare", "In model setup menus automatically set switch by moving the control")); firmware->addOption("autoswitch", QCoreApplication::translate("Firmware", "In model setup menus automatically set switch by moving the control"));
firmware->addOption("nographics", QCoreApplication::translate("Firmare", "No graphical check boxes and sliders")); firmware->addOption("nographics", QCoreApplication::translate("Firmware", "No graphical check boxes and sliders"));
firmware->addOption("battgraph", QCoreApplication::translate("Firmare", "Battery graph")); firmware->addOption("battgraph", QCoreApplication::translate("Firmware", "Battery graph"));
firmware->addOption("nobold", QCoreApplication::translate("Firmare", "Don't use bold font for highlighting active items")); firmware->addOption("nobold", QCoreApplication::translate("Firmware", "Don't use bold font for highlighting active items"));
firmware->addOption("bluetooth", QCoreApplication::translate("Firmare", "Bluetooth interface")); firmware->addOption("bluetooth", QCoreApplication::translate("Firmware", "Bluetooth interface"));
firmware->addOption("sqt5font", QCoreApplication::translate("Firmare", "Use alternative SQT5 font")); firmware->addOption("sqt5font", QCoreApplication::translate("Firmware", "Use alternative SQT5 font"));
addOpenTxArmOptions(firmware); addOpenTxArmOptions(firmware);
addOpenTxCommonOptions(firmware); addOpenTxCommonOptions(firmware);
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* 9XR board with M128 chip */ /* 9XR board with M128 chip */
firmware = new OpenTxFirmware("opentx-9xr128", QCoreApplication::translate("Firmare", "Turnigy 9XR with m128 chip"), BOARD_M128); firmware = new OpenTxFirmware("opentx-9xr128", QCoreApplication::translate("Firmware", "Turnigy 9XR with m128 chip"), BOARD_M128);
firmware->addOptions(extr_options); firmware->addOptions(extr_options);
firmware->addOption("heli", QCoreApplication::translate("Firmare", "Enable heli menu and cyclic mix support")); firmware->addOption("heli", QCoreApplication::translate("Firmware", "Enable heli menu and cyclic mix support"));
firmware->addOption("templates", QCoreApplication::translate("Firmare", "Enable TEMPLATES menu")); firmware->addOption("templates", QCoreApplication::translate("Firmware", "Enable TEMPLATES menu"));
firmware->addOption("nosplash", QCoreApplication::translate("Firmare", "No splash screen")); firmware->addOption("nosplash", QCoreApplication::translate("Firmware", "No splash screen"));
firmware->addOption("nofp", QCoreApplication::translate("Firmare", "No flight modes")); firmware->addOption("nofp", QCoreApplication::translate("Firmware", "No flight modes"));
firmware->addOption("nocurves", QCoreApplication::translate("Firmare", "Disable curves menus")); firmware->addOption("nocurves", QCoreApplication::translate("Firmware", "Disable curves menus"));
firmware->addOption("audio", QCoreApplication::translate("Firmare", "Support for radio modified with regular speaker")); firmware->addOption("audio", QCoreApplication::translate("Firmware", "Support for radio modified with regular speaker"));
firmware->addOption("voice", QCoreApplication::translate("Firmare", "Used if you have modified your radio with voice mode")); firmware->addOption("voice", QCoreApplication::translate("Firmware", "Used if you have modified your radio with voice mode"));
firmware->addOption("haptic", QCoreApplication::translate("Firmare", "Used if you have modified your radio with haptic mode")); firmware->addOption("haptic", QCoreApplication::translate("Firmware", "Used if you have modified your radio with haptic mode"));
// NOT TESTED firmware->addOption("PXX", QCoreApplication::translate("Firmare", "Support of FrSky PXX protocol")); // NOT TESTED firmware->addOption("PXX", QCoreApplication::translate("Firmware", "Support of FrSky PXX protocol"));
firmware->addOption("DSM2", QCoreApplication::translate("Firmare", "Support for DSM2 modules")); firmware->addOption("DSM2", QCoreApplication::translate("Firmware", "Support for DSM2 modules"));
firmware->addOption("ppmca", QCoreApplication::translate("Firmare", "PPM center adjustment in limits")); firmware->addOption("ppmca", QCoreApplication::translate("Firmware", "PPM center adjustment in limits"));
firmware->addOption("gvars", QCoreApplication::translate("Firmare", "Global variables"), GVARS_VARIANT); firmware->addOption("gvars", QCoreApplication::translate("Firmware", "Global variables"), GVARS_VARIANT);
firmware->addOption("symlimits", QCoreApplication::translate("Firmare", "Symetrical Limits")); firmware->addOption("symlimits", QCoreApplication::translate("Firmware", "Symetrical Limits"));
firmware->addOption("potscroll", QCoreApplication::translate("Firmare", "Pots use in menus navigation")); firmware->addOption("potscroll", QCoreApplication::translate("Firmware", "Pots use in menus navigation"));
firmware->addOption("autosource", QCoreApplication::translate("Firmare", "In model setup menus automatically set source by moving the control")); firmware->addOption("autosource", QCoreApplication::translate("Firmware", "In model setup menus automatically set source by moving the control"));
firmware->addOption("autoswitch", QCoreApplication::translate("Firmare", "In model setup menus automatically set switch by moving the control")); firmware->addOption("autoswitch", QCoreApplication::translate("Firmware", "In model setup menus automatically set switch by moving the control"));
firmware->addOption("nographics", QCoreApplication::translate("Firmare", "No graphical check boxes and sliders")); firmware->addOption("nographics", QCoreApplication::translate("Firmware", "No graphical check boxes and sliders"));
firmware->addOption("battgraph", QCoreApplication::translate("Firmare", "Battery graph")); firmware->addOption("battgraph", QCoreApplication::translate("Firmware", "Battery graph"));
firmware->addOption("nobold", QCoreApplication::translate("Firmare", "Don't use bold font for highlighting active items")); firmware->addOption("nobold", QCoreApplication::translate("Firmware", "Don't use bold font for highlighting active items"));
firmware->addOption("thrtrace", QCoreApplication::translate("Firmare", "Enable the throttle trace in Statistics")); firmware->addOption("thrtrace", QCoreApplication::translate("Firmware", "Enable the throttle trace in Statistics"));
firmware->addOption("pgbar", QCoreApplication::translate("Firmare", "EEprom write Progress bar")); firmware->addOption("pgbar", QCoreApplication::translate("Firmware", "EEprom write Progress bar"));
firmware->addOption("imperial", QCoreApplication::translate("Firmare", "Imperial units")); firmware->addOption("imperial", QCoreApplication::translate("Firmware", "Imperial units"));
firmware->addOption("sqt5font", QCoreApplication::translate("Firmare", "Use alternative SQT5 font")); firmware->addOption("sqt5font", QCoreApplication::translate("Firmware", "Use alternative SQT5 font"));
addOpenTxCommonOptions(firmware); addOpenTxCommonOptions(firmware);
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* 9XR board */ /* 9XR board */
firmware = new OpenTxFirmware("opentx-9xr", QCoreApplication::translate("Firmare", "Turnigy 9XR"), BOARD_STOCK); firmware = new OpenTxFirmware("opentx-9xr", QCoreApplication::translate("Firmware", "Turnigy 9XR"), BOARD_STOCK);
firmware->addOptions(extr_options); firmware->addOptions(extr_options);
firmware->addOption("heli", QCoreApplication::translate("Firmare", "Enable heli menu and cyclic mix support")); firmware->addOption("heli", QCoreApplication::translate("Firmware", "Enable heli menu and cyclic mix support"));
firmware->addOption("templates", QCoreApplication::translate("Firmare", "Enable TEMPLATES menu")); firmware->addOption("templates", QCoreApplication::translate("Firmware", "Enable TEMPLATES menu"));
firmware->addOption("nosplash", QCoreApplication::translate("Firmare", "No splash screen")); firmware->addOption("nosplash", QCoreApplication::translate("Firmware", "No splash screen"));
firmware->addOption("nofp", QCoreApplication::translate("Firmare", "No flight modes")); firmware->addOption("nofp", QCoreApplication::translate("Firmware", "No flight modes"));
firmware->addOption("nocurves", QCoreApplication::translate("Firmare", "Disable curves menus")); firmware->addOption("nocurves", QCoreApplication::translate("Firmware", "Disable curves menus"));
firmware->addOption("audio", QCoreApplication::translate("Firmare", "Support for radio modified with regular speaker")); firmware->addOption("audio", QCoreApplication::translate("Firmware", "Support for radio modified with regular speaker"));
firmware->addOption("voice", QCoreApplication::translate("Firmare", "Used if you have modified your radio with voice mode")); firmware->addOption("voice", QCoreApplication::translate("Firmware", "Used if you have modified your radio with voice mode"));
firmware->addOption("haptic", QCoreApplication::translate("Firmare", "Used if you have modified your radio with haptic mode")); firmware->addOption("haptic", QCoreApplication::translate("Firmware", "Used if you have modified your radio with haptic mode"));
// NOT TESTED firmware->addOption("PXX", QCoreApplication::translate("Firmare", "Support of FrSky PXX protocol")); // NOT TESTED firmware->addOption("PXX", QCoreApplication::translate("Firmware", "Support of FrSky PXX protocol"));
firmware->addOption("DSM2", QCoreApplication::translate("Firmare", "Support for DSM2 modules")); firmware->addOption("DSM2", QCoreApplication::translate("Firmware", "Support for DSM2 modules"));
firmware->addOption("ppmca", QCoreApplication::translate("Firmare", "PPM center adjustment in limits")); firmware->addOption("ppmca", QCoreApplication::translate("Firmware", "PPM center adjustment in limits"));
firmware->addOption("gvars", QCoreApplication::translate("Firmare", "Global variables"), GVARS_VARIANT); firmware->addOption("gvars", QCoreApplication::translate("Firmware", "Global variables"), GVARS_VARIANT);
firmware->addOption("symlimits", QCoreApplication::translate("Firmare", "Symetrical Limits")); firmware->addOption("symlimits", QCoreApplication::translate("Firmware", "Symetrical Limits"));
firmware->addOption("potscroll", QCoreApplication::translate("Firmare", "Pots use in menus navigation")); firmware->addOption("potscroll", QCoreApplication::translate("Firmware", "Pots use in menus navigation"));
firmware->addOption("autosource", QCoreApplication::translate("Firmare", "In model setup menus automatically set source by moving the control")); firmware->addOption("autosource", QCoreApplication::translate("Firmware", "In model setup menus automatically set source by moving the control"));
firmware->addOption("autoswitch", QCoreApplication::translate("Firmare", "In model setup menus automatically set switch by moving the control")); firmware->addOption("autoswitch", QCoreApplication::translate("Firmware", "In model setup menus automatically set switch by moving the control"));
firmware->addOption("nographics", QCoreApplication::translate("Firmare", "No graphical check boxes and sliders")); firmware->addOption("nographics", QCoreApplication::translate("Firmware", "No graphical check boxes and sliders"));
firmware->addOption("battgraph", QCoreApplication::translate("Firmare", "Battery graph")); firmware->addOption("battgraph", QCoreApplication::translate("Firmware", "Battery graph"));
firmware->addOption("nobold", QCoreApplication::translate("Firmare", "Don't use bold font for highlighting active items")); firmware->addOption("nobold", QCoreApplication::translate("Firmware", "Don't use bold font for highlighting active items"));
firmware->addOption("thrtrace", QCoreApplication::translate("Firmare", "Enable the throttle trace in Statistics")); firmware->addOption("thrtrace", QCoreApplication::translate("Firmware", "Enable the throttle trace in Statistics"));
firmware->addOption("pgbar", QCoreApplication::translate("Firmare", "EEprom write Progress bar")); firmware->addOption("pgbar", QCoreApplication::translate("Firmware", "EEprom write Progress bar"));
firmware->addOption("imperial", QCoreApplication::translate("Firmare", "Imperial units")); firmware->addOption("imperial", QCoreApplication::translate("Firmware", "Imperial units"));
firmware->addOption("nowshh", QCoreApplication::translate("Firmare", "No Winged Shadow How High support")); firmware->addOption("nowshh", QCoreApplication::translate("Firmware", "No Winged Shadow How High support"));
firmware->addOption("novario", QCoreApplication::translate("Firmare", "No vario support")); firmware->addOption("novario", QCoreApplication::translate("Firmware", "No vario support"));
firmware->addOption("nogps", QCoreApplication::translate("Firmare", "No GPS support")); firmware->addOption("nogps", QCoreApplication::translate("Firmware", "No GPS support"));
firmware->addOption("nogauges", QCoreApplication::translate("Firmare", "No gauges in the custom telemetry screen")); firmware->addOption("nogauges", QCoreApplication::translate("Firmware", "No gauges in the custom telemetry screen"));
firmware->addOption("stickrev", QCoreApplication::translate("Firmare", "Add support for reversing stick inputs (e.g. needed for FrSky gimbals)")); firmware->addOption("stickrev", QCoreApplication::translate("Firmware", "Add support for reversing stick inputs (e.g. needed for FrSky gimbals)"));
firmware->addOption("sqt5font", QCoreApplication::translate("Firmare", "Use alternative SQT5 font")); firmware->addOption("sqt5font", QCoreApplication::translate("Firmware", "Use alternative SQT5 font"));
addOpenTxCommonOptions(firmware); addOpenTxCommonOptions(firmware);
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* 9x board */ /* 9x board */
firmware = new OpenTxFirmware("opentx-9x", QCoreApplication::translate("Firmare", "9X with stock board"), BOARD_STOCK); firmware = new OpenTxFirmware("opentx-9x", QCoreApplication::translate("Firmware", "9X with stock board"), BOARD_STOCK);
firmware->addOptions(ext_options); firmware->addOptions(ext_options);
firmware->addOption("heli", QCoreApplication::translate("Firmare", "Enable heli menu and cyclic mix support")); firmware->addOption("heli", QCoreApplication::translate("Firmware", "Enable heli menu and cyclic mix support"));
firmware->addOption("templates", QCoreApplication::translate("Firmare", "Enable TEMPLATES menu")); firmware->addOption("templates", QCoreApplication::translate("Firmware", "Enable TEMPLATES menu"));
firmware->addOption("nosplash", QCoreApplication::translate("Firmare", "No splash screen")); firmware->addOption("nosplash", QCoreApplication::translate("Firmware", "No splash screen"));
firmware->addOption("nofp", QCoreApplication::translate("Firmare", "No flight modes")); firmware->addOption("nofp", QCoreApplication::translate("Firmware", "No flight modes"));
firmware->addOption("nocurves", QCoreApplication::translate("Firmare", "Disable curves menus")); firmware->addOption("nocurves", QCoreApplication::translate("Firmware", "Disable curves menus"));
firmware->addOption("audio", QCoreApplication::translate("Firmare", "Support for radio modified with regular speaker")); firmware->addOption("audio", QCoreApplication::translate("Firmware", "Support for radio modified with regular speaker"));
firmware->addOption("voice", QCoreApplication::translate("Firmare", "Used if you have modified your radio with voice mode")); firmware->addOption("voice", QCoreApplication::translate("Firmware", "Used if you have modified your radio with voice mode"));
firmware->addOption("haptic", QCoreApplication::translate("Firmare", "Used if you have modified your radio with haptic mode")); firmware->addOption("haptic", QCoreApplication::translate("Firmware", "Used if you have modified your radio with haptic mode"));
// NOT TESTED firmware->addOption("PXX", QCoreApplication::translate("Firmare", "Support of FrSky PXX protocol")); // NOT TESTED firmware->addOption("PXX", QCoreApplication::translate("Firmware", "Support of FrSky PXX protocol"));
firmware->addOption("DSM2", QCoreApplication::translate("Firmare", "Support for DSM2 modules")); firmware->addOption("DSM2", QCoreApplication::translate("Firmware", "Support for DSM2 modules"));
firmware->addOption("ppmca", QCoreApplication::translate("Firmare", "PPM center adjustment in limits")); firmware->addOption("ppmca", QCoreApplication::translate("Firmware", "PPM center adjustment in limits"));
firmware->addOption("gvars", QCoreApplication::translate("Firmare", "Global variables"), GVARS_VARIANT); firmware->addOption("gvars", QCoreApplication::translate("Firmware", "Global variables"), GVARS_VARIANT);
firmware->addOption("symlimits", QCoreApplication::translate("Firmare", "Symetrical Limits")); firmware->addOption("symlimits", QCoreApplication::translate("Firmware", "Symetrical Limits"));
firmware->addOptions(nav_options); firmware->addOptions(nav_options);
firmware->addOption("sp22", QCoreApplication::translate("Firmare", "SmartieParts 2.2 Backlight support")); firmware->addOption("sp22", QCoreApplication::translate("Firmware", "SmartieParts 2.2 Backlight support"));
firmware->addOption("autosource", QCoreApplication::translate("Firmare", "In model setup menus automatically set source by moving the control")); firmware->addOption("autosource", QCoreApplication::translate("Firmware", "In model setup menus automatically set source by moving the control"));
firmware->addOption("autoswitch", QCoreApplication::translate("Firmare", "In model setup menus automatically set switch by moving the control")); firmware->addOption("autoswitch", QCoreApplication::translate("Firmware", "In model setup menus automatically set switch by moving the control"));
firmware->addOption("dblkeys", QCoreApplication::translate("Firmare", "Enable resetting values by pressing up and down at the same time")); firmware->addOption("dblkeys", QCoreApplication::translate("Firmware", "Enable resetting values by pressing up and down at the same time"));
firmware->addOption("nographics", QCoreApplication::translate("Firmare", "No graphical check boxes and sliders")); firmware->addOption("nographics", QCoreApplication::translate("Firmware", "No graphical check boxes and sliders"));
firmware->addOption("battgraph", QCoreApplication::translate("Firmare", "Battery graph")); firmware->addOption("battgraph", QCoreApplication::translate("Firmware", "Battery graph"));
firmware->addOption("nobold", QCoreApplication::translate("Firmare", "Don't use bold font for highlighting active items")); firmware->addOption("nobold", QCoreApplication::translate("Firmware", "Don't use bold font for highlighting active items"));
firmware->addOption("thrtrace", QCoreApplication::translate("Firmare", "Enable the throttle trace in Statistics")); firmware->addOption("thrtrace", QCoreApplication::translate("Firmware", "Enable the throttle trace in Statistics"));
firmware->addOption("pgbar", QCoreApplication::translate("Firmare", "EEprom write progress bar")); firmware->addOption("pgbar", QCoreApplication::translate("Firmware", "EEprom write progress bar"));
firmware->addOption("imperial", QCoreApplication::translate("Firmare", "Imperial units")); firmware->addOption("imperial", QCoreApplication::translate("Firmware", "Imperial units"));
firmware->addOption("nowshh", QCoreApplication::translate("Firmare", "No Winged Shadow How High support")); firmware->addOption("nowshh", QCoreApplication::translate("Firmware", "No Winged Shadow How High support"));
firmware->addOption("novario", QCoreApplication::translate("Firmare", "No vario support")); firmware->addOption("novario", QCoreApplication::translate("Firmware", "No vario support"));
firmware->addOption("nogps", QCoreApplication::translate("Firmare", "No GPS support")); firmware->addOption("nogps", QCoreApplication::translate("Firmware", "No GPS support"));
firmware->addOption("nogauges", QCoreApplication::translate("Firmare", "No gauges in the custom telemetry screen")); firmware->addOption("nogauges", QCoreApplication::translate("Firmware", "No gauges in the custom telemetry screen"));
firmware->addOption("fasoffset", QCoreApplication::translate("Firmare", "Allow compensating for offset errors in FrSky FAS current sensors")); firmware->addOption("fasoffset", QCoreApplication::translate("Firmware", "Allow compensating for offset errors in FrSky FAS current sensors"));
firmware->addOption("stickrev", QCoreApplication::translate("Firmare", "Add support for reversing stick inputs (e.g. needed for FrSky gimbals)")); firmware->addOption("stickrev", QCoreApplication::translate("Firmware", "Add support for reversing stick inputs (e.g. needed for FrSky gimbals)"));
firmware->addOption("sqt5font", QCoreApplication::translate("Firmare", "Use alternative SQT5 font")); firmware->addOption("sqt5font", QCoreApplication::translate("Firmware", "Use alternative SQT5 font"));
addOpenTxCommonOptions(firmware); addOpenTxCommonOptions(firmware);
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* 9x board with M128 chip */ /* 9x board with M128 chip */
firmware = new OpenTxFirmware("opentx-9x128", QCoreApplication::translate("Firmare", "9X with stock board and m128 chip"), BOARD_M128); firmware = new OpenTxFirmware("opentx-9x128", QCoreApplication::translate("Firmware", "9X with stock board and m128 chip"), BOARD_M128);
firmware->addOptions(ext_options); firmware->addOptions(ext_options);
firmware->addOption("heli", QCoreApplication::translate("Firmare", "Enable heli menu and cyclic mix support")); firmware->addOption("heli", QCoreApplication::translate("Firmware", "Enable heli menu and cyclic mix support"));
firmware->addOption("templates", QCoreApplication::translate("Firmare", "Enable TEMPLATES menu")); firmware->addOption("templates", QCoreApplication::translate("Firmware", "Enable TEMPLATES menu"));
firmware->addOption("nosplash", QCoreApplication::translate("Firmare", "No splash screen")); firmware->addOption("nosplash", QCoreApplication::translate("Firmware", "No splash screen"));
firmware->addOption("nofp", QCoreApplication::translate("Firmare", "No flight modes")); firmware->addOption("nofp", QCoreApplication::translate("Firmware", "No flight modes"));
firmware->addOption("nocurves", QCoreApplication::translate("Firmare", "Disable curves menus")); firmware->addOption("nocurves", QCoreApplication::translate("Firmware", "Disable curves menus"));
firmware->addOption("audio", QCoreApplication::translate("Firmare", "Support for radio modified with regular speaker")); firmware->addOption("audio", QCoreApplication::translate("Firmware", "Support for radio modified with regular speaker"));
firmware->addOption("voice", QCoreApplication::translate("Firmare", "Used if you have modified your radio with voice mode")); firmware->addOption("voice", QCoreApplication::translate("Firmware", "Used if you have modified your radio with voice mode"));
firmware->addOption("haptic", QCoreApplication::translate("Firmare", "Used if you have modified your radio with haptic mode")); firmware->addOption("haptic", QCoreApplication::translate("Firmware", "Used if you have modified your radio with haptic mode"));
// NOT TESTED firmware->addOption("PXX", QCoreApplication::translate("Firmare", "Support of FrSky PXX protocol")); // NOT TESTED firmware->addOption("PXX", QCoreApplication::translate("Firmware", "Support of FrSky PXX protocol"));
firmware->addOption("DSM2", QCoreApplication::translate("Firmare", "Support for DSM2 modules")); firmware->addOption("DSM2", QCoreApplication::translate("Firmware", "Support for DSM2 modules"));
firmware->addOption("ppmca", QCoreApplication::translate("Firmare", "PPM center adjustment in limits")); firmware->addOption("ppmca", QCoreApplication::translate("Firmware", "PPM center adjustment in limits"));
firmware->addOption("gvars", QCoreApplication::translate("Firmare", "Global variables"), GVARS_VARIANT); firmware->addOption("gvars", QCoreApplication::translate("Firmware", "Global variables"), GVARS_VARIANT);
firmware->addOption("symlimits", QCoreApplication::translate("Firmare", "Symetrical Limits")); firmware->addOption("symlimits", QCoreApplication::translate("Firmware", "Symetrical Limits"));
firmware->addOptions(nav_options); firmware->addOptions(nav_options);
firmware->addOption("sp22", QCoreApplication::translate("Firmare", "SmartieParts 2.2 Backlight support")); firmware->addOption("sp22", QCoreApplication::translate("Firmware", "SmartieParts 2.2 Backlight support"));
firmware->addOption("autosource", QCoreApplication::translate("Firmare", "In model setup menus automatically set source by moving the control")); firmware->addOption("autosource", QCoreApplication::translate("Firmware", "In model setup menus automatically set source by moving the control"));
firmware->addOption("autoswitch", QCoreApplication::translate("Firmare", "In model setup menus automatically set switch by moving the control")); firmware->addOption("autoswitch", QCoreApplication::translate("Firmware", "In model setup menus automatically set switch by moving the control"));
firmware->addOption("dblkeys", QCoreApplication::translate("Firmare", "Enable resetting values by pressing up and down at the same time")); firmware->addOption("dblkeys", QCoreApplication::translate("Firmware", "Enable resetting values by pressing up and down at the same time"));
firmware->addOption("nographics", QCoreApplication::translate("Firmare", "No graphical check boxes and sliders")); firmware->addOption("nographics", QCoreApplication::translate("Firmware", "No graphical check boxes and sliders"));
firmware->addOption("battgraph", QCoreApplication::translate("Firmare", "Battery graph")); firmware->addOption("battgraph", QCoreApplication::translate("Firmware", "Battery graph"));
firmware->addOption("nobold", QCoreApplication::translate("Firmare", "Don't use bold font for highlighting active items")); firmware->addOption("nobold", QCoreApplication::translate("Firmware", "Don't use bold font for highlighting active items"));
firmware->addOption("thrtrace", QCoreApplication::translate("Firmare", "Enable the throttle trace in Statistics")); firmware->addOption("thrtrace", QCoreApplication::translate("Firmware", "Enable the throttle trace in Statistics"));
firmware->addOption("pgbar", QCoreApplication::translate("Firmare", "EEprom write Progress bar")); firmware->addOption("pgbar", QCoreApplication::translate("Firmware", "EEprom write Progress bar"));
firmware->addOption("imperial", QCoreApplication::translate("Firmare", "Imperial units")); firmware->addOption("imperial", QCoreApplication::translate("Firmware", "Imperial units"));
firmware->addOption("sqt5font", QCoreApplication::translate("Firmare", "Use alternative SQT5 font")); firmware->addOption("sqt5font", QCoreApplication::translate("Firmware", "Use alternative SQT5 font"));
addOpenTxCommonOptions(firmware); addOpenTxCommonOptions(firmware);
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* ar9x board */ /* ar9x board */
firmware = new OpenTxFirmware("opentx-ar9x", QCoreApplication::translate("Firmare", "9X with AR9X board"), BOARD_AR9X); firmware = new OpenTxFirmware("opentx-ar9x", QCoreApplication::translate("Firmware", "9X with AR9X board"), BOARD_AR9X);
firmware->addOption("heli", QCoreApplication::translate("Firmare", "Enable HELI menu and cyclic mix support")); firmware->addOption("heli", QCoreApplication::translate("Firmware", "Enable HELI menu and cyclic mix support"));
firmware->addOption("nofp", QCoreApplication::translate("Firmare", "No flight modes")); firmware->addOption("nofp", QCoreApplication::translate("Firmware", "No flight modes"));
firmware->addOption("gvars", QCoreApplication::translate("Firmare", "Global variables"), GVARS_VARIANT); firmware->addOption("gvars", QCoreApplication::translate("Firmware", "Global variables"), GVARS_VARIANT);
firmware->addOption("potscroll", QCoreApplication::translate("Firmare", "Pots use in menus navigation")); firmware->addOption("potscroll", QCoreApplication::translate("Firmware", "Pots use in menus navigation"));
firmware->addOption("autosource", QCoreApplication::translate("Firmare", "In model setup menus automatically set source by moving the control")); firmware->addOption("autosource", QCoreApplication::translate("Firmware", "In model setup menus automatically set source by moving the control"));
firmware->addOption("autoswitch", QCoreApplication::translate("Firmare", "In model setup menus automatically set switch by moving the control")); firmware->addOption("autoswitch", QCoreApplication::translate("Firmware", "In model setup menus automatically set switch by moving the control"));
firmware->addOption("dblkeys", QCoreApplication::translate("Firmare", "Enable resetting values by pressing up and down at the same time")); firmware->addOption("dblkeys", QCoreApplication::translate("Firmware", "Enable resetting values by pressing up and down at the same time"));
firmware->addOption("nographics", QCoreApplication::translate("Firmare", "No graphical check boxes and sliders")); firmware->addOption("nographics", QCoreApplication::translate("Firmware", "No graphical check boxes and sliders"));
firmware->addOption("battgraph", QCoreApplication::translate("Firmare", "Battery graph")); firmware->addOption("battgraph", QCoreApplication::translate("Firmware", "Battery graph"));
firmware->addOption("nobold", QCoreApplication::translate("Firmare", "Don't use bold font for highlighting active items")); firmware->addOption("nobold", QCoreApplication::translate("Firmware", "Don't use bold font for highlighting active items"));
firmware->addOption("bluetooth", QCoreApplication::translate("Firmare", "Bluetooth interface")); firmware->addOption("bluetooth", QCoreApplication::translate("Firmware", "Bluetooth interface"));
firmware->addOption("sqt5font", QCoreApplication::translate("Firmare", "Use alternative SQT5 font")); firmware->addOption("sqt5font", QCoreApplication::translate("Firmware", "Use alternative SQT5 font"));
// firmware->addOption("rtc", QCoreApplication::translate("Firmare", "Optional RTC added")); // firmware->addOption("rtc", QCoreApplication::translate("Firmware", "Optional RTC added"));
// firmware->addOption("volume", QCoreApplication::translate("Firmare", "i2c volume control added")); // firmware->addOption("volume", QCoreApplication::translate("Firmware", "i2c volume control added"));
addOpenTxArmOptions(firmware); addOpenTxArmOptions(firmware);
addOpenTxCommonOptions(firmware); addOpenTxCommonOptions(firmware);
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* Sky9x board */ /* Sky9x board */
firmware = new OpenTxFirmware("opentx-sky9x", QCoreApplication::translate("Firmare", "9X with Sky9x board"), BOARD_SKY9X); firmware = new OpenTxFirmware("opentx-sky9x", QCoreApplication::translate("Firmware", "9X with Sky9x board"), BOARD_SKY9X);
firmware->addOption("heli", QCoreApplication::translate("Firmare", "Enable HELI menu and cyclic mix support")); firmware->addOption("heli", QCoreApplication::translate("Firmware", "Enable HELI menu and cyclic mix support"));
firmware->addOption("nofp", QCoreApplication::translate("Firmare", "No flight modes")); firmware->addOption("nofp", QCoreApplication::translate("Firmware", "No flight modes"));
firmware->addOption("gvars", QCoreApplication::translate("Firmare", "Global variables"), GVARS_VARIANT); firmware->addOption("gvars", QCoreApplication::translate("Firmware", "Global variables"), GVARS_VARIANT);
firmware->addOption("potscroll", QCoreApplication::translate("Firmare", "Pots use in menus navigation")); firmware->addOption("potscroll", QCoreApplication::translate("Firmware", "Pots use in menus navigation"));
firmware->addOption("autosource", QCoreApplication::translate("Firmare", "In model setup menus automatically set source by moving the control")); firmware->addOption("autosource", QCoreApplication::translate("Firmware", "In model setup menus automatically set source by moving the control"));
firmware->addOption("autoswitch", QCoreApplication::translate("Firmare", "In model setup menus automatically set switch by moving the control")); firmware->addOption("autoswitch", QCoreApplication::translate("Firmware", "In model setup menus automatically set switch by moving the control"));
firmware->addOption("dblkeys", QCoreApplication::translate("Firmare", "Enable resetting values by pressing up and down at the same time")); firmware->addOption("dblkeys", QCoreApplication::translate("Firmware", "Enable resetting values by pressing up and down at the same time"));
firmware->addOption("nographics", QCoreApplication::translate("Firmare", "No graphical check boxes and sliders")); firmware->addOption("nographics", QCoreApplication::translate("Firmware", "No graphical check boxes and sliders"));
firmware->addOption("battgraph", QCoreApplication::translate("Firmare", "Battery graph")); firmware->addOption("battgraph", QCoreApplication::translate("Firmware", "Battery graph"));
firmware->addOption("nobold", QCoreApplication::translate("Firmare", "Don't use bold font for highlighting active items")); firmware->addOption("nobold", QCoreApplication::translate("Firmware", "Don't use bold font for highlighting active items"));
firmware->addOption("bluetooth", QCoreApplication::translate("Firmare", "Bluetooth interface")); firmware->addOption("bluetooth", QCoreApplication::translate("Firmware", "Bluetooth interface"));
firmware->addOption("sqt5font", QCoreApplication::translate("Firmare", "Use alternative SQT5 font")); firmware->addOption("sqt5font", QCoreApplication::translate("Firmware", "Use alternative SQT5 font"));
addOpenTxArmOptions(firmware); addOpenTxArmOptions(firmware);
addOpenTxCommonOptions(firmware); addOpenTxCommonOptions(firmware);
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* Gruvin9x board */ /* Gruvin9x board */
firmware = new OpenTxFirmware("opentx-gruvin9x", QCoreApplication::translate("Firmare", "9X with Gruvin9x board"), BOARD_GRUVIN9X); firmware = new OpenTxFirmware("opentx-gruvin9x", QCoreApplication::translate("Firmware", "9X with Gruvin9x board"), BOARD_GRUVIN9X);
firmware->addOption("heli", QCoreApplication::translate("Firmare", "Enable heli menu and cyclic mix support")); firmware->addOption("heli", QCoreApplication::translate("Firmware", "Enable heli menu and cyclic mix support"));
firmware->addOption("templates", QCoreApplication::translate("Firmare", "Enable TEMPLATES menu")); firmware->addOption("templates", QCoreApplication::translate("Firmware", "Enable TEMPLATES menu"));
firmware->addOption("nofp", QCoreApplication::translate("Firmare", "No flight modes")); firmware->addOption("nofp", QCoreApplication::translate("Firmware", "No flight modes"));
firmware->addOption("nocurves", QCoreApplication::translate("Firmare", "Disable curves menus")); firmware->addOption("nocurves", QCoreApplication::translate("Firmware", "Disable curves menus"));
firmware->addOption("sdcard", QCoreApplication::translate("Firmare", "Support for SD memory card")); firmware->addOption("sdcard", QCoreApplication::translate("Firmware", "Support for SD memory card"));
firmware->addOption("voice", QCoreApplication::translate("Firmare", "Used if you have modified your radio with voice mode")); firmware->addOption("voice", QCoreApplication::translate("Firmware", "Used if you have modified your radio with voice mode"));
firmware->addOption("PXX", QCoreApplication::translate("Firmare", "Support of FrSky PXX protocol")); firmware->addOption("PXX", QCoreApplication::translate("Firmware", "Support of FrSky PXX protocol"));
firmware->addOptions(dsm2_options); firmware->addOptions(dsm2_options);
firmware->addOption("ppmca", QCoreApplication::translate("Firmare", "PPM center adjustment in limits")); firmware->addOption("ppmca", QCoreApplication::translate("Firmware", "PPM center adjustment in limits"));
firmware->addOption("gvars", QCoreApplication::translate("Firmare", "Global variables"), GVARS_VARIANT); firmware->addOption("gvars", QCoreApplication::translate("Firmware", "Global variables"), GVARS_VARIANT);
firmware->addOption("symlimits", QCoreApplication::translate("Firmare", "Symetrical Limits")); firmware->addOption("symlimits", QCoreApplication::translate("Firmware", "Symetrical Limits"));
firmware->addOption("potscroll", QCoreApplication::translate("Firmare", "Pots use in menus navigation")); firmware->addOption("potscroll", QCoreApplication::translate("Firmware", "Pots use in menus navigation"));
firmware->addOption("autosource", QCoreApplication::translate("Firmare", "In model setup menus automatically set source by moving the control")); firmware->addOption("autosource", QCoreApplication::translate("Firmware", "In model setup menus automatically set source by moving the control"));
firmware->addOption("autoswitch", QCoreApplication::translate("Firmare", "In model setup menus automatically set switch by moving the control")); firmware->addOption("autoswitch", QCoreApplication::translate("Firmware", "In model setup menus automatically set switch by moving the control"));
firmware->addOption("dblkeys", QCoreApplication::translate("Firmare", "Enable resetting values by pressing up and down at the same time")); firmware->addOption("dblkeys", QCoreApplication::translate("Firmware", "Enable resetting values by pressing up and down at the same time"));
firmware->addOption("nographics", QCoreApplication::translate("Firmare", "No graphical check boxes and sliders")); firmware->addOption("nographics", QCoreApplication::translate("Firmware", "No graphical check boxes and sliders"));
firmware->addOption("battgraph", QCoreApplication::translate("Firmare", "Battery graph")); firmware->addOption("battgraph", QCoreApplication::translate("Firmware", "Battery graph"));
firmware->addOption("nobold", QCoreApplication::translate("Firmare", "Don't use bold font for highlighting active items")); firmware->addOption("nobold", QCoreApplication::translate("Firmware", "Don't use bold font for highlighting active items"));
firmware->addOption("pgbar", QCoreApplication::translate("Firmare", "EEprom write Progress bar")); firmware->addOption("pgbar", QCoreApplication::translate("Firmware", "EEprom write Progress bar"));
firmware->addOption("imperial", QCoreApplication::translate("Firmare", "Imperial units")); firmware->addOption("imperial", QCoreApplication::translate("Firmware", "Imperial units"));
firmware->addOption("sqt5font", QCoreApplication::translate("Firmare", "Use alternative SQT5 font")); firmware->addOption("sqt5font", QCoreApplication::translate("Firmware", "Use alternative SQT5 font"));
addOpenTxCommonOptions(firmware); addOpenTxCommonOptions(firmware);
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* MEGA2560 board */ /* MEGA2560 board */
firmware = new OpenTxFirmware("opentx-mega2560", QCoreApplication::translate("Firmare", "DIY MEGA2560 radio"), BOARD_MEGA2560); firmware = new OpenTxFirmware("opentx-mega2560", QCoreApplication::translate("Firmware", "DIY MEGA2560 radio"), BOARD_MEGA2560);
addOpenTxLcdOptions(firmware); addOpenTxLcdOptions(firmware);
firmware->addOption("PWR", QCoreApplication::translate("Firmare", "Power management by soft-off circuitry")); firmware->addOption("PWR", QCoreApplication::translate("Firmware", "Power management by soft-off circuitry"));
firmware->addOptions(ext_options); firmware->addOptions(ext_options);
firmware->addOption("PXX", QCoreApplication::translate("Firmare", "Support of FrSky PXX protocol")); firmware->addOption("PXX", QCoreApplication::translate("Firmware", "Support of FrSky PXX protocol"));
firmware->addOptions(dsm2_options); firmware->addOptions(dsm2_options);
firmware->addOption("heli", QCoreApplication::translate("Firmare", "Enable heli menu and cyclic mix support")); firmware->addOption("heli", QCoreApplication::translate("Firmware", "Enable heli menu and cyclic mix support"));
firmware->addOption("templates", QCoreApplication::translate("Firmare", "Enable TEMPLATES menu")); firmware->addOption("templates", QCoreApplication::translate("Firmware", "Enable TEMPLATES menu"));
firmware->addOption("nofp", QCoreApplication::translate("Firmare", "No flight modes")); firmware->addOption("nofp", QCoreApplication::translate("Firmware", "No flight modes"));
firmware->addOption("nocurves", QCoreApplication::translate("Firmare", "Disable curves menus")); firmware->addOption("nocurves", QCoreApplication::translate("Firmware", "Disable curves menus"));
firmware->addOption("sdcard", QCoreApplication::translate("Firmare", "Support for SD memory card")); firmware->addOption("sdcard", QCoreApplication::translate("Firmware", "Support for SD memory card"));
firmware->addOption("audio", QCoreApplication::translate("Firmare", "Support for radio modified with regular speaker")); firmware->addOption("audio", QCoreApplication::translate("Firmware", "Support for radio modified with regular speaker"));
//firmware->addOption("voice", QCoreApplication::translate("Firmare", "Used if you have modified your radio with voice mode")); //firmware->addOption("voice", QCoreApplication::translate("Firmware", "Used if you have modified your radio with voice mode"));
addOpenTxVoiceOptions(firmware); addOpenTxVoiceOptions(firmware);
firmware->addOption("haptic", QCoreApplication::translate("Firmare", "Used if you have modified your radio with haptic mode")); firmware->addOption("haptic", QCoreApplication::translate("Firmware", "Used if you have modified your radio with haptic mode"));
firmware->addOption("ppmca", QCoreApplication::translate("Firmare", "PPM center adjustment in limits")); firmware->addOption("ppmca", QCoreApplication::translate("Firmware", "PPM center adjustment in limits"));
firmware->addOption("gvars", QCoreApplication::translate("Firmare", "Global variables"), GVARS_VARIANT); firmware->addOption("gvars", QCoreApplication::translate("Firmware", "Global variables"), GVARS_VARIANT);
firmware->addOption("symlimits", QCoreApplication::translate("Firmare", "Symetrical Limits")); firmware->addOption("symlimits", QCoreApplication::translate("Firmware", "Symetrical Limits"));
firmware->addOption("autosource", QCoreApplication::translate("Firmare", "In model setup menus automatically set source by moving the control")); firmware->addOption("autosource", QCoreApplication::translate("Firmware", "In model setup menus automatically set source by moving the control"));
firmware->addOption("autoswitch", QCoreApplication::translate("Firmare", "In model setup menus automatically set switch by moving the control")); firmware->addOption("autoswitch", QCoreApplication::translate("Firmware", "In model setup menus automatically set switch by moving the control"));
firmware->addOption("dblkeys", QCoreApplication::translate("Firmare", "Enable resetting values by pressing up and down at the same time")); firmware->addOption("dblkeys", QCoreApplication::translate("Firmware", "Enable resetting values by pressing up and down at the same time"));
firmware->addOption("nographics", QCoreApplication::translate("Firmare", "No graphical check boxes and sliders")); firmware->addOption("nographics", QCoreApplication::translate("Firmware", "No graphical check boxes and sliders"));
firmware->addOption("battgraph", QCoreApplication::translate("Firmare", "Battery graph")); firmware->addOption("battgraph", QCoreApplication::translate("Firmware", "Battery graph"));
firmware->addOption("nobold", QCoreApplication::translate("Firmare", "Don't use bold font for highlighting active items")); firmware->addOption("nobold", QCoreApplication::translate("Firmware", "Don't use bold font for highlighting active items"));
firmware->addOption("pgbar", QCoreApplication::translate("Firmare", "EEprom write Progress bar")); firmware->addOption("pgbar", QCoreApplication::translate("Firmware", "EEprom write Progress bar"));
firmware->addOption("imperial", QCoreApplication::translate("Firmare", "Imperial units")); firmware->addOption("imperial", QCoreApplication::translate("Firmware", "Imperial units"));
firmware->addOption("sqt5font", QCoreApplication::translate("Firmare", "Use alternative SQT5 font")); firmware->addOption("sqt5font", QCoreApplication::translate("Firmware", "Use alternative SQT5 font"));
addOpenTxCommonOptions(firmware); addOpenTxCommonOptions(firmware);
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);

4
companion/src/firmwares/rawsource.cpp
View file

@ -326,7 +326,7 @@ QString RawSource::toString(const ModelData * model, const GeneralSettings * con
static const QString telemetry[] = { static const QString telemetry[] = {
tr("Batt"), tr("Time"), tr("Timer1"), tr("Timer2"), tr("Timer3"), tr("Batt"), tr("Time"), tr("Timer1"), tr("Timer2"), tr("Timer3"),
tr("SWR"), tr("RSSI Tx"), tr("RSSI Rx"), tr("RAS"), tr("RSSI Tx"), tr("RSSI Rx"),
tr("A1"), tr("A2"), tr("A3"), tr("A4"), tr("A1"), tr("A2"), tr("A3"), tr("A4"),
tr("Alt"), tr("Rpm"), tr("Fuel"), tr("T1"), tr("T2"), tr("Alt"), tr("Rpm"), tr("Fuel"), tr("T1"), tr("T2"),
tr("Speed"), tr("Dist"), tr("GPS Alt"), tr("Speed"), tr("Dist"), tr("GPS Alt"),
@ -518,7 +518,7 @@ bool RawSource::isAvailable(const ModelData * const model, const GeneralSettings
if (type == (int)TELEMETRY_SOURCE_TX_TIME && !fw->getCapability(RtcTime)) if (type == (int)TELEMETRY_SOURCE_TX_TIME && !fw->getCapability(RtcTime))
return false; return false;
if (type == (int)TELEMETRY_SOURCE_SWR && !fw->getCapability(SportTelemetry)) if (type == (int)TELEMETRY_SOURCE_RAS && !fw->getCapability(SportTelemetry))
return false; return false;
if (type == (int)TELEMETRY_SOURCE_TIMER3 && fw->getCapability(Timers) < 3) if (type == (int)TELEMETRY_SOURCE_TIMER3 && fw->getCapability(Timers) < 3)

2
companion/src/firmwares/rawsource.h
View file

@ -106,7 +106,7 @@ enum TelemetrySource {
TELEMETRY_SOURCE_TIMER1, TELEMETRY_SOURCE_TIMER1,
TELEMETRY_SOURCE_TIMER2, TELEMETRY_SOURCE_TIMER2,
TELEMETRY_SOURCE_TIMER3, TELEMETRY_SOURCE_TIMER3,
TELEMETRY_SOURCE_SWR, TELEMETRY_SOURCE_RAS,
TELEMETRY_SOURCE_RSSI_TX, TELEMETRY_SOURCE_RSSI_TX,
TELEMETRY_SOURCE_RSSI_RX, TELEMETRY_SOURCE_RSSI_RX,
TELEMETRY_SOURCE_A1, TELEMETRY_SOURCE_A1,

8
companion/src/simulation/telemetrysimu.cpp
View file

@ -189,7 +189,7 @@ void TelemetrySimulator::setupDataFields()
{ {
SET_INSTANCE(rxbt_inst, BATT_ID, 0); SET_INSTANCE(rxbt_inst, BATT_ID, 0);
SET_INSTANCE(rssi_inst, RSSI_ID, 24); SET_INSTANCE(rssi_inst, RSSI_ID, 24);
SET_INSTANCE(swr_inst, SWR_ID, 24); SET_INSTANCE(swr_inst, RAS_ID, 24);
SET_INSTANCE(a1_inst, ADC1_ID, 0); SET_INSTANCE(a1_inst, ADC1_ID, 0);
SET_INSTANCE(a2_inst, ADC2_ID, 0); SET_INSTANCE(a2_inst, ADC2_ID, 0);
SET_INSTANCE(a3_inst, A3_FIRST_ID, 0); SET_INSTANCE(a3_inst, A3_FIRST_ID, 0);
@ -292,7 +292,7 @@ void TelemetrySimulator::generateTelemetryFrame()
case 3: case 3:
if (ui->Swr->text().length()) if (ui->Swr->text().length())
generateSportPacket(buffer, ui->swr_inst->text().toInt(&ok, 0) - 1, DATA_FRAME, SWR_ID, LIMIT<uint32_t>(0, ui->Swr->text().toInt(&ok, 0), 0xFFFF)); generateSportPacket(buffer, ui->swr_inst->text().toInt(&ok, 0) - 1, DATA_FRAME, RAS_ID, LIMIT<uint32_t>(0, ui->Swr->text().toInt(&ok, 0), 0xFFFF));
break; break;
case 4: case 4:
@ -635,7 +635,7 @@ TelemetrySimulator::LogPlaybackController::LogPlaybackController(Ui::TelemetrySi
colToFuncMap.clear(); colToFuncMap.clear();
colToFuncMap.insert("RxBt(V)", RXBT_V); colToFuncMap.insert("RxBt(V)", RXBT_V);
colToFuncMap.insert("RSSI(dB)", RSSI); colToFuncMap.insert("RSSI(dB)", RSSI);
colToFuncMap.insert("SWR", SWR); colToFuncMap.insert("RAS", RAS);
colToFuncMap.insert("A1", A1); colToFuncMap.insert("A1", A1);
colToFuncMap.insert("A1(V)", A1); colToFuncMap.insert("A1(V)", A1);
colToFuncMap.insert("A2", A2); colToFuncMap.insert("A2", A2);
@ -951,7 +951,7 @@ void TelemetrySimulator::LogPlaybackController::setUiDataValues()
case RSSI: case RSSI:
ui->Rssi->setValue(columnData[info.dataIndex].toDouble()); ui->Rssi->setValue(columnData[info.dataIndex].toDouble());
break; break;
case SWR: case RAS:
ui->Swr->setValue(columnData[info.dataIndex].toDouble()); ui->Swr->setValue(columnData[info.dataIndex].toDouble());
break; break;
case A1: case A1:

2
companion/src/simulation/telemetrysimu.h
View file

@ -102,7 +102,7 @@ class TelemetrySimulator : public QWidget
enum CONVERT_TYPE { enum CONVERT_TYPE {
RXBT_V, RXBT_V,
RSSI, RSSI,
SWR, RAS,
A1, A1,
A2, A2,
A3, A3,

5
radio/src/CMakeLists.txt
View file

@ -38,6 +38,7 @@ endif()
option(SIMU_DISKIO "Enable disk IO simulation in simulator. Simulator will use FatFs module and simulated IO layer that uses \"./sdcard.image\" file as image of SD card. This file must contain whole SD card from first to last sector" OFF) option(SIMU_DISKIO "Enable disk IO simulation in simulator. Simulator will use FatFs module and simulated IO layer that uses \"./sdcard.image\" file as image of SD card. This file must contain whole SD card from first to last sector" OFF)
option(SIMU_LUA_COMPILER "Pre-compile and save Lua scripts in simulator." ON) option(SIMU_LUA_COMPILER "Pre-compile and save Lua scripts in simulator." ON)
option(FAS_PROTOTYPE "Support of old FAS prototypes (different resistors)" OFF) option(FAS_PROTOTYPE "Support of old FAS prototypes (different resistors)" OFF)
option(RAS "RAS (SWR) enabled" ON)
option(TEMPLATES "Model templates menu" OFF) option(TEMPLATES "Model templates menu" OFF)
option(TRACE_SIMPGMSPACE "Turn on traces in simpgmspace.cpp" ON) option(TRACE_SIMPGMSPACE "Turn on traces in simpgmspace.cpp" ON)
option(TRACE_LUA_INTERNALS "Turn on traces for Lua internals" OFF) option(TRACE_LUA_INTERNALS "Turn on traces for Lua internals" OFF)
@ -249,6 +250,10 @@ elseif(FAI STREQUAL CHOICE)
add_definitions(-DFAI_CHOICE) add_definitions(-DFAI_CHOICE)
endif() endif()
if(NOT RAS)
add_definitions(-DNO_RAS)
endif()
if(FAS_PROTOTYPE) if(FAS_PROTOTYPE)
add_definitions(-DFAS_PROTOTYPE) add_definitions(-DFAS_PROTOTYPE)
endif() endif()

2
radio/src/audio_arm.cpp
View file

@ -1134,7 +1134,7 @@ void audioEvent(unsigned int index)
case AU_RSSI_RED: case AU_RSSI_RED:
audioQueue.playTone(BEEP_DEFAULT_FREQ + 1800, 800, 20, PLAY_REPEAT(1) | PLAY_NOW); audioQueue.playTone(BEEP_DEFAULT_FREQ + 1800, 800, 20, PLAY_REPEAT(1) | PLAY_NOW);
break; break;
case AU_SWR_RED: case AU_RAS_RED:
audioQueue.playTone(450, 160, 40, PLAY_REPEAT(2), 1); audioQueue.playTone(450, 160, 40, PLAY_REPEAT(2), 1);
break; break;
case AU_SPECIAL_SOUND_BEEP1: case AU_SPECIAL_SOUND_BEEP1:

2
radio/src/audio_arm.h
View file

@ -571,7 +571,7 @@ void audioTimerCountdown(uint8_t timer, int value);
#define AUDIO_VARIO(fq, t, p, f) audioQueue.playTone(fq, t, p, f) #define AUDIO_VARIO(fq, t, p, f) audioQueue.playTone(fq, t, p, f)
#define AUDIO_RSSI_ORANGE() audioEvent(AU_RSSI_ORANGE) #define AUDIO_RSSI_ORANGE() audioEvent(AU_RSSI_ORANGE)
#define AUDIO_RSSI_RED() audioEvent(AU_RSSI_RED) #define AUDIO_RSSI_RED() audioEvent(AU_RSSI_RED)
#define AUDIO_SWR_RED() audioEvent(AU_SWR_RED) #define AUDIO_RAS_RED() audioEvent(AU_RAS_RED)
#define AUDIO_TELEMETRY_LOST() audioEvent(AU_TELEMETRY_LOST) #define AUDIO_TELEMETRY_LOST() audioEvent(AU_TELEMETRY_LOST)
#define AUDIO_TELEMETRY_BACK() audioEvent(AU_TELEMETRY_BACK) #define AUDIO_TELEMETRY_BACK() audioEvent(AU_TELEMETRY_BACK)
#define AUDIO_TRAINER_LOST() audioEvent(AU_TRAINER_LOST) #define AUDIO_TRAINER_LOST() audioEvent(AU_TRAINER_LOST)

3
radio/src/gui/128x64/radio_diaganas.cpp
View file

@ -56,11 +56,10 @@ void menuRadioDiagAnalogs(event_t event)
#endif #endif
} }
// SWR // RAS
#if defined(PCBX7) #if defined(PCBX7)
if(IS_MODULE_XJT(EXTERNAL_MODULE) && !IS_INTERNAL_MODULE_ON()) { if(IS_MODULE_XJT(EXTERNAL_MODULE) && !IS_INTERNAL_MODULE_ON()) {
coord_t y = MENU_HEADER_HEIGHT + 1 + (NUM_STICKS+NUM_POTS+NUM_SLIDERS+1)/2 * FH + 1 * FH + 2; coord_t y = MENU_HEADER_HEIGHT + 1 + (NUM_STICKS+NUM_POTS+NUM_SLIDERS+1)/2 * FH + 1 * FH + 2;
lcdDrawText(1, y, "RAS:"); lcdDrawText(1, y, "RAS:");
lcdDrawNumber(1 + 4*FW, y, telemetryData.swr.value, LEFT); lcdDrawNumber(1 + 4*FW, y, telemetryData.swr.value, LEFT);
} }

2
radio/src/gui/212x64/radio_diaganas.cpp
View file

@ -41,7 +41,7 @@ void menuRadioDiagAnalogs(event_t event)
#endif #endif
} }
// SWR // RAS
if((IS_MODULE_XJT(INTERNAL_MODULE) && IS_INTERNAL_MODULE_ON()) || (IS_MODULE_PXX(EXTERNAL_MODULE) && !IS_INTERNAL_MODULE_ON())) { if((IS_MODULE_XJT(INTERNAL_MODULE) && IS_INTERNAL_MODULE_ON()) || (IS_MODULE_PXX(EXTERNAL_MODULE) && !IS_INTERNAL_MODULE_ON())) {
lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+6*FH, "RAS"); lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+6*FH, "RAS");
lcdDrawNumber(10*FW-1, MENU_HEADER_HEIGHT+6*FH, telemetryData.swr.value, RIGHT); lcdDrawNumber(10*FW-1, MENU_HEADER_HEIGHT+6*FH, telemetryData.swr.value, RIGHT);

2
radio/src/gui/480x272/view_statistics.cpp
View file

@ -177,7 +177,7 @@ bool menuStatsAnalogs(event_t event)
#endif #endif
} }
// SWR // RAS
if ((IS_MODULE_XJT(INTERNAL_MODULE) && IS_INTERNAL_MODULE_ON()) || (IS_MODULE_PXX(EXTERNAL_MODULE) && !IS_INTERNAL_MODULE_ON())) { if ((IS_MODULE_XJT(INTERNAL_MODULE) && IS_INTERNAL_MODULE_ON()) || (IS_MODULE_PXX(EXTERNAL_MODULE) && !IS_INTERNAL_MODULE_ON())) {
lcdDrawText(MENUS_MARGIN_LEFT, MENU_CONTENT_TOP+7*FH, "RAS"); lcdDrawText(MENUS_MARGIN_LEFT, MENU_CONTENT_TOP+7*FH, "RAS");
lcdDrawNumber(MENUS_MARGIN_LEFT+100, MENU_CONTENT_TOP+7*FH, telemetryData.swr.value); lcdDrawNumber(MENUS_MARGIN_LEFT+100, MENU_CONTENT_TOP+7*FH, telemetryData.swr.value);

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

@ -640,7 +640,7 @@ This is just a hardware pass/fail measure and does not represent the quality of
*/ */
static int luaGetRAS(lua_State * L) static int luaGetRAS(lua_State * L)
{ {
if (IS_SWR_VALUE_VALID()) { if (IS_RAS_VALUE_VALID()) {
lua_pushinteger(L, telemetryData.swr.value); lua_pushinteger(L, telemetryData.swr.value);
} }
else { else {

2
radio/src/opentx.h
View file

@ -1295,7 +1295,7 @@ enum AUDIO_SOUNDS {
#if defined(CPUARM) #if defined(CPUARM)
AU_RSSI_ORANGE, AU_RSSI_ORANGE,
AU_RSSI_RED, AU_RSSI_RED,
AU_SWR_RED, AU_RAS_RED,
AU_TELEMETRY_LOST, AU_TELEMETRY_LOST,
AU_TELEMETRY_BACK, AU_TELEMETRY_BACK,
AU_TRAINER_LOST, AU_TRAINER_LOST,

14
radio/src/telemetry/frsky.h
View file

@ -162,7 +162,7 @@ enum FrSkyDataState {
#define SP2UART_A_ID 0xfd00 #define SP2UART_A_ID 0xfd00
#define SP2UART_B_ID 0xfd01 #define SP2UART_B_ID 0xfd01
#define BATT_ID 0xf104 #define BATT_ID 0xf104
#define SWR_ID 0xf105 #define RAS_ID 0xf105
#define XJT_VERSION_ID 0xf106 #define XJT_VERSION_ID 0xf106
#define FUEL_QTY_FIRST_ID 0x0a10 #define FUEL_QTY_FIRST_ID 0x0a10
#define FUEL_QTY_LAST_ID 0x0a1f #define FUEL_QTY_LAST_ID 0x0a1f
@ -287,15 +287,17 @@ PACK(struct FrskyTelemetryData {
#endif #endif
#endif #endif
#if defined(PCBX10) #if defined(NO_RAS)
#define IS_SWR_VALUE_VALID() (false) #define IS_RAS_VALUE_VALID() (false)
#elif defined(PCBX10)
#define IS_RAS_VALUE_VALID() (false)
#elif defined(PCBX9DP) || defined(PCBX9E) #elif defined(PCBX9DP) || defined(PCBX9E)
#define IS_SWR_VALUE_VALID() (telemetryData.xjtVersion != 0 && telemetryData.xjtVersion != 0xff) #define IS_RAS_VALUE_VALID() (telemetryData.xjtVersion != 0 && telemetryData.xjtVersion != 0xff)
#else #else
#define IS_SWR_VALUE_VALID() (true) #define IS_RAS_VALUE_VALID() (true)
#endif #endif
#define IS_HIDDEN_TELEMETRY_VALUE(id) ((id == SP2UART_A_ID) || (id == SP2UART_B_ID) || (id == XJT_VERSION_ID) || (id == SWR_ID) || (id == FACT_TEST_ID)) #define IS_HIDDEN_TELEMETRY_VALUE(id) ((id == SP2UART_A_ID) || (id == SP2UART_B_ID) || (id == XJT_VERSION_ID) || (id == RAS_ID) || (id == FACT_TEST_ID))
enum AlarmLevel { enum AlarmLevel {
alarm_off = 0, alarm_off = 0,

8
radio/src/telemetry/frsky_sport.cpp
View file

@ -147,12 +147,12 @@ void sportProcessTelemetryPacket(const uint8_t * packet)
} }
else if (id == XJT_VERSION_ID) { else if (id == XJT_VERSION_ID) {
telemetryData.xjtVersion = HUB_DATA_U16(packet); telemetryData.xjtVersion = HUB_DATA_U16(packet);
if (!IS_SWR_VALUE_VALID()) { if (!IS_RAS_VALUE_VALID()) {
telemetryData.swr.set(0x00); telemetryData.swr.set(0x00);
} }
} }
else if (id == SWR_ID) { else if (id == RAS_ID) {
if (IS_SWR_VALUE_VALID()) if (IS_RAS_VALUE_VALID())
telemetryData.swr.set(SPORT_DATA_U8(packet)); telemetryData.swr.set(SPORT_DATA_U8(packet));
else else
telemetryData.swr.set(0x00); telemetryData.swr.set(0x00);
@ -164,7 +164,7 @@ void sportProcessTelemetryPacket(const uint8_t * packet)
processHubPacket(id, HUB_DATA_U16(packet)); processHubPacket(id, HUB_DATA_U16(packet));
} }
else if (!IS_HIDDEN_TELEMETRY_VALUE(id)) { else if (!IS_HIDDEN_TELEMETRY_VALUE(id)) {
if (id == ADC1_ID || id == ADC2_ID || id == BATT_ID || id == SWR_ID) { if (id == ADC1_ID || id == ADC2_ID || id == BATT_ID || id == RAS_ID) {
data = SPORT_DATA_U8(packet); data = SPORT_DATA_U8(packet);
} }
if (id >= GPS_LONG_LATI_FIRST_ID && id <= GPS_LONG_LATI_LAST_ID) { if (id >= GPS_LONG_LATI_FIRST_ID && id <= GPS_LONG_LATI_LAST_ID) {

4
radio/src/telemetry/telemetry.cpp
View file

@ -146,7 +146,7 @@ void telemetryWakeup()
} }
#endif #endif
#define FRSKY_BAD_ANTENNA() (IS_SWR_VALUE_VALID() && telemetryData.swr.value > 0x33) #define FRSKY_BAD_ANTENNA() (IS_RAS_VALUE_VALID() && telemetryData.swr.value > 0x33)
#if defined(CPUARM) #if defined(CPUARM)
static tmr10ms_t alarmsCheckTime = 0; static tmr10ms_t alarmsCheckTime = 0;
@ -174,7 +174,7 @@ void telemetryWakeup()
#if defined(PCBTARANIS) || defined(PCBHORUS) #if defined(PCBTARANIS) || defined(PCBHORUS)
if ((IS_MODULE_PXX(INTERNAL_MODULE) || IS_MODULE_PXX(EXTERNAL_MODULE)) && FRSKY_BAD_ANTENNA()) { if ((IS_MODULE_PXX(INTERNAL_MODULE) || IS_MODULE_PXX(EXTERNAL_MODULE)) && FRSKY_BAD_ANTENNA()) {
AUDIO_SWR_RED(); AUDIO_RAS_RED();
POPUP_WARNING(STR_WARNING); POPUP_WARNING(STR_WARNING);
const char * w = STR_ANTENNAPROBLEM; const char * w = STR_ANTENNAPROBLEM;
SET_WARNING_INFO(w, strlen(w), 0); SET_WARNING_INFO(w, strlen(w), 0);

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

@ -1292,7 +1292,7 @@
#define TR_JITTER_FILTER "ADC Filtr" #define TR_JITTER_FILTER "ADC Filtr"
#define ZSTR_RSSI "RSSI" #define ZSTR_RSSI "RSSI"
#define ZSTR_SWR "SWR" #define ZSTR_RAS "SWR"
#define ZSTR_A1 "A1" #define ZSTR_A1 "A1"
#define ZSTR_A2 "A2" #define ZSTR_A2 "A2"
#define ZSTR_A3 "A3" #define ZSTR_A3 "A3"

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

@ -355,14 +355,14 @@
#if defined(CPUARM) #if defined(CPUARM)
#define TR_TELEM_RESERVE TR("[--]", "[---]") #define TR_TELEM_RESERVE TR("[--]", "[---]")
#define TR_TELEM_TIME TR("Zeit", "Zeit\0") #define TR_TELEM_TIME TR("Zeit", "Zeit\0")
#define TR_SWR TR("SWR\0", "SWR\0 ") #define TR_RAS TR("SWR\0", "SWR\0 ")
#define TR_RX_BATT TR("[NA]", "[NA]\0") #define TR_RX_BATT TR("[NA]", "[NA]\0")
#define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ")
#define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ") #define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ")
#else #else
#define TR_TELEM_RESERVE #define TR_TELEM_RESERVE
#define TR_TELEM_TIME #define TR_TELEM_TIME
#define TR_SWR #define TR_RAS
#define TR_RX_BATT #define TR_RX_BATT
#define TR_A3_A4 #define TR_A3_A4
#define TR_A3_A4_MIN #define TR_A3_A4_MIN
@ -554,7 +554,7 @@
#define TR_EXTRA_VSRCRAW "Batt""Time""GPS\0" TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW "Tmr1""Tmr2""Tmr3" #define TR_EXTRA_VSRCRAW "Batt""Time""GPS\0" TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW "Tmr1""Tmr2""Tmr3"
#else #else
#define TR_EXTRA_VSRCRAW #define TR_EXTRA_VSRCRAW
#define TR_VTELEMCHNS "---\0""Akku" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_TIMERS TR_SWR "Tx\0 " TR_TELEM_RSSI_RX TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Zeit" #define TR_VTELEMCHNS "---\0""Akku" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_TIMERS TR_RAS "Tx\0 " TR_TELEM_RSSI_RX TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Zeit"
#endif #endif
#define TR_VSRCRAW "---\0" TR_STICKS_VSRCRAW TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW TR_TRIMS_VSRCRAW TR_SW_VSRCRAW TR_EXTRA_VSRCRAW #define TR_VSRCRAW "---\0" TR_STICKS_VSRCRAW TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW TR_TRIMS_VSRCRAW TR_SW_VSRCRAW TR_EXTRA_VSRCRAW
@ -1305,7 +1305,7 @@
#define TR_JITTER_FILTER "ADC Filter" #define TR_JITTER_FILTER "ADC Filter"
// ---------------------------------------------------------------- // ----------------------------------------------------------------
#define ZSTR_RSSI "RSSI" #define ZSTR_RSSI "RSSI"
#define ZSTR_SWR "SWR" #define ZSTR_RAS "SWR"
#define ZSTR_A1 "A1" #define ZSTR_A1 "A1"
#define ZSTR_A2 "A2" #define ZSTR_A2 "A2"
#define ZSTR_A3 "A3" #define ZSTR_A3 "A3"

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

@ -1292,7 +1292,7 @@
#define TR_JITTER_FILTER "ADC filter" #define TR_JITTER_FILTER "ADC filter"
#define ZSTR_RSSI "RSSI" #define ZSTR_RSSI "RSSI"
#define ZSTR_SWR "SWR" #define ZSTR_RAS "SWR"
#define ZSTR_A1 "A1" #define ZSTR_A1 "A1"
#define ZSTR_A2 "A2" #define ZSTR_A2 "A2"
#define ZSTR_A3 "A3" #define ZSTR_A3 "A3"

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

@ -348,14 +348,14 @@
#if defined(CPUARM) #if defined(CPUARM)
#define TR_TELEM_RESERVE TR("[--]", "[---]") #define TR_TELEM_RESERVE TR("[--]", "[---]")
#define TR_TELEM_TIME TR("Time", "Time\0") #define TR_TELEM_TIME TR("Time", "Time\0")
#define TR_SWR TR("SWR\0", "SWR\0 ") #define TR_RAS TR("SWR\0", "SWR\0 ")
#define TR_RX_BATT TR("[NA]", "[NA]\0") #define TR_RX_BATT TR("[NA]", "[NA]\0")
#define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ")
#define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ") #define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ")
#else #else
#define TR_TELEM_RESERVE #define TR_TELEM_RESERVE
#define TR_TELEM_TIME #define TR_TELEM_TIME
#define TR_SWR #define TR_RAS
#define TR_RX_BATT #define TR_RX_BATT
#define TR_A3_A4 #define TR_A3_A4
#define TR_A3_A4_MIN #define TR_A3_A4_MIN
@ -1270,7 +1270,7 @@
#define TR_JITTER_FILTER "ADC Filter" #define TR_JITTER_FILTER "ADC Filter"
#define ZSTR_RSSI "RSSI" #define ZSTR_RSSI "RSSI"
#define ZSTR_SWR "SWR" #define ZSTR_RAS "SWR"
#define ZSTR_A1 "A1" #define ZSTR_A1 "A1"
#define ZSTR_A2 "A2" #define ZSTR_A2 "A2"
#define ZSTR_A3 "A3" #define ZSTR_A3 "A3"

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

@ -348,14 +348,14 @@
#if defined(CPUARM) #if defined(CPUARM)
#define TR_TELEM_RESERVE TR("[--]", "[---]") #define TR_TELEM_RESERVE TR("[--]", "[---]")
#define TR_TELEM_TIME TR("Time", "Time\0") #define TR_TELEM_TIME TR("Time", "Time\0")
#define TR_SWR TR("SWR\0", "SWR\0 ") #define TR_RAS TR("SWR\0", "SWR\0 ")
#define TR_RX_BATT TR("[NA]", "[NA]\0") #define TR_RX_BATT TR("[NA]", "[NA]\0")
#define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ")
#define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ") #define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ")
#else #else
#define TR_TELEM_RESERVE #define TR_TELEM_RESERVE
#define TR_TELEM_TIME #define TR_TELEM_TIME
#define TR_SWR #define TR_RAS
#define TR_RX_BATT #define TR_RX_BATT
#define TR_A3_A4 #define TR_A3_A4
#define TR_A3_A4_MIN #define TR_A3_A4_MIN
@ -1260,7 +1260,7 @@
#define TR_JITTER_FILTER "ADC Filter" #define TR_JITTER_FILTER "ADC Filter"
#define ZSTR_RSSI "RSSI" #define ZSTR_RSSI "RSSI"
#define ZSTR_SWR "SWR" #define ZSTR_RAS "SWR"
#define ZSTR_A1 "A1" #define ZSTR_A1 "A1"
#define ZSTR_A2 "A2" #define ZSTR_A2 "A2"
#define ZSTR_A3 "A3" #define ZSTR_A3 "A3"

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

@ -350,14 +350,14 @@
#if defined(CPUARM) #if defined(CPUARM)
#define TR_TELEM_RESERVE TR("[--]", "[---]") #define TR_TELEM_RESERVE TR("[--]", "[---]")
#define TR_TELEM_TIME TR("Heur", "H:M\0 ") #define TR_TELEM_TIME TR("Heur", "H:M\0 ")
#define TR_SWR TR("SWR\0", "SWR\0 ") #define TR_RAS TR("SWR\0", "SWR\0 ")
#define TR_RX_BATT TR("BtRx", "BatRx") #define TR_RX_BATT TR("BtRx", "BatRx")
#define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ")
#define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ") #define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ")
#else #else
#define TR_TELEM_RESERVE #define TR_TELEM_RESERVE
#define TR_TELEM_TIME #define TR_TELEM_TIME
#define TR_SWR #define TR_RAS
#define TR_RX_BATT #define TR_RX_BATT
#define TR_A3_A4 #define TR_A3_A4
#define TR_A3_A4_MIN #define TR_A3_A4_MIN
@ -555,7 +555,7 @@
#define TR_EXTRA_VSRCRAW "Batt""H:M\0""GPS\0" TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW "Chr1""Chr2""Chr3" #define TR_EXTRA_VSRCRAW "Batt""H:M\0""GPS\0" TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW "Chr1""Chr2""Chr3"
#else #else
#define TR_EXTRA_VSRCRAW #define TR_EXTRA_VSRCRAW
#define TR_VTELEMCHNS "---\0""Batt" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_TIMERS TR_SWR "Tx\0 " TR_TELEM_RSSI_RX TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vit\0""Dist""AltG""Elem""Velm""Vfas""Cour""Cnsm""Puis""AccX""AccY""AccZ""Cap\0""VitV""VitA""dET\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vit+""Dst+" TR_ASPD_MAX "Elm-""Els-""Vfs-""Cur+""Pui+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Tmps" #define TR_VTELEMCHNS "---\0""Batt" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_TIMERS TR_RAS "Tx\0 " TR_TELEM_RSSI_RX TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vit\0""Dist""AltG""Elem""Velm""Vfas""Cour""Cnsm""Puis""AccX""AccY""AccZ""Cap\0""VitV""VitA""dET\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vit+""Dst+" TR_ASPD_MAX "Elm-""Els-""Vfs-""Cur+""Pui+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Tmps"
#endif #endif
#define TR_VSRCRAW "---\0" TR_STICKS_VSRCRAW TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW TR_TRIMS_VSRCRAW TR_SW_VSRCRAW TR_EXTRA_VSRCRAW #define TR_VSRCRAW "---\0" TR_STICKS_VSRCRAW TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW TR_TRIMS_VSRCRAW TR_SW_VSRCRAW TR_EXTRA_VSRCRAW
@ -1299,7 +1299,7 @@
#define TR_JITTER_FILTER "Filtre ADC" #define TR_JITTER_FILTER "Filtre ADC"
#define ZSTR_RSSI "RSSI" #define ZSTR_RSSI "RSSI"
#define ZSTR_SWR "SWR" #define ZSTR_RAS "SWR"
#define ZSTR_A1 "A1" #define ZSTR_A1 "A1"
#define ZSTR_A2 "A2" #define ZSTR_A2 "A2"
#define ZSTR_A3 "A3" #define ZSTR_A3 "A3"

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

@ -350,14 +350,14 @@
#if defined(CPUARM) #if defined(CPUARM)
#define TR_TELEM_RESERVE TR("[--]", "[---]") #define TR_TELEM_RESERVE TR("[--]", "[---]")
#define TR_TELEM_TIME TR("Ora\0", "Ora\0 ") #define TR_TELEM_TIME TR("Ora\0", "Ora\0 ")
#define TR_SWR TR("SWR\0", "SWR\0 ") #define TR_RAS TR("SWR\0", "SWR\0 ")
#define TR_RX_BATT TR("RxBt", "BatRx") #define TR_RX_BATT TR("RxBt", "BatRx")
#define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ")
#define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ") #define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ")
#else #else
#define TR_TELEM_RESERVE #define TR_TELEM_RESERVE
#define TR_TELEM_TIME #define TR_TELEM_TIME
#define TR_SWR #define TR_RAS
#define TR_RX_BATT #define TR_RX_BATT
#define TR_A3_A4 #define TR_A3_A4
#define TR_A3_A4_MIN #define TR_A3_A4_MIN
@ -541,7 +541,7 @@
#define TR_EXTRA_VSRCRAW "Batt""Time""GPS\0" TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW "Tmr1""Tmr2""Tmr3" #define TR_EXTRA_VSRCRAW "Batt""Time""GPS\0" TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW "Tmr1""Tmr2""Tmr3"
#else #else
#define TR_EXTRA_VSRCRAW #define TR_EXTRA_VSRCRAW
#define TR_VTELEMCHNS "---\0""Batt" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_TIMERS TR_SWR "Tx\0 " TR_TELEM_RSSI_RX TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Ora\0" #define TR_VTELEMCHNS "---\0""Batt" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_TIMERS TR_RAS "Tx\0 " TR_TELEM_RSSI_RX TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Ora\0"
#endif #endif
#define TR_VSRCRAW "---\0" TR_STICKS_VSRCRAW TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW TR_TRIMS_VSRCRAW TR_SW_VSRCRAW TR_EXTRA_VSRCRAW #define TR_VSRCRAW "---\0" TR_STICKS_VSRCRAW TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW TR_TRIMS_VSRCRAW TR_SW_VSRCRAW TR_EXTRA_VSRCRAW
@ -1296,7 +1296,7 @@
#define TR_JITTER_FILTER "ADC Filter" #define TR_JITTER_FILTER "ADC Filter"
#define ZSTR_RSSI "RSSI" #define ZSTR_RSSI "RSSI"
#define ZSTR_SWR "SWR" #define ZSTR_RAS "SWR"
#define ZSTR_A1 "A1" #define ZSTR_A1 "A1"
#define ZSTR_A2 "A2" #define ZSTR_A2 "A2"
#define ZSTR_A3 "A3" #define ZSTR_A3 "A3"

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

@ -1293,7 +1293,7 @@
#define TR_JITTER_FILTER "ADC Filter" #define TR_JITTER_FILTER "ADC Filter"
#define ZSTR_RSSI "RSSI" #define ZSTR_RSSI "RSSI"
#define ZSTR_SWR "SWR" #define ZSTR_RAS "SWR"
#define ZSTR_A1 "A1" #define ZSTR_A1 "A1"
#define ZSTR_A2 "A2" #define ZSTR_A2 "A2"
#define ZSTR_A3 "A3" #define ZSTR_A3 "A3"

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

@ -352,14 +352,14 @@
#if defined(CPUARM) #if defined(CPUARM)
#define TR_TELEM_RESERVE TR("[--]", "[---]") #define TR_TELEM_RESERVE TR("[--]", "[---]")
#define TR_TELEM_TIME TR("Time", "Time\0") #define TR_TELEM_TIME TR("Time", "Time\0")
#define TR_SWR TR("SWR\0", "SWR\0 ") #define TR_RAS TR("SWR\0", "SWR\0 ")
#define TR_RX_BATT TR("[NA]", "[NA]\0") #define TR_RX_BATT TR("[NA]", "[NA]\0")
#define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ")
#define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ") #define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ")
#else #else
#define TR_TELEM_RESERVE #define TR_TELEM_RESERVE
#define TR_TELEM_TIME #define TR_TELEM_TIME
#define TR_SWR #define TR_RAS
#define TR_RX_BATT #define TR_RX_BATT
#define TR_A3_A4 #define TR_A3_A4
#define TR_A3_A4_MIN #define TR_A3_A4_MIN
@ -543,7 +543,7 @@
#define TR_EXTRA_VSRCRAW "Batt""Time""GPS\0" TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW "Tmr1""Tmr2""Tmr3" #define TR_EXTRA_VSRCRAW "Batt""Time""GPS\0" TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW "Tmr1""Tmr2""Tmr3"
#else #else
#define TR_EXTRA_VSRCRAW #define TR_EXTRA_VSRCRAW
#define TR_VTELEMCHNS "---\0""Bat\0" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_TIMERS TR_SWR "Tx\0 " TR_TELEM_RSSI_RX TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time" #define TR_VTELEMCHNS "---\0""Bat\0" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_TIMERS TR_RAS "Tx\0 " TR_TELEM_RSSI_RX TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time"
#endif #endif
#define TR_VSRCRAW "---\0" TR_STICKS_VSRCRAW TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW TR_TRIMS_VSRCRAW TR_SW_VSRCRAW TR_EXTRA_VSRCRAW #define TR_VSRCRAW "---\0" TR_STICKS_VSRCRAW TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW TR_TRIMS_VSRCRAW TR_SW_VSRCRAW TR_EXTRA_VSRCRAW
@ -1299,7 +1299,7 @@
#define TR_JITTER_FILTER "ADC Filter" #define TR_JITTER_FILTER "ADC Filter"
#define ZSTR_RSSI "RSSI" #define ZSTR_RSSI "RSSI"
#define ZSTR_SWR "SWR" #define ZSTR_RAS "SWR"
#define ZSTR_A1 "A1" #define ZSTR_A1 "A1"
#define ZSTR_A2 "A2" #define ZSTR_A2 "A2"
#define ZSTR_A3 "A3" #define ZSTR_A3 "A3"

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

@ -347,14 +347,14 @@
#if defined(CPUARM) #if defined(CPUARM)
#define TR_TELEM_RESERVE TR("[--]", "[---]") #define TR_TELEM_RESERVE TR("[--]", "[---]")
#define TR_TELEM_TIME TR("Time", "Time\0") #define TR_TELEM_TIME TR("Time", "Time\0")
#define TR_SWR TR("SWR\0", "SWR\0 ") #define TR_RAS TR("SWR\0", "SWR\0 ")
#define TR_RX_BATT TR("[NA]", "[NA]\0") #define TR_RX_BATT TR("[NA]", "[NA]\0")
#define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ")
#define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ") #define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ")
#else #else
#define TR_TELEM_RESERVE #define TR_TELEM_RESERVE
#define TR_TELEM_TIME #define TR_TELEM_TIME
#define TR_SWR #define TR_RAS
#define TR_RX_BATT #define TR_RX_BATT
#define TR_A3_A4 #define TR_A3_A4
#define TR_A3_A4_MIN #define TR_A3_A4_MIN
@ -1273,7 +1273,7 @@
#define TR_JITTER_FILTER "ADC Filter" #define TR_JITTER_FILTER "ADC Filter"
#define ZSTR_RSSI "RSSI" #define ZSTR_RSSI "RSSI"
#define ZSTR_SWR "SWR" #define ZSTR_RAS "SWR"
#define ZSTR_A1 "A1" #define ZSTR_A1 "A1"
#define ZSTR_A2 "A2" #define ZSTR_A2 "A2"
#define ZSTR_A3 "A3" #define ZSTR_A3 "A3"

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

@ -348,14 +348,14 @@
#if defined(CPUARM) #if defined(CPUARM)
#define TR_TELEM_RESERVE TR("[--]", "[---]") #define TR_TELEM_RESERVE TR("[--]", "[---]")
#define TR_TELEM_TIME TR("Tid\0", "Tid\0 ") #define TR_TELEM_TIME TR("Tid\0", "Tid\0 ")
#define TR_SWR TR("SWR\0", "SWR\0 ") #define TR_RAS TR("SWR\0", "SWR\0 ")
#define TR_RX_BATT TR("[NA]", "[NA]\0") #define TR_RX_BATT TR("[NA]", "[NA]\0")
#define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ")
#define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ") #define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ")
#else #else
#define TR_TELEM_RESERVE #define TR_TELEM_RESERVE
#define TR_TELEM_TIME #define TR_TELEM_TIME
#define TR_SWR #define TR_RAS
#define TR_RX_BATT #define TR_RX_BATT
#define TR_A3_A4 #define TR_A3_A4
#define TR_A3_A4_MIN #define TR_A3_A4_MIN
@ -550,7 +550,7 @@
#define TR_EXTRA_VSRCRAW "Batt""Tid\0""GPS\0" TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW "Tmr1""Tmr2""Tmr3" #define TR_EXTRA_VSRCRAW "Batt""Tid\0""GPS\0" TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW TR_RESERVE_VSRCRAW "Tmr1""Tmr2""Tmr3"
#else #else
#define TR_EXTRA_VSRCRAW #define TR_EXTRA_VSRCRAW
#define TR_VTELEMCHNS "---\0""Batt" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_TIMERS TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Tid\0" #define TR_VTELEMCHNS "---\0""Batt" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_TIMERS TR_RAS "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Tid\0"
#endif #endif
#define TR_VSRCRAW "---\0" TR_STICKS_VSRCRAW TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "Max\0" TR_CYC_VSRCRAW TR_TRIMS_VSRCRAW TR_SW_VSRCRAW TR_EXTRA_VSRCRAW #define TR_VSRCRAW "---\0" TR_STICKS_VSRCRAW TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "Max\0" TR_CYC_VSRCRAW TR_TRIMS_VSRCRAW TR_SW_VSRCRAW TR_EXTRA_VSRCRAW
@ -1306,7 +1306,7 @@
#define TR_JITTER_FILTER "ADC Filter" #define TR_JITTER_FILTER "ADC Filter"
#define ZSTR_RSSI "RSSI" #define ZSTR_RSSI "RSSI"
#define ZSTR_SWR "SWR" #define ZSTR_RAS "SWR"
#define ZSTR_A1 "A1" #define ZSTR_A1 "A1"
#define ZSTR_A2 "A2" #define ZSTR_A2 "A2"
#define ZSTR_A3 "A3" #define ZSTR_A3 "A3"

5
radio/util/fwoptions.py
View file

@ -239,6 +239,7 @@ options_taranis = {
"haptic": ("HAPTIC", "YES", "NO"), "haptic": ("HAPTIC", "YES", "NO"),
"nogvars": ("GVARS", "NO", "YES"), "nogvars": ("GVARS", "NO", "YES"),
"sqt5font": ("FONT", "SQT5", None), "sqt5font": ("FONT", "SQT5", None),
"noras": ("RAS", "NO", "YES"),
"faimode": ("FAI", "YES", None), "faimode": ("FAI", "YES", None),
"faichoice": ("FAI", "CHOICE", None), "faichoice": ("FAI", "CHOICE", None),
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
@ -253,9 +254,9 @@ options_taranisplus = {
"ppmus": ("PPM_UNIT", "US", "PERCENT_PREC1"), "ppmus": ("PPM_UNIT", "US", "PERCENT_PREC1"),
"lua": ("LUA", "YES", "NO_MODEL_SCRIPTS"), "lua": ("LUA", "YES", "NO_MODEL_SCRIPTS"),
"luac": ("LUA_COMPILER", "YES", "NO"), "luac": ("LUA_COMPILER", "YES", "NO"),
"SWR": ("SWR", "YES", "NO"),
"nogvars": ("GVARS", "NO", "YES"), "nogvars": ("GVARS", "NO", "YES"),
"sqt5font": ("FONT", "SQT5", None), "sqt5font": ("FONT", "SQT5", None),
"noras": ("RAS", "NO", "YES"),
"faimode": ("FAI", "YES", None), "faimode": ("FAI", "YES", None),
"faichoice": ("FAI", "CHOICE", None), "faichoice": ("FAI", "CHOICE", None),
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
@ -270,9 +271,9 @@ options_taranisx9e = {
"ppmus": ("PPM_UNIT", "US", "PERCENT_PREC1"), "ppmus": ("PPM_UNIT", "US", "PERCENT_PREC1"),
"lua": ("LUA", "YES", "NO_MODEL_SCRIPTS"), "lua": ("LUA", "YES", "NO_MODEL_SCRIPTS"),
"luac": ("LUA_COMPILER", "YES", "NO"), "luac": ("LUA_COMPILER", "YES", "NO"),
"SWR": ("SWR", "YES", "NO"),
"nogvars": ("GVARS", "NO", "YES"), "nogvars": ("GVARS", "NO", "YES"),
"sqt5font": ("FONT", "SQT5", None), "sqt5font": ("FONT", "SQT5", None),
"noras": ("RAS", "NO", "YES"),
"faimode": ("FAI", "YES", None), "faimode": ("FAI", "YES", None),
"faichoice": ("FAI", "CHOICE", None), "faichoice": ("FAI", "CHOICE", None),
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),

6
radio/util/sport-parse.py
View file

@ -53,9 +53,9 @@ def ParseBatt(packet, dataId, prim, appId, data, crc):
print(" Batt: %d" % (data & 0xFF)) print(" Batt: %d" % (data & 0xFF))
def ParseSWR(packet, dataId, prim, appId, data, crc): def ParseRAS(packet, dataId, prim, appId, data, crc):
print("packet: %s (%4d)" % (dump(packet), lineNumber), end=' ') print("packet: %s (%4d)" % (dump(packet), lineNumber), end=' ')
print(" SWR: %d" % (data & 0xFF)) print(" RAS: %d" % (data & 0xFF))
def ParseVersion(packet, dataId, prim, appId, data, crc): def ParseVersion(packet, dataId, prim, appId, data, crc):
@ -74,7 +74,7 @@ appIdParsers = (
(0xf101, 0xf101, ParseRSSI), (0xf101, 0xf101, ParseRSSI),
(0xf102, 0xf103, ParseAdc), (0xf102, 0xf103, ParseAdc),
(0xf104, 0xf104, ParseBatt), (0xf104, 0xf104, ParseBatt),
(0xf105, 0xf105, ParseSWR), (0xf105, 0xf105, ParseRAS),
(0xf106, 0xf106, ParseVersion), (0xf106, 0xf106, ParseVersion),
) )