mirror
/
micropython-samples
kopia lustrzana https://github.com/peterhinch/micropython-samples
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Encoders: Rename pin_x to pin_a, pin_y to pin_b

pull/23/head
IhorNehrutsa 2021-10-08 01:57:33 +03:00
rodzic f8e7ebabae
commit d6ec83b71f
4 zmienionych plików z 34 dodań i 34 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
encoders/ENCODERS.md
Wyświetl plik

@ -38,25 +38,25 @@ read the following notes as there are potential issues.
from machine import Pin from machine import Pin
class Encoder: class Encoder:
def __init__(self, pin_x, pin_y, scale=1): def __init__(self, pin_a, pin_b, scale=1):
self.scale = scale self.scale = scale
self.forward = True self.forward = True
self.pin_x = pin_x self.pin_a = pin_a
self.pin_y = pin_y self.pin_b = pin_b
self._pos = 0 self._pos = 0
try: try:
self.x_interrupt = pin_x.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.x_callback, hard=True) self.a_interrupt = pin_a.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.a_callback, hard=True)
self.y_interrupt = pin_y.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.y_callback, hard=True) self.b_interrupt = pin_b.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.b_callback, hard=True)
except TypeError: except TypeError:
self.x_interrupt = pin_x.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.x_callback) self.a_interrupt = pin_a.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.a_callback)
self.y_interrupt = pin_y.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.y_callback) self.b_interrupt = pin_b.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.b_callback)
def x_callback(self, pin): def x_callback(self, pin):
self.forward = pin() ^ self.pin_y() self.forward = pin() ^ self.pin_b()
self._pos += 1 if self.forward else -1 self._pos += 1 if self.forward else -1
def y_callback(self, pin): def y_callback(self, pin):
self.forward = self.pin_x() ^ pin() ^ 1 self.forward = self.pin_a() ^ pin() ^ 1
self._pos += 1 if self.forward else -1 self._pos += 1 if self.forward else -1
def position(self, value=None): def position(self, value=None):

14
encoders/encoder.py
Wyświetl plik

@ -6,22 +6,22 @@
import pyb import pyb
class Encoder: class Encoder:
def __init__(self, pin_x, pin_y, reverse, scale): def __init__(self, pin_a, pin_b, reverse, scale):
self.reverse = reverse self.reverse = reverse
self.scale = scale self.scale = scale
self.forward = True self.forward = True
self.pin_x = pin_x self.pin_a = pin_a
self.pin_y = pin_y self.pin_b = pin_b
self._pos = 0 self._pos = 0
self.x_interrupt = pyb.ExtInt(pin_x, pyb.ExtInt.IRQ_RISING_FALLING, pyb.Pin.PULL_NONE, self.x_callback) self.a_interrupt = pyb.ExtInt(pin_a, pyb.ExtInt.IRQ_RISING_FALLING, pyb.Pin.PULL_NONE, self.a_callback)
self.y_interrupt = pyb.ExtInt(pin_y, pyb.ExtInt.IRQ_RISING_FALLING, pyb.Pin.PULL_NONE, self.y_callback) self.b_interrupt = pyb.ExtInt(pin_b, pyb.ExtInt.IRQ_RISING_FALLING, pyb.Pin.PULL_NONE, self.b_callback)
def x_callback(self, line): def x_callback(self, line):
self.forward = self.pin_x.value() ^ self.pin_y.value() ^ self.reverse self.forward = self.pin_a.value() ^ self.pin_b.value() ^ self.reverse
self._pos += 1 if self.forward else -1 self._pos += 1 if self.forward else -1
def y_callback(self, line): def y_callback(self, line):
self.forward = self.pin_x.value() ^ self.pin_y.value() ^ self.reverse ^ 1 self.forward = self.pin_a.value() ^ self.pin_b.value() ^ self.reverse ^ 1
self._pos += 1 if self.forward else -1 self._pos += 1 if self.forward else -1
def position(self): def position(self):

18
encoders/encoder_portable.py
Wyświetl plik

@ -9,25 +9,25 @@
from machine import Pin from machine import Pin
class Encoder: class Encoder:
def __init__(self, pin_x, pin_y, scale=1): def __init__(self, pin_a, pin_b, scale=1):
self.scale = scale self.scale = scale
self.forward = True self.forward = True
self.pin_x = pin_x self.pin_a = pin_a
self.pin_y = pin_y self.pin_b = pin_b
self._pos = 0 self._pos = 0
try: try:
self.x_interrupt = pin_x.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.x_callback, hard=True) self.a_interrupt = pin_a.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.a_callback, hard=True)
self.y_interrupt = pin_y.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.y_callback, hard=True) self.b_interrupt = pin_b.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.b_callback, hard=True)
except TypeError: except TypeError:
self.x_interrupt = pin_x.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.x_callback) self.a_interrupt = pin_a.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.a_callback)
self.y_interrupt = pin_y.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.y_callback) self.b_interrupt = pin_b.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.b_callback)
def x_callback(self, pin): def x_callback(self, pin):
self.forward = pin() ^ self.pin_y() self.forward = pin() ^ self.pin_b()
self._pos += 1 if self.forward else -1 self._pos += 1 if self.forward else -1
def y_callback(self, pin): def y_callback(self, pin):
self.forward = self.pin_x() ^ pin() ^ 1 self.forward = self.pin_a() ^ pin() ^ 1
self._pos += 1 if self.forward else -1 self._pos += 1 if self.forward else -1
def position(self, value=None): def position(self, value=None):

18
encoders/encoder_timed.py
Wyświetl plik

@ -7,29 +7,29 @@ import utime
from machine import Pin, disable_irq, enable_irq from machine import Pin, disable_irq, enable_irq
class EncoderTimed: class EncoderTimed:
def __init__(self, pin_x, pin_y, scale=1): def __init__(self, pin_a, pin_b, scale=1):
self.scale = scale # Optionally scale encoder rate to distance/angle self.scale = scale # Optionally scale encoder rate to distance/angle
self.tprev = 0 self.tprev = 0
self.tlast = 0 self.tlast = 0
self.forward = True self.forward = True
self.pin_x = pin_x self.pin_a = pin_a
self.pin_y = pin_y self.pin_b = pin_b
self._pos = 0 self._pos = 0
try: try:
self.x_interrupt = pin_x.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.x_callback, hard=True) self.a_interrupt = pin_a.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.a_callback, hard=True)
self.y_interrupt = pin_y.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.y_callback, hard=True) self.b_interrupt = pin_b.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.b_callback, hard=True)
except TypeError: except TypeError:
self.x_interrupt = pin_x.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.x_callback) self.a_interrupt = pin_a.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.a_callback)
self.y_interrupt = pin_y.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.y_callback) self.b_interrupt = pin_b.irq(trigger=Pin.IRQ_RISING | Pin.IRQ_FALLING, handler=self.b_callback)
def x_callback(self, line): def x_callback(self, line):
self.forward = self.pin_x.value() ^ self.pin_y.value() self.forward = self.pin_a.value() ^ self.pin_b.value()
self._pos += 1 if self.forward else -1 self._pos += 1 if self.forward else -1
self.tprev = self.tlast self.tprev = self.tlast
self.tlast = utime.ticks_us() self.tlast = utime.ticks_us()
def y_callback(self, line): def y_callback(self, line):
self.forward = self.pin_x.value() ^ self.pin_y.value() ^ 1 self.forward = self.pin_a.value() ^ self.pin_b.value() ^ 1
self._pos += 1 if self.forward else -1 self._pos += 1 if self.forward else -1
self.tprev = self.tlast self.tprev = self.tlast
self.tlast = utime.ticks_us() self.tlast = utime.ticks_us()