remove unnecessary intermediate GPIOPotentiometer class
This commit is contained in:
parent
0f22ce071b
commit
b97fca7c76
@ -4,16 +4,17 @@ from supervisor import ticks_ms
|
|||||||
from kmk.modules import Module
|
from kmk.modules import Module
|
||||||
|
|
||||||
|
|
||||||
class BasePotentiometer:
|
class Potentiometer:
|
||||||
def __init__(self, is_inverted=False):
|
def __init__(self, pin, move_callback, is_inverted=False):
|
||||||
self.is_inverted = is_inverted
|
self.is_inverted = is_inverted
|
||||||
self.read_pin = None
|
self.read_pin = AnalogIn(pin)
|
||||||
self._direction = None
|
self._direction = None
|
||||||
self._pos = 0
|
self._pos = self.get_pos()
|
||||||
self._timestamp = ticks_ms()
|
self._timestamp = ticks_ms()
|
||||||
|
self.cb = move_callback
|
||||||
|
|
||||||
# callback function on events. Needs to be defined externally
|
# callback function on events.
|
||||||
self.on_move_do = None
|
self.on_move_do = lambda state: self.cb(state)
|
||||||
|
|
||||||
def get_state(self):
|
def get_state(self):
|
||||||
return {
|
return {
|
||||||
@ -42,15 +43,6 @@ class BasePotentiometer:
|
|||||||
self.on_move_do(self.get_state())
|
self.on_move_do(self.get_state())
|
||||||
|
|
||||||
|
|
||||||
class GPIOPotentiometer(BasePotentiometer):
|
|
||||||
def __init__(self, pin, move_callback, is_inverted=False):
|
|
||||||
super().__init__(is_inverted)
|
|
||||||
self.read_pin = AnalogIn(pin)
|
|
||||||
self._pos = self.get_pos()
|
|
||||||
self.cb = move_callback
|
|
||||||
self.on_move_do = lambda state: self.cb(state)
|
|
||||||
|
|
||||||
|
|
||||||
class PotentiometerHandler(Module):
|
class PotentiometerHandler(Module):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.potentiometers = []
|
self.potentiometers = []
|
||||||
@ -65,7 +57,7 @@ class PotentiometerHandler(Module):
|
|||||||
def during_bootup(self, keyboard):
|
def during_bootup(self, keyboard):
|
||||||
if self.pins:
|
if self.pins:
|
||||||
for args in self.pins:
|
for args in self.pins:
|
||||||
self.potentiometers.append(GPIOPotentiometer(*args))
|
self.potentiometers.append(Potentiometer(*args))
|
||||||
return
|
return
|
||||||
|
|
||||||
def before_matrix_scan(self, keyboard):
|
def before_matrix_scan(self, keyboard):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user