Updated for CI

rzeldent · Dec 12, 2023 · 9fcd7e5 · 9fcd7e5
1 parent c9b7013
commit 9fcd7e5
Show file tree

Hide file tree

Showing 2 changed files with 156 additions and 112 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,75 +4,6 @@ jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - board: "esp32dev"
-            smartboard: "ESP32_2432S024N"
-            color16swap: 1
-          - board: "esp32dev"
-            smartboard: "ESP32_2432S024R"
-            color16swap: 1
-          - board: "esp32dev"
-            smartboard: "ESP32_2432S024C"
-            color16swap: 1
-          - board: "esp32dev"
-            smartboard: "ESP32_2432S028R"
-            color16swap: 1
-          - board: "esp32dev"
-            smartboard: "ESP32_2432S032N"
-            color16swap: 1
-          - board: "esp32dev"
-            smartboard: "ESP32_2432S032R"
-            color16swap: 1
-          - board: "esp32dev"
-            smartboard: "ESP32_2432S032C"
-            color16swap: 1
-          - board: "esp32dev"
-            smartboard: "ESP32_3248S035R"
-            color16swap: 1
-          - board: "esp32dev"
-            smartboard: "ESP32_3248S035C"
-            color16swap: 1
-          - board: "esp32-s3-devkitc-1"
-            smartboard: "ESP32_1732S019N"
-            color16swap: 1
-          - board: "esp32-s3-devkitc-1"
-            smartboard: "ESP32_1732S019C"
-            color16swap: 1
-          - board: "esp32-s3-devkitc-1"
-            smartboard: "ESP32_4827S043R"
-            color16swap: 0
-          - board: "esp32-s3-devkitc-1"
-            smartboard: "ESP32_4827S043C"
-            color16swap: 0
-          - board: "esp32-s3-devkitc-1"
-            smartboard: "ESP32_8048S043N"
-            color16swap: 0
-          - board: "esp32-s3-devkitc-1"
-            smartboard: "ESP32_8048S043R"
-            color16swap: 0
-          - board: "esp32-s3-devkitc-1"
-            smartboard: "ESP32_8048S043C"
-            color16swap: 0
-          - board: "esp32-s3-devkitc-1"
-            smartboard: "ESP32_8048S050N"
-            color16swap: 0
-          - board: "esp32-s3-devkitc-1"
-            smartboard: "ESP32_8048S050R"
-            color16swap: 0
-          - board: "esp32-s3-devkitc-1"
-            smartboard: "ESP32_8048S050C"
-            color16swap: 0
-          - board: "esp32-s3-devkitc-1"
-            smartboard: "ESP32_8048S070N"
-            color16swap: 0
-          - board: "esp32-s3-devkitc-1"
-            smartboard:  "ESP32_8048S070R"
-            color16swap: 0
-          - board: "esp32-s3-devkitc-1"
-            smartboard: "ESP32_8048S070C"
-            color16swap: 0
     steps:
       - uses: actions/checkout@v3
       - name: Set up python
@@ -83,6 +14,6 @@ jobs:
       - name: Install PlatformIO
         run: python -m pip install platformio
       - name: Build firmware
-        run: pio ci --lib="." --project-conf "example/platformio.ini" --environment ${{matrix.board}} "example/main.cpp"
+        run: pio ci --lib="." --project-conf "example/platformio.ini" "example/main.cpp"
         env:
-          PLATFORMIO_BUILD_FLAGS: -D${{matrix.smartboard}} -DLV_CONF_PATH="${{github.workspace}}/example/lv_conf.h" -DLV_COLOR_16_SWAP=${{matrix.color16swap}}
+          PLATFORMIO_BUILD_FLAGS: -DLV_CONF_PATH="${{github.workspace}}/example/lv_conf.h"
diff --git a/example/platformio.ini b/example/platformio.ini
@@ -8,16 +8,50 @@
 ; Please visit documentation for the other options and examples
 ; https://docs.platformio.org/page/projectconf.html
 
+[platformio]
+#default_envs = ESP32-2424S012C
+#default_envs = ESP32-2424S012N
+#default_envs = ESP32-2432S024C
+#default_envs = ESP32-2432S024N
+#default_envs = ESP32-2432S024R
+#default_envs = ESP32-2432S028R
+#default_envs = ESP32-2432S032C
+#default_envs = ESP32-2432S032N
+#default_envs = ESP32-2432S032R
+#default_envs = ESP32-3248S035C
+#default_envs = ESP32-3248S035R
+#default_envs = ESP32-1732S019C
+#default_envs = ESP32-1732S019N
+#default_envs = ESP32-4827S043C
+#default_envs = ESP32-4827S043N
+#default_envs = ESP32-4827S043R
+#default_envs = ESP32-8048S043C
+#default_envs = ESP32-8048S043N
+#default_envs = ESP32-8048S043R
+#default_envs = ESP32-8048S050C
+#default_envs = ESP32-8048S050N
+#default_envs = ESP32-8048S050R
+#default_envs = ESP32-8048S070C
+#default_envs = ESP32-8048S070N
+
 [env]
 platform = espressif32
 framework = arduino
 
+monitor_speed = 115200
+monitor_rts = 0
+monitor_dtr = 0
+monitor_filters = esp32_exception_decoder
+
+# Partition scheme for OTA
+board_build.partitions = min_spiffs.csv
+
 build_flags =
     -Ofast
-    -Wall
+    #-Wall
     -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE
     # LVGL settings
-    #-D LV_CONF_PATH="${PROJECT_DIR}/example/lv_conf.h"
+    #-D LV_CONF_PATH=${PROJECT_INCLUDE_DIR}/lv_conf.h
     # EspressIf library defines
     -D ESP_LCD_ST7796_VER_MAJOR=1
     -D ESP_LCD_ST7796_VER_MINOR=2
@@ -32,43 +66,122 @@ build_flags =
     -D CONFIG_XPT2046_CONVERT_ADC_TO_COORDS
     -D CONFIG_XPT2046_Z_THRESHOLD=600
 
-[env:esp32dev]
-board = esp32dev
-build_flags =
-    ${env.build_flags}
-    # Smartdisplay selection
-    #-D ESP32_2432S024N
-    #-D ESP32_2432S024R
-    #-D ESP32_2432S024C
-    #-D ESP32_2432S028R
-    #-D ESP32_3248S032N
-    #-D ESP32_3248S032R
-    #-D ESP32_3248S032C
-    #-D ESP32_3248S035R
-    #-D ESP32_3248S035C
-
-[env:esp32-c3-devkitm-1]
-board = esp32-c3-devkitm-1
-build_flags =
-    ${env.build_flags}
-    # Smartdisplay selection
-    #-D ESP32_2424S012N
-    #-D ESP32_2424S012C
+[env:ESP32-2424S012C]
+board = ESP32-2424S012C
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
 
-[env:esp32-s3-devkitc-1]
-board = esp32-s3-devkitc-1
-build_flags =
-    ${env.build_flags}
-    # Smartdisplay selection
-    #-D ESP32_1732S019N
-    #-D ESP32_4827S043R
-    #-D ESP32_4827S043C
-    #-D ESP32_8048S043N
-    #-D ESP32_8048S043R
-    #-D ESP32_8048S043C
-    #-D ESP32_8048S050N
-    #-D ESP32_8048S050R
-    #-D ESP32_8048S050C
-    #-D ESP32_8048S070N
-    #-D ESP32_8048S070R
-    #-D ESP32_8048S070C
+[env:ESP32-2424S012N]
+board = ESP32-2424S012N
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
+
+[env:ESP32-2432S024C]
+board = ESP32-2432S024C
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
+
+[env:ESP32-2432S024N]
+board = ESP32-2432S024N
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
+
+[env:ESP32-2432S024R]
+board = ESP32-2432S024R
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
+
+[env:ESP32-2432S028R]
+board = ESP32-2432S024R
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
+
+[env:ESP32-2432S032C]
+board = ESP32-2432S032C
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
+
+[env:ESP32-2432S032N]
+board = ESP32-2432S032C
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
+
+[env:ESP32-2432S032R]
+board = ESP32-2432S032C
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
+
+[env:ESP32-3248S035C]
+board = ESP32-3248S035C
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
+
+[env:ESP32-3248S035R]
+board = ESP32-3248S035R
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
+
+[env:ESP32-1732S019C]
+board = ESP32-1732S019C
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
+
+[env:ESP32-1732S019R]
+board = ESP32-1732S019R
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
+
+[env:ESP32-4827S043C]
+board = ESP32-4827S043C
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
+
+[env:ESP32-4827S043N]
+board = ESP32-4827S043N
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
+
+[env:ESP32-4827S043R]
+board = ESP32-4827S043R
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
+
+[env:ESP32-8048S043C]
+board = ESP32-8048S043C
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
+
+[env:ESP32-8048S043N]
+board = ESP32-8048S043N
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
+
+[env:ESP32-8048S043R]
+board = ESP32-8048S043R
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
+
+[env:ESP32-8048S050C]
+board = ESP32-8048S050C
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
+
+[env:ESP32-8048S050N]
+board = ESP32-8048S050N
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
+
+[env:ESP32-8048S050R]
+board = ESP32-8048S050R
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
+
+[env:ESP32-8048S070C]
+board = ESP32-8048S070C
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}
+
+[env:ESP32-8048S070N]
+board = ESP32-8048S070N
+build_flags = ${env.build_flags}
+lib_deps = ${env.lib_deps}