@@ -29,8 +29,7 @@ def read_voltage(self):
29
29
def read_current (self ):
30
30
if self .resistor > 0 :
31
31
return self .read_voltage () / self .resistor
32
- else :
33
- return self .read_voltage ()
32
+ return self .read_voltage ()
34
33
35
34
36
35
class AnalogMux :
@@ -50,46 +49,46 @@ def __init__(self, addr0, addr1=None, addr2=None, en=None, muxed_pin=None):
50
49
def select (self , address ):
51
50
if address < 0 :
52
51
raise ValueError ("address is less than zero" )
53
- elif address > self .max_address :
52
+ if address > self .max_address :
54
53
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 )
58
54
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 )
60
57
61
- if self .addr1_pin is not None :
62
- self .addr1_pin .value (address & 0b010 )
58
+ self .addr0_pin .value (address & 0b001 )
63
59
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 )
66
62
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 )
69
68
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 ])
72
71
73
72
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 :
77
74
raise RuntimeError ("there is no enable pin assigned to this mux" )
78
75
76
+ self .en_pin .value (0 )
77
+
79
78
def configure_pull (self , address , pull = None ):
80
79
if address < 0 :
81
80
raise ValueError ("address is less than zero" )
82
- elif address > self .max_address :
81
+ if address > self .max_address :
83
82
raise ValueError ("address is greater than number of available addresses" )
84
- else :
85
- self .pulls [address ] = pull
83
+
84
+ self .pulls [address ] = pull
86
85
87
86
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 :
91
88
raise RuntimeError ("there is no muxed pin assigned to this mux" )
92
89
90
+ return self .muxed_pin .value ()
91
+
93
92
94
93
class Button :
95
94
def __init__ (self , button , invert = True , repeat_time = 200 , hold_time = 1000 ):
@@ -113,10 +112,9 @@ def read(self):
113
112
self .pressed = True
114
113
self .last_time = current_time
115
114
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
120
118
121
119
if self .repeat_time == 0 :
122
120
return False
@@ -132,10 +130,7 @@ def read(self):
132
130
return False
133
131
134
132
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
139
134
140
135
@property
141
136
def is_pressed (self ):
0 commit comments