From 1cd6606436fc2ad510b90b94d459f81a99ee1426 Mon Sep 17 00:00:00 2001
From: Vitor de Miranda Henrique <vitormhenrique@gmail.com>
Date: Mon, 10 Oct 2016 14:55:31 -0500
Subject: [PATCH] Add files via upload

---
 extras/GetHumidity.py        |  4 ---
 extras/GetTemperature.py     | 56 ++++++------------------------------
 extras/GetTemperature1820.py | 37 ++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 52 deletions(-)
 create mode 100644 extras/GetTemperature1820.py

diff --git a/extras/GetHumidity.py b/extras/GetHumidity.py
index fbb98bf..6772d0d 100644
--- a/extras/GetHumidity.py
+++ b/extras/GetHumidity.py
@@ -2,7 +2,6 @@
 import sys
 import Adafruit_DHT
 
-
 # Parse command line parameters.
 sensor_args = {'11': Adafruit_DHT.DHT11,
                 '22': Adafruit_DHT.DHT22,
@@ -11,9 +10,6 @@ sensor_args = {'11': Adafruit_DHT.DHT11,
 if len(sys.argv) == 3 and sys.argv[1] in sensor_args:
     sensor = sensor_args[sys.argv[1]]
     pin = sys.argv[2]
-elif len(sys.argv) == 2 and sys.argv[1] == '1820':
-    print 'Failed'
-    sys.exit(1)
 else:
     sys.exit(1)
 
diff --git a/extras/GetTemperature.py b/extras/GetTemperature.py
index 3d12e1f..c1eaec0 100644
--- a/extras/GetTemperature.py
+++ b/extras/GetTemperature.py
@@ -1,60 +1,20 @@
-#!/usr/bin/python
 import sys
 import Adafruit_DHT
-import os
-import glob
-import time
-
 
 # Parse command line parameters.
-sensor_args = {'11': Adafruit_DHT.DHT11, '22': Adafruit_DHT.DHT22, '2302': Adafruit_DHT.AM2302}
-
+sensor_args = { '11': Adafruit_DHT.DHT11,
+                '22': Adafruit_DHT.DHT22,
+                '2302': Adafruit_DHT.AM2302 }
 if len(sys.argv) == 3 and sys.argv[1] in sensor_args:
     sensor = sensor_args[sys.argv[1]]
     pin = sys.argv[2]
-    isDHTSensor = True
-elif len(sys.argv) == 2 and sys.argv[1] == '1820':
-    os.system('modprobe w1-gpio')
-    os.system('modprobe w1-therm')
-    base_dir = '/sys/bus/w1/devices/'
-    device_folder = glob.glob(base_dir + '28*')[0]
-    device_file = device_folder + '/w1_slave'
-    isDHTSensor = False
 else:
     sys.exit(1)
 
+humidity, temperature = Adafruit_DHT.read_retry(sensor, pin)
 
-def read_temp_raw():
-    f = open(device_file, 'r')
-    lines = f.readlines()
-    f.close()
-    return lines
-
-
-def read_temp():
-    lines = read_temp_raw()
-    while lines[0].strip()[-3:] != 'YES':
-        time.sleep(0.2)
-        lines = read_temp_raw()
-    equals_pos = lines[1].find('t=')
-    if equals_pos != -1:
-        temp_string = lines[1][equals_pos+2:]
-        temp_c = float(temp_string) / 1000.0
-        return temp_c
-
-
-def read_dht_temp():
-    hum, temp = Adafruit_DHT.read_retry(sensor, pin)
-    return temp
-
-if isDHTSensor = True:
-    temperature = read_dht_temp()
-    if temperature is not None:
-        print '{0:0.1f}'.format(temperature)
-    else:
-        print 'Failed'
-        sys.exit(1)
-else:
-    temperature = read_temp()
+if temperature is not None:
     print '{0:0.1f}'.format(temperature)
-    sys.exit(1)
+else:
+    print 'Failed'
+    sys.exit(1)
\ No newline at end of file
diff --git a/extras/GetTemperature1820.py b/extras/GetTemperature1820.py
new file mode 100644
index 0000000..b93d1d1
--- /dev/null
+++ b/extras/GetTemperature1820.py
@@ -0,0 +1,37 @@
+#!/usr/bin/python
+import sys
+import os
+import glob
+import time
+
+if len(sys.argv) == 2 and sys.argv[1] == '1820':
+    os.system('modprobe w1-gpio')
+    os.system('modprobe w1-therm')
+    base_dir = '/sys/bus/w1/devices/'
+    device_folder = glob.glob(base_dir + '28*')[0]
+    device_file = device_folder + '/w1_slave'
+else:
+    sys.exit(1)
+
+
+def read_temp_raw():
+    f = open(device_file, 'r')
+    lines = f.readlines()
+    f.close()
+    return lines
+
+
+def read_temp():
+    lines = read_temp_raw()
+    while lines[0].strip()[-3:] != 'YES':
+        time.sleep(0.2)
+        lines = read_temp_raw()
+    equals_pos = lines[1].find('t=')
+    if equals_pos != -1:
+        temp_string = lines[1][equals_pos+2:]
+        temp_c = float(temp_string) / 1000.0
+        return temp_c
+
+temperature = read_temp()
+print '{0:0.1f}'.format(temperature)
+sys.exit(1)