Fix rgb driver color handling

xanecs · xanecs · commit 56815ccb0e7e · 2017-03-17T22:38:24.000+01:00
diff --git a/config.toml b/config.toml
@@ -6,10 +6,10 @@ topic = "lighthouse"
   [boards.alpha]
   serial = "/dev/ttyUSB0"
     [boards.alpha.dev]
-      [boards.alpha.dev.led]
-      mode = "pwm"
+      [boards.alpha.dev.rgb]
+      mode = "rgb"
       inverted = false
-      pins = ["9"]
+      pins = ["9", "10", "11"]
 
       [boards.alpha.dev.internal]
       mode = "direct"
diff --git a/driver/rgb.go b/driver/rgb.go
@@ -88,15 +88,15 @@ func parseColor(params map[string]interface{}) (color, error) {
 		return color{}, errors.New("Missing color parameters")
 	}
 
-	red, okR := valR.(byte)
-	green, okG := valG.(byte)
-	blue, okB := valB.(byte)
+	red, okR := valR.(float64)
+	green, okG := valG.(float64)
+	blue, okB := valB.(float64)
 
 	if !(okR && okG && okB) {
 		return color{}, errors.New("Invalid color parameters")
 	}
 
-	return color{red, green, blue}, nil
+	return color{uint8(red), uint8(green), uint8(blue)}, nil
 }
 
 func newRgbDriver(cfg config.DeviceConfig, connection gpio.DigitalWriter) (*rgbDriver, error) {

Original file line number	Diff line number	Diff line change
`@@ -88,15 +88,15 @@ func parseColor(params map[string]interface{}) (color, error) {`
`88`	`88`	`return color{}, errors.New("Missing color parameters")`
`89`	`89`	`}`
`90`	`90`
`91`		`- red, okR := valR.(byte)`
`92`		`- green, okG := valG.(byte)`
`93`		`- blue, okB := valB.(byte)`
	`91`	`+ red, okR := valR.(float64)`
	`92`	`+ green, okG := valG.(float64)`
	`93`	`+ blue, okB := valB.(float64)`
`94`	`94`
`95`	`95`	`if !(okR && okG && okB) {`
`96`	`96`	`return color{}, errors.New("Invalid color parameters")`
`97`	`97`	`}`
`98`	`98`
`99`		`- return color{red, green, blue}, nil`
	`99`	`+ return color{uint8(red), uint8(green), uint8(blue)}, nil`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`func newRgbDriver(cfg config.DeviceConfig, connection gpio.DigitalWriter) (*rgbDriver, error) {`