From f69fe363c8f5b9bab648b33bceba2223dce9f48a Mon Sep 17 00:00:00 2001 From: J Blackman Date: Mon, 13 Mar 2023 20:21:03 +1100 Subject: [PATCH] Remove SPEK1024 as the default RX (set to NONE) (#12500) --- src/main/cli/settings.c | 3 ++- src/main/rx/ghst.c | 4 +++- src/main/rx/rx.h | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/cli/settings.c b/src/main/cli/settings.c index 25d744ee73..6def298b76 100644 --- a/src/main/cli/settings.c +++ b/src/main/cli/settings.c @@ -232,7 +232,7 @@ static const char * const lookupTableBlackboxSampleRate[] = { #ifdef USE_SERIALRX static const char * const lookupTableSerialRX[] = { - "SPEK1024", + "NONE", "SPEK2048", "SBUS", "SUMD", @@ -247,6 +247,7 @@ static const char * const lookupTableSerialRX[] = { "FPORT", "SRXL2", "GHST", + "SPEK1024", }; #endif diff --git a/src/main/rx/ghst.c b/src/main/rx/ghst.c index c5051da661..ad91fd0bd9 100644 --- a/src/main/rx/ghst.c +++ b/src/main/rx/ghst.c @@ -124,7 +124,9 @@ void ghstRxSendTelemetryData(void) { // if there is telemetry data to write if (telemetryBufLen > 0) { - serialWriteBuf(serialPort, telemetryBuf, telemetryBufLen); + if (serialPort != NULL) { + serialWriteBuf(serialPort, telemetryBuf, telemetryBufLen); + } telemetryBufLen = 0; // reset telemetry buffer } } diff --git a/src/main/rx/rx.h b/src/main/rx/rx.h index 617dfddc00..65002888f6 100644 --- a/src/main/rx/rx.h +++ b/src/main/rx/rx.h @@ -54,7 +54,7 @@ typedef enum { } rxFrameState_e; typedef enum { - SERIALRX_SPEKTRUM1024 = 0, + SERIALRX_NONE = 0, SERIALRX_SPEKTRUM2048 = 1, SERIALRX_SBUS = 2, SERIALRX_SUMD = 3, @@ -68,7 +68,8 @@ typedef enum { SERIALRX_TARGET_CUSTOM = 11, SERIALRX_FPORT = 12, SERIALRX_SRXL2 = 13, - SERIALRX_GHST = 14 + SERIALRX_GHST = 14, + SERIALRX_SPEKTRUM1024 = 15 } SerialRXType; #define MAX_SUPPORTED_RC_PPM_CHANNEL_COUNT 12