From bc38ce344fc416a8a91868549e54369f11864191 Mon Sep 17 00:00:00 2001 From: Fribur Date: Thu, 4 Jan 2024 18:22:58 -0500 Subject: [PATCH] remove FirebaseJson from platfromio.ini, fix unintended change in PowerLimiter --- platformio.ini | 1 - src/PowerLimiter.cpp | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platformio.ini b/platformio.ini index d7f10e76..11377d00 100644 --- a/platformio.ini +++ b/platformio.ini @@ -45,7 +45,6 @@ lib_deps = https://github.com/arkhipenko/TaskScheduler#testing https://github.com/coryjfowler/MCP_CAN_lib plerup/EspSoftwareSerial@^8.0.1 - mobizt/FirebaseJson @ ^3.0.6 rweather/Crypto@^0.4.0 extra_scripts = diff --git a/src/PowerLimiter.cpp b/src/PowerLimiter.cpp index 45055561..56d73257 100644 --- a/src/PowerLimiter.cpp +++ b/src/PowerLimiter.cpp @@ -199,14 +199,15 @@ void PowerLimiterClass::loop() // the normal mode of operation requires a valid // power meter reading to calculate a power limit - if (!config.PowerMeter.Enabled) { - //instead of shutting down completelty, how about setting alternativly to a save "low production" mode? - //Could be usefull when PowerMeter fails but we know for sure house consumption will never fall below a certain limit (say 200W) + if (!config.PowerMeter.Enabled) { shutdown(Status::PowerMeterDisabled); return; } + //instead of shutting down on PowerMeterTimeout, how about setting alternativly to a safe "low production" mode? + //Could be usefull when PowerMeter fails but we know for sure house consumption will never fall below a certain limit (say 200W) if (millis() - PowerMeter.getLastPowerMeterUpdate() > (30 * 1000)) { + shutdown(Status::PowerMeterTimeout); return; }