From f6ac9357c90a5f32b1732723a621e22a59076052 Mon Sep 17 00:00:00 2001
From: Elliot Matson <ematson5897@gmail.com>
Date: Sun, 29 Jan 2023 20:25:59 -0600
Subject: [PATCH] Use proper ci matrix

---
 .github/workflows/pio_build.yml          |  6 ++++
 examples/PIO_TestPatterns/platformio.ini | 35 ------------------------
 examples/PIO_TestPatterns/src/main.cpp   |  6 ++--
 3 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/pio_build.yml b/.github/workflows/pio_build.yml
index 39901f9..6258798 100644
--- a/.github/workflows/pio_build.yml
+++ b/.github/workflows/pio_build.yml
@@ -18,7 +18,13 @@ jobs:
       matrix:
         example:
           - "examples/PIO_TestPatterns"
+        no_gfx: ["", -DNO_GFX]
+        no_fast_functions: ["", -DFAST_FUNCTIONS]
+        no_cie1931: ["", -DNO_CIE1931]
+        virtual_panel: ["", -DVIRTUAL_PANEL]
 
+    env:
+      PLATFORMIO_BUILD_FLAGS: ${{ matrix.no_gfx }} ${{ matrix.no_fast_functions }} ${{ matrix.no_cie1931 }} ${{ matrix.virtual_panel
     steps:
     - uses: actions/checkout@v2
     - name: Cache pip
diff --git a/examples/PIO_TestPatterns/platformio.ini b/examples/PIO_TestPatterns/platformio.ini
index d30d57f..379d2bb 100644
--- a/examples/PIO_TestPatterns/platformio.ini
+++ b/examples/PIO_TestPatterns/platformio.ini
@@ -18,41 +18,6 @@ upload_speed = 460800
 monitor_speed = 115200
 monitor_filters = esp32_exception_decoder
 
-[env:esp32]
-build_flags =
-    ${env.build_flags}
-    -DTEST_FASTLINES
-
-[env:debug]
-build_flags =
-    ${env.build_flags}
-    -DTEST_FASTLINES
-    -DSERIAL_DEBUG
-
-; build without GFX functions
-[env:minimal]
-build_flags =
-    ${env.build_flags}
-    -DNO_GFX
-    -DNO_FAST_FUNCTIONS
-    -DNO_CIE1931
-
-; Virtual Panel test
-[env:vpane]
-build_flags =
-    ${env.build_flags}
-    -DNO_FAST_FUNCTIONS
-    -DVIRTUAL_PANE
-
-; Virtual Panel test
-[env:vpane_minimal]
-build_flags =
-    ${env.build_flags}
-    -DVIRTUAL_PANE
-    -DNO_GFX
-    -DNO_FAST_FUNCTIONS
-    -DNO_CIE1931
-
 ; PIO CI can't handle IDF git modules properly (yet)
 ;[env:idfarduino]
 ;platform = espressif32
diff --git a/examples/PIO_TestPatterns/src/main.cpp b/examples/PIO_TestPatterns/src/main.cpp
index 6325b63..ef43fe3 100644
--- a/examples/PIO_TestPatterns/src/main.cpp
+++ b/examples/PIO_TestPatterns/src/main.cpp
@@ -241,7 +241,7 @@ void loop(){
   delay(PATTERN_DELAY);
 //
 
-#ifdef TEST_FASTLINES
+#ifndef NO_FAST_FUNCTIONS
   // Fillrate for fillRect() function
   Serial.print("Estimating fullscreen fillrate with fillRect() time: ");
   t1 = micros();
@@ -293,7 +293,7 @@ void loop(){
   Serial.printf("%lu us, %u ticks\n", t2, ccount1);
   delay(PATTERN_DELAY);
 
-#ifdef TEST_FASTLINES
+#ifndef NO_FAST_FUNCTIONS
   Serial.println("Estimating V-lines with vlineDMA(): ");  //
   matrix->fillScreen(0);
   color2 = random8();
@@ -347,7 +347,7 @@ void loop(){
   Serial.printf("%lu us, %u ticks\n", t2, ccount1);
   delay(PATTERN_DELAY);
 
-#ifdef TEST_FASTLINES
+#ifndef NO_FAST_FUNCTIONS
   Serial.println("Estimating H-lines with hlineDMA(): ");
   matrix->fillScreen(0);
   color2 = random8();