ce8299609b
Cyclic mode, if enabled, is now shown on detailed screen, bracketing its range Shifted helpers.h into src/Utility - made far more logical sense! Fancy pants slash screen :-D
455 lines
12 KiB
C++
455 lines
12 KiB
C++
/*
|
|
* This file is part of the "bluetoothheater" distribution
|
|
* (https://gitlab.com/mrjones.id.au/bluetoothheater)
|
|
*
|
|
* Copyright (C) 2018 Ray Jones <ray@mrjones.id.au>
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
#include <Arduino.h>
|
|
#include "NVStorage.h"
|
|
#include "DebugPort.h"
|
|
#include <driver/adc.h>
|
|
|
|
|
|
bool
|
|
sNVStore::valid()
|
|
{
|
|
bool retval = true;
|
|
retval &= heaterTuning.valid();
|
|
retval &= userSettings.valid();
|
|
for(int i=0; i<2; i++) {
|
|
retval &= timer[i].valid();
|
|
}
|
|
retval &= MQTT.valid();
|
|
retval &= Credentials.valid();
|
|
return retval;
|
|
}
|
|
|
|
void
|
|
sNVStore::init()
|
|
{
|
|
heaterTuning.init();
|
|
userSettings.init();
|
|
for(int i=0; i<2; i++) {
|
|
timer[i].init();
|
|
}
|
|
MQTT.init();
|
|
Credentials.init();
|
|
}
|
|
|
|
CHeaterStorage::CHeaterStorage()
|
|
{
|
|
_calValues.init();
|
|
}
|
|
|
|
float
|
|
sHeaterTuning::getPmin() const
|
|
{
|
|
return float(Pmin) * 0.1f;
|
|
}
|
|
|
|
float
|
|
sHeaterTuning::getPmax() const
|
|
{
|
|
return float(Pmax) * 0.1f;
|
|
}
|
|
|
|
|
|
void
|
|
sHeaterTuning::setPmin(float val)
|
|
{
|
|
uint8_t cVal = (uint8_t)(val * 10.f + 0.5f);
|
|
Pmin = cVal;
|
|
}
|
|
|
|
void
|
|
sHeaterTuning::setPmax(float val)
|
|
{
|
|
uint8_t cVal = (uint8_t)(val * 10.f + 0.5f);
|
|
Pmax = cVal;
|
|
}
|
|
|
|
|
|
void
|
|
sHeaterTuning::setSysVoltage(float fVal)
|
|
{
|
|
int val = int(fVal * 10.0);
|
|
if(val == 120 || val == 240) {
|
|
sysVoltage = val;
|
|
}
|
|
}
|
|
|
|
|
|
void
|
|
CHeaterStorage::getTimerInfo(int idx, sTimer& timerInfo)
|
|
{
|
|
if(INBOUNDS(idx, 0, 13)) {
|
|
timerInfo = _calValues.timer[idx];
|
|
}
|
|
}
|
|
|
|
void
|
|
CHeaterStorage::setTimerInfo(int idx, const sTimer& timerInfo)
|
|
{
|
|
if(INBOUNDS(idx, 0, 13)) {
|
|
_calValues.timer[idx] = timerInfo;
|
|
}
|
|
}
|
|
|
|
const sCyclicThermostat&
|
|
CHeaterStorage::getCyclicMode() const
|
|
{
|
|
return _calValues.userSettings.cyclic;
|
|
}
|
|
|
|
void
|
|
CHeaterStorage::setCyclicMode(const sCyclicThermostat& val)
|
|
{
|
|
_calValues.userSettings.cyclic = val;
|
|
save();
|
|
}
|
|
|
|
const sGPIOparams&
|
|
CHeaterStorage::getGPIOparams() const
|
|
{
|
|
return _calValues.userSettings.GPIO;
|
|
}
|
|
|
|
void
|
|
CHeaterStorage::setGPIOparams(const sGPIOparams& params)
|
|
{
|
|
_calValues.userSettings.GPIO = params;
|
|
}
|
|
|
|
|
|
const sHomeMenuActions&
|
|
CHeaterStorage::getHomeMenu() const
|
|
{
|
|
return _calValues.userSettings.HomeMenu;
|
|
}
|
|
|
|
void
|
|
CHeaterStorage::setHomeMenu(const sHomeMenuActions& val)
|
|
{
|
|
_calValues.userSettings.HomeMenu = val;
|
|
}
|
|
|
|
// MQTT parameter read/save
|
|
const sMQTTparams&
|
|
CHeaterStorage::getMQTTinfo() const
|
|
{
|
|
return _calValues.MQTT;
|
|
}
|
|
|
|
void
|
|
CHeaterStorage::setMQTTinfo(const sMQTTparams& info)
|
|
{
|
|
_calValues.MQTT = info;
|
|
}
|
|
|
|
// credentials read/save
|
|
const sCredentials&
|
|
CHeaterStorage::getCredentials() const
|
|
{
|
|
return _calValues.Credentials;
|
|
}
|
|
|
|
void
|
|
CHeaterStorage::setCredentials(const sCredentials& info)
|
|
{
|
|
_calValues.Credentials = info;
|
|
}
|
|
|
|
const sUserSettings&
|
|
CHeaterStorage::getUserSettings() const
|
|
{
|
|
return _calValues.userSettings;
|
|
}
|
|
|
|
void
|
|
CHeaterStorage::setUserSettings(const sUserSettings& info) {
|
|
_calValues.userSettings = info;
|
|
}
|
|
|
|
const sHeaterTuning&
|
|
CHeaterStorage::getHeaterTuning() const
|
|
{
|
|
return _calValues.heaterTuning;
|
|
}
|
|
|
|
void
|
|
CHeaterStorage::setHeaterTuning(const sHeaterTuning& info)
|
|
{
|
|
_calValues.heaterTuning = info;
|
|
}
|
|
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////
|
|
// ESP32
|
|
//
|
|
//#ifdef ESP32
|
|
|
|
CESP32HeaterStorage::CESP32HeaterStorage()
|
|
{
|
|
init();
|
|
}
|
|
|
|
CESP32HeaterStorage::~CESP32HeaterStorage()
|
|
{
|
|
}
|
|
|
|
void
|
|
CESP32HeaterStorage::init()
|
|
{
|
|
for(int i=0; i<14; i++) {
|
|
_calValues.timer[i].timerID = i; // each instance needs a unique ID
|
|
}
|
|
}
|
|
|
|
void
|
|
CESP32HeaterStorage::load()
|
|
{
|
|
DebugPort.println("Reading from NV storage");
|
|
_calValues.heaterTuning.load();
|
|
for(int i=0; i<14; i++) {
|
|
_calValues.timer[i].load();
|
|
}
|
|
_calValues.userSettings.load();
|
|
_calValues.MQTT.load();
|
|
_calValues.Credentials.load();
|
|
}
|
|
|
|
void
|
|
CESP32HeaterStorage::save()
|
|
{
|
|
DebugPort.println("Saving to NV storage");
|
|
_calValues.heaterTuning.save();
|
|
for(int i=0; i<14; i++) {
|
|
_calValues.timer[i].save();
|
|
}
|
|
_calValues.userSettings.save();
|
|
_calValues.MQTT.save();
|
|
_calValues.Credentials.save();
|
|
}
|
|
|
|
void
|
|
sHeaterTuning::load()
|
|
{
|
|
// section for heater calibration params
|
|
// **** MAX LENGTH is 15 for names ****
|
|
preferences.begin("Calibration", false);
|
|
validatedLoad("minPump", Pmin, 14, u8inBounds, 4, 100);
|
|
validatedLoad("maxPump", Pmax, 45, u8inBounds, 4, 150);
|
|
validatedLoad("minFan", Fmin, 1500, u16inBounds, 100, 5000);
|
|
validatedLoad("maxFan", Fmax, 4500, u16inBounds, 100, 6000);
|
|
validatedLoad("systemVoltage", sysVoltage, 120, u8Match2, 120, 240);
|
|
validatedLoad("fanSensor", fanSensor, 1, u8inBounds, 1, 2);
|
|
validatedLoad("glowDrive", glowDrive, 5, u8inBounds, 1, 6);
|
|
preferences.end();
|
|
}
|
|
|
|
void
|
|
sHeaterTuning::save()
|
|
{
|
|
// section for heater calibration params
|
|
// **** MAX LENGTH is 15 for names ****
|
|
preferences.begin("Calibration", false);
|
|
preferences.putUChar("minPump", Pmin);
|
|
preferences.putUChar("maxPump", Pmax);
|
|
preferences.putUShort("minFan", Fmin);
|
|
preferences.putUShort("maxFan", Fmax);
|
|
preferences.putUChar("systemVoltage", sysVoltage);
|
|
preferences.putUChar("fanSensor", fanSensor);
|
|
preferences.putUChar("glowDrive", glowDrive);
|
|
preferences.end();
|
|
}
|
|
|
|
void
|
|
sTimer::load()
|
|
{
|
|
// **** MAX LENGTH is 15 for names ****
|
|
char SectionName[16];
|
|
sprintf(SectionName, "timer%d", timerID+1);
|
|
preferences.begin(SectionName, false);
|
|
validatedLoad("startHour", start.hour, 0, s8inBounds, 0, 23);
|
|
validatedLoad("startMin", start.min, 0, s8inBounds, 0, 59);
|
|
validatedLoad("stopHour", stop.hour, 0, s8inBounds, 0, 23);
|
|
validatedLoad("stopMin", stop.min, 0, s8inBounds, 0, 59);
|
|
validatedLoad("enabled", enabled, 0, u8inBounds, 0, 255); // all 8 bits used!
|
|
validatedLoad("repeat", repeat, 0, u8inBounds, 0, 1);
|
|
validatedLoad("temperature", temperature, 22, u8inBounds, 8, 35);
|
|
preferences.end();
|
|
}
|
|
|
|
void
|
|
sTimer::save()
|
|
{
|
|
// **** MAX LENGTH is 15 for names ****
|
|
char SectionName[16];
|
|
sprintf(SectionName, "timer%d", timerID+1);
|
|
preferences.begin(SectionName, false);
|
|
preferences.putChar("startHour", start.hour);
|
|
preferences.putChar("startMin", start.min);
|
|
preferences.putChar("stopHour", stop.hour);
|
|
preferences.putChar("stopMin", stop.min);
|
|
preferences.putUChar("enabled", enabled);
|
|
preferences.putUChar("repeat", repeat);
|
|
preferences.putUChar("temperature", temperature);
|
|
preferences.end();
|
|
}
|
|
|
|
void
|
|
sUserSettings::load()
|
|
{
|
|
// **** MAX LENGTH is 15 for names ****
|
|
preferences.begin("user", false);
|
|
validatedLoad("dimTime", dimTime, 60000, -600000, 600000);
|
|
validatedLoad("menuTimeout", menuTimeout, 60000, 0, 300000);
|
|
validatedLoad("degF", degF, 0, u8inBounds, 0, 1);
|
|
validatedLoad("thermostat", useThermostat, 1, u8inBounds, 0, 1);
|
|
validatedLoad("demandDegC", demandDegC, 22, u8inBounds, 8, 35);
|
|
validatedLoad("demandPump", demandPump, 22, u8inBounds, 8, 35);
|
|
validatedLoad("thermoMethod", ThermostatMethod, 0, u8inBounds, 0, 255);
|
|
// catch and migrate old combined method & window
|
|
if(ThermostatMethod & 0xFC) {
|
|
float defVal = float(ThermostatMethod>>2) * 0.1f;
|
|
validatedLoad("thermoWindow", ThermostatWindow, defVal, 0.2f, 10.0f);
|
|
preferences.putUChar("thermoMethod", ThermostatMethod & 0x03); // strip old window
|
|
}
|
|
validatedLoad("thermoWindow", ThermostatWindow, 1.0f, 0.2f, 10.f);
|
|
DebugPort.printf("2) Window = %f\r\n", ThermostatWindow);
|
|
validatedLoad("enableWifi", enableWifi, 1, u8inBounds, 0, 1);
|
|
validatedLoad("enableOTA", enableOTA, 1, u8inBounds, 0, 1);
|
|
validatedLoad("cyclicStop", cyclic.Stop, 0, s8inBounds, 0, 10);
|
|
validatedLoad("cyclicStart", cyclic.Start, -1, s8inBounds, -20, 0);
|
|
uint8_t tVal;
|
|
validatedLoad("GPIOinMode", tVal, 0, u8inBounds, 0, 3); GPIO.inMode = (GPIOinModes)tVal;
|
|
validatedLoad("GPIOoutMode", tVal, 0, u8inBounds, 0, 2); GPIO.outMode = (GPIOoutModes)tVal;
|
|
validatedLoad("GPIOalgMode", tVal, 0, u8inBounds, 0, 2); GPIO.algMode = (GPIOalgModes)tVal;
|
|
validatedLoad("MenuOnTimeout", HomeMenu.onTimeout, 0, u8inBounds, 0, 3);
|
|
validatedLoad("MenuonStart", HomeMenu.onStart, 0, u8inBounds, 0, 3);
|
|
validatedLoad("MenuonStop", HomeMenu.onStop, 0, u8inBounds, 0, 3);
|
|
validatedLoad("FrameRate", FrameRate, 1000, u16inBounds, 300, 1500);
|
|
validatedLoad("JSONsingle", JSON.singleElement, 0, u8inBounds, 0, 1);
|
|
validatedLoad("JSONLF", JSON.LF, 0, u8inBounds, 0, 1);
|
|
validatedLoad("JSONpad", JSON.padding, 0, u8inBounds, 0, 1);
|
|
preferences.end();
|
|
}
|
|
|
|
void
|
|
sUserSettings::save()
|
|
{
|
|
// **** MAX LENGTH is 15 for names ****
|
|
preferences.begin("user", false);
|
|
preferences.putLong("dimTime", dimTime);
|
|
preferences.putLong("menuTimeout", menuTimeout);
|
|
preferences.putUChar("thermostat", useThermostat);
|
|
preferences.putUChar("demandDegC", demandDegC);
|
|
preferences.putUChar("demandPump", demandPump);
|
|
preferences.putUChar("degF", degF);
|
|
preferences.putUChar("thermoMethod", ThermostatMethod);
|
|
preferences.putFloat("thermoWindow", ThermostatWindow);
|
|
preferences.putUChar("enableWifi", enableWifi);
|
|
preferences.putUChar("enableOTA", enableOTA);
|
|
preferences.putChar("cyclicStop", cyclic.Stop);
|
|
preferences.putChar("cyclicStart",cyclic.Start);
|
|
preferences.putUChar("GPIOinMode", GPIO.inMode);
|
|
preferences.putUChar("GPIOoutMode", GPIO.outMode);
|
|
preferences.putUChar("GPIOalgMode", GPIO.algMode);
|
|
preferences.putUChar("MenuOnTimeout", HomeMenu.onTimeout);
|
|
preferences.putUChar("MenuonStart", HomeMenu.onStart);
|
|
preferences.putUChar("MenuonStop", HomeMenu.onStop);
|
|
preferences.putUShort("FrameRate", FrameRate);
|
|
preferences.putUChar("JSONsingle", JSON.singleElement);
|
|
preferences.putUChar("JSONLF", JSON.LF);
|
|
preferences.putUChar("JSONpad", JSON.padding);
|
|
preferences.end();
|
|
}
|
|
|
|
void
|
|
sMQTTparams::load()
|
|
{
|
|
// **** MAX LENGTH is 15 for names ****
|
|
preferences.begin("mqtt", false);
|
|
validatedLoad("enabled", enabled, 0, u8inBounds, 0, 1);
|
|
validatedLoad("port", port, 0, u16inBounds, 0, 0xffff);
|
|
validatedLoad("host", host, 127, "hostIP");
|
|
validatedLoad("username", username, 31, "username");
|
|
validatedLoad("password", password, 31, "password");
|
|
preferences.end();
|
|
}
|
|
|
|
void
|
|
sMQTTparams::save()
|
|
{
|
|
// **** MAX LENGTH is 15 for names ****
|
|
preferences.begin("mqtt", false);
|
|
preferences.putUChar("enabled", enabled);
|
|
preferences.putUShort("port", port);
|
|
preferences.putString("host", host);
|
|
preferences.putString("username", username);
|
|
preferences.putString("password", password);
|
|
preferences.end();
|
|
}
|
|
|
|
bool
|
|
sMQTTparams::valid()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
void
|
|
sCredentials::load()
|
|
{
|
|
// **** MAX LENGTH is 15 for names ****
|
|
preferences.begin("credentials", false);
|
|
validatedLoad("SSID", SSID, 31, "Afterburner");
|
|
validatedLoad("APpassword", APpassword, 31, "thereisnospoon");
|
|
validatedLoad("webUpdateUser", webUpdateUsername, 31, "Afterburner");
|
|
validatedLoad("webUpdatePass", webUpdatePassword, 31, "BurnBabyBurn");
|
|
preferences.end();
|
|
}
|
|
|
|
void
|
|
sCredentials::save()
|
|
{
|
|
// **** MAX LENGTH is 15 for names ****
|
|
preferences.begin("credentials", false);
|
|
preferences.putString("SSID", SSID);
|
|
preferences.putString("APpassword", APpassword);
|
|
preferences.putString("webUpdateUser", webUpdateUsername);
|
|
preferences.putString("webUpdatePass", webUpdatePassword);
|
|
preferences.end();
|
|
}
|
|
|
|
bool
|
|
sCredentials::valid()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
void toggle(bool& ref)
|
|
{
|
|
ref = !ref;
|
|
}
|
|
|
|
void toggle(uint8_t& ref)
|
|
{
|
|
ref = ref ? 0 : 1;
|
|
}
|