martin/raspikeyer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: martin:491d5e34f1d69c1d96e9f9c6f8b1b5978ccbeedb
Branches Tags
martin:main
martin:observer
..
compare: martin:b1d376952214b3015cd9ec9054cfc826055d076e
Branches Tags
martin:main
martin:observer

2 commits
491d5e34f1 ... b1d3769522

Author SHA1 Message Date
Martin Brodbeck
b1d3769522 sending messages is working now. 2024-02-25 21:37:37 +01:00
Martin Brodbeck
e21fda9917 ... 2024-02-25 21:30:29 +01:00
3 changed files with 33 additions and 50 deletions
Show stats Expand all files Collapse all files

4
src/keyer.cpp
View file

@ -51,7 +51,7 @@ void Keyer::setSpeed(uint8_t wpm)
void Keyer::sendMessage(std::string msg) void Keyer::sendMessage(std::string msg)
{ {
std::string morse = messageToMorse(msg); std::string morse = messageToMorse(msg);
printf("Morse (%i): %s\n", morse.length(), morse.c_str());
for (unsigned char c : morse) { for (unsigned char c : morse) {
m_messageQueue.push(c); m_messageQueue.push(c);
} }
@ -80,8 +80,6 @@ void Keyer::run()
m_messageChar = m_messageQueue.front(); m_messageChar = m_messageQueue.front();
m_messageQueue.pop(); m_messageQueue.pop();
printf("Char is: %c\n", m_messageChar);
switch (m_messageChar) { switch (m_messageChar) {
case '.': case '.':
m_messageKeyingState = MessageState::Dit; m_messageKeyingState = MessageState::Dit;

77
src/morse.cpp
View file

@ -4,97 +4,82 @@
#include "morse.h" #include "morse.h"
std::map<char, std::string> morseCode = { static std::map<char, std::string> morseCode = {
{'A', ".-"}, {'B', "-..."}, {'C', "-.-."}, {'D', "-.."}, {'E', "."}, {'F', "..-."}, {'A', ".-"}, {'B', "-..."}, {'C', "-.-."}, {'D', "-.."}, {'E', "."}, {'F', "..-."},
{'G', "--."}, {'H', "...."}, {'I', ".."}, {'J', ".---"}, {'K', "-.-"}, {'L', ".-.."}, {'G', "--."}, {'H', "...."}, {'I', ".."}, {'J', ".---"}, {'K', "-.-"}, {'L', ".-.."},
{'M', "--"}, {'N', "-."}, {'O', "---"}, {'P', ".--."}, {'Q', "--.-"}, {'R', ".-."}, {'M', "--"}, {'N', "-."}, {'O', "---"}, {'P', ".--."}, {'Q', "--.-"}, {'R', ".-."},
{'S', "..."}, {'T', "-"}, {'U', "..-"}, {'V', "...-"}, {'W', ".--"}, {'X', "-..-"}, {'S', "..."}, {'T', "-"}, {'U', "..-"}, {'V', "...-"}, {'W', ".--"}, {'X', "-..-"},
{'Y', "-.--"}, {'Z', "--.."}, {'1', ".----"}, {'2', "..---"}, {'3', "...--"}, {'4', "....-"}, {'Y', "-.--"}, {'Z', "--.."}, {'1', ".----"}, {'2', "..---"}, {'3', "...--"}, {'4', "....-"},
{'5', "....."}, {'6', "-...."}, {'7', "--..."}, {'8', "---.."}, {'9', "----."}, {'0', "-----"}, {'5', "....."}, {'6', "-...."}, {'7', "--..."}, {'8', "---.."}, {'9', "----."}, {'0', "-----"},
{',', "--..--"}, {'.', ".-.-.-"}, {'?', "..--.."}, {'/', "-..-."}, {'-', "-....-"}, {':', "---..."}, {',', "--..--"}, {'.', ".-.-.-"}, {'?', "..--.."}, {'/', "-..-."}, {'-', "-....-"}, {':', "---..."},
{'&', ".-..."}, {'\'', ".----."}, {'@', ".--.-."}, {')', "-.--.-"}, {'(', "-.--."}, {'\"', ".-..-."}, {'&', ".-..."}, {'\'', ".----."}, {'@', ".--.-."}, {')', "-.--.-"}, {'(', "-.--."}, {'\"', ".-..-."},
{'=', "-...-"}, // '=' == <BT> {'=', "-...-"}, // '=' == <BT>
{'k', "-.--."}, // k == <KN> {'b', "-...-.-"}, // '=' == <BK>
{'s', "...-.-"}, // s == <SK> {'k', "-.--."}, // k == <KN>
{'+', ".-.-."}, // + == <AR> {'s', "...-.-"}, // s == <SK>
{'a', "-.-.-"}, // a == <KA> {'+', ".-.-."}, // + == <AR>
{'a', "-.-.-"}, // a == <KA>
}; };
void refurbishMessage(std::string &msg) void refurbishMessage(std::string &msg)
{ {
printf("The message is: %s\n", msg.c_str());
//std::string msgRefurb;
//msgRefurb.resize(msg.size());
// Make the message all upper case // Make the message all upper case
//std::transform(msg.begin(), msg.end(), msgRefurb.begin(), [](unsigned char c) { return std::toupper(c); });
std::transform(msg.begin(), msg.end(), msg.begin(), ::toupper); std::transform(msg.begin(), msg.end(), msg.begin(), ::toupper);
// Encode the special characters as we like it // Encode the special characters as we like it
//msg = std::regex_replace(msg, std::regex("<BT>"), "="); msg = std::regex_replace(msg, std::regex("<BT>"), "=");
//msg = std::regex_replace(msg, std::regex("<KN>"), "k"); msg = std::regex_replace(msg, std::regex("<BK>"), "b");
//msg = std::regex_replace(msg, std::regex("<SK>"), "s"); msg = std::regex_replace(msg, std::regex("<KN>"), "k");
//msg = std::regex_replace(msg, std::regex("<AR>"), "+"); msg = std::regex_replace(msg, std::regex("<SK>"), "s");
//msg = std::regex_replace(msg, std::regex("<KA>"), "a"); msg = std::regex_replace(msg, std::regex("<AR>"), "+");
msg = std::regex_replace(msg, std::regex("<KA>"), "a");
//printf("Msg Origgg: %s\n", msg.c_str());
// Remove all other unknown characters // Remove all other unknown characters
//msg.erase(remove_if(msg.begin(), msg.end(), msg.erase(remove_if(msg.begin(), msg.end(),
// [](const char &c) { return c != ' ' && morseCode.find(c) == morseCode.end(); }), [](const char &c) { return c != ' ' && morseCode.find(c) == morseCode.end(); }),
// msg.end()); msg.end());
// Remove spaces, if there are too many of them // Remove spaces, if there are too many of them
//msg = std::regex_replace(msg, std::regex("(\\s+)"), " "); msg = std::regex_replace(msg, std::regex("(\\s+)"), " ");
//printf("Msg Origgg2: %s\n", msg.c_str());
//return msgRefurb;
} }
std::string messageToMorse(std::string &msg) std::string messageToMorse(std::string &msg)
{ {
refurbishMessage(msg); refurbishMessage(msg);
std::string morseString = ""; std::string morseString {};
printf("Ref Mesg (%i): %s\n", msg.length(), msg.c_str());
for (unsigned int i = 0; i < msg.length(); i++) { for (unsigned int i = 0; i < msg.length(); i++) {
char c = msg[i]; char c = msg[i];
if (c == ' ') { if (c == ' ') {
morseString += 'w'; morseString.push_back('w');
continue; continue;
} }
// Ignore and continue with next char, if not found // Ignore and continue with next char, if not found
auto search = morseCode.find(c); auto search = morseCode.find(c);
if (search == morseCode.end()) { if (search == morseCode.end()) {
printf("Nanu (i=%i)? %c\n", i, c);
continue; continue;
} }
for (unsigned int j = 0; j < morseCode[c].length(); j++) { for (unsigned int j = 0; j < morseCode[c].length(); j++) {
char m = morseCode[c][j]; printf("M = %c\n", m); char m = morseCode[c][j];
if (j == 0 && i > 0 && msg[i - 1] != ' ') { if (j == 0 && i > 0 && msg[i - 1] != ' ') {
morseString += 'c'; morseString.push_back('c');
} }
morseString += m; morseString += m;
if (j < morseCode[c].length() - 1) { if (j < morseCode[c].length() - 1) {
morseString += 'i'; morseString.push_back('i');
} }
} }
} }
// Append word space if last char was not a blank // Append word space if last char was not a blank
if (msg.back() != ' ') { if (msg.back() != ' ') {
morseString += 'w'; morseString.push_back('w');
} }
printf("Sodele: %s\n", morseString.c_str());
printf("Ref Mesg 2 (%i): %s\n", msg.length(), msg.c_str());
return morseString; return morseString;
} }

2
src/raspi_keyer.cpp
View file

@ -207,7 +207,7 @@ int main()
busy_wait_ms(5000); busy_wait_ms(5000);
if (!used) { if (!used) {
//KeyerQueueData keyerQueueData {KeyerQueueCommand::SendMessage, 0, settings.mode, "cq cq de dg2smb dg2smb pse k"}; //KeyerQueueData keyerQueueData {KeyerQueueCommand::SendMessage, 0, settings.mode, "cq cq de dg2smb dg2smb pse k"};
KeyerQueueData keyerQueueData {KeyerQueueCommand::SendMessage, 0, settings.mode, "cq cqde dg2smbk"}; KeyerQueueData keyerQueueData {KeyerQueueCommand::SendMessage, 0, settings.mode, "cq cq de dg2smb dg2smb pse k"};
queue_add_blocking(&keyerQueue, &keyerQueueData); queue_add_blocking(&keyerQueue, &keyerQueueData);
used = true; used = true;
} }