Reorganized morsecode symbols array and updated the MorseClient::write(uint8_t b) method

The whole idea was taken from the CubeSat way of doing morsecode,
This commit is contained in:
Marco Campinoti 2019-12-22 22:07:46 +01:00 committed by GitHub
parent 444800ea08
commit 4272b0ff30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 107 additions and 104 deletions

View file

@ -4,68 +4,79 @@
/*!
\cond RADIOLIB_DOXYGEN_HIDDEN
*/
struct Morse_t {
char c; // ASCII character
char m[7]; // Morse code representation
};
/*!
\endcond
*/
// array of all Morse code characters
const Morse_t MorseTable[MORSE_LENGTH] PROGMEM = {
{'A', ".-"},
{'B',"-..."},
{'C', "-.-."},
{'D',"-.."},
{'E',"."},
{'F',"..-."},
{'G',"--."},
{'H',"...."},
{'I',".."},
{'J',".---"},
{'K',"-.-"},
{'L',".-.."},
{'M',"--"},
{'N',"-."},
{'O',"---"},
{'P',".--."},
{'Q',"--.-"},
{'R',".-."},
{'S',"..."},
{'T',"-"},
{'U',"..-"},
{'V',"...-"},
{'W',".--"},
{'X',"-..-"},
{'Y',"-.--"},
{'Z',"--.."},
{'1',".----"},
{'2',"..---"},
{'3',"...--"},
{'4',"....-"},
{'5',"....."},
{'6',"-...."},
{'7',"--..."},
{'8',"---.."},
{'9',"----."},
{'0',"-----"},
{'.',".-.-.-"},
{',',"--..--"},
{':',"---..."},
{'?',"..--.."},
{'\'',".----."},
{'-',"-....-"},
{'/',"-..-."},
{'(',"-.--."},
{')',"-.--.-"},
{'\"',".-..-."},
{'=',"-...-"},
{'+',".-.-."},
{'@',".--.-."},
{' ',"_"}, // space is used to separate words
{0x01,"-.-.-"}, // ASCII SOH (start of heading) is used as alias for start signal
{0x02,".-.-."} // ASCII EOT (end of transmission) is used as alias for stop signal
//----------------------------------------------------------------------------------------
// In the below array we represent dots as 0 and dashes as 1, using a further bit as
// 'guard' who tell us when we must stop in decoding our symbols.
// Some bytes are zeroed because there isn't a morse code representation of that char.
// The ascii code of the letter is the search index into the array for the correspondent
// morse code representation.
//----------------------------------------------------------------------------------------
const uint8_t morse_lookuptable[64] PROGMEM = {
0b00, // space 0x00
0b1110101, // ! 117
0b1010010, // " 82
0b00, // # (doesn't exists)<--
0b11001000, // $ 200
0b00, // % (doesn't exists)<--
0b100010, // & 34
0b1011110, // ' 94
0b101101, // ( 45
0b1101101, // ) 109
0b00, // * (doesn't exists)<--
0b101010, // + 42
0b1110011, // , 115
0b1100001, // - 97
0b1101010, // . 106
0b101001, // / 41
0b111111, // 0 63
0b111110, // 1 62
0b111100, // 2 60
0b111000, // 3 56
0b110000, // 4 48
0b100000, // 5 32
0b100001, // 6 33
0b100011, // 7 35
0b100111, // 8 39
0b101111, // 9 47
0b1000111, // : 71
0b1101010, // ; 106
0b00, // < (doesn't exists)<--
0b110001, // = 49
0b00, // > (doesn't exists)<--
0b1001100, // ? 76
0b1010110, // @ 86
0b110, // A 6
0b10001, // B 17
0b10101, // C 21
0b1001, // D 9
0b10, // E 2
0b10100, // F 20
0b1011, // G 11
0b10000, // H 16
0b100, // I 4
0b11110, // J 30
0b1101, // K 13
0b10010, // L 18
0b111, // M 7
0b101, // N 5
0b1111, // O 15
0b10110, // P 22
0b11011, // Q 27
0b1010, // R 10
0b1000, // S 8
0b11, // T 3
0b1100, // U 12
0b11000, // V 24
0b1110, // W 14
0b11001, // X 25
0b11101, // Y 29
0b10011, // Z 19
0b00, // [ (doesn't exists)<--
0b00, // \ (doesn't exists)<--
0b00, // ] (doesn't exists)<--
0b00, // ^ (doesn't exists)<--
0b1101100 // _ 108
};
MorseClient::MorseClient(PhysicalLayer* phy) {
@ -106,50 +117,38 @@ size_t MorseClient::write(uint8_t* buff, size_t len) {
}
size_t MorseClient::write(uint8_t b) {
// find the correct Morse code in array
Morse_t mc;
bool found = false;
for(uint8_t pos = 0; pos < MORSE_LENGTH; pos++) {
memcpy_P(&mc, &MorseTable[pos], sizeof(Morse_t));
if(mc.c == toupper(b)) {
found = true;
break;
}
}
// check if the requested code was found in the array
if(found) {
RADIOLIB_DEBUG_PRINT(mc.c);
RADIOLIB_DEBUG_PRINT('\t');
RADIOLIB_DEBUG_PRINTLN(mc.m);
// iterate over Morse code representation and output appropriate tones
for(uint8_t i = 0; i < strlen(mc.m); i++) {
switch(mc.m[i]) {
case '.':
_phy->transmitDirect(_base);
delay(_dotLength);
break;
case '-':
_phy->transmitDirect(_base);
delay(_dotLength * 3);
break;
case '_':
// do nothing (word space)
break;
}
//Note: using toupper() you always find a char, because all possible chars are included in this array!
uint8_t ditdah_code = 0x00;
if (b == ' ') {
RADIOLIB_DEBUG_PRINTLN('space'); // inter-words pause (space)
// symbol space
_phy->standby();
delay(_dotLength * 3);
}
ditdah_code = morse_lookuptable[(uint8_t)(toupper(b) - 32)]; // retrieve morse code from lookuptable
//do it until 'guardbit' is reached
while (ditdah_code > GUARDBIT) {
if (ditdah_code & DAH) {
RADIOLIB_DEBUG_PRINT('-'); // tx a 'dah'
_phy->transmitDirect(_base);
delay(_dotLength * 3);
}
else{
RADIOLIB_DEBUG_PRINT('.'); // tx a 'dit'
_phy->transmitDirect(_base);
delay(_dotLength);
}
ditdah_code >>= 1; // analyze next bit
}
// letter space
RADIOLIB_DEBUG_PRINTLN();
delay(_dotLength * 3);
return(1);
}
_phy->standby();
delay(_dotLength);
return(0);
}

View file

@ -4,7 +4,11 @@
#include "../../TypeDef.h"
#include "../PhysicalLayer/PhysicalLayer.h"
#define MORSE_LENGTH 52
//#define MORSE_LENGTH 52
#define MORSE_LENGTH 64
#define DIT 0b0
#define DAH 0b1
#define GUARDBIT 0b1
/*!
\class MorseClient