Skip to content

Commit 0353a4e

Browse files
authored
M5Core2 and Tough now enable 5V boost (#181)
1 parent 5f99c76 commit 0353a4e

File tree

8 files changed

+11
-9
lines changed

8 files changed

+11
-9
lines changed

M5StackCommon/Core2ToughCommon.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,9 @@ static Tough()
363363
// 128ms power on, 4s power off
364364
_power.SetButtonBehavior(LongPressTiming.S1, ShortPressTiming.Ms128, true, SignalDelayAfterPowerUp.Ms32, ShutdownTiming.S4);
365365

366+
// enable EXTEN switch control to enable 5V boost
367+
_power.EXTENEnable = true;
368+
366369
#if M5CORE2
367370
// enable DCO and LDO outputs
368371
_power.LdoDcPinsEnabled = LdoDcPinsEnabled.DcDc1 | LdoDcPinsEnabled.DcDc3 | LdoDcPinsEnabled.Ldo2 | LdoDcPinsEnabled.Ldo3;

Tests/M5Core2TestApp/M5Core2TestApp.nfproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,4 +172,4 @@
172172
<ProjectConfigurationsDeclaredAsItems />
173173
</ProjectCapabilities>
174174
</ProjectExtensions>
175-
</Project>
175+
</Project>

Tests/M5Core2TestApp/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@
3434
<package id="UnitsNet.nanoFramework.ElectricPotential" version="4.135.0" targetFramework="netnanoframework10" />
3535
<package id="UnitsNet.nanoFramework.Power" version="4.135.0" targetFramework="netnanoframework10" />
3636
<package id="UnitsNet.nanoFramework.Temperature" version="4.135.0" targetFramework="netnanoframework10" />
37-
</packages>
37+
</packages>

Tests/ToughTestApp/ToughTestApp.nfproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,4 @@
109109
<ProjectConfigurationsDeclaredAsItems />
110110
</ProjectCapabilities>
111111
</ProjectExtensions>
112-
</Project>
112+
</Project>

nanoFramework.M5Core2.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<dependency id="nanoFramework.CoreLibrary" version="1.12.0" />
2222
<dependency id="nanoFramework.Graphics" version="1.0.3.2" />
2323
<dependency id="nanoFramework.Hardware.Esp32" version="1.3.6.7" />
24-
<dependency id="nanoFramework.Iot.Device.Axp192" version="1.1.121.35854" />
24+
<dependency id="nanoFramework.Iot.Device.Axp192" version="1.1.127.28388" />
2525
<dependency id="nanoFramework.Iot.Device.Bmm150" version="1.1.116.8772" />
2626
<dependency id="nanoFramework.Iot.Device.Button" version="1.1.113.2032" />
2727
<dependency id="nanoFramework.Iot.Device.Common.NumberHelper" version="1.1.113.2032" />

nanoFramework.M5Core2/nanoFramework.M5Core2.nfproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@
2929
</Compile>
3030
</ItemGroup>
3131
<ItemGroup>
32-
<Reference Include="Iot.Device.Axp192, Version=1.1.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
33-
<HintPath>..\packages\nanoFramework.Iot.Device.Axp192.1.1.121.35854\lib\Iot.Device.Axp192.dll</HintPath>
34-
<Private>True</Private>
32+
<Reference Include="Iot.Device.Axp192">
33+
<HintPath>..\packages\nanoFramework.Iot.Device.Axp192.1.1.127.28388\lib\Iot.Device.Axp192.dll</HintPath>
3534
</Reference>
3635
<Reference Include="Iot.Device.Bmm150, Version=1.1.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
3736
<HintPath>..\packages\nanoFramework.Iot.Device.Bmm150.1.1.116.8772\lib\Iot.Device.Bmm150.dll</HintPath>

nanoFramework.M5Core2/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="nanoFramework.CoreLibrary" version="1.12.0" targetFramework="netnanoframework10" />
44
<package id="nanoFramework.Graphics" version="1.0.3.2" targetFramework="netnanoframework10" />
55
<package id="nanoFramework.Hardware.Esp32" version="1.3.6.7" targetFramework="netnanoframework10" />
6-
<package id="nanoFramework.Iot.Device.Axp192" version="1.1.121.35854" targetFramework="netnanoframework10" />
6+
<package id="nanoFramework.Iot.Device.Axp192" version="1.1.127.28388" targetFramework="netnano1.0" />
77
<package id="nanoFramework.Iot.Device.Bmm150" version="1.1.116.8772" targetFramework="netnanoframework10" />
88
<package id="nanoFramework.Iot.Device.Button" version="1.1.113.2032" targetFramework="netnanoframework10" />
99
<package id="nanoFramework.Iot.Device.Common.NumberHelper" version="1.1.113.2032" targetFramework="netnanoframework10" />

nanoFramework.Tough/nanoFramework.Tough.nfproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,4 @@
140140
</PropertyGroup>
141141
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.5.103\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.5.103\build\Nerdbank.GitVersioning.targets'))" />
142142
</Target>
143-
</Project>
143+
</Project>

0 commit comments

Comments
 (0)