mirror of
https://github.com/legop3/MultiRoombaRover.git
synced 2026-09-16 01:21:20 -04:00
camera servo speed limit
This commit is contained in:
Vendored
BIN
Binary file not shown.
Vendored
BIN
Binary file not shown.
@@ -7,6 +7,7 @@ import (
|
|||||||
"log"
|
"log"
|
||||||
"math"
|
"math"
|
||||||
"sync"
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
rpio "github.com/stianeikeland/go-rpio/v4"
|
rpio "github.com/stianeikeland/go-rpio/v4"
|
||||||
)
|
)
|
||||||
@@ -17,9 +18,12 @@ type CameraServo struct {
|
|||||||
pin rpio.Pin
|
pin rpio.Pin
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
currentAngle float64
|
currentAngle float64
|
||||||
|
lastMove time.Time
|
||||||
closed bool
|
closed bool
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const maxServoDegPerSec = 10.0
|
||||||
|
|
||||||
func NewCameraServo(cfg CameraServoConfig, logger *log.Logger) (*CameraServo, error) {
|
func NewCameraServo(cfg CameraServoConfig, logger *log.Logger) (*CameraServo, error) {
|
||||||
if !cfg.Enabled {
|
if !cfg.Enabled {
|
||||||
return nil, fmt.Errorf("camera servo disabled")
|
return nil, fmt.Errorf("camera servo disabled")
|
||||||
@@ -68,8 +72,9 @@ func (s *CameraServo) setAngleLocked(angle float64) error {
|
|||||||
return fmt.Errorf("servo closed")
|
return fmt.Errorf("servo closed")
|
||||||
}
|
}
|
||||||
clamped := clampFloat(angle, s.cfg.MinAngle, s.cfg.MaxAngle)
|
clamped := clampFloat(angle, s.cfg.MinAngle, s.cfg.MaxAngle)
|
||||||
s.applyPulseLocked(s.angleToPulse(clamped))
|
limited := s.rateLimitAngleLocked(clamped)
|
||||||
s.currentAngle = clamped
|
s.applyPulseLocked(s.angleToPulse(limited))
|
||||||
|
s.currentAngle = limited
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -95,8 +100,11 @@ func (s *CameraServo) SetPulseWidth(micros int) error {
|
|||||||
if micros <= 0 {
|
if micros <= 0 {
|
||||||
return fmt.Errorf("pulse width must be > 0")
|
return fmt.Errorf("pulse width must be > 0")
|
||||||
}
|
}
|
||||||
s.applyPulseLocked(micros)
|
clampedPulse := clampInt(micros, s.cfg.MinPulseUs, s.cfg.MaxPulseUs)
|
||||||
s.currentAngle = s.pulseToAngle(micros)
|
targetAngle := s.pulseToAngle(clampedPulse)
|
||||||
|
limited := s.rateLimitAngleLocked(targetAngle)
|
||||||
|
s.applyPulseLocked(s.angleToPulse(limited))
|
||||||
|
s.currentAngle = limited
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -111,6 +119,32 @@ func (s *CameraServo) applyPulseLocked(micros int) {
|
|||||||
s.pin.DutyCycle(uint32(micros), uint32(s.cfg.CycleLen))
|
s.pin.DutyCycle(uint32(micros), uint32(s.cfg.CycleLen))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *CameraServo) rateLimitAngleLocked(target float64) float64 {
|
||||||
|
now := time.Now()
|
||||||
|
if s.lastMove.IsZero() {
|
||||||
|
s.lastMove = now
|
||||||
|
return target
|
||||||
|
}
|
||||||
|
elapsed := now.Sub(s.lastMove).Seconds()
|
||||||
|
if elapsed <= 0 {
|
||||||
|
s.lastMove = now
|
||||||
|
return s.currentAngle
|
||||||
|
}
|
||||||
|
maxDelta := maxServoDegPerSec * elapsed
|
||||||
|
delta := target - s.currentAngle
|
||||||
|
if math.Abs(delta) <= maxDelta {
|
||||||
|
s.lastMove = now
|
||||||
|
return target
|
||||||
|
}
|
||||||
|
if delta > 0 {
|
||||||
|
target = s.currentAngle + maxDelta
|
||||||
|
} else {
|
||||||
|
target = s.currentAngle - maxDelta
|
||||||
|
}
|
||||||
|
s.lastMove = now
|
||||||
|
return target
|
||||||
|
}
|
||||||
|
|
||||||
func (s *CameraServo) angleToPulse(angle float64) int {
|
func (s *CameraServo) angleToPulse(angle float64) int {
|
||||||
totalRange := s.cfg.MaxAngle - s.cfg.MinAngle
|
totalRange := s.cfg.MaxAngle - s.cfg.MinAngle
|
||||||
if totalRange == 0 {
|
if totalRange == 0 {
|
||||||
|
|||||||
Reference in New Issue
Block a user