Merge pull request hybridgroup#555 from imathno/fix-DPAD

Fix joystick driver to detect dpad input for xbox controllers
foreignspy · May 25, 2018 · ed867b9 · ed867b9
2 parents 5c6e47a + 7beb0ec
commit ed867b9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/platforms/joystick/joystick_driver.go b/platforms/joystick/joystick_driver.go
@@ -118,7 +118,8 @@ func (j *Driver) Start() (err error) {
 		j.AddEvent(value.Name)
 	}
 	for _, value := range j.config.Hats {
-		j.AddEvent(value.Name)
+		j.AddEvent(fmt.Sprintf("%s_press", value.Name))
+		j.AddEvent(fmt.Sprintf("%s_release", value.Name))
 	}
 
 	go func() {
@@ -144,6 +145,8 @@ func (j *Driver) Halt() (err error) {
 	return
 }
 
+var previousHat = ""
+
 // HandleEvent publishes an specific event according to data received
 func (j *Driver) handleEvent(event sdl.Event) error {
 	switch data := event.(type) {
@@ -172,8 +175,13 @@ func (j *Driver) handleEvent(event sdl.Event) error {
 			hat := j.findHatName(data.Value, data.Hat, j.config.Hats)
 			if hat == "" {
 				return fmt.Errorf("Unknown Hat: %v %v", data.Hat, data.Value)
+			} else if hat == "released" {
+				hat = previousHat
+				j.Publish(j.Event(fmt.Sprintf("%s_release", hat)), true)
+			} else {
+				previousHat = hat
+				j.Publish(j.Event(fmt.Sprintf("%s_press", hat)), true)
 			}
-			j.Publish(j.Event(hat), true)
 		}
 	}
 	return nil

diff --git a/platforms/joystick/joystick_driver_test.go b/platforms/joystick/joystick_driver_test.go
@@ -100,7 +100,7 @@ func TestDriverHandleEvent(t *testing.T) {
 	}
 
 	// down button press
-	d.On(d.Event("down"), func(data interface{}) {
+	d.On(d.Event("down_press"), func(data interface{}) {
 		sem <- true
 	})
 	d.handleEvent(&sdl.JoyHatEvent{