Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
dSS - digitalSTROM Server
dss-mainline
Commits
7ec056c5
Commit
7ec056c5
authored
1 year ago
by
Jean Visagie
Browse files
Options
Download
Plain Diff
Merge branch 'master' into 'testing'
Merge branch 'master' into testing See merge request
!2875
parents
2c8283e3
510930d9
testing
R2311
R2411
1.19.11
1.19.11-beta01
1.19.10.1
1.19.10.1-beta01
1.19.10
1.19.9
1.19.9-beta03
1.19.9-beta02
1.19.9-beta01
1.19.8.1
1.19.8
1.19.8-beta03
1.19.8-beta02
1.19.8-beta01
1.19.7.1
1.19.7
1.19.7-beta07
1.19.7-beta06
1.19.7-beta05
2 merge requests
!2876
Merge branch 'testing' into R2311
,
!2875
Merge branch 'master' into testing
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
src/ds-backend/connector.cpp
+3
-1
src/ds-backend/connector.cpp
src/metering/metering.cpp
+5
-0
src/metering/metering.cpp
src/metering/modbusmeteringsystem.cpp
+22
-1
src/metering/modbusmeteringsystem.cpp
src/metering/modbusmeteringsystem.h
+2
-0
src/metering/modbusmeteringsystem.h
src/metering/socket-server.cpp
+4
-6
src/metering/socket-server.cpp
src/web/handler/meteringrequesthandler.cpp
+4
-0
src/web/handler/meteringrequesthandler.cpp
with
40 additions
and
8 deletions
+40
-8
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets