firmata: correct problem where last analog pin(s) were being ignored …

…from capabilities query

Signed-off-by: deadprogram <[email protected]>

examples/firmata_grove_sound_sensor.go

@@ -0,0 +1,33 @@
+// +build example
+//
+// Do not build by default.
+
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"gobot.io/x/gobot"
+	"gobot.io/x/gobot/drivers/aio"
+	"gobot.io/x/gobot/platforms/firmata"
+)
+
+func main() {
+	board := firmata.NewAdaptor(os.Args[1])
+	sensor := aio.NewGroveSoundSensorDriver(board, "3")
+
+	work := func() {
+		sensor.On(aio.Data, func(data interface{}) {
+			fmt.Println("sensor", data)
+		})
+	}
+
+	robot := gobot.NewRobot("sensorBot",
+		[]gobot.Connection{board},
+		[]gobot.Device{sensor},
+		work,
+	)
+
+	robot.Start()
+}

platforms/firmata/client/client.go

@@ -340,19 +340,15 @@ func (b *Client) I2cConfig(delay int) error {
 	return b.WriteSysex([]byte{I2CConfig, byte(delay & 0xFF), byte((delay >> 8) & 0xFF)})
 }
 
-func (b *Client) togglePinReporting(pin int, state int, mode byte) error {
+func (b *Client) togglePinReporting(pin int, state int, mode byte) (err error) {
 	if state != 0 {
 		state = 1
 	} else {
 		state = 0
 	}
 
-	if err := b.write([]byte{byte(mode) | byte(pin), byte(state)}); err != nil {
-		return err
-	}
-
-	return nil
-
+	err = b.write([]byte{byte(mode) | byte(pin), byte(state)})
+	return
 }
 
 // WriteSysex writes an arbitrary Sysex command to the microcontroller.
@@ -428,7 +424,7 @@ func (b *Client) process() (err error) {
 			supportedModes := 0
 			n := 0
 
-			for _, val := range currentBuffer[2:(len(currentBuffer) - 5)] {
+			for _, val := range currentBuffer[2 : len(currentBuffer)-1] {
 				if val == 127 {
 					modes := []int{}
 					for _, mode := range []int{Input, Output, Analog, Pwm, Servo} {
@@ -455,8 +451,7 @@ func (b *Client) process() (err error) {
 			pinIndex := 0
 			b.analogPins = []int{}
 
-			for _, val := range currentBuffer[2 : len(b.pins)-1] {
-
+			for _, val := range currentBuffer[2 : len(currentBuffer)-1] {
 				b.pins[pinIndex].AnalogChannel = int(val)
 
 				if val != 127 {

platforms/firmata/client/client_test.go

@@ -97,8 +97,9 @@ func initTestFirmata() *Client {
 func TestPins(t *testing.T) {
 	b := initTestFirmata()
 	b.setConnected(true)
-	//test if functions executes
-	gobottest.Assert(t, len(b.Pins()), 19)
+
+	gobottest.Assert(t, len(b.Pins()), 20)
+	gobottest.Assert(t, len(b.analogPins), 6)
 }
 
 func TestReportVersion(t *testing.T) {