PR1132: Получение данных с сенсоров

Версия 1.2
MrNeuronix · Nov 20, 2014 · c132f14 · c132f14
1 parent 7b1e064
commit c132f14
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -70,6 +70,11 @@ mvn package
                pr.turnOn(channel);
                pr.turnOff(channel);
 
+               List<Sensors> sensors = pr.getSensors();
+
+               // Температура с первого сенсора в списке
+               short temp = sensors.get(0).getTemperature();
+
                pc.open();
 
                pc.turnOn(channel);

diff --git a/src/main/java/ru/iris/noolite4j/gateway/HTTPCommand.java b/src/main/java/ru/iris/noolite4j/gateway/HTTPCommand.java
@@ -127,7 +127,7 @@ public List<Sensor> getSensors()
 
                     Node nNode = nList.item(temp);
 
-                    byte value = Byte.valueOf(nNode.getNodeValue());
+                    short value = Short.valueOf(nNode.getNodeValue());
 
                     /**
                      * Найдем канал и связанный с ним сенсор
@@ -162,7 +162,7 @@ public List<Sensor> getSensors()
                     }
                     else if(type.equals("snsh"))
                     {
-                        sensor.setHumidity(value);
+                        sensor.setHumidity((byte)value);
                     }
                     else if(type.equals("snt"))
                     {

diff --git a/src/main/java/ru/iris/noolite4j/gateway/Sensor.java b/src/main/java/ru/iris/noolite4j/gateway/Sensor.java
@@ -20,7 +20,7 @@ public class Sensor {
 
 
     private byte channel;
-    private byte temperature;
+    private short temperature;
     private byte humidity;
     private SensorState state;
 
@@ -32,11 +32,11 @@ public void setChannel(byte channel) {
         this.channel = channel;
     }
 
-    public byte getTemperature() {
+    public short getTemperature() {
         return temperature;
     }
 
-    public void setTemperature(byte temperature) {
+    public void setTemperature(short temperature) {
         this.temperature = temperature;
     }