Merge pull request #14 from foglamp/1.5.2RC

1.5.2RC

README.rst

@@ -0,0 +1,15 @@
+===================
+foglamp-south-pt100
+===================
+
+FogLAMP South Plugin for Raspberry PI PT100
+
+Installation
+------------
+
+The plugin can be installed with given `requirements.sh <requirements.sh>`_ or the following steps:
+
+
+.. code-block:: bash
+
+   $ sudo apt install -y python3-rpi.gpio

VERSION.south.pt100

@@ -1,2 +1,2 @@
-foglamp_south_pt100_version=1.5.0
+foglamp_south_pt100_version=1.5.2
 foglamp_version>=1.5

packages/Debian/armhf/DEBIAN/control

@@ -3,7 +3,7 @@ Version: 0.0
 Section: devel
 Priority: optional
 Architecture: armhf
-Depends: foglamp
+Depends: foglamp,python3-rpi.gpio
 Conflicts:
 Maintainer: Dianomic Systems, Inc. <info@dianomic.com>
 Homepage: http://www.dianomic.com

python/foglamp/plugins/south/pt100/pt100.py

@@ -7,7 +7,6 @@
 """ Module for PT100 'poll' type plugin """
 
 import copy
-import datetime
 import json
 import uuid
 import logging
@@ -16,7 +15,6 @@
 from foglamp.plugins.south.pt100.max31865 import *
 from foglamp.common import logger
 from foglamp.plugins.common import utils
-from foglamp.services.south import exceptions
 
 
 __author__ = "Ashwin Gopalakrishnan"
@@ -100,7 +98,7 @@ def plugin_poll(handle):
         returns a sensor reading in a JSON document, as a Python dict, if it is available
         None - If no reading is available
     Raises:
-        DataRetrievalError
+        Exception
     """
     probes = handle['probes']
     data = list()
@@ -118,10 +116,10 @@ def plugin_poll(handle):
             })
     except (Exception, RuntimeError) as ex:
         _LOGGER.exception("PT100 exception: {}".format(str(ex)))
-        raise exceptions.DataRetrievalError(ex)
-
-    _LOGGER.debug("PT100 reading: {}".format(json.dumps(data)))
-    return data
+        raise ex
+    else:
+        _LOGGER.debug("PT100 reading: {}".format(json.dumps(data)))
+        return data
 
 
 def plugin_reconfigure(handle, new_config):

requirements.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+##--------------------------------------------------------------------
+## Copyright (c) 2019 Dianomic Systems
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+##     http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##--------------------------------------------------------------------
+
+##
+## Author: Ashish Jabble
+##
+
+set -e
+
+sudo apt install -y python3-rpi.gpio