Fix beaglebone black issues

grassespi · Jun 6, 2014 · bd3599d · bd3599d
1 parent fc124dd
commit bd3599d
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 11 deletions.
diff --git a/device.go b/device.go
diff --git a/driver.go b/driver.go
diff --git a/examples/beaglebone_led_brightness_with_analog_input.go b/examples/beaglebone_led_brightness_with_analog_input.go
@@ -16,9 +16,9 @@ func main() {
 	led := gpio.NewLedDriver(beagleboneAdaptor, "led", "P9_14")
 
 	work := func() {
-		gobot.Every(0.1*time.Second, func() {
+		gobot.Every(100*time.Millisecond, func() {
 			val := sensor.Read()
-			brightness := uint8(gpio.ToPwm(val))
+			brightness := uint8(gobot.ToScale(gobot.FromScale(float64(val), 0, 1024), 0, 255))
 			fmt.Println("sensor", val)
 			fmt.Println("brightness", brightness)
 			led.Brightness(brightness)

diff --git a/examples/firmata_makey_button.go b/examples/firmata_makey_button.go
diff --git a/examples/sphero_api.go b/examples/sphero_api.go
diff --git a/examples/sphero_master.go b/examples/sphero_master.go
diff --git a/platforms/beaglebone/beaglebone_adaptor.go b/platforms/beaglebone/beaglebone_adaptor.go
@@ -173,7 +173,7 @@ func (b *BeagleboneAdaptor) I2cWrite(data []byte) {
 	b.i2cDevice.write(data)
 }
 
-func (b *BeagleboneAdaptor) I2cRead(size byte) []byte {
+func (b *BeagleboneAdaptor) I2cRead(size uint) []byte {
 	return b.i2cDevice.read(size)
 }
 

diff --git a/platforms/beaglebone/i2c_device.go b/platforms/beaglebone/i2c_device.go
@@ -38,7 +38,7 @@ func (me *i2cDevice) write(data []byte) {
 	me.i2cDevice.Write(data)
 }
 
-func (me *i2cDevice) read(len byte) []byte {
+func (me *i2cDevice) read(len uint) []byte {
 	buf := make([]byte, len)
 	me.i2cDevice.Read(buf)
 	return buf

diff --git a/platforms/gpio/analog_sensor_driver.go b/platforms/gpio/analog_sensor_driver.go
@@ -9,7 +9,7 @@ type AnalogSensorDriver struct {
 	Adaptor AnalogReader
 }
 
-func NewAnalogSensor(a AnalogReader, name string, pin string) *AnalogSensorDriver {
+func NewAnalogSensorDriver(a AnalogReader, name string, pin string) *AnalogSensorDriver {
 	return &AnalogSensorDriver{
 		Driver: gobot.Driver{
 			Name: name,

diff --git a/platforms/gpio/analog_sensor_driver_test.go b/platforms/gpio/analog_sensor_driver_test.go
@@ -12,7 +12,7 @@ var _ = Describe("Analog-Sensor", func() {
 	)
 
 	BeforeEach(func() {
-		a = NewAnalogSensor(t, "bot", "1")
+		a = NewAnalogSensorDriver(t, "bot", "1")
 	})
 
 	It("Must be able to Read", func() {

diff --git a/platforms/gpio/makey_button_driver.go b/platforms/gpio/makey_button_driver.go
diff --git a/platforms/gpio/utils.go b/platforms/gpio/utils.go
@@ -31,8 +31,3 @@ type DigitalWriter interface {
 type DigitalReader interface {
 	DigitalRead(string) int
 }
-
-// convert to PWM value from analog reading
-func ToPwm(i int) byte {
-	return byte((255 / 1023.0) * float64(i))
-}
diff --git a/test_helper.go b/test_helper.go