Merge pull request #23 from WildernessLabs/pin_controller

Updates for pin controller pattern
WildernessLabs · Feb 17, 2023 · c6eebf3 · c6eebf3
2 parents bb3822d + 5bb2848
commit c6eebf3
Show file tree

Hide file tree

Showing 47 changed files with 80 additions and 165 deletions.
diff --git a/Source/Button/Driver/Button.cs b/Source/Button/Driver/Button.cs
@@ -19,14 +19,12 @@ public Button(IDigitalInputPort interruptPort)
         /// <summary>
         /// Creates a new Button driver
         /// </summary>
-        /// <param name="device"></param>
         /// <param name="inputPin"></param>
         /// <param name="resistorMode"></param>
         public Button(
-            IDigitalInputController device, 
             IPin inputPin, 
             ResistorMode resistorMode = ResistorMode.InternalPullUp) 
-            : base(device, inputPin, resistorMode)
+            : base(inputPin, resistorMode)
         { }
     }
 }
diff --git a/Source/Button/Sample/Button_Sample/MeadowApp.cs b/Source/Button/Sample/Button_Sample/MeadowApp.cs
@@ -17,7 +17,7 @@ public override Task Initialize()
         {
             Console.WriteLine("Initialize...");
 
-            button = new Button(Device, Device.Pins.D13)
+            button = new Button(Device.Pins.D13)
             {
                 LongClickedThreshold = TimeSpan.FromMilliseconds(1500)
             };

diff --git a/Source/Buzzer/Driver/Buzzer.cs b/Source/Buzzer/Driver/Buzzer.cs
@@ -20,12 +20,10 @@ public Buzzer(IPwmPort port)
         /// <summary>
         /// Creates a new Buzzer driver
         /// </summary>
-        /// <param name="device">The Pwm controller connected to the buzzer (typically Meadow)</param>
         /// <param name="pin">The pin connected to the buzzer/param>
         public Buzzer(
-            IPwmOutputController device, 
             IPin pin)
-            : base(device, pin, new Frequency(440))
+            : base(pin, new Frequency(440))
         { }
     }
 }
diff --git a/Source/Buzzer/Sample/Buzzer_Sample/MeadowApp.cs b/Source/Buzzer/Sample/Buzzer_Sample/MeadowApp.cs
@@ -18,7 +18,7 @@ public override Task Initialize()
         {
             Console.WriteLine("Initialize...");
 
-            buzzer = new Buzzer(Device, Device.Pins.D13);
+            buzzer = new Buzzer(Device.Pins.D13);
 
             return Task.CompletedTask;
         }

diff --git a/Source/FlameSensor/Driver/FlameSensor.cs b/Source/FlameSensor/Driver/FlameSensor.cs
@@ -25,14 +25,9 @@ public FlameSensor(IDigitalInputPort signalPort)
         /// <summary>
         /// Creates a Flame Sensor driver
         /// </summary>
-        /// <param name="device"></param>
         /// <param name="inputPin"></param>
-        public FlameSensor(
-            IDigitalInputController device, 
-            IPin inputPin) 
-            : this(
-                  device.CreateDigitalInputPort(
-                      inputPin, 
+        public FlameSensor(IPin inputPin) 
+            : this(inputPin.CreateDigitalInputPort(
                       InterruptMode.EdgeBoth, 
                       ResistorMode.InternalPullUp, 
                       TimeSpan.Zero, 

diff --git a/Source/FlameSensor/Sample/FlameSensor_Sample/MeadowApp.cs b/Source/FlameSensor/Sample/FlameSensor_Sample/MeadowApp.cs
@@ -17,7 +17,7 @@ public override Task Initialize()
         {
             Console.WriteLine("Initialize...");
 
-            flameSensor = new FlameSensor(Device, Device.Pins.D13);
+            flameSensor = new FlameSensor(Device.Pins.D13);
 
             flameSensor.FlameDetected += (s, e) =>
             {

diff --git a/Source/LEDButton/Driver/LEDButton.cs b/Source/LEDButton/Driver/LEDButton.cs
@@ -34,18 +34,15 @@ public LEDButton(IDigitalInputPort buttonPort, IDigitalOutputPort ledPort)
         /// <summary>
         /// Creates an LEDButton driver
         /// </summary>
-        /// <param name="device"></param>
         /// <param name="buttonPin"></param>
         /// <param name="ledPin"></param>
         /// <param name="resistorMode"></param>
-        public LEDButton(
-            IMeadowDevice device, 
-            IPin buttonPin, 
+        public LEDButton(IPin buttonPin, 
             IPin ledPin, 
             ResistorMode resistorMode = ResistorMode.InternalPullUp)
-            : base(device, buttonPin, resistorMode)
+            : base(buttonPin, resistorMode)
         {
-            led = new Led(device, ledPin);
+            led = new Led(ledPin);
         }
     }
 }
diff --git a/Source/LEDButton/Sample/LEDButton_Sample/MeadowApp.cs b/Source/LEDButton/Sample/LEDButton_Sample/MeadowApp.cs
@@ -17,10 +17,7 @@ public override Task Initialize()
         {
             Console.WriteLine("Initialize...");
 
-            ledButton = new LEDButton(
-                device: Device, 
-                buttonPin: Device.Pins.D12, 
-                ledPin: Device.Pins.D13);
+            ledButton = new LEDButton(buttonPin: Device.Pins.D12, ledPin: Device.Pins.D13);
 
             ledButton.LongClickedThreshold = TimeSpan.FromMilliseconds(1500);
 

diff --git a/Source/LEDSocket/Driver/LEDSocket.cs b/Source/LEDSocket/Driver/LEDSocket.cs
@@ -19,10 +19,9 @@ public LEDSocket(IDigitalOutputPort port)
         /// <summary>
         /// Creates an LEDSocker driver 
         /// </summary>
-        /// <param name="device"></param>
         /// <param name="pin"></param>
-        public LEDSocket(IDigitalOutputController device, IPin pin)
-            : base(device, pin)
+        public LEDSocket(IPin pin)
+            : base(pin)
         { }
     }
 }
diff --git a/Source/LEDSocket/Sample/LEDSocket_Sample/MeadowApp.cs b/Source/LEDSocket/Sample/LEDSocket_Sample/MeadowApp.cs
@@ -17,7 +17,7 @@ public override Task Initialize()
         {
             Console.WriteLine("Initialize...");
 
-            led = new LEDSocket(Device, Device.Pins.D13);
+            led = new LEDSocket(Device.Pins.D13);
 
             return Task.CompletedTask;
         }

diff --git a/Source/LightSensor/Driver/LightSensor.cs b/Source/LightSensor/Driver/LightSensor.cs
@@ -21,17 +21,14 @@ public LightSensor(IAnalogInputPort port) : base(port)
         /// Creates a new LightSensor driver
         /// </summary>
         public LightSensor(
-            IAnalogInputController device, 
             IPin pin, 
             int sampleCount = 5, 
             TimeSpan? sampleInterval = null, 
             Voltage? voltage = null)
-            : this (
-                  device.CreateAnalogInputPort(
-                      pin, 
-                      sampleCount, 
-                      sampleInterval ?? TimeSpan.FromMilliseconds(40), 
-                      voltage ?? new Voltage(3.3)))
+            : this (pin.CreateAnalogInputPort(
+                    sampleCount, 
+                    sampleInterval ?? TimeSpan.FromMilliseconds(40), 
+                    voltage ?? new Voltage(3.3)))
         { }
     }
 }
diff --git a/Source/LightSensor/Sample/LightSensor_Sample/MeadowApp.cs b/Source/LightSensor/Sample/LightSensor_Sample/MeadowApp.cs
@@ -17,7 +17,7 @@ public override Task Initialize()
         {
             Console.WriteLine("Initialize...");
 
-            sensor = new LightSensor(Device, Device.Pins.A01);
+            sensor = new LightSensor(Device.Pins.A01);
 
             var consumer = LightSensor.CreateObserver(
                 handler: result => Console.WriteLine($"Observer filter satisfied: {result.New.Millivolts:N2}mV, old: {result.Old?.Millivolts:N2}mV"),

diff --git a/Source/LineFinder/Driver/LineFinder.cs b/Source/LineFinder/Driver/LineFinder.cs
@@ -38,16 +38,13 @@ public LineFinder(IDigitalInputPort signalPort)
         /// <summary>
         /// Creates a new LineFinder driver
         /// </summary>
-        /// <param name="device"></param>
         /// <param name="inputPin"></param>
-        public LineFinder(IDigitalInputController device, IPin inputPin) 
-            : this(
-                device.CreateDigitalInputPort(
-                    inputPin, 
-                    InterruptMode.EdgeBoth, 
-                    ResistorMode.InternalPullUp,
-                    TimeSpan.Zero,
-                    TimeSpan.FromMilliseconds(25)))
+        public LineFinder(IPin inputPin) 
+            : this(inputPin.CreateDigitalInputPort(
+                   InterruptMode.EdgeBoth, 
+                   ResistorMode.InternalPullUp,
+                   TimeSpan.Zero,
+                   TimeSpan.FromMilliseconds(25)))
         { }
 
         void SignalPortChanged(object sender, DigitalPortResult e)

diff --git a/Source/LineFinder/Sample/LineFinder_Sample/MeadowApp.cs b/Source/LineFinder/Sample/LineFinder_Sample/MeadowApp.cs
@@ -15,7 +15,7 @@ public override Task Initialize()
         {
             Console.WriteLine("Initialize...");
 
-            var lineFinder = new LineFinder(Device, Device.Pins.D13);
+            var lineFinder = new LineFinder(Device.Pins.D13);
 
             lineFinder.ColorChanged += (s, e) =>
             {

diff --git a/Source/LoudnessSensor/Driver/LoudnessSensor.cs b/Source/LoudnessSensor/Driver/LoudnessSensor.cs
@@ -22,14 +22,11 @@ public LoudnessSensor(IAnalogInputPort port) : base(port)
         /// </summary>
         /// <param name="pin">AnalogChannel connected to the sensor.</param>
         public LoudnessSensor(
-            IAnalogInputController device, 
             IPin pin, 
             int sampleCount = 5, 
             TimeSpan? sampleInterval = null, 
             Voltage? voltage = null)
-            : this(
-                  device.CreateAnalogInputPort(
-                      pin, 
+            : this(pin.CreateAnalogInputPort(
                       sampleCount, 
                       sampleInterval ?? TimeSpan.FromMilliseconds(40), 
                       voltage ?? new Voltage(3.3)))

diff --git a/Source/LoudnessSensor/Sample/LoudnessSensor_Sample/MeadowApp.cs b/Source/LoudnessSensor/Sample/LoudnessSensor_Sample/MeadowApp.cs
@@ -17,7 +17,7 @@ public override Task Initialize()
         {
             Console.WriteLine("Initialize...");
 
-            sensor = new LoudnessSensor(Device, Device.Pins.A01);
+            sensor = new LoudnessSensor(Device.Pins.A01);
 
             var consumer = LoudnessSensor.CreateObserver(
                 handler: result => Console.WriteLine($"Observer filter satisfied: {result.New.Millivolts:N2}mV, old: {result.Old?.Millivolts:N2}mV"),

diff --git a/Source/MagneticSwitch/Driver/MagneticSwitch.cs b/Source/MagneticSwitch/Driver/MagneticSwitch.cs
@@ -36,14 +36,9 @@ public MagneticSwitch(IDigitalInputPort signalPort)
         /// <summary>
         /// Creates a MagneticSwitch driver
         /// </summary>
-        /// <param name="device"></param>
         /// <param name="inputPin"></param>
-        public MagneticSwitch(
-            IDigitalInputController device, 
-            IPin inputPin)
-            : this(
-                device.CreateDigitalInputPort(
-                    inputPin, 
+        public MagneticSwitch(IPin inputPin)
+            : this(inputPin.CreateDigitalInputPort(
                     InterruptMode.EdgeBoth, 
                     ResistorMode.InternalPullUp,
                     TimeSpan.Zero,

diff --git a/Source/MagneticSwitch/Sample/MagneticSwitch_Sample/MeadowApp.cs b/Source/MagneticSwitch/Sample/MagneticSwitch_Sample/MeadowApp.cs
@@ -15,7 +15,7 @@ public override Task Initialize()
         {
             Console.WriteLine("Initialize...");
 
-            var magneticSwitch = new MagneticSwitch(Device, Device.Pins.D13);
+            var magneticSwitch = new MagneticSwitch(Device.Pins.D13);
 
             magneticSwitch.Changed += (s, e) =>
             {

diff --git a/Source/MiniPIRMotionSensor/Driver/MiniPIRMotionSensor.cs b/Source/MiniPIRMotionSensor/Driver/MiniPIRMotionSensor.cs
@@ -20,23 +20,18 @@ public MiniPIRMotionSensor(IDigitalInputPort digitalInputPort)
         /// <summary>
         /// Creates a MiniPIRMotionSensor driver
         /// </summary>
-        /// <param name="device">The Meadow device</param>
         /// <param name="pin">The pin connected to the PIR sensor</param>
         /// <param name="interruptMode">The interrupt mode of the pin</param>
         /// <param name="resistorMode">The resistor mode of the pin</param>
         /// <param name="debounceDuration">The debounce duration</param>
         /// <param name="glitchDuration">The glitch duration (can typically be set to zero)</param>
         public MiniPIRMotionSensor(
-            IDigitalInputController device, 
             IPin pin,
-            InterruptMode 
-            interruptMode, 
+            InterruptMode interruptMode, 
             ResistorMode resistorMode, 
             TimeSpan debounceDuration,
             TimeSpan glitchDuration) 
-            : base(
-                  device, 
-                  pin, 
+            : base(pin, 
                   interruptMode, 
                   resistorMode, 
                   debounceDuration, 

diff --git a/Source/MoistureSensor/Driver/MoistureSensor.cs b/Source/MoistureSensor/Driver/MoistureSensor.cs
@@ -23,14 +23,11 @@ public MoistureSensor(IAnalogInputPort port)
         /// </summary>
         /// <param name="pin">AnalogChannel connected to the sensor.</param>
         public MoistureSensor(
-            IAnalogInputController device, 
             IPin pin, 
             int sampleCount = 5, 
             TimeSpan? sampleInterval = null, 
             Voltage? voltage = null)
-            : this(
-                  device.CreateAnalogInputPort(
-                      pin, 
+            : this(pin.CreateAnalogInputPort(
                       sampleCount, 
                       sampleInterval ?? TimeSpan.FromMilliseconds(40), 
                       voltage ?? new Voltage(3.3)))

diff --git a/Source/MoistureSensor/Sample/MoistureSensor_Sample/MeadowApp.cs b/Source/MoistureSensor/Sample/MoistureSensor_Sample/MeadowApp.cs
@@ -17,7 +17,7 @@ public override Task Initialize()
         {
             Console.WriteLine("Initialize...");
 
-            sensor = new MoistureSensor(Device, Device.Pins.A01);
+            sensor = new MoistureSensor(Device.Pins.A01);
 
             var consumer = MoistureSensor.CreateObserver(
                 handler: result => Console.WriteLine($"Observer filter satisfied: {result.New.Millivolts:N2}mV, old: {result.Old?.Millivolts:N2}mV"),

diff --git a/Source/PIRMotionSensor/Driver/PIRMotionSensor.cs b/Source/PIRMotionSensor/Driver/PIRMotionSensor.cs
@@ -20,22 +20,18 @@ public PIRMotionSensor(IDigitalInputPort digitalInputPort)
         /// <summary>
         /// Creates a PIRMotionSensor driver
         /// </summary>
-        /// <param name="device">The Meadow device</param>
         /// <param name="pin">The pin connected to the PIR sensor</param>
         /// <param name="interruptMode">The interrupt mode of the pin</param>
         /// <param name="resistorMode">The resistor mode of the pin</param>
         /// <param name="debounceDuration">The debounce duration</param>
         /// <param name="glitchDuration">The glitch duration (can typically be set to zero)</param>
         public PIRMotionSensor(
-            IDigitalInputController device, 
             IPin pin, 
             InterruptMode interruptMode, 
             ResistorMode resistorMode, 
             TimeSpan debounceDuration, 
             TimeSpan glitchDuration) 
-            : base(
-                  device, 
-                  pin, 
+            : base(pin, 
                   interruptMode, 
                   resistorMode, 
                   debounceDuration, 

diff --git a/Source/Relay/Driver/Relay.cs b/Source/Relay/Driver/Relay.cs
@@ -18,10 +18,9 @@ public Relay(IDigitalOutputPort port)
         /// <summary>
         /// Creates a new Relay driver
         /// </summary>
-        /// <param name="device"></param>
         /// <param name="pin"></param>
-        public Relay(IDigitalOutputController device, IPin pin) 
-            : base(device, pin)
+        public Relay(IPin pin) 
+            : base(pin)
         { }
     }
 }
diff --git a/Source/Relay/Sample/Relay_Sample/MeadowApp.cs b/Source/Relay/Sample/Relay_Sample/MeadowApp.cs
@@ -17,7 +17,7 @@ public override Task Initialize()
         {
             Console.WriteLine("Initialize...");
 
-            relay = new Relay(Device, Device.Pins.D13);
+            relay = new Relay(Device.Pins.D13);
 
             return Task.CompletedTask;
         }

diff --git a/Source/RotaryAngleSensor/Driver/RotaryAngleSensor.cs b/Source/RotaryAngleSensor/Driver/RotaryAngleSensor.cs
@@ -21,8 +21,8 @@ public RotaryAngleSensor(IAnalogInputPort port) : base(port)
         /// Creates a new RotaryAngleSensor driver
         /// </summary>
         /// <param name="pin">AnalogChannel connected to the sensor.</param>
-        public RotaryAngleSensor(IAnalogInputController device, IPin pin, int sampleCount = 5, TimeSpan? sampleInterval = null, Voltage? voltage = null)
-            : this(device.CreateAnalogInputPort(pin, sampleCount, sampleInterval ?? TimeSpan.FromMilliseconds(40), voltage ?? new Voltage(3.3)))
+        public RotaryAngleSensor(IPin pin, int sampleCount = 5, TimeSpan? sampleInterval = null, Voltage? voltage = null)
+            : this(pin.CreateAnalogInputPort(sampleCount, sampleInterval ?? TimeSpan.FromMilliseconds(40), voltage ?? new Voltage(3.3)))
         { }
     }
 }
diff --git a/Source/RotaryAngleSensor/Sample/RotaryAngleSensor_Sample/MeadowApp.cs b/Source/RotaryAngleSensor/Sample/RotaryAngleSensor_Sample/MeadowApp.cs
@@ -17,7 +17,7 @@ public override Task Initialize()
         {
             Console.WriteLine("Initialize...");
 
-            sensor = new RotaryAngleSensor(Device, Device.Pins.A01);
+            sensor = new RotaryAngleSensor(Device.Pins.A01);
 
             var consumer = RotaryAngleSensor.CreateObserver(
                 handler: result => Console.WriteLine($"Observer filter satisfied: {result.New.Millivolts:N2}mV, old: {result.Old?.Millivolts:N2}mV"),

diff --git a/Source/Servo/Driver/Servo.cs b/Source/Servo/Driver/Servo.cs
@@ -19,10 +19,9 @@ public Servo(IPwmPort pwm)
         /// <summary>
         /// Creates a Servo driver
         /// </summary>
-        /// <param name="device"></param>
-        /// <param name="pwm"></param>
-        public Servo(IPwmOutputController device, IPin pwm)
-            : base(device, pwm, NamedServoConfigs.SG90)
+        /// <param name="pwmPin"></param>
+        public Servo(IPin pwmPin)
+            : base(pwmPin, NamedServoConfigs.SG90)
         { }
     }
 }
diff --git a/Source/Servo/Sample/Servo_Sample/MeadowApp.cs b/Source/Servo/Sample/Servo_Sample/MeadowApp.cs
@@ -19,7 +19,7 @@ public override Task Initialize()
         {
             Console.WriteLine("Initialize...");
 
-            servo = new Servo(Device, Device.Pins.D13);
+            servo = new Servo(Device.Pins.D13);
 
             return Task.CompletedTask;
         }