Checkpoint

This commit is contained in:
maze authored and maze committed 2026-10-29 17:29:41 +01:00
1 parent 85a9ec684c
commit c5d6137fab
160 files changed
+76293 -387

No files matched your search

+6 -2
View File
@@ -2,12 +2,16 @@ package input
import (
"fmt"
"time"
"go.maze.io/harmon/config"
"go.maze.io/harmon/hardware"
"periph.io/x/conn/v3/gpio"
"github.com/BeatGlow/beatglow/config"
"github.com/BeatGlow/beatglow/hardware"
)
var LongPressDuration = 450 * time.Millisecond
type Encoder interface {
hardware.Driver
+79 -28
View File
@@ -3,14 +3,15 @@ package input
import (
"encoding/binary"
"errors"
"fmt"
"os"
"path/filepath"
"strings"
"time"
"github.com/sirupsen/logrus"
"go.maze.io/harmon/hardware"
"periph.io/x/conn/v3/gpio"
"github.com/BeatGlow/beatglow/hardware"
)
const (
@@ -20,28 +21,57 @@ const (
)
type devInputEncoder struct {
path string
click gpio.PinIn
path string
button *linuxButton
rotary *linuxRotary
}
func newDevInputEncoder(click string) (enc Encoder, err error) {
e := new(devInputEncoder)
if e.click, err = hardware.LookupPin(click); err != nil {
return
}
var ps []*linuxPheripheral
if ps, err = linuxPheripherals(); err != nil {
return
}
var (
rotary *linuxRotary
button *linuxButton
)
for _, p := range ps {
if strings.HasPrefix(p.name, "rotary@") {
e.path = p.path
return e, nil
switch {
case strings.HasPrefix(p.name, "rotary@"):
rotary = &linuxRotary{p: p}
case strings.HasPrefix(p.name, "button@") && (click == "" || strings.HasSuffix(p.name, "@"+click)):
button = &linuxButton{p: p}
}
}
return nil, errors.New("no rotary encoders found in " + procInputDevices)
if rotary == nil {
return nil, errors.New("no rotary encoder found, is the rotary_encoder dtoveraly loaded?")
}
if button == nil {
return nil, errors.New("no button found, is the gpio-key dtoverlay loaded?")
}
return &devInputEncoder{
button: button,
rotary: rotary,
}, nil
}
func (e devInputEncoder) Halt() error {
return nil
}
func (e devInputEncoder) Type() string {
return e.path
}
func (e devInputEncoder) Events() (<-chan hardware.InputEvent, error) {
events := make(chan hardware.InputEvent, 8)
go e.rotary.readEvents(events)
go e.button.readEvents(events)
return events, nil
}
type linuxPheripheral struct {
@@ -146,6 +176,10 @@ type linuxInputEvent struct {
Value int32
}
func (e linuxInputEvent) String() string {
return fmt.Sprintf("time=%s type=%#04x code=%#04x value=%d", e.Time(), e.Type, e.Code, e.Value)
}
func (e linuxInputEvent) Time() time.Time {
return time.Unix(int64(e.Secs), int64(e.USecs))
}
@@ -180,38 +214,47 @@ func (s *linuxButton) Name() string {
return s.p.name
}
func (s *linuxButton) Events() (<-chan Event, error) {
func (s *linuxButton) Events() (<-chan hardware.InputEvent, error) {
log := logrus.
WithField("input", "button").
WithField("path", s.p.path)
log.Debug("opening linux button source")
events := make(chan Event)
events := make(chan hardware.InputEvent)
go s.readEvents(events)
return events, nil
}
func (s *linuxButton) readEvents(events chan<- Event) {
func (s *linuxButton) readEvents(events chan<- hardware.InputEvent) {
defer close(events)
log := logrus.
WithField("input", "button").
WithField("path", s.p.path)
var last time.Time
err := readLinuxInputEvents(s.p.path, func(ev linuxInputEvent) error {
log.WithField("data", ev).Debug("button event")
if ev.Code == 0 {
return nil // not sure what this is
return nil // Ignore
}
var pressed bool
if ev.Value == 1 {
pressed = true
log.WithField("data", ev).Trace("button event")
var event hardware.InputEvent
switch ev.Value {
case 0: // Released
if ev.Time().Sub(last) > LongPressDuration {
event = hardware.RotaryLongPressEvent{Time: ev.Time()}
} else {
event = hardware.RotaryPressEvent{Time: ev.Time()}
}
case 1: // Pressed
last = ev.Time()
return nil
}
select {
case events <- NewButtonEvent(s, pressed):
case events <- event:
default:
log.Warn("dropping event")
}
@@ -235,18 +278,18 @@ func (s *linuxRotary) Name() string {
return s.p.name
}
func (s *linuxRotary) Events() (<-chan Event, error) {
func (s *linuxRotary) Events() (<-chan hardware.InputEvent, error) {
log := logrus.
WithField("input", "rotary").
WithField("path", s.p.path)
log.Debug("opening linux rotary source")
events := make(chan Event)
events := make(chan hardware.InputEvent)
go s.readEvents(events)
return events, nil
}
func (s *linuxRotary) readEvents(events chan<- Event) {
func (s *linuxRotary) readEvents(events chan<- hardware.InputEvent) {
defer close(events)
log := logrus.
@@ -254,10 +297,18 @@ func (s *linuxRotary) readEvents(events chan<- Event) {
WithField("path", s.p.path)
err := readLinuxInputEvents(s.p.path, func(ev linuxInputEvent) error {
log.WithField("data", ev).Debug("rotary event")
if ev.Value == 0 {
return nil // Ignore
}
log.WithField("data", ev).Trace("rotary event")
event := hardware.RotaryEvent{
Time: ev.Time(),
Delta: int(ev.Value),
}
select {
case events <- NewRotaryEvent(s, int(ev.Value), ev.Value == 0):
case events <- event:
default:
log.Warn("dropping event")
}