Skip to content

Commit 8891de1

Browse files
MrCSharp22Ellerbach
MrCSharp22
and
Ellerbach
authored
update the Ws28xx (ESP32) to nanoFramework.Hardware.Esp32.Rmt version 2.0.1 (#724)
Co-authored-by: Laurent Ellerbach <[email protected]>
1 parent 8054c34 commit 8891de1

10 files changed

+28
-22
lines changed

‎devices/Ws28xx.Esp32/Ws2812C.cs

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public class Ws2812c : Ws28xx
2020
public Ws2812c(int gpioPin, int width, int height = 1)
2121
: base(gpioPin, new BitmapImageWs2808Grb(width, height))
2222
{
23-
ClockDivider = 2;
2423
ClockDivider = 2;
2524
OnePulse = new RmtCommand(52, true, 52, false);
2625
ZeroPulse = new RmtCommand(14, true, 52, false);

‎devices/Ws28xx.Esp32/Ws2815B.cs

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public class Ws2815b : Ws28xx
2020
public Ws2815b(int gpioPin, int width, int height = 1)
2121
: base(gpioPin, new BitmapImageNeo3Rgb(width, height))
2222
{
23-
ClockDivider = 2;
2423
ClockDivider = 2;
2524
OnePulse = new RmtCommand(52, true, 52, false);
2625
ZeroPulse = new RmtCommand(14, true, 52, false);

‎devices/Ws28xx.Esp32/Ws28xx.Esp32.nfproj

+5-3
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@
3737
<HintPath>packages\nanoFramework.CoreLibrary.1.14.2\lib\mscorlib.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
40-
<Reference Include="nanoFramework.Hardware.Esp32.Rmt, Version=1.3.6.3188, Culture=neutral, PublicKeyToken=c07d481e9758c731">
41-
<HintPath>packages\nanoFramework.Hardware.Esp32.Rmt.1.3.6\lib\nanoFramework.Hardware.Esp32.Rmt.dll</HintPath>
42-
<Private>True</Private>
40+
<Reference Include="nanoFramework.Hardware.Esp32.Rmt">
41+
<HintPath>packages\nanoFramework.Hardware.Esp32.Rmt.2.0.1\lib\nanoFramework.Hardware.Esp32.Rmt.dll</HintPath>
4342
</Reference>
4443
<Reference Include="nanoFramework.Runtime.Events, Version=1.11.6.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
4544
<HintPath>packages\nanoFramework.Runtime.Events.1.11.6\lib\nanoFramework.Runtime.Events.dll</HintPath>
@@ -60,6 +59,9 @@
6059
<Compile Include="*.cs" />
6160
<None Include="*.md" />
6261
</ItemGroup>
62+
<ItemGroup>
63+
<Content Include="packages.lock.json" />
64+
</ItemGroup>
6365
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
6466
<ProjectExtensions>
6567
<ProjectCapabilities>

‎devices/Ws28xx.Esp32/Ws28xx.Esp32.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<tags>nanoFramework C# csharp netmf netnf esp32 iot ws28xx</tags>
2020
<dependencies>
2121
<dependency id="nanoFramework.CoreLibrary" version="1.14.2" />
22-
<dependency id="nanoFramework.Hardware.Esp32.Rmt" version="1.3.6" />
22+
<dependency id="nanoFramework.Hardware.Esp32.Rmt" version="2.0.1" />
2323
<dependency id="nanoFramework.Runtime.Events" version="1.11.6" />
2424
<dependency id="nanoFramework.System.Drawing" version="1.2.211" />
2525
</dependencies>

‎devices/Ws28xx.Esp32/Ws28xx.cs

+9-5
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,16 @@ public Ws28xx(int gpioPin, BitmapImage image)
6262
/// </summary>
6363
public void Update()
6464
{
65-
var transmitter = new TransmitterChannel(GpioPin);
66-
transmitter.CarrierEnabled = false;
65+
var transmitterSettings = new TransmitChannelSettings(pinNumber: GpioPin)
66+
{
67+
EnableCarrierWave = false,
68+
IdleLevel = false,
69+
70+
// this value for the clock divider considers a clock source of 80MHz which is what we have fixed in native
71+
ClockDivider = this.ClockDivider,
72+
};
73+
var transmitter = new TransmitterChannel(transmitterSettings);
6774

68-
// this value for the clock divider considers a clock source of 80MHz which is what we have fixed in native
69-
transmitter.ClockDivider = ClockDivider;
70-
transmitter.IdleLevel = false;
7175
for (int i = 0; i < Image.Data.Length; i++)
7276
{
7377
SerializeColor(Image.Data[i], transmitter);

‎devices/Ws28xx.Esp32/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="nanoFramework.CoreLibrary" version="1.14.2" targetFramework="netnano1.0" />
4-
<package id="nanoFramework.Hardware.Esp32.Rmt" version="1.3.6" targetFramework="netnano1.0" />
4+
<package id="nanoFramework.Hardware.Esp32.Rmt" version="2.0.1" targetFramework="netnano1.0" />
55
<package id="nanoFramework.Runtime.Events" version="1.11.6" targetFramework="netnano1.0" />
66
<package id="nanoFramework.System.Drawing" version="1.2.211" targetFramework="netnano1.0" />
77
<package id="Nerdbank.GitVersioning" version="3.5.119" developmentDependency="true" targetFramework="netnano1.0" />

‎devices/Ws28xx.Esp32/packages.lock.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
},
1111
"nanoFramework.Hardware.Esp32.Rmt": {
1212
"type": "Direct",
13-
"requested": "[1.3.6, 1.3.6]",
14-
"resolved": "1.3.6",
15-
"contentHash": "vn+KOC24pOs1BvuYcbWy4NgV7tR6Wjx5v8kFZBZUrwqpffb3C1N+jWHyO6EcGgKxbIFxDFDZKULSHqnQr/H0Xg=="
13+
"requested": "[2.0.1, 2.0.1]",
14+
"resolved": "2.0.1",
15+
"contentHash": "h3xaxgk1vIeWxFYxRa+6bvYmg5TlNuCS9GwYzbVba0T0mq2nYWUNqTUoWtLEGReZY17vmULzu5AXQzGz+q7tZQ=="
1616
},
1717
"nanoFramework.Runtime.Events": {
1818
"type": "Direct",

‎devices/Ws28xx.Esp32/samples/Ws28xx.Samples.nfproj

+5-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@
2929
<HintPath>..\packages\nanoFramework.Hardware.Esp32.1.5.1\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
3030
<Private>True</Private>
3131
</Reference>
32-
<Reference Include="nanoFramework.Hardware.Esp32.Rmt, Version=1.3.6.3188, Culture=neutral, PublicKeyToken=c07d481e9758c731">
33-
<HintPath>..\packages\nanoFramework.Hardware.Esp32.Rmt.1.3.6\lib\nanoFramework.Hardware.Esp32.Rmt.dll</HintPath>
34-
<Private>True</Private>
32+
<Reference Include="nanoFramework.Hardware.Esp32.Rmt">
33+
<HintPath>..\packages\nanoFramework.Hardware.Esp32.Rmt.2.0.1\lib\nanoFramework.Hardware.Esp32.Rmt.dll</HintPath>
3534
</Reference>
3635
<Reference Include="nanoFramework.Runtime.Events, Version=1.11.6.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
3736
<HintPath>..\packages\nanoFramework.Runtime.Events.1.11.6\lib\nanoFramework.Runtime.Events.dll</HintPath>
@@ -62,6 +61,9 @@
6261
<ItemGroup>
6362
<ProjectReference Include="..\Ws28xx.Esp32.nfproj" />
6463
</ItemGroup>
64+
<ItemGroup>
65+
<Content Include="packages.lock.json" />
66+
</ItemGroup>
6567
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
6668
<ProjectExtensions>
6769
<ProjectCapabilities>

‎devices/Ws28xx.Esp32/samples/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="nanoFramework.CoreLibrary" version="1.14.2" targetFramework="netnano1.0" />
44
<package id="nanoFramework.Hardware.Esp32" version="1.5.1" targetFramework="netnano1.0" />
5-
<package id="nanoFramework.Hardware.Esp32.Rmt" version="1.3.6" targetFramework="netnano1.0" />
5+
<package id="nanoFramework.Hardware.Esp32.Rmt" version="2.0.1" targetFramework="netnano1.0" />
66
<package id="nanoFramework.Runtime.Events" version="1.11.6" targetFramework="netnano1.0" />
77
<package id="nanoFramework.Runtime.Native" version="1.6.6" targetFramework="netnano1.0" />
88
<package id="nanoFramework.System.Diagnostics.Stopwatch" version="1.2.195" targetFramework="netnano1.0" />

‎devices/Ws28xx.Esp32/samples/packages.lock.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
},
1717
"nanoFramework.Hardware.Esp32.Rmt": {
1818
"type": "Direct",
19-
"requested": "[1.3.6, 1.3.6]",
20-
"resolved": "1.3.6",
21-
"contentHash": "vn+KOC24pOs1BvuYcbWy4NgV7tR6Wjx5v8kFZBZUrwqpffb3C1N+jWHyO6EcGgKxbIFxDFDZKULSHqnQr/H0Xg=="
19+
"requested": "[2.0.1, 2.0.1]",
20+
"resolved": "2.0.1",
21+
"contentHash": "h3xaxgk1vIeWxFYxRa+6bvYmg5TlNuCS9GwYzbVba0T0mq2nYWUNqTUoWtLEGReZY17vmULzu5AXQzGz+q7tZQ=="
2222
},
2323
"nanoFramework.Runtime.Events": {
2424
"type": "Direct",

0 commit comments

Comments
 (0)