Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modbus: add UDP and allow concurrent access #13676

Merged
merged 27 commits into from
Aug 2, 2024
Merged

Modbus: add UDP and allow concurrent access #13676

Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
15e21f7
Modbus: add UDP
andig Apr 19, 2024
ababd4d
wip
andig May 1, 2024
ccac638
wip
andig May 1, 2024
57ddb87
wip
andig May 1, 2024
45206c3
wip
andig May 2, 2024
a53b234
wip
andig May 2, 2024
9de8bbb
Parallelize meter setup
andig May 2, 2024
f24c3cc
Merge branch 'master' into chore/modbus-udp
andig May 2, 2024
63c748e
Merge branch 'master' into chore/modbus-udp
andig May 4, 2024
242a620
wip
andig May 4, 2024
da55fd3
Fix race in logger
andig May 4, 2024
ba2527a
wip
andig May 4, 2024
6b20be3
TODO races
andig May 4, 2024
cad39bb
Merge branch 'master' into chore/modbus-udp
andig May 4, 2024
63eb8c0
wip
andig May 4, 2024
5bca309
wip
andig May 9, 2024
c7961c6
Serialise creating modbus devices
andig Jul 6, 2024
c43847b
Merge branch 'master' into chore/modbus-udp
andig Jul 6, 2024
41c507a
Fix build
andig Jul 6, 2024
61b4036
Wait for meters
andig Jul 7, 2024
76a46f3
Add UDP protocol detection
andig Jul 7, 2024
6a1d9e4
Use 8899 as default UDP port
andig Jul 7, 2024
17cae72
wip
andig Jul 7, 2024
4d9a6dc
Merge branch 'master' into chore/modbus-udp
andig Jul 27, 2024
c8eeea0
Merge branch 'master' into chore/modbus-udp
andig Jul 27, 2024
8365b64
Merge branch 'master' into chore/modbus-udp
andig Aug 2, 2024
69115bd
Merge branch 'master' into chore/modbus-udp
andig Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' into chore/modbus-udp 
# Conflicts:
#	go.sum
  • Loading branch information
@andig
andig committed Aug 2, 2024
commit 69115bdf8d15e131a7c2ac59fa3a73170b491d00
3 changes: 0 additions & 3 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,10 @@ github.com/enbility/zeroconf/v2 v2.0.0-20240210101930-d0004078577b/go.mod h1:Bjz
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=
<<<<<<< HEAD
github.com/evcc-io/modbus v0.0.0-20240503125516-9fd99fe0e438 h1:I14MN2UauarS2Lo+prnNXEj31MxJS1mEfLUrEnOUBsw=
github.com/evcc-io/modbus v0.0.0-20240503125516-9fd99fe0e438/go.mod h1:WpbUAyptAAi0VAriSRopZa6uhiJOJCTz7KFvgGtNRXc=
=======
github.com/evcc-io/ocpp-go v0.0.0-20240730071053-d69e53b0fce9 h1:FLv1vmLnfc8DanI5U1qOTe1Zr0OgZ/tuOvHALtZ2sOI=
github.com/evcc-io/ocpp-go v0.0.0-20240730071053-d69e53b0fce9/go.mod h1:ZynYDWGw6CslG3vyPuucLsy6AyE+h3XXYlr39jhNiQY=
>>>>>>> master
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=
Expand Down