Update to 2.1.0 and add support for PI-SPI-8AI-16B

Author: optlink

Makefile

@@ -9,4 +9,4 @@ install:
 
 clean:
 	rm -rf bin
-	rm -f overlays/*.dtbo
+	rm -f overlays/*.dtbo

debian/changelog

@@ -1,3 +1,9 @@
+libwidgetlords (2.1.0) unstable; urgency=medium
+
+  * Add support for PI-SPI-8AI-16B
+
+ --  Kelsey Maes <kelsey@vpprocess.com>  Mon, 18 Nov 2019 02:00:00 -0800
+
 libwidgetlords (2.0.0) unstable; urgency=medium
 
   * Drop dependency on wiringpi in favor of using the character-device GPIO API.

include/pi_spi.h

@@ -35,4 +35,7 @@ void pi_spi_8di_init(uint8_t address, uint8_t type);
 void pi_spi_8ko_write(uint8_t data, uint8_t type);
 void pi_spi_8ko_write_single(uint8_t channel, uint8_t data, uint8_t type);
 
+void pi_spi_8ai_16b_set_channel(uint8_t channel, uint8_t type);
+uint16_t pi_spi_8ai_16b_read(uint8_t type);
+
 #endif

meson.build

@@ -14,6 +14,7 @@ source = [
   'src/pi_spi.c',
   'src/pi_spi_2ao.c',
   'src/pi_spi_8ai.c',
+  'src/pi_spi_8ai_16b.c',
   'src/pi_spi_8di.c',
   'src/pi_spi_8ko.c',
   'src/pi_spi_din.c',
@@ -69,6 +70,7 @@ endif
 
 executable('pi_spi_8ko_demo', 'src/demos/pi_spi_8ko_demo.c', dependencies: [dep])
 executable('pi_spi_8ai_demo', 'src/demos/pi_spi_8ai_demo.c', dependencies: [dep])
+executable('pi_spi_8ai_16b_demo', 'src/demos/pi_spi_8ai_16b_demo.c', dependencies: [dep])
 executable('pi_spi_8di_demo', 'src/demos/pi_spi_8di_demo.c', dependencies: [dep])
 executable('pi_spi_2ao_demo', 'src/demos/pi_spi_2ao_demo.c', dependencies: [dep])
 

python/demos/pi_spi_8ai_16b_demo.py

@@ -0,0 +1,9 @@
+from time import sleep
+from widgetlords.pi_spi import *
+
+inputs = Mod8AI16B()
+while True:
+    for i in range(8):
+        inputs.set_channel(i)
+        print(inputs.read())
+        sleep(0.5)

python/widgetlords/pi_spi.py

@@ -44,4 +44,15 @@ def __init__(self, optional: bool = False):
 
     def write_single(self, channel: int, counts: int):
         widgetlords.pi_spi_2ao_write_single(channel, counts, int(self.optional))
-__all__.append('Mod2AO')
+__all__.append('Mod2AO')
+
+class Mod8AI16B:
+    def __init__(self, spare: int = 0):
+        self.spare = int(spare) % 4
+
+    def set_channel(self, channel: int):
+        widgetlords.pi_spi_8ai_16b_set_channel(channel)
+
+    def read(self):
+        return widgetlords.pi_spi_8ai_16b_read(self.spare)
+__all__.append('Mod8AI16B')

src/demos/pi_spi_4freq_demo.c

@@ -0,0 +1,24 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <widgetlords.h>
+
+int main(void) 
+{	
+	while(1)
+	{
+		printf("Channel\tFixed\tVariable\tPulse\n");
+		for(uint8_t i = 0; i < 4; ++i)
+		{
+			uint32_t fixed = pi_spi_4freq_read_fixed(CE0, 0, i);
+			uint32_t variable = pi_spi_4freq_read_variable(CE0, 0, i);
+			uint32_t pulse = pi_spi_4freq_read_pulse(CE0, 0, i);
+			// printf("CH%i: ")
+			printf("%i\t%i\t%i\t%i\n", i, fixed, variable, pulse);
+		}
+		uint8_t di = pi_spi_4freq_read_di(CE0, 0);
+		printf("%i\n\n", di);
+		usleep(500000);
+	}
+
+	return 0;
+}

src/demos/pi_spi_8ai_16b_demo.c

@@ -0,0 +1,19 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <widgetlords.h>
+
+int main(void)
+{
+	while(1)
+	{
+		printf("\nCH 1\tCH 2\tCH 3\tCH 4\tCH 5\tCH 6\tCH 7\tCH 8\n");
+		for(int i = 0; i < 8; ++i)
+		{
+			pi_spi_8ai_16b_set_channel(i, DEFAULT);
+			printf("%i\t", pi_spi_8ai_16b_read(DEFAULT));
+		}
+		usleep(500000);
+	}
+
+	return 0;
+}

src/pi_spi_8ai_16b.c

@@ -0,0 +1,65 @@
+#include <pi_spi.h>
+#include <spi.h>
+
+#define MAX_SPI_FREQ	100000
+
+uint8_t _channels[4] = { 0, 0, 0, 0 };
+
+int8_t _open(uint8_t type)
+{
+	if(type == DEFAULT)
+	{
+		spi_open(SPI_8AI, MAX_SPI_FREQ);
+	}
+	else if(type == SPARE1)
+	{
+		spi_open(SPI_SPARE1, MAX_SPI_FREQ);
+	}
+	else if(type == SPARE2)
+	{
+		spi_open(SPI_SPARE2, MAX_SPI_FREQ);
+	}
+	else if(type == SPARE3)
+	{
+		spi_open(SPI_SPARE3, MAX_SPI_FREQ);
+	}
+	else
+	{
+		return -1;
+	}
+
+	return 0;
+}
+
+// read data from previously opened SPI device
+uint16_t _read(uint8_t channel)
+{
+	uint8_t data[2] = { channel, channel };
+
+	spi_transfer(data, 2);
+
+	return ((uint16_t)data[0] << 8) | data[1];
+}
+
+void pi_spi_8ai_16b_set_channel(uint8_t channel, uint8_t type)
+{
+	channel = channel > 7 ? 7 : channel;
+
+	uint8_t ret = _open(type);
+	if(ret < 0) { return; }
+
+	_channels[type] = channel;
+
+	// read once to write channel to mux
+	_read(channel);
+	// read twice to ensure ADC has updated reading
+	_read(channel);
+}
+
+uint16_t pi_spi_8ai_16b_read(uint8_t type)
+{
+	uint8_t ret = _open(type);
+	if(ret < 0) { return 0; }
+
+	return _read(_channels[type]);
+}