From bfc14f10761b9e0efd058daac907fe25650c7dbb Mon Sep 17 00:00:00 2001 From: Onno-Dirkzwager Date: Sat, 16 May 2020 23:35:56 +0200 Subject: [PATCH 1/5] Updated version to RC3 --- library.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library.json b/library.json index ce71bc0f..9f33208a 100644 --- a/library.json +++ b/library.json @@ -15,5 +15,5 @@ "platforms": ["espressif8266", "espressif32"], "authors": "Hristo Gochkov" }, - "version": "2.1.0-RC2" + "version": "2.1.0-RC3" } From 7aeeda2fd6db0a1183e468b9d69898a7a9ca126c Mon Sep 17 00:00:00 2001 From: Onno-Dirkzwager Date: Sat, 16 May 2020 23:36:29 +0200 Subject: [PATCH 2/5] Updated version to RC3 --- library.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library.properties b/library.properties index 225c56db..d1934fa0 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=IOTAppStory-ESP -version=2.1.0-RC2 +version=2.1.0-RC3 author=SensorsIot, Onno Dirkzwager maintainer=iotappstory sentence=Update your ESP8266, ESP32 & Nextion displays over the air(OTA) From d1f09a9ec08fbad46f3c9c4165a5e1b027ba1ea7 Mon Sep 17 00:00:00 2001 From: Onno-Dirkzwager Date: Sat, 16 May 2020 23:37:55 +0200 Subject: [PATCH 3/5] Set default for HTTPS_8266_TYPE to CERTIFICATE --- src/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.h b/src/config.h index bebd217a..62f1a0c6 100644 --- a/src/config.h +++ b/src/config.h @@ -60,7 +60,7 @@ // HTTPS defines #define HTTPS true // Use HTTPS for OTA updates -#define HTTPS_8266_TYPE FNGPRINT // FNGPRINT / CERTIFICATE | ESP32 only accepts certificates | SET to FNGPRINT for backwards compatibility with 2.0.X (ESP8266) +#define HTTPS_8266_TYPE CERTIFICATE // FNGPRINT / CERTIFICATE | ESP32 only accepts certificates | SET to FNGPRINT for backwards compatibility with 2.0.X (ESP8266) #define HTTPS_CERT_STORAGE ST_SPIFFS // ST_SPIFFS / ST_PROGMEM | If you want to be able to update your certificates from config mode choose for ST_SPIFFS #define HTTPS_FNGPRINT "34 6d 0a 26 f0 40 3a 0a 1b f1 ca 8e c8 0c f5 14 21 83 7c b1" // Initial fingerprint(ESP8266). You can edit & change this later in config mode. From c6cf10583c8ca2a6bfc85983f3e5a618fb23f29b Mon Sep 17 00:00:00 2001 From: Onno-Dirkzwager Date: Sat, 16 May 2020 23:40:23 +0200 Subject: [PATCH 4/5] Update IOTAppStory.h - Added missing eepFreeFrom #144 - Updated comment --- src/IOTAppStory.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/IOTAppStory.h b/src/IOTAppStory.h index 2fb69ffc..021cae49 100644 --- a/src/IOTAppStory.h +++ b/src/IOTAppStory.h @@ -151,7 +151,8 @@ class IOTAppStory { ------ ------ ------ ------ ------ ------ VARIABLES ------ ------ ------ ------ ------ ------ */ int bootTimes; - char boardMode = 'N'; // Normal operation or Configuration mode? + char boardMode = 'N'; // Normal operation or Configuration mode? + unsigned int eepFreeFrom; // From where can I use eeprom? String statusMessage = ""; @@ -240,7 +241,7 @@ class IOTAppStory { const char* _compDate; const int _modeButton; // which gpio is used for selecting modes unsigned int _nrXF = 0; // nr of extra fields required in the config manager - unsigned int _nrXFlastAdd = 0; // nr of extra fields required in the config manager + unsigned int _nrXFlastAdd = 0; // current EEPROM position counter used by the addFields method bool _updateOnBoot = true; // update on boot? (end of begin();) bool _automaticConfig = true; // automaticly go to config on boot if there is no wifi connection present bool _setPreSet = false; // ;) have there been any preSets set? From a8361aa4f23489ae336047123a09946d3e9f98b5 Mon Sep 17 00:00:00 2001 From: Onno-Dirkzwager Date: Sat, 16 May 2020 23:44:48 +0200 Subject: [PATCH 5/5] Update IOTAppStory.cpp Added missing eepFreeFrom iotappstory #144 --- src/IOTAppStory.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/IOTAppStory.cpp b/src/IOTAppStory.cpp index ef9d6dcd..123c92dd 100644 --- a/src/IOTAppStory.cpp +++ b/src/IOTAppStory.cpp @@ -980,6 +980,7 @@ void IOTAppStory::addField(char* &defaultVal, const char *fieldLabel, const int // increase added xtra field count this->_nrXF++; + this->eepFreeFrom = this->_nrXFlastAdd; } } }