From ae58534da22dbc1ed003b53eeff7f363cb82c075 Mon Sep 17 00:00:00 2001
From: martha-johnston <106617924+martha-johnston@users.noreply.github.com>
Date: Tue, 12 Nov 2024 09:32:32 -0500
Subject: [PATCH] RSDK-9136: issues when stopping motor with controls (#4550)

---
 components/motor/gpio/basic.go      |  4 ++++
 components/motor/gpio/basic_test.go | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/components/motor/gpio/basic.go b/components/motor/gpio/basic.go
index 298a0b9d93e..6755f4b03cb 100644
--- a/components/motor/gpio/basic.go
+++ b/components/motor/gpio/basic.go
@@ -102,6 +102,10 @@ func NewMotor(b board.Board, mc Config, name resource.Name, logger logging.Logge
 		m.EnablePinLow = enablePinLow
 	}
 
+	if m.maxRPM == 0 {
+		m.maxRPM = 100
+	}
+
 	return m, nil
 }
 
diff --git a/components/motor/gpio/basic_test.go b/components/motor/gpio/basic_test.go
index ef348463fd3..ada19e63d5f 100644
--- a/components/motor/gpio/basic_test.go
+++ b/components/motor/gpio/basic_test.go
@@ -168,7 +168,7 @@ func TestMotorDirPWM(t *testing.T) {
 			mc.ResourceName(), logger)
 
 		test.That(t, err, test.ShouldBeNil)
-		test.That(t, m.GoFor(ctx, 50, 10, nil), test.ShouldBeError, errors.New("not supported, define max_rpm attribute != 0"))
+		test.That(t, m.GoFor(ctx, 50, 10, nil), test.ShouldBeNil)
 
 		m, err = NewMotor(b, Config{Pins: PinConfig{Direction: "1", EnablePinLow: "2"}, PWMFreq: 4000},
 			mc.ResourceName(), logger)
@@ -191,7 +191,7 @@ func TestMotorDirPWM(t *testing.T) {
 
 	t.Run("motor (DIR/PWM) Off testing", func(t *testing.T) {
 		test.That(t, m.Stop(ctx, nil), test.ShouldBeNil)
-		test.That(t, mustGetGPIOPinByName(b, "1").Get(context.Background()), test.ShouldEqual, false)
+		test.That(t, mustGetGPIOPinByName(b, "1").Get(context.Background()), test.ShouldEqual, true)
 		test.That(t, mustGetGPIOPinByName(b, "2").Get(context.Background()), test.ShouldEqual, true)
 		test.That(t, mustGetGPIOPinByName(b, "1").PWM(context.Background()), test.ShouldEqual, 0)
 		test.That(t, mustGetGPIOPinByName(b, "2").PWM(context.Background()), test.ShouldEqual, 0)
@@ -204,11 +204,11 @@ func TestMotorDirPWM(t *testing.T) {
 
 	t.Run("motor (DIR/PWM) GoFor testing", func(t *testing.T) {
 		test.That(t, m.GoFor(ctx, 50, 0, nil), test.ShouldBeError, motor.NewZeroRevsError())
-		test.That(t, mustGetGPIOPinByName(b, "1").Get(context.Background()), test.ShouldEqual, false)
+		test.That(t, mustGetGPIOPinByName(b, "1").Get(context.Background()), test.ShouldEqual, true)
 		test.That(t, mustGetGPIOPinByName(b, "3").PWM(context.Background()), test.ShouldEqual, 0)
 
 		test.That(t, m.GoFor(ctx, -50, 0, nil), test.ShouldBeError, motor.NewZeroRevsError())
-		test.That(t, mustGetGPIOPinByName(b, "1").Get(context.Background()), test.ShouldEqual, false)
+		test.That(t, mustGetGPIOPinByName(b, "1").Get(context.Background()), test.ShouldEqual, true)
 		test.That(t, mustGetGPIOPinByName(b, "3").PWM(context.Background()), test.ShouldEqual, 0)
 
 		test.That(t, m.Stop(context.Background(), nil), test.ShouldBeNil)
@@ -341,7 +341,7 @@ func TestMotorABNoEncoder(t *testing.T) {
 	test.That(t, err, test.ShouldBeNil)
 
 	t.Run("motor no encoder GoFor testing", func(t *testing.T) {
-		test.That(t, m.GoFor(ctx, 50, 10, nil), test.ShouldBeError, errors.New("not supported, define max_rpm attribute != 0"))
+		test.That(t, m.GoFor(ctx, 50, 10, nil), test.ShouldBeNil)
 	})
 
 	t.Run("motor no encoder GoTo testing", func(t *testing.T) {