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

updated startup scripts

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

@@ -1,45 +1,44 @@
-# Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+## Copyright and license
-# WSO2 Inc. licenses this file to you under the Apache License,
+
-# Version 2.0 (the "License"); you may not use this file except
+Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-# in compliance with the License.
+WSO2 Inc. licenses this file to you under the Apache License,Version 2.0 (the "License"); you may not use this file except
-# You may obtain a copy of the License at
+in compliance with the License.You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-# 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
-# Unless required by applicable law or agreed to in writing,
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
-# software distributed under the License is distributed on an
+specific language governing permissions and limitations under the License.
-# "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.
 
 
                                                 --------------
                                                   testAgent.sh
                                                 --------------
 This script is used to run this service in a testing environment. It can be run on a real Raspberry Pi device or in a 
-virtual environment.
+virtual environment.If this runs on a real Raspberry Pi device, you need to install [Adafruit Python DHT Sensor Library](https://github.com/adafruit/Adafruit_Python_DHT).
-If this runs on a real Raspberry Pi device, you need to install Adafruit Python DHT Sensor Library and RPi.GPIO Python Library.To install  Adafruit Python DHT Sensor Library, follow the
+To install  Adafruit Python DHT Sensor Library: follow the instructions given here https://github.com/adafruit/Adafruit_Python_DHT.
-instructions given here https://github.com/adafruit/Adafruit_Python_DHT.
-To install RPi.GPIO Python Library, sudo apt-get install rpi.gpio
 
-To run: sudo ./testAgent.sh and follow the instructions.
+To run: ` sudo ./testAgent.sh ` and follow the instructions.
 
                                                 -------------------
                                                   startService.sh
                                                 -------------------
 After testing, this script can be used to deploy this application as a service on Raspberry Pi which will get loaded
 during boot up process.
-To run: sudo ./startService.sh
-Note: You should have to provide following arguments in RaspberryService.sh as shown below.
-
-DAEMON_OPTS="-l /usr/local/src/RaspberryAgent/RaspberryStats.log -m N -i 56"
 
--l ----> file to write log
+create a service:
--i ----> time interval between successive data pushes to the wso2 IoT Server
+        ` sudo ./startService.sh `
--m ----> weather is going to run on the real device or not
+        
+get current state of the service:
+       ` sudo service RaspberryService.sh status `
 
 start service:
-       service /etc/init.d/RaspberryService.sh start
+       ` sudo service RaspberryService.sh start `
 
 stop service:
-       service /etc/init.d/RaspberryService.sh stop
+       ` sudo service RaspberryService.sh stop `
+
+restart service:
+       ` sudo service RaspberryService.sh restart `
+
+
+
+
       

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

@@ -31,7 +31,6 @@
 ### END INIT INFO
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
-# Change the next 3 lines to suit where you install your script and what you want to call it
 DESC="This service is used to publish events from the Raspberry Pi to the WSO2 Device Cloud"
 NAME=RaspberryStats
 
@@ -47,7 +46,6 @@ PIDFILE=/var/run/$DAEMON_NAME.pid
 DAEMON_OPTS="-l /usr/local/src/RaspberryAgent/RaspberryStats.log -m N -i 60"
 
 # This next line determines what user the script runs as.
-# Root generally not recommended but necessary if you are using the Raspberry Pi GPIO from Python.
 DAEMON_USER=root   #pi
 
 # Load the VERBOSE setting and other rcS variables

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

@@ -54,8 +54,8 @@ LOG_LEVEL = logging.INFO  # Could be e.g. "DEBUG" or "WARNING"
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #       Python version
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-if sys.version_info<(2,7,5):
+if sys.version_info<(2,7,0):
-  sys.stderr.write("You need python 2.7.5 or later to run this script\n")
+  sys.stderr.write("You need python 2.7.0 or later to run this script\n")
   exit(1)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

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

@@ -31,6 +31,7 @@ import running_mode
 global HOST_NAME
 HOST_NAME = "0.0.0.0"
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+HTTP_SERVER_PORT = 5678 # http server port which is listning on
 
 global LAST_TEMP
 LAST_TEMP = 25  # The Last read temperature value from the DHT sensor. Kept globally
@@ -40,9 +41,7 @@ TEMPERATURE_READING_INTERVAL_REAL_MODE = 3
 TEMPERATURE_READING_INTERVAL_VIRTUAL_MODE = 60
 TEMP_PIN = 4
 TEMP_SENSOR_TYPE = 11
-
 BULB_PIN = 11  # The GPIO Pin# in RPi to which the LED is connected
-HTTP_SERVER_PORT = 5678 # http server port which is listning on
 global GPIO
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

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

@@ -20,6 +20,13 @@
 
 #!/usr/bin/env bash
 
+echo "----------------------------------------------------------------"
+echo "|		          WSO2 IOT Sample				                  "
+echo "|		            RaspiAgent				                      "
+echo "|	              ----------------				                  "
+echo "|           ....initializing service-start-script	              "
+echo "----------------------------------------------------------------"
+
 destination="/usr/local/src/RaspberryAgent"
 currentDir=$PWD
 if [ ! -d "$destination" ]
@@ -33,4 +40,4 @@ sudo update-rc.d -f RaspberryService.sh remove
 sudo cp $currentDir/RaspberryService.sh /etc/init.d
 sudo chmod +x /etc/init.d/RaspberryService.sh
 sudo update-rc.d RaspberryService.sh defaults
-sudo service /etc/init.d/RaspberryService.sh start
+sudo service RaspberryService.sh start

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

@@ -21,10 +21,10 @@
 #!/bin/bash
 
 echo "----------------------------------------------------------------"
-echo "|		WSO2 IOT Sample				"
+echo "|		                 WSO2 IOT Sample				          "
-echo "|		  RaspiAgent				"
+echo "|		                   RaspiAgent				              "
-echo "|	       ----------------				"
+echo "|	                     ----------------				          "
-echo "|    ....initializing startup-script	"
+echo "|                ....initializing startup-script	              "
 echo "----------------------------------------------------------------"
 
 currentDir=$PWD
@@ -96,7 +96,7 @@ while true; do
 done
 cp deviceConfig.properties ./src
 
-if [ $mode -eq "N" ]; then
+if [ "$mode" = "N" ]; then
      sudo apt-get install rpi.gpio
 fi
 
@@ -111,4 +111,4 @@ fi
 
 echo "--------------------------------------------------------------------------"
 echo "|			Successfully Started		"
-echo "|		   --------------------------		"
+echo "|		   --------------------------	"