Add Kconfig op mode as west arg

Protocentral · Nov 16, 2024 · a1bc60e · a1bc60e
1 parent da7a7cb
commit a1bc60e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,14 +27,14 @@ jobs:
         working-directory: healthypi5_zephyr
         run: |
           rm -rf *.uf2
-          west build -p auto -b healthypi5_rp2040 app  -DEXTRA_CONF_FILE='overlay-bt.conf;overlay-display-ili9488.conf;overlay-logger-sd.conf' -DEXTRA_DTC_OVERLAY_FILE='healthypi5_rp2040_display_ili9488.overlay;healthypi5_rp2040_sd.overlay' 
+          source make_basic_ili9488.sh
           mv build/zephyr/zephyr.uf2 healthypi5_basic_ili9488.uf2
 
       - name: Build Basic firmware - ST7796
         working-directory: healthypi5_zephyr
         run: |
           west build -t pristine
-          west build -p auto -b healthypi5_rp2040 app  -DEXTRA_CONF_FILE='overlay-bt.conf;overlay-display-st7796.conf;overlay-logger-sd.conf' -DEXTRA_DTC_OVERLAY_FILE='healthypi5_rp2040_display_st7796.overlay;healthypi5_rp2040_sd.overlay'
+          source make_basic_st7796.sh
           mv build/zephyr/zephyr.uf2 healthypi5_basic_st7796.uf2 
 
       - name: Build display firmware for ST7796

diff --git a/app/overlay-op-mode-display.conf b/app/overlay-op-mode-display.conf
diff --git a/make_basic_ili9488.sh b/make_basic_ili9488.sh
@@ -1,4 +1,4 @@
-west build -p auto -b healthypi5_rp2040 app  -DEXTRA_CONF_FILE='overlay-bt.conf;overlay-display-ili9488.conf;overlay-logger-sd.conf' -DEXTRA_DTC_OVERLAY_FILE='healthypi5_rp2040_display_ili9488.overlay;healthypi5_rp2040_sd.overlay'
+west build -p auto -b healthypi5_rp2040 app  -DEXTRA_CONF_FILE='overlay-bt.conf;overlay-display-ili9488.conf;overlay-logger-sd.conf' -DCONFIG_HEALTHYPI_OP_MODE_DISPLAY=n -DEXTRA_DTC_OVERLAY_FILE='healthypi5_rp2040_display_ili9488.overlay;healthypi5_rp2040_sd.overlay'
 
 #west build -p always -b healthypi5_rp2040 app -DEXTRA_CONF_FILE='overlay-logger-sd.conf;overlay-bt.conf' -DEXTRA_DTC_OVERLAY_FILE=healthypi5_rp2040_sd.overlay 
 

diff --git a/make_basic_st7796.sh b/make_basic_st7796.sh
@@ -1,4 +1,4 @@
-west build -p auto -b healthypi5_rp2040 app  -DEXTRA_CONF_FILE='overlay-bt.conf;overlay-display-st7796.conf;overlay-logger-sd.conf' -DEXTRA_DTC_OVERLAY_FILE='healthypi5_rp2040_display_st7796.overlay;healthypi5_rp2040_sd.overlay'
+west build -p auto -b healthypi5_rp2040 app  -DEXTRA_CONF_FILE='overlay-bt.conf;overlay-display-st7796.conf;overlay-logger-sd.conf' -DCONFIG_HEALTHYPI_OP_MODE_DISPLAY=n -DEXTRA_DTC_OVERLAY_FILE='healthypi5_rp2040_display_st7796.overlay;healthypi5_rp2040_sd.overlay'
 
 #west build -p always -b healthypi5_rp2040 app -DEXTRA_CONF_FILE='overlay-logger-sd.conf;overlay-bt.conf' -DEXTRA_DTC_OVERLAY_FILE=healthypi5_rp2040_sd.overlay 
 

diff --git a/make_display_ili9488.sh b/make_display_ili9488.sh
@@ -1,3 +1,3 @@
-west build -p auto -b healthypi5_rp2040 app  -DEXTRA_CONF_FILE='overlay-bt.conf;overlay-display-ili9488.conf;overlay-logger-sd.conf;overlay-op-mode-display.conf' -DEXTRA_DTC_OVERLAY_FILE='healthypi5_rp2040_display_ili9488.overlay;healthypi5_rp2040_sd.overlay'
+west build -p auto -b healthypi5_rp2040 app  -DEXTRA_CONF_FILE='overlay-bt.conf;overlay-display-ili9488.conf;overlay-logger-sd.conf' -DCONFIG_HEALTHYPI_OP_MODE_DISPLAY=y -DEXTRA_DTC_OVERLAY_FILE='healthypi5_rp2040_display_ili9488.overlay;healthypi5_rp2040_sd.overlay'
 
 #-DEXTRA_CONF_FILE=overlay-bt.conf
diff --git a/make_display_st7796.sh b/make_display_st7796.sh
@@ -1 +1 @@
-west build -p auto -b healthypi5_rp2040 app -DEXTRA_CONF_FILE='overlay-bt.conf;overlay-display-st7796.conf' -DEXTRA_DTC_OVERLAY_FILE='healthypi5_rp2040_display_st7796.overlay;healthypi5_rp2040_sd.overlay'
+west build -p auto -b healthypi5_rp2040 app -DEXTRA_CONF_FILE='overlay-bt.conf;overlay-display-st7796.conf,overlay-logger-sd.conf' -DCONFIG_HEALTHYPI_OP_MODE_DISPLAY=y -DEXTRA_DTC_OVERLAY_FILE='healthypi5_rp2040_display_st7796.overlay;healthypi5_rp2040_sd.overlay'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		west build -p auto -b healthypi5_rp2040 app -DEXTRA_CONF_FILE='overlay-bt.conf;overlay-display-st7796.conf' -DEXTRA_DTC_OVERLAY_FILE='healthypi5_rp2040_display_st7796.overlay;healthypi5_rp2040_sd.overlay'
		west build -p auto -b healthypi5_rp2040 app -DEXTRA_CONF_FILE='overlay-bt.conf;overlay-display-st7796.conf,overlay-logger-sd.conf' -DCONFIG_HEALTHYPI_OP_MODE_DISPLAY=y -DEXTRA_DTC_OVERLAY_FILE='healthypi5_rp2040_display_st7796.overlay;healthypi5_rp2040_sd.overlay'