Skip to content
Snippets Groups Projects
Commit 33781d4f authored by jkerdreu's avatar jkerdreu
Browse files

Cleaning some stuff..

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Java/branches/0.7@2603 b32b6428-25c9-4566-ad07-03861ab6144f
parent 56dedeb5
No related branches found
No related tags found
No related merge requests found
......@@ -3,10 +3,8 @@ package org.imta.xaal.lib;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.UUID;
import com.upokecenter.cbor.CBORObject;
......@@ -61,15 +59,6 @@ public class Lamp extends Device {
else turn_on();
brightness.setValue(target);
}
/*
if (msg.getAction().equals("toggle")) toggle();
if (msg.getAction().equals("turn_on")) turn_on();;
if (msg.getAction().equals("turn_off")) turn_off();;
if (msg.getAction())
*/
return null;
}
......
......@@ -89,10 +89,12 @@ public class Message {
}
public void setBody(CBORObject body) {
bodyAsMap = null;
this.body = body;
}
public void setBodyAsMap(HashMap<String,Object> body) {
bodyAsMap = null;
this.body = CBORObject.FromObject(body);
}
......
......@@ -26,8 +26,8 @@ public class Test {
var key = BinTools.unhexlify(xaal_key);
Engine eng = new Engine(key);
eng.init();
Lamp l1 = new Lamp("lamp.toggle", UUID.fromString("6265eb30-8c59-11e9-98b1-b827ebe99201"));
Lamp l2 = new Lamp("lamp.toggle", UUID.fromString("6265eb30-8c59-11e9-98b1-b827ebe99202"));
Lamp l1 = new Lamp("lamp.dimmer", UUID.fromString("6265eb30-8c59-11e9-98b1-b827ebe99201"));
Lamp l2 = new Lamp("lamp.dimmer", UUID.fromString("6265eb30-8c59-11e9-98b1-b827ebe99202"));
eng.registerDevices(Arrays.asList(l1,l2));
l1.toggle();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment