Merge pull request #490 from mc-hamster/master

Update filename, cpu clock timer, add more debug info on the web server startup

src/graphics/Screen.cpp

@@ -110,8 +110,6 @@ static void drawBootScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int1
     screen->forceDisplay();
 }
 
-
-
 static void drawFrameBluetooth(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
     display->setTextAlignment(TEXT_ALIGN_CENTER);
@@ -1044,8 +1042,12 @@ void DebugInfo::drawFrameWiFi(OLEDDisplay *display, OLEDDisplayUiState *state, i
         }
     }
 
-    display->drawString(x, y + FONT_HEIGHT_SMALL * 2, "SSID: " + String(wifiName));
-    display->drawString(x, y + FONT_HEIGHT_SMALL * 3, "PWD: " + String(wifiPsw));
+    if ((millis() / 1000) % 2) {
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 2, "SSID: " + String(wifiName));
+    } else {
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 2, "PWD: " + String(wifiPsw));
+    }
+    display->drawString(x, y + FONT_HEIGHT_SMALL * 3, "http://meshtastic.local");
 
     /* Display a heartbeat pixel that blinks every time the frame is redrawn */
 #ifdef SHOW_REDRAWS
@@ -1100,9 +1102,8 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
 
 #ifndef NO_ESP32
     // Show CPU Frequency.
-    display->drawString(x + SCREEN_WIDTH - display->getStringWidth("CPU " + String(getCpuFrequencyMhz()) + "MHz"), 
-        y + FONT_HEIGHT_SMALL * 1,
-        "CPU " + String(getCpuFrequencyMhz()) + "MHz");
+    display->drawString(x + SCREEN_WIDTH - display->getStringWidth("CPU " + String(getCpuFrequencyMhz()) + "MHz"),
+                        y + FONT_HEIGHT_SMALL * 1, "CPU " + String(getCpuFrequencyMhz()) + "MHz");
 #endif
 
     // Line 3

src/meshwifi/meshhttp.cpp

@@ -2,7 +2,7 @@
 #include "NodeDB.h"
 #include "configuration.h"
 #include "main.h"
-#include "meshhttpStatic.h"
+#include "meshHttpStatic.h"
 #include "meshwifi/meshwifi.h"
 #include "sleep.h"
 #include <WebServer.h>
@@ -79,9 +79,11 @@ void handleWebResponse()
         insecureServer->loop();
     }
 
-    // Slow down the CPU if we have not received a request within the last
-    //   2 minutes.
-    if (millis() - timeSpeedUp >= (2 * 60 * 1000)) {
+    /* 
+        Slow down the CPU if we have not received a request within the last few
+        seconds.
+    */
+    if (millis() - timeSpeedUp >= (25 * 1000)) {
         setCpuFrequencyMhz(80);
         timeSpeedUp = millis();
     }
@@ -253,12 +255,14 @@ void initWebServer()
 
     insecureServer->addMiddleware(&middlewareSpeedUp160);
 
-    DEBUG_MSG("Starting Web Server...\n");
+    DEBUG_MSG("Starting Web Servers...\n");
     secureServer->start();
     insecureServer->start();
     if (secureServer->isRunning() && insecureServer->isRunning()) {
-        DEBUG_MSG("Web Server Ready\n");
+        DEBUG_MSG("HTTP and HTTPS Web Servers Ready! :-) \n");
         isWebServerReady = 1;
+    } else {
+        DEBUG_MSG("HTTP and HTTPS Web Servers Failed! ;-( \n");
     }
 }
 

src/meshwifi/meshhttpStatic.h

@@ -7,6 +7,8 @@
      - Convert to hex:
          http://tomeko.net/online_tools/file_to_hex.php?lang=en
      - Paste into the array
+     - Note the filesize of your .gz file and write the file
+       size into the length int.
 
 */
 

src/meshwifi/meshwifi.cpp

@@ -6,6 +6,7 @@
 #include "meshwifi/meshhttp.h"
 #include "target_specific.h"
 #include <DNSServer.h>
+#include <ESPmDNS.h>
 #include <WiFi.h>
 
 static void WiFiEvent(WiFiEvent_t event);
@@ -18,7 +19,7 @@ static WiFiServerPort *apiPort;
 uint8_t wifiDisconnectReason = 0;
 
 // Stores our hostname
-static char ourHost[16];
+char ourHost[16];
 
 bool isWifiAvailable()
 {
@@ -63,7 +64,6 @@ void initWifi()
 
     createSSLCert();
 
-
     if (radioConfig.has_preferences) {
         const char *wifiName = radioConfig.preferences.wifi_ssid;
         const char *wifiPsw = radioConfig.preferences.wifi_password;
@@ -117,12 +117,23 @@ void initWifi()
                 }
             }
         }
+
+        if (!MDNS.begin( "Meshtastic" )) {
+            DEBUG_MSG("Error setting up MDNS responder!\n");
+
+            while (1) {
+                delay(1000);
+            }
+        }
+        DEBUG_MSG("mDNS responder started\n");
+        DEBUG_MSG("mDNS Host: Meshtastic.local\n");
+        MDNS.addService("http", "tcp", 80);
+        MDNS.addService("https", "tcp", 443);
+
     } else
         DEBUG_MSG("Not using WIFI\n");
 }
 
-
-
 static void initApiServer()
 {
     // Start API server on port 4403