just some reformatting - no code changes

This commit is contained in:
Joe Tretter
2022-07-05 14:18:19 -05:00
parent c372dcd95d
commit 22783a6e58

View File

@@ -1,13 +1,13 @@
#include <Arduino.h> #include <Arduino.h>
#include <ArduinoJson.h>
#include <ESPmDNS.h>
#include <PubSubClient.h>
#include <SPIFFS.h>
#include <Update.h>
#include <WebServer.h>
#include <WiFi.h> #include <WiFi.h>
#include <WiFiClient.h> #include <WiFiClient.h>
#include <WiFiClientSecure.h> #include <WiFiClientSecure.h>
#include <WebServer.h>
#include <ESPmDNS.h>
#include <Update.h>
#include <SPIFFS.h>
#include <ArduinoJson.h>
#include <PubSubClient.h>
const char* host = "esp32gragedoor"; const char* host = "esp32gragedoor";
const char* ssid = "JoNelsDarlings"; const char* ssid = "JoNelsDarlings";
@@ -15,48 +15,48 @@ const char* password = "Paris2016";
const char* mqtt_server = "mqtt.ddns.kawomi.com"; const char* mqtt_server = "mqtt.ddns.kawomi.com";
const int buttonPin = 4; // Reed switch - don't forget the pull down resistor. const int buttonPin = 4; // Reed switch - don't forget the pull down resistor.
const int ledPin = 2; // Internal LED const int ledPin = 2; // Internal LED
boolean bForceResend=true; // send initial state to mqtt on startup. boolean bForceResend = true; // send initial state to mqtt on startup.
int previousState; int previousState;
WebServer server(80); WebServer server(80);
WiFiClient espClient; WiFiClient espClient;
PubSubClient mqttClient(espClient); PubSubClient mqttClient(espClient);
#define MSG_BUFFER_SIZE (50) #define MSG_BUFFER_SIZE (50)
char msg[MSG_BUFFER_SIZE]; char msg[MSG_BUFFER_SIZE];
/* /*
* Login page * Login page
*/ */
const char* loginIndex = const char* loginIndex =
"<form name='loginForm'>" "<form name='loginForm'>"
"<table width='20%' bgcolor='A09F9F' align='center'>" "<table width='20%' bgcolor='A09F9F' align='center'>"
"<tr>" "<tr>"
"<td colspan=2>" "<td colspan=2>"
"<center><font size=4><b>ESP32 Login Page</b></font></center>" "<center><font size=4><b>ESP32 Login Page</b></font></center>"
"<br>" "<br>"
"</td>" "</td>"
"<br>" "<br>"
"<br>" "<br>"
"</tr>" "</tr>"
"<td>Username:</td>" "<td>Username:</td>"
"<td><input type='text' size=25 name='userid'><br></td>" "<td><input type='text' size=25 name='userid'><br></td>"
"</tr>" "</tr>"
"<br>" "<br>"
"<br>" "<br>"
"<tr>" "<tr>"
"<td>Password:</td>" "<td>Password:</td>"
"<td><input type='Password' size=25 name='pwd'><br></td>" "<td><input type='Password' size=25 name='pwd'><br></td>"
"<br>" "<br>"
"<br>" "<br>"
"</tr>" "</tr>"
"<tr>" "<tr>"
"<td><input type='submit' onclick='check(this.form)' value='Login'></td>" "<td><input type='submit' onclick='check(this.form)' value='Login'></td>"
"</tr>" "</tr>"
"</table>" "</table>"
"</form>" "</form>"
"<script>" "<script>"
"function check(form)" "function check(form)"
"{" "{"
"if(form.userid.value=='admin' && form.pwd.value=='admin')" "if(form.userid.value=='admin' && form.pwd.value=='admin')"
@@ -68,58 +68,60 @@ const char* loginIndex =
" alert('Error Password or Username')/*displays error message*/" " alert('Error Password or Username')/*displays error message*/"
"}" "}"
"}" "}"
"</script>"; "</script>";
/* /*
* Server Index Page * Server Index Page
*/ */
const char* serverIndex = const char* serverIndex =
"<script src='https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js'></script>" "<script "
"<form method='POST' action='#' enctype='multipart/form-data' id='upload_form'>" "src='https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js'></"
"<input type='file' name='update'>" "script>"
"<input type='submit' value='Update'>" "<form method='POST' action='#' enctype='multipart/form-data' "
"id='upload_form'>"
"<input type='file' name='update'>"
"<input type='submit' value='Update'>"
"</form>" "</form>"
"<div id='prg'>progress: 0%</div>" "<div id='prg'>progress: 0%</div>"
"<script>" "<script>"
"$('form').submit(function(e){" "$('form').submit(function(e){"
"e.preventDefault();" "e.preventDefault();"
"var form = $('#upload_form')[0];" "var form = $('#upload_form')[0];"
"var data = new FormData(form);" "var data = new FormData(form);"
" $.ajax({" " $.ajax({"
"url: '/update'," "url: '/update',"
"type: 'POST'," "type: 'POST',"
"data: data," "data: data,"
"contentType: false," "contentType: false,"
"processData:false," "processData:false,"
"xhr: function() {" "xhr: function() {"
"var xhr = new window.XMLHttpRequest();" "var xhr = new window.XMLHttpRequest();"
"xhr.upload.addEventListener('progress', function(evt) {" "xhr.upload.addEventListener('progress', function(evt) {"
"if (evt.lengthComputable) {" "if (evt.lengthComputable) {"
"var per = evt.loaded / evt.total;" "var per = evt.loaded / evt.total;"
"$('#prg').html('progress: ' + Math.round(per*100) + '%');" "$('#prg').html('progress: ' + Math.round(per*100) + '%');"
"}" "}"
"}, false);" "}, false);"
"return xhr;" "return xhr;"
"}," "},"
"success:function(d, s) {" "success:function(d, s) {"
"console.log('success!')" "console.log('success!')"
"}," "},"
"error: function (a, b, c) {" "error: function (a, b, c) {"
"}" "}"
"});" "});"
"});" "});"
"</script>"; "</script>";
void send_notification(String subject) {
void send_notification(String subject){ // return;
//return;
Serial.println("Sending Notification."); Serial.println("Sending Notification.");
WiFiClientSecure client; WiFiClientSecure client;
client.setInsecure(); // NOT RECOMMENDED client.setInsecure(); // NOT RECOMMENDED
const char* host="deadswitch.kawomi.com"; const char* host = "deadswitch.kawomi.com";
const int port=443; const int port = 443;
if (!client.connect(host,port)) { if (!client.connect(host, port)) {
Serial.println("connection failed"); Serial.println("connection failed");
return; return;
} }
@@ -127,28 +129,25 @@ void send_notification(String subject){
String url = "/api/v1?topic=" + subject + "&secs=0&email=none"; String url = "/api/v1?topic=" + subject + "&secs=0&email=none";
Serial.print("Requesting URL: "); Serial.print("Requesting URL: ");
Serial.println(url); Serial.println(url);
client.print(String("POST ") + url + " HTTP/1.1\r\n" + client.print(String("POST ") + url + " HTTP/1.1\r\n" + "Host: " + host +
"Host: " + host + "\r\n" + "\r\n" + "Content-Type: application/x-www-form-urlencoded\r\n" +
"Content-Type: application/x-www-form-urlencoded\r\n" + "Content-Length: 14\r\n\r\n" + "platform=esp32\r\n");
"Content-Length: 14\r\n\r\n" +
"platform=esp32\r\n");
} }
void send_mqtt(String value){ void send_mqtt(String value) {
const size_t CAPACITY = JSON_OBJECT_SIZE(1); const size_t CAPACITY = JSON_OBJECT_SIZE(1);
StaticJsonDocument<CAPACITY> doc; StaticJsonDocument<CAPACITY> doc;
// create an object
JsonObject object = doc.to<JsonObject>();
object["status"] = value.c_str();
// serialize the object and send the result to Serial
static char sensorStatus[150];
serializeJson(doc, sensorStatus);
Serial.println(sensorStatus);
mqttClient.publish("Address/Livorno/Garagedoor", sensorStatus,true); // create an object
JsonObject object = doc.to<JsonObject>();
object["status"] = value.c_str();
// serialize the object and send the result to Serial
static char sensorStatus[150];
serializeJson(doc, sensorStatus);
Serial.println(sensorStatus);
mqttClient.publish("Address/Livorno/Garagedoor", sensorStatus, true);
} }
void reconnect() { void reconnect() {
@@ -172,21 +171,20 @@ void reconnect() {
} }
} }
/* /*
* setup function * setup function
*/ */
void setup(void) { void setup(void) {
Serial.begin(9600); Serial.begin(9600);
delay(500); delay(500);
Serial.println(">>>>>>>>>> Garage Door Monitor <<<<<<<<<<<<<<"); Serial.println(">>>>>>>>>> Garage Door Monitor <<<<<<<<<<<<<<");
pinMode(buttonPin, INPUT); pinMode(buttonPin, INPUT);
pinMode(ledPin, OUTPUT); pinMode(ledPin, OUTPUT);
// if we stat up we need to see what the status is... // if we stat up we need to see what the status is...
digitalWrite(ledPin, previousState= digitalRead(buttonPin)); digitalWrite(ledPin, previousState = digitalRead(buttonPin));
Serial.printf("Initial State: %d",previousState); Serial.printf("Initial State: %d", previousState);
randomSeed(micros()); randomSeed(micros());
@@ -200,7 +198,8 @@ void setup(void) {
delay(500); delay(500);
Serial.print("."); Serial.print(".");
if (wifiConnAttements++ > 120) { if (wifiConnAttements++ > 120) {
Serial.println("<Wifi not connecting after 120 attmepts (1 min.) - rebooting>"); Serial.println(
"<Wifi not connecting after 120 attmepts (1 min.) - rebooting>");
ESP.restart(); ESP.restart();
} }
} }
@@ -212,7 +211,7 @@ void setup(void) {
Serial.println(WiFi.localIP()); Serial.println(WiFi.localIP());
/*use mdns for host name resolution*/ /*use mdns for host name resolution*/
if (!MDNS.begin(host)) { //http://esp32garagedoor.local if (!MDNS.begin(host)) { // http://esp32garagedoor.local
while (1) { while (1) {
Serial.println("Error setting up MDNS responder!"); Serial.println("Error setting up MDNS responder!");
delay(1000); delay(1000);
@@ -223,11 +222,11 @@ void setup(void) {
mqttClient.setServer(mqtt_server, 1883); mqttClient.setServer(mqtt_server, 1883);
Serial.println("mqtt server set."); Serial.println("mqtt server set.");
if(!SPIFFS.begin(true)){ if (!SPIFFS.begin(true)) {
Serial.println("An Error has occurred while mounting SPIFFS"); Serial.println("An Error has occurred while mounting SPIFFS");
} }
//send_mqtt("rebooted"); // send_mqtt("rebooted");
send_notification("garagedoor.rebooted.livorno.address"); send_notification("garagedoor.rebooted.livorno.address");
/*return index page which is stored in serverIndex */ /*return index page which is stored in serverIndex */
@@ -241,25 +240,26 @@ void setup(void) {
Serial.println("There was a problem opening the file for reading."); Serial.println("There was a problem opening the file for reading.");
thePage += "There was a problem opening the file for reading."; thePage += "There was a problem opening the file for reading.";
} }
while (file.available()) { while (file.available()) {
thePage+=String((char)file.read()); thePage += String((char)file.read());
} }
file.close(); file.close();
server.send(200, "text/html", thePage); server.send(200, "text/html", thePage);
}); });
server.on("/status", HTTP_GET, []() { server.on("/status", HTTP_GET, []() {
server.sendHeader("Connection", "close"); server.sendHeader("Connection", "close");
boolean isOpen=digitalRead(buttonPin)==HIGH; boolean isOpen = digitalRead(buttonPin) == HIGH;
server.send(200, "application/json", "{ \"isOpen\": " + String(isOpen?"true":"false") + " }"); server.send(200, "application/json",
//send_mqtt("statusquery"); "{ \"isOpen\": " + String(isOpen ? "true" : "false") + " }");
// send_mqtt("statusquery");
}); });
server.on("/sendmqtt", HTTP_GET, []() { server.on("/sendmqtt", HTTP_GET, []() {
server.sendHeader("Connection", "close"); server.sendHeader("Connection", "close");
server.send(200, "text/html", "mqtt resend."); server.send(200, "text/html", "mqtt resend.");
bForceResend=true; bForceResend = true;
}); });
server.on("/serverIndex", HTTP_GET, []() { server.on("/serverIndex", HTTP_GET, []() {
@@ -267,30 +267,37 @@ void setup(void) {
server.send(200, "text/html", serverIndex); server.send(200, "text/html", serverIndex);
}); });
/*handling uploading firmware file */ /*handling uploading firmware file */
server.on("/update", HTTP_POST, []() { server.on(
server.sendHeader("Connection", "close"); "/update", HTTP_POST,
server.send(200, "text/plain", (Update.hasError()) ? "FAIL" : "OK"); []() {
ESP.restart(); server.sendHeader("Connection", "close");
}, []() { server.send(200, "text/plain", (Update.hasError()) ? "FAIL" : "OK");
HTTPUpload& upload = server.upload(); ESP.restart();
if (upload.status == UPLOAD_FILE_START) { },
Serial.printf("Update: %s\n", upload.filename.c_str()); []() {
if (!Update.begin(UPDATE_SIZE_UNKNOWN)) { //start with max available size HTTPUpload& upload = server.upload();
Update.printError(Serial); if (upload.status == UPLOAD_FILE_START) {
} Serial.printf("Update: %s\n", upload.filename.c_str());
} else if (upload.status == UPLOAD_FILE_WRITE) { if (!Update.begin(
/* flashing firmware to ESP*/ UPDATE_SIZE_UNKNOWN)) { // start with max available size
if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) { Update.printError(Serial);
Update.printError(Serial); }
} } else if (upload.status == UPLOAD_FILE_WRITE) {
} else if (upload.status == UPLOAD_FILE_END) { /* flashing firmware to ESP*/
if (Update.end(true)) { //true to set the size to the current progress if (Update.write(upload.buf, upload.currentSize) !=
Serial.printf("Update Success: %u\nRebooting...\n", upload.totalSize); upload.currentSize) {
} else { Update.printError(Serial);
Update.printError(Serial); }
} } else if (upload.status == UPLOAD_FILE_END) {
} if (Update.end(
}); true)) { // true to set the size to the current progress
Serial.printf("Update Success: %u\nRebooting...\n",
upload.totalSize);
} else {
Update.printError(Serial);
}
}
});
server.begin(); server.begin();
} }
@@ -306,19 +313,19 @@ void loop(void) {
int buttonState = digitalRead(buttonPin); int buttonState = digitalRead(buttonPin);
if (buttonState!=previousState || bForceResend ){ if (buttonState != previousState || bForceResend) {
bForceResend=false; bForceResend = false;
if (buttonState == HIGH) { if (buttonState == HIGH) {
digitalWrite(ledPin, HIGH); digitalWrite(ledPin, HIGH);
Serial.println("Garage Opened"); Serial.println("Garage Opened");
//send_notification("garagedoor.opened.livorno.address"); // send_notification("garagedoor.opened.livorno.address");
send_mqtt("opened"); send_mqtt("opened");
} else { } else {
digitalWrite(ledPin, LOW); digitalWrite(ledPin, LOW);
Serial.println("Garage Closed"); Serial.println("Garage Closed");
//send_notification("garagedoor.closed.livorno.address"); // send_notification("garagedoor.closed.livorno.address");
send_mqtt("closed"); send_mqtt("closed");
} }
previousState=buttonState; previousState = buttonState;
} }
} }