From cc4d798a03ae4fb38b729cd37ad32e9273d039b0 Mon Sep 17 00:00:00 2001
From: mattbk <mattbk@users.noreply.github.com>
Date: Thu, 31 Aug 2023 23:09:21 -0500
Subject: [PATCH] Get back to working.

---
 vulpes/src/main.cpp | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/vulpes/src/main.cpp b/vulpes/src/main.cpp
index 7c48b99..e782b69 100644
--- a/vulpes/src/main.cpp
+++ b/vulpes/src/main.cpp
@@ -60,14 +60,14 @@ const char index_html[] PROGMEM = R"rawliteral(
   <form action="/get" target="hidden-form">
     inputString (current value %inputString%): <input type="text" name="inputString" value=%inputString%><br>
 
-    Sending program (cycle doesn't work yet):
+    Sending program (cycle doesn't work yet) (current %inputSend%):
     <select name="inputSend" id="send-program">
       <option value="0">Off</option>
       <option value="1">Continuous</option>
       <option value="2">Cycle</option>
     </select><br>
 
-    Message:
+    Message (current %inputMsg%):
     <select name="inputMsg" id="message">
       <option value="0">CQ CQ CQ DE W1CDN</option>
       <option value="1">MOE</option>
@@ -77,7 +77,7 @@ const char index_html[] PROGMEM = R"rawliteral(
       <option value="5">MO5</option>
     </select><br>
     
-    WPM (current value %inputWPM%): <input type="number " name="inputWPM" value = %inputWPM%> (doesn't work yet)<br>
+    <!-- WPM (current value %inputWPM%): <input type="number " name="inputWPM" value = %inputWPM%> (doesn't work yet)<br> -->
 
     inputFloat (current value %inputFloat%): <input type="number " name="inputFloat" value = %inputFloat%><br>
     <input type="submit" value="Submit" onclick="submitMessage()">
@@ -265,7 +265,7 @@ int wpm = 10;
 int ms_per_dit = 120; //1000 * (60 / (50 * wpm));
 int word_space_ms = ms_per_dit * 7;
 // Hardcoding these for now, will come back and make it more flexible.
-MorseEffect morseEffect("CQ CQ CQ DE W1CDN", ms_per_dit);
+MorseEffect morseEffectCQ("CQ CQ CQ DE W1CDN", ms_per_dit);
 MorseEffect morseEffectMOE("MOE", ms_per_dit);
 MorseEffect morseEffectMOI("MOI", ms_per_dit);
 MorseEffect morseEffectMOS("MOS", ms_per_dit);
@@ -273,7 +273,7 @@ MorseEffect morseEffectMOH("MOH", ms_per_dit);
 MorseEffect morseEffectMO5("MO5", ms_per_dit);
 
 auto morseCQ =
-    JLed(output26).UserFunc(&morseEffect).DelayAfter(word_space_ms).Forever();
+    JLed(output26).UserFunc(&morseEffectCQ).DelayAfter(word_space_ms).Forever();
 auto morseMOE =
     JLed(output26).UserFunc(&morseEffectMOE).DelayAfter(word_space_ms).Forever();
 auto morseMOI =
@@ -423,20 +423,19 @@ void loop() {
   //sender.continueSending();
 
   // See which message we are sending
-  auto morseToSend = JLed(output26);
-  if(yourInputMsg == 0){
-    morseToSend = morseCQ;
-  } else if(yourInputMsg == 1){
-    morseToSend = morseMOE;
-  } else if(yourInputMsg == 2){
-    morseToSend = morseMOI;
-  } else if(yourInputMsg == 3){
-    morseToSend = morseMOS;
-  } else if(yourInputMsg == 4){
-    morseToSend = morseMOH;
-  } else if(yourInputMsg == 5){
-    morseToSend = morseMO5;
-  }
+  // if(yourInputMsg == 0){
+  //   morseToSend = JLed(output26).UserFunc(&morseEffectCQ).DelayAfter(word_space_ms).Forever();
+  // } else if(yourInputMsg == 1){
+  //   morseToSend = morseMOE;
+  // } else if(yourInputMsg == 2){
+  //   morseToSend = morseMOI;
+  // } else if(yourInputMsg == 3){
+  //   morseToSend = morseMOS;
+  // } else if(yourInputMsg == 4){
+  //   morseToSend = morseMOH;
+  // } else if(yourInputMsg == 5){
+  //   morseToSend = morseMO5;
+  // }
 
 
   // if you want to send continuous code, and it's not sending, then start it up