From 4775a12d45f1968d755ef97767a80f0f0201e50f Mon Sep 17 00:00:00 2001
From: Martin Brodbeck <martin@brodbeck-online.de>
Date: Wed, 28 Feb 2024 14:39:55 +0100
Subject: [PATCH] more cleanup

---
 src/keyer.cpp | 15 ------------
 src/morse.cpp | 65 ++++++++++++++++++++++++++-------------------------
 src/morse.h   |  4 ----
 3 files changed, 33 insertions(+), 51 deletions(-)

diff --git a/src/keyer.cpp b/src/keyer.cpp
index 9b7a564..8fd26f5 100644
--- a/src/keyer.cpp
+++ b/src/keyer.cpp
@@ -49,15 +49,6 @@ void Keyer::setSpeed(uint8_t wpm)
     m_elementDuration = calcElementDurationUs(wpm);
 }
 
-//void Keyer::sendMessage(std::string msg)
-//{
-//   std::string morse = messageToMorse(msg);
-//
-//    for (char c : morse) {
-//        m_messageQueue.push(c);
-//    }
-//}
-
 void Keyer::sendCharacter(const char ch)
 {
     char morseSymbols[32] {0};
@@ -69,12 +60,6 @@ void Keyer::sendCharacter(const char ch)
     for (size_t i = 0; i < strlen(morseSymbols); i++) {
         m_messageQueue.push(morseSymbols[i]);
     }
-
-    // std::string morse = charToMorse(ch);
-
-    // for (char c : morse) {
-    //     m_messageQueue.push(c);
-    // }
 }
 
 void Keyer::run()
diff --git a/src/morse.cpp b/src/morse.cpp
index 5a529ee..a6e2db4 100644
--- a/src/morse.cpp
+++ b/src/morse.cpp
@@ -1,7 +1,5 @@
-// #include <algorithm>
 #include <map>
 #include <string>
-// #include <regex>
 
 #include "morse.h"
 
@@ -67,6 +65,35 @@ std::map<char, std::string> morseMap = {
     {']', "-.--."},   // ] => <KN> [sic!]
 };
 
+bool charToMorse(const char ch, char *morseSymbols)
+{
+    size_t index {0};
+
+    if (ch != ' ' && !morseMap.contains(ch)) {
+        return false;
+    }
+
+    if (ch == ' ') {
+        morseSymbols[index++] = 'w';
+    } else {
+        for (unsigned int i = 0; i < morseMap[ch].length(); i++) {
+            char m = morseMap[ch][i];
+
+            morseSymbols[index++] = m;
+
+            if (i < morseMap[ch].length() - 1) {
+                morseSymbols[index++] = 'i';
+            }
+        }
+
+        morseSymbols[index++] = 'c';
+    }
+
+    morseSymbols[index] = '\0';
+
+    return true;
+}
+
 /*
 void refurbishMessage(std::string &msg)
 {
@@ -90,7 +117,7 @@ void refurbishMessage(std::string &msg)
     msg = std::regex_replace(msg, std::regex("(\\s+)"), " ");
 }
 */
-
+/*
 std::string messageToMorse(std::string &msg)
 {
     // refurbishMessage(msg);
@@ -131,7 +158,9 @@ std::string messageToMorse(std::string &msg)
 
     return morseString;
 }
+*/
 
+/*
 std::string charToMorse(const char ch)
 {
     std::string morseString {};
@@ -155,32 +184,4 @@ std::string charToMorse(const char ch)
 
     return morseString;
 }
-
-bool charToMorse(const char ch, char *morseSymbols)
-{
-    size_t index {0};
-
-    if (ch != ' ' && !morseMap.contains(ch)) {
-        return false;
-    }
-
-    if (ch == ' ') {
-        morseSymbols[index++] = 'w';
-    } else {
-        for (unsigned int i = 0; i < morseMap[ch].length(); i++) {
-            char m = morseMap[ch][i];
-
-            morseSymbols[index++] = m;
-
-            if (i < morseMap[ch].length() - 1) {
-                morseSymbols[index++] = 'i';
-            }
-        }
-
-        morseSymbols[index++] = 'c';
-    }
-
-    morseSymbols[index] = '\0';
-
-    return true;
-}
\ No newline at end of file
+*/
\ No newline at end of file
diff --git a/src/morse.h b/src/morse.h
index d58fe88..1ed7496 100644
--- a/src/morse.h
+++ b/src/morse.h
@@ -1,7 +1,3 @@
 #pragma once
 
-//#include <string>
-
-//std::string messageToMorse(std::string &msg);
-//std::string charToMorse(const char ch);
 bool charToMorse(const char ch, char * morseSymbols);
\ No newline at end of file