andreil/klipper
1
0
Fork 0
mirror of https://github.com/andreili/klipper.git synced 2025-08-23 19:34:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

ads1x1x: Rename local 'config' variable to pcfg

Browse Source 
Avoid using the name "config" as a local register storage variable as
it can be confused with the common "config" configfile reference.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2025-07-08 18:55:25 -04:00
parent 42fbf8256f
commit c01e6eee1d
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
klippy/extras/ads1x1x.py
View File

@ -210,28 +210,28 @@ class ADS1X1X_chip:
raise pins.error('ADS1x1x pin %s is not valid' % \ raise pins.error('ADS1x1x pin %s is not valid' % \
pin_params['pin']) pin_params['pin'])
config = 0 pcfg = 0
config |= (ADS1X1X_OS['OS_SINGLE'] & \ pcfg |= (ADS1X1X_OS['OS_SINGLE'] & \
ADS1X1X_REG_CONFIG['OS_MASK']) ADS1X1X_REG_CONFIG['OS_MASK'])
config |= (ADS1X1X_MUX[pin_params['pin']] & \ pcfg |= (ADS1X1X_MUX[pin_params['pin']] & \
ADS1X1X_REG_CONFIG['MULTIPLEXER_MASK']) ADS1X1X_REG_CONFIG['MULTIPLEXER_MASK'])
config |= (self.pga & ADS1X1X_REG_CONFIG['PGA_MASK']) pcfg |= (self.pga & ADS1X1X_REG_CONFIG['PGA_MASK'])
# Have to use single mode, because in continuous, it never reaches # Have to use single mode, because in continuous, it never reaches
# idle state, which we use to determine if the sampling is done. # idle state, which we use to determine if the sampling is done.
config |= (ADS1X1X_MODE['single'] & \ pcfg |= (ADS1X1X_MODE['single'] & \
ADS1X1X_REG_CONFIG['MODE_MASK']) ADS1X1X_REG_CONFIG['MODE_MASK'])
# lowest sample rate per default, until report time has been set in # lowest sample rate per default, until report time has been set in
# setup_adc_sample # setup_adc_sample
config |= (self.comp_mode \ pcfg |= (self.comp_mode \
& ADS1X1X_REG_CONFIG['COMPARATOR_MODE_MASK']) & ADS1X1X_REG_CONFIG['COMPARATOR_MODE_MASK'])
config |= (self.comp_polarity \ pcfg |= (self.comp_polarity \
& ADS1X1X_REG_CONFIG['COMPARATOR_POLARITY_MASK']) & ADS1X1X_REG_CONFIG['COMPARATOR_POLARITY_MASK'])
config |= (self.comp_latching \ pcfg |= (self.comp_latching \
& ADS1X1X_REG_CONFIG['COMPARATOR_LATCHING_MASK']) & ADS1X1X_REG_CONFIG['COMPARATOR_LATCHING_MASK'])
config |= (self.comp_queue \ pcfg |= (self.comp_queue \
& ADS1X1X_REG_CONFIG['COMPARATOR_QUEUE_MASK']) & ADS1X1X_REG_CONFIG['COMPARATOR_QUEUE_MASK'])
pin_obj = ADS1X1X_pin(self, config) pin_obj = ADS1X1X_pin(self, pcfg)
if pin in self._pins: if pin in self._pins:
raise pins.error( raise pins.error(
'pin %s for chip %s is used multiple times' \ 'pin %s for chip %s is used multiple times' \
@ -250,8 +250,8 @@ class ADS1X1X_chip:
logging.exception("ADS1X1X: error while resetting device") logging.exception("ADS1X1X: error while resetting device")
def is_ready(self): def is_ready(self):
config = self._read_register(ADS1X1X_REG_POINTER['CONFIG']) cfg = self._read_register(ADS1X1X_REG_POINTER['CONFIG'])
return bool((config & ADS1X1X_REG_CONFIG['OS_MASK']) == \ return bool((cfg & ADS1X1X_REG_CONFIG['OS_MASK']) == \
ADS1X1X_OS['OS_IDLE']) ADS1X1X_OS['OS_IDLE'])
def calculate_sample_rate(self): def calculate_sample_rate(self):
@ -281,7 +281,7 @@ class ADS1X1X_chip:
(sample_rate, sample_rate_bits) = self.calculate_sample_rate() (sample_rate, sample_rate_bits) = self.calculate_sample_rate()
for pin in self._pins.values(): for pin in self._pins.values():
pin.config = (pin.config & ~ADS1X1X_REG_CONFIG['DATA_RATE_MASK']) \ pin.pcfg = (pin.pcfg & ~ADS1X1X_REG_CONFIG['DATA_RATE_MASK']) \
| (sample_rate_bits & ADS1X1X_REG_CONFIG['DATA_RATE_MASK']) | (sample_rate_bits & ADS1X1X_REG_CONFIG['DATA_RATE_MASK'])
self.delay = 1 / float(sample_rate) self.delay = 1 / float(sample_rate)
@ -289,7 +289,7 @@ class ADS1X1X_chip:
def sample(self, pin): def sample(self, pin):
with self._mutex: with self._mutex:
try: try:
self._write_register(ADS1X1X_REG_POINTER['CONFIG'], pin.config) self._write_register(ADS1X1X_REG_POINTER['CONFIG'], pin.pcfg)
self._reactor.pause(self._reactor.monotonic() + self.delay) self._reactor.pause(self._reactor.monotonic() + self.delay)
start_time = self._reactor.monotonic() start_time = self._reactor.monotonic()
while not self.is_ready(): while not self.is_ready():
@ -318,10 +318,10 @@ class ADS1X1X_chip:
self._i2c.i2c_write(data) self._i2c.i2c_write(data)
class ADS1X1X_pin: class ADS1X1X_pin:
def __init__(self, chip, config): def __init__(self, chip, pcfg):
self.mcu = chip.mcu self.mcu = chip.mcu
self.chip = chip self.chip = chip
self.config = config self.pcfg = pcfg
self.invalid_count = 0 self.invalid_count = 0