diff --git a/manager/Dockerfile b/manager/Dockerfile index c00ec118..595f21c1 100644 --- a/manager/Dockerfile +++ b/manager/Dockerfile @@ -37,7 +37,8 @@ RUN git clone https://github.com/EVerest/everest-core.git \ # it there. But this is what we have to work with :( RUN bash /tmp/demo-patch-scripts/apply-library-patches.sh -RUN /entrypoint.sh run-script compile +RUN /entrypoint.sh run-script compile \ + && /entrypoint.sh run-script install # cleanup RUN apt-get -y remove --purge build-essential diff --git a/manager/config-sil-ocpp201-pnc.yaml b/manager/config-sil-ocpp201-pnc.yaml index 6f534fd7..627d2e40 100644 --- a/manager/config-sil-ocpp201-pnc.yaml +++ b/manager/config-sil-ocpp201-pnc.yaml @@ -54,6 +54,7 @@ active_modules: auto_enable: true auto_exec: false auto_exec_commands: sleep 1;iec_wait_pwr_ready;sleep 1;draw_power_regulated 16,3;sleep 30;unplug + three_phases: false connections: ev_board_support: - module_id: yeti_driver_1 diff --git a/manager/demo-patch-scripts/apply-compile-patches.sh b/manager/demo-patch-scripts/apply-compile-patches.sh index 943eea0d..7b410d97 100644 --- a/manager/demo-patch-scripts/apply-compile-patches.sh +++ b/manager/demo-patch-scripts/apply-compile-patches.sh @@ -4,3 +4,4 @@ echo "Applying compile-time patches" cd / && patch -p0 -i /tmp/demo-patches/enable_iso_dt.patch cd / && patch -p1 -i /tmp/demo-patches/composite_schedule_fixes.patch +cd / && patch -p1 -i /tmp/demo-patches/change_transfer_mode_to_single_phase.patch diff --git a/manager/demo-patch-scripts/apply-library-patches.sh b/manager/demo-patch-scripts/apply-library-patches.sh index abc14d66..8a17e6fe 100644 --- a/manager/demo-patch-scripts/apply-library-patches.sh +++ b/manager/demo-patch-scripts/apply-library-patches.sh @@ -3,3 +3,4 @@ echo "Applying library patches" cd / && patch -p0 -i /tmp/demo-patches/enable_ocpp_logging.patch +cd / && patch -p0 -i /tmp/demo-patches/support_m3_chip.patch diff --git a/manager/demo-patches/change_transfer_mode_to_single_phase.patch b/manager/demo-patches/change_transfer_mode_to_single_phase.patch new file mode 100644 index 00000000..6d99443b --- /dev/null +++ b/manager/demo-patches/change_transfer_mode_to_single_phase.patch @@ -0,0 +1,15 @@ +diff --git a/modules/EvseManager/EvseManager.cpp b/modules/EvseManager/EvseManager.cpp +index 63cd65a9..679f1e57 100644 +--- a/ext/source/modules/EvseManager/EvseManager.cpp ++++ b/ext/source/modules/EvseManager/EvseManager.cpp +@@ -251,8 +251,8 @@ void EvseManager::ready() { + + // FIXME: we cannot change this during run time at the moment. Refactor ISO interface to exclude transfer + // modes from setup +- // transfer_modes.push_back(types::iso15118_charger::EnergyTransferMode::AC_single_phase_core); +- transfer_modes.push_back(types::iso15118_charger::EnergyTransferMode::AC_three_phase_core); ++ transfer_modes.push_back(types::iso15118_charger::EnergyTransferMode::AC_single_phase_core); ++ // transfer_modes.push_back(types::iso15118_charger::EnergyTransferMode::AC_three_phase_core); + + } else if (config.charge_mode == "DC") { + transfer_modes.push_back(types::iso15118_charger::EnergyTransferMode::DC_extended); diff --git a/manager/demo-patches/support_m3_chip.patch b/manager/demo-patches/support_m3_chip.patch new file mode 100644 index 00000000..7942be00 --- /dev/null +++ b/manager/demo-patches/support_m3_chip.patch @@ -0,0 +1,10 @@ +--- /ext/cache/cpm/everest-framework/d01be681d203f70289900147e87a8f4c43ff47f0/everest-framework/src/system_unix.cpp ++++ /ext/cache/cpm/everest-framework/d01be681d203f70289900147e87a8f4c43ff47f0/everest-framework/src/system_unix.cpp +@@ -190,7 +190,7 @@ std::string set_user_and_capabilities(const std::string& run_as_user, const std: + SubProcess SubProcess::create(const std::string& run_as_user, const std::vector& capabilities) { + int pipefd[2]; + +- if (pipe2(pipefd, O_CLOEXEC | O_DIRECT)) { ++ if (pipe2(pipefd, O_CLOEXEC)) { + throw std::runtime_error(fmt::format("Syscall pipe2() failed ({}), exiting", strerror(errno))); + } diff --git a/nodered/config/config-sil-iso15118-ac-flow.json b/nodered/config/config-sil-iso15118-ac-flow.json index dec677bc..2e32d9b9 100644 --- a/nodered/config/config-sil-iso15118-ac-flow.json +++ b/nodered/config/config-sil-iso15118-ac-flow.json @@ -303,11 +303,11 @@ { "id": "0e8d234f60b178a8", "type": "ui_group", - "name": "External Limits", + "name": "Charging Network Limit", "tab": "d3ada9fa4cf6ac53", "order": 4, "disp": true, - "width": 6, + "width": "6", "collapse": false, "className": "" },