turcy
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge conflicts

Browse Source
charithag 9 years ago
parent f7daf241c3
commit f9a47a89bc
2 changed files with 66 additions and 38 deletions
Show Stats Download Patch File Download Diff File

9
features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs
Unescape View File

@ -171,7 +171,8 @@
<strong>Register Device</strong> button.)</i></li> <strong>Register Device</strong> button.)</i></li>
the <strong>Enroll Device</strong> button.)</i> the <strong>Enroll Device</strong> button.)</i>
<a href="{{@unit.publicUri}}/images/registerView.png" target="_blank" class="padding-top-double"> <a href="{{@unit.publicUri}}/images/registerView.png" target="_blank"
class="padding-top-double">
<img src="{{@unit.publicUri}}/images/registerView.png" class="img-responsive"> <img src="{{@unit.publicUri}}/images/registerView.png" class="img-responsive">
</a> </a>
</li> </li>
@ -180,7 +181,8 @@
click on <strong>[+]</strong> click on <strong>[+]</strong>
button to select button to select
the sensors. the sensors.
<a href="{{@unit.publicUri}}/images/selectSensorView.png" target="_blank" class="padding-top-double"> <a href="{{@unit.publicUri}}/images/selectSensorView.png" target="_blank"
class="padding-top-double">
<img src="{{@unit.publicUri}}/images/selectSensorView.png" class="img-responsive"> <img src="{{@unit.publicUri}}/images/selectSensorView.png" class="img-responsive">
</a> </a>
</li> </li>
@ -189,7 +191,8 @@
button button
to publish sensor readings to to publish sensor readings to
IoT server. IoT server.
<a href="{{@unit.publicUri}}/images/publishDataView.png" target="_blank" class="padding-top-double"> <a href="{{@unit.publicUri}}/images/publishDataView.png" target="_blank"
class="padding-top-double">
<img src="{{@unit.publicUri}}/images/publishDataView.png" class="img-responsive"> <img src="{{@unit.publicUri}}/images/publishDataView.png" class="img-responsive">
</a> </a>
</li> </li>

71
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
Unescape View File

@ -15,7 +15,8 @@
<h3 class="uppercase">What it Does</h3> <h3 class="uppercase">What it Does</h3>
<hr> <hr>
<p class="grey margin-top">Connect Arduino UNO board to WSO2 IoT Server and visualize sensor data.</p> <p class="grey margin-top">Connect Arduino UNO board to WSO2 IoT Server and visualize sensor
data.</p>
<br> <br>
<h3 class="uppercase">What You Need</h3> <h3 class="uppercase">What You Need</h3>
@ -23,16 +24,21 @@
<ul class="list-unstyled"> <ul class="list-unstyled">
<li class="padding-top-double"><span class="circle">ITEM 01</span>&nbsp;&nbsp;&nbsp;Arduino UNO Board. <li class="padding-top-double"><span class="circle">ITEM 01</span>&nbsp;&nbsp;&nbsp;Arduino UNO Board.
</li> </li>
<li class="padding-top-double"><span class="circle">ITEM 02</span>&nbsp;&nbsp;&nbsp;Adafruit Wifi Shield for <li class="padding-top-double"><span class="circle">ITEM 02</span>&nbsp;&nbsp;&nbsp;Adafruit
Wifi Shield for
Arduino. Arduino.
</li> </li>
<li class="padding-top-double"><span class="circle">ITEM 03</span>&nbsp;&nbsp;&nbsp;LED bulb connected to Pin <li class="padding-top-double"><span class="circle">ITEM 03</span>&nbsp;&nbsp;&nbsp;LED bulb
13. <i>(If not available, will use the one on connected to Pin
13. <i>(If not available,
will use the one on
the board.)</i> the board.)</i>
</li> </li>
<li class="padding-top-double"><span class="circle">ITEM 04</span>&nbsp;&nbsp;&nbsp;A resister( e.g 330 ohms ) <li class="padding-top-double"><span class="circle">ITEM 04</span>&nbsp;&nbsp;&nbsp;A
resister( e.g 330 ohms )
</li> </li>
<li class="padding-top-double"><span class="circle">STEP 05</span>&nbsp;&nbsp;&nbsp;Proceed to [Prepare] <li class="padding-top-double"><span class="circle">STEP 05</span>&nbsp;&nbsp;&nbsp;Proceed
to [Prepare]
section. section.
</ul> </ul>
@ -164,30 +170,40 @@
<h3 class="uppercase">Prepare</h3> <h3 class="uppercase">Prepare</h3>
<hr> <hr>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li class="padding-top-double"><span class="circle">01</span>&nbsp;&nbsp;&nbsp;Wifi-Shield mounted onto the Arduino-UNO board <li class="padding-top-double"><span class="circle">01</span>&nbsp;&nbsp;&nbsp;Wifi-Shield
mounted onto the Arduino-UNO
board
</li> </li>
<li class="padding-top-double"><span class="circle">02</span>&nbsp;&nbsp;&nbsp;Connect LED bulb to arduino as follows <li class="padding-top-double"><span class="circle">02</span>&nbsp;&nbsp;&nbsp;Connect LED
bulb to arduino as follows
<br/><br/> <br/><br/>
<a href="{{@unit.publicUri}}/images/schematicsGuide.png" target="_blank" > <a href="{{@unit.publicUri}}/images/schematicsGuide.png" target="_blank">
<img src="{{@unit.publicUri}}/images/schematicsGuide.png" class="img-responsive"> <img src="{{@unit.publicUri}}/images/schematicsGuide.png" class="img-responsive">
</a> </a>
<br/> <br/>
</li> </li>
<li class="padding-top-double"><span class="circle">03</span>&nbsp;&nbsp;&nbsp;Download Arduino-Sketch from <li class="padding-top-double"><span class="circle">03</span>&nbsp;&nbsp;&nbsp;Download
Arduino-Sketch from
[Download] link above. [Download] link above.
</li> </li>
<li class="padding-top-double"><span class="circle">04</span>&nbsp;&nbsp;&nbsp;Unzip the downloaded <li class="padding-top-double"><span class="circle">04</span>&nbsp;&nbsp;&nbsp;Unzip the
downloaded
Arduino Agent Arduino Agent
</li> </li>
<li class="padding-top-double"><span class="circle">05</span>&nbsp;&nbsp;&nbsp;Create a folder called "ArduinoBoardSketch" <li class="padding-top-double"><span class="circle">05</span>&nbsp;&nbsp;&nbsp;Create a
and move all source files inside folder called
"ArduinoBoardSketch"
and move all source files
inside
</li> </li>
<li class="padding-top-double"><span class="circle">06</span>&nbsp;&nbsp;&nbsp;Open ArduinoBoardSketch.h and <li class="padding-top-double"><span class="circle">06</span>&nbsp;&nbsp;&nbsp;Open
ArduinoBoardSketch.h and
provide appropriate values for provide appropriate values for
<i>[WLAN_SSID]</i>,<i>[WLAN_PASS]</i>,<i>[SERVICE_PORT]</i>,<i>[server]</i> and <i>[deviceIP]</i> variables according to your network. <i>[WLAN_SSID]</i>,<i>[WLAN_PASS]</i>,<i>[SERVICE_PORT]</i>,<i>[server]</i> and <i>[deviceIP]</i> variables according to your network.
</li> </li>
<li class="padding-top-double"><span class="circle">07</span>&nbsp;&nbsp;&nbsp;Burn the sketch onto your Arduino <li class="padding-top-double"><span class="circle">07</span>&nbsp;&nbsp;&nbsp;Burn the
sketch onto your Arduino
board and let the program run. board and let the program run.
</li> </li>
@ -214,18 +230,26 @@
<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 padding-double"> <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 padding-double">
<h3 class="uppercase">Try Out</h3> <h3 class="uppercase">Try Out</h3>
<hr> <hr>
<p class="grey margin-top">WSO2-IoT Server provides Analytics and Real-Time Statistics of your device</p> <p class="grey margin-top">WSO2-IoT Server provides Analytics and Real-Time Statistics of
your device</p>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li class="padding-top-double"><span class="circle">01</span>&nbsp;&nbsp;&nbsp;You can view all your connected <li class="padding-top-double"><span class="circle">01</span>&nbsp;&nbsp;&nbsp;You can
devices at <a href="{{@app.context}}/devices">[Device view all your connected
devices at <a
href="{{@app.context}}/devices">[Device
Management]</a> Management]</a>
page. page.
</li> </li>
<li class="padding-top-double"><span class="circle">02</span>&nbsp;&nbsp;&nbsp;Select one of connected devices and check for available <li class="padding-top-double"><span class="circle">02</span>&nbsp;&nbsp;&nbsp;Select
control operations and monitor Real-Time data. one of connected devices
and check for available
control operations and
monitor Real-Time data.
</li> </li>
<li class="padding-top-double"><span class="circle">03</span>&nbsp;&nbsp;&nbsp;You can also view analytics of <li class="padding-top-double"><span class="circle">03</span>&nbsp;&nbsp;&nbsp;You can
the data published to IoT-Server by navigating also view analytics of
the data published to
IoT-Server by navigating
to Device Analytics page. to Device Analytics page.
</li> </li>
</ul> </ul>
@ -235,7 +259,8 @@
<p class="grey margin-top">Click on the image to zoom</p> <p class="grey margin-top">Click on the image to zoom</p>
<center> <center>
<a href="{{@unit.publicUri}}/images/myDevices_analytics.png" target="_blank"> <a href="{{@unit.publicUri}}/images/myDevices_analytics.png" target="_blank">
<img src="{{@unit.publicUri}}/images/myDevices_analytics.png" class="img-responsive"> <img src="{{@unit.publicUri}}/images/myDevices_analytics.png"
class="img-responsive">
</a> </a>
</center> </center>
</div> </div>

Write Preview
Loading…
Cancel
Save