evcc-io · andig · Jun 23, 2023 · Jun 23, 2023 · Jun 23, 2023 · Jun 23, 2023
diff --git a/templates/README.md b/templates/README.md
@@ -117,7 +117,7 @@ Example Use Case: With SMA Home Manager, there can be a SMA Energy Meter used fo
 **Predefined name values**:
 
 - `usage`: specifies a list of meter classes, the device can be used for. Possible values are `grid`, `pv`, `battery`, and `charger`
-- `modbus`: specifies that this device is accessed via modbus. It requires the `choice` property to have a list of possible interface values the device provides. These values can be `rs485` and `tcpip`. The command will use either to ask the appropriate questions and settings. The `render` section needs to include the string `{{include "modbus" .}}` in all places where the configuration needs modbus settings.
+- `modbus`: specifies that this device is accessed via modbus. It requires the `choice` property to have a list of possible interface values the device provides. These values can be `rtu`, `tcp` or `ascii`. The command will use either to ask the appropriate questions and settings. The `render` section needs to include the string `{{include "modbus" .}}` in all places where the configuration needs modbus settings.
 
 #### Usage Options
 

diff --git a/templates/definition/charger/abb.yaml b/templates/definition/charger/abb.yaml
@@ -11,7 +11,7 @@ requirements:
  evcc: ["sponsorship"]
 params:
  - name: modbus
- choice: ["rs485", "tcpip"]
+ choice: ["rtu", "tcp"]
 render: |
  type: abb
  {{- include "modbus" . }}
diff --git a/templates/definition/charger/abl-em4.yaml b/templates/definition/charger/abl-em4.yaml
@@ -8,7 +8,7 @@ requirements:
  evcc: ["sponsorship"]
 params:
  - name: modbus
- choice: ["tcpip"]
+ choice: ["tcp"]
  id: 255
  - name: connector
  default: 1

diff --git a/templates/definition/charger/abl.yaml b/templates/definition/charger/abl.yaml
@@ -11,7 +11,7 @@ requirements:
  evcc: ["sponsorship"]
 params:
  - name: modbus
- choice: ["rs485"]
+ choice: ["ascii"]
  baudrate: 38400
  comset: 8E1
  - name: timeout

diff --git a/templates/definition/charger/alfen.yaml b/templates/definition/charger/alfen.yaml
@@ -11,7 +11,7 @@ requirements:
  evcc: ["sponsorship"]
 params:
  - name: modbus
- choice: ["tcpip"]
+ choice: ["tcp"]
 render: |
  type: alfen
  {{- include "modbus" . }}
diff --git a/templates/definition/charger/alphatec.yaml b/templates/definition/charger/alphatec.yaml
@@ -7,7 +7,7 @@ requirements:
  evcc: ["sponsorship"]
 params:
  - name: modbus
- choice: ["rs485"]
+ choice: ["rtu"]
  baudrate: 9600
  comset: 8N1
  - name: timeout

diff --git a/templates/definition/charger/amperfied.yaml b/templates/definition/charger/amperfied.yaml
@@ -11,7 +11,7 @@ requirements:
  evcc: ["sponsorship"]
 params:
  - name: modbus
- choice: ["tcpip"]
+ choice: ["tcp"]
  id: 255
 render: |
  type: heidelberg

diff --git a/templates/definition/charger/amtron.yaml b/templates/definition/charger/amtron.yaml
@@ -7,7 +7,7 @@ requirements:
  evcc: ["sponsorship"]
 params:
  - name: modbus
- choice: ["tcpip"]
+ choice: ["tcp"]
  id: 255
 render: |
  type: amtron

diff --git a/templates/definition/charger/dadapower.yaml b/templates/definition/charger/dadapower.yaml
@@ -6,7 +6,7 @@ products:
 capabilities: ["1p3p", "mA", "rfid"]
 params:
  - name: modbus
- choice: ["tcpip"]
+ choice: ["tcp"]
  id: 1
 render: |
  type: dadapower

diff --git a/templates/definition/charger/em2go.yaml b/templates/definition/charger/em2go.yaml
@@ -10,7 +10,7 @@ requirements:
  en: "Recent firmware with Modbus support required (Pro Power: 1.01 and OCPP/ONC: 3.15)"
 params:
  - name: modbus
- choice: ["tcpip"]
+ choice: ["tcp"]
  id: 255
 render: |
  type: em2go

diff --git a/templates/definition/charger/evse-din.yaml b/templates/definition/charger/evse-din.yaml
@@ -9,7 +9,7 @@ products:
  generic: EVSE DIN
 params:
  - name: modbus
- choice: ["rs485"]
+ choice: ["rtu"]
  baudrate: 9600
  comset: 8N1
 render: |

diff --git a/templates/definition/charger/heidelberg.yaml b/templates/definition/charger/heidelberg.yaml
@@ -20,7 +20,7 @@ requirements:
  evcc: ["sponsorship"]
 params:
  - name: modbus
- choice: ["rs485"]
+ choice: ["rtu"]
  baudrate: 19200
  comset: 8E1
 render: |

diff --git a/templates/definition/charger/hesotec.yaml b/templates/definition/charger/hesotec.yaml
@@ -7,7 +7,7 @@ requirements:
  evcc: ["sponsorship"]
 params:
  - name: modbus
- choice: ["tcpip"]
+ choice: ["tcp"]
 render: |
  type: hesotec
  {{- include "modbus" . }}
diff --git a/templates/definition/charger/icharge-cion.yaml b/templates/definition/charger/icharge-cion.yaml
@@ -5,7 +5,7 @@ products:
  generic: i-CHARGE CION
 params:
  - name: modbus
- choice: ["tcpip"]
+ choice: ["tcp"]
 render: |
  type: custom
  status:

diff --git a/templates/definition/charger/innogy-ebox.yaml b/templates/definition/charger/innogy-ebox.yaml
@@ -14,7 +14,7 @@ requirements:
  evcc: ["sponsorship"]
 params:
  - name: modbus
- choice: ["tcpip"]
+ choice: ["tcp"]
 render: |
  type: innogy
  {{- include "modbus" . }}
diff --git a/templates/definition/charger/keba-modbus.yaml b/templates/definition/charger/keba-modbus.yaml
@@ -17,7 +17,7 @@ requirements:
  en: Requires firmware version 3.10.42 (C-series) bzw. 1.11 (X-series). For phase switching the Keba phase switch (KeContact S10) is also required.
 params:
  - name: modbus
- choice: ["tcpip"]
+ choice: ["tcp"]
  id: 255
 render: |
  type: keba-modbus

diff --git a/templates/definition/charger/kse.yaml b/templates/definition/charger/kse.yaml
@@ -8,7 +8,7 @@ requirements:
  evcc: ["sponsorship"]
 params:
  - name: modbus
- choice: ["rs485"]
+ choice: ["rtu"]
  baudrate: 9600
  comset: 8E1
  id: 100

diff --git a/templates/definition/charger/obo.yaml b/templates/definition/charger/obo.yaml
@@ -5,7 +5,7 @@ products:
  generic: Ion
 params:
  - name: modbus
- choice: ["rs485", "tcpip"]
+ choice: ["rtu"]
  baudrate: 19200
  comset: 8E1
  id: 101

diff --git a/templates/definition/charger/phoenix-charx.yaml b/templates/definition/charger/phoenix-charx.yaml
@@ -8,7 +8,7 @@ products:
  generic: EvLoad/ Mikro 2.0
 params:
  - name: modbus
- choice: ["tcpip"]
+ choice: ["tcp"]
  id: 255
  - name: connector
 render: |

diff --git a/templates/definition/charger/phoenix-em-eth.yaml b/templates/definition/charger/phoenix-em-eth.yaml
@@ -5,7 +5,7 @@ products:
  generic: EM-CP-PP-ETH (Modbus TCP)
 params:
  - name: modbus
- choice: ["tcpip"]
+ choice: ["tcp"]
  id: 255
 render: |
  type: phoenix-em-eth

diff --git a/templates/definition/charger/phoenix-ev-eth.yaml b/templates/definition/charger/phoenix-ev-eth.yaml
@@ -20,7 +20,7 @@ requirements:
  evcc: ["sponsorship"]
 params:
  - name: modbus
- choice: ["tcpip"]
+ choice: ["tcp"]
  id: 255
 render: |
  type: phoenix-ev-eth

diff --git a/templates/definition/charger/phoenix-ev-ser.yaml b/templates/definition/charger/phoenix-ev-ser.yaml
@@ -5,7 +5,7 @@ products:
  generic: EV-SER (Modbus RTU)
 params:
  - name: modbus
- choice: ["rs485"]
+ choice: ["rtu"]
 render: |
  type: phoenix-ev-ser
  {{- include "modbus" . }}
diff --git a/templates/definition/charger/pracht-alpha.yaml b/templates/definition/charger/pracht-alpha.yaml
@@ -7,7 +7,7 @@ requirements:
  evcc: ["sponsorship"]
 params:
  - name: modbus
- choice: ["rs485", "tcpip"]
+ choice: ["rtu", "tcp"]
  baudrate: 9600
  comset: 8N1
  id: 1

diff --git a/templates/definition/charger/scheider-evlink.yaml b/templates/definition/charger/scheider-evlink.yaml
@@ -7,7 +7,7 @@ requirements:
  evcc: ["sponsorship"]
 params:
  - name: modbus
- choice: ["tcpip"]
+ choice: ["tcp"]
  id: 255
 render: |
  type: schneider

diff --git a/templates/definition/charger/versicharge.yaml b/templates/definition/charger/versicharge.yaml
@@ -10,7 +10,7 @@ requirements:
  en: Requires firmware >= 2.121.5
 params:
  - name: modbus
- choice: ["tcpip"]
+ choice: ["tcp"]
  id: 2
 render: |
  type: versicharge

diff --git a/templates/definition/charger/vestel.yaml b/templates/definition/charger/vestel.yaml
@@ -14,7 +14,7 @@ requirements:
  evcc: ["sponsorship"]
 params:
  - name: modbus
- choice: ["tcpip"]
+ choice: ["tcp"]
  id: 255
 render: |
  type: vestel

diff --git a/templates/definition/common-schema.json b/templates/definition/common-schema.json
@@ -124,8 +124,9 @@
  "items": {
  "type": "string",
  "enum": [
- "tcpip",
- "rs485"
+ "tcp",
+ "rtu",
+ "ascii"
  ]
  }
  },

diff --git a/templates/definition/meter/abb-ab.yaml b/templates/definition/meter/abb-ab.yaml
@@ -7,7 +7,7 @@ params:
  - name: usage
  choice: ["grid", "charge"]
  - name: modbus
- choice: ["rs485"]
+ choice: ["rtu"]
 render: |
  type: modbus
  model: abb

diff --git a/templates/definition/meter/acrel-adw300.yaml b/templates/definition/meter/acrel-adw300.yaml
@@ -7,7 +7,7 @@ params:
  - name: usage
  choice: ["grid", "pv", "charge"]
  - name: modbus
- choice: ["rs485", "tcpip"]
+ choice: ["rtu", "tcp"]
  baudrate: 1200
 render: |
  type: custom

diff --git a/templates/definition/meter/alpha-ess-smile.yaml b/templates/definition/meter/alpha-ess-smile.yaml
@@ -8,7 +8,7 @@ params:
  choice: ["grid", "pv", "battery"]
  allinone: true
  - name: modbus
- choice: ["rs485", "tcpip"]
+ choice: ["rtu", "tcp"]
  baudrate: 9600
  id: 85
  - name: capacity

diff --git a/templates/definition/meter/be-mpm3pm.yaml b/templates/definition/meter/be-mpm3pm.yaml
@@ -7,7 +7,7 @@ params:
  - name: usage
  choice: ["grid", "charge"]
  - name: modbus
- choice: ["rs485"]
+ choice: ["rtu"]
 render: |
  type: modbus
  {{- include "modbus" . }}

diff --git a/templates/definition/meter/cfos.yaml b/templates/definition/meter/cfos.yaml
@@ -9,7 +9,7 @@ params:
  - name: usage
  choice: ["charge"]
  - name: modbus
- choice: ["tcpip"]
+ choice: ["tcp"]
  port: 4702
  id: 2
 render: |

diff --git a/templates/definition/meter/cg-em24.yaml b/templates/definition/meter/cg-em24.yaml
@@ -7,7 +7,7 @@ params:
  - name: usage
  choice: ["grid", "charge"]
  - name: modbus
- choice: ["rs485", "tcpip"]
+ choice: ["rtu", "tcp"]
 render: |
  type: modbus
  {{- include "modbus" . }}

diff --git a/templates/definition/meter/cg-emt3xx.yaml b/templates/definition/meter/cg-emt3xx.yaml
@@ -7,7 +7,7 @@ params:
  - name: usage
  choice: ["grid", "charge"]
  - name: modbus
- choice: ["rs485", "tcpip"]
+ choice: ["rtu", "tcp"]
 render: |
  type: modbus
  {{- include "modbus" . }}

diff --git a/templates/definition/meter/deye-hybrid.yaml b/templates/definition/meter/deye-hybrid.yaml
@@ -11,7 +11,7 @@ params:
  choice: ["grid", "pv", "battery"]
  allinone: true
  - name: modbus
- choice: ["rs485", "tcpip"]
+ choice: ["rtu", "tcp"]
  baudrate: 9600
  id: 1
  - name: capacity

diff --git a/templates/definition/meter/dzg.yaml b/templates/definition/meter/dzg.yaml
@@ -7,7 +7,7 @@ params:
  - name: usage
  choice: ["charge"]
  - name: modbus
- choice: ["rs485"]
+ choice: ["rtu"]
 render: |
  type: modbus
  model: dzg

diff --git a/templates/definition/meter/eastron-sdm120.yaml b/templates/definition/meter/eastron-sdm120.yaml
@@ -7,7 +7,7 @@ params:
  - name: usage
  choice: ["grid", "charge"]
  - name: modbus
- choice: ["rs485"]
+ choice: ["rtu"]
 render: |
  type: modbus
  {{- include "modbus" . }}

diff --git a/templates/definition/meter/eastron-sdm220_230.yaml b/templates/definition/meter/eastron-sdm220_230.yaml
@@ -7,7 +7,7 @@ params:
  - name: usage
  choice: ["grid", "charge"]
  - name: modbus
- choice: ["rs485"]
+ choice: ["rtu"]
 render: |
  type: modbus
  {{- include "modbus" . }}

diff --git a/templates/definition/meter/eastron-sdm72.yaml b/templates/definition/meter/eastron-sdm72.yaml
@@ -7,7 +7,7 @@ params:
  - name: usage
  choice: ["grid", "charge"]
  - name: modbus
- choice: ["rs485"]
+ choice: ["rtu"]
 render: |
  type: modbus
  {{- include "modbus" . }}

diff --git a/templates/definition/meter/eastron-sdm72v2_630.yaml b/templates/definition/meter/eastron-sdm72v2_630.yaml
@@ -10,7 +10,7 @@ params:
  - name: usage
  choice: ["grid", "charge"]
  - name: modbus
- choice: ["rs485"]
+ choice: ["rtu"]
 render: |
  type: modbus
  {{- include "modbus" . }}