kopia lustrzana https://github.com/peterhinch/micropython-samples
Encoders: add changes suggested by IhorNehrutsa.
rodzic
f8e7ebabae
commit
577a3ab67b
|
@ -61,7 +61,7 @@ class Encoder:
|
|||
|
||||
def position(self, value=None):
|
||||
if value is not None:
|
||||
self._pos = value // self.scale
|
||||
self._pos = round(value / self.scale)
|
||||
return self._pos * self.scale
|
||||
```
|
||||
If the direction is incorrect, transpose the X and Y pins in the constructor
|
||||
|
|
|
@ -24,8 +24,10 @@ class Encoder:
|
|||
self.forward = self.pin_x.value() ^ self.pin_y.value() ^ self.reverse ^ 1
|
||||
self._pos += 1 if self.forward else -1
|
||||
|
||||
def position(self):
|
||||
return self._pos*self.scale
|
||||
def position(self, value=None):
|
||||
if value is not None:
|
||||
self._pos = round(value / self.scale)
|
||||
return self._pos * self.scale
|
||||
|
||||
def reset(self):
|
||||
self._pos = 0
|
||||
|
|
|
@ -32,5 +32,5 @@ class Encoder:
|
|||
|
||||
def position(self, value=None):
|
||||
if value is not None:
|
||||
self._pos = value // self.scale
|
||||
self._pos = round(value / self.scale) # # Improvement provided by @IhorNehrutsa
|
||||
return self._pos * self.scale
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
# Copyright (c) 2016-2021 Peter Hinch
|
||||
# Released under the MIT License (MIT) - see LICENSE file
|
||||
# Improvements provided by IhorNehrutsa
|
||||
|
||||
import utime
|
||||
from machine import Pin, disable_irq, enable_irq
|
||||
|
@ -9,8 +10,8 @@ from machine import Pin, disable_irq, enable_irq
|
|||
class EncoderTimed:
|
||||
def __init__(self, pin_x, pin_y, scale=1):
|
||||
self.scale = scale # Optionally scale encoder rate to distance/angle
|
||||
self.tprev = 0
|
||||
self.tlast = 0
|
||||
self.tprev = -1
|
||||
self.tlast = -1
|
||||
self.forward = True
|
||||
self.pin_x = pin_x
|
||||
self.pin_y = pin_y
|
||||
|
@ -39,14 +40,20 @@ class EncoderTimed:
|
|||
tlast = self.tlast # Cache current values
|
||||
tprev = self.tprev
|
||||
enable_irq(state)
|
||||
if utime.ticks_diff(utime.ticks_us(), tlast) > 2_000_000: # It's stopped
|
||||
result = 0.0
|
||||
else:
|
||||
result = 1000000.0/(utime.ticks_diff(tlast, tprev))
|
||||
result *= self.scale
|
||||
if self.tprev == -1: # No valid times yet
|
||||
return 0.0
|
||||
dt = utime.ticks_diff(utime.ticks_us(), tlast)
|
||||
if dt > 2_000_000: # Stopped
|
||||
return 0.0
|
||||
dt = utime.ticks_diff(tlast, tprev)
|
||||
if dt == 0: # Could happen on future rapid hardware
|
||||
return 0.0
|
||||
result = self.scale * 1_000_000.0/dt
|
||||
return result if self.forward else -result
|
||||
|
||||
def position(self):
|
||||
def position(self, value=None):
|
||||
if value is not None:
|
||||
self._pos = round(value / self.scale)
|
||||
return self._pos * self.scale
|
||||
|
||||
def reset(self):
|
||||
|
|
Ładowanie…
Reference in New Issue