More refactoring, start implementing proportional axis...
This commit is contained in:
parent
cefd6a22b8
commit
b9d02e6482
3 changed files with 64 additions and 41 deletions
|
@ -33,7 +33,7 @@ func timerWatcher(rule *mappingrules.MappingRuleProportionalAxis, channel chan<-
|
||||||
event := rule.TimerEvent()
|
event := rule.TimerEvent()
|
||||||
if event != nil {
|
if event != nil {
|
||||||
channel <- ChannelEvent{
|
channel <- ChannelEvent{
|
||||||
Device: rule.Output.(*mappingrules.RuleTargetModeSelect).Device,
|
Device: rule.Output.Device,
|
||||||
Event: event,
|
Event: event,
|
||||||
Type: ChannelEventTimer,
|
Type: ChannelEventTimer,
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,10 +2,46 @@ package mappingrules
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"slices"
|
"slices"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/holoplot/go-evdev"
|
"github.com/holoplot/go-evdev"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type MappingRuleBase struct {
|
||||||
|
Name string
|
||||||
|
Output RuleTarget
|
||||||
|
Modes []string
|
||||||
|
}
|
||||||
|
|
||||||
|
// A Simple Mapping Rule can map a button to a button or an axis to an axis.
|
||||||
|
type MappingRuleSimple struct {
|
||||||
|
MappingRuleBase
|
||||||
|
Input RuleTarget
|
||||||
|
}
|
||||||
|
|
||||||
|
// A Combo Mapping Rule can require multiple physical button presses for a single output button
|
||||||
|
type MappingRuleCombo struct {
|
||||||
|
MappingRuleBase
|
||||||
|
Inputs []RuleTarget
|
||||||
|
State int
|
||||||
|
}
|
||||||
|
|
||||||
|
type MappingRuleLatched struct {
|
||||||
|
MappingRuleBase
|
||||||
|
Input RuleTarget
|
||||||
|
State bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: How are we going to implement this? It needs to operate on a timer...
|
||||||
|
type MappingRuleProportionalAxis struct {
|
||||||
|
MappingRuleBase
|
||||||
|
Input *RuleTargetAxis
|
||||||
|
Output *RuleTargetButton
|
||||||
|
Sensitivity int32
|
||||||
|
LastValue int32
|
||||||
|
LastEvent time.Time
|
||||||
|
}
|
||||||
|
|
||||||
func (rule *MappingRuleBase) OutputName() string {
|
func (rule *MappingRuleBase) OutputName() string {
|
||||||
return rule.Output.GetDeviceName()
|
return rule.Output.GetDeviceName()
|
||||||
}
|
}
|
||||||
|
@ -92,13 +128,38 @@ func (rule *MappingRuleLatched) MatchEvent(device *evdev.InputDevice, event *evd
|
||||||
}
|
}
|
||||||
|
|
||||||
func (rule *MappingRuleProportionalAxis) MatchEvent(device *evdev.InputDevice, event *evdev.InputEvent, mode *string) *evdev.InputEvent {
|
func (rule *MappingRuleProportionalAxis) MatchEvent(device *evdev.InputDevice, event *evdev.InputEvent, mode *string) *evdev.InputEvent {
|
||||||
// STUB
|
if !rule.MappingRuleBase.modeCheck(mode) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if device != rule.Input.GetDevice() ||
|
||||||
|
event.Code != rule.Input.GetCode() {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// set the last value to the normalized input value
|
||||||
|
rule.LastValue = rule.Input.NormalizeValue(event.Value)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// TimerEvent returns an event when enough time has passed (compared to the last recorded axis value)
|
// TimerEvent returns an event when enough time has passed (compared to the last recorded axis value)
|
||||||
// to emit an event.
|
// to emit an event.
|
||||||
func (rule *MappingRuleProportionalAxis) TimerEvent() *evdev.InputEvent {
|
func (rule *MappingRuleProportionalAxis) TimerEvent() *evdev.InputEvent {
|
||||||
// STUB
|
// This is tighter coupling than we'd like, but it will do for now.
|
||||||
|
// TODO: maybe it would be better to just be more declarative about event types and their inputs and outputs.
|
||||||
|
if rule.LastValue < rule.Input.AxisStart {
|
||||||
|
rule.LastEvent = time.Now()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// calculate target time until next event press
|
||||||
|
// nextEvent := rule.LastEvent + (rule.LastValue)
|
||||||
|
|
||||||
|
// TODO: figure out what the condition should be
|
||||||
|
if false {
|
||||||
|
// TODO: emit event
|
||||||
|
rule.LastEvent = time.Now()
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
|
@ -1,38 +0,0 @@
|
||||||
package mappingrules
|
|
||||||
|
|
||||||
import (
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
type MappingRuleBase struct {
|
|
||||||
Name string
|
|
||||||
Output RuleTarget
|
|
||||||
Modes []string
|
|
||||||
}
|
|
||||||
|
|
||||||
// A Simple Mapping Rule can map a button to a button or an axis to an axis.
|
|
||||||
type MappingRuleSimple struct {
|
|
||||||
MappingRuleBase
|
|
||||||
Input RuleTarget
|
|
||||||
}
|
|
||||||
|
|
||||||
// A Combo Mapping Rule can require multiple physical button presses for a single output button
|
|
||||||
type MappingRuleCombo struct {
|
|
||||||
MappingRuleBase
|
|
||||||
Inputs []RuleTarget
|
|
||||||
State int
|
|
||||||
}
|
|
||||||
|
|
||||||
type MappingRuleLatched struct {
|
|
||||||
MappingRuleBase
|
|
||||||
Input RuleTarget
|
|
||||||
State bool
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: How are we going to implement this? It needs to operate on a timer...
|
|
||||||
type MappingRuleProportionalAxis struct {
|
|
||||||
MappingRuleBase
|
|
||||||
Input RuleTarget
|
|
||||||
Output RuleTarget
|
|
||||||
LastEvent time.Time
|
|
||||||
}
|
|
Loading…
Add table
Add a link
Reference in a new issue