From d032015e318a3b54ea14de41a151f7b2f45b81d2 Mon Sep 17 00:00:00 2001 From: jgromes Date: Tue, 30 Jun 2020 10:45:28 +0200 Subject: [PATCH] [Hell] Reworked driver exclusion --- src/protocols/Hellschreiber/Hellschreiber.cpp | 5 +++++ src/protocols/Hellschreiber/Hellschreiber.h | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/protocols/Hellschreiber/Hellschreiber.cpp b/src/protocols/Hellschreiber/Hellschreiber.cpp index 3f769add..5c6483b3 100644 --- a/src/protocols/Hellschreiber/Hellschreiber.cpp +++ b/src/protocols/Hellschreiber/Hellschreiber.cpp @@ -1,14 +1,17 @@ #include "Hellschreiber.h" +#if !defined(RADIOLIB_EXCLUDE_HELLSCHREIBER) HellClient::HellClient(PhysicalLayer* phy) { _phy = phy; _audio = nullptr; } +#if !defined(RADIOLIB_EXCLUDE_AFSK) HellClient::HellClient(AFSKClient* audio) { _phy = audio->_phy; _audio = audio; } +#endif int16_t HellClient::begin(float base, float rate) { // calculate 24-bit frequency @@ -295,3 +298,5 @@ int16_t HellClient::standby() { return(_phy->standby()); } } + +#endif diff --git a/src/protocols/Hellschreiber/Hellschreiber.h b/src/protocols/Hellschreiber/Hellschreiber.h index 8756df5f..a70e74e7 100644 --- a/src/protocols/Hellschreiber/Hellschreiber.h +++ b/src/protocols/Hellschreiber/Hellschreiber.h @@ -1,4 +1,4 @@ -#ifndef _RADIOLIB_HELLSCHREIBER_H +#if !defined(_RADIOLIB_HELLSCHREIBER_H) && !defined(RADIOLIB_EXCLUDE_HELLSCHREIBER) #define _RADIOLIB_HELLSCHREIBER_H #include "../../TypeDef.h" @@ -92,12 +92,14 @@ class HellClient { */ HellClient(PhysicalLayer* phy); + #if !defined(RADIOLIB_EXCLUDE_AFSK) /*! \brief Constructor for AFSK mode. \param audio Pointer to the AFSK instance providing audio. */ HellClient(AFSKClient* audio); + #endif // basic methods @@ -148,7 +150,11 @@ class HellClient { private: #endif PhysicalLayer* _phy; + #if !defined(RADIOLIB_EXCLUDE_AFSK) AFSKClient* _audio; + #else + void* _audio; + #endif uint32_t _base, _baseHz; uint32_t _pixelDuration;