Revert "Modbus: don't render rtu: false for Modbus TCP (#9915)" (#10046)

evcc-io · Sep 24, 2023 · c920893 · c920893 · FreedimBeet · Oct 9, 2023
1 parent d58706e
commit c920893
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/charger/phoenix-em-eth.go b/charger/phoenix-em-eth.go
@@ -37,14 +37,15 @@ func init() {
 // NewPhoenixEMEthFromConfig creates a Phoenix charger from generic config
 func NewPhoenixEMEthFromConfig(other map[string]interface{}) (api.Charger, error) {
 	cc := struct {
-		URI   string
-		ID    uint8
-		Meter struct {
+		modbus.TcpSettings `mapstructure:",squash"`
+		Meter              struct {
 			Power, Energy, Currents bool
 		}
 	}{
-		URI: "192.168.0.8:502", // default
-		ID:  180,               // default
+		TcpSettings: modbus.TcpSettings{
+			URI: "192.168.0.8:502", // default
+			ID:  180,               // default
+		},
 	}
 
 	if err := util.DecodeOther(other, &cc); err != nil {

diff --git a/util/templates/modbus.tpl b/util/templates/modbus.tpl
@@ -12,6 +12,7 @@ rtu: true
 {{- else if or (eq .modbus "tcpip") .tcpip }}
 # Modbus TCP
 uri: {{ .host }}:{{ .port }}
+rtu: false
 {{- else }}
 # configuration error - should not happen
 modbusConnectionTypeNotDefined: {{ .modbus }}