Merge pull request #96 from GPrathap/IoTS-1.0.0-M1

changed Raspberry Pi device-type view

features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/sketch.properties

@@ -0,0 +1,2 @@
+templates=deviceConfig.properties
+zipfilename=RaspberryPiAgent.zip

features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/src/deviceConfig.properties

@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-#
-[Device-Configurations]
-owner=admin
-deviceId=u856bjb7z4fr
-device-name=rsdghoooooooooooooooooooooooooooooooooooooo_u856bjb7z4fr
-controller-context=/raspberrypi/controller
-https-ep=https://192.168.237.1:9443
-http-ep=http://192.168.237.1:9763
-apim-ep=http://192.168.237.1:9763
-mqtt-ep=tcp://204.232.188.214:1883
-xmpp-ep=http://204.232.188.215:5222
-auth-method=token
-auth-token=a568d7110ec2f4f4f51623cfbf62b67b
-refresh-token=d8d1feb54fb2b2fed5436299c64ceaef
-push-interval=15
-
-

features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/wso2IoTsServer

@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFkzCCA3sCBAKkVfcwDQYJKoZIhvcNAQEFBQAwgY0xCzAJBgNVBAYTAlNMMRAw
-DgYDVQQIEwdXZXN0ZXJuMRAwDgYDVQQHEwdDb2xvbWJvMQ0wCwYDVQQKEwRXU08y
-MRQwEgYDVQQLEwtFbmdpbmVlcmluZzESMBAGA1UEAxMJbG9jYWxob3N0MSEwHwYJ
-KoZIhvcNAQkBFhJpb3RzZXJ2ZXJAd3NvMi5jb20wHhcNMTUxMjE3MTMxMTA0WhcN
-MTcxMjE2MTMxMTA0WjCBjTELMAkGA1UEBhMCU0wxEDAOBgNVBAgTB1dlc3Rlcm4x
-EDAOBgNVBAcTB0NvbG9tYm8xDTALBgNVBAoTBFdTTzIxFDASBgNVBAsTC0VuZ2lu
-ZWVyaW5nMRIwEAYDVQQDEwlsb2NhbGhvc3QxITAfBgkqhkiG9w0BCQEWEmlvdHNl
-cnZlckB3c28yLmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALki
-GVQ9tZOKIi/gD/toV+enq+neqOBGYQ8Fq/ABOWnK2QpGWm81+Rets5GbQ6W//D8C
-5TOBGqK7z+LAgdmILr1XLkvrXWoan0GPdDJ1wpc2/6XDZvM5f7Y8cmRqVPJv7AF+
-ImgF9dqv97gYCiujy+nNHd5Nk/60pco2LBV5SyLqqrzKXEnSGrS4zoYWpPeJ9YrX
-PEkW7A6AxTQK0yU9Ej4TktgafbTueythrLomKiZJj4wPxm2lA2lAZscDdws9NWrI
-5z/LUVLbUMxrY10Nig1liX5b1mrUk5bb1d2tqwkPrpRILKoOBJtI674SQS3GziiU
-iCJGIO/EGGRn1AJsC/SvnnEez3WKY/DgJ6102MWK/yWtY8NYHUX2anwMBS7UpT5A
-4BXdsfBz3R+iPF99FxdAGGsS4GQuuPocZaycLqoPCxpTSSxBsKMUcKpn3yaiQRd6
-uDuiTNt7odDOQj0Tno7uokh/HILgbzvj9EExDOsdwLVvqYmUHBPeLmiICWXfi4ky
-H/twPOZtV9eVnfWYx5Kwg+2Y4fIb3q4ABr0hzxaMYHQo6NOukSH1BcdAWiQIXbSF
-FaTZD8p6OfiZpHcQ59HT/Z8GBlCFL2xkYJFmOhXI/Cu+xrcwqEIInv7d8w3eiNQ7
-MneomEptLbBk9+kMsP0ubo34oOGHR9qk3Lj580c/AgMBAAEwDQYJKoZIhvcNAQEF
-BQADggIBADw70g2/wrgzrAM8OXBlthGbCEaXZpKwq9IJN0qu+/l+PNwF7csQhj+q
-W+zMrWaH1DGWJroaei1+NFFrj/pvp61rF/ZeTPGVJd7puCq++SevqIrzKyAEBtwt
-pXmcFhBpV/FrQAv3ODOJ3bN2wSRPZHUvARTBB3RaUI06g1jCaBzjDEGoMfSxdr5/
-Ty2WxTI9u9RlIs3Q52AiOmROtLPiEQZQIqfNO3cxCEWojHxPqVEZA/kQYy+rryj4
-H0zzSrj7QFlQhsMDw5j8bv9AcvTEGmwp29avsgnceDWinI6lwtd8zqh0ZW9QJdH0
-BRNCM/EkTlTUHeEg04/sOgOrlWcvEfVxDqNEtbUzU9UFxl0lkQkuRn1UdxZlvhWa
-Fnel5iRC9b7OZvi2mkVujLyxEWlJB1tuyMLQxu6PfabBVODP5V8/+uyiiK/gwrB5
-rYl8RHxGoznJnI1Y3HVzKlA849CrMBaY5vnhE03cNja7QroPzLmmuXBLk2LbI1lu
-5nJAqKpBUPMI/IU3pF4Q7VTD2ZANI+ktGgGlM8AK4OJHWOhj8W289pWTHVjG8syP
-LTsaYkhgLjzZl/g9cUwn/96NJNvzd3dkT+7VgE+BJOLofq25CjZcN1M7MhWdl3vb
-WNj9vzL0+FCnwca8UecfvFS39PIekIvqbtP+Gw8NiYOUGIllZ0JH
------END CERTIFICATE-----

features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs

@@ -1,8 +1,8 @@
-<div>
+
 <div class="col-lg-12  margin-top-double">
     <h1 class="grey ">Raspberry Pi</h1>
     <hr>
-        <p class="margin-bottom-double light-grey ">Connect your RaspberryPi device to the WSO2 IoT Server.</p>
+    <p class="margin-bottom-double light-grey ">Connect your Raspberry Pi device to the WSO2 device cloud.</p>
 </div>
 <div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
     <img src="{{@unit.publicUri}}/images/respberry-icon.png" class="img-responsive">
@@ -15,22 +15,16 @@
     <br>
     <ul class="list-unstyled">
         <li><span class="fw-stack margin-right"><i class="fw fw-ring fw-stack-2x"></i>
-                <i class="fw fw-right-arrow fw-stack-1x"></i></span> Raspberry Pi (Internet Enabled)
+                <i class="fw fw-right-arrow fw-stack-1x"></i></span> Raspberry Pi (Internet Enabled)</li>
-            </li>
-            <li><span class="fw-stack margin-right"><i class="fw fw-ring fw-stack-2x"></i>
-                <i class="fw fw-right-arrow fw-stack-1x"></i></span> DHT11 Temperature Sensor
-            </li>
         <li><span class="fw-stack margin-right"><i class="fw fw-ring fw-stack-2x"></i>
-                <i class="fw fw-right-arrow fw-stack-1x"></i></span> LED
+                <i class="fw fw-right-arrow fw-stack-1x"></i></span> DHT11 Temperature Sensor</li>
-            </li>
         <li><span class="fw-stack margin-right"><i class="fw fw-ring fw-stack-2x"></i>
-                <i class="fw fw-right-arrow fw-stack-1x"></i></span> Buzzer(3v)
+                <i class="fw fw-right-arrow fw-stack-1x"></i></span> LED</li>
-            </li>
     </ul>
     <br>
 
-        <a href="/api-store/apis/info?name={{@uriParams.deviceType}}&version=1.0.0&provider=admin"
+    <a href="/api-store/apis/info?name={{@uriParams.deviceType}}&version=1.0.0&provider=admin" class="btn-operations"
-           class="btn-operations" target="_blank"><i class="fw fw-api"></i> View API</a>
+       target="_blank" ><i class="fw fw-api"></i> View API</i> &nbsp;</a>
     <a href="#" class="download-link btn-operations"><i class="fw fw-download"></i>Download</a>
 
     <div id="download-device-modal-content" class="hide">
@@ -39,19 +33,18 @@
                 <div class="col-md-7  center-container">
                     <h3>Name your device and download the agent from following link.</h3>
                     <br/>
-
                     <form id="downloadForm" method="GET" action="{{@app.context}}/api/devices/sketch/download">
                         <div class="control-group">
                             <div class="controls">
                                 <input class="new-device-name" style="color:#3f3f3f;padding:5px"
                                        type="text"
-                                           placeholder="Ex. Home_RaspberryPi"
+                                       placeholder="Ex. Lobby_DigitalDisplay"
                                        name="deviceName" size="60" required>
-                                    <br/><br/>
+                                <br/>
                                 <input type="hidden" class="deviceType" name="deviceType"
-                                           value="{{@uriParams.deviceType}}"/>
+                                       value="raspberrypi"/>
                                 <input type="hidden" class="sketchType" name="sketchType"
-                                           value="{{@uriParams.deviceType}}"/>
+                                       value="raspberrypi"/>
                             </div>
                         </div>
                         <div class="buttons" style="padding-bottom: 0px">
@@ -61,7 +54,7 @@
                             <a href="#" id="download-device-download-link" class="btn btn-operations">
                                 Copy Link
                             </a>
-
+                            &nbsp;&nbsp;
                         </div>
                     </form>
                 </div>
@@ -156,24 +149,69 @@
 </div>
 
 <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 padding-double grey-bg">
-        <h3 class="uppercase">Prepare</h3>
+    <h3 class="uppercase">Prepare</h3><hr>
-        <hr>
     <p class="grey margin-top">Get your device ready</p>
-        <br/>
     <ul class="list-unstyled">
-            <li class="padding-top-double"><span class="circle">01</span> Get your RaspberryPi device and download the Agent
+        <li class="padding-top-double"><span class="circle">01</span> Set up your RaspberryPi device as shown in the
-                Sketch.
+            schematic below and get the FireAlarm setup.</li>
-            </li>
+        <li class="padding-top-double"><span class="circle">02</span> Connect a monitor to your RaspberryPi via the
-            <li class="padding-top-double"><span class="circle">02</span> Open the downloaded RaspberryPi sketch and fill in
+            HDMI cable to get a UI view of the device.</li>
-                the pins that you wish to read/control.
+        <li class="padding-top-double"><span class="circle">03</span> Get the RaspberryPi to connect to the internet
-            </li>
+            (via Ethernet or Wifi) and note its IP_ADDRESS</li>
-            <li class="padding-top-double"><span class="circle">03</span> Burn the sketch onto your RaspberryPi board and
-                let the program run.
-            </li>
     </ul>
     <br>
 </div>
+
+<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 padding-double">
+    <h3 class="uppercase">Schematic Diagram</h3><hr>
+    <p class="grey margin-top">Click on the image to zoom</p>
+    <center>
+        <a href="{{@unit.publicUri}}/images/schematicsGuide.png" target="_blank">
+            <img src="{{@unit.publicUri}}/images/schematicsGuide.png" class="img-responsive">
+        </a>
+    </center>
+    <br/>
+</div>
+
+<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 padding-double">
+    <h3 class="uppercase">Connect (Quick Start)</h3><hr>
+    <p class="grey margin-top">Internet of Things Foundation Quickstart connection</p>
+    <ul class="list-unstyled">
+        <li class="padding-top-double"><span class="circle">01</span> Click on the <i>'Create DEB'</i> button above to
+            get the download link for the Raspberry Pi setup files</li>
+        <li class="padding-top-double"><span class="circle">02</span> (The following commands can be issued by
+            directly typing into the terminal of the device or by an <b>'ssh'</b> login from a remote PC)</li>
+        <li class="padding-top-double"><span class="circle">03</span> Download the Raspberry Pi files using the
+            following command: 'curl -k < url_link_received_from_the_above_step >> Agent.zip'.
+            This will download a zip file named 'Agent.zip'</li>
+    </ul>
+    <br/>
+</div>
+
+</div>
+
+<div id="qr-code-modal" data-enrollment-url="{{deviceType.enrollmentURL}}" class="hidden">
+
+    <div class="content">
+        <div class="row">
+            <div class="col-lg-5 col-md-6 col-centered">
+                <h3>
+                    Scan QR code to start enrollment
+                </h3>
+                <h4>
+                    Please scan the QR code using your mobile device to retrieve enrollment URL.
+                </h4>
+
+                <div class="panel panel-default">
+                    <div class="panel-body col-centered ">
+                        <div class="qr-code"></div>
+                    </div>
+                </div>
+            </div>
         </div>
+    </div>
+</div>
+
 
 {{#zone "topCss"}}
     <style type="text/css">
@@ -185,19 +223,15 @@
             width: 50px;
             color: #fff;
         }
-
         .padding-top-double {
             padding-top: 20px;
         }
-
         .padding-double {
             padding: 20px;
         }
-
         .grey {
             color: #333;
         }
-
         hr {
             display: block;
             height: 1px;
@@ -207,15 +241,12 @@
             padding: 0;
             opacity: 0.2;
         }
-
         .light-grey {
             color: #7c7c7c;
         }
-
         .uppercase {
             text-transform: uppercase;
         }
-
         .grey-bg {
             background-color: #f6f4f4;
         }
@@ -225,18 +256,4 @@
 {{#zone "bottomJs"}}
     {{js "/js/download.js"}}
     {{js "/js/jquery.validate.js"}}
-    <script type="text/javascript">
-
-        $(document).ready(function () {
-            toggleEnrollment();
-        });
-
-
-        function toggleEnrollment() {
-            $(".modalpopup-content").html($("#qr-code-modal").html());
-            //generateQRCode(".modalpopup-content .qr-code");
-            //showPopup();
-        }
-
-    </script>
 {{/zone}}