forks/RadioLibSmol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[RTTY] Reworked driver exclusion

Browse source
This commit is contained in:
jgromes 2020-06-30 10:45:52 +02:00
parent e5437deae2
commit 80fa8ba99d
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/protocols/RTTY/RTTY.cpp
View file

@ -1,4 +1,5 @@
#include "RTTY.h" #include "RTTY.h"
#if !defined(RADIOLIB_EXCLUDE_RTTY)
ITA2String::ITA2String(char c) { ITA2String::ITA2String(char c) {
_len = 1; _len = 1;
@ -109,10 +110,12 @@ RTTYClient::RTTYClient(PhysicalLayer* phy) {
_audio = nullptr; _audio = nullptr;
} }
#if !defined(RADIOLIB_EXCLUDE_AFSK)
RTTYClient::RTTYClient(AFSKClient* audio) { RTTYClient::RTTYClient(AFSKClient* audio) {
_phy = audio->_phy; _phy = audio->_phy;
_audio = audio; _audio = audio;
} }
#endif
int16_t RTTYClient::begin(float base, uint32_t shift, uint16_t rate, uint8_t encoding, uint8_t stopBits) { int16_t RTTYClient::begin(float base, uint32_t shift, uint16_t rate, uint8_t encoding, uint8_t stopBits) {
// save configuration // save configuration
@ -531,3 +534,5 @@ int16_t RTTYClient::standby() {
return(_phy->standby()); return(_phy->standby());
} }
} }
#endif

8
src/protocols/RTTY/RTTY.h
View file

@ -1,4 +1,4 @@
#ifndef _RADIOLIB_RTTY_H #if !defined(_RADIOLIB_RTTY_H) && !defined(RADIOLIB_EXCLUDE_RTTY)
#define _RADIOLIB_RTTY_H #define _RADIOLIB_RTTY_H
#include "../../TypeDef.h" #include "../../TypeDef.h"
@ -91,12 +91,14 @@ class RTTYClient {
*/ */
RTTYClient(PhysicalLayer* phy); RTTYClient(PhysicalLayer* phy);
#if !defined(RADIOLIB_EXCLUDE_AFSK)
/*! /*!
\brief Constructor for AFSK mode. \brief Constructor for AFSK mode.
\param audio Pointer to the AFSK instance providing audio. \param audio Pointer to the AFSK instance providing audio.
*/ */
RTTYClient(AFSKClient* audio); RTTYClient(AFSKClient* audio);
#endif
// basic methods // basic methods
@ -155,7 +157,11 @@ class RTTYClient {
private: private:
#endif #endif
PhysicalLayer* _phy; PhysicalLayer* _phy;
#if !defined(RADIOLIB_EXCLUDE_AFSK)
AFSKClient* _audio; AFSKClient* _audio;
#else
void* _audio;
#endif
uint8_t _encoding; uint8_t _encoding;
uint32_t _base, _baseHz; uint32_t _base, _baseHz;