X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fcan%2Fpd.py;h=3dbadc090313cc424feaf13051cf724e82c29108;hb=6ca8b2b761788a1a2476fc4de3899f456428a277;hp=3ab82b02c054dea02f0c5b4b7c0fbac0564f2917;hpb=8abd7aa36c1a8c2d83777fedba499f6fb7f38e06;p=libsigrokdecode.git

diff --git a/decoders/can/pd.py b/decoders/can/pd.py
index 3ab82b0..3dbadc0 100644
--- a/decoders/can/pd.py
+++ b/decoders/can/pd.py
@@ -45,7 +45,7 @@ class Decoder(srd.Decoder):
         {'id': 'sample_point', 'desc': 'Sample point (%)', 'default': 70.0},
     )
     annotations = (
-        ('data', 'CAN payload data'),
+        ('data', 'Payload data'),
         ('sof', 'Start of frame'),
         ('eof', 'End of frame'),
         ('id', 'Identifier'),
@@ -61,7 +61,7 @@ class Decoder(srd.Decoder):
         ('ack-slot', 'ACK slot'),
         ('ack-delimiter', 'ACK delimiter'),
         ('stuff-bit', 'Stuff bit'),
-        ('warnings', 'Human-readable warnings'),
+        ('warning', 'Warning'),
         ('bit', 'Bit'),
     )
     annotation_rows = (
@@ -140,16 +140,12 @@ class Decoder(srd.Decoder):
         self.dom_edge_snum = self.samplenum
         self.dom_edge_bcount = self.curbit
 
-    def bit_sampled(self):
-        # EMPTY
-        pass
-
     # Determine the position of the next desired bit's sample point.
     def get_sample_point(self, bitnum):
         samplenum = self.dom_edge_snum
-        samplenum += int(self.bit_width * (bitnum - self.dom_edge_bcount))
-        samplenum += int(self.sample_point)
-        return samplenum
+        samplenum += self.bit_width * (bitnum - self.dom_edge_bcount)
+        samplenum += self.sample_point
+        return int(samplenum)
 
     def is_stuff_bit(self):
         # CAN uses NRZ encoding and bit stuffing.
@@ -502,4 +498,3 @@ class Decoder(srd.Decoder):
                     self.dom_edge_seen()
                 if self.matched[0]:
                     self.handle_bit(can_rx)
-                    self.bit_sampled()