Skip to content

Commit 4f131e6

Browse files
committed
Dimmer update
* Level behavior fix when updating 'status' * Ability to change level by schedule
1 parent cf82fe3 commit 4f131e6

File tree

4 files changed

+7
-1
lines changed

4 files changed

+7
-1
lines changed

Diff for: languages/default.php

+1
Original file line numberDiff line numberDiff line change
@@ -1369,6 +1369,7 @@
13691369
'DEVICES_DIMMER_MAX_WORK' => 'Max level (work)',
13701370
'DEVICES_DIMMER_SWITCH_LEVEL' => 'Do not change level on switch',
13711371
'DEVICES_DIMMER_SET_MAX' => 'Set maximum level when turning on',
1372+
'DEVICES_DIMMER_SET_TARGET_LEVEL' => 'Set target level, %',
13721373

13731374
'DEVICES_COLLECTION_IS_ON' => 'Is turned on now',
13741375
'DEVICES_COLLECTION_IS_OPEN' => 'Is open now',

Diff for: languages/ru.php

+1
Original file line numberDiff line numberDiff line change
@@ -1369,6 +1369,7 @@
13691369
'DEVICES_DIMMER_MAX_WORK' => 'Макс. уровень (рабочий)',
13701370
'DEVICES_DIMMER_SWITCH_LEVEL' => 'Не изменять уровень при переключении',
13711371
'DEVICES_DIMMER_SET_MAX' => 'Устанавливать максимальную яркость при включении',
1372+
'DEVICES_DIMMER_SET_TARGET_LEVEL' => 'Установить желаемый уровень, %',
13721373

13731374
'DEVICES_COLLECTION_IS_ON' => 'Сейчас включено',
13741375
'DEVICES_COLLECTION_IS_OPEN' => 'Сейчас открыто',

Diff for: modules/devices/SDimmers_statusUpdated.php

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
$level = $this->getProperty('level');
55
$levelSaved = $this->getProperty('levelSaved');
66
$linked_room = $this->getProperty('linkedRoom');
7+
$switchLevel=$this->getProperty('switchLevel');
78

89
if ($this->getProperty('setMaxTurnOn')) {
910
$levelSaved = 100;
@@ -13,6 +14,9 @@
1314
if ($status > 0 && !$level && $levelSaved) {
1415
$this->setProperty('level', $levelSaved);
1516
} else {
17+
if (!$status && !$switchLevel) {
18+
$this->setProperty('level', 0);
19+
}
1620
$this->callMethod('logicAction');
1721
include_once(dirname(__FILE__) . '/devices.class.php');
1822
$dv = new devices();

Diff for: modules/devices/devices_structure.inc.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@
208208
'setMaxTurnOn' => array('DESCRIPTION' => LANG_DEVICES_DIMMER_SET_MAX, '_CONFIG_TYPE' => 'yesno', '_CONFIG_HELP' => 'SdDimmerSetMax'),
209209
),
210210
'METHODS' => array(
211-
'setLevel' => array('DESCRIPTION' => 'Set brightness level'),
211+
'setLevel' => array('DESCRIPTION' => LANG_DEVICES_DIMMER_SET_TARGET_LEVEL, '_CONFIG_SHOW' => 1, '_CONFIG_REQ_VALUE' => 1),
212212
'statusUpdated' => array('DESCRIPTION' => 'Status Updated'),
213213
'levelUpdated' => array('DESCRIPTION' => 'Level Updated'),
214214
'levelWorkUpdated' => array('DESCRIPTION' => 'Level Work Updated'),

0 commit comments

Comments
 (0)