Skip to content

Commit

Permalink
Moved from sending ints to strings
Browse files Browse the repository at this point in the history
  • Loading branch information
dep11007 committed Apr 27, 2015
1 parent b2eb55e commit 9e88ba7
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/thermostat/Sensorable.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package thermostat;

public interface Sensorable {
public DataObject<Integer> getValue();
public DataObject<String> getValue();
public void newDataEvent();
public void requestNewDataPointReading();
}
6 changes: 3 additions & 3 deletions src/thermostat/TemperatureSensor.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public TemperatureSensor(Deviceable owner){
this.owner = owner;
}

public DataObject<Integer> getValue(){
public DataObject<String> getValue(){
return this.generateFakeTemperature();
}

Expand All @@ -20,9 +20,9 @@ public void newDataEvent(){
this.owner.sensorUpdateEvent(this);
}

public DataObject<Integer> generateFakeTemperature(){
public DataObject<String> generateFakeTemperature(){
int minRandomTemp = 50;
int maxRandomTemp = 78;
return new DataObject<Integer>(minRandomTemp + (int)(Math.random() * ((maxRandomTemp - minRandomTemp) + 1)));
return new DataObject<String>(String.valueOf(minRandomTemp + (int)(Math.random() * ((maxRandomTemp - minRandomTemp) + 1))));
}
}
12 changes: 8 additions & 4 deletions src/thermostat/ThermostatDevice.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,18 @@ public ThermostatDevice(Integer updateIntervalInSeconds){
}

public void sensorUpdateEvent(Sensorable sensor) {
DataObject <Integer> value = sensor.getValue();
System.out.println("New Sensor Event: "+ String.valueOf(value.getValue().intValue()));
DataObject <String> value = sensor.getValue();
//System.out.println("New Sensor Event: "+ String.valueOf(value.getValue().intValue()));
this.updateServer(sensor.getValue());
}

private void updateServer(DataObject<Integer> dataReading){
private void updateServer(DataObject<String> dataReading){
//this.sendIP("192.168.1.2");
this.sendCurrentTemp(dataReading.getValue());
try {
this.sendCurrentTemp(dataReading.getValue());
} catch(Exception e){
System.out.println("Error sending to server");
}
//this.sendSerialNumber(this.serialNumber);
}

Expand Down

0 comments on commit 9e88ba7

Please sign in to comment.