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

Fixes #2117

Browse source
This commit is contained in:
bsongis 2015-05-07 19:27:55 +02:00
parent 2c3eb5e313
commit 8cb6539264
16 changed files with 59 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
radio/src/gui/Taranis/menu_model_setup.cpp
View file

@ -738,15 +738,16 @@ void menuModelSetup(uint8_t event)
lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN, y, STR_VFAILSAFE, moduleData.failsafeMode, m_posHorz==0 ? attr : 0);
if (moduleData.failsafeMode == FAILSAFE_CUSTOM) lcd_putsAtt(MODEL_SETUP_2ND_COLUMN + MODEL_SETUP_SET_FAILSAFE_OFS, y, STR_SET, m_posHorz==1 ? attr : 0);
if (attr) {
if (moduleData.failsafeMode != FAILSAFE_CUSTOM)
if (moduleData.failsafeMode != FAILSAFE_CUSTOM) {
m_posHorz = 0;
if (m_posHorz==0) {
if (s_editMode>0) {
}
if (m_posHorz == 0) {
if (s_editMode > 0) {
CHECK_INCDEC_MODELVAR_ZERO(event, moduleData.failsafeMode, FAILSAFE_LAST);
if (checkIncDec_Ret) SEND_FAILSAFE_NOW(moduleIdx);
}
}
else if (m_posHorz==1) {
else if (m_posHorz == 1) {
s_editMode = 0;
if (moduleData.failsafeMode==FAILSAFE_CUSTOM && event==EVT_KEY_FIRST(KEY_ENTER)) {
g_moduleIdx = moduleIdx;

1
radio/src/myeeprom.h
View file

@ -2044,6 +2044,7 @@ enum ModuleTypes {
#define IS_PULSES_EXTERNAL_MODULE() (g_model.externalModule != MODULE_TYPE_NONE)
enum FailsafeModes {
FAILSAFE_NOT_SET,
FAILSAFE_HOLD,
FAILSAFE_CUSTOM,
FAILSAFE_NOPULSES,

18
radio/src/opentx.cpp
View file

@ -1018,6 +1018,23 @@ void doSplash()
#define doSplash()
#endif
#if defined(PXX)
void checkFailsafe()
{
for (int i=0; i<NUM_MODULES; i++) {
if (IS_MODULE_XJT(i)) {
ModuleData & moduleData = g_model.moduleData[i];
if (moduleData.failsafeMode == FAILSAFE_NOT_SET) {
ALERT(STR_FAILSAFEWARN, STR_NO_FAILSAFE, AU_ERROR);
break;
}
}
}
}
#else
#define checkFailsafe()
#endif
#if defined(GUI)
void checkAll()
{
@ -1030,6 +1047,7 @@ void checkAll()
#else
checkTHR();
checkSwitches();
checkFailsafe();
#endif
#if defined(CPUARM)

2
radio/src/pulses/pxx_arm.cpp
View file

@ -200,7 +200,7 @@ void setupPulsesPXX(unsigned int port)
else if (moduleFlag[port] == MODULE_RANGECHECK) {
flag1 |= PXX_SEND_RANGECHECK;
}
else if (g_model.moduleData[port].failsafeMode != FAILSAFE_RECEIVER) {
else if (g_model.moduleData[port].failsafeMode != FAILSAFE_NOT_SET && g_model.moduleData[port].failsafeMode != FAILSAFE_RECEIVER) {
if (failsafeCounter[port]-- == 0) {
failsafeCounter[port] = 1000;
flag1 |= PXX_SEND_FAILSAFE;

2
radio/src/translations.cpp
View file

@ -455,6 +455,8 @@ const pm_char STR_EEPROM_CONVERTING[] PROGMEM = TR_EEPROM_CONVERTING;
const pm_char STR_THROTTLEWARN[] PROGMEM = TR_THROTTLEWARN;
const pm_char STR_ALARMSWARN[] PROGMEM = TR_ALARMSWARN;
const pm_char STR_SWITCHWARN[] PROGMEM = TR_SWITCHWARN;
const pm_char STR_FAILSAFEWARN[] PROGMEM = TR_FAILSAFEWARN;
const pm_char STR_NO_FAILSAFE[] PROGMEM = TR_NO_FAILSAFE;
const pm_char STR_KEYSTUCK[] PROGMEM = TR_KEYSTUCK;
const pm_char STR_SPEAKER_VOLUME[] PROGMEM = TR_SPEAKER_VOLUME;

2
radio/src/translations.h
View file

@ -634,6 +634,8 @@ extern const pm_char STR_EEPROM_CONVERTING[];
extern const pm_char STR_THROTTLEWARN[];
extern const pm_char STR_ALARMSWARN[];
extern const pm_char STR_SWITCHWARN[];
extern const pm_char STR_FAILSAFEWARN[];
extern const pm_char STR_NO_FAILSAFE[];
extern const pm_char STR_KEYSTUCK[];
extern const pm_char STR_SPEAKER_VOLUME[];

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

@ -525,7 +525,7 @@
#define TR_VTRAINERMODES "Učitel/Jack\0 ""Žák/Jack\0 ""Master/SBUS Module""Master/CPPM Module""Master/Battery\0"
#define LEN_VFAILSAFE "\011"
#define TR_VFAILSAFE "Držet\0 ""Vlastní\0 ""Bez pulzů""Přijímač"
#define TR_VFAILSAFE "Not set\0 ""Držet\0 ""Vlastní\0 ""Bez pulzů""Přijímač"
#if defined(MAVLINK)
#define LEN_MAVLINK_BAUDS "\006"
@ -823,6 +823,8 @@
#define TR_THROTTLEWARN "PLYNU"
#define TR_ALARMSWARN "ALARMU"
#define TR_SWITCHWARN "POZICE"
#define TR_FAILSAFEWARN "FAILSAFE"
#define TR_NO_FAILSAFE "Failsafe not set"
#define TR_KEYSTUCK "Zaseklá klávesa"
#define TR_INVERT_THR "Invertovat plyn?"
#define TR_SPEAKER_VOLUME INDENT "Hlasitost"

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

@ -524,7 +524,7 @@
#define TR_VTRAINERMODES "Lehrer/Buchse\0 ""Schüler/Buchse\0 ""Lehrer/SBUS Modul\0""Lehrer/CPPM Modul\0""Lehrer/Batterie\0"
#define LEN_VFAILSAFE "\013"
#define TR_VFAILSAFE "Halte Pos.\0""Angepasst\0 ""Kein Signal""Empfänger\0"
#define TR_VFAILSAFE "Not set\0 ""Halte Pos.\0""Angepasst\0 ""Kein Signal""Empfänger\0"
#if defined(MAVLINK)
#define LEN_MAVLINK_BAUDS "\006"
@ -822,6 +822,8 @@
#define TR_THROTTLEWARN "GAS"
#define TR_ALARMSWARN "ALARM"
#define TR_SWITCHWARN "SCHALTER"
#define TR_FAILSAFEWARN "FAILSAFE"
#define TR_NO_FAILSAFE "Failsafe not set"
#define TR_KEYSTUCK "Taste klemmt" //Key stuck=Taste klemmt
#define TR_INVERT_THR TR("Gas umkehren?","Vollgas hinten?") // Th9x 9XR
#define TR_SPEAKER_VOLUME INDENT "Lautstärke"

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

@ -524,7 +524,7 @@
#define TR_VTRAINERMODES "Master/Jack\0 ""Slave/Jack\0 ""Master/SBUS Module""Master/CPPM Module""Master/Battery\0"
#define LEN_VFAILSAFE "\011"
#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses""Receiver\0"
#define TR_VFAILSAFE "Not set\0 ""Hold\0 ""Custom\0 ""No pulses""Receiver\0"
#if defined(MAVLINK)
#define LEN_MAVLINK_BAUDS "\006"
@ -822,6 +822,8 @@
#define TR_THROTTLEWARN "THROTTLE"
#define TR_ALARMSWARN "ALARMS"
#define TR_SWITCHWARN TR("SWITCH","CONTROL")
#define TR_FAILSAFEWARN "FAILSAFE"
#define TR_NO_FAILSAFE "Failsafe not set"
#define TR_KEYSTUCK "Key stuck"
#define TR_INVERT_THR TR("Invert Thr?","Invert Throttle?")
#define TR_SPEAKER_VOLUME INDENT "Volume" // TODO could be TR_VOLUME ?

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

@ -498,7 +498,7 @@
#define TR_VTRAINERMODES "Master/Jack\0 ""Esclav/Jack\0 ""Master/SBUS Module""Master/CPPM Module""Master/Battery\0"
#define LEN_VFAILSAFE "\011"
#define TR_VFAILSAFE "Guardar\0 ""Adaptar\0 ""Sin pulso""Receiver\0"
#define TR_VFAILSAFE "Not set\0 ""Guardar\0 ""Adaptar\0 ""Sin pulso""Receiver\0"
#if defined(MAVLINK)
#define LEN_MAVLINK_BAUDS "\006"
@ -773,6 +773,8 @@
#define TR_THROTTLEWARN "ACELERADOR"
#define TR_ALARMSWARN "ALARMAS"
#define TR_SWITCHWARN "INTERPTOR"
#define TR_FAILSAFEWARN "FAILSAFE"
#define TR_NO_FAILSAFE "Failsafe not set"
#define TR_KEYSTUCK "Key stuck"
#define TR_INVERT_THR TR("Invertir Acel?", "Invertir Acel.?")
#define TR_SPEAKER_VOLUME INDENT "Volumen"

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

@ -498,7 +498,7 @@
#define TR_VTRAINERMODES "Master/Jack\0 ""Slave/Jack\0 ""Master/SBUS Module""Master/CPPM Module""Master/Battery\0"
#define LEN_VFAILSAFE "\011"
#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses""Receiver\0"
#define TR_VFAILSAFE "Not set\0 ""Hold\0 ""Custom\0 ""No pulses""Receiver\0"
#if defined(MAVLINK)
#define LEN_MAVLINK_BAUDS "\006"
@ -773,6 +773,8 @@
#define TR_THROTTLEWARN "THROTTLE"
#define TR_ALARMSWARN "ALARMS"
#define TR_SWITCHWARN TR("SWITCH","CONTROL")
#define TR_FAILSAFEWARN "FAILSAFE"
#define TR_NO_FAILSAFE "Failsafe not set"
#define TR_KEYSTUCK "Key stuck"
#define TR_INVERT_THR TR("Invert Thr?","Invert Throttle?")
#define TR_SPEAKER_VOLUME INDENT "Volume"

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

@ -524,7 +524,7 @@
#define TR_VTRAINERMODES "Maître/Jack\0 ""Elève/Jack\0 ""Maître/SBUS Module""Maître/CPPM Module""Maître/Batterie\0"
#define LEN_VFAILSAFE "\011"
#define TR_VFAILSAFE "Maintien\0""Prédéfini""Pas d'imp""Récepteur"
#define TR_VFAILSAFE "Not set\0 ""Maintien\0""Prédéfini""Pas d'imp""Récepteur"
#if defined(MAVLINK)
#define LEN_MAVLINK_BAUDS "\006"
@ -814,6 +814,8 @@
#define TR_THROTTLEWARN "GAZ"
#define TR_ALARMSWARN "SON"
#define TR_SWITCHWARN TR("INTERS","CONTROLES")
#define TR_FAILSAFEWARN "FAILSAFE"
#define TR_NO_FAILSAFE "Failsafe not set"
#define TR_KEYSTUCK "Key stuck"
#define TR_INVERT_THR "Inverser Gaz?"
#define TR_SPEAKER_VOLUME INDENT "Volume"

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

@ -498,7 +498,7 @@
#define TR_VTRAINERMODES "Maestro/Jack\0 ""Allievo/Jack\0 ""Master/SBUS Module""Master/CPPM Module""Master/Battery\0"
#define LEN_VFAILSAFE "\013"
#define TR_VFAILSAFE "Mantieni\0 ""Personali\0 ""No impulsi\0""Ricevente\0 "
#define TR_VFAILSAFE "Not set\0 ""Mantieni\0 ""Personali\0 ""No impulsi\0""Ricevente\0 "
#if defined(MAVLINK)
#define LEN_MAVLINK_BAUDS "\006"
@ -773,6 +773,8 @@
#define TR_THROTTLEWARN "MOTORE"
#define TR_ALARMSWARN "ALLARMI"
#define TR_SWITCHWARN "CONTROLLI"
#define TR_FAILSAFEWARN "FAILSAFE"
#define TR_NO_FAILSAFE "Failsafe not set"
#define TR_KEYSTUCK "Key stuck"
#define TR_INVERT_THR "Inverti Mot?"
#define TR_SPEAKER_VOLUME "Volume Audio"

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

@ -528,7 +528,7 @@
#define TR_VTRAINERMODES "Trener/Jack\0 ""Uczeń/Jack\0 ""Trener/SBUS Moduł ""Trener/CPPM Moduł ""Trener/Bateria\0 "
#define LEN_VFAILSAFE "\011" /*9 decimal*/
#define TR_VFAILSAFE "Utrzymuj\0""Własne\0 ""0 sygnału""Odbiornik"
#define TR_VFAILSAFE "Not set\0 ""Utrzymuj\0""Własne\0 ""0 sygnału""Odbiornik"
#if defined(MAVLINK)
#define LEN_MAVLINK_BAUDS "\006"
@ -826,6 +826,8 @@
#define TR_THROTTLEWARN "GAZ"
#define TR_ALARMSWARN "ALARM"
#define TR_SWITCHWARN TR("Przełą","Kontrola")
#define TR_FAILSAFEWARN "FAILSAFE"
#define TR_NO_FAILSAFE "Failsafe not set"
#define TR_KEYSTUCK "Blokada klucza"
#define TR_INVERT_THR TR("Odw.Gaz?","Odwróć gaz?")
#define TR_SPEAKER_VOLUME INDENT "Głośność"

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

@ -498,7 +498,7 @@
#define TR_VTRAINERMODES "Master/Jack\0 ""Slave/Jack\0 ""Master/SBUS Module""Master/CPPM Module""Master/Battery\0"
#define LEN_VFAILSAFE "\011"
#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses""Receiver\0"
#define TR_VFAILSAFE "Not set\0 ""Hold\0 ""Custom\0 ""No pulses""Receiver\0"
#if defined(MAVLINK)
#define LEN_MAVLINK_BAUDS "\006"
@ -773,6 +773,8 @@
#define TR_THROTTLEWARN "ACELERAD"
#define TR_ALARMSWARN "ALARMES"
#define TR_SWITCHWARN "CHAVES"
#define TR_FAILSAFEWARN "FAILSAFE"
#define TR_NO_FAILSAFE "Failsafe not set"
#define TR_KEYSTUCK "Key stuck"
#define TR_INVERT_THR "Inverte Acel?"
#define TR_SPEAKER_VOLUME INDENT "Volume"

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

@ -498,7 +498,7 @@
#define TR_VTRAINERMODES "Lärare/Uttag\0 ""Elev./Uttag\0 ""Lärare/SBUS-Modul\0""Lärare/CPPM-Modul\0""Lärare/Batteri\0"
#define LEN_VFAILSAFE "\011"
#define TR_VFAILSAFE "Lås Servo""Anpassat\0""Pulsfritt""Mottagare"
#define TR_VFAILSAFE "Not set\0 ""Lås Servo""Anpassat\0""Pulsfritt""Mottagare"
#if defined(MAVLINK)
#define LEN_MAVLINK_BAUDS "\006"
@ -773,6 +773,8 @@
#define TR_THROTTLEWARN "GAS"
#define TR_ALARMSWARN "ALARM"
#define TR_SWITCHWARN "BRYTARE"
#define TR_FAILSAFEWARN "FAILSAFE"
#define TR_NO_FAILSAFE "Failsafe not set"
#define TR_KEYSTUCK "Knapp-fel"
#define TR_INVERT_THR TR("Invert.Gas?", "Invertera Gasen?")
#define TR_SPEAKER_VOLUME INDENT "Volym"