From 238915b8cde54c604bd9f0c4f190fa8be80d9d46 Mon Sep 17 00:00:00 2001 From: Filip Strajnar Date: Sat, 28 Sep 2024 11:18:49 +0200 Subject: [PATCH] Added frequency to each pin. --- Proculite.GpioRest/Models/PinModel.cs | 3 ++- Proculite.GpioRest/Services/GpioService.cs | 8 ++------ Proculite.GpioRest/Wrappers/PwmWrapper.cs | 6 ++++++ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Proculite.GpioRest/Models/PinModel.cs b/Proculite.GpioRest/Models/PinModel.cs index 56f1a6b..5855726 100644 --- a/Proculite.GpioRest/Models/PinModel.cs +++ b/Proculite.GpioRest/Models/PinModel.cs @@ -3,10 +3,11 @@ using System.Text.Json.Serialization; namespace Proculite.GpioRest.Models { - public class PinModel(int number, double value) + public class PinModel(int number, double value, int frequency) { public int Number { get; set; } = number; public double Value { get; set; } = value; + public int Frequency { get; set; } = frequency; } } diff --git a/Proculite.GpioRest/Services/GpioService.cs b/Proculite.GpioRest/Services/GpioService.cs index 326a11a..abfa792 100644 --- a/Proculite.GpioRest/Services/GpioService.cs +++ b/Proculite.GpioRest/Services/GpioService.cs @@ -32,14 +32,10 @@ namespace Proculite.GpioRest.Services } } - public PinModel CurrentPinValue(int pinNumber) - { - return new PinModel(pinNumber, _pwmPins[pinNumber].Value); - } - public PinModel PinValueModelOfPin(int pinNumber) { - return new PinModel(pinNumber, _pwmPins[pinNumber].Value); + PwmWrapper pwmWrapper = _pwmPins[pinNumber]; + return new PinModel(pinNumber, pwmWrapper.Value, pwmWrapper.Frequency); } public PinModel[] StateOfAllPins() diff --git a/Proculite.GpioRest/Wrappers/PwmWrapper.cs b/Proculite.GpioRest/Wrappers/PwmWrapper.cs index 8d2bfcd..5f9f810 100644 --- a/Proculite.GpioRest/Wrappers/PwmWrapper.cs +++ b/Proculite.GpioRest/Wrappers/PwmWrapper.cs @@ -13,6 +13,12 @@ namespace Proculite.GpioRest.Wrappers set { _softwarePwmChannel.DutyCycle = value; } } + public int Frequency + { + get => _softwarePwmChannel.Frequency; + set => _softwarePwmChannel.Frequency = value; + } + public PwmWrapper(int pinNumber, ILogger? logger = null) { PinNumber = pinNumber;