From 6475507274f2d1b1cddec6759a9cfe69409654b3 Mon Sep 17 00:00:00 2001 From: jgromes Date: Wed, 27 Oct 2021 19:15:36 +0200 Subject: [PATCH] [SX127x] Fixed missing OOK shaping configuration in some derived classes (#393) --- src/modules/SX127x/SX1276.cpp | 9 +++++++-- src/modules/SX127x/SX1277.cpp | 9 +++++++-- src/modules/SX127x/SX1279.cpp | 9 +++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/modules/SX127x/SX1276.cpp b/src/modules/SX127x/SX1276.cpp index a52fa27a..eb3a2295 100644 --- a/src/modules/SX127x/SX1276.cpp +++ b/src/modules/SX127x/SX1276.cpp @@ -48,8 +48,13 @@ int16_t SX1276::beginFSK(float freq, float br, float freqDev, float rxBw, int8_t state = setOutputPower(power); RADIOLIB_ASSERT(state); - state = setDataShaping(RADIOLIB_SHAPING_NONE); - RADIOLIB_ASSERT(state); + if(enableOOK) { + state = setDataShapingOOK(RADIOLIB_SHAPING_NONE); + RADIOLIB_ASSERT(state); + } else { + state = setDataShaping(RADIOLIB_SHAPING_NONE); + RADIOLIB_ASSERT(state); + } return(state); } diff --git a/src/modules/SX127x/SX1277.cpp b/src/modules/SX127x/SX1277.cpp index 6b4a1a66..b2f7e86b 100644 --- a/src/modules/SX127x/SX1277.cpp +++ b/src/modules/SX127x/SX1277.cpp @@ -48,8 +48,13 @@ int16_t SX1277::beginFSK(float freq, float br, float freqDev, float rxBw, int8_t state = setOutputPower(power); RADIOLIB_ASSERT(state); - state = setDataShaping(RADIOLIB_SHAPING_NONE); - RADIOLIB_ASSERT(state); + if(enableOOK) { + state = setDataShapingOOK(RADIOLIB_SHAPING_NONE); + RADIOLIB_ASSERT(state); + } else { + state = setDataShaping(RADIOLIB_SHAPING_NONE); + RADIOLIB_ASSERT(state); + } return(state); } diff --git a/src/modules/SX127x/SX1279.cpp b/src/modules/SX127x/SX1279.cpp index dff6e856..8313a489 100644 --- a/src/modules/SX127x/SX1279.cpp +++ b/src/modules/SX127x/SX1279.cpp @@ -48,8 +48,13 @@ int16_t SX1279::beginFSK(float freq, float br, float freqDev, float rxBw, int8_t state = setOutputPower(power); RADIOLIB_ASSERT(state); - state = setDataShaping(RADIOLIB_SHAPING_NONE); - RADIOLIB_ASSERT(state); + if(enableOOK) { + state = setDataShapingOOK(RADIOLIB_SHAPING_NONE); + RADIOLIB_ASSERT(state); + } else { + state = setDataShaping(RADIOLIB_SHAPING_NONE); + RADIOLIB_ASSERT(state); + } return(state); }