Merge pull request #19 from cuplsensor/dev

Dev

Author: malcolmmackay

conf.py

@@ -28,7 +28,7 @@
 # -- Project information -----------------------------------------------------
 
 project = 'codec'
-copyright = '2019, Malcolm Mackay'
+copyright = '2019, Plotsensor Ltd.'
 author = 'Malcolm Mackay'
 
 # The short X.Y version
@@ -63,7 +63,7 @@
 breathe_default_project = "encoderproject" # BREATHE
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_doc_templates']
+templates_path = ['docs/_doc_templates']
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:

docs/_doc_templates/footer.html

@@ -0,0 +1,3 @@
+{% extends '!footer.html' %} {% block extrafooter %} {{super}}
+This documentation is licenced under the <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.
+{% endblock %}

setup.py

@@ -6,7 +6,7 @@
 
 setuptools.setup(
     name="cuplcodec",
-    version="2.0.2",
+    version="2.0.3",
     author="Malcolm Mackay",
     author_email="malcolm@plotsensor.com",
     description="Package for creating and decoding URLs that contain temperature and humidity samples.",

wscodec/encoder/pyencoder/instrumented.py

@@ -66,8 +66,6 @@ def printint(myint):
 
 
 
-
-
 class InstrumentedNDEF(InstrumentedBase):
     def __init__(self,
                  baseurl='plotsensor.com',
@@ -156,7 +154,9 @@ def __init__(self,
                  batteryadc=100,
                  resetcause=0,
                  usehmac=True,
-                 httpsdisable=False):
+                 httpsdisable=False,
+                 tagerror=False
+                 ):
         super(InstrumentedSampleT, self).__init__(baseurl,
                                                   serial,
                                                   secretkey,
@@ -166,7 +166,7 @@ def __init__(self,
                                                   resetsalltime=resetsalltime,
                                                   usehmac=usehmac,
                                                   httpsdisable=httpsdisable)
-        self.ffimodule.lib.enc_init(resetcause, False, 0)
+        self.ffimodule.lib.enc_init(resetcause, tagerror, 0)
 
     def pushsamples(self, num):
         inlist = list()
@@ -188,7 +188,8 @@ def __init__(self,
                  batteryadc=100,
                  resetcause=0,
                  usehmac=True,
-                 httpsdisable=False
+                 httpsdisable=False,
+                 tagerror=False
                  ):
         super(InstrumentedSampleTRH, self).__init__(baseurl,
                                                     serial,
@@ -199,7 +200,7 @@ def __init__(self,
                                                     resetsalltime=resetsalltime,
                                                     usehmac=usehmac,
                                                     httpsdisable=httpsdisable)
-        self.ffimodule.lib.enc_init(resetcause, False, 0)
+        self.ffimodule.lib.enc_init(resetcause, tagerror, 0)
 
     def pushsamples(self, num):
         inlist = list()