diff --git a/src/protocols/RTTY/RTTY.cpp b/src/protocols/RTTY/RTTY.cpp index eff2d7ad..c823fb28 100644 --- a/src/protocols/RTTY/RTTY.cpp +++ b/src/protocols/RTTY/RTTY.cpp @@ -2,17 +2,17 @@ #include -#if !defined(RADIOLIB_EXCLUDE_RTTY) +#if !RADIOLIB_EXCLUDE_RTTY RTTYClient::RTTYClient(PhysicalLayer* phy) { phyLayer = phy; lineFeed = "\r\n"; - #if !defined(RADIOLIB_EXCLUDE_AFSK) + #if !RADIOLIB_EXCLUDE_AFSK audioClient = nullptr; #endif } -#if !defined(RADIOLIB_EXCLUDE_AFSK) +#if !RADIOLIB_EXCLUDE_AFSK RTTYClient::RTTYClient(AFSKClient* audio) { phyLayer = audio->phyLayer; lineFeed = "\r\n"; @@ -104,7 +104,7 @@ void RTTYClient::space() { } int16_t RTTYClient::transmitDirect(uint32_t freq, uint32_t freqHz) { - #if !defined(RADIOLIB_EXCLUDE_AFSK) + #if !RADIOLIB_EXCLUDE_AFSK if(audioClient != nullptr) { return(audioClient->tone(freqHz)); } @@ -116,7 +116,7 @@ int16_t RTTYClient::standby() { // ensure everything is stopped in interrupt timing mode Module* mod = phyLayer->getMod(); mod->waitForMicroseconds(0, 0); - #if !defined(RADIOLIB_EXCLUDE_AFSK) + #if !RADIOLIB_EXCLUDE_AFSK if(audioClient != nullptr) { return(audioClient->noTone()); } diff --git a/src/protocols/RTTY/RTTY.h b/src/protocols/RTTY/RTTY.h index 4ebbc7cc..4da4ca63 100644 --- a/src/protocols/RTTY/RTTY.h +++ b/src/protocols/RTTY/RTTY.h @@ -3,7 +3,7 @@ #include "../../TypeDef.h" -#if !defined(RADIOLIB_EXCLUDE_RTTY) +#if !RADIOLIB_EXCLUDE_RTTY #include "../PhysicalLayer/PhysicalLayer.h" #include "../AFSK/AFSK.h" @@ -22,7 +22,7 @@ class RTTYClient: public RadioLibPrint { */ explicit RTTYClient(PhysicalLayer* phy); - #if !defined(RADIOLIB_EXCLUDE_AFSK) + #if !RADIOLIB_EXCLUDE_AFSK /*! \brief Constructor for AFSK mode. \param audio Pointer to the AFSK instance providing audio. @@ -61,11 +61,11 @@ class RTTYClient: public RadioLibPrint { */ size_t write(uint8_t b); -#if !defined(RADIOLIB_GODMODE) +#if !RADIOLIB_GODMODE private: #endif PhysicalLayer* phyLayer; - #if !defined(RADIOLIB_EXCLUDE_AFSK) + #if !RADIOLIB_EXCLUDE_AFSK AFSKClient* audioClient; #endif