Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
8c7b529
Set version to '1.0.1-preview.{height}'
nfbot Dec 23, 2021
e833ab3
Merge branch 'release-v1.0.0'
nfbot Dec 23, 2021
d2cfdec
Update 1 nuget dependencies
github-actions[bot] Dec 27, 2021
b353052
Update README.md (#42)
jcabad100 Dec 28, 2021
5ce28f5
Rename M5Stack library to M5Core (#43)
josesimoes Dec 28, 2021
369585c
Update 7 nuget dependencies
github-actions[bot] Dec 29, 2021
1003a07
Update 5 nuget dependencies
github-actions[bot] Dec 31, 2021
1685822
Update 5 nuget dependencies
github-actions[bot] Dec 31, 2021
e8af671
Update 1 nuget dependencies
github-actions[bot] Jan 5, 2022
d059c11
Work CI-CD
josesimoes Jan 10, 2022
cfc7c47
Work CI-CD
josesimoes Jan 10, 2022
9be7714
Update 6 NuGet dependencies
github-actions[bot] Jan 11, 2022
e9c0049
Adding touch events on M5Core2 (#48)
Ellerbach Jan 12, 2022
397b5f6
Fixing resource not found in M5Core2.InitializeScreen() (#52)
Ellerbach Jan 14, 2022
8c62d51
Fixing NuGets and M5Core2 project (#53)
Ellerbach Jan 14, 2022
1f595ee
Fixing resources for M5Core screen init (#54)
Ellerbach Jan 16, 2022
44719cf
Fixing Issue with wifi connection and touch
Ellerbach Jan 20, 2022
4bc6271
Fix touch screen and wifi issue when both in use (#55)
Ellerbach Jan 20, 2022
a6cc6ba
Update 18 NuGet dependencies
github-actions[bot] Jan 21, 2022
389998e
Update 5 NuGet dependencies
github-actions[bot] Jan 21, 2022
956718d
Update 6 NuGet dependencies
github-actions[bot] Jan 21, 2022
31df8a9
Update 7 NuGet dependencies
github-actions[bot] Jan 21, 2022
352d021
Update 4 NuGet dependencies
github-actions[bot] Jan 24, 2022
30705ea
Update 15 NuGet dependencies
github-actions[bot] Jan 26, 2022
181d4fd
Update 11 NuGet dependencies
github-actions[bot] Jan 27, 2022
c3a169b
Update 10 NuGet dependencies
github-actions[bot] Jan 27, 2022
c5c325a
Work CI-CD
josesimoes Jan 28, 2022
1bac7b4
Update 13 NuGet dependencies
github-actions[bot] Jan 28, 2022
f914660
Adjusting red port for M5Core2 and M5Core (#64)
Ellerbach Jan 28, 2022
1f2cee5
Update 8 NuGet dependencies
github-actions[bot] Jan 28, 2022
1e623cc
Fixing I2C creation for MPU6886 (#69)
Ellerbach Jan 29, 2022
eeee88b
Update 17 NuGet dependencies
github-actions[bot] Jan 31, 2022
002c2b5
Added board support package for Atom Lite (#71)
Feiko Jan 31, 2022
bb725e7
Rename Atom Lite namespace and projects (#74)
josesimoes Jan 31, 2022
e37de3a
Add BSP for ATOM Matrix (#75)
josesimoes Feb 3, 2022
d9118e8
Update 9 NuGet dependencies
github-actions[bot] Feb 4, 2022
5cdc546
Update 3 NuGet dependencies
github-actions[bot] Feb 5, 2022
6d54d9e
Update 1 NuGet dependencies
github-actions[bot] Feb 6, 2022
a0c31bc
Update 1 NuGet dependencies
github-actions[bot] Feb 8, 2022
5f922c6
Update 11 NuGet dependencies
github-actions[bot] Feb 9, 2022
b59a880
Update 10 NuGet dependencies
github-actions[bot] Feb 10, 2022
e3909e7
Update 10 NuGet dependencies
github-actions[bot] Feb 12, 2022
b1e0843
Update 10 NuGet dependencies
github-actions[bot] Feb 16, 2022
3d113c5
Add missing dependency declarationWork CI-CD
josesimoes Feb 17, 2022
d6dda39
Update 20 NuGet dependencies
github-actions[bot] Feb 18, 2022
32bad11
Update 2 NuGet dependencies
github-actions[bot] Feb 25, 2022
a459373
Update 10 NuGet dependencies
github-actions[bot] Feb 26, 2022
626a2a0
Update 10 NuGet dependencies
github-actions[bot] Feb 27, 2022
339d9f2
Update 2 NuGet dependencies
github-actions[bot] Mar 3, 2022
c9ca910
Update 5 NuGet dependencies
github-actions[bot] Mar 4, 2022
30edf1e
Update 5 NuGet dependencies
github-actions[bot] Mar 7, 2022
8158406
Update 7 NuGet dependencies
github-actions[bot] Mar 8, 2022
1e628ad
Update 1 NuGet dependencies
github-actions[bot] Mar 9, 2022
8dc2e15
Update 1 NuGet dependencies
github-actions[bot] Mar 11, 2022
4be4c4c
Add M5Stack FIRE (#90)
Ellerbach Mar 14, 2022
e5666a3
Fix M5Stack Fire CI-CD (#97)
josesimoes Mar 14, 2022
e053ea3
Update 21 NuGet dependencies (#108)
github-actions[bot] Mar 16, 2022
e347a57
Update 1 NuGet dependencies
github-actions[bot] Mar 16, 2022
c63db1d
Update 1 NuGet dependencies
github-actions[bot] Mar 16, 2022
f7e8550
Update 22 NuGet dependencies
github-actions[bot] Mar 19, 2022
5e715b7
Update 1 NuGet dependencies
github-actions[bot] Mar 20, 2022
6e415b5
Update 10 NuGet dependencies
github-actions[bot] Mar 21, 2022
7cffa86
Update 2 NuGet dependencies
github-actions[bot] Mar 22, 2022
d20269f
Update 2 NuGet dependencies
github-actions[bot] Mar 23, 2022
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
33 changes: 7 additions & 26 deletions .github/workflows/update-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ name: Daily update dependencies

on:
schedule:
# At 00:00 UTC every Mon, Wed and Friday.
- cron: '00 00 * * 1,3,5'
# At 03:00 UTC daily.
# This has to run after the automated updated in IoT bindings as it depends from several bindings there.
- cron: '00 03 * * *'
repository_dispatch:
types: update-dependencies

Expand All @@ -21,32 +22,12 @@ jobs:
name: Update .NET nanoFramework dependencies
timeout-minutes: 30 # Non default because this solution has lots of projects to update!
runs-on: windows-latest
env:
GITHUB_TOKEN: ${{ github.token }}
steps:
- name: Checkout
uses: actions/checkout@v2
with:
path: main
- name: Checkout tools repo
uses: actions/checkout@v2
with:
repository: nanoframework/nf-tools
path: tools
- name: Update dependencies
run: ./github-actions/update-nf-dependencies.ps1
working-directory: tools
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
if: env.CREATE_PR == 'true'
uses: nanoframework/nanodu@v1
with:
title: '${{ env.PR_TITLE }}'
body: |
${{ env.PR_MESSAGE }}

[version update]

### :warning: This is an automated update. :warning:
committer: 'nfbot <dependencybot@nanoframework.net>'
branch: ${{ env.BRANCH_NAME }}
path: main
labels: |
Type: dependencies
solutionsToCheck: 'nanoFramework.M5Stack.sln'
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -331,3 +331,6 @@ ASALocalRun/

#SoundCloud
*.sonarqube/

#VSCode
*.vscode/
155 changes: 155 additions & 0 deletions AtomCommon/AtomBase.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using Iot.Device.Button;
using nanoFramework.Hardware.Esp32;
using nanoFramework.Hardware.Esp32.Rmt;
using System;
using System.Device.Adc;
using System.Device.Dac;
using System.Device.Gpio;
using System.Device.I2c;
using System.Device.Spi;

#if ATOM_MATRIX
namespace nanoFramework.AtomMatrix
{
/// <summary>
/// The AtomMatrix Board.
/// </summary>
public static partial class AtomMatrix
#else
namespace nanoFramework.AtomLite
{
/// <summary>
/// M5Stack board
/// </summary>
public static partial class AtomLite
#endif
{
private static GpioButton _button;
private static GpioController _gpio;
private static DacChannel _dac1;
private static DacChannel _dac2;
private static AdcController _adc;
private static TransmitterChannel _irLed;

/// <summary>
/// Main button.
/// </summary>
public static GpioButton Button
{
get
{
if (_button == null)
{
_button = new(39, _gpio, false);
}

return _button;
}
}

/// <summary>
/// Gets the main <see cref="GpioController"/>.
/// </summary>
public static GpioController GpioController => _gpio;

/// <summary>
/// Gets <see cref="DacChannel"/> connected to GPIO 25.
/// </summary>
public static DacChannel Dac1
{
get
{
// We are creating it on demand
if (_dac1 == null)
{
_dac1 = DacController.GetDefault().OpenChannel(0);
}

return _dac1;
}
}

/// <summary>
/// Gets <see cref="DacChannel"/> connected to GPIO 26.
/// </summary>
public static DacChannel Dac2
{
get
{
// We are creating it on demand
if (_dac2 == null)
{

_dac2 = DacController.GetDefault().OpenChannel(1);
}

return _dac2;
}
}

/// <summary>
/// Gets an <see cref="I2cDevice"/>.
/// </summary>
/// <param name="i2cDeviceAddress">The address of the <see cref="I2cDevice"/> on the bus.</param>
/// <returns>The I2cDevice.</returns>
public static I2cDevice GetI2cDevice(int i2cDeviceAddress) => new(new I2cConnectionSettings(1, i2cDeviceAddress));

/// <summary>
/// Gets an <see cref="I2cDevice"/>.
/// </summary>
/// <param name="i2cDeviceAddress">The address of the <see cref="I2cDevice"/> on the bus.</param>
/// <returns>The I2cDevice.</returns>
public static I2cDevice GetGrove(int i2cDeviceAddress) => new(new I2cConnectionSettings(1, i2cDeviceAddress));

/// <summary>
/// Gets the infrared led as a RMT transmitter channel.
/// </summary>
public static TransmitterChannel InfraredLed
{
get
{
if (_irLed == null)
{
_irLed = new(12);
}

return _irLed;
}
}

/// <summary>
/// Gets an <see cref="SpiDevice"/>.
/// </summary>
/// <param name="chipSelect">The chip select of the device, needs to be any valid GPIO.</param>
/// <returns>An SpiDevice.</returns>
public static SpiDevice GetSpiDevice(int chipSelect) => new(new SpiConnectionSettings(1, chipSelect));

/// <summary>
/// Gets an <see cref="AdcChannel"/>
/// </summary>
/// <param name="gpioNumber">The GPIO pin number where the <see cref="AdcChannel"/> is connected to.</param>
/// <returns>An AdcChannel</returns>
public static AdcChannel GetAdcGpio(int gpioNumber)
{
if (_adc == null)
{
_adc = new();
}

switch (gpioNumber)
{
case 33:
Configuration.SetPinFunction(12, DeviceFunction.ADC1_CH5);
return _adc.OpenChannel(5);
case 32:
Configuration.SetPinFunction(25, DeviceFunction.ADC1_CH4);
return _adc.OpenChannel(4);
default:
throw new ArgumentException(nameof(gpioNumber));
}
}
}
}
14 changes: 14 additions & 0 deletions AtomCommon/AtomCommon.projitems
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<HasSharedItems>true</HasSharedItems>
<SharedGUID>79f09006-ab5d-4e3e-ad12-2efbee536ca9</SharedGUID>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<Import_RootNamespace>AtomCommon</Import_RootNamespace>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)AtomBase.cs" />
</ItemGroup>
</Project>
13 changes: 13 additions & 0 deletions AtomCommon/AtomCommon.shproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<ProjectGuid>79f09006-ab5d-4e3e-ad12-2efbee536ca9</ProjectGuid>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
<PropertyGroup />
<Import Project="AtomCommon.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
</Project>
3 changes: 1 addition & 2 deletions M5StackCommon/Console.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@

using nanoFramework.Presentation.Media;
using nanoFramework.UI;
using System;

namespace nanoFramework
namespace nanoFramework.M5Stack
{
/// <summary>
/// Console class to display text on screens
Expand Down
1 change: 0 additions & 1 deletion M5StackCommon/ScreenBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

using nanoFramework.Presentation.Media;
using nanoFramework.UI;
using System;
using System.Device.Gpio;

namespace nanoFramework.M5Stack
Expand Down
Loading