From 71dbf371e7d57eca2878e2094a7d171f18315613 Mon Sep 17 00:00:00 2001
From: jgromes <jan.gromes@gmail.com>
Date: Mon, 27 Nov 2023 21:16:56 +0100
Subject: [PATCH] [FSK4] Reworked macro configuration system

---
 src/protocols/FSK4/FSK4.cpp | 10 +++++-----
 src/protocols/FSK4/FSK4.h   |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/protocols/FSK4/FSK4.cpp b/src/protocols/FSK4/FSK4.cpp
index bb24e5be..f589f459 100644
--- a/src/protocols/FSK4/FSK4.cpp
+++ b/src/protocols/FSK4/FSK4.cpp
@@ -1,15 +1,15 @@
 #include "FSK4.h"
 #include <math.h>
-#if !defined(RADIOLIB_EXCLUDE_FSK4)
+#if !RADIOLIB_EXCLUDE_FSK4
 
 FSK4Client::FSK4Client(PhysicalLayer* phy) {
   phyLayer = phy;
-  #if !defined(RADIOLIB_EXCLUDE_AFSK)
+  #if !RADIOLIB_EXCLUDE_AFSK
   audioClient = nullptr;
   #endif
 }
 
-#if !defined(RADIOLIB_EXCLUDE_AFSK)
+#if !RADIOLIB_EXCLUDE_AFSK
  FSK4Client::FSK4Client(AFSKClient* audio) {
    phyLayer = audio->phyLayer;
    audioClient = audio;
@@ -87,7 +87,7 @@ void FSK4Client::tone(uint8_t i) {
 }
 
 int16_t FSK4Client::transmitDirect(uint32_t freq, uint32_t freqHz) {
-  #if !defined(RADIOLIB_EXCLUDE_AFSK)
+  #if !RADIOLIB_EXCLUDE_AFSK
   if(audioClient != nullptr) {
     return(audioClient->tone(freqHz));
   }
@@ -99,7 +99,7 @@ int16_t FSK4Client::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/FSK4/FSK4.h b/src/protocols/FSK4/FSK4.h
index d466d642..a1e91e37 100644
--- a/src/protocols/FSK4/FSK4.h
+++ b/src/protocols/FSK4/FSK4.h
@@ -3,7 +3,7 @@
 
 #include "../../TypeDef.h"
 
-#if !defined(RADIOLIB_EXCLUDE_FSK4)
+#if !RADIOLIB_EXCLUDE_FSK4
 
 #include "../PhysicalLayer/PhysicalLayer.h"
 #include "../AFSK/AFSK.h"
@@ -20,7 +20,7 @@ class FSK4Client {
     */
     explicit FSK4Client(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.
@@ -74,11 +74,11 @@ class FSK4Client {
     */
     int16_t standby();
 
-#if !defined(RADIOLIB_GODMODE)
+#if !RADIOLIB_GODMODE
   private:
 #endif
     PhysicalLayer* phyLayer;
-    #if !defined(RADIOLIB_EXCLUDE_AFSK)
+    #if !RADIOLIB_EXCLUDE_AFSK
     AFSKClient* audioClient;
     #endif