From 9d65315b48d13ac128dd821005d393dd0ec71dd1 Mon Sep 17 00:00:00 2001
From: Filip Strajnar <filip.strajnar@gmail.com>
Date: Fri, 27 Sep 2024 23:42:16 +0200
Subject: [PATCH] Reworked code to use PwmWrapper instead of GpioService.

---
 Proculite.GpioRest/Models/PinValueModel.cs |  6 ++--
 Proculite.GpioRest/Services/GpioService.cs | 32 +++++++---------------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/Proculite.GpioRest/Models/PinValueModel.cs b/Proculite.GpioRest/Models/PinValueModel.cs
index 1767b67..c1561a0 100644
--- a/Proculite.GpioRest/Models/PinValueModel.cs
+++ b/Proculite.GpioRest/Models/PinValueModel.cs
@@ -3,12 +3,10 @@ using System.Text.Json.Serialization;
 
 namespace Proculite.GpioRest.Models
 {
-    public class PinValueModel(int pinNumber, PinValue pinValue)
+    public class PinValueModel(int pinNumber, double value)
     {
         public int PinNumber { get; set; } = pinNumber;
 
-        [JsonIgnore]
-        public PinValue PinValue { get; set; } = pinValue;
-        public int Value => PinValue == PinValue.High ? 1 : 0;
+        public double PinValue { get; set; } = value;
     }
 }
diff --git a/Proculite.GpioRest/Services/GpioService.cs b/Proculite.GpioRest/Services/GpioService.cs
index c64fe36..398af0b 100644
--- a/Proculite.GpioRest/Services/GpioService.cs
+++ b/Proculite.GpioRest/Services/GpioService.cs
@@ -1,5 +1,6 @@
 using System.Device.Gpio;
 using Proculite.GpioRest.Models;
+using Proculite.GpioRest.Wrappers;
 
 namespace Proculite.GpioRest.Services
 {
@@ -7,7 +8,7 @@ namespace Proculite.GpioRest.Services
     {
         public readonly ILogger<GpioService> _logger;
         private readonly int[] _pins;
-        private readonly GpioController _gpioController;
+        private readonly Dictionary<int, PwmWrapper> _pwmPins;
 
         public GpioService(ILogger<GpioService> logger, IConfiguration configuration)
         {
@@ -18,7 +19,6 @@ namespace Proculite.GpioRest.Services
                 .Select(pin => pin.Get<int>())
                 .ToArray();
 
-            _gpioController = new GpioController();
             SetupPins();
         }
 
@@ -29,29 +29,18 @@ namespace Proculite.GpioRest.Services
 
             foreach (var pin in _pins)
             {
-                if (_gpioController.IsPinOpen(pin))
-                {
-                    _logger.LogWarning("Pin number {Pin} is already open.", pin);
-                    continue;
-                }
-
-                if (!_gpioController.IsPinModeSupported(pin, pinMode))
-                {
-                    _logger.LogWarning("Pin number {Pin} does not support {PinMode}", pin, pinMode);
-                }
-
-                _gpioController.OpenPin(pin, pinMode, PinValue.Low);
+                _pwmPins[pin] = new PwmWrapper(pin);
             }
         }
 
-        public PinValue CurrentPinValue(int pinNumber)
+        public PinValueModel CurrentPinValue(int pinNumber)
         {
-            return _gpioController.Read(pinNumber);
+            return new PinValueModel(pinNumber, _pwmPins[pinNumber].Value);
         }
 
         public PinValueModel PinValueModelOfPin(int pinNumber)
         {
-            return new PinValueModel(pinNumber, _gpioController.Read(pinNumber));
+            return new PinValueModel(pinNumber, _pwmPins[pinNumber].Value);
         }
 
         public PinValueModel[] StateOfAllPins()
@@ -61,19 +50,18 @@ namespace Proculite.GpioRest.Services
 
         public void SetPinHigh(int pinNumber)
         {
-            _gpioController.Write(pinNumber, PinValue.High);
+            _pwmPins[pinNumber].SetHigh();
         }
 
         public void SetPinLow(int pinNumber)
         {
-            _gpioController.Write(pinNumber, PinValue.Low);
+            _pwmPins[pinNumber].SetLow();
         }
 
         public void TogglePin(int pinNumber)
         {
-            PinValue currentValue = CurrentPinValue(pinNumber);
-            PinValue newValue = currentValue == PinValue.High ? PinValue.Low : PinValue.High;
-            _gpioController.Write(pinNumber, newValue);
+            double currentValue = _pwmPins[pinNumber].Value;
+            _pwmPins[pinNumber].Value = currentValue > 0 ? 0 : 1;
         }
 
         public PinValueModel SetPinHighReturning(int pinNumber)