piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Remove legacy UI for telemetry type (#3782)

Browse Source 
* CPN and radio: removed legacy UI for telemetry type

* CPN and radio: removed legacy UI for telemetry type
This commit is contained in:
Michael
2023-09-07 21:10:16 +10:00
committed by GitHub
parent e485db93ca
commit 73a4a2387e
24 changed files with 2 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/modeledit/telemetry.cpp
-17
View File
@@ -475,14 +475,6 @@ void TelemetryPanel::update()
lock = true;
if (IS_HORUS_OR_TARANIS(firmware->getBoard())) {
if (model->moduleData[0].protocol == PULSES_OFF && model->moduleData[1].protocol == PULSES_PPM) {
ui->telemetryProtocol->setEnabled(true);
}
else {
ui->telemetryProtocol->setEnabled(false);
ui->telemetryProtocol->setCurrentIndex(0);
}
ui->voltsSource->updateValue();
ui->altitudeSource->updateValue();
ui->varioSource->updateValue();
@@ -499,15 +491,6 @@ void TelemetryPanel::setup()
{
lock = true;
ui->telemetryProtocol->addItem(tr("FrSky S.PORT"), 0);
ui->telemetryProtocol->addItem(tr("FrSky D"), 1);
if (IS_9XRPRO(firmware->getBoard()) ||
(IS_TARANIS(firmware->getBoard()) &&
generalSettings.serialPort[GeneralSettings::SP_AUX1] ==
GeneralSettings::AUX_SERIAL_TELE_IN)) {
ui->telemetryProtocol->addItem(tr("FrSky D (cable)"), 2);
}
ui->telemetryProtocol->setCurrentIndex(model->telemetryProtocol);
ui->ignoreSensorIds->setField(model->frsky.ignoreSensorIds, this);
ui->showInstanceIds->setField(model->showInstanceIds, this);
ui->disableTelemetryAlarms->setField(model->rssiAlarms.disabled);
companion/src/modeledit/telemetry.ui
-34
View File
@@ -17,39 +17,6 @@
<property name="spacing">
<number>4</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1">
<item>
<widget class="QLabel" name="telemetryProtocolLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Protocol</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="telemetryProtocol">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="RSSIGB">
<property name="sizePolicy">
@@ -1024,7 +991,6 @@
</customwidget>
</customwidgets>
<tabstops>
<tabstop>telemetryProtocol</tabstop>
<tabstop>rssiAlarmWarningCB</tabstop>
<tabstop>rssiAlarmWarningSB</tabstop>
<tabstop>rssiAlarmCriticalCB</tabstop>
radio/src/gui/128x64/model_telemetry.cpp
+1 -22
View File
@@ -22,7 +22,6 @@
#include "opentx.h"
enum MenuModelTelemetryFrskyItems {
ITEM_TELEMETRY_PROTOCOL_TYPE,
ITEM_TELEMETRY_SENSORS_LABEL,
ITEM_TELEMETRY_SENSOR_FIRST,
ITEM_TELEMETRY_SENSOR_LAST = ITEM_TELEMETRY_SENSOR_FIRST + MAX_TELEMETRY_SENSORS - 1,
@@ -73,14 +72,6 @@ uint8_t SENSOR_ROW(uint8_t value)
#define VARIO_ROWS
#endif
#if defined(HARDWARE_EXTERNAL_MODULE)
#define TELEMETRY_TYPE_ROW (!IS_INTERNAL_MODULE_ENABLED() && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PPM) ? (uint8_t)0 : HIDDEN_ROW
#else
#define TELEMETRY_TYPE_ROW HIDDEN_ROW
#endif
#define TELEMETRY_TYPE_ROWS TELEMETRY_TYPE_ROW,
void onSensorMenu(const char * result)
{
uint8_t index = menuVerticalPosition - HEADER_LINE - ITEM_TELEMETRY_SENSOR_FIRST;
@@ -126,7 +117,7 @@ void onDeleteAllSensorsConfirm(const char * result)
void menuModelTelemetry(event_t event)
{
MENU(STR_MENUTELEMETRY, menuTabModel, MENU_MODEL_TELEMETRY, HEADER_LINE+ITEM_TELEMETRY_MAX, { HEADER_LINE_COLUMNS TELEMETRY_TYPE_ROWS SENSORS_ROWS RSSI_ROWS VARIO_ROWS });
MENU(STR_MENUTELEMETRY, menuTabModel, MENU_MODEL_TELEMETRY, HEADER_LINE+ITEM_TELEMETRY_MAX, { HEADER_LINE_COLUMNS SENSORS_ROWS RSSI_ROWS VARIO_ROWS });
uint8_t sub = menuVerticalPosition - HEADER_LINE;
@@ -184,18 +175,6 @@ void menuModelTelemetry(event_t event)
else
switch (k) {
case ITEM_TELEMETRY_PROTOCOL_TYPE:
lcdDrawTextAlignedLeft(y, STR_TELEMETRY_TYPE);
lcdDrawTextAtIndex(TELEM_COL2, y, STR_TELEMETRY_PROTOCOLS,
g_model.telemetryProtocol, attr);
if (attr) {
g_model.telemetryProtocol = checkIncDec(
event, g_model.telemetryProtocol, PROTOCOL_TELEMETRY_FIRST,
PROTOCOL_TELEMETRY_LAST, EE_MODEL, isTelemetryProtocolAvailable);
}
break;
case ITEM_TELEMETRY_SENSORS_LABEL:
telemExpandState.sensors = expandableSection(y, STR_TELEMETRY_SENSORS, telemExpandState.sensors, attr, event);
break;
radio/src/gui/212x64/model_telemetry.cpp
+1 -11
View File
@@ -22,7 +22,6 @@
#include "opentx.h"
enum MenuModelTelemetryFrskyItems {
ITEM_TELEMETRY_PROTOCOL_TYPE,
ITEM_TELEMETRY_SENSORS_LABEL,
ITEM_TELEMETRY_SENSOR_FIRST,
ITEM_TELEMETRY_SENSOR_LAST = ITEM_TELEMETRY_SENSOR_FIRST + MAX_TELEMETRY_SENSORS - 1,
@@ -67,7 +66,6 @@ uint8_t SENSOR_ROW(uint8_t value)
#else
#define VARIO_ROWS
#endif
#define TELEMETRY_TYPE_ROWS (!IS_INTERNAL_MODULE_ENABLED() && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PPM) ? (uint8_t)0 : HIDDEN_ROW,
void onSensorMenu(const char * result)
{
@@ -114,7 +112,7 @@ void onDeleteAllSensorsConfirm(const char * result)
void menuModelTelemetry(event_t event)
{
MENU(STR_MENUTELEMETRY, menuTabModel, MENU_MODEL_TELEMETRY, HEADER_LINE+ITEM_TELEMETRY_MAX, { HEADER_LINE_COLUMNS TELEMETRY_TYPE_ROWS SENSORS_ROWS RSSI_ROWS VARIO_ROWS });
MENU(STR_MENUTELEMETRY, menuTabModel, MENU_MODEL_TELEMETRY, HEADER_LINE+ITEM_TELEMETRY_MAX, { HEADER_LINE_COLUMNS SENSORS_ROWS RSSI_ROWS VARIO_ROWS });
uint8_t sub = menuVerticalPosition - HEADER_LINE;
@@ -176,14 +174,6 @@ void menuModelTelemetry(event_t event)
else
switch (k) {
case ITEM_TELEMETRY_PROTOCOL_TYPE:
lcdDrawTextAlignedLeft(y, STR_TELEMETRY_TYPE);
lcdDrawTextAtIndex(TELEM_COL2, y, STR_TELEMETRY_PROTOCOLS, g_model.telemetryProtocol, attr);
if (attr) {
g_model.telemetryProtocol = checkIncDec(event, g_model.telemetryProtocol, PROTOCOL_TELEMETRY_FIRST, PROTOCOL_TELEMETRY_LAST, EE_MODEL, isTelemetryProtocolAvailable);
}
break;
case ITEM_TELEMETRY_SENSORS_LABEL:
telemExpandState.sensors = expandableSection(y, STR_TELEMETRY_SENSORS, telemExpandState.sensors, attr, event);
if (telemExpandState.sensors) {
radio/src/gui/gui_common.cpp
-38
View File
@@ -1024,44 +1024,6 @@ bool isRfProtocolAvailable(int protocol)
return true;
}
bool isTelemetryProtocolAvailable(int protocol)
{
#if defined(PCBTARANIS)
if (protocol == PROTOCOL_TELEMETRY_FRSKY_D_SECONDARY &&
hasSerialMode(UART_MODE_TELEMETRY) < 0) {
return false;
}
#endif
if (protocol== PROTOCOL_TELEMETRY_CROSSFIRE) {
return false;
}
if ( protocol== PROTOCOL_TELEMETRY_GHOST) {
return false;
}
#if !defined(MULTIMODULE)
if (protocol == PROTOCOL_TELEMETRY_SPEKTRUM || protocol == PROTOCOL_TELEMETRY_FLYSKY_IBUS || protocol == PROTOCOL_TELEMETRY_MULTIMODULE) {
return false;
}
#endif
#if !defined(AFHDS3)
if (protocol == PROTOCOL_TELEMETRY_AFHDS3) {
return false;
}
#endif
#if defined(PCBHORUS)
if (protocol == PROTOCOL_TELEMETRY_FRSKY_D_SECONDARY) {
return false;
}
#endif
return true;
}
bool isTrainerModeAvailable(int mode)
{
#if defined(PCBX9E)
radio/src/gui/gui_common.h
-1
View File
@@ -97,7 +97,6 @@ bool isExternalModuleAvailable(int moduleType);
bool isInternalModuleAvailable(int moduleType);
bool isInternalModuleSupported(int moduleType);
bool isRfProtocolAvailable(int protocol);
bool isTelemetryProtocolAvailable(int protocol);
bool isTrainerModeAvailable(int mode);
bool isAssignableFunctionAvailable(int function, CustomFunctionData * functions);
radio/src/translations.cpp
-1
View File
@@ -76,7 +76,6 @@ ISTR(R9M_FCC_POWER_VALUES);
ISTR(R9M_LBT_POWER_VALUES);
ISTR(R9M_LITE_FCC_POWER_VALUES);
ISTR(R9M_LITE_LBT_POWER_VALUES);
ISTR(TELEMETRY_PROTOCOLS);
ISTR(XJT_ACCST_RF_PROTOCOLS);
ISTR(ISRM_RF_PROTOCOLS);
ISTR(R9M_PXX2_RF_PROTOCOLS);
radio/src/translations.h
-1
View File
@@ -195,7 +195,6 @@ extern const char* const STR_R9M_FCC_POWER_VALUES[];
extern const char* const STR_R9M_LBT_POWER_VALUES[];
extern const char* const STR_R9M_LITE_FCC_POWER_VALUES[];
extern const char* const STR_R9M_LITE_LBT_POWER_VALUES[];
extern const char* const STR_TELEMETRY_PROTOCOLS[];
extern const char* const STR_XJT_ACCST_RF_PROTOCOLS[];
extern const char* const STR_ISRM_RF_PROTOCOLS[];
extern const char* const STR_R9M_PXX2_RF_PROTOCOLS[];
radio/src/translations/cn.h
-1
View File
@@ -56,7 +56,6 @@
#define TR_COUNTRY_CODES "美国","日本","欧洲"
#define TR_USBMODES "询问","游戏柄","U盘","串行"
#define TR_JACK_MODES "询问","音频","教练"
#define TR_TELEMETRY_PROTOCOLS "FrSky S.PORT","FrSky D","FrSky D (cable)","TBS Crossfire","Spektrum","AFHDS2A IBUS","Multi Telemetry"
#define TR_SBUS_INVERSION_VALUES "normal","not inverted"
#define TR_MULTI_CUSTOM "自定义"
radio/src/translations/cz.h
-1
View File
@@ -59,7 +59,6 @@
#define TR_COUNTRY_CODES TR("US","Amerika"),TR("JP","Japonsko"),TR("EU","Evropa")
#define TR_USBMODES TR("Zeptat","Zeptat se"),TR("Joyst","Joystick"),TR("SDkarta","Úložiště"),"Serial"
#define TR_JACK_MODES "Zeptat","Audio","Trenér"
#define TR_TELEMETRY_PROTOCOLS "FrSky S.PORT","FrSky D","FrSky D (kabel)","TBS Crossfire","Spektrum","AFHDS2A IBUS","Multi Telemetrie"
#define TR_SBUS_INVERSION_VALUES "normal","neinvertováno"
#define TR_MULTI_CUSTOM "Vlastní"
radio/src/translations/da.h
-1
View File
@@ -62,7 +62,6 @@
#define TR_COUNTRY_CODES TR("US","Amerika"),TR("JP","Japan"),TR("EU","Europa")
#define TR_USBMODES "Spørg",TR("Joyst","Joystik"),TR("Lager","USB lager"),TR("Data", "USB data")
#define TR_JACK_MODES "Spørg","Audio","Træner"
#define TR_TELEMETRY_PROTOCOLS "FrSky S.PORT","FrSky D","FrSky D (kabel)","TBS Crossfire","Spektrum","AFHDS2A IBUS","Multi Telemetri"
#define TR_SBUS_INVERSION_VALUES "normal","ikke invers"
#define TR_MULTI_CUSTOM "Tilpasset"
radio/src/translations/de.h
-1
View File
@@ -59,7 +59,6 @@
#define TR_COUNTRY_CODES TR("US","Amerika"),TR("JP","Japan"),TR("EU","Europa")
#define TR_USBMODES "Fragen",TR("Joyst","Joystick"),TR("SDCard","Speicher"),TR("Serial","Seriell")
#define TR_JACK_MODES "Popup","Audio","Trainer"
#define TR_TELEMETRY_PROTOCOLS "FrSky S.PORT","FrSky D","FrSky D (Kabel)","TBS Crossfire","Spektrum","AFHDS2A IBUS","Multi Telemetrie"
#define TR_SBUS_INVERSION_VALUES "normal","nicht inv."
#define TR_MULTI_CUSTOM "Benutzer"
radio/src/translations/en.h
-1
View File
@@ -55,7 +55,6 @@
#define TR_COUNTRY_CODES TR("US","America"),TR("JP","Japan"),TR("EU","Europe")
#define TR_USBMODES "Ask",TR("Joyst","Joystick"),TR("SDCard","Storage"),"Serial"
#define TR_JACK_MODES "Ask","Audio","Trainer"
#define TR_TELEMETRY_PROTOCOLS "FrSky S.PORT","FrSky D","FrSky D (cable)","TBS Crossfire","Spektrum","AFHDS2A IBUS","Multi Telemetry"
#define TR_SBUS_INVERSION_VALUES "normal","not inverted"
#define TR_MULTI_CUSTOM "Custom"
radio/src/translations/es.h
-1
View File
@@ -57,7 +57,6 @@
#define TR_COUNTRY_CODES TR("US","América"),TR("JP","Japón"),TR("EU", "Europa")
#define TR_USBMODES "Pregunta","Joystick","SDCard","Serie"
#define TR_JACK_MODES "Pregunta","Audio","Entrena."
#define TR_TELEMETRY_PROTOCOLS "FrSky S.PORT","FrSky D","FrSky D (cable)","TBS Crossfire","Spektrum","AFHDS2A IBUS","Multi Telemetry"
#define TR_SBUS_INVERSION_VALUES "normal","not inverted"
#define TR_MULTI_CUSTOM "Custom"
radio/src/translations/fi.h
-1
View File
@@ -59,7 +59,6 @@
#define TR_COUNTRY_CODES TR("US","Amerikk"),TR("JP","Japani"),TR("EU","Euroopp")
#define TR_USBMODES "Kysy",TR("Joyst","Joystick"),TR("SDCard","Storage"),"Serial"
#define TR_JACK_MODES "Ask","Audio","Trainer"
#define TR_TELEMETRY_PROTOCOLS "FrSky S.PORT","FrSky D","FrSky D (cable)","TBS Crossfire","Spektrum","AFHDS2A IBUS","Multi Telemetry"
#define TR_SBUS_INVERSION_VALUES "normal","not inverted"
#define TR_MULTI_CUSTOM "Custom"
radio/src/translations/fr.h
-1
View File
@@ -60,7 +60,6 @@
#define TR_COUNTRY_CODES TR("US","USA"),TR("JP","Japon"),TR("Europe","EU")
#define TR_USBMODES TR("Popup","Demander"),TR("Joyst","Joystick"),TR("SDCard","Stockage"),"Série"
#define TR_JACK_MODES "Demander","Audio","Écolage"
#define TR_TELEMETRY_PROTOCOLS "FrSky S.PORT","FrSky D","FrSky D (câble)","TBS Crossfire","Spektrum","AFHDS2A IBUS","Multi Télémetrie"
#define TR_SBUS_INVERSION_VALUES "normal","non inversé"
#define TR_MULTI_CUSTOM "Perso"
radio/src/translations/he.h
-1
View File
@@ -59,7 +59,6 @@
#define TR_COUNTRY_CODES TR("US","America"),TR("JP","Japan"),TR("EU","Europe")
#define TR_USBMODES "הצג לי אופציות",TR("Joyst","חיבור משחק קבוע"),TR("SDCard","העברת נתונים קבוע"),"חיבור סיריילי קבוע"
#define TR_JACK_MODES "Ask","Audio","Trainer"
#define TR_TELEMETRY_PROTOCOLS "FrSky S.PORT","FrSky D","FrSky D (cable)","TBS Crossfire","Spektrum","AFHDS2A IBUS","Multi Telemetry"
#define TR_SBUS_INVERSION_VALUES "normal","not inverted"
#define TR_MULTI_TELEMETRY_MODE "Off","On","Off+Aux","On+Aux"
radio/src/translations/it.h
-1
View File
@@ -60,7 +60,6 @@
#define TR_COUNTRY_CODES TR("US","America"),TR("JP","Japan"),TR("EU","Europa")
#define TR_USBMODES TR("Chied","Chiedi"),TR("Joyst","Joystick"),TR("SDCard","Storage"),TR("Serial","Seriale")
#define TR_JACK_MODES "Chiedi","Audio","Trainer"
#define TR_TELEMETRY_PROTOCOLS "FrSky S.PORT","FrSky D","FrSky D (cable)","TBS Crossfire","Spektrum","AFHDS2A IBUS","Telemetria Multi"
#define TR_SBUS_INVERSION_VALUES "normale","non invertito"
#define TR_MULTI_CUSTOM "Person."
radio/src/translations/jp.h
-1
View File
@@ -55,7 +55,6 @@
#define TR_COUNTRY_CODES TR("US","アメリカ"),TR("JP","日本"),TR("EU","ヨーロッパ")
#define TR_USBMODES "確認",TR("Joyst","JoyStick"),TR("SDカード","ストレージ"),"シリアル"
#define TR_JACK_MODES "確認","音声","トレーナー"
#define TR_TELEMETRY_PROTOCOLS "FrSky S.PORT","FrSky D","FrSky D (cable)","TBS Crossfire","Spektrum","AFHDS2A IBUS","Multi Telemetry"
#define TR_SBUS_INVERSION_VALUES "標準","リバースなし"
#define TR_MULTI_CUSTOM "カスタム"
radio/src/translations/nl.h
-1
View File
@@ -58,7 +58,6 @@
#define TR_COUNTRY_CODES TR("US","Amerika"),TR("JP","Japan"),TR("EU","Europa")
#define TR_USBMODES "Ask",TR("Joyst","Joystick"),TR("SDCard","Storage"),"Serial"
#define TR_JACK_MODES "Ask","Audio","Trainer"
#define TR_TELEMETRY_PROTOCOLS "FrSky S.PORT","FrSky D","FrSky D (cable)","TBS Crossfire","Spektrum","AFHDS2A IBUS","Multi Telemetry"
#define TR_SBUS_INVERSION_VALUES "normal","not inverted"
#define TR_MULTI_CUSTOM "Custom"
radio/src/translations/pl.h
-1
View File
@@ -57,7 +57,6 @@
#define TR_COUNTRY_CODES TR("US","Ameryka"),TR("JP","Japonia"),TR("EU", "Europa")
#define TR_USBMODES "Ask",TR("Joyst","Joystick"),TR("SDCard","Storage"),"Serial"
#define TR_JACK_MODES "Ask","Audio","Trainer"
#define TR_TELEMETRY_PROTOCOLS "FrSky S.PORT","FrSky D","FrSky D (cable)","TBS Crossfire","Spektrum","AFHDS2A IBUS","Multi Telemetry"
#define TR_SBUS_INVERSION_VALUES "normal","not inverted"
#define TR_MULTI_CUSTOM "Custom"
radio/src/translations/pt.h
-1
View File
@@ -58,7 +58,6 @@
#define TR_COUNTRY_CODES TR("US","America"),TR("JP","Japao"),TR("EU","Europa")
#define TR_USBMODES "Pergunta",TR("Joyst","Joystick"),TR("SDCard","Storage"),"Serial"
#define TR_JACK_MODES "Pergunta","Audio","Trainer"
#define TR_TELEMETRY_PROTOCOLS "FrSky S.PORT","FrSky D","FrSky D (cable)","TBS Crossfire","Spektrum","AFHDS2A IBUS","Multi Telemetry"
#define TR_SBUS_INVERSION_VALUES "normal","not inverted"
#define TR_MULTI_CUSTOM "Custom"
radio/src/translations/se.h
-1
View File
@@ -66,7 +66,6 @@
#define TR_COUNTRY_CODES TR("US","Amerika"),TR("JP","Japan"),TR("EU","Europa")
#define TR_USBMODES "Fråga","Joystick",TR("SD-kort","SD-kortlagring"),"Seriell"
#define TR_JACK_MODES "Fråga","Audio","Lärare"
#define TR_TELEMETRY_PROTOCOLS "FrSky S.Port","FrSky D","FrSky D (sladd)","TBS Crossfire","Spektrum","AFHDS2A IBUS","Multi Telemetry"
#define TR_SBUS_INVERSION_VALUES "normal","ej inverterad"
#define TR_MULTI_CUSTOM "Anpassad"
#define TR_VTRIMINC TR("Expo","Exponentiell"),TR("xFin","Extra fin"),"Fin","Medium","Grov"
radio/src/translations/tw.h
-1
View File
@@ -56,7 +56,6 @@
#define TR_COUNTRY_CODES "美國","日本","歐洲"
#define TR_USBMODES "詢問","遊戲柄","U盤","串行"
#define TR_JACK_MODES "詢問","音頻","教練"
#define TR_TELEMETRY_PROTOCOLS "FrSky S.PORT","FrSky D","FrSky D (cable)","TBS Crossfire","Spektrum","AFHDS2A IBUS","Multi Telemetry"
#define TR_SBUS_INVERSION_VALUES "normal","not inverted"
#define TR_MULTI_CUSTOM "自定義"