From 3bc641a9cdc15b26a973a1428a210f7bb057244b Mon Sep 17 00:00:00 2001 From: Shankari Date: Wed, 27 Mar 2024 10:16:41 -0700 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20=20Bump=20up=20the=20versi?= =?UTF-8?q?on=20that=20we=20use=20to=20the=20RC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This ensures that it includes the changes required to support OCPP PnC https://github.com/EVerest/everest-core/pull/588 This involves: - Changing the tag to `2024.3.0-rc1` - Bumping up the version number in the `.env` - Copying over two nodered configurations: - to support MREC in the UI (https://github.com/EVerest/everest-core/commit/9e182a983271a2f20f30976364eca912fcd49a8d) - to support PnC in the UI (https://github.com/EVerest/everest-core/commit/56a9ff27352a62ee353dd3cdf311cd4f4c8bb76d) These are identical to the ones in everest-core at the specified tag, except that they connect to the `mqtt-server` MQTT server instead of `localhost` Signed-off-by: Shankari --- .env | 2 +- manager/Dockerfile | 2 +- nodered/config/config-sil-flow.json | 1295 +++++++++++++++++- nodered/config/config-sil-two-evse-flow.json | 12 +- 4 files changed, 1304 insertions(+), 7 deletions(-) diff --git a/.env b/.env index c0f4ac60..640055cc 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -TAG=0.0.12 +TAG=0.0.13 EVEREST_MANAGER_CPUS='1.0' EVEREST_MANAGER_MEMORY='1024mb' diff --git a/manager/Dockerfile b/manager/Dockerfile index d16ffe30..daa22a2b 100644 --- a/manager/Dockerfile +++ b/manager/Dockerfile @@ -1,6 +1,6 @@ FROM --platform=linux/x86_64 ghcr.io/everest/build-kit-alpine:latest -ARG EVEREST_VERSION=2024.2.0 +ARG EVEREST_VERSION=2024.3.0-rc1 ENV EVEREST_VERSION=${EVEREST_VERSION} COPY install.sh ./ diff --git a/nodered/config/config-sil-flow.json b/nodered/config/config-sil-flow.json index 5253bb7c..9afbb515 100644 --- a/nodered/config/config-sil-flow.json +++ b/nodered/config/config-sil-flow.json @@ -13,6 +13,14 @@ "disabled": false, "info": "" }, + { + "id": "cb7609df6138407d", + "type": "tab", + "label": "Errors", + "disabled": false, + "info": "", + "env": [] + }, { "id": "af1e1eeac9c4b704", "type": "group", @@ -30,9 +38,7 @@ "1295e032d7ddbc20" ], "x": 1114, - "y": 439, - "w": 152, - "h": 82 + "y": 439 }, { "id": "7140803fb3989089", @@ -331,6 +337,39 @@ "disabled": false, "hidden": false }, + { + "id": "18b792e585c4a82f", + "type": "ui_group", + "name": "BSP Errors", + "tab": "d3ada9fa4cf6ac53", + "order": 1, + "disp": true, + "width": "6", + "collapse": false, + "className": "" + }, + { + "id": "8f3b7f2bd49a8537", + "type": "ui_group", + "name": "AC_RCD Errors", + "tab": "d3ada9fa4cf6ac53", + "order": 1, + "disp": true, + "width": "6", + "collapse": false, + "className": "" + }, + { + "id": "442159b74a1a0712", + "type": "ui_group", + "name": "Connector Lock Errors", + "tab": "d3ada9fa4cf6ac53", + "order": 6, + "disp": true, + "width": "6", + "collapse": false, + "className": "" + }, { "id": "c8955752ad17f297", "type": "mqtt in", @@ -1809,7 +1848,7 @@ }, { "label": "AC RCD Error", - "value": "sleep 1;rcd_current 10.3;sleep 10;rcd_current 0.1sleep 36000#unplug", + "value": "sleep 1;iec_wait_pwr_ready;sleep 1;draw_power_regulated 16,3;sleep 3;rcd_current 10.5;sleep 5;rcd_current 0.2;sleep 36000#unplug", "type": "str" }, { @@ -1949,5 +1988,1253 @@ "620b0d248a89ece0" ] ] + }, + { + "id": "14a551bb80c5552d", + "type": "change", + "z": "cb7609df6138407d", + "name": "", + "rules": [ + { + "t": "set", + "p": "connector_number", + "pt": "flow", + "to": "1", + "tot": "str" + } + ], + "action": "", + "property": "", + "from": "", + "to": "", + "reg": false, + "x": 440, + "y": 180, + "wires": [ + [] + ] + }, + { + "id": "2ffed6827d01d00d", + "type": "inject", + "z": "cb7609df6138407d", + "name": "", + "props": [ + { + "p": "payload" + }, + { + "p": "topic", + "vt": "str" + } + ], + "repeat": "", + "crontab": "", + "once": true, + "onceDelay": 0.1, + "topic": "", + "payloadType": "date", + "x": 190, + "y": 180, + "wires": [ + [ + "14a551bb80c5552d" + ] + ] + }, + { + "id": "ca7308d14419cbd2", + "type": "change", + "z": "cb7609df6138407d", + "name": "Insert Connector number", + "rules": [ + { + "t": "change", + "p": "topic", + "pt": "msg", + "from": "#", + "fromt": "str", + "to": "connector_number", + "tot": "flow" + } + ], + "action": "", + "property": "", + "from": "", + "to": "", + "reg": false, + "x": 770, + "y": 560, + "wires": [ + [ + "513a3b91748dc03c" + ] + ] + }, + { + "id": "513a3b91748dc03c", + "type": "mqtt out", + "z": "cb7609df6138407d", + "name": "", + "topic": "", + "qos": "1", + "retain": "false", + "respTopic": "", + "contentType": "", + "userProps": "", + "correl": "", + "expiry": "", + "broker": "fc8686af.48d178", + "x": 970, + "y": 560, + "wires": [] + }, + { + "id": "cf15f41427168f59", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "BrownOut", + "tooltip": "", + "group": "18b792e585c4a82f", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"BrownOut\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"BrownOut\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 160, + "y": 280, + "wires": [ + [ + "ca7308d14419cbd2" + ] + ] + }, + { + "id": "b0c90949862e4acf", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "DiodeFault", + "tooltip": "", + "group": "18b792e585c4a82f", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"DiodeFault\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"DiodeFault\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 170, + "y": 240, + "wires": [ + [ + "ca7308d14419cbd2" + ] + ] + }, + { + "id": "40c2bf363920110e", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "EnergyManagement", + "tooltip": "", + "group": "18b792e585c4a82f", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"EnergyManagement\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"EnergyManagement\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 200, + "y": 320, + "wires": [ + [ + "ca7308d14419cbd2" + ] + ] + }, + { + "id": "94a8973cf4eb4963", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "PermanentFault", + "tooltip": "", + "group": "18b792e585c4a82f", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"PermanentFault\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"PermanentFault\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 180, + "y": 360, + "wires": [ + [ + "ca7308d14419cbd2" + ] + ] + }, + { + "id": "db13aa747d6ffd3a", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "MREC2GroundFailure", + "tooltip": "", + "group": "18b792e585c4a82f", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"MREC2GroundFailure\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"MREC2GroundFailure\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 200, + "y": 400, + "wires": [ + [ + "ca7308d14419cbd2" + ] + ] + }, + { + "id": "a18a831e962fe2fb", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "MREC4OverCurrentFailure", + "tooltip": "", + "group": "18b792e585c4a82f", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"MREC4OverCurrentFailure\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"MREC4OverCurrentFailure\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 220, + "y": 440, + "wires": [ + [ + "ca7308d14419cbd2" + ] + ] + }, + { + "id": "2fc7fdfe4ae8b520", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "MREC5OverVoltage", + "tooltip": "", + "group": "18b792e585c4a82f", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"MREC5OverVoltage\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"MREC5OverVoltage\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 200, + "y": 480, + "wires": [ + [ + "ca7308d14419cbd2" + ] + ] + }, + { + "id": "9efbf3ce40d6881c", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "MREC6UnderVoltage", + "tooltip": "", + "group": "18b792e585c4a82f", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"MREC6UnderVoltage\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"MREC6UnderVoltage\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 200, + "y": 520, + "wires": [ + [ + "ca7308d14419cbd2" + ] + ] + }, + { + "id": "d6bbb4c57751877b", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "MREC8EmergencyStop", + "tooltip": "", + "group": "18b792e585c4a82f", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"MREC8EmergencyStop\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"MREC8EmergencyStop\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 210, + "y": 560, + "wires": [ + [ + "ca7308d14419cbd2" + ] + ] + }, + { + "id": "639a0db868e0ed18", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "MREC10InvalidVehicleMode", + "tooltip": "", + "group": "18b792e585c4a82f", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"MREC10InvalidVehicleMode\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"MREC10InvalidVehicleMode\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 220, + "y": 600, + "wires": [ + [ + "ca7308d14419cbd2" + ] + ] + }, + { + "id": "7b28a940fe45f635", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "MREC14PilotFault", + "tooltip": "", + "group": "18b792e585c4a82f", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"MREC14PilotFault\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"MREC14PilotFault\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 190, + "y": 640, + "wires": [ + [ + "ca7308d14419cbd2" + ] + ] + }, + { + "id": "0232fd01e1e02fe1", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "MREC15PowerLoss", + "tooltip": "", + "group": "18b792e585c4a82f", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"MREC15PowerLoss\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"MREC15PowerLoss\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 200, + "y": 680, + "wires": [ + [ + "ca7308d14419cbd2" + ] + ] + }, + { + "id": "202ebd4c388a5817", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "MREC17EVSEContactorFault", + "tooltip": "", + "group": "18b792e585c4a82f", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"MREC17EVSEContactorFault\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"MREC17EVSEContactorFault\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 230, + "y": 720, + "wires": [ + [ + "ca7308d14419cbd2" + ] + ] + }, + { + "id": "0a81c071b35d54d3", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "MREC18CableOverTempDerate", + "tooltip": "", + "group": "18b792e585c4a82f", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"MREC18CableOverTempDerate\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"MREC18CableOverTempDerate\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 230, + "y": 760, + "wires": [ + [ + "ca7308d14419cbd2" + ] + ] + }, + { + "id": "3eb9a5937aed34a7", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "MREC19CableOverTempStop", + "tooltip": "", + "group": "18b792e585c4a82f", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"MREC19CableOverTempStop\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"MREC19CableOverTempStop\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 230, + "y": 800, + "wires": [ + [ + "ca7308d14419cbd2" + ] + ] + }, + { + "id": "b6208cc76ab8ba93", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "MREC20PartialInsertion", + "tooltip": "", + "group": "18b792e585c4a82f", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"MREC20PartialInsertion\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"MREC20PartialInsertion\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 210, + "y": 840, + "wires": [ + [ + "ca7308d14419cbd2" + ] + ] + }, + { + "id": "1205c62ee631e717", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "MREC23ProximityFault", + "tooltip": "", + "group": "18b792e585c4a82f", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"MREC23ProximityFault\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"MREC23ProximityFault\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 210, + "y": 880, + "wires": [ + [ + "ca7308d14419cbd2" + ] + ] + }, + { + "id": "df7bf0f1e692028c", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "MREC24ConnectorVoltageHigh", + "tooltip": "", + "group": "18b792e585c4a82f", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"MREC24ConnectorVoltageHigh\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"MREC24ConnectorVoltageHigh\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 230, + "y": 920, + "wires": [ + [ + "ca7308d14419cbd2" + ] + ] + }, + { + "id": "5a669dee09d69d6c", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "MREC25BrokenLatch", + "tooltip": "", + "group": "18b792e585c4a82f", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"MREC25BrokenLatch\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"MREC25BrokenLatch\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 200, + "y": 960, + "wires": [ + [ + "ca7308d14419cbd2" + ] + ] + }, + { + "id": "25cadcb508c05cfc", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "MREC26CutCable", + "tooltip": "", + "group": "18b792e585c4a82f", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"MREC26CutCable\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"MREC26CutCable\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 190, + "y": 1000, + "wires": [ + [ + "ca7308d14419cbd2" + ] + ] + }, + { + "id": "51237c21c12a20a1", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "MREC2GroundFailure", + "tooltip": "", + "group": "8f3b7f2bd49a8537", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"ac_rcd_MREC2GroundFailure\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"ac_rcd_MREC2GroundFailure\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 200, + "y": 1100, + "wires": [ + [ + "f2cae8b2ddf91894" + ] + ] + }, + { + "id": "f2cae8b2ddf91894", + "type": "change", + "z": "cb7609df6138407d", + "name": "Insert Connector number", + "rules": [ + { + "t": "change", + "p": "topic", + "pt": "msg", + "from": "#", + "fromt": "str", + "to": "connector_number", + "tot": "flow" + } + ], + "action": "", + "property": "", + "from": "", + "to": "", + "reg": false, + "x": 510, + "y": 1180, + "wires": [ + [ + "b0ee128dcff69ae5" + ] + ] + }, + { + "id": "b0ee128dcff69ae5", + "type": "mqtt out", + "z": "cb7609df6138407d", + "name": "", + "topic": "", + "qos": "1", + "retain": "false", + "respTopic": "", + "contentType": "", + "userProps": "", + "correl": "", + "expiry": "", + "broker": "fc8686af.48d178", + "x": 770, + "y": 1180, + "wires": [] + }, + { + "id": "15289a399aa46887", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "VendorError", + "tooltip": "", + "group": "8f3b7f2bd49a8537", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"ac_rcd_VendorError\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"ac_rcd_VendorError\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 170, + "y": 1140, + "wires": [ + [ + "f2cae8b2ddf91894" + ] + ] + }, + { + "id": "5079f15096b7aed0", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "Selftest", + "tooltip": "", + "group": "8f3b7f2bd49a8537", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"ac_rcd_Selftest\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"ac_rcd_Selftest\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 160, + "y": 1180, + "wires": [ + [ + "f2cae8b2ddf91894" + ] + ] + }, + { + "id": "9ae6fa3942256318", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "rcd_AC", + "tooltip": "", + "group": "8f3b7f2bd49a8537", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"ac_rcd_AC\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"ac_rcd_AC\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 160, + "y": 1220, + "wires": [ + [ + "f2cae8b2ddf91894" + ] + ] + }, + { + "id": "652a0a392cd14661", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "rcd_DC", + "tooltip": "", + "group": "8f3b7f2bd49a8537", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"ac_rcd_DC\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"ac_rcd_DC\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 160, + "y": 1260, + "wires": [ + [ + "f2cae8b2ddf91894" + ] + ] + }, + { + "id": "07551316de7e8a90", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "ConnectorLockCapNotCharged", + "tooltip": "", + "group": "442159b74a1a0712", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"lock_ConnectorLockCapNotCharged\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"lock_ConnectorLockCapNotCharged\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 230, + "y": 1360, + "wires": [ + [ + "36bc757cecd5777c" + ] + ] + }, + { + "id": "36bc757cecd5777c", + "type": "change", + "z": "cb7609df6138407d", + "name": "Insert Connector number", + "rules": [ + { + "t": "change", + "p": "topic", + "pt": "msg", + "from": "#", + "fromt": "str", + "to": "connector_number", + "tot": "flow" + } + ], + "action": "", + "property": "", + "from": "", + "to": "", + "reg": false, + "x": 590, + "y": 1440, + "wires": [ + [ + "84f8ad57adf2d1be" + ] + ] + }, + { + "id": "84f8ad57adf2d1be", + "type": "mqtt out", + "z": "cb7609df6138407d", + "name": "", + "topic": "", + "qos": "1", + "retain": "false", + "respTopic": "", + "contentType": "", + "userProps": "", + "correl": "", + "expiry": "", + "broker": "fc8686af.48d178", + "x": 790, + "y": 1440, + "wires": [] + }, + { + "id": "77abd0fe30552da7", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "ConnectorLockUnexpectedOpen", + "tooltip": "", + "group": "442159b74a1a0712", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"lock_ConnectorLockUnexpectedOpen\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"lock_ConnectorLockUnexpectedOpen\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 230, + "y": 1400, + "wires": [ + [ + "36bc757cecd5777c" + ] + ] + }, + { + "id": "65881b948e434d48", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "ConnectorLockUnexpectedClose", + "tooltip": "", + "group": "442159b74a1a0712", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"lock_ConnectorLockUnexpectedClose\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"lock_ConnectorLockUnexpectedClose\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 240, + "y": 1440, + "wires": [ + [ + "36bc757cecd5777c" + ] + ] + }, + { + "id": "94d329ad56d7a2de", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "ConnectorLockFailedUnlock", + "tooltip": "", + "group": "442159b74a1a0712", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"lock_ConnectorLockFailedUnlock\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"lock_ConnectorLockFailedUnlock\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 220, + "y": 1480, + "wires": [ + [ + "36bc757cecd5777c" + ] + ] + }, + { + "id": "25c2aed46d794e37", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "MREC1ConnectorLockFailure", + "tooltip": "", + "group": "442159b74a1a0712", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"lock_MREC1ConnectorLockFailure\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"lock_MREC1ConnectorLockFailure\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 230, + "y": 1520, + "wires": [ + [ + "36bc757cecd5777c" + ] + ] + }, + { + "id": "ecf656ff7d89ccaf", + "type": "ui_switch", + "z": "cb7609df6138407d", + "name": "", + "label": "VendorError", + "tooltip": "", + "group": "442159b74a1a0712", + "order": 1, + "width": 0, + "height": 0, + "passthru": true, + "decouple": "false", + "topic": "everest_external/nodered/#/carsim/error", + "topicType": "str", + "style": "", + "onvalue": "{\"error_type\":\"lock_VendorError\",\"raise\":\"true\"}", + "onvalueType": "json", + "onicon": "", + "oncolor": "", + "offvalue": "{\"error_type\":\"lock_VendorError\",\"raise\":\"false\"}", + "offvalueType": "json", + "officon": "", + "offcolor": "", + "animate": false, + "className": "", + "x": 170, + "y": 1560, + "wires": [ + [ + "36bc757cecd5777c" + ] + ] } ] diff --git a/nodered/config/config-sil-two-evse-flow.json b/nodered/config/config-sil-two-evse-flow.json index c69dcdf1..6c6a4b5f 100644 --- a/nodered/config/config-sil-two-evse-flow.json +++ b/nodered/config/config-sil-two-evse-flow.json @@ -1356,7 +1356,7 @@ "type": "function", "z": "e921db8897354328", "name": "Swipe token", - "func": "if (msg.topic.indexOf('id_token') > -1) flow.set('id_token', msg.payload);\nif (msg.topic.indexOf('token_type') > -1) flow.set('token_type', msg.payload);\nif (msg.topic.indexOf('prevalidated') > -1) flow.set('prevalidated', msg.payload);\nif (msg.topic.indexOf('connectors') > -1) flow.set('connectors', msg.payload);\nif (msg.topic.indexOf('complete') > -1) {\n msg.payload = {\n 'id_token': flow.get('id_token'),\n 'authorization_type': flow.get('token_type'),\n 'prevalidated': flow.get('prevalidated'),\n 'connectors': [flow.get('connectors')]\n };\n return msg;\n}\n", + "func": "if (msg.topic.indexOf('id_token') > -1) flow.set('id_token', msg.payload);\nif (msg.topic.indexOf('token_type') > -1) flow.set('token_type', msg.payload);\nif (msg.topic.indexOf('prevalidated') > -1) flow.set('prevalidated', msg.payload);\nif (msg.topic.indexOf('connectors') > -1) flow.set('connectors', msg.payload);\nif (msg.topic.indexOf('complete') > -1) {\n msg.payload = {\n 'id_token': {\n 'value': flow.get('id_token'),\n 'type': 'ISO14443'\n},\n 'authorization_type': flow.get('token_type'),\n 'prevalidated': flow.get('prevalidated'),\n 'connectors': [flow.get('connectors')]\n };\n return msg;\n}\n", "outputs": 1, "noerr": 0, "initialize": "", @@ -2138,6 +2138,16 @@ "label": "AC ISO15118-2", "value": "sleep 1;iso_wait_slac_matched;iso_start_v2g_session ExternalPayment,AC_three_phase_core;iso_wait_pwr_ready;iso_draw_power_regulated 16,3;sleep 36000#iso_stop_charging;iso_wait_v2g_session_stopped;unplug#iso_pause_charging;iso_wait_for_resume#iso_start_bcb_toogle 3;iso_wait_pwm_is_running;iso_start_v2g_session ExternalPayment,AC_three_phase_core;iso_wait_pwr_ready;iso_draw_power_regulated 16,3;sleep 36000", "type": "str" + }, + { + "label": "DC ISO15118-2", + "value": "sleep 1;iso_wait_slac_matched;iso_start_v2g_session ExternalPayment,DC_extended;iso_wait_pwr_ready;sleep 36000#iso_stop_charging;iso_wait_v2g_session_stopped;unplug#iso_pause_charging;iso_wait_for_resume#iso_start_bcb_toogle 3;iso_wait_pwm_is_running;iso_start_v2g_session ExternalPayment,DC_extended;iso_wait_pwr_ready;sleep 36000;", + "type": "str" + }, + { + "label": "AC ISO15118-2 Plug&Charge", + "value": "sleep 1;iso_wait_slac_matched;iso_start_v2g_session contract,AC_three_phase_core;iso_wait_pwr_ready;iso_draw_power_regulated 16,3;sleep 36000#;iso_stop_charging;iso_wait_v2g_session_stopped;unplug", + "type": "str" } ], "payload": "",