Merge pull request #753 from cyberman54/development

v2.4.0

include/boot.h

@@ -0,0 +1,16 @@
+#ifndef BOOT_H
+#define BOOT_H
+
+#include "globals.h"
+#include "hash.h"
+
+#include <Update.h>
+#include <WiFi.h>
+#include <WiFiClientSecure.h>
+#include <WiFiClient.h>
+#include <WebServer.h>
+#include <ESPmDNS.h>
+
+void start_boot_menu(void);
+
+#endif // BOOT_H

include/globals.h

@@ -58,7 +58,8 @@ enum runmode_t {
   RUNMODE_NORMAL,
   RUNMODE_WAKEUP,
   RUNMODE_UPDATE,
-  RUNMODE_SLEEP
+  RUNMODE_SLEEP,
+  RUNMODE_MAINTENANCE
 };
 
 // Struct holding devices's runtime configuration
@@ -83,7 +84,6 @@ typedef struct __attribute__((packed)) {
   uint8_t macfilter;     // 0=disabled, 1=enabled
   uint8_t rgblum;        // RGB Led luminosity (0..100%)
   uint8_t monitormode;   // 0=disabled, 1=enabled
-  uint8_t runmode;       // 0=normal, 1=update
   uint8_t payloadmask;   // bitswitches for payload data
   uint8_t enscount;      // 0=disabled 1= enabled
 

include/hash.h

@@ -4,6 +4,6 @@
 #include <Arduino.h>
 #include <RokkitHash.h>
 
-uint32_t IRAM_ATTR hash(const char *data, int len);
+uint32_t IRAM_ATTR myhash(const char *data, int len);
 
 #endif

include/main.h

@@ -20,5 +20,6 @@
 #include "lorawan.h"
 #include "timekeeper.h"
 #include "corona.h"
+#include "boot.h"
 
 #endif

include/mqttclient.h

@@ -3,6 +3,7 @@
 
 #include "globals.h"
 #include "rcommand.h"
+#include "hash.h"
 #include <MQTT.h>
 #include <ETH.h>
 #include <mbedtls/base64.h>

include/ota.h

@@ -21,4 +21,4 @@ void show_progress(unsigned long current, unsigned long size);
 
 #endif // USE_OTA
 
-#endif // OTA_H
+#endif // OTA_H