Crash_Override/ESP32_ChinaDieselHeater_Control
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Bug Fix: was not calling into ESP32 non volatile load /save etc - lack of virtual functions!

Browse source
This commit is contained in:
Ray Jones 2019-06-01 18:03:38 +10:00
parent 4f9a77486a
commit 0a6171ae8b
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Arduino/BTCDieselHeater/src/OLED/ScreenHeader.cpp
View file

@ -132,7 +132,9 @@ CScreenHeader::animate()
// UP arrow animation
//
int yPos = 0;
if(_clearUpAnimation) {
bool uploadActive = hasWebServerSpoken(true);
if(_clearUpAnimation && !uploadActive) {
// arrow was drawn in the prior iteration, now erase it
if(NVstore.getOTAEnabled())
_display.fillRect(X_WIFI_ICON +12, Y_WIFI_ICON, 12, 5, BLACK);
@ -142,7 +144,7 @@ CScreenHeader::animate()
retval = true;
_clearUpAnimation = false;
}
else if(hasWebServerSpoken(true)) {
else if(uploadActive) {
// we have emitted data to the web client, show an UP arrow
if(NVstore.getOTAEnabled())
_display.fillRect(X_WIFI_ICON +12, Y_WIFI_ICON, 12, 5, BLACK);

6
Arduino/BTCDieselHeater/src/Utility/NVStorage.h
View file

@ -222,9 +222,9 @@ public:
// TODO: These are only here to allow building without fully
// fleshing out NV storage for Due, Mega etc
// these should be removed once complete (pure virtual)
void init() {};
void load() {};
void save() {};
virtual void init() {};
virtual void load() {};
virtual void save() {};
float getPmin();