better serial

README.md

@@ -1,3 +1,16 @@
 # Eck Eck
 
 ![EckEckEckEck.gif](https://media-be.chewy.com/wp-content/uploads/2023/05/05165809/cat-chattering-chirping-at-birds.gif)
+
+
+### Current WIP issue:
+
+command issue:
+
+```
+.........................................................SR D
+...........SR 1
+..............................SR
+Processing input: D1
+Command: D -
+```

platformio.ini

@@ -12,3 +12,4 @@
 platform = atmelavr
 board = nanoatmega328
 framework = arduino
+monitor_speed = 115200

src/cw.cpp

@@ -0,0 +1,37 @@
+#include <Arduino.h>
+#include <ctype.h>
+
+uint8_t convertASCII(char c){
+    uint8_t result;
+    if(isalpha(c)){
+        if(islower(c)){
+            result = (uint8_t)c - 97;
+        }else{
+            result = (uint8_t)c - 65;
+        }
+    } else if (isdigit(c)){
+        result = (uint8_t)c - 22;
+    } else {
+        switch (c) {
+        case '-':
+            result = 36;
+            break;
+        case '.':
+            result = 36;
+            break;
+        case ',':
+            result = 36;
+            break;
+        case '?':
+            result = 36;
+            break;
+        case '/' || '\\':
+            result = 36;
+            break;
+        default:
+            result = 41;
+            break;
+        }
+    }
+    return result;
+}

src/cw.h

@@ -0,0 +1,55 @@
+#ifndef CW_H
+#define CW_H
+
+#include <Arduino.h>
+#include <ctype.h>
+
+// Morse code representation for each character (A-Z, 0-9)
+const char* morseCode[42] = {
+    ".-",    // 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
+    "-----", // 0
+    ".----", // 1
+    "..---", // 2
+    "...--", // 3
+    "....-", // 4
+    ".....", // 5
+    "-....", // 6
+    "--...", // 7
+    "---..", // 8
+    "----.", // 9
+    "-...-",  // -
+    ".-.-.-", // .
+    "--..--", // ,
+    "..--..", // ?
+    "-..-.",  // /
+    ".-.-.",  // End Of Message (41)
+};
+uint8_t convertASCII(char c);
+const char* allowedCharacters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-.,?/\\";
+
+#endif // CW_H

src/main.cpp

@@ -14,6 +14,8 @@
 
 #include <Arduino.h>
 #include <EEPROM.h>
+#include <ctype.h>
+#include "cw.h"
 
 /* TODO:
  * - Implement sending strings
@@ -25,10 +27,11 @@ uint8_t input_dit = 3, input_dah = 6, input_pot = A6;
 uint8_t output = 7;
 uint16_t dit = 200, dah = 500;
 uint8_t debounce = 50;
-uint16_t p_tol = 10, p_min = 50, p_max = 2000, p_buf = 0, p_cache = 0;
+uint16_t p_tol = 30, p_min = 50, p_max = 2000, p_buf = 0, p_cache = 0;
 String serial_buffer = "";
 char buf;
 
+void key_string(String);
 void adjust_length(uint16_t);
 void set_length(uint16_t, uint16_t);
 void send(bool);
@@ -42,30 +45,29 @@ void setup() {
   pinMode(input_dah, INPUT_PULLUP);
   pinMode(input_pot, INPUT);
   pinMode(output, OUTPUT);
-  digitalWrite(output, HIGH);
+  digitalWrite(output, LOW);
   log("Read EEPROM\n");
   dit = EEPROM.read(20);
   dah = EEPROM.read(21);
-  // debug = EEPROM.read(22);
+  debug = EEPROM.read(22);
   p_buf = analogRead(input_pot);
-  adjust_length(p_buf);
+  // adjust_length(p_buf);
   log("Setup complete\n");
   log("Dit length: ");
-  log(dit);
+  log(String(dit));
   log("\n");
   log("Dah length: ");
-  log(dah);
+  log(String(dah));
   log("\n");
   log("Potentiometer: ");
-  log(p_buf);
+  log(String(p_buf));
   log("\n");
 }
 
 void loop() {
-  log(".");
-  if (digitalRead(input_dah)){
+  if (!digitalRead(input_dah)){
     send(true);
-  }else if (digitalRead(input_dit)){
+  }else if (!digitalRead(input_dit)){
     send(false);
   }
 
@@ -82,13 +84,10 @@ void loop() {
 
   if (Serial.available() > 0) {
     buf = Serial.read();
-    log("SR ");
-    log(buf);
-    log("\n");
     if ((uint16_t) buf == 13){
       process_input(serial_buffer);
       serial_buffer = "";
-    } else {
+    } else if ((uint8_t) buf > 27 ){
       serial_buffer += buf;
     }
   }
@@ -96,8 +95,8 @@ void loop() {
   delay(debounce);
 }
 
-void adjust_length(uint8_t adjusted_length){
-  uint16_t new_dah = map(adjusted_length, 0, 1023, p_min, p_max);
+void adjust_length(uint16_t adjusted_length){
+  uint16_t new_dah = map(adjusted_length, 20, 1000, p_min, p_max);
   set_length(new_dah/2, new_dah);
 }
 
@@ -111,11 +110,20 @@ void process_input(String input){
   log(input);
   log("\n");
   char command = input[0];
-  input.remove(0);
+  input.remove(0,1);
+  log("Command: ");
+  log(String(command));
+  log(" - ");
+  log(input);
+  log("\n");
   uint16_t length = 0;
+
+  if (islower(command)){
+    command = toupper(command);
+  }
   switch(command){
   case 'S':
-    // TODO
+    key_string(input);
     break;
   case 'I':
     length = input.toInt();
@@ -126,7 +134,8 @@ void process_input(String input){
     set_length(dit, length);
     break;
   case 'D':
-    debug = input.toInt()==1;
+    debug = boolean(input.toInt()==1);
+    log("Debug mode enabled");
     EEPROM.write(22, debug);
     break;
   default:
@@ -135,20 +144,47 @@ void process_input(String input){
   }
 }
 
+void key_string(String input){
+  // log("Sending string: ");
+  // log(input);
+  // log("\n");
+  uint8_t b = 0; 
+  for (uint8_t i = 0; i < input.length(); i++){
+    char c = input[i];
+    if ((uint8_t)c != 32){
+      b = convertASCII(c);
+      for(uint8_t y = 0; y < strlen(morseCode[b]); y++){
+        send(morseCode[b][y] == '.');
+        delay(dit);
+      }
+      if(debug){
+        Serial.print(' ');
+      }
+      delay(dit);
+    } else {
+      if (debug){
+        Serial.println("");
+      }
+      delay(dah);
+    }
+  }
+}
+
 void send(bool b) {
-  log("Sending ");
-  log(b?"dah":"dit");
-  log("\n");
-  digitalWrite(output, LOW);
-  delay(b?dit:dah);
+  if (debug){
+    Serial.print(b?"+":"=");
+  }
   digitalWrite(output, HIGH);
+  delay(b?dit:dah);
+  digitalWrite(output, LOW);
 }
 
 void set_length(uint16_t length_dit, uint16_t length_dah) {
   log("Setting dit length to ");
-  log(length_dit);
+  log(String(length_dit));
   log(" and dah length to ");
-  log(length_dah);
+  log(String(length_dah));
+  log("\n");
   dit = length_dit;
   dah = length_dah;
   EEPROM.write(20, length_dit);