From 27471fd788d41499dbd636985095802601ce2d57 Mon Sep 17 00:00:00 2001
From: jgromes <jgromes@users.noreply.github.com>
Date: Sat, 4 Jul 2020 21:19:16 +0200
Subject: [PATCH] [Morse] Fixed exclusion macros

---
 src/protocols/Morse/Morse.cpp | 14 ++++++++++----
 src/protocols/Morse/Morse.h   |  2 --
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/protocols/Morse/Morse.cpp b/src/protocols/Morse/Morse.cpp
index bd336229..80a44d46 100644
--- a/src/protocols/Morse/Morse.cpp
+++ b/src/protocols/Morse/Morse.cpp
@@ -3,7 +3,9 @@
 
 MorseClient::MorseClient(PhysicalLayer* phy) {
   _phy = phy;
+  #if !defined(RADIOLIB_EXCLUDE_AFSK)
   _audio = nullptr;
+  #endif
 }
 
 #if !defined(RADIOLIB_EXCLUDE_AFSK)
@@ -23,9 +25,11 @@ int16_t MorseClient::begin(float base, uint8_t speed) {
 
   // set module frequency deviation to 0 if using FSK
   int16_t state = ERR_NONE;
+  #if !defined(RADIOLIB_EXCLUDE_AFSK)
   if(_audio == nullptr) {
     state = _phy->setFrequencyDeviation(0);
   }
+  #endif
 
   return(state);
 }
@@ -298,19 +302,21 @@ size_t MorseClient::printFloat(double number, uint8_t digits)  {
 }
 
 int16_t MorseClient::transmitDirect(uint32_t freq, uint32_t freqHz) {
+  #if !defined(RADIOLIB_EXCLUDE_AFSK)
   if(_audio != nullptr) {
     return(_audio->tone(freqHz));
-  } else {
-    return(_phy->transmitDirect(freq));
   }
+  #endif
+  return(_phy->transmitDirect(freq));
 }
 
 int16_t MorseClient::standby() {
+  #if !defined(RADIOLIB_EXCLUDE_AFSK)
   if(_audio != nullptr) {
     return(_audio->noTone());
-  } else {
-    return(_phy->standby());
   }
+  #endif
+  return(_phy->standby());
 }
 
 #endif
diff --git a/src/protocols/Morse/Morse.h b/src/protocols/Morse/Morse.h
index c7bcce52..d94fad0d 100644
--- a/src/protocols/Morse/Morse.h
+++ b/src/protocols/Morse/Morse.h
@@ -157,8 +157,6 @@ class MorseClient {
     PhysicalLayer* _phy;
     #if !defined(RADIOLIB_EXCLUDE_AFSK)
     AFSKClient* _audio;
-    #else
-    void* _audio;
     #endif
 
     uint32_t _base = 0, _baseHz = 0;