SWR hidden on Taranis+
This commit is contained in:
@@ -1433,6 +1433,12 @@ bool isTelemetrySourceAvailable(int source)
|
|||||||
return false;
|
return false;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(PCBTARANIS) && defined(REVPLUS)
|
||||||
|
// on Taranis+ we also hide the SWR
|
||||||
|
if (source == TELEM_SWR)
|
||||||
|
return false;
|
||||||
|
#endif
|
||||||
|
|
||||||
if (source >= TELEM_A1 && source <= TELEM_A4) {
|
if (source >= TELEM_A1 && source <= TELEM_A4) {
|
||||||
return g_model.frsky.channels[source-TELEM_A1].ratio != 0;
|
return g_model.frsky.channels[source-TELEM_A1].ratio != 0;
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-2
@@ -115,7 +115,9 @@ const pm_char * openLogs()
|
|||||||
f_puts("Time,", &g_oLogFile);
|
f_puts("Time,", &g_oLogFile);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CPUARM) && defined(FRSKY)
|
#if defined(PCBTARANIS) && defined(REVPLUS)
|
||||||
|
f_puts("RSSI,A1,A2,A3,A4,", &g_oLogFile);
|
||||||
|
#elif defined(CPUARM) && defined(FRSKY)
|
||||||
f_puts("SWR,RSSI,A1,A2,A3,A4,", &g_oLogFile);
|
f_puts("SWR,RSSI,A1,A2,A3,A4,", &g_oLogFile);
|
||||||
#elif defined(FRSKY)
|
#elif defined(FRSKY)
|
||||||
f_puts("Buffer,RX,TX,A1,A2,", &g_oLogFile);
|
f_puts("Buffer,RX,TX,A1,A2,", &g_oLogFile);
|
||||||
@@ -205,7 +207,9 @@ void writeLogs()
|
|||||||
#endif // #if defined(RTCLOCK)
|
#endif // #if defined(RTCLOCK)
|
||||||
|
|
||||||
#if defined(FRSKY)
|
#if defined(FRSKY)
|
||||||
#if defined(CPUARM)
|
#if defined(PCBTARANIS) && defined(REVPLUS)
|
||||||
|
f_printf(&g_oLogFile, "%d,", RAW_FRSKY_MINMAX(frskyData.rssi[0]));
|
||||||
|
#elif defined(CPUARM)
|
||||||
f_printf(&g_oLogFile, "%d,%d,", RAW_FRSKY_MINMAX(frskyData.swr), RAW_FRSKY_MINMAX(frskyData.rssi[0]));
|
f_printf(&g_oLogFile, "%d,%d,", RAW_FRSKY_MINMAX(frskyData.swr), RAW_FRSKY_MINMAX(frskyData.rssi[0]));
|
||||||
#else
|
#else
|
||||||
f_printf(&g_oLogFile, "%d,%d,%d,", frskyStreaming, RAW_FRSKY_MINMAX(frskyData.rssi[0]), RAW_FRSKY_MINMAX(frskyData.rssi[1]));
|
f_printf(&g_oLogFile, "%d,%d,%d,", frskyStreaming, RAW_FRSKY_MINMAX(frskyData.rssi[0]), RAW_FRSKY_MINMAX(frskyData.rssi[1]));
|
||||||
|
|||||||
@@ -347,7 +347,7 @@ void telemetryWakeup()
|
|||||||
alarmsCheckTime = get_tmr10ms() + 100; /* next check in 1 second */
|
alarmsCheckTime = get_tmr10ms() + 100; /* next check in 1 second */
|
||||||
|
|
||||||
if (alarmsCheckStep == ALARM_SWR_STEP) {
|
if (alarmsCheckStep == ALARM_SWR_STEP) {
|
||||||
#if defined(PCBTARANIS)
|
#if defined(PCBTARANIS) && !defined(REVPLUS)
|
||||||
if (IS_FRSKY_SPORT_PROTOCOL() && frskyData.swr.value > 0x33) {
|
if (IS_FRSKY_SPORT_PROTOCOL() && frskyData.swr.value > 0x33) {
|
||||||
AUDIO_SWR_RED();
|
AUDIO_SWR_RED();
|
||||||
POPUP_WARNING(STR_ANTENNAPROBLEM);
|
POPUP_WARNING(STR_ANTENNAPROBLEM);
|
||||||
|
|||||||
Reference in New Issue
Block a user