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

Merge branch 'cose' into 'dev'

Browse source 
fixed dimmable light

See merge request sa4-2020/the-sanmarinoes/backend!63
This commit is contained in:
Claudio Maggioni 2020-03-25 22:38:47 +01:00
commit b732d70ffd
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableLight.java
View file

@ -39,6 +39,10 @@ public class DimmableLight extends Switchable {
@Max(100)
private Integer intensity = 0;
@NotNull
@Column(nullable = false)
private Integer oldIntensity = 100;
public Integer getIntensity() {
return intensity;
}
@ -55,8 +59,10 @@ public class DimmableLight extends Switchable {
this.intensity = 0;
} else if (intensity > 100) {
this.intensity = 100;
this.oldIntensity = 100;
} else {
this.intensity = intensity;
this.oldIntensity = intensity;
}
}
@ -67,13 +73,13 @@ public class DimmableLight extends Switchable {
@Override
public void setOn(boolean on) {
intensity = on ? 100 : 0;
intensity = on ? oldIntensity : 0;
}
public void setDimmerId(Long dimmerId) {
this.dimmerId = dimmerId;
super.setSwitchId(null);
};
}
@Override
public void setSwitchId(Long switchId) {