Skip to content

Commit 461a1bc

Browse files
josesimoesjosesimoes
authored
Merge pull request #154 from nanoframework/release-v1.3.4
release-v1.3.4
2 parents 2fcc352 + 59a554f commit 461a1bc

16 files changed

+553
-268
lines changed

‎.github_changelog_generator‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
user=nanoframework
2-
project=lib-nanoFramework.Hardware.Esp32
2+
project=nanoFramework.Hardware.Esp32
33
issues=true
44
add_issues_wo_labels=false
55
add_pr_wo_labels=false

‎CHANGELOG.md‎

Lines changed: 392 additions & 220 deletions
Large diffs are not rendered by default.

‎LICENSE‎ renamed to ‎LICENSE.md‎

File renamed without changes.

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_lib-nanoFramework.Hardware.Esp32&metric=alert_status)](https://sonarcloud.io/dashboard?id=nanoframework_lib-nanoFramework.Hardware.Esp32) [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_lib-nanoFramework.Hardware.Esp32&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=nanoframework_lib-nanoFramework.Hardware.Esp32) [![License](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE) [![NuGet](https://img.shields.io/nuget/dt/nanoFramework.Hardware.Esp32.svg?label=NuGet&style=flat&logo=nuget)]() [![#yourfirstpr](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](https://github.com/nanoframework/Home/blob/master/CONTRIBUTING.md) [![Discord](https://img.shields.io/discord/478725473862549535.svg?logo=discord&logoColor=white&label=Discord&color=7289DA)](https://discord.gg/gCyBu8T)
22

3-
![nanoFramework logo](https://github.com/nanoframework/Home/blob/master/resources/logo/nanoFramework-repo-logo.png)
3+
![nanoFramework logo](https://raw.githubusercontent.com/nanoframework/Home/main/resources/logo/nanoFramework-repo-logo.png)
44

55
-----
66

7-
### Welcome to the **nanoFramework** nanoFramework.Hardware.Esp32 Library repository!
7+
### Welcome to the .NET **nanoFramework** nanoFramework.Hardware.Esp32 Library repository
88

99
## Build status
1010

@@ -29,7 +29,7 @@ The **nanoFramework** Class Libraries are licensed under the [MIT license](LICEN
2929

3030
## Code of Conduct
3131

32-
This project has adopted the code of conduct defined by the Contributor Covenant to clarify expected behavior in our community.
32+
This project has adopted the code of conduct defined by the Contributor Covenant to clarify expected behaviour in our community.
3333
For more information see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
3434

3535
### .NET Foundation

‎assets/nf-logo.png‎

8.98 KB
Loading

‎readme.txt‎ renamed to ‎assets/readme.txt‎

File renamed without changes.

‎azure-pipelines.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
trigger:
22
branches:
3-
include: [main, master, develop, "release-*" ]
3+
include: [main, develop, "release-*" ]
44
paths:
5-
exclude: ["*.md", .gitignore]
5+
exclude: [README.md, LICENSE.md, NuGet.Config, .github_changelog_generator, .gitignore]
66
tags:
77
include: ["v*"]
88

99
# PR always trigger build
10+
pr:
11+
autoCancel: true
1012

1113
# add nf-tools repo to resources (for Azure Pipelines templates)
1214
resources:
@@ -20,12 +22,11 @@ pool:
2022
vmImage: 'windows-2019'
2123

2224
variables:
23-
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
24-
solution: '**/*.sln'
25+
DOTNET_NOLOGO: true
26+
solution: 'nanoFramework.Hardware.Esp32.sln'
2527
buildPlatform: 'Any CPU'
2628
buildConfiguration: 'Release'
2729
nugetPackageName: 'nanoFramework.Hardware.Esp32'
28-
repoName: 'nanoFramework.Hardware.Esp32'
2930

3031
steps:
3132

‎nanoFramework.Hardware.Esp32.DELIVERABLES.nuspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55
<version>$version$</version>
66
<title>nanoFramework.Hardware.Esp32.DELIVERABLES</title>
77
<authors>nanoFramework project contributors</authors>
8-
<owners>nanoFramework project contributors</owners>
8+
<owners>nanoFramework</owners>
99
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1010
<releaseNotes>
1111
</releaseNotes>
1212
<developmentDependency>false</developmentDependency>
13-
<projectUrl>https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32</projectUrl>
13+
<projectUrl>https://github.com/nanoframework/nanoFramework.Hardware.Esp32</projectUrl>
1414
<iconUrl>https://secure.gravatar.com/avatar/97d0e092247f0716db6d4b47b7d1d1ad</iconUrl>
1515
<copyright>Copyright (c) .NET Foundation and Contributors</copyright>
1616
<description>** DON'T REFERENCE THIS PACKAGE ** Not meant for development. This package includes the deliverable artifacts of the nanoFramework.Hardware.Esp32 assembly for nanoFramework. These are for testing purposes and for updating the native code base of the library.</description>
1717
<summary>nanoFramework.Hardware.Esp32.DELIVERABLES is not meant for development.</summary>
1818
<tags>
1919
</tags>
2020
<dependencies>
21-
<dependency id="nanoFramework.CoreLibrary" version="1.10.5" />
22-
<dependency id="nanoFramework.Runtime.Events" version="1.9.1" />
21+
<dependency id="nanoFramework.CoreLibrary" version="1.11.7" />
22+
<dependency id="nanoFramework.Runtime.Events" version="1.9.2" />
2323
</dependencies>
2424
</metadata>
2525
<files>

‎nanoFramework.Hardware.Esp32.nuspec‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,24 @@
55
<version>$version$</version>
66
<title>nanoFramework.Hardware.Esp32</title>
77
<authors>nanoFramework project contributors</authors>
8-
<owners>nanoFramework project contributors</owners>
8+
<owners>nanoFramework,dotnetfoundation</owners>
99
<requireLicenseAcceptance>false</requireLicenseAcceptance>
10-
<license type="expression">Apache-2.0</license>
10+
<license type="file">LICENSE.md</license>
1111
<releaseNotes>
1212
</releaseNotes>
13+
<readme>docs\README.md</readme>
1314
<developmentDependency>false</developmentDependency>
14-
<projectUrl>https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32</projectUrl>
15-
<iconUrl>https://secure.gravatar.com/avatar/97d0e092247f0716db6d4b47b7d1d1ad</iconUrl>
16-
<repository type="git" url="https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32" commit="$commit$" />
15+
<projectUrl>https://github.com/nanoframework/nanoFramework.Hardware.Esp32</projectUrl>
16+
<icon>images\nf-logo.png</icon>
17+
<repository type="git" url="https://github.com/nanoframework/nanoFramework.Hardware.Esp32" commit="$commit$" />
1718
<copyright>Copyright (c) .NET Foundation and Contributors</copyright>
18-
<description>This package includes the nanoFramework.Hardware.Esp32 assembly for nanoFramework C# projects. The nanoFramework.Hardware.Esp32 assembly contains functions specific to the ESP32 device.
19-
This package requires a target with nanoFramework.Hardware.Esp32 v$nativeVersion$.</description>
20-
<summary>nanoFramework.Hardware.Esp32 assembly for nanoFramework C# projects</summary>
19+
<description>This package includes the nanoFramework.Hardware.Esp32 assembly for .NET nanoFramework C# projects.
20+
The nanoFramework.Hardware.Esp32 assembly contains functions specific to the ESP32 device.
21+
This package requires a target with nanoFramework.Hardware.Esp32 v$nativeVersion$ (checksum $checksum$).</description>
2122
<tags>nanoFramework C# csharp netmf netnf esp32</tags>
2223
<dependencies>
23-
<dependency id="nanoFramework.CoreLibrary" version="1.10.5" />
24-
<dependency id="nanoFramework.Runtime.Events" version="1.9.1" />
24+
<dependency id="nanoFramework.CoreLibrary" version="1.11.7" />
25+
<dependency id="nanoFramework.Runtime.Events" version="1.9.2" />
2526
</dependencies>
2627
</metadata>
2728
<files>
@@ -30,7 +31,9 @@ This package requires a target with nanoFramework.Hardware.Esp32 v$nativeVersion
3031
<file src="nanoFramework.Hardware.Esp32\bin\Release\nanoFramework.Hardware.Esp32.pdbx" target="lib\nanoFramework.Hardware.Esp32.pdbx" />
3132
<file src="nanoFramework.Hardware.Esp32\bin\Release\nanoFramework.Hardware.Esp32.pe" target="lib\nanoFramework.Hardware.Esp32.pe" />
3233
<file src="nanoFramework.Hardware.Esp32\bin\Release\nanoFramework.Hardware.Esp32.xml" target="lib\nanoFramework.Hardware.Esp32.xml" />
33-
<!-- readme -->
34-
<file src="readme.txt" target="readme.txt" />
34+
<file src="assets\readme.txt" target="" />
35+
<file src="README.md" target="docs\" />
36+
<file src="assets\nf-logo.png" target="images" />
37+
<file src="LICENSE.md" target="" />
3538
</files>
3639
</package>

‎nanoFramework.Hardware.Esp32/DeviceTypePins.cs‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,36 @@ public enum DeviceTypes
2323
/// GPIO Device type
2424
/// </summary>
2525
GPIO = 0 * ValueTypes.DeviceType,
26+
2627
/// <summary>
2728
/// SPI Device type
2829
/// </summary>
2930
SPI = 1 * ValueTypes.DeviceType,
31+
3032
/// <summary>
3133
/// I2C Device type
3234
/// </summary>
3335
I2C = 2 * ValueTypes.DeviceType,
36+
3437
/// <summary>
3538
/// SERIAL Device type
3639
/// </summary>
3740
SERIAL = 3 * ValueTypes.DeviceType,
41+
3842
/// <summary>
3943
/// PWM Device type
4044
/// </summary>
4145
PWM = 4 * ValueTypes.DeviceType,
46+
4247
/// <summary>
4348
/// ADC Device type
4449
/// </summary>
4550
ADC = 5 * ValueTypes.DeviceType,
51+
52+
/// <summary>
53+
/// I2S Device type
54+
/// </summary>
55+
I2S = 6 * ValueTypes.DeviceType,
4656
};
4757

4858
/// <summary>
@@ -305,5 +315,56 @@ public enum DeviceFunction
305315
/// </summary>
306316
ADC1_CH19 = DeviceTypes.ADC + (1 * ValueTypes.DeviceIndex) + 19,
307317

318+
/// <summary>
319+
/// I2S1 function Master Clock.
320+
/// Used only in master mode.
321+
/// </summary>
322+
I2S1_MCK = DeviceTypes.I2S + (1 * ValueTypes.DeviceIndex) + 0,
323+
/// <summary>
324+
/// I2S1 function Bit Clock.
325+
/// Used for general purpose read and write on the I2S bus.
326+
/// </summary>
327+
I2S1_BCK = DeviceTypes.I2S + (1 * ValueTypes.DeviceIndex) + 1,
328+
/// <summary>
329+
/// I2S1 function WS.
330+
/// Used if your have stereo.
331+
/// </summary>
332+
I2S1_WS = DeviceTypes.I2S + (1 * ValueTypes.DeviceIndex) + 2,
333+
/// <summary>
334+
/// I2S1 function DATA_OUT.
335+
/// Used for output data typically on a speaker.
336+
/// </summary>
337+
I2S1_DATA_OUT = DeviceTypes.I2S + (1 * ValueTypes.DeviceIndex) + 3,
338+
/// <summary>
339+
/// I2S1 function MDATA_IN.
340+
/// Used for input data typically from a microphone.
341+
/// </summary>
342+
I2S1_MDATA_IN = DeviceTypes.I2S + (1 * ValueTypes.DeviceIndex) + 4,
343+
344+
/// <summary>
345+
/// I2S2 function Master Clock.
346+
/// Used only in master mode.
347+
/// </summary>
348+
I2S2_MCK = DeviceTypes.I2S + (2 * ValueTypes.DeviceIndex) + 0,
349+
/// <summary>
350+
/// I2S2 function Bit Clock.
351+
/// Used for general purpose read and write on the I2S bus.
352+
/// </summary>
353+
I2S2_BCK = DeviceTypes.I2S + (2 * ValueTypes.DeviceIndex) + 1,
354+
/// <summary>
355+
/// I2S2 function WS.
356+
/// Used if your have stereo.
357+
/// </summary>
358+
I2S2_WS = DeviceTypes.I2S + (2 * ValueTypes.DeviceIndex) + 2,
359+
/// <summary>
360+
/// I2S2 function DATA_OUT.
361+
/// Used for output data typically on a speaker.
362+
/// </summary>
363+
I2S2_DATA_OUT = DeviceTypes.I2S + (2 * ValueTypes.DeviceIndex) + 3,
364+
/// <summary>
365+
/// I2S2 function MDATA_IN.
366+
/// Used for input data typically from a microphone.
367+
/// </summary>
368+
I2S2_MDATA_IN = DeviceTypes.I2S + (2 * ValueTypes.DeviceIndex) + 4,
308369
};
309370
}

0 commit comments

Comments
 (0)