Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added support for M5Core2 in Graphics Primitives #302

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Added support for M5Core2 in Graphics Primitives #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef18c55
Added support for M5Core2
jsuutari May 21, 2023
29d5deb
removed redundant usings
jsuutari May 21, 2023
080c42c
Merge branch 'main' into jsuu/primitives-enhancements
josesimoes Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 81 additions & 0 deletions samples/Graphics/Primitives/Primitives.nfproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,27 @@
<Content Include="Resources\waterfall_costa_rica.jpg" />
</ItemGroup>
<ItemGroup>
<Reference Include="Iot.Device.Axp192">
<HintPath>packages\nanoFramework.Iot.Device.Axp192.1.2.313\lib\Iot.Device.Axp192.dll</HintPath>
</Reference>
<Reference Include="Iot.Device.Bmm150">
<HintPath>packages\nanoFramework.Iot.Device.Bmm150.1.2.313\lib\Iot.Device.Bmm150.dll</HintPath>
</Reference>
<Reference Include="Iot.Device.Button">
<HintPath>packages\nanoFramework.Iot.Device.Button.1.2.313\lib\Iot.Device.Button.dll</HintPath>
</Reference>
<Reference Include="Iot.Device.Common.NumberHelper">
<HintPath>packages\nanoFramework.Iot.Device.Common.NumberHelper.1.2.295\lib\Iot.Device.Common.NumberHelper.dll</HintPath>
</Reference>
<Reference Include="Iot.Device.Ft6xx6x">
<HintPath>packages\nanoFramework.Iot.Device.Ft6xx6x.1.2.316\lib\Iot.Device.Ft6xx6x.dll</HintPath>
</Reference>
<Reference Include="Iot.Device.Mpu6886">
<HintPath>packages\nanoFramework.Iot.Device.Mpu6886.1.2.313\lib\Iot.Device.Mpu6886.dll</HintPath>
</Reference>
<Reference Include="Iot.Device.Rtc">
<HintPath>packages\nanoFramework.Iot.Device.Rtc.1.2.313\lib\Iot.Device.Rtc.dll</HintPath>
</Reference>
<Reference Include="mscorlib">
<HintPath>packages\nanoFramework.CoreLibrary.1.14.2\lib\mscorlib.dll</HintPath>
<Private>True</Private>
Expand All @@ -81,6 +102,9 @@
<HintPath>packages\nanoFramework.Hardware.Esp32.1.6.8\lib\nanoFramework.Hardware.Esp32.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nanoFramework.M5Core2">
<HintPath>packages\nanoFramework.M5Core2.1.1.142\lib\nanoFramework.M5Core2.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.ResourceManager, Version=1.2.13.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>packages\nanoFramework.ResourceManager.1.2.13\lib\nanoFramework.ResourceManager.dll</HintPath>
<Private>True</Private>
Expand All @@ -97,10 +121,67 @@
<HintPath>packages\nanoFramework.System.Collections.1.5.18\lib\nanoFramework.System.Collections.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nanoFramework.System.Text">
<HintPath>packages\nanoFramework.System.Text.1.2.37\lib\nanoFramework.System.Text.dll</HintPath>
</Reference>
<Reference Include="System.Buffers.Binary.BinaryPrimitives">
<HintPath>packages\nanoFramework.System.Buffers.Binary.BinaryPrimitives.1.2.295\lib\System.Buffers.Binary.BinaryPrimitives.dll</HintPath>
</Reference>
<Reference Include="System.Device.Adc">
<HintPath>packages\nanoFramework.System.Device.Adc.1.1.6\lib\System.Device.Adc.dll</HintPath>
</Reference>
<Reference Include="System.Device.Dac">
<HintPath>packages\nanoFramework.System.Device.Dac.1.5.9\lib\System.Device.Dac.dll</HintPath>
</Reference>
<Reference Include="System.Device.Gpio">
<HintPath>packages\nanoFramework.System.Device.Gpio.1.1.28\lib\System.Device.Gpio.dll</HintPath>
</Reference>
<Reference Include="System.Device.I2c">
<HintPath>packages\nanoFramework.System.Device.I2c.1.1.11\lib\System.Device.I2c.dll</HintPath>
</Reference>
<Reference Include="System.Device.Model">
<HintPath>packages\nanoFramework.System.Device.Model.1.2.295\lib\System.Device.Model.dll</HintPath>
</Reference>
<Reference Include="System.Device.Pwm">
<HintPath>packages\nanoFramework.System.Device.Pwm.1.1.6\lib\System.Device.Pwm.dll</HintPath>
</Reference>
<Reference Include="System.Device.Spi">
<HintPath>packages\nanoFramework.System.Device.Spi.1.3.37\lib\System.Device.Spi.dll</HintPath>
</Reference>
<Reference Include="System.Diagnostics.Stopwatch">
<HintPath>packages\nanoFramework.System.Diagnostics.Stopwatch.1.2.295\lib\System.Diagnostics.Stopwatch.dll</HintPath>
</Reference>
<Reference Include="System.IO.FileSystem">
<HintPath>packages\nanoFramework.System.IO.FileSystem.1.1.23\lib\System.IO.FileSystem.dll</HintPath>
</Reference>
<Reference Include="System.IO.Ports">
<HintPath>packages\nanoFramework.System.IO.Ports.1.1.60\lib\System.IO.Ports.dll</HintPath>
</Reference>
<Reference Include="System.IO.Streams">
<HintPath>packages\nanoFramework.System.IO.Streams.1.1.38\lib\System.IO.Streams.dll</HintPath>
</Reference>
<Reference Include="System.Math, Version=1.5.29.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>packages\nanoFramework.System.Math.1.5.29\lib\System.Math.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Numerics">
<HintPath>packages\nanoFramework.System.Numerics.1.2.295\lib\System.Numerics.dll</HintPath>
</Reference>
<Reference Include="System.Threading">
<HintPath>packages\nanoFramework.System.Threading.1.1.19\lib\System.Threading.dll</HintPath>
</Reference>
<Reference Include="UnitsNet.ElectricCurrent">
<HintPath>packages\UnitsNet.nanoFramework.ElectricCurrent.5.13.0\lib\UnitsNet.ElectricCurrent.dll</HintPath>
</Reference>
<Reference Include="UnitsNet.ElectricPotential">
<HintPath>packages\UnitsNet.nanoFramework.ElectricPotential.5.13.0\lib\UnitsNet.ElectricPotential.dll</HintPath>
</Reference>
<Reference Include="UnitsNet.Power">
<HintPath>packages\UnitsNet.nanoFramework.Power.5.13.0\lib\UnitsNet.Power.dll</HintPath>
</Reference>
<Reference Include="UnitsNet.Temperature">
<HintPath>packages\UnitsNet.nanoFramework.Temperature.5.13.0\lib\UnitsNet.Temperature.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
<ProjectExtensions>
Expand Down
4 changes: 4 additions & 0 deletions samples/Graphics/Primitives/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@
// !!!----------- SAMPLE - ENSURE YOU CHOOSE THE CORRECT TARGET HERE --------------!!!
//#define STM32F769I_DISCO // Comment this in if for the target!
#define ESP32 // Comment this in if for the target platform!
//#define M5Core2 // Comment this in if for the target platform!
// !!!-----------------------------------------------------------------------------!!!

using System.Threading;
using nanoFramework.Hardware.Esp32;
using nanoFramework.UI;
using Primitives.SimplePrimitives;
using Stack = nanoFramework.M5Stack;

namespace Primitives
{
Expand Down Expand Up @@ -39,6 +41,8 @@ public static void Main()
#elif STM32F769I_DISCO // This is an example (working) button map, work the actual pins out for your need!
//WARNING: Invalid pin mappings will never be returned, and may need you to reflash the device!
DisplayControl.Initialize(new SpiConfiguration(), new ScreenConfiguration());
#elif M5Core2
Stack.M5Core2.InitializeScreen();
#else
throw new System.Exception("Unknown display mapping!");
#endif
Expand Down
31 changes: 29 additions & 2 deletions samples/Graphics/Primitives/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="nanoFramework.CoreLibrary" version="1.14.2" targetFramework="netnano1.0" />
<package id="nanoFramework.Graphics" version="1.1.37" targetFramework="netnano1.0" />
<package id="nanoFramework.Hardware.Esp32" version="1.6.8" targetFramework="netnano1.0" />
<package id="nanoFramework.Hardware.Esp32" version="1.6.3" targetFramework="netnano1.0" />
<package id="nanoFramework.Iot.Device.Axp192" version="1.2.313" targetFramework="netnano1.0" />
<package id="nanoFramework.Iot.Device.Bmm150" version="1.2.313" targetFramework="netnano1.0" />
<package id="nanoFramework.Iot.Device.Button" version="1.2.313" targetFramework="netnano1.0" />
<package id="nanoFramework.Iot.Device.Common.NumberHelper" version="1.2.295" targetFramework="netnano1.0" />
<package id="nanoFramework.Iot.Device.Ft6xx6x" version="1.2.316" targetFramework="netnano1.0" />
<package id="nanoFramework.Iot.Device.Mpu6886" version="1.2.313" targetFramework="netnano1.0" />
<package id="nanoFramework.Iot.Device.Rtc" version="1.2.313" targetFramework="netnano1.0" />
<package id="nanoFramework.M5Core2" version="1.1.142" targetFramework="netnano1.0" />
<package id="nanoFramework.ResourceManager" version="1.2.13" targetFramework="netnano1.0" />
<package id="nanoFramework.Runtime.Events" version="1.11.6" targetFramework="netnano1.0" />
<package id="nanoFramework.Runtime.Native" version="1.6.6" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Buffers.Binary.BinaryPrimitives" version="1.2.295" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Collections" version="1.5.18" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Device.Adc" version="1.1.6" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Device.Dac" version="1.5.9" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Device.Gpio" version="1.1.28" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Device.I2c" version="1.1.11" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Device.Model" version="1.2.295" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Device.Pwm" version="1.1.6" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Device.Spi" version="1.3.37" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Diagnostics.Stopwatch" version="1.2.295" targetFramework="netnano1.0" />
<package id="nanoFramework.System.IO.FileSystem" version="1.1.23" targetFramework="netnano1.0" />
<package id="nanoFramework.System.IO.Ports" version="1.1.60" targetFramework="netnano1.0" />
<package id="nanoFramework.System.IO.Streams" version="1.1.38" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Math" version="1.5.29" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Numerics" version="1.2.295" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Text" version="1.2.37" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Threading" version="1.1.19" targetFramework="netnano1.0" />
<package id="UnitsNet.nanoFramework.ElectricCurrent" version="5.13.0" targetFramework="netnano1.0" />
<package id="UnitsNet.nanoFramework.ElectricPotential" version="5.13.0" targetFramework="netnano1.0" />
<package id="UnitsNet.nanoFramework.Power" version="5.13.0" targetFramework="netnano1.0" />
<package id="UnitsNet.nanoFramework.Temperature" version="5.13.0" targetFramework="netnano1.0" />
</packages>
Loading