From 80fa8ba99d7a26c1679f03a541a8e02ceda0ad63 Mon Sep 17 00:00:00 2001 From: jgromes Date: Tue, 30 Jun 2020 10:45:52 +0200 Subject: [PATCH] [RTTY] Reworked driver exclusion --- src/protocols/RTTY/RTTY.cpp | 5 +++++ src/protocols/RTTY/RTTY.h | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/protocols/RTTY/RTTY.cpp b/src/protocols/RTTY/RTTY.cpp index 1a96d5e2..7b023f8e 100644 --- a/src/protocols/RTTY/RTTY.cpp +++ b/src/protocols/RTTY/RTTY.cpp @@ -1,4 +1,5 @@ #include "RTTY.h" +#if !defined(RADIOLIB_EXCLUDE_RTTY) ITA2String::ITA2String(char c) { _len = 1; @@ -109,10 +110,12 @@ RTTYClient::RTTYClient(PhysicalLayer* phy) { _audio = nullptr; } +#if !defined(RADIOLIB_EXCLUDE_AFSK) RTTYClient::RTTYClient(AFSKClient* audio) { _phy = audio->_phy; _audio = audio; } +#endif int16_t RTTYClient::begin(float base, uint32_t shift, uint16_t rate, uint8_t encoding, uint8_t stopBits) { // save configuration @@ -531,3 +534,5 @@ int16_t RTTYClient::standby() { return(_phy->standby()); } } + +#endif diff --git a/src/protocols/RTTY/RTTY.h b/src/protocols/RTTY/RTTY.h index 1e6120c1..7dc54076 100644 --- a/src/protocols/RTTY/RTTY.h +++ b/src/protocols/RTTY/RTTY.h @@ -1,4 +1,4 @@ -#ifndef _RADIOLIB_RTTY_H +#if !defined(_RADIOLIB_RTTY_H) && !defined(RADIOLIB_EXCLUDE_RTTY) #define _RADIOLIB_RTTY_H #include "../../TypeDef.h" @@ -91,12 +91,14 @@ class RTTYClient { */ RTTYClient(PhysicalLayer* phy); + #if !defined(RADIOLIB_EXCLUDE_AFSK) /*! \brief Constructor for AFSK mode. \param audio Pointer to the AFSK instance providing audio. */ RTTYClient(AFSKClient* audio); + #endif // basic methods @@ -155,7 +157,11 @@ class RTTYClient { private: #endif PhysicalLayer* _phy; + #if !defined(RADIOLIB_EXCLUDE_AFSK) AFSKClient* _audio; + #else + void* _audio; + #endif uint8_t _encoding; uint32_t _base, _baseHz;