M5Core2 and Tough now enable 5V boost (#181)

nanoframework · Jun 28, 2022 · 0353a4e · 0353a4e
1 parent 5f99c76
commit 0353a4e
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git a/M5StackCommon/Core2ToughCommon.cs b/M5StackCommon/Core2ToughCommon.cs
@@ -363,6 +363,9 @@ static Tough()
             // 128ms power on, 4s power off
             _power.SetButtonBehavior(LongPressTiming.S1, ShortPressTiming.Ms128, true, SignalDelayAfterPowerUp.Ms32, ShutdownTiming.S4);
 
+            // enable EXTEN switch control to enable 5V boost
+            _power.EXTENEnable = true;
+
 #if M5CORE2
             // enable DCO and LDO outputs
             _power.LdoDcPinsEnabled = LdoDcPinsEnabled.DcDc1 | LdoDcPinsEnabled.DcDc3 | LdoDcPinsEnabled.Ldo2 | LdoDcPinsEnabled.Ldo3;

diff --git a/Tests/M5Core2TestApp/M5Core2TestApp.nfproj b/Tests/M5Core2TestApp/M5Core2TestApp.nfproj
@@ -172,4 +172,4 @@
       <ProjectConfigurationsDeclaredAsItems />
     </ProjectCapabilities>
   </ProjectExtensions>
-</Project>
+</Project>
diff --git a/Tests/M5Core2TestApp/packages.config b/Tests/M5Core2TestApp/packages.config
@@ -34,4 +34,4 @@
   <package id="UnitsNet.nanoFramework.ElectricPotential" version="4.135.0" targetFramework="netnanoframework10" />
   <package id="UnitsNet.nanoFramework.Power" version="4.135.0" targetFramework="netnanoframework10" />
   <package id="UnitsNet.nanoFramework.Temperature" version="4.135.0" targetFramework="netnanoframework10" />
-</packages>
+</packages>
diff --git a/Tests/ToughTestApp/ToughTestApp.nfproj b/Tests/ToughTestApp/ToughTestApp.nfproj
@@ -109,4 +109,4 @@
       <ProjectConfigurationsDeclaredAsItems />
     </ProjectCapabilities>
   </ProjectExtensions>
-</Project>
+</Project>
diff --git a/nanoFramework.M5Core2.nuspec b/nanoFramework.M5Core2.nuspec
@@ -21,7 +21,7 @@
       <dependency id="nanoFramework.CoreLibrary" version="1.12.0" />
       <dependency id="nanoFramework.Graphics" version="1.0.3.2" />
       <dependency id="nanoFramework.Hardware.Esp32" version="1.3.6.7" />
-      <dependency id="nanoFramework.Iot.Device.Axp192" version="1.1.121.35854" />
+      <dependency id="nanoFramework.Iot.Device.Axp192" version="1.1.127.28388" />
       <dependency id="nanoFramework.Iot.Device.Bmm150" version="1.1.116.8772" />
       <dependency id="nanoFramework.Iot.Device.Button" version="1.1.113.2032" />
       <dependency id="nanoFramework.Iot.Device.Common.NumberHelper" version="1.1.113.2032" />

diff --git a/nanoFramework.M5Core2/nanoFramework.M5Core2.nfproj b/nanoFramework.M5Core2/nanoFramework.M5Core2.nfproj
@@ -29,9 +29,8 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Iot.Device.Axp192, Version=1.1.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Iot.Device.Axp192.1.1.121.35854\lib\Iot.Device.Axp192.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Iot.Device.Axp192">
+      <HintPath>..\packages\nanoFramework.Iot.Device.Axp192.1.1.127.28388\lib\Iot.Device.Axp192.dll</HintPath>
     </Reference>
     <Reference Include="Iot.Device.Bmm150, Version=1.1.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\packages\nanoFramework.Iot.Device.Bmm150.1.1.116.8772\lib\Iot.Device.Bmm150.dll</HintPath>

diff --git a/nanoFramework.M5Core2/packages.config b/nanoFramework.M5Core2/packages.config
@@ -3,7 +3,7 @@
   <package id="nanoFramework.CoreLibrary" version="1.12.0" targetFramework="netnanoframework10" />
   <package id="nanoFramework.Graphics" version="1.0.3.2" targetFramework="netnanoframework10" />
   <package id="nanoFramework.Hardware.Esp32" version="1.3.6.7" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.Iot.Device.Axp192" version="1.1.121.35854" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.Iot.Device.Axp192" version="1.1.127.28388" targetFramework="netnano1.0" />
   <package id="nanoFramework.Iot.Device.Bmm150" version="1.1.116.8772" targetFramework="netnanoframework10" />
   <package id="nanoFramework.Iot.Device.Button" version="1.1.113.2032" targetFramework="netnanoframework10" />
   <package id="nanoFramework.Iot.Device.Common.NumberHelper" version="1.1.113.2032" targetFramework="netnanoframework10" />

diff --git a/nanoFramework.Tough/nanoFramework.Tough.nfproj b/nanoFramework.Tough/nanoFramework.Tough.nfproj
@@ -140,4 +140,4 @@
     </PropertyGroup>
     <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'))" />
   </Target>
-</Project>
+</Project>