just some reformatting - no code changes
This commit is contained in:
76
src/main.cpp
76
src/main.cpp
@@ -1,21 +1,22 @@
|
|||||||
// Example posting to display:
|
// Example posting to display:
|
||||||
// curl -XPOST --data-binary @- -H 'Content-Type:text/plain' http://esp32oled.local/oled
|
// curl -XPOST --data-binary @- -H 'Content-Type:text/plain'
|
||||||
|
// http://esp32oled.local/oled
|
||||||
|
|
||||||
// I connected SCK to D22 and SDA to D21
|
// I connected SCK to D22 and SDA to D21
|
||||||
|
|
||||||
#include <Arduino.h>
|
|
||||||
#include <Adafruit_I2CDevice.h>
|
|
||||||
#include <Wire.h>
|
|
||||||
#include <Adafruit_GFX.h>
|
#include <Adafruit_GFX.h>
|
||||||
|
#include <Adafruit_I2CDevice.h>
|
||||||
#include <Adafruit_SSD1306.h>
|
#include <Adafruit_SSD1306.h>
|
||||||
|
#include <Arduino.h>
|
||||||
|
#include <ArduinoJson.h>
|
||||||
|
#include <ESPmDNS.h>
|
||||||
|
#include <PubSubClient.h>
|
||||||
|
#include <Update.h>
|
||||||
|
#include <WebServer.h>
|
||||||
#include <WiFi.h>
|
#include <WiFi.h>
|
||||||
#include <WiFiClient.h>
|
#include <WiFiClient.h>
|
||||||
#include <WebServer.h>
|
#include <Wire.h>
|
||||||
#include <ESPmDNS.h>
|
|
||||||
#include <Update.h>
|
|
||||||
#include <uri/UriBraces.h>
|
#include <uri/UriBraces.h>
|
||||||
#include <PubSubClient.h>
|
|
||||||
#include <ArduinoJson.h>
|
|
||||||
|
|
||||||
const char* mqtt_server = "mqtt.ddns.kawomi.com";
|
const char* mqtt_server = "mqtt.ddns.kawomi.com";
|
||||||
|
|
||||||
@@ -67,8 +68,8 @@ const char* loginIndex =
|
|||||||
"<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')"
|
||||||
@@ -80,15 +81,18 @@ 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'></"
|
||||||
|
"script>"
|
||||||
|
"<form method='POST' action='#' enctype='multipart/form-data' "
|
||||||
|
"id='upload_form'>"
|
||||||
"<input type='file' name='update'>"
|
"<input type='file' name='update'>"
|
||||||
"<input type='submit' value='Update'>"
|
"<input type='submit' value='Update'>"
|
||||||
"</form>"
|
"</form>"
|
||||||
@@ -123,7 +127,6 @@ const char* serverIndex =
|
|||||||
"});"
|
"});"
|
||||||
"</script>";
|
"</script>";
|
||||||
|
|
||||||
|
|
||||||
void reconnect() {
|
void reconnect() {
|
||||||
// Loop until we're reconnected
|
// Loop until we're reconnected
|
||||||
while (!client.connected()) {
|
while (!client.connected()) {
|
||||||
@@ -150,7 +153,7 @@ void callback(char* topic, byte* payload, unsigned int length) {
|
|||||||
Serial.print("Message arrived [");
|
Serial.print("Message arrived [");
|
||||||
Serial.print(topic);
|
Serial.print(topic);
|
||||||
|
|
||||||
String recBuf="";
|
String recBuf = "";
|
||||||
Serial.print("] ");
|
Serial.print("] ");
|
||||||
for (int i = 0; i < length; i++) {
|
for (int i = 0; i < length; i++) {
|
||||||
recBuf += (char)payload[i];
|
recBuf += (char)payload[i];
|
||||||
@@ -158,9 +161,9 @@ void callback(char* topic, byte* payload, unsigned int length) {
|
|||||||
Serial.println(recBuf);
|
Serial.println(recBuf);
|
||||||
|
|
||||||
StaticJsonDocument<1024> jsonDoc;
|
StaticJsonDocument<1024> jsonDoc;
|
||||||
deserializeJson(jsonDoc,recBuf);
|
deserializeJson(jsonDoc, recBuf);
|
||||||
const char* theText=jsonDoc["text"];
|
const char* theText = jsonDoc["text"];
|
||||||
int theSize=jsonDoc["size"];
|
int theSize = jsonDoc["size"];
|
||||||
|
|
||||||
display.setCursor(40, 0);
|
display.setCursor(40, 0);
|
||||||
display.setTextSize(9);
|
display.setTextSize(9);
|
||||||
@@ -175,8 +178,7 @@ void callback(char* topic, byte* payload, unsigned int length) {
|
|||||||
display.display();
|
display.display();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void writeToOled(String text) {
|
||||||
void writeToOled(String text){
|
|
||||||
display.clearDisplay();
|
display.clearDisplay();
|
||||||
display.setTextColor(WHITE);
|
display.setTextColor(WHITE);
|
||||||
display.setCursor(0, 0);
|
display.setCursor(0, 0);
|
||||||
@@ -193,9 +195,10 @@ void setup(void) {
|
|||||||
delay(2000);
|
delay(2000);
|
||||||
|
|
||||||
Serial.println("STARTUP");
|
Serial.println("STARTUP");
|
||||||
if(!display.begin(SSD1306_SWITCHCAPVCC, 0x3C)) { // Address 0x3D for 128x64
|
if (!display.begin(SSD1306_SWITCHCAPVCC, 0x3C)) { // Address 0x3D for 128x64
|
||||||
Serial.println(F("SSD1306 allocation failed"));
|
Serial.println(F("SSD1306 allocation failed"));
|
||||||
for(;;);
|
for (;;)
|
||||||
|
;
|
||||||
}
|
}
|
||||||
delay(2000);
|
delay(2000);
|
||||||
|
|
||||||
@@ -212,12 +215,12 @@ 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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Serial.println("");
|
Serial.println("");
|
||||||
Serial.print("Connected to ");
|
Serial.print("Connected to ");
|
||||||
Serial.println(ssid);
|
Serial.println(ssid);
|
||||||
@@ -225,7 +228,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://esp32ota.local
|
if (!MDNS.begin(host)) { // http://esp32ota.local
|
||||||
Serial.println("Error setting up MDNS responder!");
|
Serial.println("Error setting up MDNS responder!");
|
||||||
while (1) {
|
while (1) {
|
||||||
delay(1000);
|
delay(1000);
|
||||||
@@ -254,25 +257,32 @@ void setup(void) {
|
|||||||
server.send(200, "text/html", text);
|
server.send(200, "text/html", text);
|
||||||
});
|
});
|
||||||
/*handling uploading firmware file */
|
/*handling uploading firmware file */
|
||||||
server.on("/update", HTTP_POST, []() {
|
server.on(
|
||||||
|
"/update", HTTP_POST,
|
||||||
|
[]() {
|
||||||
server.sendHeader("Connection", "close");
|
server.sendHeader("Connection", "close");
|
||||||
server.send(200, "text/plain", (Update.hasError()) ? "FAIL" : "OK");
|
server.send(200, "text/plain", (Update.hasError()) ? "FAIL" : "OK");
|
||||||
ESP.restart();
|
ESP.restart();
|
||||||
}, []() {
|
},
|
||||||
|
[]() {
|
||||||
HTTPUpload& upload = server.upload();
|
HTTPUpload& upload = server.upload();
|
||||||
if (upload.status == UPLOAD_FILE_START) {
|
if (upload.status == UPLOAD_FILE_START) {
|
||||||
Serial.printf("Update: %s\n", upload.filename.c_str());
|
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);
|
Update.printError(Serial);
|
||||||
}
|
}
|
||||||
} else if (upload.status == UPLOAD_FILE_WRITE) {
|
} else if (upload.status == UPLOAD_FILE_WRITE) {
|
||||||
/* flashing firmware to ESP*/
|
/* 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);
|
Update.printError(Serial);
|
||||||
}
|
}
|
||||||
} else if (upload.status == UPLOAD_FILE_END) {
|
} else if (upload.status == UPLOAD_FILE_END) {
|
||||||
if (Update.end(true)) { //true to set the size to the current progress
|
if (Update.end(
|
||||||
Serial.printf("Update Success: %u\nRebooting...\n", upload.totalSize);
|
true)) { // true to set the size to the current progress
|
||||||
|
Serial.printf("Update Success: %u\nRebooting...\n",
|
||||||
|
upload.totalSize);
|
||||||
} else {
|
} else {
|
||||||
Update.printError(Serial);
|
Update.printError(Serial);
|
||||||
}
|
}
|
||||||
@@ -284,7 +294,6 @@ void setup(void) {
|
|||||||
client.setCallback(callback);
|
client.setCallback(callback);
|
||||||
|
|
||||||
writeToOled("Ready.");
|
writeToOled("Ready.");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void loop(void) {
|
void loop(void) {
|
||||||
@@ -295,5 +304,4 @@ void loop(void) {
|
|||||||
reconnect();
|
reconnect();
|
||||||
}
|
}
|
||||||
client.loop();
|
client.loop();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user