2019-07-24 09:25:07 +00:00
|
|
|
/*
|
|
|
|
* This file is part of the "bluetoothheater" distribution
|
|
|
|
* (https://gitlab.com/mrjones.id.au/bluetoothheater)
|
|
|
|
*
|
|
|
|
* Copyright (C) 2019 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 "HourMeter.h"
|
|
|
|
#include "NVStorage.h"
|
|
|
|
#include "../RTC/RTCStore.h"
|
|
|
|
#include "../RTC/Clock.h"
|
|
|
|
#include "../Protocol/Protocol.h"
|
2019-07-24 20:06:47 +00:00
|
|
|
#include "../Utility/NVStorage.h"
|
|
|
|
|
|
|
|
const int baseSeconds = 60 * 15; // 15 minutes
|
2019-07-24 09:25:07 +00:00
|
|
|
|
|
|
|
|
|
|
|
void
|
2019-07-25 12:31:31 +00:00
|
|
|
CHourMeter::init(bool poweron)
|
2019-07-24 09:25:07 +00:00
|
|
|
{
|
2019-07-25 12:31:31 +00:00
|
|
|
if(poweron) {
|
|
|
|
_RunTime = 0; // difinitely untrustworthy after power on or OTA updates
|
|
|
|
_GlowTime = 0;
|
|
|
|
}
|
|
|
|
int rt = RTC_Store.getRunTime();
|
|
|
|
int gt = RTC_Store.getGlowTime();
|
|
|
|
if(rt || gt) {
|
|
|
|
sHourMeter FLASHmem = NVstore.getHourMeter();
|
|
|
|
FLASHmem.RunTime += _RunTime + baseSeconds * rt;
|
|
|
|
FLASHmem.GlowTime += _GlowTime + baseSeconds * gt;
|
|
|
|
NVstore.setHourMeter(FLASHmem);
|
|
|
|
RTC_Store.resetRunTime();
|
|
|
|
RTC_Store.resetGlowTime();
|
|
|
|
_RunTime = 0;
|
|
|
|
_GlowTime = 0;
|
|
|
|
}
|
2019-07-24 09:25:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
CHourMeter::monitor(const CProtocol& frame)
|
|
|
|
{
|
2019-07-24 20:06:47 +00:00
|
|
|
// long now = Clock.get().secondstime();
|
|
|
|
unsigned long now = millis();
|
|
|
|
if(frame.getRunState() != 0) {
|
|
|
|
if(_lastRunTime != 0) {
|
|
|
|
float tDelta = float(now - _lastRunTime) * 0.001;
|
|
|
|
_RunTime += tDelta;
|
|
|
|
if(frame.getGlowPlug_Voltage() != 0) {
|
|
|
|
if(_lastGlowTime != 0) {
|
|
|
|
_GlowTime += tDelta;
|
|
|
|
}
|
|
|
|
_lastGlowTime = now;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
_lastGlowTime = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_lastRunTime = now;
|
|
|
|
sHourMeter FLASHmem = NVstore.getHourMeter();
|
|
|
|
if(_RunTime > baseSeconds) {
|
2019-07-25 12:31:31 +00:00
|
|
|
if(RTC_Store.incRunTime()) {
|
|
|
|
// rolled RTC intermediate store - push into FLASH
|
|
|
|
FLASHmem.RunTime += baseSeconds * RTC_Store.getMaxRunTime();
|
|
|
|
}
|
2019-07-24 20:06:47 +00:00
|
|
|
_RunTime -= baseSeconds;
|
|
|
|
}
|
|
|
|
if(_GlowTime > baseSeconds) {
|
2019-07-25 12:31:31 +00:00
|
|
|
if(RTC_Store.incGlowTime()) {
|
|
|
|
// rolled RTC intermediate store - push into FLASH
|
|
|
|
FLASHmem.GlowTime += baseSeconds * RTC_Store.getMaxGlowTime(); // store whole seconds to flash memory
|
|
|
|
}
|
2019-07-24 20:06:47 +00:00
|
|
|
_GlowTime -= baseSeconds;
|
|
|
|
}
|
|
|
|
NVstore.setHourMeter(FLASHmem);
|
|
|
|
}
|
|
|
|
else {
|
2019-07-25 12:31:31 +00:00
|
|
|
// heater has been stopped - save remant times to flash
|
|
|
|
if(_lastRunTime) {
|
|
|
|
sHourMeter FLASHmem = NVstore.getHourMeter();
|
|
|
|
FLASHmem.RunTime += _RunTime + baseSeconds * RTC_Store.getRunTime();
|
|
|
|
FLASHmem.GlowTime += _GlowTime + baseSeconds * RTC_Store.getGlowTime();
|
|
|
|
NVstore.setHourMeter(FLASHmem);
|
|
|
|
_RunTime = 0;
|
|
|
|
_GlowTime = 0;
|
|
|
|
RTC_Store.resetRunTime();
|
|
|
|
RTC_Store.resetGlowTime();
|
|
|
|
}
|
2019-07-24 20:06:47 +00:00
|
|
|
_lastRunTime = 0;
|
|
|
|
_lastGlowTime = 0;
|
|
|
|
}
|
2019-07-25 12:31:31 +00:00
|
|
|
// DebugPort.printf("CHourMeter %f %f\r\n", _RunTime, _GlowTime);
|
2019-07-24 09:25:07 +00:00
|
|
|
}
|
|
|
|
|
2019-07-24 20:06:47 +00:00
|
|
|
uint32_t
|
2019-07-24 09:25:07 +00:00
|
|
|
CHourMeter::getRunTime()
|
|
|
|
{
|
2019-07-24 20:06:47 +00:00
|
|
|
uint32_t rt = (uint32_t)_RunTime;
|
2019-07-25 12:31:31 +00:00
|
|
|
DebugPort.printf("HrMtr Run: %d %d %d\r\n", rt, RTC_Store.getRunTime(), NVstore.getHourMeter().RunTime);
|
2019-07-24 20:06:47 +00:00
|
|
|
|
2019-07-25 12:31:31 +00:00
|
|
|
// return rt + baseSeconds * RTC_Store.getRunTime() + baseSeconds * RTC_Store.getMaxRunTime() * NVstore.getHourMeter().RunTime;
|
|
|
|
return rt + baseSeconds * RTC_Store.getRunTime() + NVstore.getHourMeter().RunTime;
|
2019-07-24 09:25:07 +00:00
|
|
|
}
|
|
|
|
|
2019-07-24 20:06:47 +00:00
|
|
|
uint32_t
|
2019-07-24 09:25:07 +00:00
|
|
|
CHourMeter::getGlowTime()
|
|
|
|
{
|
2019-07-24 20:06:47 +00:00
|
|
|
uint32_t gt = (uint32_t)_GlowTime;
|
2019-07-25 12:31:31 +00:00
|
|
|
// return gt + baseSeconds * RTC_Store.getGlowTime() + baseSeconds * RTC_Store.getMaxGlowTime() * NVstore.getHourMeter().GlowTime;
|
|
|
|
DebugPort.printf("HrMtr Glow: %d %d %d\r\n", gt, RTC_Store.getGlowTime(), NVstore.getHourMeter().GlowTime);
|
|
|
|
return gt + baseSeconds * RTC_Store.getGlowTime() + NVstore.getHourMeter().GlowTime;
|
2019-07-24 09:25:07 +00:00
|
|
|
}
|
|
|
|
|