Compare commits

...

9 commits

6 changed files with 143 additions and 50 deletions

View file

@ -19,7 +19,7 @@ namespace Proculite.GpioRest.Controllers
if (!ModelState.IsValid)
return BadRequest();
return Ok(_gpioService.PinValueModelOfPin(pinNumber));
return Ok(_gpioService.PinModelOfPin(pinNumber));
}
[HttpGet("pin-value")]
@ -46,6 +46,24 @@ namespace Proculite.GpioRest.Controllers
return Ok(_gpioService.SetPinLowReturning(pinNumber));
}
[HttpPut("pin-value/{pinNumber}/{pinValue}")]
public IActionResult SetPinValue(int pinNumber, double pinValue)
{
if (!ModelState.IsValid)
return BadRequest();
return Ok(_gpioService.SetPinReturning(pinNumber, pinValue));
}
[HttpPut("pin-frequency/{pinNumber}/{pinFrequency}")]
public IActionResult SetPinFrequency(int pinNumber, int pinFrequency)
{
if (!ModelState.IsValid)
return BadRequest();
return Ok(_gpioService.SetPinFrequencyReturning(pinNumber, pinFrequency));
}
[HttpPost("pin-value/toggle/{pinNumber}")]
public IActionResult TogglePin(int pinNumber)
{

View file

@ -0,0 +1,13 @@
using System.Device.Gpio;
using System.Text.Json.Serialization;
namespace Proculite.GpioRest.Models
{
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;
}
}

View file

@ -1,14 +0,0 @@
using System.Device.Gpio;
using System.Text.Json.Serialization;
namespace Proculite.GpioRest.Models
{
public class PinValueModel(int pinNumber, PinValue pinValue)
{
public int PinNumber { get; set; } = pinNumber;
[JsonIgnore]
public PinValue PinValue { get; set; } = pinValue;
public int Value => PinValue == PinValue.High ? 1 : 0;
}
}

View file

@ -7,6 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Iot.Device.Bindings" Version="3.2.0" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.7" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
<PackageReference Include="System.Device.Gpio" Version="3.2.0" />

View file

@ -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 = new();
public GpioService(ILogger<GpioService> logger, IConfiguration configuration)
{
@ -18,80 +19,84 @@ namespace Proculite.GpioRest.Services
.Select(pin => pin.Get<int>())
.ToArray();
_gpioController = new GpioController();
SetupPins();
}
private void SetupPins()
{
_logger.LogInformation("Setting up {PinCount} pins.", _pins.Length);
PinMode pinMode = PinMode.Output;
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 PinModel PinModelOfPin(int pinNumber)
{
return _gpioController.Read(pinNumber);
PwmWrapper pwmWrapper = _pwmPins[pinNumber];
return new PinModel(pinNumber, pwmWrapper.Value, pwmWrapper.Frequency);
}
public PinValueModel PinValueModelOfPin(int pinNumber)
public PinModel[] StateOfAllPins()
{
return new PinValueModel(pinNumber, _gpioController.Read(pinNumber));
}
public PinValueModel[] StateOfAllPins()
{
return _pins.Select(PinValueModelOfPin).ToArray();
return _pins.Select(PinModelOfPin).ToArray();
}
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)
public void SetPin(int pinNumber, double pinValue)
{
_pwmPins[pinNumber].Value = pinValue;
}
public void SetPinFrequency(int pinNumber, int pinFrequency)
{
_pwmPins[pinNumber].Frequency = pinFrequency;
}
public PinModel SetPinHighReturning(int pinNumber)
{
SetPinHigh(pinNumber);
return PinValueModelOfPin(pinNumber);
return PinModelOfPin(pinNumber);
}
public PinValueModel SetPinLowReturning(int pinNumber)
public PinModel SetPinLowReturning(int pinNumber)
{
SetPinLow(pinNumber);
return PinValueModelOfPin(pinNumber);
return PinModelOfPin(pinNumber);
}
public PinValueModel TogglePinReturning(int pinNumber)
public PinModel TogglePinReturning(int pinNumber)
{
TogglePin(pinNumber);
return PinValueModelOfPin(pinNumber);
return PinModelOfPin(pinNumber);
}
public PinModel SetPinReturning(int pinNumber, double pinValue)
{
SetPin(pinNumber, pinValue);
return PinModelOfPin(pinNumber);
}
public PinModel SetPinFrequencyReturning(int pinNumber, int pinFrequency)
{
_pwmPins[pinNumber].Frequency = pinFrequency;
return PinModelOfPin(pinNumber);
}
}
}

View file

@ -0,0 +1,70 @@
using System.Device.Pwm.Drivers;
namespace Proculite.GpioRest.Wrappers
{
public class PwmWrapper
{
private readonly SoftwarePwmChannel _softwarePwmChannel;
private readonly ILogger? _logger;
public int PinNumber { get; }
public double Value
{
get => _softwarePwmChannel.DutyCycle;
set { _softwarePwmChannel.DutyCycle = value; }
}
public int Frequency
{
get => _softwarePwmChannel.Frequency;
set => _softwarePwmChannel.Frequency = value;
}
public PwmWrapper(int pinNumber, ILogger? logger = null)
{
PinNumber = pinNumber;
_softwarePwmChannel = new SoftwarePwmChannel(pinNumber, usePrecisionTimer: true);
_logger = logger;
_softwarePwmChannel.DutyCycle = 0;
_softwarePwmChannel.Start();
}
public void SetValue(double value)
{
LogValue(value);
if (value < 0 || value > 1)
{
LogValueOutOfBounds();
return;
}
_softwarePwmChannel.DutyCycle = value;
}
public void SetHigh()
{
SetValue(1);
}
public void SetLow()
{
SetValue(0);
}
private void LogValue(double value)
{
if (_logger is null)
return;
_logger.LogDebug("New value for pin {PinNumber}: {Value}", PinNumber, value);
}
private void LogValueOutOfBounds()
{
if (_logger is null)
return;
_logger.LogWarning(
"Attempting to set value of pin {PinNumber}, but it's not between 0 and 1.",
PinNumber
);
}
}
}