diff --git a/.github/workflows/silabs-firmware-build-zwave.yaml b/.github/workflows/silabs-firmware-build-zwave.yaml index d131cd89..22b6a6f5 100644 --- a/.github/workflows/silabs-firmware-build-zwave.yaml +++ b/.github/workflows/silabs-firmware-build-zwave.yaml @@ -92,6 +92,10 @@ jobs: - name: Patch SDK if: "${{ inputs.sdkpatchpath != '' }}" run: | + if [ ! -d "${{ inputs.sdkpatchpath }}" ]; then + exit 0 + fi + cd ${{ inputs.firmware_name }}/gecko_sdk_${{ inputs.sdk_version }} for patch in "../../${{ inputs.sdkpatchpath }}"/*.patch do @@ -137,6 +141,13 @@ jobs: $SIGN_KEY $ENC_KEY \ --compress ${{ inputs.gbl_compression }} + - name: Install node within container (act) + if: ${{ env.ACT }} + shell: bash + run: | + curl -fsSL https://deb.nodesource.com/nsolid_setup_deb.sh | bash -s 20 + apt-get install -y nodejs + - uses: actions/upload-artifact@v3 if: success() || failure() with: diff --git a/.github/workflows/silabs-firmware-build.yaml b/.github/workflows/silabs-firmware-build.yaml index 84450426..8d640808 100644 --- a/.github/workflows/silabs-firmware-build.yaml +++ b/.github/workflows/silabs-firmware-build.yaml @@ -91,6 +91,10 @@ jobs: - name: Patch SDK if: "${{ inputs.sdkpatchpath != '' }}" run: | + if [ ! -d "${{ inputs.sdkpatchpath }}" ]; then + exit 0 + fi + cd ${{ inputs.firmware_name }}/gecko_sdk_${{ inputs.sdk_version }} for patch in "../../${{ inputs.sdkpatchpath }}"/*.patch do diff --git a/EmberZNet/SkyConnect/0001-config-use-SkyConnect-specific-UUID-as-Application-P.patch b/EmberZNet/SkyConnect/0002-config-use-SkyConnect-specific-UUID-as-Application-P.patch similarity index 100% rename from EmberZNet/SkyConnect/0001-config-use-SkyConnect-specific-UUID-as-Application-P.patch rename to EmberZNet/SkyConnect/0002-config-use-SkyConnect-specific-UUID-as-Application-P.patch diff --git a/EmberZNet/Yellow/0001-config-add-board-activity-LED-pin-config.patch b/EmberZNet/Yellow/0002-config-add-board-activity-LED-pin-config.patch similarity index 100% rename from EmberZNet/Yellow/0001-config-add-board-activity-LED-pin-config.patch rename to EmberZNet/Yellow/0002-config-add-board-activity-LED-pin-config.patch diff --git a/OpenThreadRCP/SkyConnect/0001-config-configure-usart-vcom-for-SkyConnect.patch b/OpenThreadRCP/SkyConnect/0001-Configure-UART.patch similarity index 61% rename from OpenThreadRCP/SkyConnect/0001-config-configure-usart-vcom-for-SkyConnect.patch rename to OpenThreadRCP/SkyConnect/0001-Configure-UART.patch index ae47b6e3..756ae328 100644 --- a/OpenThreadRCP/SkyConnect/0001-config-configure-usart-vcom-for-SkyConnect.patch +++ b/OpenThreadRCP/SkyConnect/0001-Configure-UART.patch @@ -1,53 +1,77 @@ -From 51ef16ec2d80cdf032612159d3d9307639cfc561 Mon Sep 17 00:00:00 2001 -Message-Id: <51ef16ec2d80cdf032612159d3d9307639cfc561.1678798117.git.stefan@agner.ch> -From: Stefan Agner -Date: Tue, 14 Mar 2023 13:26:35 +0100 -Subject: [PATCH] config: configure usart vcom for SkyConnect +From aca87d890c1d779add80a9a418f89e30f6d52f6d Mon Sep 17 00:00:00 2001 +From: puddly <32534428+puddly@users.noreply.github.com> +Date: Wed, 3 Jan 2024 10:47:37 -0500 +Subject: [PATCH] Configure UART +Configure UART --- - config/sl_uartdrv_usart_vcom_config.h | 27 +++++++++++++++------------ - 1 file changed, 15 insertions(+), 12 deletions(-) + config/sl_uartdrv_usart_vcom_config.h | 54 +++++++++++++++------- + 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/config/sl_uartdrv_usart_vcom_config.h b/config/sl_uartdrv_usart_vcom_config.h -index 8a2ab70..7292f1a 100644 +index c64b243..bb58433 100644 --- a/config/sl_uartdrv_usart_vcom_config.h +++ b/config/sl_uartdrv_usart_vcom_config.h -@@ -76,21 +76,24 @@ +@@ -89,21 +89,44 @@ // <<< sl:start pin_tool >>> // SL_UARTDRV_USART_VCOM // $[USART_SL_UARTDRV_USART_VCOM] -#warning "UARTDRV USART peripheral not configured" -// #define SL_UARTDRV_USART_VCOM_PERIPHERAL USART0 -// #define SL_UARTDRV_USART_VCOM_PERIPHERAL_NO 0 -+#define SL_UARTDRV_USART_VCOM_PERIPHERAL USART0 -+#define SL_UARTDRV_USART_VCOM_PERIPHERAL_NO 0 - +- -// #define SL_UARTDRV_USART_VCOM_TX_PORT gpioPortA -// #define SL_UARTDRV_USART_VCOM_TX_PIN 0 -+// USART0 TX on PA05 -+#define SL_UARTDRV_USART_VCOM_TX_PORT gpioPortA -+#define SL_UARTDRV_USART_VCOM_TX_PIN 6 - +- -// #define SL_UARTDRV_USART_VCOM_RX_PORT gpioPortA -// #define SL_UARTDRV_USART_VCOM_RX_PIN 1 -+// USART0 RX on PA06 -+#define SL_UARTDRV_USART_VCOM_RX_PORT gpioPortA -+#define SL_UARTDRV_USART_VCOM_RX_PIN 5 - +- -// #define SL_UARTDRV_USART_VCOM_CTS_PORT gpioPortA -// #define SL_UARTDRV_USART_VCOM_CTS_PIN 2 -+// USART0 CTS on PD02 -+#define SL_UARTDRV_USART_VCOM_CTS_PORT gpioPortB -+#define SL_UARTDRV_USART_VCOM_CTS_PIN 1 - +- -// #define SL_UARTDRV_USART_VCOM_RTS_PORT gpioPortA -// #define SL_UARTDRV_USART_VCOM_RTS_PIN 3 -+// USART0 RTS on PC01 ++#ifndef SL_UARTDRV_USART_VCOM_PERIPHERAL ++#define SL_UARTDRV_USART_VCOM_PERIPHERAL USART0 ++#endif ++#ifndef SL_UARTDRV_USART_VCOM_PERIPHERAL_NO ++#define SL_UARTDRV_USART_VCOM_PERIPHERAL_NO 0 ++#endif ++ ++// USART0 TX on PA06 ++#ifndef SL_UARTDRV_USART_VCOM_TX_PORT ++#define SL_UARTDRV_USART_VCOM_TX_PORT gpioPortA ++#endif ++#ifndef SL_UARTDRV_USART_VCOM_TX_PIN ++#define SL_UARTDRV_USART_VCOM_TX_PIN 6 ++#endif ++ ++// USART0 RX on PA05 ++#ifndef SL_UARTDRV_USART_VCOM_RX_PORT ++#define SL_UARTDRV_USART_VCOM_RX_PORT gpioPortA ++#endif ++#ifndef SL_UARTDRV_USART_VCOM_RX_PIN ++#define SL_UARTDRV_USART_VCOM_RX_PIN 5 ++#endif ++ ++// USART0 CTS on PB01 ++#ifndef SL_UARTDRV_USART_VCOM_CTS_PORT ++#define SL_UARTDRV_USART_VCOM_CTS_PORT gpioPortB ++#endif ++#ifndef SL_UARTDRV_USART_VCOM_CTS_PIN ++#define SL_UARTDRV_USART_VCOM_CTS_PIN 1 ++#endif ++ ++// USART0 RTS on PB00 ++#ifndef SL_UARTDRV_USART_VCOM_RTS_PORT +#define SL_UARTDRV_USART_VCOM_RTS_PORT gpioPortB ++#endif ++#ifndef SL_UARTDRV_USART_VCOM_RTS_PIN +#define SL_UARTDRV_USART_VCOM_RTS_PIN 0 ++#endif // [USART_SL_UARTDRV_USART_VCOM]$ // <<< sl:end pin_tool >>> -- -2.39.2 +2.43.0 diff --git a/OpenThreadRCP/Yellow/0001-config-configure-usart-vcom-for-Yellow.patch b/OpenThreadRCP/Yellow/0001-Configure-UART.patch similarity index 65% rename from OpenThreadRCP/Yellow/0001-config-configure-usart-vcom-for-Yellow.patch rename to OpenThreadRCP/Yellow/0001-Configure-UART.patch index 00960edb..d61c5357 100644 --- a/OpenThreadRCP/Yellow/0001-config-configure-usart-vcom-for-Yellow.patch +++ b/OpenThreadRCP/Yellow/0001-Configure-UART.patch @@ -1,53 +1,77 @@ -From 05cfb71f684cf20e48c51eefaf301cce035f0c64 Mon Sep 17 00:00:00 2001 -Message-Id: <05cfb71f684cf20e48c51eefaf301cce035f0c64.1678797714.git.stefan@agner.ch> -From: Stefan Agner -Date: Tue, 14 Mar 2023 13:26:35 +0100 -Subject: [PATCH] config: configure usart vcom for Yellow +From aca87d890c1d779add80a9a418f89e30f6d52f6d Mon Sep 17 00:00:00 2001 +From: puddly <32534428+puddly@users.noreply.github.com> +Date: Wed, 3 Jan 2024 10:47:37 -0500 +Subject: [PATCH] Configure UART +Configure UART --- - config/sl_uartdrv_usart_vcom_config.h | 27 +++++++++++++++------------ - 1 file changed, 15 insertions(+), 12 deletions(-) + config/sl_uartdrv_usart_vcom_config.h | 54 +++++++++++++++------- + 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/config/sl_uartdrv_usart_vcom_config.h b/config/sl_uartdrv_usart_vcom_config.h -index 8a2ab70..5caf982 100644 +index c64b243..bb58433 100644 --- a/config/sl_uartdrv_usart_vcom_config.h +++ b/config/sl_uartdrv_usart_vcom_config.h -@@ -76,21 +76,24 @@ +@@ -89,21 +89,44 @@ // <<< sl:start pin_tool >>> // SL_UARTDRV_USART_VCOM // $[USART_SL_UARTDRV_USART_VCOM] -#warning "UARTDRV USART peripheral not configured" -// #define SL_UARTDRV_USART_VCOM_PERIPHERAL USART0 -// #define SL_UARTDRV_USART_VCOM_PERIPHERAL_NO 0 -+#define SL_UARTDRV_USART_VCOM_PERIPHERAL USART0 -+#define SL_UARTDRV_USART_VCOM_PERIPHERAL_NO 0 - +- -// #define SL_UARTDRV_USART_VCOM_TX_PORT gpioPortA -// #define SL_UARTDRV_USART_VCOM_TX_PIN 0 +- +-// #define SL_UARTDRV_USART_VCOM_RX_PORT gpioPortA +-// #define SL_UARTDRV_USART_VCOM_RX_PIN 1 +- +-// #define SL_UARTDRV_USART_VCOM_CTS_PORT gpioPortA +-// #define SL_UARTDRV_USART_VCOM_CTS_PIN 2 +- +-// #define SL_UARTDRV_USART_VCOM_RTS_PORT gpioPortA +-// #define SL_UARTDRV_USART_VCOM_RTS_PIN 3 ++#ifndef SL_UARTDRV_USART_VCOM_PERIPHERAL ++#define SL_UARTDRV_USART_VCOM_PERIPHERAL USART0 ++#endif ++#ifndef SL_UARTDRV_USART_VCOM_PERIPHERAL_NO ++#define SL_UARTDRV_USART_VCOM_PERIPHERAL_NO 0 ++#endif ++ +// USART0 TX on PA05 ++#ifndef SL_UARTDRV_USART_VCOM_TX_PORT +#define SL_UARTDRV_USART_VCOM_TX_PORT gpioPortA ++#endif ++#ifndef SL_UARTDRV_USART_VCOM_TX_PIN +#define SL_UARTDRV_USART_VCOM_TX_PIN 5 - --// #define SL_UARTDRV_USART_VCOM_RX_PORT gpioPortA --// #define SL_UARTDRV_USART_VCOM_RX_PIN 1 ++#endif ++ +// USART0 RX on PA06 ++#ifndef SL_UARTDRV_USART_VCOM_RX_PORT +#define SL_UARTDRV_USART_VCOM_RX_PORT gpioPortA ++#endif ++#ifndef SL_UARTDRV_USART_VCOM_RX_PIN +#define SL_UARTDRV_USART_VCOM_RX_PIN 6 - --// #define SL_UARTDRV_USART_VCOM_CTS_PORT gpioPortA --// #define SL_UARTDRV_USART_VCOM_CTS_PIN 2 ++#endif ++ +// USART0 CTS on PD02 ++#ifndef SL_UARTDRV_USART_VCOM_CTS_PORT +#define SL_UARTDRV_USART_VCOM_CTS_PORT gpioPortD ++#endif ++#ifndef SL_UARTDRV_USART_VCOM_CTS_PIN +#define SL_UARTDRV_USART_VCOM_CTS_PIN 2 - --// #define SL_UARTDRV_USART_VCOM_RTS_PORT gpioPortA --// #define SL_UARTDRV_USART_VCOM_RTS_PIN 3 ++#endif ++ +// USART0 RTS on PC01 ++#ifndef SL_UARTDRV_USART_VCOM_RTS_PORT +#define SL_UARTDRV_USART_VCOM_RTS_PORT gpioPortC ++#endif ++#ifndef SL_UARTDRV_USART_VCOM_RTS_PIN +#define SL_UARTDRV_USART_VCOM_RTS_PIN 1 ++#endif // [USART_SL_UARTDRV_USART_VCOM]$ // <<< sl:end pin_tool >>> -- -2.39.2 +2.43.0 diff --git a/RCPMultiPAN/SkyConnect/0001-Configure-UART.patch b/RCPMultiPAN/SkyConnect/0001-Configure-UART.patch new file mode 100644 index 00000000..0ef4c1e7 --- /dev/null +++ b/RCPMultiPAN/SkyConnect/0001-Configure-UART.patch @@ -0,0 +1,85 @@ +From aca87d890c1d779add80a9a418f89e30f6d52f6d Mon Sep 17 00:00:00 2001 +From: puddly <32534428+puddly@users.noreply.github.com> +Date: Wed, 3 Jan 2024 10:47:37 -0500 +Subject: [PATCH] Configure UART + +Configure UART +--- + config/sl_cpc_drv_uart_usart_vcom_config.h | 54 +++++++++++++++------- + 1 file changed, 38 insertions(+), 16 deletions(-) + +diff --git a/config/sl_cpc_drv_uart_usart_vcom_config.h b/config/sl_cpc_drv_uart_usart_vcom_config.h +index 265c262..bb0d7d5 100644 +--- a/config/sl_cpc_drv_uart_usart_vcom_config.h ++++ b/config/sl_cpc_drv_uart_usart_vcom_config.h +@@ -29,7 +29,6 @@ + ******************************************************************************/ + + // <<< Use Configuration Wizard in Context Menu >>> +- + #ifndef SL_CPC_DRV_UART_USART_VCOM_CONFIG_H + #define SL_CPC_DRV_UART_USART_VCOM_CONFIG_H + +@@ -59,21 +58,44 @@ + // <<< sl:start pin_tool >>> + // SL_CPC_DRV_UART_VCOM + // $[USART_SL_CPC_DRV_UART_VCOM] +-#warning "CPC USART peripheral not configured" +-// #define SL_CPC_DRV_UART_VCOM_PERIPHERAL USART0 +-// #define SL_CPC_DRV_UART_VCOM_PERIPHERAL_NO 0 +-// +-// #define SL_CPC_DRV_UART_VCOM_TX_PORT gpioPortD +-// #define SL_CPC_DRV_UART_VCOM_TX_PIN 13 +-// +-// #define SL_CPC_DRV_UART_VCOM_RX_PORT gpioPortD +-// #define SL_CPC_DRV_UART_VCOM_RX_PIN 14 +-// +-// #define SL_CPC_DRV_UART_VCOM_CTS_PORT gpioPortD +-// #define SL_CPC_DRV_UART_VCOM_CTS_PIN 13 +-// +-// #define SL_CPC_DRV_UART_VCOM_RTS_PORT gpioPortD +-// #define SL_CPC_DRV_UART_VCOM_RTS_PIN 14 ++#ifndef SL_CPC_DRV_UART_VCOM_PERIPHERAL ++#define SL_CPC_DRV_UART_VCOM_PERIPHERAL USART0 ++#endif ++#ifndef SL_CPC_DRV_UART_VCOM_PERIPHERAL_NO ++#define SL_CPC_DRV_UART_VCOM_PERIPHERAL_NO 0 ++#endif ++ ++// USART0 TX on PA06 ++#ifndef SL_CPC_DRV_UART_VCOM_TX_PORT ++#define SL_CPC_DRV_UART_VCOM_TX_PORT gpioPortA ++#endif ++#ifndef SL_CPC_DRV_UART_VCOM_TX_PIN ++#define SL_CPC_DRV_UART_VCOM_TX_PIN 6 ++#endif ++ ++// USART0 RX on PA05 ++#ifndef SL_CPC_DRV_UART_VCOM_RX_PORT ++#define SL_CPC_DRV_UART_VCOM_RX_PORT gpioPortA ++#endif ++#ifndef SL_CPC_DRV_UART_VCOM_RX_PIN ++#define SL_CPC_DRV_UART_VCOM_RX_PIN 5 ++#endif ++ ++// USART0 CTS on PB01 ++#ifndef SL_CPC_DRV_UART_VCOM_CTS_PORT ++#define SL_CPC_DRV_UART_VCOM_CTS_PORT gpioPortB ++#endif ++#ifndef SL_CPC_DRV_UART_VCOM_CTS_PIN ++#define SL_CPC_DRV_UART_VCOM_CTS_PIN 1 ++#endif ++ ++// USART0 RTS on PB00 ++#ifndef SL_CPC_DRV_UART_VCOM_RTS_PORT ++#define SL_CPC_DRV_UART_VCOM_RTS_PORT gpioPortB ++#endif ++#ifndef SL_CPC_DRV_UART_VCOM_RTS_PIN ++#define SL_CPC_DRV_UART_VCOM_RTS_PIN 0 ++#endif + // [USART_SL_CPC_DRV_UART_VCOM]$ + // <<< sl:end pin_tool >>> + +-- +2.43.0 + diff --git a/RCPMultiPAN/SkyConnect/0001-config-configure-cpc-usart-vcom-for-SkyConnect.patch b/RCPMultiPAN/SkyConnect/0001-config-configure-cpc-usart-vcom-for-SkyConnect.patch deleted file mode 100644 index 0a4bbc50..00000000 --- a/RCPMultiPAN/SkyConnect/0001-config-configure-cpc-usart-vcom-for-SkyConnect.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 952a0a662f48fe5c44d7350f6d89b90dfbea60ad Mon Sep 17 00:00:00 2001 -Message-Id: <952a0a662f48fe5c44d7350f6d89b90dfbea60ad.1675725669.git.stefan@agner.ch> -From: Stefan Agner -Date: Tue, 7 Feb 2023 00:14:01 +0100 -Subject: [PATCH] config: configure cpc usart vcom for SkyConnect - ---- - ...cpc_drv_secondary_uart_usart_vcom_config.h | 24 +++++++++---------- - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/config/sl_cpc_drv_secondary_uart_usart_vcom_config.h b/config/sl_cpc_drv_secondary_uart_usart_vcom_config.h -index 66288db..56c21a9 100644 ---- a/config/sl_cpc_drv_secondary_uart_usart_vcom_config.h -+++ b/config/sl_cpc_drv_secondary_uart_usart_vcom_config.h -@@ -62,21 +62,21 @@ - #define SL_CPC_DRV_UART_VCOM_PERIPHERAL USART0 - #define SL_CPC_DRV_UART_VCOM_PERIPHERAL_NO 0 - --// USART TX --#define SL_CPC_DRV_UART_VCOM_TX_PORT gpioPortD --#define SL_CPC_DRV_UART_VCOM_TX_PIN 13 -+// USART0 TX on PA06 -+#define SL_CPC_DRV_UART_VCOM_TX_PORT gpioPortA -+#define SL_CPC_DRV_UART_VCOM_TX_PIN 6 - --// USART RX --#define SL_CPC_DRV_UART_VCOM_RX_PORT gpioPortD --#define SL_CPC_DRV_UART_VCOM_RX_PIN 14 -+// USART0 RX on PA05 -+#define SL_CPC_DRV_UART_VCOM_RX_PORT gpioPortA -+#define SL_CPC_DRV_UART_VCOM_RX_PIN 5 - --// USART CTS --#define SL_CPC_DRV_UART_VCOM_CTS_PORT gpioPortD --#define SL_CPC_DRV_UART_VCOM_CTS_PIN 13 -+// USART0 CTS on PB01 -+#define SL_CPC_DRV_UART_VCOM_CTS_PORT gpioPortB -+#define SL_CPC_DRV_UART_VCOM_CTS_PIN 1 - --// USART RTS --#define SL_CPC_DRV_UART_VCOM_RTS_PORT gpioPortD --#define SL_CPC_DRV_UART_VCOM_RTS_PIN 14 -+// USART0 RTS on PB00 -+#define SL_CPC_DRV_UART_VCOM_RTS_PORT gpioPortB -+#define SL_CPC_DRV_UART_VCOM_RTS_PIN 0 - - // [USART_SL_CPC_DRV_UART_VCOM]$ - // <<< sl:end pin_tool >>> --- -2.39.1 - diff --git a/RCPMultiPAN/Yellow/0001-Configure-UART.patch b/RCPMultiPAN/Yellow/0001-Configure-UART.patch new file mode 100644 index 00000000..5c5ad8fa --- /dev/null +++ b/RCPMultiPAN/Yellow/0001-Configure-UART.patch @@ -0,0 +1,85 @@ +From aca87d890c1d779add80a9a418f89e30f6d52f6d Mon Sep 17 00:00:00 2001 +From: puddly <32534428+puddly@users.noreply.github.com> +Date: Wed, 3 Jan 2024 10:47:37 -0500 +Subject: [PATCH] Configure UART + +Configure UART +--- + config/sl_cpc_drv_uart_usart_vcom_config.h | 54 +++++++++++++++------- + 1 file changed, 38 insertions(+), 16 deletions(-) + +diff --git a/config/sl_cpc_drv_uart_usart_vcom_config.h b/config/sl_cpc_drv_uart_usart_vcom_config.h +index 265c262..bb0d7d5 100644 +--- a/config/sl_cpc_drv_uart_usart_vcom_config.h ++++ b/config/sl_cpc_drv_uart_usart_vcom_config.h +@@ -29,7 +29,6 @@ + ******************************************************************************/ + + // <<< Use Configuration Wizard in Context Menu >>> +- + #ifndef SL_CPC_DRV_UART_USART_VCOM_CONFIG_H + #define SL_CPC_DRV_UART_USART_VCOM_CONFIG_H + +@@ -59,21 +58,44 @@ + // <<< sl:start pin_tool >>> + // SL_CPC_DRV_UART_VCOM + // $[USART_SL_CPC_DRV_UART_VCOM] +-#warning "CPC USART peripheral not configured" +-// #define SL_CPC_DRV_UART_VCOM_PERIPHERAL USART0 +-// #define SL_CPC_DRV_UART_VCOM_PERIPHERAL_NO 0 +-// +-// #define SL_CPC_DRV_UART_VCOM_TX_PORT gpioPortD +-// #define SL_CPC_DRV_UART_VCOM_TX_PIN 13 +-// +-// #define SL_CPC_DRV_UART_VCOM_RX_PORT gpioPortD +-// #define SL_CPC_DRV_UART_VCOM_RX_PIN 14 +-// +-// #define SL_CPC_DRV_UART_VCOM_CTS_PORT gpioPortD +-// #define SL_CPC_DRV_UART_VCOM_CTS_PIN 13 +-// +-// #define SL_CPC_DRV_UART_VCOM_RTS_PORT gpioPortD +-// #define SL_CPC_DRV_UART_VCOM_RTS_PIN 14 ++#ifndef SL_CPC_DRV_UART_VCOM_PERIPHERAL ++#define SL_CPC_DRV_UART_VCOM_PERIPHERAL USART0 ++#endif ++#ifndef SL_CPC_DRV_UART_VCOM_PERIPHERAL_NO ++#define SL_CPC_DRV_UART_VCOM_PERIPHERAL_NO 0 ++#endif ++ ++// USART0 TX on PA05 ++#ifndef SL_CPC_DRV_UART_VCOM_TX_PORT ++#define SL_CPC_DRV_UART_VCOM_TX_PORT gpioPortA ++#endif ++#ifndef SL_CPC_DRV_UART_VCOM_TX_PIN ++#define SL_CPC_DRV_UART_VCOM_TX_PIN 5 ++#endif ++ ++// USART0 RX on PA06 ++#ifndef SL_CPC_DRV_UART_VCOM_RX_PORT ++#define SL_CPC_DRV_UART_VCOM_RX_PORT gpioPortA ++#endif ++#ifndef SL_CPC_DRV_UART_VCOM_RX_PIN ++#define SL_CPC_DRV_UART_VCOM_RX_PIN 6 ++#endif ++ ++// USART0 CTS on PD02 ++#ifndef SL_CPC_DRV_UART_VCOM_CTS_PORT ++#define SL_CPC_DRV_UART_VCOM_CTS_PORT gpioPortD ++#endif ++#ifndef SL_CPC_DRV_UART_VCOM_CTS_PIN ++#define SL_CPC_DRV_UART_VCOM_CTS_PIN 2 ++#endif ++ ++// USART0 RTS on PC01 ++#ifndef SL_CPC_DRV_UART_VCOM_RTS_PORT ++#define SL_CPC_DRV_UART_VCOM_RTS_PORT gpioPortC ++#endif ++#ifndef SL_CPC_DRV_UART_VCOM_RTS_PIN ++#define SL_CPC_DRV_UART_VCOM_RTS_PIN 1 ++#endif + // [USART_SL_CPC_DRV_UART_VCOM]$ + // <<< sl:end pin_tool >>> + +-- +2.43.0 + diff --git a/RCPMultiPAN/Yellow/0001-config-configure-cpc-usart-vcom-for-Yellow.patch b/RCPMultiPAN/Yellow/0001-config-configure-cpc-usart-vcom-for-Yellow.patch deleted file mode 100644 index ea81872d..00000000 --- a/RCPMultiPAN/Yellow/0001-config-configure-cpc-usart-vcom-for-Yellow.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 20184d2a2b267ce0ff81464d140481ce1657da74 Mon Sep 17 00:00:00 2001 -Message-Id: <20184d2a2b267ce0ff81464d140481ce1657da74.1679556106.git.stefan@agner.ch> -From: Stefan Agner -Date: Tue, 7 Feb 2023 00:18:24 +0100 -Subject: [PATCH] config: configure cpc usart vcom for Yellow - ---- - ...cpc_drv_secondary_uart_usart_vcom_config.h | 22 +++++++++---------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/config/sl_cpc_drv_secondary_uart_usart_vcom_config.h b/config/sl_cpc_drv_secondary_uart_usart_vcom_config.h -index 66288db..e006ebc 100644 ---- a/config/sl_cpc_drv_secondary_uart_usart_vcom_config.h -+++ b/config/sl_cpc_drv_secondary_uart_usart_vcom_config.h -@@ -62,21 +62,21 @@ - #define SL_CPC_DRV_UART_VCOM_PERIPHERAL USART0 - #define SL_CPC_DRV_UART_VCOM_PERIPHERAL_NO 0 - --// USART TX --#define SL_CPC_DRV_UART_VCOM_TX_PORT gpioPortD --#define SL_CPC_DRV_UART_VCOM_TX_PIN 13 -+// USART0 TX on PA05 -+#define SL_CPC_DRV_UART_VCOM_TX_PORT gpioPortA -+#define SL_CPC_DRV_UART_VCOM_TX_PIN 5 - --// USART RX --#define SL_CPC_DRV_UART_VCOM_RX_PORT gpioPortD --#define SL_CPC_DRV_UART_VCOM_RX_PIN 14 -+// USART0 RX on PA06 -+#define SL_CPC_DRV_UART_VCOM_RX_PORT gpioPortA -+#define SL_CPC_DRV_UART_VCOM_RX_PIN 6 - --// USART CTS -+// USART0 CTS on PD02 - #define SL_CPC_DRV_UART_VCOM_CTS_PORT gpioPortD --#define SL_CPC_DRV_UART_VCOM_CTS_PIN 13 -+#define SL_CPC_DRV_UART_VCOM_CTS_PIN 2 - --// USART RTS --#define SL_CPC_DRV_UART_VCOM_RTS_PORT gpioPortD --#define SL_CPC_DRV_UART_VCOM_RTS_PIN 14 -+// USART0 RTS on PC01 -+#define SL_CPC_DRV_UART_VCOM_RTS_PORT gpioPortC -+#define SL_CPC_DRV_UART_VCOM_RTS_PIN 1 - - // [USART_SL_CPC_DRV_UART_VCOM]$ - // <<< sl:end pin_tool >>> --- -2.40.0 -