diff --git a/src/protocols/Hellschreiber/Hellschreiber.cpp b/src/protocols/Hellschreiber/Hellschreiber.cpp
index 63fb915f..8a0e9376 100644
--- a/src/protocols/Hellschreiber/Hellschreiber.cpp
+++ b/src/protocols/Hellschreiber/Hellschreiber.cpp
@@ -5,7 +5,7 @@
HellClient::HellClient(PhysicalLayer* phy) {
phyLayer = phy;
-
+ lineFeed = " ";
#if !defined(RADIOLIB_EXCLUDE_AFSK)
audioClient = nullptr;
#endif
@@ -14,6 +14,7 @@ HellClient::HellClient(PhysicalLayer* phy) {
#if !defined(RADIOLIB_EXCLUDE_AFSK)
HellClient::HellClient(AFSKClient* audio) {
phyLayer = audio->phyLayer;
+ lineFeed = " ";
audioClient = audio;
}
#endif
@@ -58,21 +59,6 @@ void HellClient::setInversion(bool inv) {
invert = inv;
}
-size_t HellClient::write(const char* str) {
- if(str == NULL) {
- return(0);
- }
- return(HellClient::write((uint8_t *)str, strlen(str)));
-}
-
-size_t HellClient::write(uint8_t* buff, size_t len) {
- size_t n = 0;
- for(size_t i = 0; i < len; i++) {
- n += HellClient::write(buff[i]);
- }
- return(n);
-}
-
size_t HellClient::write(uint8_t b) {
// convert to position in font buffer
uint8_t pos = b;
@@ -96,206 +82,6 @@ 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<PGM_P>(fstr);
- size_t n = 0;
- while(true) {
- char c = RADIOLIB_NONVOLATILE_READ_BYTE(p++);
- if(c == '\0') {
- break;
- }
- n += HellClient::write(c);
- }
- return n;
-}
-
-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)));
-}
-
-size_t HellClient::print(char c) {
- return(HellClient::write(c));
-}
-
-size_t HellClient::print(unsigned char b, int base) {
- return(HellClient::print((unsigned long)b, base));
-}
-
-size_t HellClient::print(int n, int base) {
- return(HellClient::print((long)n, base));
-}
-
-size_t HellClient::print(unsigned int n, int base) {
- return(HellClient::print((unsigned long)n, base));
-}
-
-size_t HellClient::print(long n, int base) {
- if(base == 0) {
- return(HellClient::write(n));
- } else if(base == DEC) {
- if (n < 0) {
- int t = HellClient::print('-');
- n = -n;
- return(HellClient::printNumber(n, DEC) + t);
- }
- return(HellClient::printNumber(n, DEC));
- } else {
- return(HellClient::printNumber(n, base));
- }
-}
-
-size_t HellClient::print(unsigned long n, int base) {
- if(base == 0) {
- return(HellClient::write(n));
- } else {
- return(HellClient::printNumber(n, base));
- }
-}
-
-size_t HellClient::print(double n, int digits) {
- return(HellClient::printFloat(n, digits));
-}
-
-size_t HellClient::println(void) {
- // Hellschreiber has no concept of "line ending", print one space instead
- return(HellClient::print(' '));
-}
-
-#if defined(RADIOLIB_BUILD_ARDUINO)
-size_t HellClient::println(__FlashStringHelper* fstr) {
- size_t n = HellClient::print(fstr);
- n += HellClient::println();
- return(n);
-}
-
-size_t HellClient::println(const String& str) {
- size_t n = HellClient::print(str);
- n += HellClient::println();
- return(n);
-}
-#endif
-
-size_t HellClient::println(const char* str) {
- size_t n = HellClient::print(str);
- n += HellClient::println();
- return(n);
-}
-
-size_t HellClient::println(char c) {
- size_t n = HellClient::print(c);
- n += HellClient::println();
- return(n);
-}
-
-size_t HellClient::println(unsigned char b, int base) {
- size_t n = HellClient::print(b, base);
- n += HellClient::println();
- return(n);
-}
-
-size_t HellClient::println(int num, int base) {
- size_t n = HellClient::print(num, base);
- n += HellClient::println();
- return(n);
-}
-
-size_t HellClient::println(unsigned int num, int base) {
- size_t n = HellClient::print(num, base);
- n += HellClient::println();
- return(n);
-}
-
-size_t HellClient::println(long num, int base) {
- size_t n = HellClient::print(num, base);
- n += HellClient::println();
- return(n);
-}
-
-size_t HellClient::println(unsigned long num, int base) {
- size_t n = HellClient::print(num, base);
- n += HellClient::println();
- return(n);
-}
-
-size_t HellClient::println(double d, int digits) {
- size_t n = HellClient::print(d, digits);
- n += HellClient::println();
- return(n);
-}
-
-size_t HellClient::printNumber(unsigned long n, uint8_t base) {
- char buf[8 * sizeof(long) + 1];
- char *str = &buf[sizeof(buf) - 1];
-
- *str = '\0';
-
- if(base < 2) {
- base = 10;
- }
-
- do {
- char c = n % base;
- n /= base;
-
- *--str = c < 10 ? c + '0' : c + 'A' - 10;
- } while(n);
-
- return(HellClient::write(str));
-}
-
-size_t HellClient::printFloat(double number, uint8_t digits) {
- size_t n = 0;
-
- char code[] = {0x00, 0x00, 0x00, 0x00};
- if (isnan(number)) strcpy(code, "nan");
- if (isinf(number)) strcpy(code, "inf");
- if (number > 4294967040.0) strcpy(code, "ovf"); // constant determined empirically
- if (number <-4294967040.0) strcpy(code, "ovf"); // constant determined empirically
-
- if(code[0] != 0x00) {
- return(HellClient::write(code));
- }
-
- // Handle negative numbers
- if (number < 0.0) {
- n += HellClient::print('-');
- number = -number;
- }
-
- // Round correctly so that print(1.999, 2) prints as "2.00"
- double rounding = 0.5;
- for(uint8_t i = 0; i < digits; ++i) {
- rounding /= 10.0;
- }
- number += rounding;
-
- // Extract the integer part of the number and print it
- unsigned long int_part = (unsigned long)number;
- double remainder = number - (double)int_part;
- n += HellClient::print(int_part);
-
- // Print the decimal point, but only if there are digits beyond
- if(digits > 0) {
- n += HellClient::print('.');
- }
-
- // Extract digits from the remainder one at a time
- while(digits-- > 0) {
- remainder *= 10.0;
- unsigned int toPrint = (unsigned int)(remainder);
- n += HellClient::print(toPrint);
- remainder -= toPrint;
- }
-
- return n;
-}
-
int16_t HellClient::transmitDirect(uint32_t freq, uint32_t freqHz) {
#if !defined(RADIOLIB_EXCLUDE_AFSK)
if(audioClient != nullptr) {
diff --git a/src/protocols/Hellschreiber/Hellschreiber.h b/src/protocols/Hellschreiber/Hellschreiber.h
index ac7d5d6c..7855dee8 100644
--- a/src/protocols/Hellschreiber/Hellschreiber.h
+++ b/src/protocols/Hellschreiber/Hellschreiber.h
@@ -7,6 +7,7 @@
#include "../PhysicalLayer/PhysicalLayer.h"
#include "../AFSK/AFSK.h"
+#include "../Print/Print.h"
#define RADIOLIB_HELL_FONT_WIDTH 7
#define RADIOLIB_HELL_FONT_HEIGHT 7
@@ -86,7 +87,7 @@ static const uint8_t HellFont[64][RADIOLIB_HELL_FONT_WIDTH - 2] RADIOLIB_NONVOLA
\class HellClient
\brief Client for Hellschreiber transmissions.
*/
-class HellClient {
+class HellClient: public RadioLibPrint {
public:
/*!
\brief Constructor for 2-FSK mode.
@@ -124,37 +125,13 @@ class HellClient {
*/
void setInversion(bool inv);
- size_t write(const char* str);
- size_t write(uint8_t* buff, size_t len);
+ /*!
+ \brief Write one byte. Implementation of interface of the RadioLibPrint/Print class.
+ \param b Byte to write.
+ \returns 1 if the byte was written, 0 otherwise.
+ */
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);
- size_t print(int, int = DEC);
- size_t print(unsigned int, int = DEC);
- size_t print(long, int = DEC);
- size_t print(unsigned long, int = DEC);
- 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);
- size_t println(int, int = DEC);
- size_t println(unsigned int, int = DEC);
- size_t println(long, int = DEC);
- size_t println(unsigned long, int = DEC);
- size_t println(double, int = 2);
-
#if !defined(RADIOLIB_GODMODE)
private:
#endif