Merge branch 'master' of gitlab.com:vpprocess/libwidgetlords

optlink · optlink · commit 91be1259ee88 · 2018-03-26T10:36:12.000-07:00
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+libwidgetlords (1.0.1) unstable; urgency=medium
+
+  * Update to 1.0.1
+
+ --  Kelsey Maes <kelsey@vpprocess.com>  Mon, 26 Mar 2018 09:11:53 -0700
+
 libwidgetlords (1.0) unstable; urgency=medium
 
   * Initial Release.
diff --git a/debian/control b/debian/control
@@ -4,9 +4,7 @@ Priority: optional
 Maintainer: Kelsey Maes <kelsey@vpprocess.com>
 Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.8
-Homepage: <insert the upstream URL, if relevant>
-#Vcs-Git: https://anonscm.debian.org/collab-maint/libwidgetlords.git
-#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/libwidgetlords.git
+Homepage: https://widgetlords.com
 
 Package: libwidgetlords
 Architecture: armhf
diff --git a/meson.build b/meson.build
@@ -34,7 +34,7 @@ lib = library('widgetlords',
               dependencies: [m_dep, wiringpi],
               install: true,
               include_directories: include,
-              version: '1.0.0')
+              version: '1.0.1')
 
 install_headers('include/pi_spi.h', 'include/pi_spi_din.h', 'include/widgetlords.h', subdir: 'widgetlords')
 
@@ -43,7 +43,7 @@ install_data('libwidgetlords.vapi', install_dir: 'share/vala/vapi')
 dep = declare_dependency(include_directories: include, link_with: lib)
 
 pkg.generate(libraries: [lib], 
-             version: '1.0.0', 
+             version: '1.0.1', 
              name: 'libwidgetlords',
              description: 'libwidgetlords',
              subdirs: ['widgetlords'])
@@ -61,7 +61,10 @@ if get_option('python')
   python_dir = r.stdout().strip()
   message(python_dir)
 
-  install_data('python/pi_spi.py', 'python/pi_spi_din.py', install_dir: python_dir)
+  install_data('python/widgetlords/__init__.py',
+               'python/widgetlords/pi_spi.py', 
+               'python/widgetlords/pi_spi_din.py', 
+               install_dir: join_paths(python_dir, 'widgetlords'))
 endif
 
 executable('pi_spi_8ko_demo', 'src/pi_spi_8ko_demo.c', dependencies: [dep])
diff --git a/python/pi_spi.py b/python/pi_spi.py
diff --git a/python/pi_spi_2ao_demo.py b/python/pi_spi_2ao_demo.py
@@ -1,6 +1,7 @@
-from pi_spi import *
+from time import sleep
+from widgetlords.pi_spi import *
 
-pi_spi_init()
+init()
 
 outputs = Mod2AO()
 while True:
diff --git a/python/pi_spi_8ai_demo.py b/python/pi_spi_8ai_demo.py
@@ -1,6 +1,7 @@
-from pi_spi import *
+from time import sleep
+from widgetlords.pi_spi import *
 
-pi_spi_init()
+init()
 
 inputs = Mod8AI()
 while True:
diff --git a/python/pi_spi_8di_demo.py b/python/pi_spi_8di_demo.py
@@ -1,6 +1,7 @@
-from pi_spi import *
+from time import sleep
+from widgetlords.pi_spi import *
 
-pi_spi_init()
+init()
 
 inputs = Mod8DI()
 while True:
diff --git a/python/pi_spi_8ko_demo.py b/python/pi_spi_8ko_demo.py
@@ -1,6 +1,7 @@
-from pi_spi import *
+from time import sleep
+from widgetlords.pi_spi import *
 
-pi_spi_init()
+init()
 
 relays = Mod8KO()
 while True:
diff --git a/python/pi_spi_din_4ao_demo.py b/python/pi_spi_din_4ao_demo.py
@@ -1,6 +1,7 @@
-from pi_spi_din import *
+from time import sleep
+from widgetlords.pi_spi_din import *
 
-pi_spi_din_init()
+init()
 
 outputs = Mod4AO()
 while True:
diff --git a/python/pi_spi_din_4ko_demo.py b/python/pi_spi_din_4ko_demo.py
@@ -1,6 +1,7 @@
-from pi_spi_din import *
+from time import sleep
+from widgetlords.pi_spi_din import *
 
-pi_spi_din_init()
+init()
 
 relays = Mod4KO(ChipEnable.CE3)
 while True:
diff --git a/python/pi_spi_din_8ai_demo.py b/python/pi_spi_din_8ai_demo.py
@@ -1,6 +1,7 @@
-from pi_spi_din import *
+from time import sleep
+from widgetlords.pi_spi_din import *
 
-pi_spi_din_init()
+init()
 
 inputs = Mod8AI(ChipEnable.CE1)
 while True:
diff --git a/python/pi_spi_din_8di_demo.py b/python/pi_spi_din_8di_demo.py
@@ -1,6 +1,7 @@
-from pi_spi_din import *
+from time import sleep
+from widgetlords.pi_spi_din import *
 
-pi_spi_din_init()
+init()
 
 inputs = Mod8DI(ChipEnable.CE2)
 while True:
diff --git a/python/vpe_2901a_demo.py b/python/vpe_2901a_demo.py
@@ -1,8 +1,9 @@
 #!/bin/python
 
-from pi_spi_din import *
+from time import sleep
+from widgetlords.pi_spi_din import *
 
-pi_spi_din_init()
+init()
 
 vpe = VPE2901A()
 while True:
diff --git a/python/vpe_3011b_demo.py b/python/vpe_3011b_demo.py
@@ -1,8 +1,9 @@
 #!/bin/python
 
-from pi_spi_din import *
+from time import sleep
+from widgetlords.pi_spi_din import *
 
-pi_spi_din_init()
+init()
 
 vpe = VPE3011B()
 while True:
diff --git a/python/widgetlords/__init__.py b/python/widgetlords/__init__.py
@@ -0,0 +1,13 @@
+from ctypes import *
+
+__all__ = []
+
+widgetlords = cdll.LoadLibrary('libwidgetlords.so')
+
+def steinhart_hart(r_room: float, r_beta: float, counts_range: int, counts: int):
+    return widgetlords.widgetlords_steinhart_hart(r_room, r_beta, counts_range, counts)
+__all__.append('steinhart_hart')
+
+def counts_to_value(counts: int, zero_counts: int, range_counts: int, zero: float, range: float):
+    return widgetlords.widgetlords_counts_to_value(counts, zero_counts, range_counts, zero, range)
+__all__.append('counts_to_value')
diff --git a/python/widgetlords/pi_spi.py b/python/widgetlords/pi_spi.py
@@ -0,0 +1,47 @@
+from . import widgetlords
+
+__all__ = []
+
+def init():
+    widgetlords.pi_spi_init()
+__all__.append('init')
+
+class Mod8KO:
+    def __init__(self, optional: bool = False):
+        self.optional = optional
+
+    def write(self, data):
+        widgetlords.pi_spi_8ko_write(data, int(self.optional))
+
+    def write_single(self, channel: int, data: int):
+        widgetlords.pi_spi_8ko_write_single(channel, data, int(self.optional))
+__all__.append('Mod8KO')
+
+class Mod8DI:
+    def __init__(self, address: int = 0, optional: bool = False):
+        self.address = address
+        self.optional = optional
+        widgetlords.pi_spi_8di_init(self.address, int(self.optional))
+
+    def read(self):
+        return widgetlords.pi_spi_8di_read(self.address, int(self.optional))
+
+    def read_single(self, channel: int):
+        return widgetlords.pi_spi_8di_read_single(self.address, channel, int(self.optional))
+__all__.append('Mod8DI')
+
+class Mod8AI:
+    def __init__(self, optional: bool = False):
+        self.optional = optional
+
+    def read_single(self, channel: int):
+        return widgetlords.pi_spi_8ai_read_single(channel, int(self.optional))
+__all__.append('Mod8AI')
+
+class Mod2AO:
+    def __init__(self, optional: bool = False):
+        self.optional = optional
+
+    def write_single(self, channel: int, counts: int):
+        widgetlords.pi_spi_2ao_write_single(channel, counts, int(self.optional))
+__all__.append('Mod2AO')
diff --git a/python/widgetlords/pi_spi_din.py b/python/widgetlords/pi_spi_din.py
diff --git a/src/pi_spi_8di.c b/src/pi_spi_8di.c
diff --git a/src/pi_spi_din_8di.c b/src/pi_spi_din_8di.c
