X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fcan%2Fpd.py;h=6904ed95822c66711858cd7230041d19d5795712;hb=300f9194250913babbd57d5eccc2ceccf9010785;hp=375069f2042a1b1ea0d10a36857fc874cc27fc16;hpb=8a9f60b1a24de32bb4170b927637655ef19de77b;p=libsigrokdecode.git diff --git a/decoders/can/pd.py b/decoders/can/pd.py index 375069f..6904ed9 100644 --- a/decoders/can/pd.py +++ b/decoders/can/pd.py @@ -75,11 +75,11 @@ class Decoder(srd.Decoder): if key == srd.SRD_CONF_SAMPLERATE: self.samplerate = value self.bit_width = float(self.samplerate) / float(self.options['bitrate']) - self.bitpos = (self.bit_width / 100.0) * self.options['sample_point'] + self.sample_point = (self.bit_width / 100.0) * self.options['sample_point'] # Generic helper for CAN bit annotations. def putg(self, ss, es, data): - left, right = int(self.bitpos), int(self.bit_width - self.bitpos) + left, right = int(self.sample_point), int(self.bit_width - self.sample_point) self.put(ss - left, es + right, self.out_ann, data) # Single-CAN-bit annotation using the current samplenum. @@ -107,8 +107,8 @@ class Decoder(srd.Decoder): # Determine the position of the next desired bit's sample point. def get_sample_point(self, bitnum): - bitpos = int(self.sof + (self.bit_width * bitnum) + self.bitpos) - return bitpos + samplenum = int(self.sof + (self.bit_width * bitnum) + self.sample_point) + return samplenum def is_stuff_bit(self): # CAN uses NRZ encoding and bit stuffing.