smarthut/backend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into guests-fix

Browse source
This commit is contained in:
Claudio Maggioni (maggicl) 2020-05-03 16:38:27 +02:00
commit 4a963115bb
2 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
View file

@ -24,14 +24,10 @@ public class Thermostat extends Switchable implements BooleanTriggerable {
computeState();
}
/**
* Computes the new thermostat state, for when the thermostat is on;
*
* @return true if the state changed, false if not;
*/
public boolean computeState() {
/** Computes the new thermostat state, for when the thermostat is on */
public void computeState() {
if (mode == Thermostat.Mode.OFF) {
return false;
return;
}
BigDecimal measured = this.getMeasuredTemperature();
@ -39,23 +35,18 @@ public class Thermostat extends Switchable implements BooleanTriggerable {
if (measured == null) {
this.setMode(Thermostat.Mode.IDLE);
return true;
return;
}
BigDecimal delta = target.subtract(measured);
if (delta.abs().doubleValue() < 0.25) {
if (this.getMode() == Thermostat.Mode.IDLE) return false;
this.setMode(Thermostat.Mode.IDLE);
} else if (delta.signum() > 0) {
if (this.getMode() == Thermostat.Mode.HEATING) return false;
this.setMode(Thermostat.Mode.HEATING);
} else {
if (this.getMode() == Thermostat.Mode.COOLING) return false;
this.setMode(Thermostat.Mode.COOLING);
}
return true;
}
@Override

12
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java
View file

@ -45,18 +45,16 @@ public class ThermostatService {
return Utils.toList(all);
}
public boolean computeState(Thermostat t) {
public void computeState(Thermostat t) {
populateMeasuredTemperature(t);
return t.computeState();
t.computeState();
}
private void updateState(Thermostat t) {
boolean shouldUpdate = this.computeState(t);
this.computeState(t);
if (shouldUpdate) {
deviceService.saveAsOwner(t, thermostatRepository.findUser(t.getId()).getUsername());
endpoint.queueDeviceUpdate(t, thermostatRepository.findUser(t.getId()));
}
deviceService.saveAsOwner(t, thermostatRepository.findUser(t.getId()).getUsername());
endpoint.queueDeviceUpdate(t, thermostatRepository.findUser(t.getId()));
}
public void updateStates() {