Compare commits

..

No commits in common. "238915b8cde54c604bd9f0c4f190fa8be80d9d46" and "e97f3222fb9ba06c0a251b2ca3c95e374e3d375a" have entirely different histories.

4 changed files with 24 additions and 27 deletions

View file

@ -1,13 +0,0 @@
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

@ -0,0 +1,12 @@
using System.Device.Gpio;
using System.Text.Json.Serialization;
namespace Proculite.GpioRest.Models
{
public class PinValueModel(int pinNumber, double value)
{
public int PinNumber { get; set; } = pinNumber;
public double PinValue { get; set; } = value;
}
}

View file

@ -32,13 +32,17 @@ namespace Proculite.GpioRest.Services
} }
} }
public PinModel PinValueModelOfPin(int pinNumber) public PinValueModel CurrentPinValue(int pinNumber)
{ {
PwmWrapper pwmWrapper = _pwmPins[pinNumber]; return new PinValueModel(pinNumber, _pwmPins[pinNumber].Value);
return new PinModel(pinNumber, pwmWrapper.Value, pwmWrapper.Frequency);
} }
public PinModel[] StateOfAllPins() public PinValueModel PinValueModelOfPin(int pinNumber)
{
return new PinValueModel(pinNumber, _pwmPins[pinNumber].Value);
}
public PinValueModel[] StateOfAllPins()
{ {
return _pins.Select(PinValueModelOfPin).ToArray(); return _pins.Select(PinValueModelOfPin).ToArray();
} }
@ -64,25 +68,25 @@ namespace Proculite.GpioRest.Services
_pwmPins[pinNumber].Value = pinValue; _pwmPins[pinNumber].Value = pinValue;
} }
public PinModel SetPinHighReturning(int pinNumber) public PinValueModel SetPinHighReturning(int pinNumber)
{ {
SetPinHigh(pinNumber); SetPinHigh(pinNumber);
return PinValueModelOfPin(pinNumber); return PinValueModelOfPin(pinNumber);
} }
public PinModel SetPinLowReturning(int pinNumber) public PinValueModel SetPinLowReturning(int pinNumber)
{ {
SetPinLow(pinNumber); SetPinLow(pinNumber);
return PinValueModelOfPin(pinNumber); return PinValueModelOfPin(pinNumber);
} }
public PinModel TogglePinReturning(int pinNumber) public PinValueModel TogglePinReturning(int pinNumber)
{ {
TogglePin(pinNumber); TogglePin(pinNumber);
return PinValueModelOfPin(pinNumber); return PinValueModelOfPin(pinNumber);
} }
public PinModel SetPinReturning(int pinNumber, double pinValue) public PinValueModel SetPinReturning(int pinNumber, double pinValue)
{ {
SetPin(pinNumber, pinValue); SetPin(pinNumber, pinValue);
return PinValueModelOfPin(pinNumber); return PinValueModelOfPin(pinNumber);

View file

@ -13,12 +13,6 @@ namespace Proculite.GpioRest.Wrappers
set { _softwarePwmChannel.DutyCycle = value; } set { _softwarePwmChannel.DutyCycle = value; }
} }
public int Frequency
{
get => _softwarePwmChannel.Frequency;
set => _softwarePwmChannel.Frequency = value;
}
public PwmWrapper(int pinNumber, ILogger? logger = null) public PwmWrapper(int pinNumber, ILogger? logger = null)
{ {
PinNumber = pinNumber; PinNumber = pinNumber;