Merge pull request #78 from j7126/master

DHT on PC and x86 fix

octoprint_dashboard/__init__.py

@@ -4,7 +4,11 @@
 from octoprint.util import RepeatedTimer
 import re
 import psutil
-import Adafruit_DHT
+import sys
+import os
+if sys.platform.startswith("linux"):
+    if os.uname()[1].startswith("octopi"):
+   		import Adafruit_DHT
 
 from octoprint.events import Events, eventManager
 
@@ -31,16 +35,18 @@ class DashboardPlugin(octoprint.plugin.SettingsPlugin,
     dht_sensor_type = None
 
     def adafruitDhtGetStats(self):
-        if self.dht_sensor_type == "DHT11":
-            sensor = Adafruit_DHT.DHT11
-        elif self.dht_sensor_type == "DHT22":
-            sensor = Adafruit_DHT.DHT22
-        else: return
-        pin = self.dht_sensor_pin        
-        try:
-            self.ambient_humidity, self.ambient_temperature = Adafruit_DHT.read_retry(sensor, pin)
-        except RuntimeError as e:
-            print("Reading from DHT failure: ", e.args)
+        if sys.platform.startswith("linux"):
+            if os.uname()[1].startswith("octopi"):
+                if self.dht_sensor_type == "DHT11":
+                    sensor = Adafruit_DHT.DHT11
+                elif self.dht_sensor_type == "DHT22":
+                    sensor = Adafruit_DHT.DHT22
+                else: return
+                pin = self.dht_sensor_pin        
+                try:
+                    self.ambient_humidity, self.ambient_temperature = Adafruit_DHT.read_retry(sensor, pin)
+                except RuntimeError as e:
+                    print("Reading from DHT failure: ", e.args)
 
     def psUtilGetStats(self):
         #temp_average = 0

setup.py

@@ -1,4 +1,6 @@
 # coding=utf-8
+import sys
+import os
 
 ########################################################################################################################
 ### Do not forget to adjust the following variables to your own plugin.
@@ -33,7 +35,13 @@
 plugin_license = "AGPLv3"
 
 # Any additional requirements besides OctoPrint should be listed here
-plugin_requires = ["psutil", "Adafruit_DHT"]
+if sys.platform.startswith("linux"):
+    if os.uname()[1].startswith("octopi"):
+   		plugin_requires = ["psutil", "Adafruit_DHT"]
+    else:
+   		plugin_requires = ["psutil"]
+else:
+   	plugin_requires = ["psutil"]
 
 ### --------------------------------------------------------------------------------------------------------------------
 ### More advanced options that you usually shouldn't have to touch follow after this point