Commit cc390325 authored by simon's avatar simon
Browse files

add reverse mapping

parent 682638aa

joysticks.go

+5 −3
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ var LongPressDelay = time.Second 
type hatAxis struct {

	number uint8

	axis   uint8

	reversed bool

	time   time.Duration

	value  float32

}
@@ -100,6 +101,7 @@ func (d HID) ParcelOutEvents() { 
			case 2:

				h := d.HatAxes[evt.Index]

				v := float32(evt.Value) / maxValue

				if h.reversed{v=-v}

				switch h.axis {

				case 1:

					if c, ok := d.hatPanXEvents[h.number]; ok {
@@ -111,7 +113,7 @@ func (d HID) ParcelOutEvents() { 
					}

				}

				if c, ok := d.hatPositionEvents[h.number]; ok {

					switch d.HatAxes[evt.Index].axis {

					switch h.axis {

					case 1:

						c <- HatPositionEvent{when{toDuration(evt.Time)}, v, d.HatAxes[evt.Index+1].value}

					case 2:
@@ -119,14 +121,14 @@ func (d HID) ParcelOutEvents() { 
					}

				}

				if c, ok := d.hatAngleEvents[h.number]; ok {

					switch d.HatAxes[evt.Index].axis {

					switch h.axis {

					case 1:

						c <- HatAngleEvent{when{toDuration(evt.Time)}, float32(math.Atan2(float64(v), float64(d.HatAxes[evt.Index+1].value)))}

					case 2:

						c <- HatAngleEvent{when{toDuration(evt.Time)}, float32(math.Atan2(float64(d.HatAxes[evt.Index-1].value), float64(v)))}

					}

				}

				d.HatAxes[evt.Index] = hatAxis{h.number, h.axis, toDuration(evt.Time), v}

				d.HatAxes[evt.Index] = hatAxis{h.number, h.axis, h.reversed ,toDuration(evt.Time), v}

			default:

				// log.Println("unknown input type. ",evt.Type & 0x7f)

			}

joysticks_linux.go

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ func (d HID) populate() { 
			d.Buttons[evt.Index] = button{uint8(buttonNumber), toDuration(evt.Time), evt.Value != 0}

			buttonNumber += 1

		case 0x82:

			d.HatAxes[evt.Index] = hatAxis{uint8(hatNumber), uint8(axisNumber), toDuration(evt.Time), float32(evt.Value) / maxValue}

			d.HatAxes[evt.Index] = hatAxis{uint8(hatNumber), uint8(axisNumber), false, toDuration(evt.Time), float32(evt.Value) / maxValue}

			axisNumber += 1

			if axisNumber > 2 {

				axisNumber = 1

joysticks_test.go

+2 −0
Original line number Diff line number Diff line
@@ -130,3 +130,5 @@ func play(s Sound) { 
		panic(err)

	}

}