diff --git a/src/networking/ServerNetworking.java b/src/networking/ServerNetworking.java index 7f9e4c3..a0427b5 100644 --- a/src/networking/ServerNetworking.java +++ b/src/networking/ServerNetworking.java @@ -62,7 +62,6 @@ public void receiveMutlticast(int receiveMulticastPORT) throws Exception { // Opens the receiving port MulticastSocket multicastReceiver = new MulticastSocket(receiveMulticastPORT); // Join the All Hosts network segment, as defined by RFC 5771 - multicastReceiver.joinGroup(InetAddress.getByName("224.0.0.1")); // Instantiate the DatagramPacket and buffer size DatagramPacket packet; diff --git a/src/server/server.java b/src/server/server.java index c8108bb..67ca602 100644 --- a/src/server/server.java +++ b/src/server/server.java @@ -38,8 +38,8 @@ public boolean createUser(String email, String password, String ip) { } public boolean createThermostat(String serial, String name, String desiredTemp) { - // TODO Auto-generated method stub - return false; + dataStorage.createThermostat(serial, name, desiredTemp); + return true; } public boolean createThermostat(String serialnumber, String name, String ip, String currenttemp, String desiredtemp){ diff --git a/src/thermostat/ThermostatDevice.java b/src/thermostat/ThermostatDevice.java index 30809b3..958623e 100644 --- a/src/thermostat/ThermostatDevice.java +++ b/src/thermostat/ThermostatDevice.java @@ -25,6 +25,8 @@ public class ThermostatDevice extends ThermostatNetworking implements Deviceable int receiveDesiredTempPORT = 7001; // Send mutlicast packets to notify the server that the device exists int sendMulticastPORT = 7002; + // Server IP address + String serverIP; public ThermostatDevice(Integer updateIntervalInSeconds){ try { @@ -44,6 +46,9 @@ public ThermostatDevice(Integer updateIntervalInSeconds){ this.clock = new Timer(updateIntervalInSeconds*1000, this); this.clock.start(); + + // String serverIP = this.getServerIP(); + } public void sensorUpdateEvent(Sensorable sensor) { @@ -68,4 +73,10 @@ public void actionPerformed(ActionEvent e) { } } +/* + public String getServerIP() { + return + } + */ + }