Merge pull request #3 from yeyeto2788/master

Latest change pulled.

Author: SecT0uch

action.py

@@ -4,7 +4,7 @@
 
 import redis
 
-sys.path.append('..')
+
 
 
 class Action():

config_load.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"

constants.py

@@ -3,7 +3,7 @@
 import redis
 from nanpy import (ArduinoApi, SerialManager)
 import sys
-sys.path.append('..')
+
 
 default_connection = SerialManager()
 

controls/arduino/control.py

@@ -7,7 +7,7 @@
 from adafruit_debouncer import Debouncer
 
 
-sys.path.append('..')
+
 
 
 # Base sensor class to extend all other arduino sensors from.

controls/linux/control.py

@@ -7,43 +7,45 @@
 using redis.
 """
 
-import RPi.GPIO as GPIO
-import threading
 import datetime
+import json
 import socket
-import redis
+# import RPi.GPIO as GPIO
+import threading
 import time
-import json
-import sys
 
-# TODO: This might not be needed and could be deleted
-sys.path.append('..')
+import redis
+
+import constants
 from action import Action
-from config_load import load_config_json
 from server.mudpi_server import MudpiServer
-from workers.linux.lcd_worker import LcdWorker
+from utils import load_config_json
+from workers.linux.camera_worker import CameraWorker
+from workers.linux.control_worker import PiControlWorker
 from workers.linux.i2c_worker import PiI2CWorker
+from workers.linux.lcd_worker import LcdWorker
 from workers.linux.relay_worker import RelayWorker
-from workers.linux.camera_worker import CameraWorker
 from workers.linux.sensor_worker import PiSensorWorker
-from workers.linux.control_worker import PiControlWorker
-from workers.trigger_worker import TriggerWorker
 from workers.sequence_worker import SequenceWorker
+from workers.trigger_worker import TriggerWorker
+
 try:
     from workers.arduino.arduino_worker import ArduinoWorker
+
     NANPY_ENABLED = True
 except ImportError:
     NANPY_ENABLED = False
+
 try:
     from workers.adc_worker import ADCMCP3008Worker
+
     MCP_ENABLED = True
-except ImportError:
+except (ImportError, AttributeError):
     MCP_ENABLED = False
 
 from logger.Logger import Logger, LOG_LEVEL
-import variables
 
-CONFIGS = {}
+
 PROGRAM_RUNNING = True
 threads = []
 actions = {}
@@ -58,7 +60,16 @@
 
 print(chr(27) + "[2J")
 print('Loading MudPi Configs...\r', end="", flush=True)
-CONFIGS = load_config_json()
+
+try:
+    CONFIGS = load_config_json()
+except FileNotFoundError:
+    print(
+        f'{constants.RED_BACK}There is no configuration file present on the '
+        f'filesystem{constants.RESET}\n\r'
+    )
+    exit(1)
+
 # Singleton redis to prevent connection conflicts
 try:
     r = redis.Redis(host=CONFIGS['redis'].get('host', '127.0.0.1'),
@@ -112,10 +123,6 @@
 
 try:
     print('Initializing Garden Control \r', end="", flush=True)
-    GPIO.setwarnings(False)
-    GPIO.setmode(GPIO.BCM)
-    GPIO.cleanup()
-    # Pause for GPIO to finish
     time.sleep(0.1)
     Logger.log(
         LOG_LEVEL["info"],
@@ -278,10 +285,13 @@
             Logger.log(
                 LOG_LEVEL["info"],
                 '{0} Actions...\t\t\t\t\033[1;32m Initializing\033[0;0m'.format(
-                    len(CONFIGS['actions'])))
+                    len(CONFIGS['actions']))
+            )
     except KeyError:
-        Logger.log(LOG_LEVEL["info"],
-                   'Actions...\t\t\t\t\033[1;31m Disabled\033[0;0m')
+        Logger.log(
+            LOG_LEVEL["info"],
+            'Actions...\t\t\t\t\033[1;31m Disabled\033[0;0m'
+        )
 
     # Worker for Sequences
     try:

mudpi.py

@@ -6,9 +6,9 @@
 from nanpy import (ArduinoApi, SerialManager, DHT)
 import sys
 
-sys.path.append('..')
 
-import variables
+
+import constants
 
 default_connection = SerialManager(device='/dev/ttyUSB0')
 

sensors/arduino/humidity_sensor.py

@@ -6,9 +6,9 @@
 from nanpy import (ArduinoApi, SerialManager)
 import sys
 
-sys.path.append('..')
 
-import variables
+
+import constants
 
 default_connection = SerialManager(device='/dev/ttyUSB0')
 

sensors/arduino/light_sensor.py

@@ -6,9 +6,9 @@
 from nanpy import (ArduinoApi, SerialManager)
 import sys
 
-sys.path.append('..')
 
-import variables
+
+import constants
 
 default_connection = SerialManager(device='/dev/ttyUSB0')
 # r = redis.Redis(host='127.0.0.1', port=6379)

sensors/arduino/rain_sensor.py

@@ -6,9 +6,9 @@
 from nanpy import (ArduinoApi, SerialManager)
 import sys
 
-sys.path.append('..')
 
-import variables
+
+import constants
 
 default_connection = SerialManager(device='/dev/ttyUSB0')
 # r = redis.Redis(host='127.0.0.1', port=6379)

sensors/arduino/soil_sensor.py

@@ -8,9 +8,9 @@
 
 from logger.Logger import Logger, LOG_LEVEL
 
-sys.path.append('..')
 
-import variables
+
+import constants
 
 default_connection = SerialManager(device='/dev/ttyUSB0')
 

sensors/arduino/temperature_sensor.py

@@ -1,9 +1,7 @@
-import time
-import json
-import redis
-from .sensor import Sensor
-import digitalio
 import board
+import digitalio
+
+from .sensor import Sensor
 
 
 # PIN MODE : OUT | IN
@@ -16,12 +14,16 @@ def __init__(self, pin, name=None, key=None, redis_conn=None):
         return
 
     def init_sensor(self):
-        """Initialize the sensor here (i.e. set pin mode, get addresses, etc) this gets called by the worker"""
-        self.gpio_pin = digitalio.DigitalInOut(self.pin_obj)  # Default to input : https://github.com/adafruit/Adafruit_Blinka/blob/master/src/digitalio.py#L111
+        """Initialize the sensor here (i.e. set pin mode, get addresses, etc)
+        this gets called by the worker"""
+        # Default to input :
+        # https://github.com/adafruit/Adafruit_Blinka/blob/master/src/digitalio.py#L111
+        self.gpio_pin = digitalio.DigitalInOut(self.pin_obj)
         return
 
     def read(self):
-        """Read the sensor(s), parse the data and store it in redis if redis is configured"""
+        """Read the sensor(s), parse the data and store it in redis if redis
+        is configured"""
         value = self.gpio_pin.value
         return value
 

sensors/linux/float_sensor.py

@@ -6,7 +6,7 @@
 
 from sensors.linux.sensor import Sensor
 
-sys.path.append('..')
+
 
 from logger.Logger import Logger, LOG_LEVEL
 

sensors/linux/humidity_sensor.py

@@ -6,7 +6,7 @@
 from logger.Logger import Logger, LOG_LEVEL
 from sensors.linux.i2c.sensor import Sensor
 
-sys.path.append('..')
+
 
 
 class Bme680Sensor(Sensor):

sensors/linux/i2c/bme680_sensor.py

@@ -6,7 +6,7 @@
 from logger.Logger import Logger, LOG_LEVEL
 from sensors.linux.i2c.sensor import Sensor
 
-sys.path.append('..')
+
 
 
 class T9602Sensor(Sensor):

sensors/linux/i2c/t9602_sensor.py

@@ -28,7 +28,8 @@ def __init__(self, pin, name=None, key=None, redis_conn=None):
         else:
             Logger.log(
                 LOG_LEVEL["error"],
-                "Cannot detect pin type (Digital or analog), should be Dxx or Axx for digital or analog. "
+                "Cannot detect pin type (Digital or analog), "
+                "should be Dxx or Axx for digital or analog. "
                 "Please refer to "
                 "https://github.com/adafruit/Adafruit_Blinka/tree/master/src/adafruit_blinka/board"
             )

sensors/linux/sensor.py

@@ -5,7 +5,7 @@
 from logger.Logger import Logger, LOG_LEVEL
 from sensors.mcp3xxx.sensor import Sensor
 
-sys.path.append('..')
+
 
 #  Tested using Sun3Drucker Model SX239
 # Wet Water = 287
@@ -27,8 +27,10 @@ def init_sensor(self):
 
     def read(self):
         resistance = self.read_pin()
-        moistpercent = ((resistance - WaterBounds) / (
-                    AirBounds - WaterBounds)) * 100
+        moistpercent = (
+                               (resistance - WaterBounds) / (
+                               AirBounds - WaterBounds)
+                       ) * 100
         if moistpercent > 80:
             moisture = 'Very Dry - ' + str(int(moistpercent))
         elif 80 >= moistpercent > 45:

sensors/mcp3xxx/soil_sensor.py

@@ -4,7 +4,7 @@
 import sys
 from .trigger import Trigger
 
-sys.path.append('..')
+
 
 from logger.Logger import Logger, LOG_LEVEL
 

triggers/control_trigger.py

@@ -4,7 +4,7 @@
 import sys
 from .trigger import Trigger
 
-sys.path.append('..')
+
 
 from logger.Logger import Logger, LOG_LEVEL
 

triggers/sensor_trigger.py

@@ -10,7 +10,7 @@
     CRON_ENABLED = True
 except ImportError:
     CRON_ENABLED = False
-sys.path.append('..')
+
 
 from logger.Logger import Logger, LOG_LEVEL
 

triggers/time_trigger.py

@@ -4,7 +4,7 @@
 import threading
 import sys
 
-sys.path.append('..')
+
 
 from logger.Logger import Logger, LOG_LEVEL
 

triggers/trigger.py

@@ -4,7 +4,7 @@
 import threading
 import sys
 
-sys.path.append('..')
+
 
 from logger.Logger import Logger, LOG_LEVEL
 

triggers/trigger_group.py

@@ -0,0 +1,35 @@
+import json
+
+
+def load_config_json():
+    """
+
+    Returns:
+        Dictionary from json file.
+    """
+
+    with open('mudpi.config') as loadedfile:
+        configs = json.load(loadedfile)
+        loadedfile.close()
+        return configs
+
+
+def get_config_item(config, item, default=None, replace_char='_'):
+    """
+
+    Args:
+        config:
+        item:
+        default:
+        replace_char:
+
+    Returns:
+        Configuration item
+    """
+
+    value = config.get(item, default)
+
+    if type(value) == str:
+        value = value.replace(" ", replace_char).lower()
+
+    return value