add support for Launchpad MK2

Author: rainu

README.md

@@ -1,7 +1,7 @@
 # launchpad 
-A package allows you to talk to your Novation Launchpad S in Go. Light buttons or read your touches.
+A package allows you to talk to your Novation Launchpad S or Launchpad MK2 in Go. Light buttons or read your touches.
 
-This library is currently only working with Launchpad S (Green-Red Launchpads)
+This library is currently only working with Launchpad S (Green-Red Launchpads) and Launchpad MK2 (RGB)
 
 ## Usage
 Initialize a new Launchpad. If there are no currently connected Launchpad
@@ -53,6 +53,7 @@ The coordinate system is illustrated below.
 +--------- arrow keys -----------+  +--- mode keys ---+
 {0, 8} {1, 8} {2, 8} {3, 8} {4, 8} {5, 8} {6, 8} {7, 8} | ableton
 ----------------------------------------------------------------
+----------------------------------------------------------------
 {0, 0} {1, 0} {2, 0} {3, 0} {4, 0} {5, 0} {6, 0} {7, 0} | {8, 0} vol
 ----------------------------------------------------------------
 {0, 1} {1, 1} {2, 1} {3, 1} {4, 1} {5, 1} {6, 1} {7, 1} | {8, 1} pan
@@ -100,7 +101,7 @@ func main() {
     for {
         select {
         case hit := <-hits:
-            pad.Light(hit.X, hit.Y, 3, 3)
+            pad.Light(hit.X, hit.Y, launchpad.ColorS{3, 3})
         }
     }
 }
@@ -128,7 +129,7 @@ func main() {
     pad.Clear()
 
     // Send Text-Loop
-    pad.Text(3, 0).Add(7, "Hello World!").Perform()
+    pad.Text(launchpad.ColorS{3, 0}).Add(7, "Hello World!").Perform()
 
     marker, err := pad.ListenToScrollTextEndMarker()
     if err != nil {

cmd/helloworld/launchpad_mk2/main.go

@@ -0,0 +1,73 @@
+package main
+
+import (
+	// replace with e.g. "gitlab.com/gomidi/rtmididrv" for real midi connections
+	driver "gitlab.com/gomidi/midi/testdrv"
+	"time"
+
+	"github.com/rainu/launchpad"
+	"log"
+)
+
+func main() {
+	pad, err := launchpad.NewLaunchpad(driver.New("fake"))
+	if err != nil {
+		log.Fatalf("error while openning connection to launchpad: %v", err)
+	}
+	defer pad.Close()
+
+	pad.Clear()
+
+	// Set <0,8> to yellow (via RGB mode).
+	pad.Light(0, 8, launchpad.ColorMK2RGB{16, 16, 0})
+
+	// Set <1,8> to yellow (via RGB mode).
+	pad.Light(1, 8, launchpad.ColorMK2{15})
+
+	// Show the whole color palette
+	c := 0
+	for x := 0; x < 8; x++ {
+		for y := 0; y < 8; y++ {
+			pad.Light(x, y, launchpad.ColorMK2{c})
+			c++
+		}
+	}
+	time.Sleep(5 * time.Second)
+	for x := 0; x < 8; x++ {
+		for y := 0; y < 8; y++ {
+			pad.Light(x, y, launchpad.ColorMK2{c})
+			c++
+		}
+	}
+
+	pad.Text(launchpad.ColorMK2{9}).
+		Add(7, "Hello ").
+		Add(1, "World!").
+		Perform()
+
+	hits, err := pad.ListenToHits()
+	if err != nil {
+		panic(err)
+	}
+
+	marker, err := pad.ListenToScrollTextEndMarker()
+	if err != nil {
+		panic(err)
+	}
+
+	for {
+		select {
+		case hit := <-hits:
+			log.Printf("Button pressed at <x=%d, y=%d>", hit.X, hit.Y)
+			// Turn to green.
+			if hit.Down {
+				pad.Light(hit.X, hit.Y, launchpad.ColorMK2{13})
+			} else {
+				pad.Light(hit.X, hit.Y, launchpad.ColorMK2RGB{0, 16, 16})
+			}
+		case <-marker:
+			log.Print("Text ends")
+		}
+
+	}
+}

cmd/helloworld/main.go renamed to cmd/helloworld/launchpad_s/main.go

@@ -18,9 +18,9 @@ func main() {
 	pad.Clear()
 
 	// Set <0,0> to yellow.
-	pad.Light(0, 0, 2, 2)
+	pad.Light(0, 0, launchpad.ColorS{2, 2})
 
-	pad.Text(3, 0).
+	pad.Text(launchpad.ColorS{3, 0}).
 		Add(7, "Hello ").
 		Add(1, "World!").
 		Perform()
@@ -41,9 +41,9 @@ func main() {
 			log.Printf("Button pressed at <x=%d, y=%d>", hit.X, hit.Y)
 			// Turn to green.
 			if hit.Down {
-				pad.Light(hit.X, hit.Y, 0, 3)
+				pad.Light(hit.X, hit.Y, launchpad.ColorS{0, 3})
 			} else {
-				pad.Light(hit.X, hit.Y, 3, 0)
+				pad.Light(hit.X, hit.Y, launchpad.ColorS{3, 0})
 			}
 		case <-marker:
 			log.Print("Text ends")

event_mk2.go

@@ -0,0 +1,110 @@
+package launchpad
+
+import (
+	"gitlab.com/gomidi/midi"
+	"gitlab.com/gomidi/midi/midimessage/channel"
+	"gitlab.com/gomidi/midi/reader"
+)
+
+func (l *LaunchpadMK2) listen() error {
+	rd := reader.New(
+		reader.NoLogger(),
+		// write every message to the out port
+		reader.Each(l.handleMidiMessage),
+	)
+
+	if !l.inputStream.IsOpen() {
+		if err := l.inputStream.Open(); err != nil {
+			return err
+		}
+	}
+
+	if err := rd.ListenTo(l.inputStream); err != nil {
+		return err
+	}
+
+	l.isListening = true
+	return nil
+}
+
+func (l *LaunchpadMK2) handleMidiMessage(pos *reader.Position, msg midi.Message) {
+	l.listenerMutex.RLock()
+	defer l.listenerMutex.RUnlock()
+
+	for i := range l.listener {
+		//delegate to listener
+		l.listener[i](pos, msg)
+	}
+}
+
+func (l *LaunchpadMK2) addMidiMessageListener(listener func(pos *reader.Position, msg midi.Message)) {
+	l.listenerMutex.Lock()
+	defer l.listenerMutex.Unlock()
+
+	l.listener = append(l.listener, listener)
+}
+
+func (l *LaunchpadMK2) ListenToHits() (<-chan Hit, error) {
+	if !l.isListening {
+		if err := l.listen(); err != nil {
+			return nil, err
+		}
+	}
+
+	hitChan := make(chan Hit) //unbuffered/blocking channel
+
+	l.addMidiMessageListener(func(pos *reader.Position, msg midi.Message) {
+		isHit := false
+		hit := Hit{
+			X:    0,
+			Y:    0,
+			Down: false,
+		}
+
+		if controlChange, ok := msg.(channel.ControlChange); ok {
+			if controlChange.Controller() >= 104 && controlChange.Controller() <= 112 {
+				isHit = true
+
+				hit.X = int(controlChange.Controller()) - 104
+				hit.Y = 8
+				hit.Down = controlChange.Value() == 127
+			}
+		} else if noteOn, ok := msg.(channel.NoteOn); ok {
+			isHit = true
+			hit.Down = true
+
+			hit.X = int(noteOn.Key())%10 - 1
+			hit.Y = 8 - (int(noteOn.Key())-hit.X)/10
+		} else if noteOn, ok := msg.(channel.NoteOff); ok {
+			isHit = true
+			hit.Down = false
+
+			hit.X = int(noteOn.Key())%10 - 1
+			hit.Y = 8 - (int(noteOn.Key())-hit.X)/10
+		}
+
+		if isHit {
+			hitChan <- hit
+		}
+	})
+
+	return hitChan, nil
+}
+
+func (l *LaunchpadMK2) ListenToScrollTextEndMarker() (<-chan interface{}, error) {
+	if !l.isListening {
+		if err := l.listen(); err != nil {
+			return nil, err
+		}
+	}
+
+	markerChan := make(chan interface{}) //unbuffered/blocking channel
+
+	l.addMidiMessageListener(func(pos *reader.Position, msg midi.Message) {
+		if controlChange, ok := msg.(channel.ControlChange); ok && controlChange.Value() == 3 {
+			markerChan <- true
+		}
+	})
+
+	return markerChan, nil
+}

event.go renamed to event_s.go

@@ -6,13 +6,7 @@ import (
 	"gitlab.com/gomidi/midi/reader"
 )
 
-type Hit struct {
-	X    int
-	Y    int
-	Down bool
-}
-
-func (l *launchpad) listen() error {
+func (l *LaunchpadS) listen() error {
 	rd := reader.New(
 		reader.NoLogger(),
 		// write every message to the out port
@@ -33,7 +27,7 @@ func (l *launchpad) listen() error {
 	return nil
 }
 
-func (l *launchpad) handleMidiMessage(pos *reader.Position, msg midi.Message) {
+func (l *LaunchpadS) handleMidiMessage(pos *reader.Position, msg midi.Message) {
 	l.listenerMutex.RLock()
 	defer l.listenerMutex.RUnlock()
 
@@ -43,14 +37,14 @@ func (l *launchpad) handleMidiMessage(pos *reader.Position, msg midi.Message) {
 	}
 }
 
-func (l *launchpad) addMidiMessageListener(listener func(pos *reader.Position, msg midi.Message)) {
+func (l *LaunchpadS) addMidiMessageListener(listener func(pos *reader.Position, msg midi.Message)) {
 	l.listenerMutex.Lock()
 	defer l.listenerMutex.Unlock()
 
 	l.listener = append(l.listener, listener)
 }
 
-func (l *launchpad) ListenToHits() (<-chan Hit, error) {
+func (l *LaunchpadS) ListenToHits() (<-chan Hit, error) {
 	if !l.isListening {
 		if err := l.listen(); err != nil {
 			return nil, err
@@ -97,7 +91,7 @@ func (l *launchpad) ListenToHits() (<-chan Hit, error) {
 	return hitChan, nil
 }
 
-func (l *launchpad) ListenToScrollTextEndMarker() (<-chan interface{}, error) {
+func (l *LaunchpadS) ListenToScrollTextEndMarker() (<-chan interface{}, error) {
 	if !l.isListening {
 		if err := l.listen(); err != nil {
 			return nil, err