From 78bdff492d216cea6b32a0479e6123b3be0b90a8 Mon Sep 17 00:00:00 2001 From: bsongis Date: Tue, 25 Mar 2014 19:56:10 +0100 Subject: [PATCH] Issue #863 fixed (firmware part) --- radio/src/myeeprom.h | 3 ++- radio/src/protocols/pxx_arm.cpp | 15 ++++++++------- radio/src/translations/cz.h.txt | 2 +- radio/src/translations/de.h.txt | 2 +- radio/src/translations/en.h.txt | 2 +- radio/src/translations/es.h.txt | 2 +- radio/src/translations/fi.h.txt | 2 +- radio/src/translations/fr.h.txt | 2 +- radio/src/translations/it.h.txt | 2 +- radio/src/translations/pl.h.txt | 2 +- radio/src/translations/pt.h.txt | 2 +- radio/src/translations/se.h.txt | 2 +- 12 files changed, 20 insertions(+), 18 deletions(-) diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index 21563a8d2..919e9c7c9 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -1575,7 +1575,8 @@ enum FailsafeModes { FAILSAFE_HOLD, FAILSAFE_CUSTOM, FAILSAFE_NOPULSES, - FAILSAFE_LAST = FAILSAFE_NOPULSES + FAILSAFE_RECEIVER, + FAILSAFE_LAST = FAILSAFE_RECEIVER }; #if defined(FRSKY) || !defined(PCBSTD) diff --git a/radio/src/protocols/pxx_arm.cpp b/radio/src/protocols/pxx_arm.cpp index 0f84fd6d5..b6db89f23 100644 --- a/radio/src/protocols/pxx_arm.cpp +++ b/radio/src/protocols/pxx_arm.cpp @@ -211,13 +211,14 @@ void setupPulsesPXX(unsigned int port) } else { flag1 = (g_model.moduleData[port].rfProtocol << 6) | pxxFlag[port]; - - if (failsafeCounter[port]-- == 0) { - failsafeCounter[port] = 1000; - flag1 |= PXX_SEND_FAILSAFE; - } - if (failsafeCounter[port] == 0 && g_model.moduleData[port].channelsCount > 0) { - flag1 |= PXX_SEND_FAILSAFE; + if (g_model.moduleData[port].failsafeMode != FAILSAFE_RECEIVER) { + if (failsafeCounter[port]-- == 0) { + failsafeCounter[port] = 1000; + flag1 |= PXX_SEND_FAILSAFE; + } + if (failsafeCounter[port] == 0 && g_model.moduleData[port].channelsCount > 0) { + flag1 |= PXX_SEND_FAILSAFE; + } } } diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index b32758c6f..8244dbdb8 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -421,7 +421,7 @@ #define TR_VTRAINERMODES "Učitel""Žák\0 " #define LEN_VFAILSAFE "\011" -#define TR_VFAILSAFE "Držet\0 ""Vlastní\0 ""Bez pulzů" +#define TR_VFAILSAFE "Držet\0 ""Vlastní\0 ""Bez pulzů""Receiver\0" #if defined(MAVLINK) #define LEN_MAVLINK_BAUDS "\006" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index aa4285ab3..6bba7b8bc 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -421,7 +421,7 @@ #define TR_VTRAINERMODES "Lehrer\0""Schüler\0" // "Master""Slave\0" #define LEN_VFAILSAFE "\011" -#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses" +#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses""Receiver\0" #if defined(MAVLINK) #define LEN_MAVLINK_BAUDS "\006" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index d88175e55..fbdd2f9be 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -421,7 +421,7 @@ #define TR_VTRAINERMODES "Master""Slave\0" #define LEN_VFAILSAFE "\011" -#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses" +#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses""Receiver\0" #if defined(MAVLINK) #define LEN_MAVLINK_BAUDS "\006" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index f8d27c626..a6895cf05 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -421,7 +421,7 @@ #define TR_VTRAINERMODES "Master""Esclav" #define LEN_VFAILSAFE "\011" -#define TR_VFAILSAFE "Guardar\0 ""Adaptar\0 ""Sin pulsos" +#define TR_VFAILSAFE "Guardar\0 ""Adaptar\0 ""Sin pulso""Receiver\0" #if defined(MAVLINK) #define LEN_MAVLINK_BAUDS "\006" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 1cd7e2e09..d730c4935 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -421,7 +421,7 @@ #define TR_VTRAINERMODES "Master""Slave\0" #define LEN_VFAILSAFE "\011" -#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses" +#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses""Receiver\0" #if defined(MAVLINK) #define LEN_MAVLINK_BAUDS "\006" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 37c09007f..4f01cb889 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -421,7 +421,7 @@ #define TR_VTRAINERMODES "Maître""Elève\0" #define LEN_VFAILSAFE "\011" -#define TR_VFAILSAFE "Maintien\0""Prédéfini""Pas d'imp" +#define TR_VFAILSAFE "Maintien\0""Prédéfini""Pas d'imp""Récepteur" #if defined(MAVLINK) #define LEN_MAVLINK_BAUDS "\006" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 5a227cf24..e6cec2d25 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -421,7 +421,7 @@ #define TR_VTRAINERMODES "Maestro""Allievo" #define LEN_VFAILSAFE "\012" -#define TR_VFAILSAFE "Mantieni\0 ""Personali\0""No impulsi" +#define TR_VFAILSAFE "Mantieni\0 ""Personali\0""No impulsi""Receiver\0 " #if defined(MAVLINK) #define LEN_MAVLINK_BAUDS "\006" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index ee2525b57..b00169847 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -421,7 +421,7 @@ #define TR_VTRAINERMODES "Trener""Uczeń\0" #define LEN_VFAILSAFE "\011" -#define TR_VFAILSAFE "Utrzymuj\0""Własne\0 ""0 sygnału" +#define TR_VFAILSAFE "Utrzymuj\0""Własne\0 ""0 sygnału""Receiver\0" #if defined(MAVLINK) #define LEN_MAVLINK_BAUDS "\006" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index ab380dbcd..928b1f681 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -421,7 +421,7 @@ #define TR_VTRAINERMODES "Master""Slave\0" #define LEN_VFAILSAFE "\011" -#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses" +#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses""Receiver\0" #if defined(MAVLINK) #define LEN_MAVLINK_BAUDS "\006" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 41313a7ae..38efc2bbb 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -421,7 +421,7 @@ #define TR_VTRAINERMODES "Lärare""Elev\0." #define LEN_VFAILSAFE "\011" -#define TR_VFAILSAFE "Lås Servo""Anpassat\0""Pulsfritt" +#define TR_VFAILSAFE "Lås Servo""Anpassat\0""Pulsfritt""Receiver\0" #if defined(MAVLINK) #define LEN_MAVLINK_BAUDS "\006"