From 7b6fd24c8ec2fc60aea31094d1a5f9fd94ce8d39 Mon Sep 17 00:00:00 2001 From: Mestery Date: Sat, 8 Apr 2023 19:56:41 +0000 Subject: [PATCH] fix non arduino build --- src/protocols/AX25/AX25.cpp | 2 ++ src/protocols/AX25/AX25.h | 2 ++ src/protocols/Hellschreiber/Hellschreiber.cpp | 4 +++ src/protocols/Hellschreiber/Hellschreiber.h | 4 +++ src/protocols/Morse/Morse.cpp | 4 +++ src/protocols/Morse/Morse.h | 4 +++ src/protocols/Pager/Pager.cpp | 4 +++ src/protocols/Pager/Pager.h | 4 +++ src/protocols/PhysicalLayer/PhysicalLayer.cpp | 8 ++++++ src/protocols/PhysicalLayer/PhysicalLayer.h | 8 ++++++ src/protocols/RTTY/RTTY.cpp | 26 +++++++++++-------- src/protocols/RTTY/RTTY.h | 8 ++++-- 12 files changed, 65 insertions(+), 13 deletions(-) diff --git a/src/protocols/AX25/AX25.cpp b/src/protocols/AX25/AX25.cpp index 8bc8de4b..5b657c41 100644 --- a/src/protocols/AX25/AX25.cpp +++ b/src/protocols/AX25/AX25.cpp @@ -194,9 +194,11 @@ int16_t AX25Client::begin(const char* srcCallsign, uint8_t srcSSID, uint8_t prea return(_phy->startDirect()); } +#if defined(RADIOLIB_BUILD_ARDUINO) int16_t AX25Client::transmit(String& str, const char* destCallsign, uint8_t destSSID) { return(transmit(str.c_str(), destCallsign, destSSID)); } +#endif int16_t AX25Client::transmit(const char* str, const char* destCallsign, uint8_t destSSID) { // create control field diff --git a/src/protocols/AX25/AX25.h b/src/protocols/AX25/AX25.h index dcf03334..608f09a7 100644 --- a/src/protocols/AX25/AX25.h +++ b/src/protocols/AX25/AX25.h @@ -322,6 +322,7 @@ class AX25Client { */ int16_t begin(const char* srcCallsign, uint8_t srcSSID = 0x00, uint8_t preambleLen = 8); + #if defined(RADIOLIB_BUILD_ARDUINO) /*! \brief Transmit unnumbered information (UI) frame. @@ -334,6 +335,7 @@ class AX25Client { \returns \ref status_codes */ int16_t transmit(String& str, const char* destCallsign, uint8_t destSSID = 0x00); + #endif /*! \brief Transmit unnumbered information (UI) frame. diff --git a/src/protocols/Hellschreiber/Hellschreiber.cpp b/src/protocols/Hellschreiber/Hellschreiber.cpp index 78eb3bdb..2607142b 100644 --- a/src/protocols/Hellschreiber/Hellschreiber.cpp +++ b/src/protocols/Hellschreiber/Hellschreiber.cpp @@ -94,6 +94,7 @@ size_t HellClient::write(uint8_t b) { return(printGlyph(buff)); } +#if defined(RADIOLIB_BUILD_ARDUINO) size_t HellClient::print(__FlashStringHelper* fstr) { PGM_P p = reinterpret_cast(fstr); size_t n = 0; @@ -110,6 +111,7 @@ size_t HellClient::print(__FlashStringHelper* fstr) { size_t HellClient::print(const String& str) { return(HellClient::write((uint8_t*)str.c_str(), str.length())); } +#endif size_t HellClient::print(const char* str) { return(HellClient::write((uint8_t*)str, strlen(str))); @@ -163,6 +165,7 @@ size_t HellClient::println(void) { return(HellClient::print(' ')); } +#if defined(RADIOLIB_BUILD_ARDUINO) size_t HellClient::println(__FlashStringHelper* fstr) { size_t n = HellClient::print(fstr); n += HellClient::println(); @@ -174,6 +177,7 @@ size_t HellClient::println(const String& str) { n += HellClient::println(); return(n); } +#endif size_t HellClient::println(const char* str) { size_t n = HellClient::print(str); diff --git a/src/protocols/Hellschreiber/Hellschreiber.h b/src/protocols/Hellschreiber/Hellschreiber.h index 59e11409..1609168a 100644 --- a/src/protocols/Hellschreiber/Hellschreiber.h +++ b/src/protocols/Hellschreiber/Hellschreiber.h @@ -135,8 +135,10 @@ class HellClient { size_t write(uint8_t* buff, size_t len); size_t write(uint8_t b); + #if defined(RADIOLIB_BUILD_ARDUINO) size_t print(__FlashStringHelper*); size_t print(const String &); + #endif size_t print(const char[]); size_t print(char); size_t print(unsigned char, int = DEC); @@ -147,8 +149,10 @@ class HellClient { size_t print(double, int = 2); size_t println(void); + #if defined(RADIOLIB_BUILD_ARDUINO) size_t println(__FlashStringHelper*); size_t println(const String &); + #endif size_t println(const char[]); size_t println(char); size_t println(unsigned char, int = DEC); diff --git a/src/protocols/Morse/Morse.cpp b/src/protocols/Morse/Morse.cpp index 84972590..3fbe3dd4 100644 --- a/src/protocols/Morse/Morse.cpp +++ b/src/protocols/Morse/Morse.cpp @@ -179,6 +179,7 @@ size_t MorseClient::write(uint8_t b) { return(1); } +#if defined(RADIOLIB_BUILD_ARDUINO) size_t MorseClient::print(__FlashStringHelper* fstr) { PGM_P p = reinterpret_cast(fstr); size_t n = 0; @@ -195,6 +196,7 @@ size_t MorseClient::print(__FlashStringHelper* fstr) { size_t MorseClient::print(const String& str) { return(MorseClient::write((uint8_t*)str.c_str(), str.length())); } +#endif size_t MorseClient::print(const char* str) { return(MorseClient::write((uint8_t*)str, strlen(str))); @@ -247,6 +249,7 @@ size_t MorseClient::println(void) { return(MorseClient::write('^')); } +#if defined(RADIOLIB_BUILD_ARDUINO) size_t MorseClient::println(__FlashStringHelper* fstr) { size_t n = MorseClient::print(fstr); n += MorseClient::println(); @@ -258,6 +261,7 @@ size_t MorseClient::println(const String& str) { n += MorseClient::println(); return(n); } +#endif size_t MorseClient::println(const char* str) { size_t n = MorseClient::print(str); diff --git a/src/protocols/Morse/Morse.h b/src/protocols/Morse/Morse.h index 0ae567e7..fe60cc7c 100644 --- a/src/protocols/Morse/Morse.h +++ b/src/protocols/Morse/Morse.h @@ -160,8 +160,10 @@ class MorseClient { size_t write(uint8_t* buff, size_t len); size_t write(uint8_t b); + #if defined(RADIOLIB_BUILD_ARDUINO) size_t print(__FlashStringHelper*); size_t print(const String &); + #endif size_t print(const char[]); size_t print(char); size_t print(unsigned char, int = DEC); @@ -172,8 +174,10 @@ class MorseClient { size_t print(double, int = 2); size_t println(void); + #if defined(RADIOLIB_BUILD_ARDUINO) size_t println(__FlashStringHelper*); size_t println(const String &); + #endif size_t println(const char[]); size_t println(char); size_t println(unsigned char, int = DEC); diff --git a/src/protocols/Pager/Pager.cpp b/src/protocols/Pager/Pager.cpp index 32f401f6..f6aae335 100644 --- a/src/protocols/Pager/Pager.cpp +++ b/src/protocols/Pager/Pager.cpp @@ -52,9 +52,11 @@ int16_t PagerClient::sendTone(uint32_t addr) { return(PagerClient::transmit(NULL, 0, addr)); } +#if defined(RADIOLIB_BUILD_ARDUINO) int16_t PagerClient::transmit(String& str, uint32_t addr, uint8_t encoding) { return(PagerClient::transmit(str.c_str(), addr, encoding)); } +#endif int16_t PagerClient::transmit(const char* str, uint32_t addr, uint8_t encoding) { return(PagerClient::transmit((uint8_t*)str, strlen(str), addr, encoding)); @@ -260,6 +262,7 @@ size_t PagerClient::available() { return(_phy->available() + sizeof(uint32_t))/(sizeof(uint32_t) * (RADIOLIB_PAGER_BATCH_LEN + 1)); } +#if defined(RADIOLIB_BUILD_ARDUINO) int16_t PagerClient::readData(String& str, size_t len, uint32_t* addr) { int16_t state = RADIOLIB_ERR_NONE; @@ -304,6 +307,7 @@ int16_t PagerClient::readData(String& str, size_t len, uint32_t* addr) { return(state); } +#endif int16_t PagerClient::readData(uint8_t* data, size_t* len, uint32_t* addr) { // find the correct address diff --git a/src/protocols/Pager/Pager.h b/src/protocols/Pager/Pager.h index 844150bc..966033fb 100644 --- a/src/protocols/Pager/Pager.h +++ b/src/protocols/Pager/Pager.h @@ -101,6 +101,7 @@ class PagerClient { */ int16_t sendTone(uint32_t addr); + #if defined(RADIOLIB_BUILD_ARDUINO) /*! \brief Arduino String transmit method. @@ -113,6 +114,7 @@ class PagerClient { \returns \ref status_codes */ int16_t transmit(String& str, uint32_t addr, uint8_t encoding = RADIOLIB_PAGER_BCD); + #endif /*! \brief C-string transmit method. @@ -164,6 +166,7 @@ class PagerClient { */ size_t available(); + #if defined(RADIOLIB_BUILD_ARDUINO) /*! \brief Reads data that was received after calling startReceive method. @@ -177,6 +180,7 @@ class PagerClient { \returns \ref status_codes */ int16_t readData(String& str, size_t len = 0, uint32_t* addr = NULL); + #endif /*! \brief Reads data that was received after calling startReceive method. diff --git a/src/protocols/PhysicalLayer/PhysicalLayer.cpp b/src/protocols/PhysicalLayer/PhysicalLayer.cpp index 78acfebb..46093ba9 100644 --- a/src/protocols/PhysicalLayer/PhysicalLayer.cpp +++ b/src/protocols/PhysicalLayer/PhysicalLayer.cpp @@ -9,6 +9,7 @@ PhysicalLayer::PhysicalLayer(float freqStep, size_t maxPacketLength) { #endif } +#if defined(RADIOLIB_BUILD_ARDUINO) int16_t PhysicalLayer::transmit(__FlashStringHelper* fstr, uint8_t addr) { // read flash string length size_t len = 0; @@ -45,6 +46,7 @@ int16_t PhysicalLayer::transmit(__FlashStringHelper* fstr, uint8_t addr) { int16_t PhysicalLayer::transmit(String& str, uint8_t addr) { return(transmit(str.c_str(), addr)); } +#endif int16_t PhysicalLayer::transmit(const char* str, uint8_t addr) { return(transmit((uint8_t*)str, strlen(str), addr)); @@ -57,6 +59,7 @@ int16_t PhysicalLayer::transmit(uint8_t* data, size_t len, uint8_t addr) { return(RADIOLIB_ERR_UNSUPPORTED); } +#if defined(RADIOLIB_BUILD_ARDUINO) int16_t PhysicalLayer::receive(String& str, size_t len) { int16_t state = RADIOLIB_ERR_NONE; @@ -103,6 +106,7 @@ int16_t PhysicalLayer::receive(String& str, size_t len) { return(state); } +#endif int16_t PhysicalLayer::receive(uint8_t* data, size_t len) { (void)data; @@ -131,9 +135,11 @@ int16_t PhysicalLayer::startReceive(uint32_t timeout, uint16_t irqFlags, uint16_ return(RADIOLIB_ERR_UNSUPPORTED); } +#if defined(RADIOLIB_BUILD_ARDUINO) int16_t PhysicalLayer::startTransmit(String& str, uint8_t addr) { return(startTransmit(str.c_str(), addr)); } +#endif int16_t PhysicalLayer::startTransmit(const char* str, uint8_t addr) { return(startTransmit((uint8_t*)str, strlen(str), addr)); @@ -150,6 +156,7 @@ int16_t PhysicalLayer::finishTransmit() { return(RADIOLIB_ERR_UNSUPPORTED); } +#if defined(RADIOLIB_BUILD_ARDUINO) int16_t PhysicalLayer::readData(String& str, size_t len) { int16_t state = RADIOLIB_ERR_NONE; @@ -192,6 +199,7 @@ int16_t PhysicalLayer::readData(String& str, size_t len) { return(state); } +#endif int16_t PhysicalLayer::readData(uint8_t* data, size_t len) { (void)data; diff --git a/src/protocols/PhysicalLayer/PhysicalLayer.h b/src/protocols/PhysicalLayer/PhysicalLayer.h index 915faf45..ddf742b7 100644 --- a/src/protocols/PhysicalLayer/PhysicalLayer.h +++ b/src/protocols/PhysicalLayer/PhysicalLayer.h @@ -27,6 +27,7 @@ class PhysicalLayer { // basic methods + #if defined(RADIOLIB_BUILD_ARDUINO) /*! \brief Arduino Flash String transmit method. @@ -48,6 +49,7 @@ class PhysicalLayer { \returns \ref status_codes */ int16_t transmit(String& str, uint8_t addr = 0); + #endif /*! \brief C-string transmit method. @@ -73,6 +75,7 @@ class PhysicalLayer { */ virtual int16_t transmit(uint8_t* data, size_t len, uint8_t addr = 0); + #if defined(RADIOLIB_BUILD_ARDUINO) /*! \brief Arduino String receive method. @@ -83,6 +86,7 @@ class PhysicalLayer { \returns \ref status_codes */ int16_t receive(String& str, size_t len = 0); + #endif /*! \brief Sets module to sleep. @@ -131,6 +135,7 @@ class PhysicalLayer { */ virtual int16_t receive(uint8_t* data, size_t len); + #if defined(RADIOLIB_BUILD_ARDUINO) /*! \brief Interrupt-driven Arduino String transmit method. Unlike the standard transmit method, this one is non-blocking. Interrupt pin will be activated when transmission finishes. @@ -142,6 +147,7 @@ class PhysicalLayer { \returns \ref status_codes */ int16_t startTransmit(String& str, uint8_t addr = 0); + #endif /*! \brief Interrupt-driven Arduino String transmit method. Unlike the standard transmit method, this one is non-blocking. @@ -175,6 +181,7 @@ class PhysicalLayer { */ virtual int16_t finishTransmit(); + #if defined(RADIOLIB_BUILD_ARDUINO) /*! \brief Reads data that was received after calling startReceive method. @@ -186,6 +193,7 @@ class PhysicalLayer { \returns \ref status_codes */ int16_t readData(String& str, size_t len = 0); + #endif /*! \brief Reads data that was received after calling startReceive method. diff --git a/src/protocols/RTTY/RTTY.cpp b/src/protocols/RTTY/RTTY.cpp index e1994978..abd4c6cb 100644 --- a/src/protocols/RTTY/RTTY.cpp +++ b/src/protocols/RTTY/RTTY.cpp @@ -209,6 +209,7 @@ size_t RTTYClient::write(uint8_t b) { return(1); } +#if defined(RADIOLIB_BUILD_ARDUINO) size_t RTTYClient::print(__FlashStringHelper* fstr) { // read flash string length size_t len = 0; @@ -247,13 +248,6 @@ size_t RTTYClient::print(__FlashStringHelper* fstr) { return(n); } -size_t RTTYClient::print(ITA2String& ita2) { - uint8_t* arr = ita2.byteArr(); - size_t n = RTTYClient::write(arr, ita2.length()); - delete[] arr; - return(n); -} - size_t RTTYClient::print(const String& str) { size_t n = 0; if(_encoding == RADIOLIB_ITA2) { @@ -264,6 +258,14 @@ size_t RTTYClient::print(const String& str) { } return(n); } +#endif + +size_t RTTYClient::print(ITA2String& ita2) { + uint8_t* arr = ita2.byteArr(); + size_t n = RTTYClient::write(arr, ita2.length()); + delete[] arr; + return(n); +} size_t RTTYClient::print(const char str[]) { size_t n = 0; @@ -337,20 +339,22 @@ size_t RTTYClient::println(void) { return(n); } +#if defined(RADIOLIB_BUILD_ARDUINO) size_t RTTYClient::println(__FlashStringHelper* fstr) { size_t n = RTTYClient::print(fstr); n += RTTYClient::println(); return(n); } -size_t RTTYClient::println(ITA2String& ita2) { - size_t n = RTTYClient::print(ita2); +size_t RTTYClient::println(const String& str) { + size_t n = RTTYClient::print(str); n += RTTYClient::println(); return(n); } +#endif -size_t RTTYClient::println(const String& str) { - size_t n = RTTYClient::print(str); +size_t RTTYClient::println(ITA2String& ita2) { + size_t n = RTTYClient::print(ita2); n += RTTYClient::println(); return(n); } diff --git a/src/protocols/RTTY/RTTY.h b/src/protocols/RTTY/RTTY.h index a26b144b..e663d92c 100644 --- a/src/protocols/RTTY/RTTY.h +++ b/src/protocols/RTTY/RTTY.h @@ -138,9 +138,11 @@ class RTTYClient { size_t write(uint8_t* buff, size_t len); size_t write(uint8_t b); + #if defined(RADIOLIB_BUILD_ARDUINO) size_t print(__FlashStringHelper*); - size_t print(ITA2String &); size_t print(const String &); + #endif + size_t print(ITA2String &); size_t print(const char[]); size_t print(char); size_t print(unsigned char, int = DEC); @@ -151,9 +153,11 @@ class RTTYClient { size_t print(double, int = 2); size_t println(void); + #if defined(RADIOLIB_BUILD_ARDUINO) size_t println(__FlashStringHelper*); - size_t println(ITA2String &); size_t println(const String &); + #endif + size_t println(ITA2String &); size_t println(const char[]); size_t println(char); size_t println(unsigned char, int = DEC);