Skip to content

Commit

Permalink
Merge pull request #22 from WildernessLabs/develop
Browse files Browse the repository at this point in the history 
Merge to main for RC3-1
  • Loading branch information
@adrianstevens
adrianstevens authored May 6, 2023
2 parents 8754f94 + 7f506dd commit ddb716f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 110 deletions.
15 changes: 7 additions & 8 deletions Source/CButton/Driver/CButton.cs
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
using Meadow.Foundation.Leds;
using Meadow.Foundation.Sensors.Buttons;
using Meadow.Hardware;
using Meadow.Peripherals.Leds;
using System;

namespace Meadow.Foundation.mikroBUS.Sensors.Buttons
{
/// <summary>
/// Represents a mikroBUS Button G,R,Y Click board
/// </summary>
public class CButton : PushButton, IPwmLed
public class CButton : PushButton
{
readonly IPwmLed pwmLed;
readonly PwmLed pwmLed;

/// <summary>
/// Gets or sets a value indicating whether the LED is on.
/// </summary>
/// <value><c>true</c> if is on; otherwise, <c>false</c>.</value>
public bool IsOn
public bool IsOn
{
get => pwmLed.IsOn;
set => pwmLed.IsOn = value;
Expand All @@ -29,15 +28,15 @@ public bool IsOn
public float Brightness
{
get => pwmLed.Brightness;
set => pwmLed.Brightness = value;
set => pwmLed.SetBrightness(value);
}

/// <summary>
/// Creates a new CButton object
/// </summary>
/// <param name="ledPin">Led pin</param>
/// <param name="buttonPin">Button pin</param>
public CButton(IPin ledPin, IPin buttonPin)
public CButton(IPin ledPin, IPin buttonPin)
: base(buttonPin, ResistorMode.InternalPullUp)
{
pwmLed = new PwmLed(ledPin, new Units.Voltage(TypicalForwardVoltage.Green));
Expand Down Expand Up @@ -73,9 +72,9 @@ public void StartPulse(TimeSpan pulseDuration, float highBrightness, float lowBr
/// <summary>
/// Stops any running animations
/// </summary>
public void Stop()
public void StopAnimation()
{
pwmLed?.Stop();
pwmLed?.StopAnimation();
}
}
}
2 changes: 1 addition & 1 deletion Source/CGNSS5/Driver/CGNSS5.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Meadow.Sdk/1.1.0">
<Project Sdk="Meadow.Sdk/1.1.0">
<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageIcon>icon.png</PackageIcon>
Expand Down
101 changes: 0 additions & 101 deletions Source/mikroBUS.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "C8800Retro", "C8800Retro\Dr
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "C8800Retro_Sample", "C8800Retro\Sample\C8800Retro_Sample\C8800Retro_Sample.csproj", "{D127DA01-C3B0-49CA-A964-CDEAFF7BFE5E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_external", "_external", "{20E3A0B4-6103-4EAD-BD90-90C673E07DCC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CGNSS10", "CGNSS10", "{93300EE3-6452-4C59-8C99-6AA6A4F50532}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CGNSS10", "CGNSS10\Driver\CGNSS10.csproj", "{17ABCF6F-E972-4592-B70F-D15C17E1ADF7}"
Expand All @@ -61,28 +59,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample", "Sample", "{5B29F4
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CGNSS10_Sample", "CGNSS10\Sample\CGNSS10_Sample\CGNSS10_Sample.csproj", "{B3BF79A9-45C0-44B5-8B4D-FF71830C5D5B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Contracts", "..\..\Meadow.Contracts\Source\Meadow.Contracts\Meadow.Contracts.csproj", "{D6348767-13E9-4DA8-B154-9B66D78BF264}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Core", "..\..\Meadow.Core\source\Meadow.Core\Meadow.Core.csproj", "{B4A02377-4AA5-4F45-9938-59FDE7FC8D02}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.F7", "..\..\Meadow.Core\source\implementations\f7\Meadow.F7\Meadow.F7.csproj", "{6C6943AE-23AD-4206-887A-46B60720E936}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Foundation.Core", "..\..\Meadow.Foundation\Source\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj", "{82CBBA06-7A53-47C0-8B81-4953830FC36F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sensors.Gnss.NeoM8", "..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Sensors.Gnss.NeoM8\Driver\Sensors.Gnss.NeoM8.csproj", "{D09B992A-C08A-48C4-A243-8B4394E8FA52}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Graphics.MicroGraphics", "..\..\Meadow.Foundation\Source\Meadow.Foundation.Libraries_and_Frameworks\Graphics.MicroGraphics\Driver\Graphics.MicroGraphics.csproj", "{66B1D765-D44A-4101-AAFB-B1D0EA9B2EC8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICs.IOExpanders.Is31fl3731", "..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\ICs.IOExpanders.Is31fl3731\Driver\ICs.IOExpanders.Is31fl3731.csproj", "{CFB83369-D534-4F7C-BA4D-8D061D9F41E5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICs.IOExpanders.As1115", "..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\ICs.IOExpanders.As1115\Driver\ICs.IOExpanders.As1115.csproj", "{23A6D738-4FB5-48DA-95E8-DF589EB535E0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sensors.Hid.As5013", "..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Sensors.Hid.As5013\Driver\Sensors.Hid.As5013.csproj", "{A6675803-03EC-41E5-973F-12CD684FCA81}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sensors.Atmospheric.Sht4x", "..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Sensors.Atmospheric.Sht4x\Driver\Sensors.Atmospheric.Sht4x.csproj", "{A5DAEA7F-86B7-4BE8-834D-248F5B0CEBE6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Displays.Max7219", "..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Displays.Max7219\Driver\Displays.Max7219.csproj", "{0A92D618-C408-4A00-92E6-D36440D1E18D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CGNSS5", "CGNSS5", "{12F537E2-13DC-4023-89E4-9E8515809604}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CGNSS5", "CGNSS5\Driver\CGNSS5.csproj", "{EEDDAF1D-2E35-4A7A-8C94-9F6BCA9289FB}"
Expand Down Expand Up @@ -181,72 +157,6 @@ Global
{B3BF79A9-45C0-44B5-8B4D-FF71830C5D5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B3BF79A9-45C0-44B5-8B4D-FF71830C5D5B}.Release|Any CPU.Build.0 = Release|Any CPU
{B3BF79A9-45C0-44B5-8B4D-FF71830C5D5B}.Release|Any CPU.Deploy.0 = Release|Any CPU
{D6348767-13E9-4DA8-B154-9B66D78BF264}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D6348767-13E9-4DA8-B154-9B66D78BF264}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D6348767-13E9-4DA8-B154-9B66D78BF264}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{D6348767-13E9-4DA8-B154-9B66D78BF264}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D6348767-13E9-4DA8-B154-9B66D78BF264}.Release|Any CPU.Build.0 = Release|Any CPU
{D6348767-13E9-4DA8-B154-9B66D78BF264}.Release|Any CPU.Deploy.0 = Release|Any CPU
{B4A02377-4AA5-4F45-9938-59FDE7FC8D02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B4A02377-4AA5-4F45-9938-59FDE7FC8D02}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B4A02377-4AA5-4F45-9938-59FDE7FC8D02}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{B4A02377-4AA5-4F45-9938-59FDE7FC8D02}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B4A02377-4AA5-4F45-9938-59FDE7FC8D02}.Release|Any CPU.Build.0 = Release|Any CPU
{B4A02377-4AA5-4F45-9938-59FDE7FC8D02}.Release|Any CPU.Deploy.0 = Release|Any CPU
{6C6943AE-23AD-4206-887A-46B60720E936}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6C6943AE-23AD-4206-887A-46B60720E936}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6C6943AE-23AD-4206-887A-46B60720E936}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{6C6943AE-23AD-4206-887A-46B60720E936}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6C6943AE-23AD-4206-887A-46B60720E936}.Release|Any CPU.Build.0 = Release|Any CPU
{6C6943AE-23AD-4206-887A-46B60720E936}.Release|Any CPU.Deploy.0 = Release|Any CPU
{82CBBA06-7A53-47C0-8B81-4953830FC36F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{82CBBA06-7A53-47C0-8B81-4953830FC36F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{82CBBA06-7A53-47C0-8B81-4953830FC36F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{82CBBA06-7A53-47C0-8B81-4953830FC36F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{82CBBA06-7A53-47C0-8B81-4953830FC36F}.Release|Any CPU.Build.0 = Release|Any CPU
{82CBBA06-7A53-47C0-8B81-4953830FC36F}.Release|Any CPU.Deploy.0 = Release|Any CPU
{D09B992A-C08A-48C4-A243-8B4394E8FA52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D09B992A-C08A-48C4-A243-8B4394E8FA52}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D09B992A-C08A-48C4-A243-8B4394E8FA52}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{D09B992A-C08A-48C4-A243-8B4394E8FA52}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D09B992A-C08A-48C4-A243-8B4394E8FA52}.Release|Any CPU.Build.0 = Release|Any CPU
{D09B992A-C08A-48C4-A243-8B4394E8FA52}.Release|Any CPU.Deploy.0 = Release|Any CPU
{66B1D765-D44A-4101-AAFB-B1D0EA9B2EC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{66B1D765-D44A-4101-AAFB-B1D0EA9B2EC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{66B1D765-D44A-4101-AAFB-B1D0EA9B2EC8}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{66B1D765-D44A-4101-AAFB-B1D0EA9B2EC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{66B1D765-D44A-4101-AAFB-B1D0EA9B2EC8}.Release|Any CPU.Build.0 = Release|Any CPU
{66B1D765-D44A-4101-AAFB-B1D0EA9B2EC8}.Release|Any CPU.Deploy.0 = Release|Any CPU
{CFB83369-D534-4F7C-BA4D-8D061D9F41E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CFB83369-D534-4F7C-BA4D-8D061D9F41E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CFB83369-D534-4F7C-BA4D-8D061D9F41E5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{CFB83369-D534-4F7C-BA4D-8D061D9F41E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CFB83369-D534-4F7C-BA4D-8D061D9F41E5}.Release|Any CPU.Build.0 = Release|Any CPU
{CFB83369-D534-4F7C-BA4D-8D061D9F41E5}.Release|Any CPU.Deploy.0 = Release|Any CPU
{23A6D738-4FB5-48DA-95E8-DF589EB535E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{23A6D738-4FB5-48DA-95E8-DF589EB535E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{23A6D738-4FB5-48DA-95E8-DF589EB535E0}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{23A6D738-4FB5-48DA-95E8-DF589EB535E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{23A6D738-4FB5-48DA-95E8-DF589EB535E0}.Release|Any CPU.Build.0 = Release|Any CPU
{23A6D738-4FB5-48DA-95E8-DF589EB535E0}.Release|Any CPU.Deploy.0 = Release|Any CPU
{A6675803-03EC-41E5-973F-12CD684FCA81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A6675803-03EC-41E5-973F-12CD684FCA81}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A6675803-03EC-41E5-973F-12CD684FCA81}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{A6675803-03EC-41E5-973F-12CD684FCA81}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A6675803-03EC-41E5-973F-12CD684FCA81}.Release|Any CPU.Build.0 = Release|Any CPU
{A6675803-03EC-41E5-973F-12CD684FCA81}.Release|Any CPU.Deploy.0 = Release|Any CPU
{A5DAEA7F-86B7-4BE8-834D-248F5B0CEBE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A5DAEA7F-86B7-4BE8-834D-248F5B0CEBE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A5DAEA7F-86B7-4BE8-834D-248F5B0CEBE6}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{A5DAEA7F-86B7-4BE8-834D-248F5B0CEBE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A5DAEA7F-86B7-4BE8-834D-248F5B0CEBE6}.Release|Any CPU.Build.0 = Release|Any CPU
{A5DAEA7F-86B7-4BE8-834D-248F5B0CEBE6}.Release|Any CPU.Deploy.0 = Release|Any CPU
{0A92D618-C408-4A00-92E6-D36440D1E18D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0A92D618-C408-4A00-92E6-D36440D1E18D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0A92D618-C408-4A00-92E6-D36440D1E18D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{0A92D618-C408-4A00-92E6-D36440D1E18D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0A92D618-C408-4A00-92E6-D36440D1E18D}.Release|Any CPU.Build.0 = Release|Any CPU
{0A92D618-C408-4A00-92E6-D36440D1E18D}.Release|Any CPU.Deploy.0 = Release|Any CPU
{EEDDAF1D-2E35-4A7A-8C94-9F6BCA9289FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EEDDAF1D-2E35-4A7A-8C94-9F6BCA9289FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EEDDAF1D-2E35-4A7A-8C94-9F6BCA9289FB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
Expand Down Expand Up @@ -285,17 +195,6 @@ Global
{17ABCF6F-E972-4592-B70F-D15C17E1ADF7} = {93300EE3-6452-4C59-8C99-6AA6A4F50532}
{5B29F4D6-2D4E-496A-A7CA-2303398FBCBB} = {93300EE3-6452-4C59-8C99-6AA6A4F50532}
{B3BF79A9-45C0-44B5-8B4D-FF71830C5D5B} = {5B29F4D6-2D4E-496A-A7CA-2303398FBCBB}
{D6348767-13E9-4DA8-B154-9B66D78BF264} = {20E3A0B4-6103-4EAD-BD90-90C673E07DCC}
{B4A02377-4AA5-4F45-9938-59FDE7FC8D02} = {20E3A0B4-6103-4EAD-BD90-90C673E07DCC}
{6C6943AE-23AD-4206-887A-46B60720E936} = {20E3A0B4-6103-4EAD-BD90-90C673E07DCC}
{82CBBA06-7A53-47C0-8B81-4953830FC36F} = {20E3A0B4-6103-4EAD-BD90-90C673E07DCC}
{D09B992A-C08A-48C4-A243-8B4394E8FA52} = {20E3A0B4-6103-4EAD-BD90-90C673E07DCC}
{66B1D765-D44A-4101-AAFB-B1D0EA9B2EC8} = {20E3A0B4-6103-4EAD-BD90-90C673E07DCC}
{CFB83369-D534-4F7C-BA4D-8D061D9F41E5} = {20E3A0B4-6103-4EAD-BD90-90C673E07DCC}
{23A6D738-4FB5-48DA-95E8-DF589EB535E0} = {20E3A0B4-6103-4EAD-BD90-90C673E07DCC}
{A6675803-03EC-41E5-973F-12CD684FCA81} = {20E3A0B4-6103-4EAD-BD90-90C673E07DCC}
{A5DAEA7F-86B7-4BE8-834D-248F5B0CEBE6} = {20E3A0B4-6103-4EAD-BD90-90C673E07DCC}
{0A92D618-C408-4A00-92E6-D36440D1E18D} = {20E3A0B4-6103-4EAD-BD90-90C673E07DCC}
{EEDDAF1D-2E35-4A7A-8C94-9F6BCA9289FB} = {12F537E2-13DC-4023-89E4-9E8515809604}
{C259536A-75D7-4D8A-B4F5-8C0306A897DE} = {12F537E2-13DC-4023-89E4-9E8515809604}
{1B9F8444-BAC8-423C-9D01-3D354FB8C083} = {C259536A-75D7-4D8A-B4F5-8C0306A897DE}
Expand Down

0 comments on commit ddb716f

Please sign in to comment.