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
Merge requests
!2503
ds-model: announce apartment-power-states
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
andreas.fenkart
requested to merge
taw/dss-mainline:MR_ds-model_add-apartment-states
into
master
3 years ago
Overview
0
Commits
1
Pipelines
0
Changes
2
0
0
Compare
master
master (base)
and
latest version
latest version
12bc7353
1 commit,
3 years ago
2 files
+
2
−
1
Expand all files
Preferences
Preferences
File browser
List view
Tree view
Compare changes
Inline
Side-by-side
Show whitespace changes
Show one file at a time
Search (e.g. *.vue) (Ctrl+P)
src/ds-model-test.cpp
+
1
−
0
Options
View file @ 12bc7353
Edit in single-file editor
Open in Web IDE
Show full file
@@ -2947,6 +2947,7 @@ SCENARIO("dssDsModel", TAGS) {
GENERATE
(
values
<
std
::
pair
<
std
::
string
,
std
::
string
>>
({{
"custom-states"
,
"manualState"
},
{
"zone-sensor-states"
,
"measurementState"
},
{
"consumption-states"
,
"consumptionState"
},
{
"apartment-power-states"
,
"consumptionState"
},
{
"power-states"
,
"circuitConsumptionState"
},
{
"triggered-states"
,
"triggerState"
},
{
"combined-states"
,
"combinedState"
},
src/ds-model.cpp
+
1
−
1
Options
View file @ 12bc7353
Edit in single-file editor
Open in Web IDE
Show full file
@@ -1681,7 +1681,7 @@ public:
return
"manualState"
;
if
((
name
==
"zone-sensor-states"
)
||
(
name
==
"device-sensor-states"
))
return
"measurementState"
;
if
(
name
==
"consumption-states"
)
if
(
name
==
"consumption-states"
||
(
name
==
"apartment-power-states"
)
)
return
"consumptionState"
;
if
(
name
==
"power-states"
)
return
"circuitConsumptionState"
;
Menu
Explore
Projects
Groups
Topics
Snippets