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

This should be commneted out by default #8

Merged
merged 3 commits into from
May 6, 2024
Merged

This should be commneted out by default #8

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
ab3cc5d
This should be commneted out by default
witnessmenow Aug 3, 2023
5d17c4d
Updating to 2024 and fixing up the project
witnessmenow May 6, 2024
f60d888
Fixing mistake in matrix code
witnessmenow May 6, 2024
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
173 changes: 77 additions & 96 deletions .github/workflows/build-deploy-webflash.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
push:
branches: ["main"]
paths-ignore:
- '**.md'
- "**.md"

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand All @@ -28,110 +28,91 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

# Install the Arduino CLI
- name: Install Arduino CLI
uses: arduino/setup-arduino-cli@v1

# Install TFT_eSPI
- name: Install TFT_eSPI library to prepare for modifications
run: |
arduino-cli lib install TFT_eSPI

# Copy binaries to GitHubPages folder for publishing
- name: Copy User_Setup.h for TFT_eSPI
- uses: actions/checkout@v4
- uses: actions/cache@v3
- name: Cache pip
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Cache PlatformIO
uses: actions/cache@v3
with:
path: ~/.platformio
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.10"
- name: Install PlatformIO
run: |
\cp -fR DisplayConfig/User_Setup.h ~/Arduino/libraries/TFT_eSPI/

# Build CYD Arduino Code
- uses: arduino/compile-sketches@v1
name: Compile CYD code
with:
fqbn: "esp32:esp32:esp32"
platforms: |
- name: esp32:esp32
source-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
# No need to specify ESP-libraries as these are installed with the platform (on the line above).
# Downloading SpeedyStepper from source to get correct casing on import of Arduino.h (spelled arduino.h in the version from Arduino Library Manager)
libraries: |
- name: ImageFetcher
source-url: https://github.com/witnessmenow/file-fetcher-arduino.git
- name: WiFiManager
- name: ESP_DoubleResetDetector
- name: ArduinoJson
- name: ezTime
- name: UniversalTelegramBot
- name: PNGdec
sketch-paths: |
- F1-Notifications
enable-warnings-report: true
verbose: false
cli-compile-flags: |
- --export-binaries

# Copy binaries to GitHubPages folder for publishing
- name: Copy compiled binaries to CYD
python -m pip install --upgrade pip
pip install --upgrade platformio

#Build CYD
- name: Build CYD
run: platformio run -e cyd
- name: Upload artifact
uses: actions/upload-artifact@v3
with:
name: CYD Firmware
path: .pio/build/cyd/firmware.bin
if-no-files-found: error
- name: Copy compiled binaries for webflash
run: |
# mkdir GitHubPages/ESPWebTools/esp32Firmware
mkdir GitHubPages/ESPWebTools/cyd

# Copy the manifest file for the CYD
cp GitHubPages/ESPWebTools/manifest.json GitHubPages/ESPWebTools/cyd

# Copy compiled binaries that were exported by the `-e` flag in the arduino/compile-sketches task
# Maintain folder structure, for cases where we are compiling for multiple board versions
# If we were sure that we would never need to compile for anything other then esp32:esp32:esp32, we could have used this command instead: cp -r OpenMacroRail_Arduino/build/esp32.esp32.esp32/*.bin GitHubPages/ESPWebTools/esp32Firmware
cd F1-Notifications/build
find . -print | grep -i .bin$ | xargs -i cp --parent {} ../../GitHubPages/ESPWebTools/cyd
cd ../..

# Copy boot_app0.bin to the esp32Firmware folder. This file will be common for all esp32 boards (i think)
# Using a version agnostic search to find the file. grep -m 1 makes sure only one file is copied in case multiple versions are installed.
find /home/runner/.arduino15/packages/esp32/hardware/esp32/ -type f | grep -i -m 1 boot_app0.bin$ | xargs -i cp {} GitHubPages/ESPWebTools/cyd

# Build Matrix Arduino Code
- uses: arduino/compile-sketches@v1
name: Compile Matrix code
with:
fqbn: "esp32:esp32:esp32"
platforms: |
- name: esp32:esp32
source-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
# No need to specify ESP-libraries as these are installed with the platform (on the line above).
# Downloading SpeedyStepper from source to get correct casing on import of Arduino.h (spelled arduino.h in the version from Arduino Library Manager)
libraries: |
- name: ImageFetcher
source-url: https://github.com/witnessmenow/file-fetcher-arduino.git
- name: ESP32 HUB75 LED MATRIX PANEL DMA Display
source-url: https://github.com/witnessmenow/ESP32-HUB75-MatrixPanel-I2S-DMA.git
- name: Adafruit GFX Library
sketch-paths: |
- F1-Notifications
enable-warnings-report: true
verbose: false
cli-compile-flags: |
- --build-property
- compiler.cpp.extra_flags=-DMATRIX_DISPLAY
- --export-binaries

# Copy binaries to GitHubPages folder for publishing
- name: Copy compiled binaries to Matrix

cp .pio/build/cyd/bootloader.bin GitHubPages/ESPWebTools/cyd
cp .pio/build/cyd/partitions.bin GitHubPages/ESPWebTools/cyd
cp /home/runner/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin GitHubPages/ESPWebTools/cyd
cp .pio/build/cyd/firmware.bin GitHubPages/ESPWebTools/cyd

#Build CYD2USB
- name: Build CYD2USB
run: platformio run -e cyd2usb
- name: Upload artifact
uses: actions/upload-artifact@v3
with:
name: CYD Firmware
path: .pio/build/cyd2usb/firmware.bin
if-no-files-found: error
- name: Copy compiled binaries for webflash
run: |
mkdir GitHubPages/ESPWebTools/cyd2usb

# Copy the manifest file for the cyd2usb
cp GitHubPages/ESPWebTools/manifest.json GitHubPages/ESPWebTools/cyd2usb

cp .pio/build/cyd2usb/bootloader.bin GitHubPages/ESPWebTools/cyd2usb
cp .pio/build/cyd2usb/partitions.bin GitHubPages/ESPWebTools/cyd2usb
cp /home/runner/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin GitHubPages/ESPWebTools/cyd
cp .pio/build/cyd2usb/firmware.bin GitHubPages/ESPWebTools/cyd2usb

#Build Matrix
- name: Build Matrix
run: platformio run -e trinity
- name: Upload artifact
uses: actions/upload-artifact@v3
with:
name: CYD Firmware
path: .pio/build/trinity/firmware.bin
if-no-files-found: error
- name: Copy compiled binaries for webflash
run: |
# Make matrix directory
mkdir GitHubPages/ESPWebTools/matrix

# Copy the manifest file for the matrix
# Copy the manifest file for the Matrix
cp GitHubPages/ESPWebTools/manifest.json GitHubPages/ESPWebTools/matrix

cd F1-Notifications/build
find . -print | grep -i .bin$ | xargs -i cp --parent {} ../../GitHubPages/ESPWebTools/matrix
cd ../..

# Copy boot_app0.bin to the esp32Firmware folder. This file will be common for all esp32 boards (i think)
# Using a version agnostic search to find the file. grep -m 1 makes sure only one file is copied in case multiple versions are installed.
find /home/runner/.arduino15/packages/esp32/hardware/esp32/ -type f | grep -i -m 1 boot_app0.bin$ | xargs -i cp {} GitHubPages/ESPWebTools/matrix

cp .pio/build/trinity/bootloader.bin GitHubPages/ESPWebTools/matrix
cp .pio/build/trinity/partitions.bin GitHubPages/ESPWebTools/matrix
cp /home/runner/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin GitHubPages/ESPWebTools/matrix
cp .pio/build/trinity/firmware.bin GitHubPages/ESPWebTools/matrix

# Build GitHub Page
- name: Setup Github Page
Expand All @@ -156,4 +137,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v2
100 changes: 36 additions & 64 deletions .github/workflows/test-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,79 +3,51 @@ name: Test compiling arduino code
on:
# Runs on all branches but main, when a arduino file is changed
push:
branches-ignore : ["main"]
branches-ignore: ["main"]
paths:
- '**.ino'
- '**.h'
- '**.yml'
- "**.ino"
- "**.h"
- "**.yml"

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
# Build job
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

# Install the Arduino CLI
- name: Install Arduino CLI
uses: arduino/setup-arduino-cli@v1

# Install TFT_eSPI
- name: Install TFT_eSPI library to prepare for modifications
- uses: actions/checkout@v4
- uses: actions/cache@v3
- name: Cache pip
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Cache PlatformIO
uses: actions/cache@v3
with:
path: ~/.platformio
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.10"
- name: Install PlatformIO
run: |
arduino-cli lib install TFT_eSPI
python -m pip install --upgrade pip
pip install --upgrade platformio

# Copy user_setup from repo to TFT_eSPI folder
- name: Copy User_Setup.h for TFT_eSPI
run: |
\cp -fR DisplayConfig/User_Setup.h ~/Arduino/libraries/TFT_eSPI/
#Build CYD
- name: Build CYD
run: platformio run -e cyd

# Build CYD Arduino Code
- uses: arduino/compile-sketches@v1
name: Compile CYD code
continue-on-error: true
with:
fqbn: "esp32:esp32:esp32"
platforms: |
- name: esp32:esp32
source-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
# No need to specify ESP-libraries as these are installed with the platform (on the line above).
libraries: |
- name: ImageFetcher
source-url: https://github.com/witnessmenow/file-fetcher-arduino.git
- name: WiFiManager
- name: ESP_DoubleResetDetector
- name: ArduinoJson
- name: ezTime
- name: UniversalTelegramBot
- name: PNGdec
sketch-paths: |
- F1-Notifications
enable-warnings-report: true
verbose: false
#Build CYD2USB
- name: Build CYD2USB
run: platformio run -e cyd2usb

# Build Matrix Arduino Code
- uses: arduino/compile-sketches@v1
name: Compile Matrix code
with:
fqbn: "esp32:esp32:esp32"
platforms: |
- name: esp32:esp32
source-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
# No need to specify ESP-libraries as these are installed with the platform (on the line above).
# Downloading SpeedyStepper from source to get correct casing on import of Arduino.h (spelled arduino.h in the version from Arduino Library Manager)
libraries: |
- name: ImageFetcher
source-url: https://github.com/witnessmenow/file-fetcher-arduino.git
- name: ESP32 HUB75 LED MATRIX PANEL DMA Display
source-url: https://github.com/witnessmenow/ESP32-HUB75-MatrixPanel-I2S-DMA.git
- name: Adafruit GFX Library
sketch-paths: |
- F1-Notifications
enable-warnings-report: true
verbose: false
cli-compile-flags: |
- --build-property
- compiler.cpp.extra_flags=-DMATRIX_DISPLAY
#Build Matrix
- name: Build Matrix
run: platformio run -e trinity
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.pio
.vscode/*
.DS_Store

Loading
Loading