W1CDN/vulpes
1
0
Fork 0
Code Issues 20 Pull Requests 1 Packages Projects Releases Wiki Activity

Webform switch between continuous and cycle sending #12

Merged
W1CDN merged 9 commits from continuous-or-cycle into main 2023-09-02 18:49:25 -05:00
Conversation 6 Commits 9 Files Changed 1 +18 -19
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cc4d798a03 - Show all commits

37
vulpes/src/main.cpp
View File

@ -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