Browse Source

Minor changes to paper example

Andreas T. Meyer-Berg 4 years ago
parent
commit
3705fbdaec

+ 34 - 1
src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/popups/MenuBarNetworkExamples.java

@@ -443,6 +443,10 @@ public class MenuBarNetworkExamples extends JMenu{
 		networkController.addDeviceToConnectionAndProtocol(pZigBee, inetAcces, 1);
 		networkController.addConnection(inetAcces);
 		
+		/*
+		 * ZigbeeRouter -> Broker ? 
+		 */
+		//TODO: router->Broker
 		
 		/*
 		 * Create MQTT Connection
@@ -460,7 +464,7 @@ public class MenuBarNetworkExamples extends JMenu{
 		/*
 		 * Add some MQTT Devices
 		 */
-		FloatSensorDevice floatSensor = new FloatSensorDevice("Thermostat 1");
+		FloatSensorDevice floatSensor = new FloatSensorDevice("Kitchen Thermostat");
 		floatSensor.setFSinfoName("home/kitchen/temperature");
 		networkController.addLinkToDevice(zigbee, floatSensor);
 		networkController.moveSmartDevice(floatSensor, 300, 500, 50);
@@ -472,7 +476,36 @@ public class MenuBarNetworkExamples extends JMenu{
 		pFloatSensor.setLastTrigger(-357L);
 		networkController.addDeviceToConnectionAndProtocol(pFloatSensor, mqtt,1);
 		
+		/*
+		 * Add Fridge
+		 */
+		FloatSensorDevice kitchenFridge = new FloatSensorDevice("Smart Fridge");
+		kitchenFridge.setFSinfoName("home/kitchen/fridgeTemp");
+		networkController.addLinkToDevice(zigbee, kitchenFridge);
+		networkController.moveSmartDevice(kitchenFridge, 100, 600, 50);
+		kitchenFridge.setFSmin(15.0f);
+		kitchenFridge.setFSmax(32.0f);
+		networkController.addSmartDevice(kitchenFridge);
+		Port pKitchenFridge = new Port(kitchenFridge, (short)1883, 15000);
+		pKitchenFridge.setStatus(Port.SENDING);
+		pKitchenFridge.setLastTrigger(-1231L);
+		networkController.addDeviceToConnectionAndProtocol(pKitchenFridge, mqtt,1);
+		
+		
+		/*
+		 * Add some kitchen lights
+		 */
+		BoolSensorDevice kitchenLight = new BoolSensorDevice("Kitchen Light");
+		kitchenLight.setBSinfoName("home/kitchen/light");
+		networkController.addLinkToDevice(zigbee, kitchenLight);
+		networkController.moveSmartDevice(kitchenLight, 250, 400, 50);
+		networkController.addSmartDevice(kitchenLight);
+		Port pKitchenLight = new Port(kitchenLight, (short)1883, 15000);
+		pKitchenLight.setStatus(Port.SENDING);
+		pKitchenLight.setLastTrigger(-1207L);
+		networkController.addDeviceToConnectionAndProtocol(pKitchenLight, mqtt,1);
 		
+		//TODO Further devices & Connections
 		/* 
 		 * Update visualization 
 		 */