Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix + Preparations for next release #147

Merged
merged 5 commits into from
May 16, 2020
Merged

Bugfix + Preparations for next release #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bfc14f1
Updated version to RC3
Onno-Dirkzwager May 16, 2020
7aeeda2
Updated version to RC3
Onno-Dirkzwager May 16, 2020
d1f09a9
Set default for HTTPS_8266_TYPE to CERTIFICATE
Onno-Dirkzwager May 16, 2020
c6cf105
Update IOTAppStory.h
Onno-Dirkzwager May 16, 2020
a8361aa
Update IOTAppStory.cpp
Onno-Dirkzwager May 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion library.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
"platforms": ["espressif8266", "espressif32"],
"authors": "Hristo Gochkov"
},
"version": "2.1.0-RC2"
"version": "2.1.0-RC3"
}
2 changes: 1 addition & 1 deletion library.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
1 change: 1 addition & 0 deletions src/IOTAppStory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/IOTAppStory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "";


Expand Down Expand Up @@ -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?
Expand Down
2 changes: 1 addition & 1 deletion src/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down