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

---
 src/protocols/Hellschreiber/Hellschreiber.cpp | 15 +++++++++++----
 src/protocols/Hellschreiber/Hellschreiber.h   |  9 ++++++---
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/protocols/Hellschreiber/Hellschreiber.cpp b/src/protocols/Hellschreiber/Hellschreiber.cpp
index d2355480..3a7bb6fc 100644
--- a/src/protocols/Hellschreiber/Hellschreiber.cpp
+++ b/src/protocols/Hellschreiber/Hellschreiber.cpp
@@ -3,7 +3,10 @@
 
 HellClient::HellClient(PhysicalLayer* phy) {
   _phy = phy;
+
+  #if !defined(RADIOLIB_EXCLUDE_AFSK)
   _audio = nullptr;
+  #endif
 }
 
 #if !defined(RADIOLIB_EXCLUDE_AFSK)
@@ -23,9 +26,11 @@ int16_t HellClient::begin(float base, float rate) {
 
   // 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);
 }
@@ -285,19 +290,21 @@ size_t HellClient::printFloat(double number, uint8_t digits)  {
 }
 
 int16_t HellClient::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 HellClient::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/Hellschreiber/Hellschreiber.h b/src/protocols/Hellschreiber/Hellschreiber.h
index 1f8087e1..bfe20473 100644
--- a/src/protocols/Hellschreiber/Hellschreiber.h
+++ b/src/protocols/Hellschreiber/Hellschreiber.h
@@ -1,7 +1,10 @@
-#if !defined(_RADIOLIB_HELLSCHREIBER_H) && !defined(RADIOLIB_EXCLUDE_HELLSCHREIBER)
+#if !defined(_RADIOLIB_HELLSCHREIBER_H)
 #define _RADIOLIB_HELLSCHREIBER_H
 
 #include "../../TypeDef.h"
+
+#if !defined(RADIOLIB_EXCLUDE_HELLSCHREIBER)
+
 #include "../PhysicalLayer/PhysicalLayer.h"
 #include "../AFSK/AFSK.h"
 
@@ -152,8 +155,6 @@ class HellClient {
     PhysicalLayer* _phy;
     #if !defined(RADIOLIB_EXCLUDE_AFSK)
     AFSKClient* _audio;
-    #else
-    void* _audio;
     #endif
 
     uint32_t _base = 0, _baseHz = 0;
@@ -167,3 +168,5 @@ class HellClient {
 };
 
 #endif
+
+#endif