Merge pull request #7 from mudpi/feature

Get upstream code

mudpi/constants.py

@@ -63,6 +63,7 @@
 CLASSIFIER_FLOWMETER = "flowmeter"
 CLASSIFIER_HUMIDITY = "humidity"
 CLASSIFIER_ILLUMINANCE = "illuminance"
+CLASSIFIER_LIQUID_LEVEL = "liquid_level"
 CLASSIFIER_SIGNAL_STRENGTH = "signal_strength"
 CLASSIFIER_TEMPERATURE = "temperature"
 CLASSIFIER_TIMESTAMP = "timestamp"

mudpi/extensions/camera/__init__.py

@@ -176,7 +176,7 @@ def increment_count(self):
         """ Update the image counter """
         self.image_count +=1
         if self.image_count > self.max_count:
-            self.image_count = 0 # overflow
+            self.image_count = self.count_start # overflow
 
 
     """ Actions """

mudpi/extensions/dht/extension.json

@@ -5,5 +5,5 @@
 		"description": "Provides interface for DHT sensors to take climate readings.",
 		"documentation": "https://mudpi.app/docs/pi-sensors-humidity"
 	},
-	"requirements": ["adafruit-blinka", "adafruit-circuitpython-dht"]
+	"requirements": ["adafruit-circuitpython-dht==3.5.5", "adafruit-blinka"]
 }

mudpi/extensions/dht/sensor.py

@@ -22,24 +22,28 @@ def load(self, config):
 
     def validate(self, config):
         """ Validate the dht config """
-        if not config.get('pin'):
-            raise ConfigError('Missing `pin` in DHT config.')
-
-        if not re.match(r'D\d+$', config['pin']) and not re.match(r'A\d+$', config['pin']):
-            raise ConfigError(
-                "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"
-            )
-
-        valid_models = ['11', '22', '2302']
-        if config.get('model') not in valid_models:
-            config['model'] = '11'
-            Logger.log(
-                LOG_LEVEL["warning"],
-                'Sensor Model Error: Defaulting to DHT11'
-            )
+        if not isinstance(config, list):
+            config = [config]
+
+        for conf in config:
+            if not conf.get('pin'):
+                raise ConfigError('Missing `pin` in DHT config.')
+
+            if not re.match(r'D\d+$', conf['pin']) and not re.match(r'A\d+$', conf['pin']):
+                raise ConfigError(
+                    "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"
+                )
+
+            valid_models = ['11', '22', '2302']
+            if conf.get('model') not in valid_models:
+                conf['model'] = '11'
+                Logger.log(
+                    LOG_LEVEL["warning"],
+                    'Sensor Model Error: Defaulting to DHT11'
+                )
 
         return config
 

mudpi/extensions/gpio/sensor.py

@@ -59,7 +59,7 @@ def state(self):
     @property
     def classifier(self):
         """ Classification further describing it, effects the data formatting """
-        return 'general'
+        return self.config.get('classifier', 'general')
 
 
     """ Methods """

mudpi/extensions/nanpy/char_display.py

@@ -116,7 +116,8 @@ def update(self):
         """ Control LCD display nanpy"""
         if self.node.connected:
             try:
-               super().update()
+                self.check_connection()
+                super().update()
             except (SerialManagerError, SocketManagerError,
                     BrokenPipeError, ConnectionResetError, OSError,
                     socket.timeout) as e:

mudpi/extensions/nanpy/control.py

@@ -44,7 +44,9 @@ def validate(self, config):
 
             if conf.get('pin') is None:
                 raise ConfigError(f'Missing `pin` in Nanpy control {conf["key"]} config. You need to add a pin.')
-
+            else:
+                conf['pin'] = int(conf['pin'])
+
             if not conf.get('type'):
                 # Default to the button type
                 conf['type'] = 'button'

mudpi/extensions/nanpy/sensor.py

@@ -115,7 +115,7 @@ def analog(self):
     @property
     def pin(self):
         """ Return if gpio is digital or analog """
-        return self.config.get('pin')
+        return int(self.config.get('pin'))
 
     """ Methods """
     def init(self):

mudpi/extensions/nanpy/toggle.py

@@ -55,7 +55,7 @@ class NanpyGPIOToggle(Toggle):
     @property
     def pin(self):
         """ The GPIO pin """
-        return self.config.get('pin')
+        return int(self.config.get('pin'))
 
 
     """ Methods """

mudpi/extensions/rtsp/camera.py

@@ -90,7 +90,6 @@ def update(self):
                     self.capture_recording(duration=self.record_duration)
                 else:
                     self.capture_image()
-                print(f'Camera {self.id} time:{self.duration}')
                 self.reset_duration()
 
     def open_stream(self):

mudpi/extensions/sensor/__init__.py

@@ -40,6 +40,11 @@ def name(self):
         """ Friendly name of control """
         return self.config.get('name') or f"{self.id.replace('_', ' ').title()}"
 
+    @property
+    def state(self):
+        """ Return state for the sensor """
+        return self._state
+
 
     """ Actions """
     def force_update(self, data=None):

mudpi/extensions/sequence/__init__.py

@@ -150,7 +150,7 @@ def duration(self):
     def topic(self):
         """ Return the topic to listen on """
         return self.config.get('topic', '').replace(" ", "/").lower() if self.config.get(
-            'topic') is not None else f'mudpi/sequences/{self.id}'
+            'topic') is not None else f'{NAMESPACE}/{self.id}'
 
 
     """ Methods """

mudpi/importer.py

@@ -747,6 +747,10 @@ def _install_extension_requirements(mudpi, extension):
                 f'{FONT_YELLOW}{extension.namespace.title()}{FONT_RESET} requirements', 
                 'Installing', 'notice'
             )
+            Logger.log(
+                LOG_LEVEL["debug"],
+                f'Installing package {FONT_YELLOW}{requirement}{FONT_RESET}',
+            )
             if not utils.install_package(requirement):
                 Logger.log(
                     LOG_LEVEL["error"],

mudpi/registry.py

@@ -120,7 +120,7 @@ def parse_call(self, action_call):
             parsed_action['action'] = action_call
         return parsed_action
 
-    def call(self, action_call, namespace=None, action_data={}):
+    def call(self, action_call, action_data={}):
         """ Call an action from the registry 
             Format: {namespace}.{action} or 
                     {namespace}.{component}.{action}
@@ -132,7 +132,7 @@ def call(self, action_call, namespace=None, action_data={}):
         validated_data = action.validate(action_data)
         if not validated_data and action_data:
             raise MudPiError("Action data was not valid!")
-        self.mudpi.events.publish('core', {'event': 'ActionCall', 'action': action_call, 'data': action_data, 'namespace': namespace or command['namespace']})
+        self.mudpi.events.publish('core', {'event': 'ActionCall', 'action': action_call, 'data': action_data, 'namespace': command['namespace']})
         action(data=validated_data)
 
 

requirements.txt

@@ -1,4 +1,3 @@
 redis
 paho-mqtt
 pyyaml
-adafruit-circuitpython-mcp3xxx