Fix the power DC mode spurious Import (#821)

DC PowerSupply is not falsely set to import. Fixing dc charging session. Signed-off-by: florinmihut <[email protected]> Signed-off-by: Sebastian Lukas <[email protected]> Co-authored-by: Sebastian Lukas <[email protected]>
EVerest · Aug 8, 2024 · 1cd809c · 1cd809c
1 parent a889fb2
commit 1cd809c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.14.7)
 
 project(everest-core
-    VERSION 2024.7.0
+    VERSION 2024.7.1
     DESCRIPTION "The open operating system for e-mobility charging stations"
 	LANGUAGES CXX C
 )

diff --git a/modules/EvseManager/EvseManager.cpp b/modules/EvseManager/EvseManager.cpp
@@ -1558,9 +1558,8 @@ bool EvseManager::powersupply_DC_set(double _voltage, double _current) {
 
     auto caps = get_powersupply_capabilities();
 
-    if ((((config.hack_allow_bpt_with_iso2 or config.sae_j2847_2_bpt_enabled) and is_actually_exporting_to_grid) or
-         charging_phase_changed) and
-        current_demand_active) {
+    if (((config.hack_allow_bpt_with_iso2 or config.sae_j2847_2_bpt_enabled) and current_demand_active) and
+        is_actually_exporting_to_grid) {
         if (not last_is_actually_exporting_to_grid) {
             // switching from import from grid to export to grid
             session_log.evse(false, "DC power supply: switch ON in import mode");
@@ -1594,11 +1593,9 @@ bool EvseManager::powersupply_DC_set(double _voltage, double _current) {
         return false;
 
     } else {
-
-        if ((((config.hack_allow_bpt_with_iso2 or config.sae_j2847_2_bpt_enabled) and
-              last_is_actually_exporting_to_grid) or
-             charging_phase_changed) and
-            current_demand_active) {
+        if (charging_phase_changed or (((config.hack_allow_bpt_with_iso2 or config.sae_j2847_2_bpt_enabled) and
+                                        last_is_actually_exporting_to_grid) and
+                                       current_demand_active)) {
             // switching from export to grid to import from grid
             session_log.evse(false, "DC power supply: switch ON in export mode");
             r_powersupply_DC[0]->call_setMode(types::power_supply_DC::Mode::Export, power_supply_DC_charging_phase);