-
-
Notifications
You must be signed in to change notification settings - Fork 12
App updates for SDK changes #45
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
817bffa
App updates for SDK changes
KenVanHoeylandt ac203c9
Fix for app CMakeLists.txt
KenVanHoeylandt 22198ea
Revert
KenVanHoeylandt d65415e
Tool v5.0.1
KenVanHoeylandt 3aca2c5
Device refcount fixes
KenVanHoeylandt 3e94b35
Fix for artifact upload
KenVanHoeylandt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,13 @@ | ||
| # tactility-cmakelists-version: 1 | ||
| cmake_minimum_required(VERSION 3.20) | ||
|
|
||
| include($ENV{IDF_PATH}/tools/cmake/project.cmake) | ||
|
|
||
| if (DEFINED ENV{TACTILITY_SDK_PATH}) | ||
| set(TACTILITY_SDK_PATH $ENV{TACTILITY_SDK_PATH}) | ||
| else() | ||
| set(TACTILITY_SDK_PATH "../../release/TactilitySDK") | ||
| message(WARNING "⚠️ TACTILITY_SDK_PATH environment variable is not set, defaulting to ${TACTILITY_SDK_PATH}") | ||
| if (NOT DEFINED ENV{TACTILITY_SDK_PATH}) | ||
| message(FATAL_ERROR "TACTILITY_SDK_PATH environment variable is not set") | ||
| endif() | ||
|
|
||
| get_filename_component(TACTILITY_SDK_PATH "$ENV{TACTILITY_SDK_PATH}" ABSOLUTE) | ||
| include("${TACTILITY_SDK_PATH}/TactilitySDK.cmake") | ||
|
|
||
| # Must be set before project() - ESP-IDF resolves components at that point, so setting these | ||
| # from inside the tactility_project() macro (which necessarily runs after project(), since it | ||
| # also calls project_elf()) would be too late. | ||
| set(EXTRA_COMPONENT_DIRS | ||
| ${TACTILITY_SDK_PATH} | ||
| "${TACTILITY_SDK_PATH}/Libraries/TactilityFreeRtos" | ||
| "${TACTILITY_SDK_PATH}/Modules" | ||
| ) | ||
|
|
||
| project(Brainfuck) | ||
| tactility_project(Brainfuck) | ||
| tactility_project_pre(tactility.brainfuck) | ||
| project(tactility.brainfuck) | ||
| tactility_project_post(tactility.brainfuck) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,4 @@ | ||
| file(GLOB_RECURSE SOURCE_FILES | ||
| Source/*.c* | ||
| ) | ||
| include("$ENV{TACTILITY_SDK_PATH}/TactilitySDK.cmake") | ||
|
|
||
| idf_component_register( | ||
| SRCS ${SOURCE_FILES} | ||
| REQUIRES TactilitySDK | ||
| ) | ||
| file(GLOB_RECURSE SOURCE_FILES Source/*.c*) | ||
| tactility_component_register(SRCS ${SOURCE_FILES}) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,13 @@ | ||
| # tactility-cmakelists-version: 1 | ||
| cmake_minimum_required(VERSION 3.20) | ||
|
|
||
| include($ENV{IDF_PATH}/tools/cmake/project.cmake) | ||
|
|
||
| if (DEFINED ENV{TACTILITY_SDK_PATH}) | ||
| set(TACTILITY_SDK_PATH $ENV{TACTILITY_SDK_PATH}) | ||
| else() | ||
| set(TACTILITY_SDK_PATH "../../release/TactilitySDK") | ||
| message(WARNING "⚠️ TACTILITY_SDK_PATH environment variable is not set, defaulting to ${TACTILITY_SDK_PATH}") | ||
| if (NOT DEFINED ENV{TACTILITY_SDK_PATH}) | ||
| message(FATAL_ERROR "TACTILITY_SDK_PATH environment variable is not set") | ||
| endif() | ||
|
|
||
| get_filename_component(TACTILITY_SDK_PATH "$ENV{TACTILITY_SDK_PATH}" ABSOLUTE) | ||
| include("${TACTILITY_SDK_PATH}/TactilitySDK.cmake") | ||
|
|
||
| # Must be set before project() - ESP-IDF resolves components at that point, so setting these | ||
| # from inside the tactility_project() macro (which necessarily runs after project(), since it | ||
| # also calls project_elf()) would be too late. | ||
| set(EXTRA_COMPONENT_DIRS | ||
| ${TACTILITY_SDK_PATH} | ||
| "${TACTILITY_SDK_PATH}/Libraries/TactilityFreeRtos" | ||
| "${TACTILITY_SDK_PATH}/Modules" | ||
| ) | ||
|
|
||
| project(Breakout) | ||
| tactility_project(Breakout) | ||
| tactility_project_pre(tactility.breakout) | ||
| project(tactility.breakout) | ||
| tactility_project_post(tactility.breakout) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,6 @@ | ||
| include("$ENV{TACTILITY_SDK_PATH}/TactilitySDK.cmake") | ||
|
|
||
| file(GLOB_RECURSE SOURCE_FILES Source/*.c*) | ||
| file(GLOB_RECURSE SFX_ENGINE_FILES ../../../Libraries/SfxEngine/Source/*.c*) | ||
|
|
||
| idf_component_register( | ||
| SRCS ${SOURCE_FILES} ${SFX_ENGINE_FILES} | ||
| # Library headers must be included directly, | ||
| # because all regular dependencies get stripped by elf_loader's cmake script | ||
| INCLUDE_DIRS ../../../Libraries/SfxEngine/Include | ||
| REQUIRES TactilitySDK | ||
| ) | ||
| tactility_component_register(SRCS ${SOURCE_FILES} ${SFX_ENGINE_FILES} INCLUDE_DIRS ../../../Libraries/SfxEngine/Include) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,13 @@ | ||
| # tactility-cmakelists-version: 1 | ||
| cmake_minimum_required(VERSION 3.20) | ||
|
|
||
| include($ENV{IDF_PATH}/tools/cmake/project.cmake) | ||
|
|
||
| if (DEFINED ENV{TACTILITY_SDK_PATH}) | ||
| set(TACTILITY_SDK_PATH $ENV{TACTILITY_SDK_PATH}) | ||
| else() | ||
| set(TACTILITY_SDK_PATH "../../release/TactilitySDK") | ||
| message(WARNING "⚠️ TACTILITY_SDK_PATH environment variable is not set, defaulting to ${TACTILITY_SDK_PATH}") | ||
| if (NOT DEFINED ENV{TACTILITY_SDK_PATH}) | ||
| message(FATAL_ERROR "TACTILITY_SDK_PATH environment variable is not set") | ||
| endif() | ||
|
|
||
| get_filename_component(TACTILITY_SDK_PATH "$ENV{TACTILITY_SDK_PATH}" ABSOLUTE) | ||
| include("${TACTILITY_SDK_PATH}/TactilitySDK.cmake") | ||
|
|
||
| # Must be set before project() - ESP-IDF resolves components at that point, so setting these | ||
| # from inside the tactility_project() macro (which necessarily runs after project(), since it | ||
| # also calls project_elf()) would be too late. | ||
| set(EXTRA_COMPONENT_DIRS | ||
| ${TACTILITY_SDK_PATH} | ||
| "${TACTILITY_SDK_PATH}/Libraries/TactilityFreeRtos" | ||
| "${TACTILITY_SDK_PATH}/Modules" | ||
| ) | ||
|
|
||
| project(Calculator) | ||
| tactility_project(Calculator) | ||
| tactility_project_pre(tactility.calculator) | ||
| project(tactility.calculator) | ||
| tactility_project_post(tactility.calculator) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,4 @@ | ||
| file(GLOB_RECURSE SOURCE_FILES | ||
| Source/*.c* | ||
| ) | ||
| include("$ENV{TACTILITY_SDK_PATH}/TactilitySDK.cmake") | ||
|
|
||
| idf_component_register( | ||
| SRCS ${SOURCE_FILES} | ||
| REQUIRES TactilitySDK | ||
| ) | ||
| file(GLOB_RECURSE SOURCE_FILES Source/*.c*) | ||
| tactility_component_register(SRCS ${SOURCE_FILES}) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,13 @@ | ||
| # tactility-cmakelists-version: 1 | ||
| cmake_minimum_required(VERSION 3.20) | ||
|
|
||
| include($ENV{IDF_PATH}/tools/cmake/project.cmake) | ||
|
|
||
| if (DEFINED ENV{TACTILITY_SDK_PATH}) | ||
| set(TACTILITY_SDK_PATH $ENV{TACTILITY_SDK_PATH}) | ||
| else() | ||
| set(TACTILITY_SDK_PATH "../../release/TactilitySDK") | ||
| message(WARNING "⚠️ TACTILITY_SDK_PATH environment variable is not set, defaulting to ${TACTILITY_SDK_PATH}") | ||
| if (NOT DEFINED ENV{TACTILITY_SDK_PATH}) | ||
| message(FATAL_ERROR "TACTILITY_SDK_PATH environment variable is not set") | ||
| endif() | ||
|
|
||
| get_filename_component(TACTILITY_SDK_PATH "$ENV{TACTILITY_SDK_PATH}" ABSOLUTE) | ||
| include("${TACTILITY_SDK_PATH}/TactilitySDK.cmake") | ||
|
|
||
| # Must be set before project() - ESP-IDF resolves components at that point, so setting these | ||
| # from inside the tactility_project() macro (which necessarily runs after project(), since it | ||
| # also calls project_elf()) would be too late. | ||
| set(EXTRA_COMPONENT_DIRS | ||
| ${TACTILITY_SDK_PATH} | ||
| "${TACTILITY_SDK_PATH}/Libraries/TactilityFreeRtos" | ||
| "${TACTILITY_SDK_PATH}/Modules" | ||
| ) | ||
|
|
||
| project(Diceware) | ||
| tactility_project(Diceware) | ||
| tactility_project_pre(tactility.diceware) | ||
| project(tactility.diceware) | ||
| tactility_project_post(tactility.diceware) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,4 @@ | ||
| file(GLOB_RECURSE SOURCE_FILES | ||
| Source/*.c* | ||
| ) | ||
|
|
||
| idf_component_register( | ||
| SRCS ${SOURCE_FILES} | ||
| REQUIRES TactilitySDK | ||
| ) | ||
| include("$ENV{TACTILITY_SDK_PATH}/TactilitySDK.cmake") | ||
|
|
||
| file(GLOB_RECURSE SOURCE_FILES Source/*.c*) | ||
| tactility_component_register(SRCS ${SOURCE_FILES}) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,13 @@ | ||
| # tactility-cmakelists-version: 1 | ||
| cmake_minimum_required(VERSION 3.20) | ||
|
|
||
| include($ENV{IDF_PATH}/tools/cmake/project.cmake) | ||
|
|
||
| if (DEFINED ENV{TACTILITY_SDK_PATH}) | ||
| set(TACTILITY_SDK_PATH $ENV{TACTILITY_SDK_PATH}) | ||
| else() | ||
| set(TACTILITY_SDK_PATH "../../release/TactilitySDK") | ||
| message(WARNING "TACTILITY_SDK_PATH environment variable is not set, defaulting to ${TACTILITY_SDK_PATH}") | ||
| if (NOT DEFINED ENV{TACTILITY_SDK_PATH}) | ||
| message(FATAL_ERROR "TACTILITY_SDK_PATH environment variable is not set") | ||
| endif() | ||
|
|
||
| get_filename_component(TACTILITY_SDK_PATH "$ENV{TACTILITY_SDK_PATH}" ABSOLUTE) | ||
| include("${TACTILITY_SDK_PATH}/TactilitySDK.cmake") | ||
|
|
||
| # Must be set before project() - ESP-IDF resolves components at that point, so setting these | ||
| # from inside the tactility_project() macro (which necessarily runs after project(), since it | ||
| # also calls project_elf()) would be too late. | ||
| set(EXTRA_COMPONENT_DIRS | ||
| ${TACTILITY_SDK_PATH} | ||
| "${TACTILITY_SDK_PATH}/Libraries/TactilityFreeRtos" | ||
| "${TACTILITY_SDK_PATH}/Modules" | ||
| ) | ||
|
|
||
| project(EpubReader) | ||
| tactility_project(EpubReader) | ||
| tactility_project_pre(tactility.epubreader) | ||
| project(tactility.epubreader) | ||
| tactility_project_post(tactility.epubreader) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,4 @@ | ||
| file(GLOB_RECURSE SOURCE_FILES | ||
| Source/*.c* | ||
| ) | ||
| include("$ENV{TACTILITY_SDK_PATH}/TactilitySDK.cmake") | ||
|
|
||
| idf_component_register( | ||
| SRCS ${SOURCE_FILES} | ||
| REQUIRES TactilitySDK esp_rom | ||
| ) | ||
| file(GLOB_RECURSE SOURCE_FILES Source/*.c*) | ||
| tactility_component_register(SRCS ${SOURCE_FILES} REQUIRES esp_rom) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,13 @@ | ||
| # tactility-cmakelists-version: 1 | ||
| cmake_minimum_required(VERSION 3.20) | ||
|
|
||
| include($ENV{IDF_PATH}/tools/cmake/project.cmake) | ||
|
|
||
| if (DEFINED ENV{TACTILITY_SDK_PATH}) | ||
| set(TACTILITY_SDK_PATH $ENV{TACTILITY_SDK_PATH}) | ||
| else() | ||
| set(TACTILITY_SDK_PATH "../../release/TactilitySDK") | ||
| message(WARNING "TACTILITY_SDK_PATH environment variable is not set, defaulting to ${TACTILITY_SDK_PATH}") | ||
| if (NOT DEFINED ENV{TACTILITY_SDK_PATH}) | ||
| message(FATAL_ERROR "TACTILITY_SDK_PATH environment variable is not set") | ||
| endif() | ||
|
|
||
| get_filename_component(TACTILITY_SDK_PATH "$ENV{TACTILITY_SDK_PATH}" ABSOLUTE) | ||
| include("${TACTILITY_SDK_PATH}/TactilitySDK.cmake") | ||
|
|
||
| # Must be set before project() - ESP-IDF resolves components at that point, so setting these | ||
| # from inside the tactility_project() macro (which necessarily runs after project(), since it | ||
| # also calls project_elf()) would be too late. | ||
| set(EXTRA_COMPONENT_DIRS | ||
| ${TACTILITY_SDK_PATH} | ||
| "${TACTILITY_SDK_PATH}/Libraries/TactilityFreeRtos" | ||
| "${TACTILITY_SDK_PATH}/Modules" | ||
| ) | ||
|
|
||
| project(EspNowBridge) | ||
| tactility_project(EspNowBridge) | ||
| tactility_project_pre(tactility.espnowbridge) | ||
| project(tactility.espnowbridge) | ||
| tactility_project_post(tactility.espnowbridge) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,4 @@ | ||
| file(GLOB_RECURSE SOURCE_FILES | ||
| Source/*.c* | ||
| ) | ||
| include("$ENV{TACTILITY_SDK_PATH}/TactilitySDK.cmake") | ||
|
|
||
| idf_component_register( | ||
| SRCS ${SOURCE_FILES} | ||
| REQUIRES TactilitySDK bootloader_support esp_app_format | ||
| ) | ||
| file(GLOB_RECURSE SOURCE_FILES Source/*.c*) | ||
| tactility_component_register(SRCS ${SOURCE_FILES} REQUIRES bootloader_support esp_app_format) |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.