ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Added map sensor data text

Browse source
This commit is contained in:
Ziver Koc 2016-09-23 16:20:15 +02:00
parent 0c64d4d1ad
commit c5ce7df958
2 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
resource/web/map.tmpl
View file

@ -147,10 +147,12 @@
// Sensors // Sensors
$.each(json.sensors, function(i, sensor) { $.each(json.sensors, function(i, sensor) {
var group = svg.group(); var group = svg.group();
group.image("/img/temperature.svg") group.image("/img/temperature.svg");
.addClass("draggable").addClass("sensor") group.text(sensor.data).move(45,15).fill('#999');
group.addClass("draggable").addClass("sensor")
.x(sensor.x).y(sensor.y) .x(sensor.x).y(sensor.y)
.attr("device-id", sensor.id) .attr("device-id", sensor.id);
group.title(sensor.name); group.title(sensor.name);
}); });
// Events // Events
@ -158,11 +160,12 @@
var group = svg.group(); var group = svg.group();
var img = "/img/lightbulb_off.svg"; var img = "/img/lightbulb_off.svg";
if (event.data == "ON") if (event.data == "ON")
var img = "/img/lightbulb_on.svg"; img = "/img/lightbulb_on.svg";
group.image(img) group.image(img);
.addClass("draggable").addClass("event")
group.addClass("draggable").addClass("event")
.x(event.x).y(event.y) .x(event.x).y(event.y)
.attr("device-id", event.id) .attr("device-id", event.id);
group.title(event.name); group.title(event.name);
}); });
}); });

16
src/se/hal/plugin/tellstick/device/Oregon0x1A2D.java
View file

@ -79,13 +79,19 @@ public class Oregon0x1A2D implements HalSensorConfig,TellstickDevice {
@Override @Override
public Class<? extends HalSensorData> getSensorDataClass() { public Class<? extends HalSensorData> getSensorDataClass() {
if (sensorType != null) {
switch (sensorType) { switch (sensorType) {
case HUMIDITY: return HumiditySensorData.class; case HUMIDITY:
case LIGHT: return LightSensorData.class; return HumiditySensorData.class;
case POWER: return PowerConsumptionSensorData.class; case LIGHT:
case TEMPERATURE: return TemperatureSensorData.class; return LightSensorData.class;
case POWER:
return PowerConsumptionSensorData.class;
case TEMPERATURE:
return TemperatureSensorData.class;
} }
return null; }
return TemperatureSensorData.class;
} }
@Override @Override