From 1bde39e148706d3a8659d17a90dd4472629d08d8 Mon Sep 17 00:00:00 2001
From: mattbk <mattbk@users.noreply.github.com>
Date: Mon, 11 Sep 2023 21:09:27 -0500
Subject: [PATCH] Snapshot.

---
 vulpes/platformio.ini |  2 +-
 vulpes/src/main.cpp   | 66 +++++++++++++++++++++----------------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/vulpes/platformio.ini b/vulpes/platformio.ini
index 070e79a..9502974 100644
--- a/vulpes/platformio.ini
+++ b/vulpes/platformio.ini
@@ -22,7 +22,7 @@ lib_deps =
 	me-no-dev/ESP Async WebServer@^1.2.3
 	contrem/arduino-timer@^3.0.1
 	;kj7rrv/Telegraph@^1.0.0
-	jandelgado/JLed@^4.13.0
+	jandelgado/JLed@^4.13.1
 	;adafruit/RTClib@^2.1.1
 	https://github.com/adafruit/RTClib.git ; >=2.1.2
 	adafruit/Adafruit BusIO@^1.14.3
diff --git a/vulpes/src/main.cpp b/vulpes/src/main.cpp
index a1491e6..2e46b53 100644
--- a/vulpes/src/main.cpp
+++ b/vulpes/src/main.cpp
@@ -136,17 +136,17 @@ const char index_html[] PROGMEM = R"rawliteral(
     </select></p>
 
     <h2>Cycle Settings</h2>
+    <p>Only applies when <em>Sending Program</em> is set to "2 - Cycle". You cannot set a cycle start date more than a month in advance.</p>
     <p>Cycle start time <input type="datetime-local" id="js_start_time_unix_entry" /><br>
-    Current value: <b><span id=current-start></span></b>, but only day-of-month HH:MM:SS are used.
-    Only applies when <em>Sending Program</em> is set to "2 - Cycle". 
-    You cannot set a cycle start date more than a month in advance.
+    Current value: <b><span id=current-start></span></b>
+    
     <!-- JS converts the entered start time to a unix timestamp, and copies that value
     to this hidden field so the user doesn't have to see it. -->
     <input type="hidden" name="inputStartTimeUnix" id="js_start_time_unix" /></p>
     <p>
-      Step length: <input type="number" name="inputStepLength" value = %inputStepLength%><br>
-      Cycle ID: <input type="number" name="inputCycleID" value = %inputCycleID%><br>
-      Number of transmitters: <input type="number" name="inputNtransmitters" value = %inputNtransmitters%><br>
+      Step length: <input type="number" name="inputStepLength" min=1000 step=1000 value = %inputStepLength%> milliseconds <br>
+      Cycle ID: <input type="number" name="inputCycleID" min=1 value = %inputCycleID%><br>
+      Number of transmitters: <input type="number" name="inputNtransmitters" min=1 value = %inputNtransmitters%><br>
     </p>
     
     <!-- This field is hidden so people don't change the submit time (it will be wrong).
@@ -282,12 +282,12 @@ float ms_per_dit = 1000 * (60 / (50 * wpm));
 int word_space_ms = ms_per_dit * 7;
 // Hardcoding messages and WPM  for now, will come back and make it more flexible.
 // Extra space at the end to get around https://github.com/jandelgado/jled/issues/122 on cycle mode
-MorseEffect morseEffectTEST("TEST TEST TEST DE W1CDN ", ms_per_dit);
-MorseEffect morseEffectMOE("MOE ", ms_per_dit);
-MorseEffect morseEffectMOI("MOI ", ms_per_dit);
-MorseEffect morseEffectMOS("MOS ", ms_per_dit);
-MorseEffect morseEffectMOH("MOH ", ms_per_dit);
-MorseEffect morseEffectMO5("MO5 ", ms_per_dit);
+MorseEffect morseEffectTEST("TEST TEST TEST DE W1CDN", ms_per_dit);
+MorseEffect morseEffectMOE("MOE", ms_per_dit);
+MorseEffect morseEffectMOI("MOI", ms_per_dit);
+MorseEffect morseEffectMOS("MOS", ms_per_dit);
+MorseEffect morseEffectMOH("MOH", ms_per_dit);
+MorseEffect morseEffectMO5("MO5", ms_per_dit);
 
 // CW for keyer
 auto morseTEST =
@@ -321,27 +321,26 @@ auto morseToSend_blink = morseTEST_blink; // set this up to overwrite later
 
 // Cycle stuff
 auto morse_cycle = morseEffectMOS;
-int period = morse_cycle.Period();
+int period = morse_cycle.Period() + word_space_ms;
 int repeats = step_length / period;
 int remainder_wait = step_length - (period * repeats);
 int total_wait = ((step_length * (n_transmitters - 1) + remainder_wait));
+auto blinker_continuous = JLed(blinker).UserFunc(&morse_cycle).Repeat(repeats).DelayAfter(word_space_ms);
+auto blinker_continuous_wait = JLed(blinker).Off(total_wait);
 JLed morses_blink[] = {
-    // WOW it looks like you can't do Repeat() and DelayAfter() at the same time?
-    // Opened https://github.com/jandelgado/jled/issues/122
-    JLed(blinker).UserFunc(&morse_cycle).Repeat(repeats),
-    //JLed(blinker).FadeOn(1000).Repeat(3)
-    JLed(blinker).Off(total_wait)
+    blinker_continuous,
+    blinker_continuous_wait
 };
 auto morses_sequence_blink = JLedSequence(JLedSequence::eMode::SEQUENCE, morses_blink);
 
 //================================================================================
 // start_program(): a function to start the planned program at the planned time
 //================================================================================
-bool start_program(){
-  Serial.println("The scheduled program has started.");
-  startProgram = true;
-  return false;
-}
+// bool start_program(){
+//   Serial.println("The scheduled program has started.");
+//   startProgram = true;
+//   return false;
+// }
 
 //================================================================================
 // setup(): stuff that only gets done once, after power up (KB1OIQ's description)
@@ -622,17 +621,18 @@ void loop() {
 
   // Once alarm has started the program, set things up to run
   if(startProgram == true){
-  //auto morse_cycle = morseEffectMOS;
-    int period = morse_cycle.Period();
-    int repeats = step_length / period;
-    int remainder_wait = step_length - (period * repeats);
-    int total_wait = ((step_length * (n_transmitters - 1) + remainder_wait));
+    //auto morse_cycle = morseEffectMOS;
+    //int period = morse_cycle.Period() + word_space_ms;
+    //int repeats = step_length / period;
+    //int remainder_wait = step_length - (period * repeats);
+    //int total_wait = ((step_length * (n_transmitters - 1) + remainder_wait));
+
+    // Nothing makes it out of this scope...
+    blinker_continuous = JLed(blinker).UserFunc(&morse_cycle).Repeat(repeats).DelayAfter(word_space_ms);
+    blinker_continuous_wait = JLed(blinker).Off(total_wait);
     JLed morses_blink[] = {
-        // WOW it looks like you can't do Repeat() and DelayAfter() at the same time?
-        // Opened https://github.com/jandelgado/jled/issues/122
-        JLed(blinker).UserFunc(&morse_cycle).Repeat(repeats),
-        //JLed(blinker).FadeOn(1000).Repeat(3)
-        JLed(blinker).Off(total_wait)
+        blinker_continuous,
+        blinker_continuous_wait
     };
     auto morses_sequence_blink = JLedSequence(JLedSequence::eMode::SEQUENCE, morses_blink);