Skip to content

Commit c746157

Browse files
committed
QA: Lint MicroPython modules.
1 parent 42da517 commit c746157

File tree

5 files changed

+51
-46
lines changed

5 files changed

+51
-46
lines changed

micropython/modules_py/automation.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ def relay(self, relay, actuate=None):
145145
return self.__relays[relay].value()
146146

147147
self.__relays[relay].value(actuate)
148+
return None
148149

149150
def actuate_relay(self, relay):
150151
if relay < 0 or relay >= self.NUM_RELAYS:
@@ -172,7 +173,7 @@ def output(self, output, value=None):
172173
try:
173174
if value >= 0.0 and value <= 100.0:
174175
self.__outputs[output].duty_u16(int((value / 100.0) * 65535))
175-
return
176+
return None
176177
except TypeError:
177178
pass
178179

@@ -338,6 +339,7 @@ def relay(self, actuate=None):
338339
return self.__relay.value()
339340

340341
self.__relay.value(actuate)
342+
return None
341343

342344
def actuate_relay(self):
343345
self.__relay.on()
@@ -361,7 +363,7 @@ def output(self, output, value=None):
361363
try:
362364
if value >= 0.0 and value <= 100.0:
363365
self.__outputs[output].duty_u16(int((value / 100.0) * 65535))
364-
return
366+
return None
365367
except TypeError:
366368
pass
367369

micropython/modules_py/interstate75.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from pimoroni import RGBLED, Button
2-
from picographics import PicoGraphics, DISPLAY_INTERSTATE75_32X32, DISPLAY_INTERSTATE75_64X32, DISPLAY_INTERSTATE75_96X32, DISPLAY_INTERSTATE75_96X48, DISPLAY_INTERSTATE75_128X32, DISPLAY_INTERSTATE75_64X64, DISPLAY_INTERSTATE75_128X64, DISPLAY_INTERSTATE75_192X64, DISPLAY_INTERSTATE75_256X64
2+
from picographics import PicoGraphics, DISPLAY_INTERSTATE75_32X32, DISPLAY_INTERSTATE75_64X32, DISPLAY_INTERSTATE75_96X32, DISPLAY_INTERSTATE75_96X48, DISPLAY_INTERSTATE75_128X32, DISPLAY_INTERSTATE75_64X64, DISPLAY_INTERSTATE75_128X64, DISPLAY_INTERSTATE75_192X64, DISPLAY_INTERSTATE75_256X64, DISPLAY_INTERSTATE75_128X128
33
from pimoroni_i2c import PimoroniI2C
44
import hub75
55
import sys
@@ -29,6 +29,7 @@ class Interstate75:
2929
DISPLAY_INTERSTATE75_128X64 = DISPLAY_INTERSTATE75_128X64
3030
DISPLAY_INTERSTATE75_192X64 = DISPLAY_INTERSTATE75_192X64
3131
DISPLAY_INTERSTATE75_256X64 = DISPLAY_INTERSTATE75_256X64
32+
DISPLAY_INTERSTATE75_128X128 = DISPLAY_INTERSTATE75_128X128
3233

3334
PANEL_GENERIC = hub75.PANEL_GENERIC
3435
PANEL_FM6126A = hub75.PANEL_FM6126A
@@ -43,10 +44,18 @@ class Interstate75:
4344
NUM_SWITCHES = 2
4445

4546
def __init__(self, display, panel_type=hub75.PANEL_GENERIC, stb_invert=False, color_order=hub75.COLOR_ORDER_RGB):
46-
self.interstate75w = "Pico W" in sys.implementation._machine
47+
self.interstate75w = "Pico W" in sys.implementation._machine # noqa: SLF001
4748
self.display = PicoGraphics(display=display)
4849
self.width, self.height = self.display.get_bounds()
49-
self.hub75 = hub75.Hub75(self.width, self.height, panel_type=panel_type, stb_invert=stb_invert, color_order=color_order)
50+
51+
out_width = self.width
52+
out_height = self.height
53+
54+
if display == DISPLAY_INTERSTATE75_128X128:
55+
out_width = 256
56+
out_height = 64
57+
58+
self.hub75 = hub75.Hub75(out_width, out_height, panel_type=panel_type, stb_invert=stb_invert, color_order=color_order)
5059
self.hub75.start()
5160
if self.interstate75w:
5261
self._switch_pins = self.SWITCH_PINS_W

micropython/modules_py/inventor.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ def switch_pressed(self):
116116
def play_tone(self, frequency):
117117
try:
118118
self.audio_pwm.freq(frequency)
119-
except ValueError:
119+
except ValueError as e:
120120
self.play_silence()
121-
raise ValueError("frequency of range. Expected greater than 0")
121+
raise ValueError("frequency of range. Expected greater than 0") from e
122122

123123
corrected_volume = (self.__volume ** 4) # Correct for RC Filter curve
124124
self.audio_pwm.duty_u16(int(32768 * corrected_volume))
@@ -143,6 +143,7 @@ def volume(self, volume=None):
143143
raise ValueError("volume out of range. Expected 0.0 to 1.0")
144144

145145
self.__volume = volume
146+
return None
146147

147148
def mute_audio(self):
148149
self.__amp_en.off()

micropython/modules_py/lte.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ def _netlight_irq(self, pin):
5454
def ipconfig(self, *args, **kwargs):
5555
if len(args):
5656
return self._ppp.ipconfig(*args)
57-
else:
58-
return self._ppp.ipconfig(**kwargs)
57+
return self._ppp.ipconfig(**kwargs)
5958

6059
def iccid(self):
6160
try:
@@ -73,8 +72,7 @@ def signal_quality(self):
7372
response = self._send_at_command("AT+CSQ", 1)
7473
quality = int(response.split(":")[1].split(",")[0])
7574
# Conversion as per AT command set datasheet
76-
db = -113 + (2 * quality)
77-
return db
75+
return -113 + (2 * quality)
7876
except CellularError:
7977
pass
8078
return None
@@ -125,7 +123,7 @@ def connect(self, timeout=60):
125123
self._wait_ready()
126124

127125
self._send_at_command("ATE0") # Disable local echo
128-
self._send_at_command(f"AT+CGDCONT=1,\"IP\",\"{self._apn}\"") # Set apn and activate pdp context
126+
self._send_at_command(f'AT+CGDCONT=1,"IP","{self._apn}"') # Set apn and activate pdp context
129127

130128
# Wait for roaming lte connection to be established
131129
giveup = time.time() + timeout
@@ -137,8 +135,8 @@ def connect(self, timeout=60):
137135
raise CellularError("timed out getting network registration")
138136

139137
# Disable server and client certification validation
140-
self._send_at_command("AT+CSSLCFG=\"authmode\",0,0")
141-
self._send_at_command("AT+CSSLCFG=\"enableSNI\",0,1")
138+
self._send_at_command('AT+CSSLCFG="authmode",0,0')
139+
self._send_at_command('AT+CSSLCFG="enableSNI",0,1')
142140

143141
print(f" - SIM ICCID is {self.iccid()}")
144142

micropython/modules_py/pimoroni.py

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ def read_voltage(self):
2929
def read_current(self):
3030
if self.resistor > 0:
3131
return self.read_voltage() / self.resistor
32-
else:
33-
return self.read_voltage()
32+
return self.read_voltage()
3433

3534

3635
class AnalogMux:
@@ -50,46 +49,46 @@ def __init__(self, addr0, addr1=None, addr2=None, en=None, muxed_pin=None):
5049
def select(self, address):
5150
if address < 0:
5251
raise ValueError("address is less than zero")
53-
elif address > self.max_address:
52+
if address > self.max_address:
5453
raise ValueError("address is greater than number of available addresses")
55-
else:
56-
if self.muxed_pin and self.pulls[address] is None:
57-
self.muxed_pin.init(Pin.IN, None)
5854

59-
self.addr0_pin.value(address & 0b001)
55+
if self.muxed_pin and self.pulls[address] is None:
56+
self.muxed_pin.init(Pin.IN, None)
6057

61-
if self.addr1_pin is not None:
62-
self.addr1_pin.value(address & 0b010)
58+
self.addr0_pin.value(address & 0b001)
6359

64-
if self.addr2_pin is not None:
65-
self.addr2_pin.value(address & 0b100)
60+
if self.addr1_pin is not None:
61+
self.addr1_pin.value(address & 0b010)
6662

67-
if self.en_pin is not None:
68-
self.en_pin.value(1)
63+
if self.addr2_pin is not None:
64+
self.addr2_pin.value(address & 0b100)
65+
66+
if self.en_pin is not None:
67+
self.en_pin.value(1)
6968

70-
if self.muxed_pin and self.pulls[address] is not None:
71-
self.muxed_pin.init(Pin.IN, self.pulls[address])
69+
if self.muxed_pin and self.pulls[address] is not None:
70+
self.muxed_pin.init(Pin.IN, self.pulls[address])
7271

7372
def disable(self):
74-
if self.en_pin is not None:
75-
self.en_pin.value(0)
76-
else:
73+
if self.en_pin is None:
7774
raise RuntimeError("there is no enable pin assigned to this mux")
7875

76+
self.en_pin.value(0)
77+
7978
def configure_pull(self, address, pull=None):
8079
if address < 0:
8180
raise ValueError("address is less than zero")
82-
elif address > self.max_address:
81+
if address > self.max_address:
8382
raise ValueError("address is greater than number of available addresses")
84-
else:
85-
self.pulls[address] = pull
83+
84+
self.pulls[address] = pull
8685

8786
def read(self):
88-
if self.muxed_pin is not None:
89-
return self.muxed_pin.value()
90-
else:
87+
if self.muxed_pin is None:
9188
raise RuntimeError("there is no muxed pin assigned to this mux")
9289

90+
return self.muxed_pin.value()
91+
9392

9493
class Button:
9594
def __init__(self, button, invert=True, repeat_time=200, hold_time=1000):
@@ -113,10 +112,9 @@ def read(self):
113112
self.pressed = True
114113
self.last_time = current_time
115114
return True
116-
else:
117-
self.pressed_time = 0
118-
self.pressed = False
119-
self.last_time = 0
115+
self.pressed_time = 0
116+
self.pressed = False
117+
self.last_time = 0
120118

121119
if self.repeat_time == 0:
122120
return False
@@ -132,10 +130,7 @@ def read(self):
132130
return False
133131

134132
def raw(self):
135-
if self.invert:
136-
return not self.pin.value()
137-
else:
138-
return self.pin.value()
133+
return self.pin.value() ^ self.invert
139134

140135
@property
141136
def is_pressed(self):

0 commit comments

Comments
 (0)