mirror
/
RadioLib
kopia lustrzana https://github.com/jgromes/RadioLib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

[Morse] Chore: uncrustify formatting

pull/1532/head
jgromes 2025-07-19 19:27:00 +02:00
rodzic e0c10a4021
commit 08f28073fd
2 zmienionych plików z 85 dodań i 85 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

30
src/protocols/Morse/Morse.cpp
Wyświetl plik

@ -26,13 +26,13 @@ int16_t MorseClient::begin(float base, uint8_t speed) {
baseFreq = (base * 1000000.0f) / phyLayer->freqStep; baseFreq = (base * 1000000.0f) / phyLayer->freqStep;
// calculate tone period for decoding // calculate tone period for decoding
basePeriod = (1000000.0f/base)/2.0f; basePeriod = (1000000.0f / base) / 2.0f;
// calculate symbol lengths (assumes PARIS as typical word) // calculate symbol lengths (assumes PARIS as typical word)
dotLength = 1200 / speed; dotLength = 1200 / speed;
dashLength = 3*dotLength; dashLength = 3 * dotLength;
letterSpace = 3*dotLength; letterSpace = 3 * dotLength;
wordSpace = 4*dotLength; wordSpace = 4 * dotLength;
// configure for direct mode // configure for direct mode
return(phyLayer->startDirect()); return(phyLayer->startDirect());
@ -65,10 +65,10 @@ int MorseClient::read(uint8_t* symbol, uint8_t* len, float low, float high) {
Module* mod = phyLayer->getMod(); Module* mod = phyLayer->getMod();
// measure pulse duration in us // measure pulse duration in us
uint32_t duration = mod->hal->pulseIn(audioClient->outPin, mod->hal->GpioLevelLow, 4*basePeriod); uint32_t duration = mod->hal->pulseIn(audioClient->outPin, mod->hal->GpioLevelLow, 4 * basePeriod);
// decide if this is a signal, or pause // decide if this is a signal, or pause
if((duration > low*basePeriod) && (duration < high*basePeriod)) { if((duration > low * basePeriod) && (duration < high * basePeriod)) {
// this is a signal // this is a signal
signalCounter++; signalCounter++;
} else if(duration == 0) { } else if(duration == 0) {
@ -83,7 +83,7 @@ int MorseClient::read(uint8_t* symbol, uint8_t* len, float low, float high) {
signalStart = mod->hal->millis(); signalStart = mod->hal->millis();
uint32_t pauseLen = mod->hal->millis() - pauseStart; uint32_t pauseLen = mod->hal->millis() - pauseStart;
if((pauseLen >= low*(float)letterSpace) && (pauseLen <= high*(float)letterSpace)) { if((pauseLen >= low * (float)letterSpace) && (pauseLen <= high * (float)letterSpace)) {
return(RADIOLIB_MORSE_CHAR_COMPLETE); return(RADIOLIB_MORSE_CHAR_COMPLETE);
} else if(pauseLen > wordSpace) { } else if(pauseLen > wordSpace) {
RADIOLIB_DEBUG_PROTOCOL_PRINTLN(RADIOLIB_LINE_FEED "<space>"); RADIOLIB_DEBUG_PROTOCOL_PRINTLN(RADIOLIB_LINE_FEED "<space>");
@ -96,11 +96,11 @@ int MorseClient::read(uint8_t* symbol, uint8_t* len, float low, float high) {
pauseStart = mod->hal->millis(); pauseStart = mod->hal->millis();
uint32_t signalLen = mod->hal->millis() - signalStart; uint32_t signalLen = mod->hal->millis() - signalStart;
if((signalLen >= low*(float)dotLength) && (signalLen <= high*(float)dotLength)) { if((signalLen >= low * (float)dotLength) && (signalLen <= high * (float)dotLength)) {
RADIOLIB_DEBUG_PROTOCOL_PRINT("."); RADIOLIB_DEBUG_PROTOCOL_PRINT(".");
(*symbol) |= (RADIOLIB_MORSE_DOT << (*len)); (*symbol) |= (RADIOLIB_MORSE_DOT << (*len));
(*len)++; (*len)++;
} else if((signalLen >= low*(float)dashLength) && (signalLen <= high*(float)dashLength)) { } else if((signalLen >= low * (float)dashLength) && (signalLen <= high * (float)dashLength)) {
RADIOLIB_DEBUG_PROTOCOL_PRINT("-"); RADIOLIB_DEBUG_PROTOCOL_PRINT("-");
(*symbol) |= (RADIOLIB_MORSE_DASH << (*len)); (*symbol) |= (RADIOLIB_MORSE_DASH << (*len));
(*len)++; (*len)++;
@ -125,7 +125,7 @@ size_t MorseClient::write(uint8_t b) {
if(b == ' ') { if(b == ' ') {
RADIOLIB_DEBUG_PROTOCOL_PRINTLN("space"); RADIOLIB_DEBUG_PROTOCOL_PRINTLN("space");
standby(); standby();
mod->waitForMicroseconds(mod->hal->micros(), wordSpace*1000); mod->waitForMicroseconds(mod->hal->micros(), wordSpace * 1000);
return(1); return(1);
} }
@ -143,19 +143,19 @@ size_t MorseClient::write(uint8_t b) {
while(code > RADIOLIB_MORSE_GUARDBIT) { while(code > RADIOLIB_MORSE_GUARDBIT) {
// send dot or dash // send dot or dash
if (code & RADIOLIB_MORSE_DASH) { if(code & RADIOLIB_MORSE_DASH) {
RADIOLIB_DEBUG_PROTOCOL_PRINT_NOTAG("-"); RADIOLIB_DEBUG_PROTOCOL_PRINT_NOTAG("-");
transmitDirect(baseFreq, baseFreqHz); transmitDirect(baseFreq, baseFreqHz);
mod->waitForMicroseconds(mod->hal->micros(), dashLength*1000); mod->waitForMicroseconds(mod->hal->micros(), dashLength * 1000);
} else { } else {
RADIOLIB_DEBUG_PROTOCOL_PRINT_NOTAG("."); RADIOLIB_DEBUG_PROTOCOL_PRINT_NOTAG(".");
transmitDirect(baseFreq, baseFreqHz); transmitDirect(baseFreq, baseFreqHz);
mod->waitForMicroseconds(mod->hal->micros(), dotLength*1000); mod->waitForMicroseconds(mod->hal->micros(), dotLength * 1000);
} }
// symbol space // symbol space
standby(); standby();
mod->waitForMicroseconds(mod->hal->micros(), dotLength*1000); mod->waitForMicroseconds(mod->hal->micros(), dotLength * 1000);
// move onto the next bit // move onto the next bit
code >>= 1; code >>= 1;
@ -163,7 +163,7 @@ size_t MorseClient::write(uint8_t b) {
// letter space // letter space
standby(); standby();
mod->waitForMicroseconds(mod->hal->micros(), letterSpace*1000 - dotLength*1000); mod->waitForMicroseconds(mod->hal->micros(), letterSpace * 1000 - dotLength * 1000);
RADIOLIB_DEBUG_PROTOCOL_PRINT_NOTAG(RADIOLIB_LINE_FEED); RADIOLIB_DEBUG_PROTOCOL_PRINT_NOTAG(RADIOLIB_LINE_FEED);
return(1); return(1);

140
src/protocols/Morse/Morse.h
Wyświetl plik

@ -17,81 +17,81 @@
#define RADIOLIB_MORSE_UNKNOWN_SYMBOL '*' #define RADIOLIB_MORSE_UNKNOWN_SYMBOL '*'
// Morse character table: - using codes defined in ITU-R M.1677-1 // Morse character table: - using codes defined in ITU-R M.1677-1
// - Morse code representation is saved LSb first, using additional bit as guard // - Morse code representation is saved LSb first, using additional bit as guard
// - position in array corresponds ASCII code minus RADIOLIB_MORSE_ASCII_OFFSET // - position in array corresponds ASCII code minus RADIOLIB_MORSE_ASCII_OFFSET
// - ASCII characters marked RADIOLIB_MORSE_UNSUPPORTED do not have ITU-R M.1677-1 equivalent // - ASCII characters marked RADIOLIB_MORSE_UNSUPPORTED do not have ITU-R M.1677-1 equivalent
static const uint8_t MorseTable[] RADIOLIB_NONVOLATILE = { static const uint8_t MorseTable[] RADIOLIB_NONVOLATILE = {
0b00, // space 0b00, // space
0b110101, // ! (unsupported) 0b110101, // ! (unsupported)
0b1010010, // " 0b1010010, // "
RADIOLIB_MORSE_UNSUPPORTED, // # (unsupported) RADIOLIB_MORSE_UNSUPPORTED, // # (unsupported)
RADIOLIB_MORSE_UNSUPPORTED, // $ (unsupported) RADIOLIB_MORSE_UNSUPPORTED, // $ (unsupported)
RADIOLIB_MORSE_UNSUPPORTED, // % (unsupported) RADIOLIB_MORSE_UNSUPPORTED, // % (unsupported)
RADIOLIB_MORSE_UNSUPPORTED, // & (unsupported) RADIOLIB_MORSE_UNSUPPORTED, // & (unsupported)
0b1011110, // ' 0b1011110, // '
0b101101, // ( 0b101101, // (
0b1101101, // ) 0b1101101, // )
RADIOLIB_MORSE_UNSUPPORTED, // * (unsupported) RADIOLIB_MORSE_UNSUPPORTED, // * (unsupported)
0b101010, // + 0b101010, // +
0b1110011, // , 0b1110011, // ,
0b1100001, // - 0b1100001, // -
0b1101010, // . 0b1101010, // .
0b101001, // / 0b101001, // '/'
0b111111, // 0 0b111111, // 0
0b111110, // 1 0b111110, // 1
0b111100, // 2 0b111100, // 2
0b111000, // 3 0b111000, // 3
0b110000, // 4 0b110000, // 4
0b100000, // 5 0b100000, // 5
0b100001, // 6 0b100001, // 6
0b100011, // 7 0b100011, // 7
0b100111, // 8 0b100111, // 8
0b101111, // 9 0b101111, // 9
0b1000111, // : 0b1000111, // :
RADIOLIB_MORSE_UNSUPPORTED, // ; (unsupported) RADIOLIB_MORSE_UNSUPPORTED, // ; (unsupported)
RADIOLIB_MORSE_UNSUPPORTED, // < (unsupported) RADIOLIB_MORSE_UNSUPPORTED, // < (unsupported)
0b110001, // = 0b110001, // =
RADIOLIB_MORSE_UNSUPPORTED, // > (unsupported) RADIOLIB_MORSE_UNSUPPORTED, // > (unsupported)
0b1001100, // ? 0b1001100, // ?
0b1010110, // @ 0b1010110, // @
0b110, // A 0b110, // A
0b10001, // B 0b10001, // B
0b10101, // C 0b10101, // C
0b1001, // D 0b1001, // D
0b10, // E 0b10, // E
0b10100, // F 0b10100, // F
0b1011, // G 0b1011, // G
0b10000, // H 0b10000, // H
0b100, // I 0b100, // I
0b11110, // J 0b11110, // J
0b1101, // K 0b1101, // K
0b10010, // L 0b10010, // L
0b111, // M 0b111, // M
0b101, // N 0b101, // N
0b1111, // O 0b1111, // O
0b10110, // P 0b10110, // P
0b11011, // Q 0b11011, // Q
0b1010, // R 0b1010, // R
0b1000, // S 0b1000, // S
0b11, // T 0b11, // T
0b1100, // U 0b1100, // U
0b11000, // V 0b11000, // V
0b1110, // W 0b1110, // W
0b11001, // X 0b11001, // X
0b11101, // Y 0b11101, // Y
0b10011, // Z 0b10011, // Z
RADIOLIB_MORSE_UNSUPPORTED, // [ (unsupported) RADIOLIB_MORSE_UNSUPPORTED, // [ (unsupported)
RADIOLIB_MORSE_UNSUPPORTED, // \ (unsupported) RADIOLIB_MORSE_UNSUPPORTED, // \ (unsupported)
RADIOLIB_MORSE_UNSUPPORTED, // ] (unsupported) RADIOLIB_MORSE_UNSUPPORTED, // ] (unsupported)
0b1101000, // ^ (unsupported, used as alias for end of work) 0b1101000, // ^ (unsupported, used as alias for end of work)
0b110101 // _ (unsupported, used as alias for starting signal) 0b110101 // _ (unsupported, used as alias for starting signal)
}; };
/*! /*!
\class MorseClient \class MorseClient
\brief Client for Morse Code communication. The public interface is the same as Arduino Serial. \brief Client for Morse Code communication. The public interface is the same as Arduino Serial.
*/ */
class MorseClient: public RadioLibPrint { class MorseClient : public RadioLibPrint {
public: public:
/*! /*!
\brief Constructor for 2-FSK mode. \brief Constructor for 2-FSK mode.
@ -151,9 +151,9 @@ class MorseClient: public RadioLibPrint {
*/ */
size_t write(uint8_t b) override; size_t write(uint8_t b) override;
#if !RADIOLIB_GODMODE #if !RADIOLIB_GODMODE
private: private:
#endif #endif
PhysicalLayer* phyLayer; PhysicalLayer* phyLayer;
#if !RADIOLIB_EXCLUDE_AFSK #if !RADIOLIB_EXCLUDE_AFSK
AFSKClient* audioClient; AFSKClient* audioClient;