Issue #863 fixed (firmware part)

This commit is contained in:
bsongis
2014-03-25 19:56:10 +01:00
parent c5b0e79e99
commit 78bdff492d
12 changed files with 20 additions and 18 deletions
+2 -1
View File
@@ -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)
+8 -7
View File
@@ -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;
}
}
}
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"