Merge pull request #9 from c-jimenez/fix/w_to_a_conversion

c-jimenez · web-flow · commit 66be40179007 · 2022-01-17T23:39:55.000+01:00
[smart charging] Fix W to A conversion in charging profiles setpoint computation
diff --git a/src/chargepoint/smartcharging/SmartChargingManager.cpp b/src/chargepoint/smartcharging/SmartChargingManager.cpp
@@ -110,7 +110,8 @@ bool SmartChargingManager::getSetpoint(unsigned int                  connector_i
                 }
                 else
                 {
-                    charge_point_setpoint = period->limit / m_stack_config.operatingVoltage();
+                    charge_point_setpoint =
+                        period->limit / (static_cast<float>(charge_point_number_phases) * m_stack_config.operatingVoltage());
                 }
                 break;
             }
@@ -131,7 +132,7 @@ bool SmartChargingManager::getSetpoint(unsigned int                  connector_i
         }
         if (connector_setpoint.isSet() && (connector_setpoint_unit == ChargingRateUnitType::W))
         {
-            connector_setpoint /= m_stack_config.operatingVoltage();
+            connector_setpoint /= (static_cast<float>(connector_number_phases) * m_stack_config.operatingVoltage());
         }
 
         // Connector setpoint cannot be greater than charge point setpoint

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,8 @@ bool SmartChargingManager::getSetpoint(unsigned int connector_i`
`110`	`110`	`}`
`111`	`111`	`else`
`112`	`112`	`{`
`113`		`- charge_point_setpoint = period->limit / m_stack_config.operatingVoltage();`
	`113`	`+ charge_point_setpoint =`
	`114`	`+ period->limit / (static_cast<float>(charge_point_number_phases) * m_stack_config.operatingVoltage());`
`114`	`115`	`}`
`115`	`116`	`break;`
`116`	`117`	`}`
`@@ -131,7 +132,7 @@ bool SmartChargingManager::getSetpoint(unsigned int connector_i`
`131`	`132`	`}`
`132`	`133`	`if (connector_setpoint.isSet() && (connector_setpoint_unit == ChargingRateUnitType::W))`
`133`	`134`	`{`
`134`		`- connector_setpoint /= m_stack_config.operatingVoltage();`
	`135`	`+ connector_setpoint /= (static_cast<float>(connector_number_phases) * m_stack_config.operatingVoltage());`
`135`	`136`	`}`
`136`	`137`
`137`	`138`	`// Connector setpoint cannot be greater than charge point setpoint`