Merge pull request #784 from OpenEVSE/jeremypoulter/issue762

jeremypoulter · web-flow · commit f4a3d3114b5d · 2024-01-11T21:32:27.000Z
Did for current shaper not working under certain circumstances
diff --git a/src/current_shaper.cpp b/src/current_shaper.cpp
@@ -174,9 +174,9 @@ void CurrentShaperTask::shapeCurrent() {
 			max_pwr += solar;
 		}
 	}
-	if (livepwr > max_pwr) {
-		livepwr = max_pwr;
-	}
+//	if (livepwr > max_pwr) {
+//		livepwr = max_pwr;
+//	}
 	if(!config_threephase_enabled()) {
 		_max_cur = ((max_pwr - livepwr) / evse.getVoltage()) + evse.getAmps();
 	 }

Original file line number	Diff line number	Diff line change
`@@ -174,9 +174,9 @@ void CurrentShaperTask::shapeCurrent() {`
`174`	`174`	`max_pwr += solar;`
`175`	`175`	`}`
`176`	`176`	`}`
`177`		`- if (livepwr > max_pwr) {`
`178`		`- livepwr = max_pwr;`
`179`		`- }`
	`177`	`+// if (livepwr > max_pwr) {`
	`178`	`+// livepwr = max_pwr;`
	`179`	`+// }`
`180`	`180`	`if(!config_threephase_enabled()) {`
`181`	`181`	`_max_cur = ((max_pwr - livepwr) / evse.getVoltage()) + evse.getAmps();`
`182`	`182`	`}`