diff --git a/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.controller.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/ArduinoService.java b/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.controller.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/ArduinoService.java index 2a6b8b9e84..9f3bc424fa 100644 --- a/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.controller.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/ArduinoService.java +++ b/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.controller.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/ArduinoService.java @@ -41,6 +41,7 @@ import org.wso2.carbon.device.mgt.iot.controlqueue.mqtt.MqttConfig; import org.wso2.carbon.device.mgt.iot.exception.AccessTokenException; import org.wso2.carbon.device.mgt.iot.exception.DeviceControllerException; import org.wso2.carbon.device.mgt.iot.sensormgt.SensorDataManager; +import org.wso2.carbon.device.mgt.iot.sensormgt.SensorRecord; import org.wso2.carbon.device.mgt.iot.util.ZipArchive; import org.wso2.carbon.device.mgt.iot.util.ZipUtil; @@ -219,7 +220,7 @@ public class ArduinoService { } try { - switch (protocolString) { + /*switch (protocolString) { case HTTP_PROTOCOL: String deviceHTTPEndpoint = deviceToIpMap.get(deviceId); if (deviceHTTPEndpoint == null) { @@ -235,7 +236,14 @@ public class ArduinoService { default: response.setStatus(Response.Status.NOT_ACCEPTABLE.getStatusCode()); return; + }*/ + String deviceHTTPEndpoint = deviceToIpMap.get(deviceId); + if (deviceHTTPEndpoint == null) { + response.setStatus(Response.Status.PRECONDITION_FAILED.getStatusCode()); + return; } + ArduinoServiceUtils.sendCommandViaHTTP(deviceHTTPEndpoint, callUrlPattern, true); + } catch (DeviceManagementException e) { log.error("Failed to send switch-bulb request to device [" + deviceId + "] via " + protocolString); response.setStatus(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()); @@ -244,6 +252,65 @@ public class ArduinoService { response.setStatus(Response.Status.OK.getStatusCode()); } + /** + * @param owner + * @param deviceId + * @param protocol + * @param response + * @return + */ + @Path("controller/readtemperature") + @GET + @Consumes(MediaType.APPLICATION_JSON) + @Produces(MediaType.APPLICATION_JSON) + @Feature( code="readtemperature", name="Temperature", type="monitor", + description="Request temperature reading from Arduino agent") + public SensorRecord requestTemperature(@HeaderParam("owner") String owner, + @HeaderParam("deviceId") String deviceId, + @HeaderParam("protocol") String protocol, + @Context HttpServletResponse response) { + SensorRecord sensorRecord = null; + + DeviceValidator deviceValidator = new DeviceValidator(); + try { + if (!deviceValidator.isExist(owner, SUPER_TENANT, new DeviceIdentifier(deviceId, + ArduinoConstants.DEVICE_TYPE))) { + response.setStatus(Response.Status.UNAUTHORIZED.getStatusCode()); + } + } catch (DeviceManagementException e) { + response.setStatus(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()); + } + + String protocolString = protocol.toUpperCase(); + + if (log.isDebugEnabled()) { + log.debug( + "Sending request to read raspberrypi-temperature of device [" + deviceId + "] via " + + protocolString); + } + + try { + String deviceHTTPEndpoint = deviceToIpMap.get(deviceId); + if (deviceHTTPEndpoint == null) { + response.setStatus(Response.Status.PRECONDITION_FAILED.getStatusCode()); + } + + String temperatureValue = ArduinoServiceUtils.sendCommandViaHTTP(deviceHTTPEndpoint, + ArduinoConstants + .TEMPERATURE_CONTEXT, + false); + SensorDataManager.getInstance().setSensorRecord(deviceId, ArduinoConstants.SENSOR_TEMPERATURE, + temperatureValue, + Calendar.getInstance().getTimeInMillis()); + sensorRecord = SensorDataManager.getInstance().getSensorRecord(deviceId, + ArduinoConstants.SENSOR_TEMPERATURE); + } catch (DeviceManagementException | DeviceControllerException e) { + response.setStatus(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()); + } + + response.setStatus(Response.Status.OK.getStatusCode()); + return sensorRecord; + } /** * @param dataMsg diff --git a/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.controller.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/util/ArduinoServiceUtils.java b/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.controller.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/util/ArduinoServiceUtils.java index 0747df7a04..35d86b01df 100644 --- a/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.controller.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/util/ArduinoServiceUtils.java +++ b/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.controller.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/util/ArduinoServiceUtils.java @@ -129,7 +129,7 @@ public class ArduinoServiceUtils { public static boolean sendCommandViaMQTT(String deviceOwner, String deviceId, String resource, String state) throws DeviceManagementException { - boolean result; + /*boolean result; DeviceController deviceController = new DeviceController(); try { @@ -139,7 +139,8 @@ public class ArduinoServiceUtils { log.error(errorMsg); throw new DeviceManagementException(errorMsg, e); } - return result; + return result;*/ + return false; } /* --------------------------------------------------------------------------------------- diff --git a/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.mgt.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/ArduinoService.java b/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.mgt.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/ArduinoService.java index 46c8a90a57..76ee1e3e0b 100644 --- a/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.mgt.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/ArduinoService.java +++ b/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.mgt.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/ArduinoService.java @@ -72,7 +72,6 @@ import java.util.NoSuchElementException; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; -@API( name="arduino", version="1.0.0", context="/arduino") @DeviceType( value = "arduino") public class ArduinoService { diff --git a/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.mgt.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/util/ArduinoServiceUtils.java b/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.mgt.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/util/ArduinoServiceUtils.java index 0747df7a04..35d86b01df 100644 --- a/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.mgt.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/util/ArduinoServiceUtils.java +++ b/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.mgt.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/util/ArduinoServiceUtils.java @@ -129,7 +129,7 @@ public class ArduinoServiceUtils { public static boolean sendCommandViaMQTT(String deviceOwner, String deviceId, String resource, String state) throws DeviceManagementException { - boolean result; + /*boolean result; DeviceController deviceController = new DeviceController(); try { @@ -139,7 +139,8 @@ public class ArduinoServiceUtils { log.error(errorMsg); throw new DeviceManagementException(errorMsg, e); } - return result; + return result;*/ + return false; } /* --------------------------------------------------------------------------------------- diff --git a/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.mgt.service.impl/src/main/webapp/WEB-INF/web.xml b/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.mgt.service.impl/src/main/webapp/WEB-INF/web.xml index 652c3f454a..6c2b31b411 100644 --- a/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.mgt.service.impl/src/main/webapp/WEB-INF/web.xml +++ b/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.mgt.service.impl/src/main/webapp/WEB-INF/web.xml @@ -31,7 +31,7 @@ managed-api-enabled - true + false managed-api-owner diff --git a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs index 0c04c1ed23..9d5f8ef557 100644 --- a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs +++ b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs @@ -1,279 +1,95 @@ -
-

Arduino

-
-

Connect your Arduino device to the WSO2 IoT Server.

-
+{{#zone "topCss"}} + +{{/zone}} -
+{{#zone "device-thumbnail"}} -
- -
- -

What You Need

-
-

You'll need the following "Hardware":

- -
- - View API - Download Sketch - -
-
-
-
-

Name your device and download the agent from following link.

-
+{{/zone}} -
-
-
- -

- -    -
-
-
- - Download Now - -
-
-
-
-
+{{#zone "device-opetations"}} +
+ Operations
- -
-
-
-
-

Exception at backend. Try Later.

- -
- - OK - -
-
-
-
+
+ {{unit "iot.unit.device.operation-bar" device=device}}
+{{/zone}} -
-
-
-
-

You have to log in first.


- -
- - Goto Login Page -    - - Cancel - -
-
-
+{{#zone "device-detail-properties"}} +
+
+
-
+
+
-
-
-
-
-

Action not permitted.


- -
- - OK - -
+
+
Device Statistics
+ {{unit "iot.unit.device.stats" device=device}}
-
-
-
-
-
-
-
-

Device Sketch does not exist.


- -
- - OK - +
+
Policy Compliance
+
+ +
+
+ Not available yet +
+
+
-
-
-
- -
-
-
-
-

Unexpected error.


- -
- - OK - +
+
Operations Log
+
+ +
+
+ Not available yet +
+
+
- -

-
- -
-

Prepare

-
-

Get the Wifi-Sheild mounted onto the Arduino-UNO board and follow the steps:

-
    -
  • 01   Download the Arduino-Sketch from - the [Download] link above. -
    • -
  • 02   Unzip the downloaded - Arduino-Sketch and open the "ArduinoBoardSketch.h" - file. -
    • -
  • 03   Provide appropriate values for - [WLAN_SSID] and [WLAN_PASS] variables according to your network. -
    • -
  • 04   Burn the sketch onto your Arduino - board and let the program run. -
    • - -
  • -                 - - - - -    The Arduino will publish its internal temperature to the WSO2-IoT-Server and its LED on - PIN 13 can be controlled from our Device Management page. -
    • -
-
-
- -
-

Try Out

-
-

WSO2-IoT Server provides Analytics and Real-Time Statistics of your device

-
    -
  • 01   You can view all your created - devices at our [Device - Management] - page. -
    • -
  • 02   You can select any of your - created devices here and check for available - operations and monitor Real-Time data. -
    • -
  • 03   You can also view "Analytics" of - the data published to the IoT-Server by navigating - to the [Device-Analytics Page] from here. -
    • -
-
- -

Click on the image to zoom

-
- - - -
- -
- - -{{#zone "topCss"}} - -{{/zone}} - -{{#zone "bottomJs"}} - {{js "/js/download.js"}} - {{js "/js/jquery.validate.js"}} - {{/zone}} \ No newline at end of file diff --git a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/schematicsGuide.png b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/schematicsGuide.png index 44387da559..6ae9cf9527 100644 Binary files a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/schematicsGuide.png and b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/schematicsGuide.png differ diff --git a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.hbs b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.hbs index 75f6a2a0f8..e37da4e208 100644 --- a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.hbs +++ b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.hbs @@ -15,10 +15,10 @@

You'll need the following "Hardware":

  • ITEM 01   Raspberry Pi Board (Internet - Enabled [Wifi or Ethernet]). + Enabled [Wifi or Ethernet]).
  • ITEM 02   A Digital Display with HDMI - Cable. + Cable.
  • GO-TO PREPARE
@@ -50,7 +50,7 @@
Download Now    Copy Link -    +   
@@ -164,15 +164,15 @@

Prepare

Follow the steps to get your Digital-Display up & running and communicating to the - WSO2 IoT-Server.

+ WSO2 IoT-Server.

  • 01   Connect a monitor to your - RaspberryPi via the HDMI cable to get the - Graphical-User-Interface of the RaspberryPi board. + RaspberryPi via the HDMI cable to get the + Graphical-User-Interface of the RaspberryPi board.
  • 02   Setup the RaspberryPi to connect - to the internet (via Ethernet or Wifi) and - note-down its IP_ADDRESS. + to the internet (via Ethernet or Wifi) and + note-down its IP_ADDRESS.

@@ -196,17 +196,17 @@

WSO2-IoT Server provides Analytics and Real-Time Statistics of your device

  • 01   You can view all your created - devices at our [Device - Management] - page. + devices at our [Device + Management] + page.
  • 02   You can select any of your - created devices here and check for available - operations and monitor Real-Time data. + created devices here and check for available + operations and monitor Real-Time data.
  • 03   You can also view "Analytics" of - the data published to the IoT-Server by navigating - to the [Device-Analytics Page] from here. + the data published to the IoT-Server by navigating + to the [Device-Analytics Page] from here.

@@ -222,51 +222,43 @@ {{#zone "bottomJs"}} {{js "/js/download.js"}} {{js "/js/jquery.validate.js"}} -{{/zone}} - +{{/zone}} \ No newline at end of file