X-Git-Url: http://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fcan%2Fpd.py;fp=decoders%2Fcan%2Fpd.py;h=5d27b28d23105db1096d813ddd782dd986f9611d;hp=8c417fd3f3901fe454f6e9b591d5d8cf1f317201;hb=2d9e1115baa6a5806e4ecfa435cc06395afc2337;hpb=6c890c087168b929a3017613b6ebfb7822a4f0fa diff --git a/decoders/can/pd.py b/decoders/can/pd.py index 8c417fd..5d27b28 100644 --- a/decoders/can/pd.py +++ b/decoders/can/pd.py @@ -37,7 +37,8 @@ class Decoder(srd.Decoder): {'id': 'can_rx', 'name': 'CAN RX', 'desc': 'CAN bus line'}, ) options = ( - {'id': 'bitrate', 'desc': 'Bitrate (bits/s)', 'default': 1000000}, + {'id': 'nominal_bitrate', 'desc': 'Nominal Bitrate (bits/s)', 'default': 1000000}, + {'id': 'fast_bitrate', 'desc': 'Fast Bitrate (bits/s)', 'default': 2000000}, {'id': 'sample_point', 'desc': 'Sample point (%)', 'default': 70.0}, ) annotations = ( @@ -82,7 +83,7 @@ class Decoder(srd.Decoder): def metadata(self, key, value): if key == srd.SRD_CONF_SAMPLERATE: self.samplerate = value - self.bit_width = float(self.samplerate) / float(self.options['bitrate']) + self.bit_width = float(self.samplerate) / float(self.options['nominal_bitrate']) self.sample_point = (self.bit_width / 100.0) * self.options['sample_point'] # Generic helper for CAN bit annotations.