Fix some race condition with shaper disabling while divert is on

KipK · KipK · commit fd5ae7ee9923 · 2022-11-15T15:23:08.000+01:00
diff --git a/src/current_shaper.cpp b/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);
@@ -104,11 +104,8 @@ void CurrentShaperTask::setState(bool state) {
 }
 
 void CurrentShaperTask::shapeCurrent() {
-	// only use Shaper if there's no Divert claim active ( means divert is active)
-	if (!_evse->clientHasClaim(EvseClient_OpenEVSE_Divert)) {
 	_chg_cur = round(((_max_pwr - _live_pwr) / evse.getVoltage()) + (evse.getAmps()));
 	_changed = true; 
-	}
 }
 
 int CurrentShaperTask::getMaxPwr() {

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ void CurrentShaperTask::setup() {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`unsigned long CurrentShaperTask::loop(MicroTasks::WakeReason reason) {`
`21`		`- if (_enabled) {`
	`21`	`+ if (_enabled && !_evse->clientHasClaim(EvseClient_OpenEVSE_Divert)) {`
`22`	`22`	`EvseProperties props;`
`23`	`23`	`if (_changed) {`
`24`	`24`	`props.setChargeCurrent(_chg_cur);`
`@@ -104,11 +104,8 @@ void CurrentShaperTask::setState(bool state) {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`void CurrentShaperTask::shapeCurrent() {`
`107`		`- // only use Shaper if there's no Divert claim active ( means divert is active)`
`108`		`- if (!_evse->clientHasClaim(EvseClient_OpenEVSE_Divert)) {`
`109`	`107`	`_chg_cur = round(((_max_pwr - _live_pwr) / evse.getVoltage()) + (evse.getAmps()));`
`110`	`108`	`_changed = true;`
`111`		`- }`
`112`	`109`	`}`
`113`	`110`
`114`	`111`	`int CurrentShaperTask::getMaxPwr() {`