pca9571/tca6408a: Rework logic output

[libsigrokdecode.git] / decoders / pca9571 / pd.py

diff --git a/decoders/pca9571/pd.py b/decoders/pca9571/pd.py
index df309e917d624c9458c93415693635f4b844386d..af0ad2d1763f253d4627a10616549a50bd1e149d 100644 (file)
--- a/decoders/pca9571/pd.py
+++ b/decoders/pca9571/pd.py
@@ -23,6 +23,12 @@ NUM_OUTPUT_CHANNELS = 8
 
 # TODO: Other I²C functions: general call / reset address, device ID address.
 
+def logic_channels(num_channels):
+    l = []
+    for i in range(num_channels):
+        l.append(tuple(['p%d' % i, 'P%d' % i]))
+    return tuple(l)
+
 class Decoder(srd.Decoder):
     api_version = 3
     id = 'pca9571'
@@ -36,8 +42,9 @@ class Decoder(srd.Decoder):
     annotations = (
         ('register', 'Register type'),
         ('value', 'Register value'),
-        ('warning', 'Warning messages'),
+        ('warning', 'Warning'),
     )
+    logic_output_channels = logic_channels(NUM_OUTPUT_CHANNELS)
     annotation_rows = (
         ('regs', 'Registers', (0, 1)),
         ('warnings', 'Warnings', (2,)),
@@ -50,12 +57,24 @@ class Decoder(srd.Decoder):
         self.state = 'IDLE'
         self.last_write = 0xFF # Chip port default state is high.
 
+        self.logic_es = 1
+        self.logic_data = []
+        for i in range(NUM_OUTPUT_CHANNELS):
+            self.logic_data.append(bytes([1]))
+
     def start(self):
         self.out_ann = self.register(srd.OUTPUT_ANN)
+        self.out_logic = self.register(srd.OUTPUT_LOGIC)
 
     def putx(self, data):
         self.put(self.ss, self.es, self.out_ann, data)
 
+    def put_logic_states(self):
+        if (self.es > self.logic_es):
+            for i in range(NUM_OUTPUT_CHANNELS):
+                self.put(self.logic_es, self.es, self.out_logic, [i, self.logic_data[i]])
+            self.logic_es = self.es
+
     def handle_io(self, b):
         if self.state == 'READ DATA':
             operation = ['Outputs read', 'R']
@@ -68,6 +87,10 @@ class Decoder(srd.Decoder):
         self.putx([1, [operation[0] + ': %02X' % b,
                        operation[1] + ': %02X' % b]])
 
+        for i in range(NUM_OUTPUT_CHANNELS):
+            bit = (b & (1 << i)) != 0
+            self.logic_data[i] = bytes([bit])
+
     def check_correct_chip(self, addr):
         if addr != 0x25:
             self.putx([2, ['Warning: I²C slave 0x%02X not a PCA9571 '
@@ -79,6 +102,8 @@ class Decoder(srd.Decoder):
         cmd, databyte = data
         self.ss, self.es = ss, es
 
+        self.put_logic_states()
+
         # State machine.
         if cmd in ('ACK', 'BITS'): # Discard 'ACK' and 'BITS'.
             pass