Merge pull request #478 from KipK/shaper

prevent shaper to control charge_current if divert mode is active

Author: glynhudson

src/current_shaper.cpp

@@ -18,7 +18,7 @@ void CurrentShaperTask::setup() {
 }
 
 unsigned long CurrentShaperTask::loop(MicroTasks::WakeReason reason) {
-	if (_enabled) {
+	if (_enabled && !_evse->clientHasClaim(EvseClient_OpenEVSE_Divert)) {
 			EvseProperties props;
 			if (_changed) {
 				props.setChargeCurrent(_chg_cur);
@@ -97,7 +97,6 @@ void CurrentShaperTask::setState(bool state) {
 	if (!_enabled) {
 		//remove claim
 		evse.release(EvseClient_OpenEVSE_Shaper);
-
 	}
 	StaticJsonDocument<128> event;
 	event["shaper"]  = state?1:0;
@@ -106,7 +105,7 @@ void CurrentShaperTask::setState(bool state) {
 
 void CurrentShaperTask::shapeCurrent() {
 	_chg_cur = round(((_max_pwr - _live_pwr) / evse.getVoltage()) + (evse.getAmps()));
-	_changed = true; // update claim in the loop
+	_changed = true; 
 }
 
 int CurrentShaperTask::getMaxPwr() {

src/web_server.cpp

@@ -241,7 +241,7 @@ void buildStatus(DynamicJsonDocument &doc) {
   doc["divert_update"] = (millis() - divert.getLastUpdate()) / 1000;
   doc["divert_active"] = divert.isActive();
 
-  doc["shaper"] = shaper.isActive()?1:0;
+  doc["shaper"] = shaper.getState()?1:0;
   doc["shaper_live_pwr"] = shaper.getLivePwr();
   doc["shaper_chg_cur"] = shaper.getChgCur();