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

Merge pull request 'Webform switch between continuous and cycle sending' (#12) from continuous-or-cycle into main

Browse Source 
Reviewed-on: #12
This commit is contained in:
W1CDN 2023-09-02 18:49:24 -05:00
commit ca53478b3c
1 changed files with 154 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

214
vulpes/src/main.cpp
View File

@ -34,15 +34,20 @@ const char* ssid = WIFI_SSID;
const char* password = WIFI_PASSWORD; const char* password = WIFI_PASSWORD;
const char* PARAM_STRING = "inputString"; const char* PARAM_STRING = "inputString";
const char* PARAM_INT = "inputInt"; const char* PARAM_SEND = "inputSend";
const char* PARAM_WPM = "inputWPM";
const char* PARAM_MSG = "inputMsg";
const char* PARAM_FLOAT = "inputFloat"; const char* PARAM_FLOAT = "inputFloat";
// Global variables // Global variables
String yourInputString; String yourInputString;
int yourInputInt; int yourInputSend;
int yourInputWPM;
int yourInputMsg;
int yourInputMsg_old; // to save previous state and check changes
float yourInputFloat; float yourInputFloat;
// HTML web page to handle 3 input fields (inputString, inputInt, inputFloat) // HTML web page to handle 3 input fields (inputString, inputSend, inputFloat)
const char index_html[] PROGMEM = R"rawliteral( const char index_html[] PROGMEM = R"rawliteral(
<!DOCTYPE HTML><html><head> <!DOCTYPE HTML><html><head>
<title>ESP Input Form</title> <title>ESP Input Form</title>
@ -55,17 +60,26 @@ const char index_html[] PROGMEM = R"rawliteral(
</script></head><body> </script></head><body>
<form action="/get" target="hidden-form"> <form action="/get" target="hidden-form">
inputString (current value %inputString%): <input type="text" name="inputString" value=%inputString%><br> inputString (current value %inputString%): <input type="text" name="inputString" value=%inputString%><br>
<!--
<input type="submit" value="Submit" onclick="submitMessage()"> Sending program (cycle doesn't work yet) (current value: <b>%inputSend%</b>):
</form><br> <select name="inputSend" id="send-program">
<form action="/get" target="hidden-form"> <option value="0">0 -Off</option>
--> <option value="1">1 - Continuous</option>
Seconds between flash (current value %inputInt%): <input type="number " name="inputInt" value = %inputInt%><br> <option value="2">2 - Cycle</option>
<!-- </select><br>
<input type="submit" value="Submit" onclick="submitMessage()">
</form><br> Message (current value <b>%inputMsg%</b>):
<form action="/get" target="hidden-form"> <select name="inputMsg" id="message">
--> <option value="0">0 - CQ CQ CQ DE W1CDN</option>
<option value="1">1 - MOE</option>
<option value="2">2 - MOI</option>
<option value="3">3 - MOS</option>
<option value="4">4 - MOH</option>
<option value="5">5 - MO5</option>
</select><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> inputFloat (current value %inputFloat%): <input type="number " name="inputFloat" value = %inputFloat%><br>
<input type="submit" value="Submit" onclick="submitMessage()"> <input type="submit" value="Submit" onclick="submitMessage()">
</form> </form>
@ -103,11 +117,6 @@ bool toggle_gpio_26(void *) {
return true; // keep timer active? true return true; // keep timer active? true
} }
// defaults
// String yourInputString;
// int yourInputInt;
// float yourInputFloat;
void notFound(AsyncWebServerRequest *request) { void notFound(AsyncWebServerRequest *request) {
request->send(404, "text/plain", "Not found"); request->send(404, "text/plain", "Not found");
} }
@ -144,14 +153,20 @@ void writeFile(fs::FS &fs, const char * path, const char * message){
file.close(); file.close();
} }
// Replaces placeholder with stored values // Replaces placeholder in web UI with stored values
String processor(const String& var){ String processor(const String& var){
//Serial.println(var); //Serial.println(var);
if(var == "inputString"){ if(var == "inputString"){
return readFile(SPIFFS, "/inputString.txt"); return readFile(SPIFFS, "/inputString.txt");
} }
else if(var == "inputInt"){ else if(var == "inputSend"){
return readFile(SPIFFS, "/inputInt.txt"); return readFile(SPIFFS, "/inputSend.txt");
}
else if(var == "inputWPM"){
return readFile(SPIFFS, "/inputWPM.txt");
}
else if(var == "inputMsg"){
return readFile(SPIFFS, "/inputMsg.txt");
} }
else if(var == "inputFloat"){ else if(var == "inputFloat"){
return readFile(SPIFFS, "/inputFloat.txt"); return readFile(SPIFFS, "/inputFloat.txt");
@ -247,9 +262,30 @@ class MorseEffect : public jled::BrightnessEvaluator {
// Speed is milliseconds per dit, which is 1000 * (60 / (50 * WPM)) // Speed is milliseconds per dit, which is 1000 * (60 / (50 * WPM))
// 60 is 20 wpm, 120 is 10 wpm, 90 is 15 wpm, etc. // 60 is 20 wpm, 120 is 10 wpm, 90 is 15 wpm, etc.
// https://morsecode.world/international/timing.html // https://morsecode.world/international/timing.html
MorseEffect morseEffect("CQ CQ CQ DE W1CDN", 120); float wpm = 10;
auto morseLed = float ms_per_dit = 1000 * (60 / (50 * wpm));
JLed(output26).UserFunc(&morseEffect).DelayAfter(2000).Forever(); int word_space_ms = ms_per_dit * 7;
// Hardcoding these for now, will come back and make it more flexible.
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);
MorseEffect morseEffectMOH("MOH", ms_per_dit);
MorseEffect morseEffectMO5("MO5", ms_per_dit);
auto morseCQ =
JLed(output26).UserFunc(&morseEffectCQ).DelayAfter(word_space_ms).Forever();
auto morseMOE =
JLed(output26).UserFunc(&morseEffectMOE).DelayAfter(word_space_ms).Forever();
auto morseMOI =
JLed(output26).UserFunc(&morseEffectMOI).DelayAfter(word_space_ms).Forever();
auto morseMOS =
JLed(output26).UserFunc(&morseEffectMOS).DelayAfter(word_space_ms).Forever();
auto morseMOH =
JLed(output26).UserFunc(&morseEffectMOH).DelayAfter(word_space_ms).Forever();
auto morseMO5 =
JLed(output26).UserFunc(&morseEffectMO5).DelayAfter(word_space_ms).Forever();
auto morseToSend = morseCQ; // set this up to overwrite later
//================================================================================ //================================================================================
// setup(): stuff that only gets done once, after power up (KB1OIQ's description) // setup(): stuff that only gets done once, after power up (KB1OIQ's description)
@ -285,11 +321,48 @@ void setup() {
} }
//#endif //#endif
// Make sure files exist, maybe with defaults here
// if(SPIFFS.exists("/inputString.txt") == 0){
// writeFile(SPIFFS, "/inputString.txt", "CQ");
// }
// if(SPIFFS.exists("/inputSend.txt") == 0){
// writeFile(SPIFFS, "/inputSend.txt", "0");
// }
// if(SPIFFS.exists("/inputWPM.txt") == 0){
// writeFile(SPIFFS, "/inputWPM.txt", "10");
// }
// if(SPIFFS.exists("/inputMsg.txt") == 0){
// writeFile(SPIFFS, "/inputMsg.txt", "0");
// }
// if(SPIFFS.exists("/inputFloat.txt") == 0){
// writeFile(SPIFFS, "/inputFloat.txt", "1.1");
// }
// Read in existing data // Read in existing data
yourInputString = readFile(SPIFFS, "/inputString.txt"); yourInputString = readFile(SPIFFS, "/inputString.txt");
yourInputInt = readFile(SPIFFS, "/inputInt.txt").toInt(); yourInputSend = readFile(SPIFFS, "/inputSend.txt").toInt();
yourInputWPM = readFile(SPIFFS, "/inputWPM.txt").toInt();
yourInputMsg = readFile(SPIFFS, "/inputMsg.txt").toInt();
yourInputFloat = readFile(SPIFFS, "/inputFloat.txt").toFloat(); yourInputFloat = readFile(SPIFFS, "/inputFloat.txt").toFloat();
// On restart, keep doing what you were doing before
yourInputMsg_old = yourInputMsg;
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;
}
WiFi.mode(WIFI_STA); WiFi.mode(WIFI_STA);
WiFi.begin(ssid, password); WiFi.begin(ssid, password);
if (WiFi.waitForConnectResult() != WL_CONNECTED) { if (WiFi.waitForConnectResult() != WL_CONNECTED) {
@ -314,11 +387,25 @@ void setup() {
writeFile(SPIFFS, "/inputString.txt", inputMessage.c_str()); writeFile(SPIFFS, "/inputString.txt", inputMessage.c_str());
yourInputString = inputMessage; yourInputString = inputMessage;
} }
// GET inputInt value on <ESP_IP>/get?inputInt=<inputMessage> // GET inputSend value on <ESP_IP>/get?inputSend=<inputMessage>
if (request->hasParam(PARAM_INT)) { if (request->hasParam(PARAM_SEND)) {
inputMessage = request->getParam(PARAM_INT)->value(); inputMessage = request->getParam(PARAM_SEND)->value();
writeFile(SPIFFS, "/inputInt.txt", inputMessage.c_str()); writeFile(SPIFFS, "/inputSend.txt", inputMessage.c_str());
yourInputInt = inputMessage.toInt(); yourInputSend = inputMessage.toInt();
}
// GET inputWPM value on <ESP_IP>/get?inputWPM=<inputMessage>
if (request->hasParam(PARAM_WPM)) {
inputMessage = request->getParam(PARAM_WPM)->value();
writeFile(SPIFFS, "/inputWPM.txt", inputMessage.c_str());
yourInputWPM = inputMessage.toInt();
}
// GET inputMsg value on <ESP_IP>/get?inputMsg=<inputMessage>
if (request->hasParam(PARAM_MSG)) {
inputMessage = request->getParam(PARAM_MSG)->value();
writeFile(SPIFFS, "/inputMsg.txt", inputMessage.c_str());
// save previous state
yourInputMsg_old = yourInputMsg;
yourInputMsg = inputMessage.toInt();
} }
// GET inputFloat value on <ESP_IP>/get?inputFloat=<inputMessage> // GET inputFloat value on <ESP_IP>/get?inputFloat=<inputMessage>
if (request->hasParam(PARAM_FLOAT)) { if (request->hasParam(PARAM_FLOAT)) {
@ -331,10 +418,6 @@ void setup() {
// } // }
request->send(200, "text/plain", inputMessage); request->send(200, "text/plain", inputMessage);
// // Update data from files
// String yourInputString = readFile(SPIFFS, "/inputString.txt");
// int yourInputInt = readFile(SPIFFS, "/inputInt.txt").toInt();
// float yourInputFloat = readFile(SPIFFS, "/inputFloat.txt").toFloat();
}); });
server.onNotFound(notFound); server.onNotFound(notFound);
server.begin(); server.begin();
@ -360,26 +443,51 @@ void loop() {
//arduinomorse //arduinomorse
//sender.continueSending(); //sender.continueSending();
//String yourInputString = readFile(SPIFFS, "/inputString.txt"); // See which message we are sending
//int yourInputInt = readFile(SPIFFS, "/inputInt.txt").toInt(); // Only do this when the message has been updated.
// float yourInputFloat = readFile(SPIFFS, "/inputFloat.txt").toFloat(); if(yourInputMsg != yourInputMsg_old){
//morseToSend.Stop(JLed::eStopMode::FULL_OFF).Update();
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 you want to send code, and it's not sending, then start it up
if((yourInputInt != 0) & (morseLed.IsRunning() == false)){ // if you want to send continuous code, and it's not sending, then start it up
if((yourInputSend == 1) & (morseToSend.IsRunning() == false)){
//jled //jled
morseLed.Reset().Update(); morseToSend.Reset().Update();
//morse.send("CQ CQ CQ DE W1CDN K"); //etherkit morse //morse.send("CQ CQ CQ DE W1CDN K"); //etherkit morse
//telegraph26.send("CQ CQ CQ DE W1CDN K"); //telegraph //telegraph26.send("CQ CQ CQ DE W1CDN K"); //telegraph
// if you want to send code, and it is sending, keep sending // if you want to send continuous code, and it is sending, keep sending
} else if((yourInputInt != 0) & (morseLed.IsRunning() == true)){ } else if((yourInputSend == 1) & (morseToSend.IsRunning() == true)){
morseLed.Update(); morseToSend.Update();
// if you want to send cycle code and it is sending, keep sending
} else if((yourInputSend == 2) & (morseToSend.IsRunning() == true)){
morseToSend.Update();
// if you want to send cycle code and it's not sending, then start it up
} else if((yourInputSend == 2) & (morseToSend.IsRunning() == true)){
morseToSend.Reset().Update();
// if you don't want to send code // if you don't want to send code
} else { } else {
// stop sending and make sure the pin is off // stop sending and make sure the pin is off
morseLed.Stop(JLed::eStopMode::FULL_OFF).Update(); morseToSend.Stop(JLed::eStopMode::FULL_OFF).Update();
} }
morseLed.Update(); morseToSend.Update();
@ -398,18 +506,4 @@ void loop() {
// output26State = "off"; // output26State = "off";
// } // }
// // To access your stored values on inputString, inputInt, inputFloat
// String yourInputString = readFile(SPIFFS, "/inputString.txt");
// Serial.print("*** Your inputString: ");
// Serial.println(yourInputString);
// int yourInputInt = readFile(SPIFFS, "/inputInt.txt").toInt();
// Serial.print("*** Your inputInt: ");
// Serial.println(yourInputInt);
// float yourInputFloat = readFile(SPIFFS, "/inputFloat.txt").toFloat();
// Serial.print("*** Your inputFloat: ");
// Serial.println(yourInputFloat);
// delay(5000);
} }