diff --git a/src/telemetry/frsky.cpp b/src/telemetry/frsky.cpp index f2e7f7905..892e75056 100644 --- a/src/telemetry/frsky.cpp +++ b/src/telemetry/frsky.cpp @@ -191,6 +191,10 @@ void parseTelemHubByte(uint8_t byte) break; case offsetof(FrskySerialData, current): + if(((int16_t)frskyData.hub.current + g_model.frsky.fasOffset)>0) + frskyData.hub.current += g_model.frsky.fasOffset; + else + frskyData.hub.current = 0; if (frskyData.hub.current > frskyData.hub.maxCurrent) frskyData.hub.maxCurrent = frskyData.hub.current; break; diff --git a/src/translations.cpp b/src/translations.cpp index 98d62ab7b..6749c8d2f 100644 --- a/src/translations.cpp +++ b/src/translations.cpp @@ -266,6 +266,7 @@ const pm_char STR_EEPROMFORMATTING[] PROGMEM = TR_EEPROMFORMATTING; const pm_char STR_EEPROMOVERFLOW[] PROGMEM = TR_EEPROMOVERFLOW; const pm_char STR_TRIMS2OFFSETS[] PROGMEM = TR_TRIMS2OFFSETS; const pm_char STR_MENURADIOSETUP[] PROGMEM = TR_MENURADIOSETUP; +const pm_char STR_FAS_OFFSET[] PROGMEM = TR_FAS_OFFSET; #if defined(CPUM2560) || defined(CPUARM) const pm_char STR_MENUDATEANDTIME[] PROGMEM = TR_MENUDATEANDTIME; diff --git a/src/translations.h b/src/translations.h index 4a3e0600a..7f93d1e4d 100644 --- a/src/translations.h +++ b/src/translations.h @@ -447,6 +447,7 @@ extern const pm_char STR_MENUGLOBALVARS[]; extern const pm_char STR_INVERT_THR[]; extern const pm_char STR_AND_SWITCH[]; extern const pm_char STR_CF[]; +extern const pm_char STR_FAS_OFFSET[]; #if defined(DSM2) || defined(PXX) extern const pm_char STR_RXNUM[]; diff --git a/src/translations/cz.h b/src/translations/cz.h index dca96c257..66d33932d 100644 --- a/src/translations/cz.h +++ b/src/translations/cz.h @@ -660,6 +660,7 @@ #define TR_LOWALARM INDENT "N\204zk\212 Alarm" #define TR_CRITICALALARM INDENT "Kritick\212 Alarm" #define TR_PERSISTENT_MAH INDENT "Store mAh" +#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/src/translations/cz.h.txt b/src/translations/cz.h.txt index 145783ff3..724434f84 100644 --- a/src/translations/cz.h.txt +++ b/src/translations/cz.h.txt @@ -660,6 +660,7 @@ #define TR_LOWALARM INDENT "Nízký Alarm" #define TR_CRITICALALARM INDENT "Kritický Alarm" #define TR_PERSISTENT_MAH INDENT "Store mAh" +#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/src/translations/de.h b/src/translations/de.h index a5ff6746a..065f2e57a 100644 --- a/src/translations/de.h +++ b/src/translations/de.h @@ -663,6 +663,7 @@ #define TR_LOWALARM INDENT "Low Alarm" #define TR_CRITICALALARM INDENT "Kritisch Alarm" #define TR_PERSISTENT_MAH INDENT "Store mAh" +#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/src/translations/de.h.txt b/src/translations/de.h.txt index 3410e2f15..598489fde 100644 --- a/src/translations/de.h.txt +++ b/src/translations/de.h.txt @@ -663,6 +663,7 @@ #define TR_LOWALARM INDENT "Low Alarm" #define TR_CRITICALALARM INDENT "Kritisch Alarm" #define TR_PERSISTENT_MAH INDENT "Store mAh" +#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/src/translations/en.h b/src/translations/en.h index 62876daf9..e87b5f7c6 100644 --- a/src/translations/en.h +++ b/src/translations/en.h @@ -667,6 +667,7 @@ #define TR_LOWALARM INDENT "Low Alarm" #define TR_CRITICALALARM INDENT "Critical Alarm" #define TR_PERSISTENT_MAH INDENT "Store mAh" +#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/src/translations/fr.h b/src/translations/fr.h index c2023571f..7de9ee984 100644 --- a/src/translations/fr.h +++ b/src/translations/fr.h @@ -660,6 +660,7 @@ #define TR_LOWALARM INDENT "Alarme basse" #define TR_CRITICALALARM INDENT "Alarme critique" #define TR_PERSISTENT_MAH INDENT "Store mAh" +#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/src/translations/fr.h.txt b/src/translations/fr.h.txt index 34604f7a6..81873286c 100644 --- a/src/translations/fr.h.txt +++ b/src/translations/fr.h.txt @@ -660,6 +660,7 @@ #define TR_LOWALARM INDENT "Alarme basse" #define TR_CRITICALALARM INDENT "Alarme critique" #define TR_PERSISTENT_MAH INDENT "Store mAh" +#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/src/translations/it.h b/src/translations/it.h index 2e4945d49..70718da14 100644 --- a/src/translations/it.h +++ b/src/translations/it.h @@ -660,6 +660,7 @@ #define TR_LOWALARM INDENT "Allarme Basso" #define TR_CRITICALALARM INDENT "Allarme Critico" #define TR_PERSISTENT_MAH INDENT "Store mAh" +#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/src/translations/it.h.txt b/src/translations/it.h.txt index 3a2c62fca..8c1229ac7 100644 --- a/src/translations/it.h.txt +++ b/src/translations/it.h.txt @@ -660,6 +660,7 @@ #define TR_LOWALARM INDENT "Allarme Basso" #define TR_CRITICALALARM INDENT "Allarme Critico" #define TR_PERSISTENT_MAH INDENT "Store mAh" +#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/src/translations/pl.h b/src/translations/pl.h index ef4afe289..c441faada 100644 --- a/src/translations/pl.h +++ b/src/translations/pl.h @@ -661,6 +661,7 @@ #define TR_LOWALARM INDENT "Alarm niski" #define TR_CRITICALALARM INDENT "Alarm krytyczny" #define TR_PERSISTENT_MAH INDENT "Store mAh" +#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/src/translations/pl.h.txt b/src/translations/pl.h.txt index 5525754ed..8a2caf86c 100644 --- a/src/translations/pl.h.txt +++ b/src/translations/pl.h.txt @@ -661,6 +661,7 @@ #define TR_LOWALARM INDENT "Alarm niski" #define TR_CRITICALALARM INDENT "Alarm krytyczny" #define TR_PERSISTENT_MAH INDENT "Store mAh" +#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/src/translations/pt.h b/src/translations/pt.h index 691c840af..022579f74 100644 --- a/src/translations/pt.h +++ b/src/translations/pt.h @@ -660,6 +660,7 @@ #define TR_LOWALARM INDENT "Low Alarm" #define TR_CRITICALALARM INDENT "Critical Alarm" #define TR_PERSISTENT_MAH INDENT "Store mAh" +#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/src/translations/pt.h.txt b/src/translations/pt.h.txt index 691c840af..022579f74 100644 --- a/src/translations/pt.h.txt +++ b/src/translations/pt.h.txt @@ -660,6 +660,7 @@ #define TR_LOWALARM INDENT "Low Alarm" #define TR_CRITICALALARM INDENT "Critical Alarm" #define TR_PERSISTENT_MAH INDENT "Store mAh" +#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/src/translations/se.h b/src/translations/se.h index de22c6599..029dfba9d 100644 --- a/src/translations/se.h +++ b/src/translations/se.h @@ -663,6 +663,7 @@ #define TR_LOWALARM INDENT "L\200g-alarm" #define TR_CRITICALALARM INDENT "Kritiskt alarm" #define TR_PERSISTENT_MAH INDENT "Store mAh" +#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/src/translations/se.h.txt b/src/translations/se.h.txt index 68de29549..1aaf93273 100644 --- a/src/translations/se.h.txt +++ b/src/translations/se.h.txt @@ -663,6 +663,7 @@ #define TR_LOWALARM INDENT "Låg-alarm" #define TR_CRITICALALARM INDENT "Kritiskt alarm" #define TR_PERSISTENT_MAH INDENT "Store mAh" +#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI"