Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merge pull request #17 from DanielRamsauer/microlocation
added functionality to request href of a device with corresponding decoded qr-code (add tag to device.xml)
- Loading branch information
Showing
with
527 additions
and 335 deletions.
- +9 −1 iotsys-bacnet/src/at/ac/tuwien/auto/iotsys/gateway/connectors/bacnet/BacnetDeviceLoaderImpl.java
- +9 −1 iotsys-coap/src/at/ac/tuwien/auto/iotsys/gateway/connectors/coap/CoapDeviceLoaderImpl.java
- +2 −0 iotsys-common/src/at/ac/tuwien/auto/iotsys/commons/ObjectBroker.java
- +12 −3 iotsys-common/src/at/ac/tuwien/auto/iotsys/commons/persistent/models/Device.java
- +10 −2 iotsys-enocean/src/at/ac/tuwien/auto/iotsys/gateway/connectors/enocean/EnoceanDeviceLoaderImpl.java
- +25 −2 iotsys-gateway/config/devices.xml
- +26 −0 iotsys-gateway/src/at/ac/tuwien/auto/iotsys/gateway/obix/objectbroker/ObjectBrokerImpl.java
- +2 −1 iotsys-gateway/src/at/ac/tuwien/auto/iotsys/gateway/obix/server/CoAPHelper.java
- +6 −1 iotsys-gateway/src/at/ac/tuwien/auto/iotsys/gateway/obix/server/CoAPServer.java
- +7 −0 iotsys-gateway/src/at/ac/tuwien/auto/iotsys/gateway/obix/server/ObixServer.java
- +6 −1 iotsys-gateway/src/at/ac/tuwien/auto/iotsys/gateway/obix/server/ObixServerImpl.java
- +14 −2 iotsys-knx/src/at/ac/tuwien/auto/iotsys/gateway/connectors/knx/KNXDeviceLoaderImpl.java
- +10 −2 iotsys-mbus/src/at/ac/tuwien/auto/iotsys/gateway/connector/mbus/MBusDeviceLoaderImpl.java
- +28 −1 iotsys-obix/src/obix/Obj.java
- +5 −0 iotsys-obix/src/obix/io/ObixEncoder.java
- +320 −312 iotsys-rfid/src/at/ac/tuwien/auto/iotsys/gateway/connectors/rfid/RfidDeviceLoaderImpl.java
- +10 −1 iotsys-virtual/src/at/ac/tuwien/auto/iotsys/gateway/connectors/virtual/VirtualDeviceLoaderImpl.java
- +9 −2 .../at/ac/tuwien/auto/iotsys/gateway/connectors/weatherforecast/WeatherForecastDeviceLoaderImpl.java
- +9 −1 iotsys-wmbus/src/at/ac/tuwien/auto/iotsys/gateway/connector/wmbus/WMBusDeviceLoaderImpl.java
- +8 −2 iotsys-xbee/src/at/ac/tuwien/auto/iotsys/gateway/connectors/xbee/XBeeDeviceLoaderImpl.java
Oops, something went wrong.