joe/PlatformIO_GarageDoorMonitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

just some reformatting - no code changes

Browse Source
This commit is contained in:
Joe Tretter
2022-07-05 14:18:19 -05:00
parent c372dcd95d
commit 22783a6e58
1 changed files with 151 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
src/main.cpp
View File

@@ -1,13 +1,13 @@
#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 <WiFiClient.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* ssid = "JoNelsDarlings";
@@ -17,7 +17,7 @@ const char* mqtt_server = "mqtt.ddns.kawomi.com";
const int buttonPin = 4; // Reed switch - don't forget the pull down resistor.
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;
WebServer server(80);
WiFiClient espClient;
@@ -55,8 +55,8 @@ const char* loginIndex =
"<td><input type='submit' onclick='check(this.form)' value='Login'></td>"
"</tr>"
"</table>"
"</form>"
"<script>"
"</form>"
"<script>"
"function check(form)"
"{"
"if(form.userid.value=='admin' && form.pwd.value=='admin')"
@@ -68,15 +68,18 @@ const char* loginIndex =
" alert('Error Password or Username')/*displays error message*/"
"}"
"}"
"</script>";
"</script>";
/*
* Server Index Page
*/
const char* serverIndex =
"<script src='https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js'></script>"
"<form method='POST' action='#' enctype='multipart/form-data' id='upload_form'>"
"<script "
"src='https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js'></"
"script>"
"<form method='POST' action='#' enctype='multipart/form-data' "
"id='upload_form'>"
"<input type='file' name='update'>"
"<input type='submit' value='Update'>"
"</form>"
@@ -111,15 +114,14 @@ const char* serverIndex =
"});"
"</script>";
void send_notification(String subject){
//return;
void send_notification(String subject) {
// return;
Serial.println("Sending Notification.");
WiFiClientSecure client;
client.setInsecure(); // NOT RECOMMENDED
const char* host="deadswitch.kawomi.com";
const int port=443;
if (!client.connect(host,port)) {
const char* host = "deadswitch.kawomi.com";
const int port = 443;
if (!client.connect(host, port)) {
Serial.println("connection failed");
return;
}
@@ -127,15 +129,12 @@ void send_notification(String subject){
String url = "/api/v1?topic=" + subject + "&secs=0&email=none";
Serial.print("Requesting URL: ");
Serial.println(url);
client.print(String("POST ") + url + " HTTP/1.1\r\n" +
"Host: " + host + "\r\n" +
"Content-Type: application/x-www-form-urlencoded\r\n" +
"Content-Length: 14\r\n\r\n" +
"platform=esp32\r\n");
client.print(String("POST ") + url + " HTTP/1.1\r\n" + "Host: " + host +
"\r\n" + "Content-Type: application/x-www-form-urlencoded\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);
StaticJsonDocument<CAPACITY> doc;
@@ -148,7 +147,7 @@ void send_mqtt(String value){
serializeJson(doc, sensorStatus);
Serial.println(sensorStatus);
mqttClient.publish("Address/Livorno/Garagedoor", sensorStatus,true);
mqttClient.publish("Address/Livorno/Garagedoor", sensorStatus, true);
}
void reconnect() {
@@ -172,7 +171,6 @@ void reconnect() {
}
}
/*
* setup function
*/
@@ -185,8 +183,8 @@ void setup(void) {
pinMode(ledPin, OUTPUT);
// if we stat up we need to see what the status is...
digitalWrite(ledPin, previousState= digitalRead(buttonPin));
Serial.printf("Initial State: %d",previousState);
digitalWrite(ledPin, previousState = digitalRead(buttonPin));
Serial.printf("Initial State: %d", previousState);
randomSeed(micros());
@@ -200,7 +198,8 @@ void setup(void) {
delay(500);
Serial.print(".");
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();
}
}
@@ -212,7 +211,7 @@ void setup(void) {
Serial.println(WiFi.localIP());
/*use mdns for host name resolution*/
if (!MDNS.begin(host)) { //http://esp32garagedoor.local
if (!MDNS.begin(host)) { // http://esp32garagedoor.local
while (1) {
Serial.println("Error setting up MDNS responder!");
delay(1000);
@@ -223,11 +222,11 @@ void setup(void) {
mqttClient.setServer(mqtt_server, 1883);
Serial.println("mqtt server set.");
if(!SPIFFS.begin(true)){
if (!SPIFFS.begin(true)) {
Serial.println("An Error has occurred while mounting SPIFFS");
}
//send_mqtt("rebooted");
// send_mqtt("rebooted");
send_notification("garagedoor.rebooted.livorno.address");
/*return index page which is stored in serverIndex */
@@ -243,7 +242,7 @@ void setup(void) {
}
while (file.available()) {
thePage+=String((char)file.read());
thePage += String((char)file.read());
}
file.close();
@@ -251,15 +250,16 @@ void setup(void) {
});
server.on("/status", HTTP_GET, []() {
server.sendHeader("Connection", "close");
boolean isOpen=digitalRead(buttonPin)==HIGH;
server.send(200, "application/json", "{ \"isOpen\": " + String(isOpen?"true":"false") + " }");
//send_mqtt("statusquery");
boolean isOpen = digitalRead(buttonPin) == HIGH;
server.send(200, "application/json",
"{ \"isOpen\": " + String(isOpen ? "true" : "false") + " }");
// send_mqtt("statusquery");
});
server.on("/sendmqtt", HTTP_GET, []() {
server.sendHeader("Connection", "close");
server.send(200, "text/html", "mqtt resend.");
bForceResend=true;
bForceResend = true;
});
server.on("/serverIndex", HTTP_GET, []() {
@@ -267,25 +267,32 @@ void setup(void) {
server.send(200, "text/html", serverIndex);
});
/*handling uploading firmware file */
server.on("/update", HTTP_POST, []() {
server.on(
"/update", HTTP_POST,
[]() {
server.sendHeader("Connection", "close");
server.send(200, "text/plain", (Update.hasError()) ? "FAIL" : "OK");
ESP.restart();
}, []() {
},
[]() {
HTTPUpload& upload = server.upload();
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
if (!Update.begin(
UPDATE_SIZE_UNKNOWN)) { // start with max available size
Update.printError(Serial);
}
} else if (upload.status == UPLOAD_FILE_WRITE) {
/* flashing firmware to ESP*/
if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) {
if (Update.write(upload.buf, upload.currentSize) !=
upload.currentSize) {
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);
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);
}
@@ -306,19 +313,19 @@ void loop(void) {
int buttonState = digitalRead(buttonPin);
if (buttonState!=previousState || bForceResend ){
bForceResend=false;
if (buttonState != previousState || bForceResend) {
bForceResend = false;
if (buttonState == HIGH) {
digitalWrite(ledPin, HIGH);
Serial.println("Garage Opened");
//send_notification("garagedoor.opened.livorno.address");
// send_notification("garagedoor.opened.livorno.address");
send_mqtt("opened");
} else {
digitalWrite(ledPin, LOW);
Serial.println("Garage Closed");
//send_notification("garagedoor.closed.livorno.address");
// send_notification("garagedoor.closed.livorno.address");
send_mqtt("closed");
}
previousState=buttonState;
previousState = buttonState;
}
}