Fix Github Workflow

Protocentral · Oct 28, 2024 · 2d2e861 · 2d2e861
1 parent 07101c1
commit 2d2e861
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 59 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,37 +23,27 @@ jobs:
           west init -l .
           west update -o=--depth=1 -n
 
-      - name: Build base firmware
+      - name: Build Basic firmware
         working-directory: healthypi5_zephyr
         run: |
           rm -rf *.uf2
-          west build -p auto -b healthypi5_rp2040 app
-          mv build/zephyr/zephyr.uf2 healthypi5_base.uf2
+          west build -p always -b healthypi5_rp2040 app -DEXTRA_CONF_FILE=overlay-bt.conf -DEXTRA_CONF_FILE=overlay-logger-sd.conf -DEXTRA_DTC_OVERLAY_FILE=healthypi5_rp2040_sd.overlay 
+          mv build/zephyr/zephyr.uf2 healthypi5_basic.uf2
 
-      - name: Build display firmware
+      - name: Build display firmware for ST7796
         working-directory: healthypi5_zephyr
         run: |
           west build -t pristine
-          west build -p auto -b healthypi5_rp2040 app -DEXTRA_CONF_FILE=overlay-display.conf -DEXTRA_DTC_OVERLAY_FILE=healthypi5_rp2040_display.overlay
-          mv build/zephyr/zephyr.uf2 healthypi5_display.uf2
+          west build -p auto -b healthypi5_rp2040 app -DEXTRA_CONF_FILE=overlay-bt.conf -DEXTRA_CONF_FILE=overlay-display-st7796.conf -DEXTRA_DTC_OVERLAY_FILE=healthypi5_rp2040_display_st7796.overlay
+          mv build/zephyr/zephyr.uf2 healthypi5_display_st7796.uf2
 
-      - name: Build BLE firmware
+      - name: Build display firmware for ILI9488
         working-directory: healthypi5_zephyr
         run: |
           west build -t pristine
-          west build -p auto -b healthypi5_rp2040 app -DEXTRA_CONF_FILE=overlay-bt.conf
-          mv build/zephyr/zephyr.uf2 healthypi5_ble.uf2
-      
-      - name: Build BLE firmware with MCUBoot
-        working-directory: healthypi5_zephyr
-        run: |
-          west build -t pristine
-          west build -p auto -b healthypi5_rp2040 app --sysbuild "-DEXTRA_CONF_FILE=overlay-boot.conf;overlay-bt.conf" "-DEXTRA_DTC_OVERLAY_FILE=healthypi5_rp2040_mcuboot.overlay"
-          hexmerge.py -o build/merged_boot.hex --no-start-addr build/mcuboot/zephyr/zephyr.hex build/app/zephyr/zephyr.signed.hex
-          hex2bin.py build/merged_boot.hex build/merged_boot.bin
-          ../zephyr/scripts/build/uf2conv.py build/merged_boot.bin --convert -f 0xe48bff56 -b 0x10000000 -o build/merged_boot.uf2
-          mv build/merged_boot.uf2 healthypi5_ble_boot.uf2
-      
+          west build -p auto -b healthypi5_rp2040 app  -DEXTRA_CONF_FILE=overlay-display-ili9488.conf -DEXTRA_DTC_OVERLAY_FILE=healthypi5_rp2040_display_ili9488.overlay
+          mv build/zephyr/zephyr.uf2 healthypi5_display_ili9488.uf2
+
       - name: Upload release assets
         uses: ncipollo/release-action@v1
         with:

diff --git a/app/healthypi5_rp2040_display_st7796.overlay b/app/healthypi5_rp2040_display_st7796.overlay
@@ -32,43 +32,7 @@
 	};
 };
 
-/*&zephyr_udc0 {
-	cdc_acm_uart0: cdc_acm_uart0 {
-		compatible = "zephyr,cdc-acm-uart";
-	};
-};*/
-
-/*
-&spi1 {
-	clock-frequency = <DT_FREQ_M(48)>;
-	status = "okay";
-	pinctrl-0 = <&spi1_default>;
-	pinctrl-names = "default";
-	cs-gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
-
-	ili9488: ili9488@0 {
-		compatible = "ilitek,ili9488";
-		spi-max-frequency = <48000000>;
-		reg = <0>;
-		cmd-data-gpios = <&gpio0 23 GPIO_ACTIVE_LOW>;
-		reset-gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; 
-		//pixel-format = <ILI9XXX_PIXEL_FORMAT_RGB888>;
-		width = <480>;
-		height = <320>;
-		rotation = <270>;
-		frmctr1 = [ a0 11  ];
-		pwctrl1 = [ 17 15  ];
-		pwctrl2 = [ 41  ];
-		pgamctrl = [ 00 03 09 08 16 0a 3f 78 4c 09 0a 08 16 1a 0f  ];
-		ngamctrl = [ 00 16 19 03 0f 05 32 45 46 04 0e 0d 35 37 0f  ];
-	};
-};*/
-
-
-/*
 &pwm {
 	status = "okay";
-	divider-frac-1 = <15>;
-	divider-int-1 = <255>;
-};*/
-
+	divider-int-4 = <255>;
+};
diff --git a/app/overlay-display-st7796.conf b/app/overlay-display-st7796.conf
@@ -29,4 +29,5 @@ CONFIG_LV_CIRCLE_CACHE_SIZE=8
 CONFIG_LV_FONT_DEFAULT_MONTSERRAT_12=y
 CONFIG_LV_USE_FONT_SUBPX=y
 
-CONFIG_HEALTHYPI_DISPLAY_ENABLED=y
+CONFIG_HEALTHYPI_DISPLAY_ENABLED=y
+CONFIG_PWM=y