diff --git a/src/protocols/Morse/Morse.cpp b/src/protocols/Morse/Morse.cpp index 27cb5eac..8ec0c469 100644 --- a/src/protocols/Morse/Morse.cpp +++ b/src/protocols/Morse/Morse.cpp @@ -2,17 +2,17 @@ #include -#if !defined(RADIOLIB_EXCLUDE_MORSE) +#if !RADIOLIB_EXCLUDE_MORSE MorseClient::MorseClient(PhysicalLayer* phy) { phyLayer = phy; lineFeed = "^"; - #if !defined(RADIOLIB_EXCLUDE_AFSK) + #if !RADIOLIB_EXCLUDE_AFSK audioClient = nullptr; #endif } -#if !defined(RADIOLIB_EXCLUDE_AFSK) +#if !RADIOLIB_EXCLUDE_AFSK MorseClient::MorseClient(AFSKClient* audio) { phyLayer = audio->phyLayer; lineFeed = "^"; @@ -59,7 +59,7 @@ char MorseClient::decode(uint8_t symbol, uint8_t len) { return(RADIOLIB_MORSE_UNSUPPORTED); } -#if !defined(RADIOLIB_EXCLUDE_AFSK) +#if !RADIOLIB_EXCLUDE_AFSK int MorseClient::read(uint8_t* symbol, uint8_t* len, float low, float high) { Module* mod = phyLayer->getMod(); @@ -167,7 +167,7 @@ size_t MorseClient::write(uint8_t b) { } int16_t MorseClient::transmitDirect(uint32_t freq, uint32_t freqHz) { - #if !defined(RADIOLIB_EXCLUDE_AFSK) + #if !RADIOLIB_EXCLUDE_AFSK if(audioClient != nullptr) { return(audioClient->tone(freqHz)); } @@ -176,7 +176,7 @@ int16_t MorseClient::transmitDirect(uint32_t freq, uint32_t freqHz) { } int16_t MorseClient::standby() { - #if !defined(RADIOLIB_EXCLUDE_AFSK) + #if !RADIOLIB_EXCLUDE_AFSK if(audioClient != nullptr) { return(audioClient->noTone(true)); } diff --git a/src/protocols/Morse/Morse.h b/src/protocols/Morse/Morse.h index df44bc1f..3c995c42 100644 --- a/src/protocols/Morse/Morse.h +++ b/src/protocols/Morse/Morse.h @@ -1,4 +1,4 @@ -#if !defined(_RADIOLIB_RADIOLIB_MORSE_H) && !defined(RADIOLIB_EXCLUDE_MORSE) +#if !defined(_RADIOLIB_RADIOLIB_MORSE_H) && !RADIOLIB_EXCLUDE_MORSE #define _RADIOLIB_RADIOLIB_MORSE_H #include "../../TypeDef.h" @@ -98,7 +98,7 @@ class MorseClient: public RadioLibPrint { */ explicit MorseClient(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. @@ -139,7 +139,7 @@ class MorseClient: public RadioLibPrint { \returns 0 if not enough symbols were decoded, 1 if inter-character space was detected, 2 if inter-word space was detected. */ - #if !defined(RADIOLIB_EXCLUDE_AFSK) + #if !RADIOLIB_EXCLUDE_AFSK int read(uint8_t* symbol, uint8_t* len, float low = 0.75f, float high = 1.25f); #endif @@ -150,11 +150,11 @@ class MorseClient: 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