Skip to content

Commit 21fbbc0

Browse files
josesimoesjosesimoes
authored
Merge nanoframework/release-v1.0.7
2 parents 18afd41 + 070878d commit 21fbbc0

File tree

8 files changed

+43
-27
lines changed

8 files changed

+43
-27
lines changed

‎CHANGELOG.md‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,23 @@
22

33
## [**Changes available only in 'Preview' NuGet packages:**](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/tree/HEAD)
44

5-
[Full Changelog](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/compare/v1.0.3...HEAD)
5+
[Full Changelog](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/compare/v1.0.5...HEAD)
6+
7+
**Fixed bugs:**
8+
9+
- Rework StartDeepSleep [\#47](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/pull/47)
10+
11+
**Documentation and other chores:**
12+
13+
- Update 3 NuGet dependencies [\#48](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/pull/48)
14+
- Merge back from Release v1.0.5 [\#46](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/pull/46)
15+
16+
## [v1.0.5](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/tree/v1.0.5) (2019-01-03)
17+
[Full Changelog](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/compare/v1.0.3...v1.0.5)
618

719
**Documentation and other chores:**
820

21+
- Release v1.0.5 [\#45](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/pull/45)
922
- Merge back from Release v1.0.3 [\#44](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/pull/44)
1023

1124
## [v1.0.3](https://github.com/nanoframework/lib-nanoFramework.Hardware.Esp32/tree/v1.0.3) (2018-12-17)

‎source/README.md‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎source/nanoFramework.Hardware.Esp32.DELIVERABLES.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<tags>
1919
</tags>
2020
<dependencies>
21-
<dependency id="nanoFramework.CoreLibrary" version="[1.1.0]" />
22-
<dependency id="nanoFramework.Runtime.Events" version="[1.0.2]" />
23-
<dependency id="nanoFramework.Windows.Devices.Gpio" version="[1.0.2]" />
21+
<dependency id="nanoFramework.CoreLibrary" version="[1.1.1]" />
22+
<dependency id="nanoFramework.Runtime.Events" version="[1.0.4]" />
23+
<dependency id="nanoFramework.Windows.Devices.Gpio" version="[1.0.4]" />
2424
</dependencies>
2525
</metadata>
2626
<files>

‎source/nanoFramework.Hardware.Esp32.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<summary>nanoFramework.Hardware.Esp32 assembly for nanoFramework C# projects</summary>
1818
<tags>nanoFramework C# csharp netmf netnf esp32</tags>
1919
<dependencies>
20-
<dependency id="nanoFramework.CoreLibrary" version="[1.1.0]" />
21-
<dependency id="nanoFramework.Runtime.Events" version="[1.0.2]" />
22-
<dependency id="nanoFramework.Windows.Devices.Gpio" version="[1.0.2]" />
20+
<dependency id="nanoFramework.CoreLibrary" version="[1.1.1]" />
21+
<dependency id="nanoFramework.Runtime.Events" version="[1.0.4]" />
22+
<dependency id="nanoFramework.Windows.Devices.Gpio" version="[1.0.4]" />
2323
</dependencies>
2424
</metadata>
2525
<files>

‎source/nanoFramework.Hardware.Esp32/Sleep.cs‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,11 +257,17 @@ public static EspNativeError StartLightSleep()
257257
/// Enter deep sleep using configured wakeup sources.
258258
/// </summary>
259259
/// <remarks>
260-
/// If no sources configured then it will be a indefinate sleep.</remarks>
261-
/// <returns>ESP_OK if ok</returns>
262-
public static EspNativeError StartDeepSleep()
260+
/// If no wakeup sources configured then it will be a indefinite sleep.
261+
/// This call never returns.
262+
/// After the device enters deep sleep a wakeup source will wake the device and the execution will start as if it was a reset.
263+
/// Keep in mind that the execution WILL NOT continue after the call to this method.
264+
/// </remarks>
265+
public static void StartDeepSleep()
263266
{
264-
return NativeStartDeepSleep();
267+
NativeStartDeepSleep();
268+
269+
// force an infinite sleep to allow execution engine to exit this thread and pick the reboot flags set on the call above
270+
System.Threading.Thread.Sleep(System.Threading.Timeout.Infinite);
265271
}
266272

267273
/// <summary>

‎source/nanoFramework.Hardware.Esp32/nanoFramework.Hardware.Esp32.nfproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@
4545
<Name>nanoFramework.Hardware.Esp32</Name>
4646
</PropertyGroup>
4747
<ItemGroup>
48-
<NFMDP_PE_LoadHints Include="..\packages\nanoFramework.CoreLibrary.1.1.0\lib\mscorlib.dll">
48+
<NFMDP_PE_LoadHints Include="..\packages\nanoFramework.CoreLibrary.1.1.1\lib\mscorlib.dll">
4949
<InProject>false</InProject>
5050
</NFMDP_PE_LoadHints>
51-
<NFMDP_PE_LoadHints Include="..\packages\nanoFramework.Runtime.Events.1.0.2\lib\nanoFramework.Runtime.Events.dll">
51+
<NFMDP_PE_LoadHints Include="..\packages\nanoFramework.Runtime.Events.1.0.4\lib\nanoFramework.Runtime.Events.dll">
5252
<InProject>false</InProject>
5353
</NFMDP_PE_LoadHints>
54-
<NFMDP_PE_LoadHints Include="..\packages\nanoFramework.Windows.Devices.Gpio.1.0.2\lib\nanoFramework.Windows.Devices.Gpio.dll">
54+
<NFMDP_PE_LoadHints Include="..\packages\nanoFramework.Windows.Devices.Gpio.1.0.4\lib\nanoFramework.Windows.Devices.Gpio.dll">
5555
<InProject>false</InProject>
5656
</NFMDP_PE_LoadHints>
5757
</ItemGroup>
@@ -73,16 +73,16 @@
7373
<None Include="packages.config" />
7474
</ItemGroup>
7575
<ItemGroup>
76-
<Reference Include="mscorlib, Version=1.1.0.4, Culture=neutral, PublicKeyToken=c07d481e9758c731">
77-
<HintPath>..\packages\nanoFramework.CoreLibrary.1.1.0\lib\mscorlib.dll</HintPath>
76+
<Reference Include="mscorlib, Version=1.1.1.7, Culture=neutral, PublicKeyToken=c07d481e9758c731">
77+
<HintPath>..\packages\nanoFramework.CoreLibrary.1.1.1\lib\mscorlib.dll</HintPath>
7878
<Private>True</Private>
7979
</Reference>
80-
<Reference Include="nanoFramework.Runtime.Events, Version=1.0.2.2, Culture=neutral, PublicKeyToken=c07d481e9758c731">
81-
<HintPath>..\packages\nanoFramework.Runtime.Events.1.0.2\lib\nanoFramework.Runtime.Events.dll</HintPath>
80+
<Reference Include="nanoFramework.Runtime.Events, Version=1.0.4.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
81+
<HintPath>..\packages\nanoFramework.Runtime.Events.1.0.4\lib\nanoFramework.Runtime.Events.dll</HintPath>
8282
<Private>True</Private>
8383
</Reference>
84-
<Reference Include="Windows.Devices.Gpio, Version=1.0.2.2, Culture=neutral, PublicKeyToken=c07d481e9758c731">
85-
<HintPath>..\packages\nanoFramework.Windows.Devices.Gpio.1.0.2\lib\Windows.Devices.Gpio.dll</HintPath>
84+
<Reference Include="Windows.Devices.Gpio, Version=1.0.4.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
85+
<HintPath>..\packages\nanoFramework.Windows.Devices.Gpio.1.0.4\lib\Windows.Devices.Gpio.dll</HintPath>
8686
<Private>True</Private>
8787
</Reference>
8888
</ItemGroup>

‎source/nanoFramework.Hardware.Esp32/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="nanoFramework.CoreLibrary" version="1.1.0" targetFramework="netnanoframework10" />
4-
<package id="nanoFramework.Runtime.Events" version="1.0.2" targetFramework="netnanoframework10" />
5-
<package id="nanoFramework.Windows.Devices.Gpio" version="1.0.2" targetFramework="netnanoframework10" />
3+
<package id="nanoFramework.CoreLibrary" version="1.1.1" targetFramework="netnanoframework10" />
4+
<package id="nanoFramework.Runtime.Events" version="1.0.4" targetFramework="netnanoframework10" />
5+
<package id="nanoFramework.Windows.Devices.Gpio" version="1.0.4" targetFramework="netnanoframework10" />
66
<package id="Nerdbank.GitVersioning" version="3.0.4-beta" developmentDependency="true" targetFramework="netnanoframework10" />
77
</packages>

‎source/version.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "1.0.5",
3+
"version": "1.0.7",
44
"assemblyVersion": {
55
"precision": "revision"
66
},

0 commit comments

Comments
 (0)