Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/IDFBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ jobs:
run: |
git clone --depth 1 --branch "${{ steps.m5gfx.outputs.branch }}" \
"https://github.com/${{ steps.m5gfx.outputs.repo }}.git" \
"$GITHUB_WORKSPACE/_deps/M5GFX"
"$GITHUB_WORKSPACE/_deps/m5gfx"

- name: Build
working-directory: examples/Test/build_test
shell: bash
env:
M5GFX_PATH: ${{ github.workspace }}/_deps/M5GFX
M5GFX_PATH: ${{ github.workspace }}/_deps/m5gfx
run: |
. $IDF_PATH/export.sh
idf.py set-target ${{ matrix.target }}
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/PushESPComponent.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Push component to ESP Component Registry

on:
push:
tags:
- '*.*.*'

jobs:
upload_components:
if: github.repository == 'm5stack/M5Unified'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: 'recursive'
- name: Upload component to the component registry
uses: espressif/upload-components-ci-action@v1
with:
name: 'm5unified'
namespace: 'm5stack'
version: ${{ github.ref_name }}
api_token: ${{ secrets.IDF_COMPONENT_API_TOKEN }}
14 changes: 12 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,20 @@ file(GLOB SRCS
)
set(COMPONENT_SRCS ${SRCS})

# ESP-IDF uses the directory name as the component name (case sensitive).
# Use "M5GFX" when a sibling components/M5GFX checkout exists, otherwise "m5gfx"
# (managed_components/m5stack__m5gfx is registered as the lower-case "m5gfx").
get_filename_component(_m5u_parent "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY)
if(EXISTS "${_m5u_parent}/M5GFX/CMakeLists.txt")
set(_m5gfx_name M5GFX)
else()
set(_m5gfx_name m5gfx)
endif()

if (IDF_VERSION_MAJOR GREATER_EQUAL 5)
set(COMPONENT_REQUIRES M5GFX esp_adc driver)
set(COMPONENT_REQUIRES ${_m5gfx_name} esp_adc driver)
else()
set(COMPONENT_REQUIRES M5GFX esp_adc_cal)
set(COMPONENT_REQUIRES ${_m5gfx_name} esp_adc_cal)
endif()

### If you use arduino-esp32 components, please activate next comment line.
Expand Down
3 changes: 3 additions & 0 deletions examples/Basic/HowToUse/HowToUse.ino
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ void setup(void)
case m5::board_t::board_M5PaperS3: name = "PaperS3"; break;
case m5::board_t::board_M5PowerHub: name = "PowerHub"; break;
case m5::board_t::board_M5PaperColor: name = "PaperColor"; break;
case m5::board_t::board_M5PaperMono: name = "PaperMono"; break;
case m5::board_t::board_M5StopWatch: name = "StopWatch"; break;
#elif defined (CONFIG_IDF_TARGET_ESP32C3)
case m5::board_t::board_M5StampC3: name = "StampC3"; break;
Expand All @@ -293,6 +294,8 @@ void setup(void)
case m5::board_t::board_M5NanoC6: name = "NanoC6"; break;
case m5::board_t::board_M5UnitC6L: name = "UnitC6L"; break;
case m5::board_t::board_ArduinoNessoN1: name = "NessoN1"; break;
#elif defined (CONFIG_IDF_TARGET_ESP32H2)
case m5::board_t::board_NanoH2: name = "NanoH2"; break;
#elif defined (CONFIG_IDF_TARGET_ESP32P4)
case m5::board_t::board_M5Tab5: name = "Tab5"; break;
#else
Expand Down
2 changes: 1 addition & 1 deletion idf_component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ description: Unified library for M5Stack series
issues: https://github.com/m5stack/M5Unified/issues
repository: https://github.com/m5stack/M5Unified.git
url: https://github.com/m5stack/M5Unified.git
version: 0.2.15
version: 0.2.16
4 changes: 2 additions & 2 deletions library.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"dependencies": [
{
"name": "M5GFX",
"version": ">=0.2.21"
"version": ">=0.2.22"
}
],
"version": "0.2.15",
"version": "0.2.16",
"frameworks": ["arduino", "espidf", "*"],
"platforms": ["espressif32", "native"],
"headers": "M5Unified.h"
Expand Down
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=M5Unified
version=0.2.15
version=0.2.16
author=M5Stack
maintainer=M5Stack
sentence=Unified library for M5Stack series
Expand Down
Loading
Loading