Support for Linux Boards

README.md

@@ -1,7 +1,7 @@
 <p align="center"><img alt="MudPi Smart Garden" title="MudPi Smart Garden" src="https://mudpi.app/img/mudPI_LOGO_small_grad.png" width="200px"></p>
 
 # MudPi Smart Garden
-> A python library to gather sensor readings, trigger components, control solenoids and more in an event based system that can be run on a raspberry pi.
+> A python library to gather sensor readings, trigger components, control solenoids and more in an event based system that can be run on a linux SBC, including Raspberry Pi.
 
 
 ## Documentation
@@ -17,7 +17,7 @@ For examples and guides on how to setup and use MudPi check out the [free guides
 
 
 ## Contributing
-Any contributions you can make will be greatly appreciated. If you are interested in contributing please get in touch with me and submit a pull request. There is much more I would like to add support for, however being a single developer limits my scope. Therefore mainly bugs will be accepted as issues. 
+Any contributions you can make will be greatly appreciated. If you are interested in contributing please get in touch with me and submit a pull request. There is much more I would like to add support for, however being a single developer limits my scope. Therefore mainly bugs will be accepted as issues.
 
 
 ## Versioning
@@ -33,7 +33,7 @@ Breaking.Major.Minor
 * [Twitter.com/MudpiApp](https://twitter.com/mudpiapp)
 
 ## Hardware Tested On
-These are the devices and sensors I tested and used with MudPi successfully. Many sensors are similar so it will work with a range more than what is listed below. 
+These are the devices and sensors I tested and used with MudPi successfully. Many sensors are similar so it will work with a range more than what is listed below.
 
 **Devices**
 * [Raspberry Pi 2 Model B+](https://www.raspberrypi.org/products/raspberry-pi-2-model-b/)
@@ -53,13 +53,15 @@ These are the devices and sensors I tested and used with MudPi successfully. Man
 * [DS18B20 Temperature Sensors](https://www.amazon.com/gp/product/B018KFX5X0/ref=oh_aui_detailpage_o08_s00?ie=UTF8&psc=1)
 * [DHT11 Temperature/Humidity Sensor](https://www.amazon.com/gp/product/B01DKC2GQ0/ref=oh_aui_detailpage_o07_s05?ie=UTF8&psc=1)
 * [DHT22 Temperature/Humidity Sensor](https://www.dfrobot.com/product-1102.html)
+* [T9602 Temperature/Humidity Sensor](https://www.amphenol-sensors.com/en/telaire/humidity/527-humidity-sensors/3224-t9602)
 * [Rain Sensor](https://www.amazon.com/gp/product/B01D9JK2F6/ref=oh_aui_detailpage_o03_s00?ie=UTF8&psc=1)
 * [Ambient Light Sensor](https://www.dfrobot.com/product-1004.html)
 * [DFROBOT Analog Capacitive Soil Moisture Sensor](https://www.amazon.com/gp/product/B01GHY0N4K/ref=oh_aui_detailpage_o01_s00?ie=UTF8&psc=1)
 * [Soil Moisture Sensor](https://www.sparkfun.com/products/13322)
 
 **Components**
 * [4 Channel DC 5V Relay](https://www.amazon.com/gp/product/B00KTEN3TM/ref=oh_aui_detailpage_o08_s00?ie=UTF8&psc=1)
+* [8 Channel DC 5V Relay](https://www.amazon.co.uk/SODIAL-Channel-Module-Arduino-Electronic/dp/B00IIDXYTA)
 * [LCD 16 x 2 Display I2C](https://www.dfrobot.com/product-135.html)
 * [LCD 16 x 2 Display I2C - PCF8574](https://www.amazon.com/Arducam-Display-Controller-Character-Backlight/dp/B019D9TYMI)
 * [LCD 20 x 4 Display I2C](https://www.dfrobot.com/product-590.html)
@@ -74,4 +76,3 @@ This project is licensed under the BSD-4-Clause License - see the [LICENSE.md](L
 
 
 <img alt="MudPi Smart Garden" title="MudPi Smart Garden" src="https://mudpi.app/img/mudPI_LOGO_small_flat.png" width="50px">
-

action.py

@@ -1,45 +1,54 @@
-import time
 import json
-import redis
 import subprocess
 import sys
-sys.path.append('..')
+
+import redis
+
+
+
 
 class Action():
 
-	def __init__(self, config):
-		self.config = config
-		self.name = config.get("name", "Action")
-		self.type = config.get("type", "event")
-		self.key = config.get("key", None).replace(" ", "_").lower() if config.get("key") is not None else self.name.replace(" ", "_").lower()
-		# Actions will be either objects to publish for events or a command string to execute
-		self.action = config.get("action")
-		try:
-			self.r = config["redis"] if config["redis"] is not None else redis.Redis(host='127.0.0.1', port=6379)
-		except KeyError:
-			self.r = redis.Redis(host='127.0.0.1', port=6379)
-		return
-
-	def init_action(self):
-		if self.type == 'event':
-			self.topic = self.config.get("topic", "mudpi")
-		elif self.type == 'command':
-			self.shell = self.config.get("shell", False)
-
-	def trigger(self, value=None):
-		if self.type == 'event':
-			self.emitEvent()
-		elif self.type == 'command':
-			self.runCommand(value)
-		return
-
-	def emitEvent(self):
-		self.r.publish(self.topic, json.dumps(self.action))
-		return
-
-	def runCommand(self, value=None):
-		if value is None:
-			completed_process = subprocess.run([self.action], shell=self.shell)
-		else:
-			completed_process = subprocess.run([self.action, json.dumps(value)], shell=self.shell)
-		return
+    def __init__(self, config):
+        self.config = config
+        self.name = config.get("name", "Action")
+        self.type = config.get("type", "event")
+        self.key = config.get("key", None).replace(" ",
+                                                   "_").lower() if config.get(
+            "key") is not None else self.name.replace(" ", "_").lower()
+        # Actions will be either objects to publish for events
+        # or a command string to execute
+        self.action = config.get("action")
+
+        try:
+            self.r = config["redis"] if config[
+                                            "redis"] is not None else redis.Redis(
+                host='127.0.0.1', port=6379)
+        except KeyError:
+            self.r = redis.Redis(host='127.0.0.1', port=6379)
+        return
+
+    def init_action(self):
+        if self.type == 'event':
+            self.topic = self.config.get("topic", "mudpi")
+        elif self.type == 'command':
+            self.shell = self.config.get("shell", False)
+
+    def trigger(self, value=None):
+        if self.type == 'event':
+            self.emit_event()
+        elif self.type == 'command':
+            self.run_command(value)
+        return
+
+    def emit_event(self):
+        self.r.publish(self.topic, json.dumps(self.action))
+        return
+
+    def run_command(self, value=None):
+        if value is None:
+            completed_process = subprocess.run([self.action], shell=self.shell)
+        else:
+            completed_process = subprocess.run(
+                [self.action, json.dumps(value)], shell=self.shell)
+        return

constants.py

@@ -0,0 +1,5 @@
+PREVIOUS_LINE = "\x1b[1F"
+RED_BACK = "\x1b[41;37m"
+GREEN_BACK = "\x1b[42;30m"
+YELLOW_BACK = "\x1b[43;30m"
+RESET = "\x1b[0m"

controls/arduino/button_control.py

@@ -10,30 +10,30 @@
 
 class ButtonControl(Control):
 
-	def __init__(self, pin, name=None, key=None, connection=default_connection, analog_pin_mode=False, topic=None, redis_conn=None):
-		super().__init__(pin, name=name, key=key, connection=connection, analog_pin_mode=analog_pin_mode, redis_conn=redis_conn)
-		self.topic = topic.replace(" ", "/").lower() if topic is not None else 'mudpi/controls/'+self.key
-		self.state_counter = 3
-		self.previous_state = 0
-		return
+    def __init__(self, pin, name=None, key=None, connection=default_connection, analog_pin_mode=False, topic=None, redis_conn=None):
+        super().__init__(pin, name=name, key=key, connection=connection, analog_pin_mode=analog_pin_mode, redis_conn=redis_conn)
+        self.topic = topic.replace(" ", "/").lower() if topic is not None else 'mudpi/controls/'+self.key
+        self.state_counter = 3
+        self.previous_state = 0
+        return
 
-	def init_control(self):
-		super().init_control()
+    def init_control(self):
+        super().init_control()
 
-	def read(self):
-		state = super().read()
-		if state == self.previous_state:
-			self.state_counter += 1
-			if self.state_counter % 2 == 0:
-				if state:
-					super().emitEvent(1)
-				elif self.state_counter == 2:
-					super().emitEvent(0)
-		else:
-			self.state_counter = 1
+    def read(self):
+        state = super().read()
+        if state == self.previous_state:
+            self.state_counter += 1
+            if self.state_counter % 2 == 0:
+                if state:
+                    super().emitEvent(1)
+                elif self.state_counter == 2:
+                    super().emitEvent(0)
+        else:
+            self.state_counter = 1
 
-		self.previous_state = state
-		return state
+        self.previous_state = state
+        return state
 
-	def readRaw(self):
-		return super().read()
+    def read_raw(self):
+        return super().read()

controls/arduino/control.py

@@ -3,59 +3,59 @@
 import redis
 from nanpy import (ArduinoApi, SerialManager)
 import sys
-sys.path.append('..')
+
 
 default_connection = SerialManager()
 
 # Base sensor class to extend all other arduino sensors from.
 class Control():
 
-	def __init__(self, pin, name=None, connection=default_connection, analog_pin_mode=False, key=None, redis_conn=None):
-		self.pin = pin
-
-		if key is None:
-			raise Exception('No "key" Found in Control Config')
-		else:
-			self.key = key.replace(" ", "_").lower()
-
-		if name is None:
-			self.name = self.key.replace("_", " ").title()
-		else:
-			self.name = name
-			
-		self.analog_pin_mode = analog_pin_mode
-		self.connection = connection
-		self.api = ArduinoApi(connection)
-		try:
-			self.r = redis_conn if redis_conn is not None else redis.Redis(host='127.0.0.1', port=6379)
-		except KeyError:
-			self.r = redis.Redis(host='127.0.0.1', port=6379)
-		return
-
-	def init_control(self):
-		#Initialize the control here (i.e. set pin mode, get addresses, etc)
-		self.api.pinMode(self.pin, self.api.INPUT)
-		pass
-
-	def read(self):
-		#Read the sensor(s), parse the data and store it in redis if redis is configured
-		return self.readPin()
-
-	def readRaw(self):
-		#Read the sensor(s) but return the raw data, useful for debugging
-		pass
-
-	def readPin(self):
-		#Read the pin from the ardiuno. Can be analog or digital based on "analog_pin_mode"
-		data = self.api.analogRead(self.pin) if self.analog_pin_mode else self.api.digitalRead(self.pin)
-		return data
-
-	def emitEvent(self, data): 
-		message = {
-			'event':'ControlUpdate',
-			'data': {
-				self.key:data
-			}
-		}
-		print(message["data"])
-		self.r.publish('controls', json.dumps(message))
+    def __init__(self, pin, name=None, connection=default_connection, analog_pin_mode=False, key=None, redis_conn=None):
+        self.pin = pin
+
+        if key is None:
+            raise Exception('No "key" Found in Control Config')
+        else:
+            self.key = key.replace(" ", "_").lower()
+
+        if name is None:
+            self.name = self.key.replace("_", " ").title()
+        else:
+            self.name = name
+            
+        self.analog_pin_mode = analog_pin_mode
+        self.connection = connection
+        self.api = ArduinoApi(connection)
+        try:
+            self.r = redis_conn if redis_conn is not None else redis.Redis(host='127.0.0.1', port=6379)
+        except KeyError:
+            self.r = redis.Redis(host='127.0.0.1', port=6379)
+        return
+
+    def init_control(self):
+        #Initialize the control here (i.e. set pin mode, get addresses, etc)
+        self.api.pinMode(self.pin, self.api.INPUT)
+        pass
+
+    def read(self):
+        #Read the sensor(s), parse the data and store it in redis if redis is configured
+        return self.read_pin()
+
+    def read_raw(self):
+        #Read the sensor(s) but return the raw data, useful for debugging
+        pass
+
+    def read_pin(self):
+        #Read the pin from the ardiuno. Can be analog or digital based on "analog_pin_mode"
+        data = self.api.analogRead(self.pin) if self.analog_pin_mode else self.api.digitalRead(self.pin)
+        return data
+
+    def emitEvent(self, data): 
+        message = {
+            'event':'ControlUpdate',
+            'data': {
+                self.key:data
+            }
+        }
+        print(message["data"])
+        self.r.publish('controls', json.dumps(message))

controls/arduino/potentiometer_control.py

@@ -10,29 +10,29 @@
 
 class PotentiometerControl(Control):
 
-	def __init__(self, pin, name=None, key=None, connection=default_connection, analog_pin_mode=True, topic=None, reading_buffer=3, redis_conn=None):
-		super().__init__(pin, name=name, key=key, connection=connection, analog_pin_mode=analog_pin_mode, redis_conn=redis_conn)
-		self.previous_state = 0
-		# Reading buffer helps prevent multiple events when values are floating between small amounts
-		self.reading_buffer = reading_buffer
-		return
-
-	def init_control(self):
-		super().init_control()
-		# Set initial state to prevent event on boot
-		self.previous_state = super().read()
-
-	def read(self):
-		state = super().read()
-
-		if (state < self.previous_state - self.reading_buffer) or (state > self.previous_state + self.reading_buffer):
-			# Value changed
-			# print('{0}: {1}'.format(self.name, state))
-			super().emitEvent(state)
-
-		self.previous_state = state
-		return state
-
-	def readRaw(self):
-		return super().read()
+    def __init__(self, pin, name=None, key=None, connection=default_connection, analog_pin_mode=True, topic=None, reading_buffer=3, redis_conn=None):
+        super().__init__(pin, name=name, key=key, connection=connection, analog_pin_mode=analog_pin_mode, redis_conn=redis_conn)
+        self.previous_state = 0
+        # Reading buffer helps prevent multiple events when values are floating between small amounts
+        self.reading_buffer = reading_buffer
+        return
+
+    def init_control(self):
+        super().init_control()
+        # Set initial state to prevent event on boot
+        self.previous_state = super().read()
+
+    def read(self):
+        state = super().read()
+
+        if (state < self.previous_state - self.reading_buffer) or (state > self.previous_state + self.reading_buffer):
+            # Value changed
+            # print('{0}: {1}'.format(self.name, state))
+            super().emitEvent(state)
+
+        self.previous_state = state
+        return state
+
+    def read_raw(self):
+        return super().read()