Updated to support multiple sensors

.gitignore

@@ -0,0 +1 @@
+*.swp

README.md

@@ -0,0 +1,8 @@
+#Raspberry Pi Temperature Logger
+This repo contains code for a Raspberry Pi temperature logger which uses SQLite to store data read from a DS18B20 sensor.  
+![Screenshot of temperature logger](http://i.imgur.com/nAFKJ4M.png)
+#Installation:
+**Warning:** Your Raspberry Pi will reboot after installation to enable GPIO 
+```bash
+cd && git clone https://github.com/poohzrn/rpi_temp_logger && cd ~/rpi_temp_logger && ./install.sh 
+```

createDatabase.sql

@@ -0,0 +1,10 @@
+CREATE TABLE sensor_data (
+        sensor_id TEXT NOT NULL,
+	timestamp datetime NOT NULL DEFAULT (DATETIME(CURRENT_TIMESTAMP, 'LOCALTIME')),
+        value real NOT NULL
+);
+CREATE TABLE sensor (
+        sensor_id TEXT NOT NULL UNIQUE,
+        sensor_name   TEXT NOT NULL DEFAULT 'SensorName',
+        PRIMARY KEY(sensor_id)
+);

devmonitor.py

@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+
+import sqlite3
+import glob
+import random
+import commands
+
+# global variables
+dbname='/var/www/tmplog/tempdb2.db'
+
+# store the temperature in the database
+def log_temperature(iD, temp):
+    conn=sqlite3.connect(dbname)
+    curs=conn.cursor()
+    insertDeviceQuery = "INSERT OR IGNORE INTO sensor (sensor_id) VALUES('"+str(iD)+"');"
+    curs.execute(insertDeviceQuery);
+    insertDataQuery = "INSERT INTO sensor_data (sensor_id,value) VALUES('"+str(iD)+"','"+str(temp)+"');"
+    curs.execute(insertDataQuery);
+    # commit the changes
+    conn.commit()
+    conn.close()
+
+# main function
+# This is where the program starts 
+def main():
+    devicelist = ['device1','device2',"device321"]
+    if devicelist=='':
+        # no devices
+        return None
+    else:
+        for device in devicelist:
+            temperature = random.uniform(0.0,45.0)
+            deviceid = device
+            print temperature
+            print deviceid
+            log_temperature(deviceid, temperature)
+if __name__=="__main__":
+    main()

install.sh

@@ -0,0 +1,28 @@
+!#/usr/bin/env bash 
+#Sudo access
+sudo -v 
+sudo apt-get update
+sudo apt-get intsall apache2 -y
+sudo apt-get install sqlite3 -y
+sudo a2enmod mpm_prefork cgi
+sudo mkdir -p /var/www/tmplog
+cat ~/rpi_temp_logger/createDatabase.sql | sqlite3 tempdb2.db
+
+if [ -e /var/www/tmplog/tempdb2.db ]; then
+    sudo mv /var/www/tmplog ~/tempdb2.bak
+fi
+sudo cp ~/rpi_temp_logger/tmplog.conf /etc/apache2/sites-enabled
+sudo mv  ~/rpi_temp_logger/tempdb2.db /var/www/tmplog
+sudo ln -s ~/rpi_temp_logger/monitor.py /usr/lib/cgi-bin/
+sudo ln -s ~/rpi_temp_logger/webgui.py /var/www/tmplog/index.py
+
+sudo chown www-data:www-data /usr/lib/cgi-bin/monitor.py
+sudo chown www-data:www-data /var/www/tmplog/tempdb2.db
+#Add Crontab to get data from sensors
+sudo crontab -l > currentCron
+sudo echo "* * * * *  /usr/lib/cgi-bin/monitor.py" >> currentCron
+sudo crontab currentCron && sudo rm currentCron
+#enable GPIO
+sudo echo "dtoverlay=w1-gpio" >> /boot/config.txt
+#restart to enable GPIO
+sudo reboot now

monitor.py

@@ -1,45 +1,39 @@
 #!/usr/bin/env python
 
 import sqlite3
-
 import os
-import time
 import glob
+import commands
 
 # global variables
 speriod=(15*60)-1
-dbname='/var/www/templog.db'
-
-
+dbname='/var/www/tmplog/tempdb2.db'
 
 # store the temperature in the database
-def log_temperature(temp):
-
+def log_temperature(iD, temp):
     conn=sqlite3.connect(dbname)
     curs=conn.cursor()
-
-    curs.execute("INSERT INTO temps values(datetime('now'), (?))", (temp,))
-
+    insertDeviceQuery = "INSERT OR IGNORE INTO sensor (sensor_id) VALUES('"+str(iD)+"');"
+    curs.execute(insertDeviceQuery);
+    insertDataQuery = "INSERT INTO sensor_data (sensor_id,value) VALUES('"+str(iD)+"','"+str(temp)+"');"
+    curs.execute(insertDataQuery);
     # commit the changes
     conn.commit()
-
     conn.close()
 
-
 # display the contents of the database
-def display_data():
-
+def display_data(iD):
     conn=sqlite3.connect(dbname)
     curs=conn.cursor()
-
-    for row in curs.execute("SELECT * FROM temps"):
-        print str(row[0])+"	"+str(row[1])
-
+    getDevices = "SELECT * FROM sensor"
+    getSensorDataQuery = "SELECT * FROM sensor_data WHERE sensor_id =?"
+    for row in curs.execute(getSensorDataQuery, [iD]):
+        print str(row[0])+"	"+str(row[1])+"	"+str(row[2])
+    for row in curs.execute(getDevices):
+        print str(row[0])+" "+str(row[1])
     conn.close()
 
-
-
-# get temerature
+# get temperature
 # returns None on error, or the temperature as a float
 def get_temp(devicefile):
 
@@ -64,8 +58,6 @@ def get_temp(devicefile):
         print "There was an error."
         return None
 
-
-
 # main function
 # This is where the program starts 
 def main():
@@ -75,38 +67,24 @@ def main():
     os.system('sudo modprobe w1-therm')
 
     # search for a device file that starts with 28
-    devicelist = glob.glob('/sys/bus/w1/devices/28*')
+    deviceDir = '/sys/bus/w1/devices/'
+    devicelist = glob.glob(deviceDir + '28*')
+    print devicelist
     if devicelist=='':
+        # no devices
         return None
     else:
         # append /w1slave to the device file
-        w1devicefile = devicelist[0] + '/w1_slave'
-
-
-#    while True:
-
-    # get the temperature from the device file
-    temperature = get_temp(w1devicefile)
-    if temperature != None:
-        print "temperature="+str(temperature)
-    else:
-        # Sometimes reads fail on the first attempt
-        # so we need to retry
-        temperature = get_temp(w1devicefile)
-        print "temperature="+str(temperature)
-
-        # Store the temperature in the database
-    log_temperature(temperature)
-
-        # display the contents of the database
-#        display_data()
-
-#        time.sleep(speriod)
-
-
+        for w1devicefile in devicelist:
+            w1devicefile = w1devicefile + '/w1_slave'
+            # get the temperature from the device file
+            temperature = get_temp(w1devicefile)
+            while temperature == None:
+                temperature = get_temp(w1devicefile)
+
+            deviceid = w1devicefile.split("/")[5]
+            # Store the temperature in the database
+            log_temperature(deviceid, temperature)
+            #display_data(deviceid)
 if __name__=="__main__":
     main()
-
-
-
-

tmplog.conf

@@ -0,0 +1,11 @@
+NameVirtualHost *:80
+<VirtualHost *:80>
+    <Directory /var/www/tmplog>
+        Options +ExecCGI
+        DirectoryIndex index.py
+    </Directory>
+    AddHandler cgi-script
+    DocumentRoot /var/www/tmplog
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+</VirtualHost>