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
0909dca0
Commit
0909dca0
authored
4 years ago
by
andreas.fenkart
Browse files
Options
Download
Plain Diff
Merge branch 'MR_backport_last_scene' into 'R2006'
backport callScene / fw3.8.7 to beta01 See merge request
!2229
parents
e58ae407
872a62c3
R2006
1.16.6.1
1.16.6.1-beta01
1.16.6
1.16.6-beta04
1.16.6-beta03
1.16.6-beta02
1 merge request
!2229
backport callScene / fw3.8.7 to beta01
Changes
17
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
docker/do_meson.sh
+5
-0
docker/do_meson.sh
docker/run-tests.sh
+69
-8
docker/run-tests.sh
src/cache/cache-updater-test.cpp
+247
-5
src/cache/cache-updater-test.cpp
src/cache/cache-updater.cpp
+101
-31
src/cache/cache-updater.cpp
src/cache/cache-updater.h
+46
-7
src/cache/cache-updater.h
src/cache/device-cache.h
+1
-1
src/cache/device-cache.h
src/ds/meson.build
+2
-0
src/ds/meson.build
src/event.cpp
+1
-0
src/event.cpp
src/event.h
+1
-0
src/event.h
src/hal/hal-device.cpp
+1
-0
src/hal/hal-device.cpp
src/hal/hardware-abstraction.h
+9
-5
src/hal/hardware-abstraction.h
src/hal/shade-device-state-machine-test.cpp
+273
-0
src/hal/shade-device-state-machine-test.cpp
src/hal/shade-device.cpp
+208
-42
src/hal/shade-device.cpp
src/model/device-mock-test.cpp
+21
-2
src/model/device-mock-test.cpp
src/model/device-mock.cpp
+31
-15
src/model/device-mock.cpp
src/model/device-mock.h
+11
-2
src/model/device-mock.h
src/web/handler/structurerequesthandler-test.cpp
+4
-2
src/web/handler/structurerequesthandler-test.cpp
with
1031 additions
and
120 deletions
+1031
-120
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