From 4a9ecfcfbbcf09a0a29ca07829b414859496a848 Mon Sep 17 00:00:00 2001 From: Alexander Bessman Date: Thu, 24 Mar 2022 09:21:41 +0100 Subject: [PATCH] Reformat some files to comply with psf/black#2726 --- pslab/bus/uart.py | 2 +- pslab/external/gas_sensor.py | 2 +- pslab/external/motor.py | 2 +- pslab/instrument/analog.py | 4 ++-- pslab/instrument/logic_analyzer.py | 8 ++++---- pslab/instrument/power_supply.py | 2 +- pslab/instrument/waveform_generator.py | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pslab/bus/uart.py b/pslab/bus/uart.py index 4b718f35..e5fe53f8 100644 --- a/pslab/bus/uart.py +++ b/pslab/bus/uart.py @@ -36,7 +36,7 @@ class _UARTPrimitive: """ _MIN_BRGVAL = 0 - _MAX_BRGVAL = 2 ** 16 - 1 + _MAX_BRGVAL = 2**16 - 1 _brgval = _BRGVAL _mode = _MODE diff --git a/pslab/external/gas_sensor.py b/pslab/external/gas_sensor.py index 80b16a08..9e3f6867 100644 --- a/pslab/external/gas_sensor.py +++ b/pslab/external/gas_sensor.py @@ -109,7 +109,7 @@ def _correction(self): t = self._temperature() h = self._humidity() a, b, c, d = *self._TEMPERATURE_CORRECTION, self._HUMIDITY_CORRECTION - return a * t ** 2 + b * t + c + d * (h - 0.65) + return a * t**2 + b * t + c + d * (h - 0.65) @property def _sensor_resistance(self): diff --git a/pslab/external/motor.py b/pslab/external/motor.py index 371892b7..f4d130c0 100644 --- a/pslab/external/motor.py +++ b/pslab/external/motor.py @@ -68,4 +68,4 @@ def _get_duty_cycle(self, angle): angle /= self._angle_range # Normalize angle *= self._max_angle_pulse - self._min_angle_pulse # Scale angle += self._min_angle_pulse # Offset - return angle / (self._frequency ** -1 * MICROSECONDS) + return angle / (self._frequency**-1 * MICROSECONDS) diff --git a/pslab/instrument/analog.py b/pslab/instrument/analog.py index 5823ecd7..bc3ccca0 100644 --- a/pslab/instrument/analog.py +++ b/pslab/instrument/analog.py @@ -74,7 +74,7 @@ class AnalogInput: def __init__(self, name: str): self._name = name - self._resolution = 2 ** 10 - 1 + self._resolution = 2**10 - 1 if self._name == "CH1": self.programmable_gain_amplifier = 1 @@ -140,7 +140,7 @@ def resolution(self) -> int: def resolution(self, value: int): if value not in (10, 12): raise ValueError("Resolution must be 10 or 12 bits.") - self._resolution = 2 ** value - 1 + self._resolution = 2**value - 1 self._calibrate() def _calibrate(self): diff --git a/pslab/instrument/logic_analyzer.py b/pslab/instrument/logic_analyzer.py index c6c5d008..c8ff536b 100644 --- a/pslab/instrument/logic_analyzer.py +++ b/pslab/instrument/logic_analyzer.py @@ -92,7 +92,7 @@ def measure_frequency( try: period = (t[1] - t[0]) * 1e-6 / 16 - frequency = period ** -1 + frequency = period**-1 except IndexError: frequency = 0 @@ -123,7 +123,7 @@ def _measure_frequency_firmware( else: return 0 else: - return period ** -1 + return period**-1 def _get_high_frequency(self, channel: str) -> float: """Measure high frequency signals using firmware. @@ -403,7 +403,7 @@ def _capture_two(self): self._device.get_ack() def _capture_four(self, e2e_time: float): - rollover_time = (2 ** 16 - 1) / CP.CLOCK_RATE + rollover_time = (2**16 - 1) / CP.CLOCK_RATE e2e_time = 0 if e2e_time is None else e2e_time if e2e_time > rollover_time * self._PRESCALERS[3]: @@ -513,7 +513,7 @@ def _fetch_int(self, channel: DigitalInput) -> np.ndarray: for i, diff in enumerate(np.diff(raw_timestamps)): if diff <= 0: # Counter has rolled over. - raw_timestamps[i + 1 :] += 2 ** 16 - 1 + raw_timestamps[i + 1 :] += 2**16 - 1 return raw_timestamps diff --git a/pslab/instrument/power_supply.py b/pslab/instrument/power_supply.py index 7180ffdd..da206d42 100644 --- a/pslab/instrument/power_supply.py +++ b/pslab/instrument/power_supply.py @@ -119,7 +119,7 @@ class Source: "PV3": 1, "PCS": 0, } - _RESOLUTION = 2 ** 12 - 1 + _RESOLUTION = 2**12 - 1 _MULTI_WRITE = 0b01000000 def __init__(self, mcp4728: I2CSlave, name: str): diff --git a/pslab/instrument/waveform_generator.py b/pslab/instrument/waveform_generator.py index 78e64c13..15f52dc2 100644 --- a/pslab/instrument/waveform_generator.py +++ b/pslab/instrument/waveform_generator.py @@ -64,7 +64,7 @@ def _get_wavelength(frequency: float, table_size: int = 1) -> Tuple[int, int]: """ for prescaler in _PRESCALERS: timegap = int(round(CP.CLOCK_RATE / frequency / prescaler / table_size)) - if 0 < timegap < 2 ** 16: + if 0 < timegap < 2**16: return timegap, prescaler e = (