diff --git a/go.mod b/go.mod index 44e8d46492c..0a31fce1b88 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( github.com/gorilla/mux v1.8.1 github.com/gregdel/pushover v1.3.0 github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 - github.com/grid-x/modbus v0.0.0-20240214112450-0d4922fba364 + github.com/grid-x/modbus v0.0.0-20240429072715-02314cc902aa github.com/hashicorp/go-version v1.6.0 github.com/hasura/go-graphql-client v0.12.1 github.com/influxdata/influxdb-client-go/v2 v2.13.0 @@ -91,10 +91,10 @@ require ( gitlab.com/bboehmke/sunny v0.16.0 go.uber.org/mock v0.4.0 golang.org/x/crypto/x509roots/fallback v0.0.0-20240318092723-b91329d961d4 - golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81 - golang.org/x/net v0.22.0 + golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f + golang.org/x/net v0.24.0 golang.org/x/oauth2 v0.18.0 - golang.org/x/sync v0.6.0 + golang.org/x/sync v0.7.0 golang.org/x/text v0.14.0 google.golang.org/grpc v1.62.1 google.golang.org/protobuf v1.33.0 @@ -161,7 +161,7 @@ require ( github.com/oapi-codegen/runtime v1.1.1 // indirect github.com/onsi/ginkgo v1.16.5 // indirect github.com/pascaldekloe/name v1.0.1 // indirect - github.com/pelletier/go-toml/v2 v2.2.0 // indirect + github.com/pelletier/go-toml/v2 v2.2.1 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.6.0 // indirect @@ -184,11 +184,11 @@ require ( github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect gitlab.com/c0b/go-ordered-json v0.0.0-20201030195603-febf46534d5a // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.21.0 - golang.org/x/mod v0.16.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/term v0.18.0 // indirect - golang.org/x/tools v0.19.0 + golang.org/x/crypto v0.22.0 + golang.org/x/mod v0.17.0 // indirect + golang.org/x/sys v0.19.0 // indirect + golang.org/x/term v0.19.0 // indirect + golang.org/x/tools v0.20.0 google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect gopkg.in/go-playground/validator.v9 v9.31.0 // indirect @@ -200,8 +200,10 @@ require ( modernc.org/sqlite v1.29.5 // indirect ) -replace github.com/grid-x/modbus => github.com/evcc-io/modbus v0.0.0-20230705160100-23e1df2c01c3 - replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16 replace github.com/spf13/viper => github.com/spf13/viper v1.18.1 + +replace github.com/grid-x/modbus => github.com/evcc-io/modbus v0.0.0-20240419133105-829633e7c6b0 + +replace github.com/volkszaehler/mbmd => github.com/andig/mbmd v0.0.0-20240501150732-0d3415110922 diff --git a/go.sum b/go.sum index 310a50f2217..72e42d92299 100644 --- a/go.sum +++ b/go.sum @@ -36,6 +36,8 @@ github.com/andig/go-powerwall v0.2.1-0.20230808194509-dd70cdb6e140 h1:C93T8vg7CN github.com/andig/go-powerwall v0.2.1-0.20230808194509-dd70cdb6e140/go.mod h1:Xk09mD+7RTCuuHMX5RxlqgEUeh9oZdIX0rL0qiY6l/4= github.com/andig/gosunspec v0.0.0-20231205122018-1daccfa17912 h1:pphS+WUa9zK0ZH/Rt2JMEaOx0qz8dDzOzbr/W7BMiXQ= github.com/andig/gosunspec v0.0.0-20231205122018-1daccfa17912/go.mod h1:c6P6szcR+ROkqZruOR4f6qbDKFjZX6OitPpj+yJ/r8k= +github.com/andig/mbmd v0.0.0-20240501150732-0d3415110922 h1:Sq1tOQ7ZmvPUUuRyZ9WkCVLhuS02rwvnhqlNo4m8Xhk= +github.com/andig/mbmd v0.0.0-20240501150732-0d3415110922/go.mod h1:MA3vKWI4KozcpWvD9dwN6CL+WqwdK9XGXT5Iv49IsUM= github.com/andig/mbserver v0.0.0-20230310211055-1d29cbb5820e h1:m/NTP3JWpR7M0ljLxiQU4fzR25jjhe1LDtxLMNcoNJQ= github.com/andig/mbserver v0.0.0-20230310211055-1d29cbb5820e/go.mod h1:4VtYzTm//oUipwvO3yh0g/udTE7pYJM+U/kyAuFDsgM= github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsViSLyss= @@ -127,8 +129,8 @@ github.com/enbility/eebus-go v0.2.0/go.mod h1:Ozg1eDUfSbHfQ1dWfyAUa3h8dMtgM/01eO github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/evcc-io/modbus v0.0.0-20230705160100-23e1df2c01c3 h1:QBtLqy85cy9KLRWqKxX+42bN1rWti8iU7pL7Vwf2UbE= -github.com/evcc-io/modbus v0.0.0-20230705160100-23e1df2c01c3/go.mod h1:qVX2WhsI5xyAoM6I/MV1bXSKBPdLAjp7pCvieO/S0AY= +github.com/evcc-io/modbus v0.0.0-20240419133105-829633e7c6b0 h1:TRyQYvEfiVsQup88bfboOmFy8bPYltAFJfzeS6JcSP4= +github.com/evcc-io/modbus v0.0.0-20240419133105-829633e7c6b0/go.mod h1:ei49YhPP0v5cVJZAX9k/VdqQakUYNKOEvKB/6vnkZaU= github.com/evcc-io/tesla-proxy-client v0.0.0-20240221194046-4168b3759701 h1:3JplY3KS6KMDVDNAU+3+KWmSWmoHIU34qwuIpW6SiHk= github.com/evcc-io/tesla-proxy-client v0.0.0-20240221194046-4168b3759701/go.mod h1:zWtAweBqXJTk3HSrPSecz3Q3a2hAUQ4vOE6paJfn03I= github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= @@ -511,8 +513,8 @@ github.com/pascaldekloe/name v1.0.1 h1:9lnXOHeqeHHnWLbKfH6X98+4+ETVqFqxN09UXSjcM github.com/pascaldekloe/name v1.0.1/go.mod h1:Z//MfYJnH4jVpQ9wkclwu2I2MkHmXTlT9wR5UZScttM= github.com/paypal/gatt v0.0.0-20151011220935-4ae819d591cf/go.mod h1:+AwQL2mK3Pd3S+TUwg0tYQjid0q1txyNUJuuSmz8Kdk= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -github.com/pelletier/go-toml/v2 v2.2.0 h1:QLgLl2yMN7N+ruc31VynXs1vhMZa7CeHHejIeBAsoHo= -github.com/pelletier/go-toml/v2 v2.2.0/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= +github.com/pelletier/go-toml/v2 v2.2.1 h1:9TA9+T8+8CUCO2+WYnDLCgrYi9+omqKXyjDtosvtEhg= +github.com/pelletier/go-toml/v2 v2.2.1/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/peterbourgon/ff v1.2.0/go.mod h1:ljiF7yxtUvZaxUDyUqQa0+uiEOgwVboj+Q2S2+0nq40= github.com/philippseith/signalr v0.6.3 h1:zCpVCdVq3LXRW7wXMOBGhHDqaijUdTPVhsIHBOnlbVg= @@ -673,8 +675,6 @@ github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IU github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok= github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= -github.com/volkszaehler/mbmd v0.0.0-20240229124119-740c5c8ad344 h1:pxfwqAjssh3n0bz0WcR77sg7twlYdopTjTkBzsjcOSU= -github.com/volkszaehler/mbmd v0.0.0-20240229124119-740c5c8ad344/go.mod h1:p1nUKfszvbZ+mMMsMi1vaKGA/eBAXC34VSKCk5slyG4= github.com/writeas/go-strip-markdown/v2 v2.1.1 h1:hAxUM21Uhznf/FnbVGiJciqzska6iLei22Ijc3q2e28= github.com/writeas/go-strip-markdown/v2 v2.1.1/go.mod h1:UvvgPJgn1vvN8nWuE5e7v/+qmDu3BSVnKAB6Gl7hFzA= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= @@ -713,13 +713,13 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= +golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= golang.org/x/crypto/x509roots/fallback v0.0.0-20240318092723-b91329d961d4 h1:ge/5rEpPmE0QRgTArv5El7EncSUltCBzwC+iJFanAsU= golang.org/x/crypto/x509roots/fallback v0.0.0-20240318092723-b91329d961d4/go.mod h1:kNa9WdvYnzFwC79zRpLRMJbdEFlhyM5RPFBBZp/wWH8= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81 h1:6R2FC06FonbXQ8pK11/PDFY6N6LWlf9KlzibaCapmqc= -golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81/go.mod h1:CQ1k9gNrJ50XIzaKCRR2hssIjF07kZFEiieALBM/ARQ= +golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2nTQVIEhZIptnrVb1XY= +golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -731,8 +731,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= -golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -761,8 +761,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= -golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= @@ -779,8 +779,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -826,15 +826,15 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= -golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= -golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= +golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q= +golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -869,8 +869,8 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw= -golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= +golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= +golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/meter/goodwe-wifi.go b/meter/goodwe-wifi.go index c8ea6abf64a..5f67927fc27 100644 --- a/meter/goodwe-wifi.go +++ b/meter/goodwe-wifi.go @@ -1,19 +1,28 @@ package meter import ( + "encoding/binary" "time" "github.com/evcc-io/evcc/api" - "github.com/evcc-io/evcc/meter/goodwe" "github.com/evcc-io/evcc/util" "github.com/evcc-io/evcc/util/request" + gridx "github.com/grid-x/modbus" ) type goodWeWiFi struct { - usage string - inverter *util.Monitor[goodwe.Inverter] + log *util.Logger + usage string + conn gridx.Client } +const ( + goodwePv1Power = 0x8921 + goodwePv2Power = 0x8925 + goodweActivePower = 0x8944 + goodweBatterySoc = 0x908F +) + func init() { registry.Add("goodwe-wifi", NewGoodWeWifiFromConfig) } @@ -37,21 +46,17 @@ func NewGoodWeWifiFromConfig(other map[string]interface{}) (api.Meter, error) { } func NewGoodWeWiFi(uri, usage string, timeout time.Duration) (api.Meter, error) { - instance, err := goodwe.Instance(util.NewLogger("goodwe-wifi")) - if err != nil { - return nil, err - } - - inverter := instance.GetInverter(uri) - if inverter == nil { - inverter = instance.AddInverter(uri, timeout) - } + handler := gridx.NewRTUOverUDPClientHandler(util.DefaultPort(uri, 8899)) + conn := gridx.NewClient(handler) res := &goodWeWiFi{ - usage: usage, - inverter: inverter, + log: util.NewLogger("goodwe-wifi"), + usage: usage, + conn: conn, } + handler.Logger = res + // decorate api.BatterySoc var batterySoc func() (float64, error) if usage == "battery" { @@ -61,24 +66,38 @@ func NewGoodWeWiFi(uri, usage string, timeout time.Duration) (api.Meter, error) return decorateGoodWeWifi(res, batterySoc), nil } -func (m *goodWeWiFi) CurrentPower() (float64, error) { - data, err := m.inverter.Get() - if err != nil { - return 0, err - } +func (m *goodWeWiFi) Printf(format string, v ...interface{}) { + // TODO modbus format + m.log.TRACE.Printf(format, v...) +} +func (m *goodWeWiFi) CurrentPower() (float64, error) { switch m.usage { case "grid": - return data.NetPower, nil + b, err := m.conn.ReadHoldingRegisters(goodweActivePower, 1) + if err != nil { + return 0, err + } + return float64(int16(binary.BigEndian.Uint16(b))), nil + case "pv": - return data.PvPower, nil + b, err := m.conn.ReadHoldingRegisters(goodwePv1Power, 2) + if err != nil { + return 0, err + } + return float64(binary.BigEndian.Uint32(b)), nil + case "battery": - return data.BatteryPower, nil + return 0, api.ErrNotAvailable } + return 0, api.ErrNotAvailable } func (m *goodWeWiFi) batterySoc() (float64, error) { - data, err := m.inverter.Get() - return data.Soc, err + b, err := m.conn.ReadHoldingRegisters(goodweBatterySoc, 1) + if err != nil { + return 0, err + } + return float64(binary.BigEndian.Uint16(b)), nil } diff --git a/meter/goodwe/server.go b/meter/goodwe/server.go deleted file mode 100644 index 6a3cc327f19..00000000000 --- a/meter/goodwe/server.go +++ /dev/null @@ -1,125 +0,0 @@ -package goodwe - -import ( - "encoding/binary" - "net" - "sync" - "time" - - "github.com/cenkalti/backoff/v4" - "github.com/evcc-io/evcc/util" - "golang.org/x/exp/maps" -) - -var ( - instance *Server - mu sync.RWMutex -) - -func Instance(log *util.Logger) (*Server, error) { - mu.Lock() - defer mu.Unlock() - - if instance != nil { - return instance, nil - } - - instance = &Server{ - log: log, - inverters: make(map[string]*util.Monitor[Inverter]), - } - - addr, err := net.ResolveUDPAddr("udp", "0.0.0.0:8899") - if err != nil { - return nil, err - } - - instance.conn, err = net.ListenUDP("udp", addr) - if err != nil { - return nil, err - } - - go instance.listen() - go instance.readData() - - return instance, err -} - -func (m *Server) AddInverter(ip string, timeout time.Duration) *util.Monitor[Inverter] { - mu.Lock() - defer mu.Unlock() - monitor := util.NewMonitor[Inverter](timeout) - m.inverters[ip] = monitor - return monitor -} - -func (m *Server) GetInverter(ip string) *util.Monitor[Inverter] { - mu.RLock() - defer mu.RUnlock() - return m.inverters[ip] -} - -func (m *Server) readData() { - bo := backoff.NewExponentialBackOff() - bo.MaxInterval = time.Second - bo.MaxElapsedTime = 10 * time.Second - - for { - mu.RLock() - ips := maps.Keys(m.inverters) - mu.RUnlock() - - for _, ip := range ips { - if err := backoff.Retry(func() error { - addr, err := net.ResolveUDPAddr("udp", net.JoinHostPort(ip, "8899")) - if err == nil { - _, err = m.conn.WriteToUDP([]byte{0xF7, 0x03, 0x89, 0x1C, 0x00, 0x7D, 0x7A, 0xE7}, addr) - } - if err == nil { - time.Sleep(5 * time.Second) - _, err = m.conn.WriteToUDP([]byte{0xF7, 0x03, 0x90, 0x88, 0x00, 0x0D, 0x3D, 0xB3}, addr) - } - return err - }, bo); err != nil { - m.log.ERROR.Println(err) - } - } - } -} - -func (m *Server) listen() { - for { - buf := make([]byte, 1024) - n, addr, err := m.conn.ReadFromUDP(buf) - if err != nil { - m.log.ERROR.Println(err) - continue - } - m.log.TRACE.Printf("recv from %s: % X", addr, buf[:n]) - - ip := addr.IP.String() - monitor := m.GetInverter(ip) - if monitor == nil { - m.log.ERROR.Println("unknown inverter:", ip) - continue - } - - monitor.SetFunc(func(inverter Inverter) Inverter { - if buf[4] == 250 { - ui := func(u, i int16) float64 { - return float64(int16(binary.BigEndian.Uint16(buf[u:]))) * - float64(int16(binary.BigEndian.Uint16(buf[i:]))) / 100 - } - inverter.PvPower = ui(11, 13) + ui(19, 21) - inverter.BatteryPower = ui(165, 167) - inverter.NetPower = -float64(int32(binary.BigEndian.Uint32(buf[83:]))) - } - - if buf[4] == 26 { - inverter.Soc = float64(buf[20]) - } - - return inverter - }) - } -} diff --git a/meter/goodwe/types.go b/meter/goodwe/types.go deleted file mode 100644 index 02c372eb2ff..00000000000 --- a/meter/goodwe/types.go +++ /dev/null @@ -1,20 +0,0 @@ -package goodwe - -import ( - "net" - - "github.com/evcc-io/evcc/util" -) - -type Server struct { - log *util.Logger - conn *net.UDPConn - inverters map[string]*util.Monitor[Inverter] -} - -type Inverter struct { - PvPower float64 - NetPower float64 - BatteryPower float64 - Soc float64 -}