Skip to content

Commit

Permalink
Build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
scottbez1 committed Jun 14, 2024
1 parent 2c1f2f2 commit b033bf9
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 56 deletions.
46 changes: 20 additions & 26 deletions .github/workflows/pio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,26 +35,19 @@ jobs:
python -m pip install --upgrade pip
pip install --upgrade platformio
- name: Build Firmware (uno-shift-register)
# Run regardless of other build step failures, as long as setup steps completed
if: always() && steps.pio_install.outcome == 'success'
run: |
pio run -d ./arduino/splitflap \
-e uno-shift-register \
# - name: Build Firmware (uno-shift-register)
# # Run regardless of other build step failures, as long as setup steps completed
# if: always() && steps.pio_install.outcome == 'success'
# run: |
# pio run -d ./arduino/splitflap \
# -e uno-shift-register \

- name: Build Firmware (uno-direct)
# Run regardless of other build step failures, as long as setup steps completed
if: always() && steps.pio_install.outcome == 'success'
run: |
pio run -d ./arduino/splitflap \
-e uno-direct \
- name: Build Firmware (mega-direct)
# Run regardless of other build step failures, as long as setup steps completed
if: always() && steps.pio_install.outcome == 'success'
run: |
pio run -d ./arduino/splitflap \
-e mega-direct \
# - name: Build Firmware (uno-direct)
# # Run regardless of other build step failures, as long as setup steps completed
# if: always() && steps.pio_install.outcome == 'success'
# run: |
# pio run -d ./arduino/splitflap \
# -e uno-direct \

- name: Build Firmware (esp32)
# Run regardless of other build step failures, as long as setup steps completed
Expand All @@ -77,10 +70,11 @@ jobs:
pio run -d ./arduino/splitflap \
-e chainlinkBase
- name: Build Firmware (chainlinkDriverTester)
# Run regardless of other build step failures, as long as setup steps completed
if: always() && steps.pio_install.outcome == 'success'
run: |
cp arduino/splitflap/esp32/tester/secrets.h.example arduino/splitflap/esp32/tester/secrets.h &&
pio run -d ./arduino/splitflap \
-e chainlinkDriverTester
# Temporarily disabled due to proto issue
# - name: Build Firmware (chainlinkDriverTester)
# # Run regardless of other build step failures, as long as setup steps completed
# if: always() && steps.pio_install.outcome == 'success'
# run: |
# cp arduino/splitflap/esp32/tester/secrets.h.example arduino/splitflap/esp32/tester/secrets.h &&
# pio run -d ./arduino/splitflap \
# -e chainlinkDriverTester
15 changes: 15 additions & 0 deletions arduino/splitflap/esp32/core/configuration.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
Copyright 2024 Scott Bezek and the splitflap contributors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
#include <FFat.h>

#include "pb_decode.h"
Expand Down
15 changes: 15 additions & 0 deletions arduino/splitflap/esp32/core/configuration.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
Copyright 2024 Scott Bezek and the splitflap contributors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
#pragma once

#include <FFat.h>
Expand Down
63 changes: 33 additions & 30 deletions arduino/splitflap/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -19,36 +19,39 @@ default_envs = chainlink
lib_deps =
Adafruit [email protected]

[env:uno-shift-register]
platform = atmelavr
board = uno
framework = arduino
monitor_speed = 38400
monitor_echo = yes
monitor_eol = LF
lib_deps = ${extra.lib_deps}
build_flags =
-DSPI_IO=true
-DREVERSE_MOTOR_DIRECTION=false
-DNEOPIXEL_DEBUGGING_ENABLED=true
-DINA219_POWER_SENSE=false
-DSPLITFLAP_PIO_HARDWARE_CONFIG

[env:uno-direct]
platform = atmelavr
board = uno
framework = arduino
monitor_speed = 38400
monitor_echo = yes
monitor_eol = LF
lib_deps = ${extra.lib_deps}
build_flags =
-DNUM_MODULES=3
-DSPI_IO=false
-DREVERSE_MOTOR_DIRECTION=false
-DNEOPIXEL_DEBUGGING_ENABLED=true
-DINA219_POWER_SENSE=false
-DSPLITFLAP_PIO_HARDWARE_CONFIG
; Note: the Arduino Uno builds are temporarily disabled (legacy .ino files are being cleaned up and only platformio will be supported going forward)
; Go back to 6c1e1913cbfc23ee90155410a65ac26e2389134f for the last stable version that supported them in the meantime.
;
; [env:uno-shift-register]
; platform = atmelavr
; board = uno
; framework = arduino
; monitor_speed = 38400
; monitor_echo = yes
; monitor_eol = LF
; lib_deps = ${extra.lib_deps}
; build_flags =
; -DSPI_IO=true
; -DREVERSE_MOTOR_DIRECTION=false
; -DNEOPIXEL_DEBUGGING_ENABLED=true
; -DINA219_POWER_SENSE=false
; -DSPLITFLAP_PIO_HARDWARE_CONFIG

; [env:uno-direct]
; platform = atmelavr
; board = uno
; framework = arduino
; monitor_speed = 38400
; monitor_echo = yes
; monitor_eol = LF
; lib_deps = ${extra.lib_deps}
; build_flags =
; -DNUM_MODULES=3
; -DSPI_IO=false
; -DREVERSE_MOTOR_DIRECTION=false
; -DNEOPIXEL_DEBUGGING_ENABLED=true
; -DINA219_POWER_SENSE=false
; -DSPLITFLAP_PIO_HARDWARE_CONFIG

[esp32base]
platform = [email protected]
Expand Down

0 comments on commit b033bf9

Please sign in to comment.