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

Merge branch '39-kind-name-on-device-does-not-match-route-name' into 'dev'

Browse Source 
fixed route names

Closes #39

See merge request sa4-2020/the-sanmarinoes/backend!51
This commit is contained in:
Claudio Maggioni 2020-03-21 15:12:35 +01:00
commit 1c8c4b61d9
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ButtonDimmer.java
View File

@ -13,7 +13,7 @@ public class ButtonDimmer extends Dimmer {
private static final int DIM_INCREMENT = 10; private static final int DIM_INCREMENT = 10;
public ButtonDimmer() { public ButtonDimmer() {
super("button-dimmer"); super("buttonDimmer");
} }
/** Increases the current intensity level of the dimmable light by DIM_INCREMENT */ /** Increases the current intensity level of the dimmable light by DIM_INCREMENT */

2
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableLight.java
View File

@ -21,7 +21,7 @@ public class DimmableLight extends Switchable {
Connector.basic(KnobDimmer::getOutputs, DimmableLight::setDimmerId); Connector.basic(KnobDimmer::getOutputs, DimmableLight::setDimmerId);
public DimmableLight() { public DimmableLight() {
super("light"); super("dimmableLight");
} }
@ManyToOne @ManyToOne

2
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/KnobDimmer.java
View File

@ -10,7 +10,7 @@ import javax.persistence.Entity;
public class KnobDimmer extends Dimmer { public class KnobDimmer extends Dimmer {
public KnobDimmer() { public KnobDimmer() {
super("knob-dimmer"); super("knobDimmer");
} }
/** /**

2
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/MotionSensor.java
View File

@ -19,6 +19,6 @@ public class MotionSensor extends InputDevice {
} }
public MotionSensor() { public MotionSensor() {
super("motion-sensor"); super("motionSensor");
} }
} }

2
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java
View File

@ -14,7 +14,7 @@ public class RegularLight extends Switchable {
boolean on; boolean on;
public RegularLight() { public RegularLight() {
super("regular-light"); super("regularLight");
this.on = false; this.on = false;
} }

2
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlug.java
View File

@ -42,6 +42,6 @@ public class SmartPlug extends Switchable {
} }
public SmartPlug() { public SmartPlug() {
super("smart-plug"); super("smartPlug");
} }
} }