From 655099ab646c99b24b685d2db10cfdfc28dd37f7 Mon Sep 17 00:00:00 2001
From: Joe Tretter <j.tretter@gmail.com>
Date: Tue, 5 Jul 2022 14:18:19 -0500
Subject: [PATCH] just some reformatting -  no code changes

---
 src/main.cpp | 246 ++++++++++++++++++++++++++-------------------------
 1 file changed, 127 insertions(+), 119 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index c3839a6..0eae30a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,28 +1,29 @@
-// Example posting to display: 
-// curl -XPOST --data-binary @- -H 'Content-Type:text/plain' http://esp32oled.local/oled
+// Example posting to display:
+// curl -XPOST --data-binary @- -H 'Content-Type:text/plain'
+// http://esp32oled.local/oled
 
 // 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_I2CDevice.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 <WiFiClient.h>
-#include <WebServer.h>
-#include <ESPmDNS.h>
-#include <Update.h>
+#include <Wire.h>
 #include <uri/UriBraces.h>
-#include <PubSubClient.h>
-#include <ArduinoJson.h>
 
 const char* mqtt_server = "mqtt.ddns.kawomi.com";
 
 WiFiClient espClient;
 PubSubClient client(espClient);
 unsigned long lastMsg = 0;
-#define MSG_BUFFER_SIZE	(50)
+#define MSG_BUFFER_SIZE (50)
 char msg[MSG_BUFFER_SIZE];
 
 const char* host = "esp32oled";
@@ -32,8 +33,8 @@ const char* password = "Paris2016";
 WebServer server(80);
 
 // Declaration for an SSD1306 display connected to I2C (SDA, SCL pins)
-#define SCREEN_WIDTH 128 // OLED display width, in pixels
-#define SCREEN_HEIGHT 64 // OLED display height, in pixels
+#define SCREEN_WIDTH 128  // OLED display width, in pixels
+#define SCREEN_HEIGHT 64  // OLED display height, in pixels
 
 Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, -1);
 
@@ -41,34 +42,34 @@ Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, -1);
  * Login page
  */
 
-const char* loginIndex = 
- "<form name='loginForm'>"
+const char* loginIndex =
+    "<form name='loginForm'>"
     "<table width='20%' bgcolor='A09F9F' align='center'>"
-        "<tr>"
-            "<td colspan=2>"
-                "<center><font size=4><b>ESP32 Login Page</b></font></center>"
-                "<br>"
-            "</td>"
-            "<br>"
-            "<br>"
-        "</tr>"
-        "<td>Username:</td>"
-        "<td><input type='text' size=25 name='userid'><br></td>"
-        "</tr>"
-        "<br>"
-        "<br>"
-        "<tr>"
-            "<td>Password:</td>"
-            "<td><input type='Password' size=25 name='pwd'><br></td>"
-            "<br>"
-            "<br>"
-        "</tr>"
-        "<tr>"
-            "<td><input type='submit' onclick='check(this.form)' value='Login'></td>"
-        "</tr>"
+    "<tr>"
+    "<td colspan=2>"
+    "<center><font size=4><b>ESP32 Login Page</b></font></center>"
+    "<br>"
+    "</td>"
+    "<br>"
+    "<br>"
+    "</tr>"
+    "<td>Username:</td>"
+    "<td><input type='text' size=25 name='userid'><br></td>"
+    "</tr>"
+    "<br>"
+    "<br>"
+    "<tr>"
+    "<td>Password:</td>"
+    "<td><input type='Password' size=25 name='pwd'><br></td>"
+    "<br>"
+    "<br>"
+    "</tr>"
+    "<tr>"
+    "<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')"
@@ -80,49 +81,51 @@ 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'>"
-   "<input type='file' name='update'>"
-        "<input type='submit' value='Update'>"
-    "</form>"
- "<div id='prg'>progress: 0%</div>"
- "<script>"
-  "$('form').submit(function(e){"
-  "e.preventDefault();"
-  "var form = $('#upload_form')[0];"
-  "var data = new FormData(form);"
-  " $.ajax({"
-  "url: '/update',"
-  "type: 'POST',"
-  "data: data,"
-  "contentType: false,"
-  "processData:false,"
-  "xhr: function() {"
-  "var xhr = new window.XMLHttpRequest();"
-  "xhr.upload.addEventListener('progress', function(evt) {"
-  "if (evt.lengthComputable) {"
-  "var per = evt.loaded / evt.total;"
-  "$('#prg').html('progress: ' + Math.round(per*100) + '%');"
-  "}"
-  "}, false);"
-  "return xhr;"
-  "},"
-  "success:function(d, s) {"
-  "console.log('success!')" 
- "},"
- "error: function (a, b, c) {"
- "}"
- "});"
- "});"
- "</script>";
 
+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'>"
+    "<input type='file' name='update'>"
+    "<input type='submit' value='Update'>"
+    "</form>"
+    "<div id='prg'>progress: 0%</div>"
+    "<script>"
+    "$('form').submit(function(e){"
+    "e.preventDefault();"
+    "var form = $('#upload_form')[0];"
+    "var data = new FormData(form);"
+    " $.ajax({"
+    "url: '/update',"
+    "type: 'POST',"
+    "data: data,"
+    "contentType: false,"
+    "processData:false,"
+    "xhr: function() {"
+    "var xhr = new window.XMLHttpRequest();"
+    "xhr.upload.addEventListener('progress', function(evt) {"
+    "if (evt.lengthComputable) {"
+    "var per = evt.loaded / evt.total;"
+    "$('#prg').html('progress: ' + Math.round(per*100) + '%');"
+    "}"
+    "}, false);"
+    "return xhr;"
+    "},"
+    "success:function(d, s) {"
+    "console.log('success!')"
+    "},"
+    "error: function (a, b, c) {"
+    "}"
+    "});"
+    "});"
+    "</script>";
 
 void reconnect() {
   // Loop until we're reconnected
@@ -149,8 +152,8 @@ void reconnect() {
 void callback(char* topic, byte* payload, unsigned int length) {
   Serial.print("Message arrived [");
   Serial.print(topic);
- 
-  String recBuf="";
+
+  String recBuf = "";
   Serial.print("] ");
   for (int i = 0; i < length; i++) {
     recBuf += (char)payload[i];
@@ -158,9 +161,9 @@ void callback(char* topic, byte* payload, unsigned int length) {
   Serial.println(recBuf);
 
   StaticJsonDocument<1024> jsonDoc;
-  deserializeJson(jsonDoc,recBuf);
-  const char* theText=jsonDoc["text"];
-  int theSize=jsonDoc["size"];
+  deserializeJson(jsonDoc, recBuf);
+  const char* theText = jsonDoc["text"];
+  int theSize = jsonDoc["size"];
 
   display.setCursor(40, 0);
   display.setTextSize(9);
@@ -175,14 +178,13 @@ void callback(char* topic, byte* payload, unsigned int length) {
   display.display();
 }
 
-
-void writeToOled(String text){
+void writeToOled(String text) {
   display.clearDisplay();
   display.setTextColor(WHITE);
   display.setCursor(0, 0);
   display.setTextSize(2);
   display.print(text);
-  display.display(); 
+  display.display();
 }
 
 /*
@@ -193,12 +195,13 @@ void setup(void) {
   delay(2000);
 
   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"));
-    for(;;);
+    for (;;)
+      ;
   }
   delay(2000);
-  
+
   writeToOled("Startup");
 
   randomSeed(micros());
@@ -206,18 +209,18 @@ void setup(void) {
   WiFi.begin(ssid, password);
   Serial.println("");
 
-   // Wait for connection or reboot if it doesn't connect for too long
+  // Wait for connection or reboot if it doesn't connect for too long
   uint32_t wifiConnAttements = 0;
   while (WiFi.status() != WL_CONNECTED) {
     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();
     }
   }
 
-
   Serial.println("");
   Serial.print("Connected to ");
   Serial.println(ssid);
@@ -225,7 +228,7 @@ void setup(void) {
   Serial.println(WiFi.localIP());
 
   /*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!");
     while (1) {
       delay(1000);
@@ -254,37 +257,43 @@ void setup(void) {
     server.send(200, "text/html", text);
   });
   /*handling uploading firmware file */
-  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
-        Update.printError(Serial);
-      }
-    } else if (upload.status == UPLOAD_FILE_WRITE) {
-      /* flashing firmware to ESP*/
-      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);
-      } else {
-        Update.printError(Serial);
-      }
-    }
-  });
+  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
+            Update.printError(Serial);
+          }
+        } else if (upload.status == UPLOAD_FILE_WRITE) {
+          /* flashing firmware to ESP*/
+          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);
+          } else {
+            Update.printError(Serial);
+          }
+        }
+      });
   server.begin();
 
   client.setServer(mqtt_server, 1883);
   client.setCallback(callback);
 
   writeToOled("Ready.");
-
 }
 
 void loop(void) {
@@ -295,5 +304,4 @@ void loop(void) {
     reconnect();
   }
   client.loop();
-
 }