From: Gerhard Sittig <redacted>
Date: Sun, 2 Jul 2017 10:23:09 +0000 (+0200)
Subject: can: rename 'bitpos' variable
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=300f9194250913babbd57d5eccc2ceccf9010785;p=libsigrokdecode.git

can: rename 'bitpos' variable

Consistently use .sample_point for the member variable that corresponds
to the 'sample_point' property. Use 'samplenum' in .get_sample_point()
to reflect that the routine returns a sample number. This eliminates the
'bitpos' identifier which was used for two different things.
---

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.