starred/OpenEPaperLink
1
0
Fork 0
mirror of https://github.com/OpenEPaperLink/OpenEPaperLink.git synced 2026-03-21 00:04:28 +01:00
Code Issues 472 Packages Projects Releases 10 Wiki Activity

[PR #286] [MERGED] Fix core directory interpolation and cleanup dependencies #2692

New Issue
Closed
opened 2026-03-20 21:08:23 +01:00 by sascha_hemi · 0 comments
sascha_hemi commented 2026-03-20 21:08:23 +01:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/OpenEPaperLink/OpenEPaperLink/pull/286
Author: @kelchm
Created: 4/6/2024
Status: ✅ Merged
Merged: 4/10/2024
Merged by: @jjwbruijn

Base: master ← Head: core-dir-improvements

📝 Commits (4)

  • 0c0761d correct interpolation value for local core dir
  • 0b18e90 core package cleanup + gitignore (for nrf52811_Platformio_AP)
  • d9786c6 ensure any remaining $PROJECT_DIR directories are ignored globally
  • 5bf5ef8 use more robust gitignore for core packages

📊 Changes

6659 files changed (+17 additions, -1174330 deletions)

View changed files

📝 .gitignore (+2 -1)
📝 ARM_Tag_FW/Newton_M3_nRF52811/core/.gitignore (+5 -0)
➖ ARM_Tag_FW/Newton_M3_nRF52811/core/packages/.gitignore (+0 -6)
📝 ARM_Tag_FW/Newton_M3_nRF52811/platformio.ini (+1 -1)
📝 ARM_Tag_FW/nRF_Bootloader/platformio.ini (+1 -1)
➕ ARM_Tag_FW/nrf52811_Platformio_AP/core/.gitignore (+7 -0)
➖ ARM_Tag_FW/nrf52811_Platformio_AP/core/appstate.json (+0 -1)
➖ ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-bossac-nordicnrf52/.piopm (+0 -1)
➖ ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-bossac-nordicnrf52/bossac.exe (+0 -0)
➖ ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-bossac-nordicnrf52/package.json (+0 -21)
➖ ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-jlink/.piopm (+0 -1)
➖ ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-jlink/Devices/ATMEL/SAMA5D2/SAMA5D2XPLAINED_QSPI.elf (+0 -0)
➖ ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-jlink/Devices/ATMEL/SAMB11/Atmel_ATSAMB11.elf (+0 -0)
➖ ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-jlink/Devices/Altera/Cyclone_V/Altera_Cyclone_V_QSPI.elf (+0 -0)
➖ ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-jlink/Devices/AnalogDevices/ADSP-CM41/Analog_CM41x_M4.pex (+0 -0)
➖ ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-jlink/Devices/AnalogDevices/ADSP-CM41/CM41x_FlashA_1024.FLM (+0 -0)
➖ ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-jlink/Devices/AnalogDevices/ADSP-CM41/CM41x_FlashA_128.FLM (+0 -0)
➖ ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-jlink/Devices/AnalogDevices/ADSP-CM41/CM41x_FlashA_256.FLM (+0 -0)
➖ ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-jlink/Devices/AnalogDevices/ADSP-CM41/CM41x_FlashA_512.FLM (+0 -0)
➖ ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-jlink/Devices/AnalogDevices/ADSP-CM41/CM41x_FlashB_128.FLM (+0 -0)

...and 80 more files

📄 Description

This is a first pass at correcting hard-coded core_dir to use the correct value for interpolation (${PROJECT_DIR}) and removing package dependencies from (./nrf52811_Platformio_AP/core/packages) that were committed to the repo, but are not required.

A few caveats:

  • As-is, this PR does not address the fact that nRF_Bootloader cannot be built out of the box.
  • I've tested this on macOS and Windows, but I would encourage others who are more deeply familiar with the project to test this thoroughly before merging.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/OpenEPaperLink/OpenEPaperLink/pull/286 **Author:** [@kelchm](https://github.com/kelchm) **Created:** 4/6/2024 **Status:** ✅ Merged **Merged:** 4/10/2024 **Merged by:** [@jjwbruijn](https://github.com/jjwbruijn) **Base:** `master` ← **Head:** `core-dir-improvements` --- ### 📝 Commits (4) - [`0c0761d`](https://github.com/OpenEPaperLink/OpenEPaperLink/commit/0c0761d0ba1a120715ffe64369a3543aa1a1d920) correct interpolation value for local core dir - [`0b18e90`](https://github.com/OpenEPaperLink/OpenEPaperLink/commit/0b18e90c830057939248daaa2bb421ecd29a1b93) core package cleanup + gitignore (for nrf52811_Platformio_AP) - [`d9786c6`](https://github.com/OpenEPaperLink/OpenEPaperLink/commit/d9786c623b9e1cb8308558340424568b6b884880) ensure any remaining $PROJECT_DIR directories are ignored globally - [`5bf5ef8`](https://github.com/OpenEPaperLink/OpenEPaperLink/commit/5bf5ef867823cdd09ae542167a41d30b0e728d7a) use more robust gitignore for core packages ### 📊 Changes **6659 files changed** (+17 additions, -1174330 deletions) <details> <summary>View changed files</summary> 📝 `.gitignore` (+2 -1) 📝 `ARM_Tag_FW/Newton_M3_nRF52811/core/.gitignore` (+5 -0) ➖ `ARM_Tag_FW/Newton_M3_nRF52811/core/packages/.gitignore` (+0 -6) 📝 `ARM_Tag_FW/Newton_M3_nRF52811/platformio.ini` (+1 -1) 📝 `ARM_Tag_FW/nRF_Bootloader/platformio.ini` (+1 -1) ➕ `ARM_Tag_FW/nrf52811_Platformio_AP/core/.gitignore` (+7 -0) ➖ `ARM_Tag_FW/nrf52811_Platformio_AP/core/appstate.json` (+0 -1) ➖ `ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-bossac-nordicnrf52/.piopm` (+0 -1) ➖ `ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-bossac-nordicnrf52/bossac.exe` (+0 -0) ➖ `ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-bossac-nordicnrf52/package.json` (+0 -21) ➖ `ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-jlink/.piopm` (+0 -1) ➖ `ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-jlink/Devices/ATMEL/SAMA5D2/SAMA5D2XPLAINED_QSPI.elf` (+0 -0) ➖ `ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-jlink/Devices/ATMEL/SAMB11/Atmel_ATSAMB11.elf` (+0 -0) ➖ `ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-jlink/Devices/Altera/Cyclone_V/Altera_Cyclone_V_QSPI.elf` (+0 -0) ➖ `ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-jlink/Devices/AnalogDevices/ADSP-CM41/Analog_CM41x_M4.pex` (+0 -0) ➖ `ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-jlink/Devices/AnalogDevices/ADSP-CM41/CM41x_FlashA_1024.FLM` (+0 -0) ➖ `ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-jlink/Devices/AnalogDevices/ADSP-CM41/CM41x_FlashA_128.FLM` (+0 -0) ➖ `ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-jlink/Devices/AnalogDevices/ADSP-CM41/CM41x_FlashA_256.FLM` (+0 -0) ➖ `ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-jlink/Devices/AnalogDevices/ADSP-CM41/CM41x_FlashA_512.FLM` (+0 -0) ➖ `ARM_Tag_FW/nrf52811_Platformio_AP/core/packages/tool-jlink/Devices/AnalogDevices/ADSP-CM41/CM41x_FlashB_128.FLM` (+0 -0) _...and 80 more files_ </details> ### 📄 Description This is a first pass at correcting hard-coded `core_dir` to use the correct value for interpolation (`${PROJECT_DIR}`) and removing package dependencies from (`./nrf52811_Platformio_AP/core/packages`) that were committed to the repo, but are not required. A few caveats: - As-is, this PR does not address the fact that `nRF_Bootloader` cannot be built out of the box. - I've tested this on macOS and Windows, but I would encourage others who are more deeply familiar with the project to test this thoroughly before merging. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
sascha_hemi added the pull-request label 2026-03-20 21:08:23 +01:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
88MZ100 FW
ARM Tag FW
ap fw
bug
documentation
enhancement
good first issue
nRF FW
pull-request
Mirrored from GitHub Pull Request
 question
tag fw
wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
sascha_hemi
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/OpenEPaperLink#2692
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?