srd: I2C: change format to have ACK/NACK bits as separate events

[libsigrokdecode.git] / decoders / ebr30a_i2c_demux / ebr30a_i2c_demux.py

diff --git a/decoders/ebr30a_i2c_demux/ebr30a_i2c_demux.py b/decoders/ebr30a_i2c_demux/ebr30a_i2c_demux.py
index 1c704e3f2a5d70f94b73214dfeb0cb6e5bfa86d9..4c4a8e42cfbc671fb83c924d2f3a4158ae428951 100644 (file)
--- a/decoders/ebr30a_i2c_demux/ebr30a_i2c_demux.py
+++ b/decoders/ebr30a_i2c_demux/ebr30a_i2c_demux.py
@@ -18,19 +18,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-#
 # TrekStor EBR30-a I2C demux protocol decoder
-#
-# Takes an I2C stream as input and outputs 3 different I2C streams, for the
-# 3 different I2C devices on the TrekStor EBR30-a eBook reader (which are all
-# physically connected to the same SCL/SDA lines).
-#
-# I2C slave addresses:
-#
-#  - AXP199 battery management chip: 0x69/0x68 (8bit R/W), 0x34 (7bit)
-#  - H8563S RTC chip: 0xa3/0xa2 (8bit R/W), 0x51 (7bit)
-#  - Unknown accelerometer chip: 0x2b/0x2a (8bit R/W), 0x15 (7bit)
-#
 
 import sigrokdecode as srd
 
@@ -48,8 +36,9 @@ class Decoder(srd.Decoder):
     longdesc = 'TODO.'
     license = 'gplv2+'
     inputs = ['i2c']
-    outputs = ['i2c-axp199', 'i2c-h8563s', 'i2c-accel']
+    outputs = ['i2c-axp199', 'i2c-h8563s', 'i2c-accel'] # TODO: type vs. inst.
     probes = []
+    optional_probes = []
     options = {}
     annotations = []
 
@@ -75,10 +64,10 @@ class Decoder(srd.Decoder):
     # get the whole chunk of packets (from START to STOP).
     def decode(self, ss, es, data):
 
-        cmd, databyte, ack_bit = data
+        cmd, databyte = data
 
         # Add the I2C packet to our local cache.
-        self.packets += [[ss, es, data]]
+        self.packets.append([ss, es, data])
 
         if cmd in ('ADDRESS READ', 'ADDRESS WRITE'):
             # print(hex(databyte))
@@ -102,4 +91,6 @@ class Decoder(srd.Decoder):
                 print('Error: Could not determine correct stream!') # FIXME
             self.packets = []
             self.stream = -1
+        else:
+            pass # Do nothing, only add the I2C packet to our cache.