use simplified group API

AlCalzone · Nov 7, 2017 · 3073ae9 · 3073ae9
1 parent 62c5649
commit 3073ae9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 22 deletions.
diff --git a/build/main.js b/build/main.js
@@ -205,22 +205,14 @@ let adapter = utils_1.default.adapter({
                         // if the change was acknowledged, update the state later
                         let wasAcked;
                         if (id.endsWith(".state")) {
-                            wasAcked = !(yield session_1.session.tradfri.operateGroup(group, {
-                                onOff: val,
-                            }));
+                            wasAcked = !(yield group.toggle(val));
                         }
                         else if (id.endsWith(".brightness")) {
-                            wasAcked = !(yield session_1.session.tradfri.operateGroup(group, {
-                                dimmer: val,
-                                transitionTime: yield getTransitionDuration(group),
-                            }));
+                            wasAcked = !(yield group.setBrightness(val, yield getTransitionDuration(group)));
                         }
                         else if (id.endsWith(".activeScene")) {
                             // turn on and activate a scene
-                            wasAcked = !(yield session_1.session.tradfri.operateGroup(group, {
-                                onOff: true,
-                                sceneId: val,
-                            }));
+                            wasAcked = !(yield group.activateScene(val));
                         }
                         else if (id.endsWith(".color")) {
                             val = colors_1.normalizeHexColor(val);

diff --git a/src/main.ts b/src/main.ts
@@ -232,20 +232,15 @@ let adapter: ExtendedAdapter = utils.adapter({
 						let wasAcked: boolean;
 
 						if (id.endsWith(".state")) {
-							wasAcked = !await $.tradfri.operateGroup(group, {
-								onOff: val,
-							});
+							wasAcked = !await group.toggle(val);
 						} else if (id.endsWith(".brightness")) {
-							wasAcked = !await $.tradfri.operateGroup(group, {
-								dimmer: val,
-								transitionTime: await getTransitionDuration(group),
-							});
+							wasAcked = !await group.setBrightness(
+								val,
+								await getTransitionDuration(group),
+							);
 						} else if (id.endsWith(".activeScene")) {
 							// turn on and activate a scene
-							wasAcked = !await $.tradfri.operateGroup(group, {
-								onOff: true,
-								sceneId: val,
-							});
+							wasAcked = !await group.activateScene(val);
 						} else if (id.endsWith(".color")) {
 							val = normalizeHexColor(val);
 							if (val != null) {