From 95acbdb454067206fb59dd099f3e90f38f7553ae Mon Sep 17 00:00:00 2001
From: mattbk <bedrocks@gmail.com>
Date: Sat, 9 Dec 2017 04:40:44 +0000
Subject: [PATCH] Add sensor type to config.ini.

---
 config.ini        | 8 ++++++--
 pi_temp.py        | 9 +++++----
 pi_temp_logger.py | 7 ++++++-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/config.ini b/config.ini
index d6b9c61..46d3dad 100644
--- a/config.ini
+++ b/config.ini
@@ -1,2 +1,6 @@
-[DEFAULT]
-PORT = 8080
\ No newline at end of file
+[SERVER]
+PORT = 8080
+
+[SENSOR]
+# Set sensor type : Options are DHT11, DHT22 or AM2302
+TYPE = DHT22
diff --git a/pi_temp.py b/pi_temp.py
index e0ff418..64cd403 100755
--- a/pi_temp.py
+++ b/pi_temp.py
@@ -51,21 +51,22 @@ import arrow
 import json
 import plotly
 import sqlite3
+import sys
+import Adafruit_DHT
 import ConfigParser
 from plotly.graph_objs import *
 
 config = ConfigParser.ConfigParser()
 config.read("config.ini")
-port = config.getint('DEFAULT', 'PORT') 
+port = config.getint('SERVER', 'PORT') 
+sensor = config.get('SENSOR','TYPE') 
 
 app = Flask(__name__)
 app.debug = True # Make this False if you are no longer debugging
 
 @app.route("/")
 def lab_temp():
-    import sys
-    import Adafruit_DHT
-    humidity, temperature = Adafruit_DHT.read_retry(Adafruit_DHT.AM2302, 17)
+    humidity, temperature = Adafruit_DHT.read_retry(getattr(Adafruit_DHT,sensor), 17) 
     temperature = temperature * 9/5.0 + 32
     if humidity is not None and temperature is not None:
         return render_template("live.html",temp=temperature,hum=humidity)
diff --git a/pi_temp_logger.py b/pi_temp_logger.py
index 17091aa..1a9a214 100755
--- a/pi_temp_logger.py
+++ b/pi_temp_logger.py
@@ -37,6 +37,11 @@ No text output. Two new records are inserted in the database when the script is
 import sqlite3
 import sys
 import Adafruit_DHT
+import ConfigParser
+
+config = ConfigParser.ConfigParser()
+config.read("config.ini")
+sensor = config.get('SENSOR','TYPE') 
 
 def log_values(sensor_id, temp, hum):
 	conn=sqlite3.connect('/home/pi/Documents/pi-temp/pi_temp.db')  #It is important to provide an
@@ -51,7 +56,7 @@ def log_values(sensor_id, temp, hum):
 	conn.commit()
 	conn.close()
 
-humidity, temperature = Adafruit_DHT.read_retry(Adafruit_DHT.AM2302, 17)
+humidity, temperature = Adafruit_DHT.read_retry(getattr(Adafruit_DHT,sensor), 17)
 temperature = temperature * 9/5.0 + 32
 # If you don't have a sensor but still wish to run this program, comment out all the 
 # sensor related lines, and uncomment the following lines (these will produce random