Fix build, rename esp32->esp32CustomAdvanced

scottbez1 · Oct 6, 2024 · f6aa516 · f6aa516
1 parent 419c311
commit f6aa516
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/pio.yml b/.github/workflows/pio.yml
@@ -49,12 +49,12 @@ jobs:
     #     pio run \
     #       -e uno-direct \
 
-    - name: Build Firmware (esp32)
+    - name: Build Firmware (esp32CustomAdvanced)
       # Run regardless of other build step failures, as long as setup steps completed
       if: always() && steps.pio_install.outcome == 'success'
       run: |
         pio run \
-          -e esp32 \
+          -e esp32CustomAdvanced
 
     - name: Build Firmware (chainlink)
       # Run regardless of other build step failures, as long as setup steps completed

diff --git a/firmware/esp32/base/base_supervisor_task.h b/firmware/esp32/base/base_supervisor_task.h
@@ -19,7 +19,7 @@
 #include <FastLED.h>
 
 #include "Adafruit_MCP23017.h"
-#include "src/Adafruit_INA219.h"
+#include "Adafruit_INA219.h"
 
 #include "../splitflap/serial_task.h"
 #include "../core/splitflap_task.h"

diff --git a/firmware/esp32/tester/tester_task.h b/firmware/esp32/tester/tester_task.h
@@ -20,7 +20,7 @@
 #include <Wire.h>
 
 #include "Adafruit_MCP23017.h"
-#include "src/Adafruit_INA219.h"
+#include "Adafruit_INA219.h"
 
 #include "result.h"
 #include "../core/splitflap_task.h"

diff --git a/firmware/src/Adafruit_INA219.h b/firmware/src/Adafruit_INA219.h
@@ -16,7 +16,7 @@
  * BSD license, all text here must be included in any redistribution.
  *
  */
-#include "../config.h"
+#include "config.h"
 #if INA219_POWER_SENSE
 #ifndef _LIB_ADAFRUIT_INA219_
 #define _LIB_ADAFRUIT_INA219_

diff --git a/platformio.ini b/platformio.ini
@@ -115,12 +115,6 @@ build_flags =
     -DLOAD_GFXFF=1
     -DSPI_FREQUENCY=40000000
 
-[env:esp32]
-extends=esp32base
-build_flags =
-    ${esp32base.build_flags}
-    -DNUM_MODULES=6
-
 [env:chainlink]
 extends=esp32base
 build_flags =
@@ -157,3 +151,9 @@ lib_deps =
     adafruit/Adafruit MCP23017 Arduino Library @ ^1.3.0
     adafruit/Adafruit BusIO @ ^1.9.1
 build_type = debug
+
+[env:esp32CustomAdvanced]
+extends=esp32base
+build_flags =
+    ${esp32base.build_flags}
+    -DNUM_MODULES=6