Backport fix to ASCReader #701

Skip J1939TP messages

Author: bessman

can/io/asc.py

@@ -28,7 +28,8 @@
 
 class ASCReader(BaseIOHandler):
     """
-    Iterator of CAN messages from a ASC logging file.
+    Iterator of CAN messages from a ASC logging file. Meta data (comments,
+    bus statistics, J1939 Transport Protocol messages) is ignored.
 
     TODO: turn relative timestamps back to absolute form
     """
@@ -77,7 +78,10 @@ def __iter__(self):
                               channel=channel)
                 yield msg
 
-            elif not isinstance(channel, int) or dummy.strip()[0:10].lower() == 'statistic:':
+            elif (not isinstance(channel, int)
+                  or dummy.strip()[0:10].lower() == 'statistic:'
+                  or dummy.split(None, 1)[0] == "J1939TP"
+            ):
                 pass
 
             elif dummy[-1:].lower() == 'r':

test/data/logfile.asc

@@ -1,18 +1,28 @@
-date Sam Sep 30 15:06:13.191 2017
-base hex  timestamps absolute
-internal events logged
-// version 9.0.0
-Begin Triggerblock Sam Sep 30 15:06:13.191 2017
-   0.000000 Start of measurement
-   0.015991 CAN 1 Status:chip status error passive - TxErr: 132 RxErr: 0
-   0.015991 CAN 2 Status:chip status error active
-   1.015991 1  Statistic: D 0 R 0 XD 0 XR 0 E 0 O 0 B 0.00%
-   1.015991 2  Statistic: D 0 R 0 XD 0 XR 0 E 0 O 0 B 0.00%
-   2.015992 1  Statistic: D 0 R 0 XD 0 XR 0 E 0 O 0 B 0.00%
-  17.876707 CAN 1 Status:chip status error passive - TxErr: 131 RxErr: 0
-  17.876708 1  6F9             Rx   d 8 05 0C 00 00 00 00 00 00  Length = 240015 BitCount = 124 ID = 1785
-  17.876976 1  6F8             Rx   d 8 FF 00 0C FE 00 00 00 00  Length = 239910 BitCount = 124 ID = 1784
-  18.015997 1  Statistic: D 2 R 0 XD 0 XR 0 E 0 O 0 B 0.04%
-  113.016026 1  Statistic: D 0 R 0 XD 0 XR 0 E 0 O 0 B 0.00%
- 113.016026 2  Statistic: D 0 R 0 XD 0 XR 0 E 0 O 0 B 0.00%
-End TriggerBlock
+date Sam Sep 30 15:06:13.191 2017
+base hex  timestamps absolute
+internal events logged
+// version 9.0.0
+Begin Triggerblock Sam Sep 30 15:06:13.191 2017
+   0.000000 Start of measurement
+   0.015991 CAN 1 Status:chip status error passive - TxErr: 132 RxErr: 0
+   0.015991 CAN 2 Status:chip status error active
+   1.015991 1  Statistic: D 0 R 0 XD 0 XR 0 E 0 O 0 B 0.00%
+   1.015991 2  Statistic: D 0 R 0 XD 0 XR 0 E 0 O 0 B 0.00%
+   2.015992 1  Statistic: D 0 R 0 XD 0 XR 0 E 0 O 0 B 0.00%
+   3.098426 1  18EBFF00x       Rx d 8 01 A0 0F A6 60 3B D1 40    Length = 273910 BitCount = 141 ID = 418119424x
+   3.148421 1  18EBFF00x       Rx d 8 02 1F DE 80 25 DF C0 2B    Length = 271910 BitCount = 140 ID = 418119424x
+   3.197693 1  18EBFF00x       Rx d 8 03 E1 00 4B FF FF 3C 0F    Length = 283910 BitCount = 146 ID = 418119424x
+   3.248765 1  18EBFF00x       Rx d 8 04 00 4B FF FF FF FF FF    Length = 283910 BitCount = 146 ID = 418119424x
+   3.297743 1  J1939TP FEE3p        6    0  0   -   Rx   d 23 A0 0F A6 60 3B D1 40 1F DE 80 25 DF C0 2B E1 00 4B FF FF 3C 0F 00 4B FF FF FF FF FF FF FF FF FF FF FF FF
+  17.876707 CAN 1 Status:chip status error passive - TxErr: 131 RxErr: 0
+  17.876708 1  6F9             Rx   d 8 05 0C 00 00 00 00 00 00  Length = 240015 BitCount = 124 ID = 1785
+  17.876976 1  6F8             Rx   d 8 FF 00 0C FE 00 00 00 00  Length = 239910 BitCount = 124 ID = 1784
+  18.015997 1  Statistic: D 2 R 0 XD 0 XR 0 E 0 O 0 B 0.04%
+  20.105214 2  18EBFF00x       Rx   d 8 01 A0 0F A6 60 3B D1 40  Length = 273925 BitCount = 141 ID = 418119424x
+  20.155119 2  18EBFF00x       Rx   d 8 02 1F DE 80 25 DF C0 2B  Length = 272152 BitCount = 140 ID = 418119424x
+  20.204671 2  18EBFF00x       Rx   d 8 03 E1 00 4B FF FF 3C 0F  Length = 283910 BitCount = 146 ID = 418119424x
+  20.248887 2  18EBFF00x       Rx   d 8 04 00 4B FF FF FF FF FF  Length = 283925 BitCount = 146 ID = 418119424x
+  20.305233 2  J1939TP FEE3p        6    0  0   -   Rx   d 23 A0 0F A6 60 3B D1 40 1F DE 80 25 DF C0 2B E1 00 4B FF FF 3C 0F 00 4B FF FF FF FF FF FF FF FF FF FF FF FF
+  113.016026 1  Statistic: D 0 R 0 XD 0 XR 0 E 0 O 0 B 0.00%
+ 113.016026 2  Statistic: D 0 R 0 XD 0 XR 0 E 0 O 0 B 0.00%
+End TriggerBlock