X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fcan%2Fpd.py;h=c394cf1faa84bb77ab1957bb05ba6c4444e69426;hb=9389f2c1b9b74e00d1369e846d4417bf644275d0;hp=91ccf4233ef364e81b3f4b19e3ba3169412791cb;hpb=f372d597739a30e0106aebc8225c1edebf6d93e3;p=libsigrokdecode.git

diff --git a/decoders/can/pd.py b/decoders/can/pd.py
index 91ccf42..c394cf1 100644
--- a/decoders/can/pd.py
+++ b/decoders/can/pd.py
@@ -18,8 +18,6 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-# CAN protocol decoder
-
 import sigrokdecode as srd
 
 class Decoder(srd.Decoder):
@@ -40,23 +38,23 @@ class Decoder(srd.Decoder):
         'sample_point': ['Sample point', 70], # 70%
     }
     annotations = [
-        ['Data', 'CAN payload data'],
-        ['SOF', 'Start of frame'],
-        ['EOF', 'End of frame'],
-        ['ID', 'Identifier'],
-        ['Ext. ID', 'Extended identifier'],
-        ['Full ID', 'Full identifier'],
-        ['IDE', 'Identifier extension bit'],
-        ['Reserved bit', 'Reserved bit 0 and 1'],
-        ['RTR', 'Remote transmission request'],
-        ['SRR', 'Substitute remote request'],
-        ['DLC', 'Data length count'],
-        ['CRC sequence', 'CRC sequence'],
-        ['CRC delimiter', 'CRC delimiter'],
-        ['ACK slot', 'ACK slot'],
-        ['ACK delimiter', 'ACK delimiter'],
-        ['Stuff bit', 'Stuff bit'],
-        ['Warnings', 'Human-readable warnings'],
+        ['data', 'CAN payload data'],
+        ['sof', 'Start of frame'],
+        ['eof', 'End of frame'],
+        ['id', 'Identifier'],
+        ['ext-id', 'Extended identifier'],
+        ['full-id', 'Full identifier'],
+        ['ide', 'Identifier extension bit'],
+        ['reserved-bit', 'Reserved bit 0 and 1'],
+        ['rtr', 'Remote transmission request'],
+        ['srr', 'Substitute remote request'],
+        ['dlc', 'Data length count'],
+        ['crc-sequence', 'CRC sequence'],
+        ['crc-delimiter', 'CRC delimiter'],
+        ['ack-slot', 'ACK slot'],
+        ['ack-delimiter', 'ACK delimiter'],
+        ['stuff-bit', 'Stuff bit'],
+        ['warnings', 'Human-readable warnings'],
     ]
 
     def __init__(self, **kwargs):
@@ -64,8 +62,8 @@ class Decoder(srd.Decoder):
         self.reset_variables()
 
     def start(self):
-        # self.out_proto = self.add(srd.OUTPUT_PROTO, 'can')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'can')
+        # self.out_python = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
 
     def metadata(self, key, value):
         if key == srd.SRD_CONF_SAMPLERATE:
@@ -73,9 +71,6 @@ class Decoder(srd.Decoder):
             self.bit_width = float(self.samplerate) / float(self.options['bitrate'])
             self.bitpos = (self.bit_width / 100.0) * self.options['sample_point']
 
-    def report(self):
-        pass
-
     # Generic helper for CAN bit annotations.
     def putg(self, ss, es, data):
         left, right = int(self.bitpos), int(self.bit_width - self.bitpos)