V2.0

nightflyer88 · Jan 28, 2020 · 1ce3c18 · 1ce3c18
1 parent 23e80c5
commit 1ce3c18
Show file tree

Hide file tree

Showing 29 changed files with 369 additions and 165 deletions.
diff --git a/CG_scale.ino b/CG_scale.ino
diff --git a/Doc/img/cgscale_V2_homeconfig2.png b/Doc/img/cgscale_V2_homeconfig2.png
diff --git a/Doc/img/cgscale_V2_homeconfig3.png b/Doc/img/cgscale_V2_homeconfig3.png
diff --git a/Doc/img/cgscale_V2_homeext.png b/Doc/img/cgscale_V2_homeext.png
diff --git a/Doc/img/json_lib_V2.png b/Doc/img/json_lib_V2.png
diff --git a/Doc/img/nodeMCUpyFlasher.png b/Doc/img/nodeMCUpyFlasher.png
diff --git a/Doc/img/webupdate.png b/Doc/img/webupdate.png
diff --git a/data/CG_scale_mechanics.png b/data/CG_scale_mechanics.png
diff --git a/data/CG_scale_mechanics.png.gz b/data/CG_scale_mechanics.png.gz
diff --git a/data/Resistor.png b/data/Resistor.png
diff --git a/data/battery.png b/data/battery.png
diff --git a/data/bootstrap.min.css.gz b/data/bootstrap.min.css.gz
diff --git a/data/bootstrap.min.js.gz b/data/bootstrap.min.js.gz
diff --git a/data/fw190.png b/data/fw190.png
diff --git a/data/home.png b/data/home.png
diff --git a/data/index.html.gz b/data/index.html.gz
diff --git a/data/jquery-3.3.1.slim.min.js.gz b/data/jquery-3.3.1.slim.min.js.gz
diff --git a/data/models.html.gz b/data/models.html.gz
diff --git a/data/pc6.png b/data/pc6.png
diff --git a/data/pc7.png b/data/pc7.png
diff --git a/data/settings.html.gz b/data/settings.html.gz
diff --git a/defaults.h b/defaults.h
@@ -51,6 +51,27 @@ enum {
 };
 
 
+#if defined(ESP8266)
+// https update
+enum {
+  PROBE_UPDATE,
+  UPDATE_FIRMWARE,
+  UPDATE_SPIFFS
+};
+
+
+// console msg type
+enum {
+  T_BOOT,
+  T_RUN,
+  T_ERROR,
+  T_WIFI,
+  T_UPDATE,
+  T_HTTPS
+};
+#endif
+
+
 // EEprom parameter addresses
 enum {
   P_NUMBER_LOADCELLS =                  1,
@@ -74,7 +95,9 @@ enum {
   P_SSID_AP =                           P_PASSWORD_STA + MAX_SSID_PW_LENGHT + 1,
   P_PASSWORD_AP =                       P_SSID_AP + MAX_SSID_PW_LENGHT + 1,
   P_MODELNAME =                         P_PASSWORD_AP + MAX_SSID_PW_LENGHT + 1,
-  EEPROM_SIZE =                         P_MODELNAME + MAX_MODELNAME_LENGHT + 1
+  P_ENABLE_UPDATE =                     P_MODELNAME + MAX_MODELNAME_LENGHT + 1,
+  P_ENABLE_OTA =                        P_ENABLE_UPDATE + 1,
+  EEPROM_SIZE =                         P_ENABLE_OTA + 1
 #endif
 };
 

diff --git a/data/airplane.png → img/airplane.png b/data/airplane.png → img/airplane.png
diff --git a/data/cg.png → img/cg.png b/data/cg.png → img/cg.png
diff --git a/data/cglr.png → img/cglr.png b/data/cglr.png → img/cglr.png
diff --git a/img/measuring.png b/img/measuring.png
diff --git a/data/settings.png → img/settings.png b/data/settings.png → img/settings.png
diff --git a/data/weight.png → img/weight.png b/data/weight.png → img/weight.png
diff --git a/settings_ESP8266.h b/settings_ESP8266.h
@@ -142,11 +142,22 @@ U8G2_SH1106_128X64_NONAME_1_HW_I2C oledDisplay(U8G2_R0, /* reset=*/ U8X8_PIN_NON
 const char ip[4] =                  {1,2,3,4};    // default IP address
 
 #define ENABLE_MDNS                 true          // enable mDNS to reach the webpage with hostname.local
+#define ENABLE_OTA                  true          // enable over the air update
+
+
+
+// **** https update settings ****
+
+#define ENABLE_UPDATE               true
+#define HTTPS_PORT                  443
+#define HOST                        "github.com"
+#define URL                         "/nightflyer88/CG_scale/releases/latest"
 
 
 
 // **** Model memory settings ****
 
 #define MAX_MODELNAME_LENGHT        32               // max chars 
+#define DEFAULT_NAME                "Model"          // default model name
 #define MODEL_FILE                  "/models.json"   // file to store models
-#define JSONBUFFER_SIZE             20000            // max file size in bytes
+#define JSONDOC_SIZE                20000            // max file size in bytes