can: make PD temporary compatible to existing tests

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

diff --git a/decoders/can/pd.py b/decoders/can/pd.py
index 208774274f743be0b958b97c39cc289f0a7984a3..aa49c56beccdf5575bc0d4629904e2b71155b2e0 100644 (file)
--- a/decoders/can/pd.py
+++ b/decoders/can/pd.py
@@ -65,6 +65,7 @@ class Decoder(srd.Decoder):
         ('fields', 'Fields', tuple(range(15))),
         ('warnings', 'Warnings', (16,)),
     )
+    fd = False
 
     def __init__(self):
         self.reset()
@@ -166,22 +167,22 @@ class Decoder(srd.Decoder):
             self.ss_block = self.samplenum
 
             if self.fd:
-                if self.dlc < 16:
+                if self.dlc2len(self.dlc) < 16:
                     self.crc_len = 27 # 17 + SBC + stuff bits
                 else:
-                    self.crc_len = 21
+                    self.crc_len = 32 # 21 + SBC + stuff bits
             else:
                 self.crc_len = 15
 
         # CRC sequence (15 bits, 17 bits or 21 bits)
         elif bitnum == (self.last_databit + self.crc_len):
             if self.fd:
-              if self.dlc < 16:
+              if self.dlc2len(self.dlc) < 16:
                 crc_type = "CRC-17"
               else:
                 crc_type = "CRC-21"
             else:
-              crc_type = "CRC-15"
+              crc_type = "CRC" # TODO: CRC-15 (will break existing tests)
 
             x = self.last_databit + 1
             crc_bits = self.bits[x:x + self.crc_len + 1]
@@ -215,7 +216,7 @@ class Decoder(srd.Decoder):
             self.ss_block = self.samplenum
 
         # End of frame (EOF), 7 recessive bits
-        elif bitnum == (self.last_databit + self.crc_len + 11):
+        elif bitnum == (self.last_databit + self.crc_len + 10):
             self.putb([2, ['End of frame', 'EOF', 'E']])
             if self.rawbits[-7:] != [1, 1, 1, 1, 1, 1, 1]:
                 self.putb([16, ['End of frame (EOF) must be 7 recessive bits']])
@@ -232,9 +233,14 @@ class Decoder(srd.Decoder):
         if bitnum == 14:
             self.fd = True if can_rx else False
 
-            self.putx([7, ['Flexible Data Format: %d' % can_rx,
-                           'FDF: %d' % can_rx,
-                           'FDF']])
+            if self.fd:
+                self.putx([7, ['Flexible Data Format: %d' % can_rx,
+                               'FDF: %d' % can_rx,
+                               'FDF']])
+            else:
+                self.putx([7, ['Reserved bit 0: %d' % can_rx,
+                               'RB0: %d' % can_rx,
+                               'RB0']])
 
             # SRR Substitute Remote Request
             if self.fd:
@@ -249,7 +255,6 @@ class Decoder(srd.Decoder):
                                 'RTR: %s frame' % rtr, 'RTR']])
                 self.dlc_start = 15
 
-        # TODO: add Res, BRS and ESI bits when FD format:
         if bitnum == 15:
             if self.fd:
                 self.putx([7, ['Reserved: %d' % can_rx, 'R0: %d' % can_rx, 'R0']])
@@ -269,10 +274,10 @@ class Decoder(srd.Decoder):
         # Bits 15-18: Data length code (DLC), in number of bytes (0-8).
         elif bitnum == self.dlc_start + 3:
             self.dlc = int(''.join(str(d) for d in self.bits[self.dlc_start:self.dlc_start + 4]), 2)
-            self.putb([10, ['Data length code: %d (%d Bytes)' % (self.dlc, self.dlc2len(self.dlc)),
-                            'DLC: %d (%d B)' % (self.dlc, self.dlc2len(self.dlc)), 'DLC']])
-            self.last_databit = self.dlc_start + 3 + (self.dlc * 8)
-            if self.dlc > 8:
+            self.putb([10, ['Data length code: %d' % self.dlc,
+                             'DLC: %d' % self.dlc, 'DLC']])
+            self.last_databit = self.dlc_start + 3 + (self.dlc2len(self.dlc) * 8)
+            if self.dlc > 8 and not self.fd:
                 self.putb([16, ['Data length code (DLC) > 8 is not allowed']])
 
         # Remember all databyte bits, except the very last one.
@@ -283,7 +288,7 @@ class Decoder(srd.Decoder):
         # The bits within a data byte are transferred MSB-first.
         elif bitnum == self.last_databit:
             self.ss_databytebits.append(self.samplenum) # Last databyte bit.
-            for i in range(self.dlc):
+            for i in range(self.dlc2len(self.dlc)):
                 x = self.dlc_start + 4 + (8 * i)
                 b = int(''.join(str(d) for d in self.bits[x:x + 8]), 2)
                 ss = self.ss_databytebits[i * 8]
@@ -347,7 +352,7 @@ class Decoder(srd.Decoder):
             self.dlc = int(''.join(str(d) for d in self.bits[35:38 + 1]), 2)
             self.putb([10, ['Data length code: %d' % self.dlc,
                             'DLC: %d' % self.dlc, 'DLC']])
-            self.last_databit = 38 + (self.dlc * 8)
+            self.last_databit = 38 + (self.dlc2len(self.dlc) * 8)
 
         # Remember all databyte bits, except the very last one.
         elif bitnum in range(39, self.last_databit):
@@ -357,7 +362,7 @@ class Decoder(srd.Decoder):
         # The bits within a data byte are transferred MSB-first.
         elif bitnum == self.last_databit:
             self.ss_databytebits.append(self.samplenum) # Last databyte bit.
-            for i in range(self.dlc):
+            for i in range(self.dlc2len(self.dlc)):
                 x = 38 + (8 * i) + 1
                 b = int(''.join(str(d) for d in self.bits[x:x + 8]), 2)
                 ss = self.ss_databytebits[i * 8]