Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream baudrate changes #18

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Merge upstream baudrate changes #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7318f47
Set baudrate from metadata
darkxst Apr 12, 2023
8c6d1b2
Split out baudrate as input
darkxst Apr 14, 2023
56cfe36
Fix baudrate metadata is a number
darkxst Apr 15, 2023
266ab3b
Adapt remaining changes for upstream baudrate changes
darkxst Apr 17, 2023
5861862
Clean up patch paths
darkxst Apr 17, 2023
32b0c06
Drop baudrate specific patches
darkxst Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 40 additions & 42 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,35 +52,35 @@ jobs:
device: MGM210PA32JIA
components: simple_led:board_activity
patchpath: "EmberZNet/Yellow"
metadata_extra: "{ \"ezsp_version\": \"7.2.2.0\", \"baudrate\": 115200 }"
baudrate: 115200
- target: skyconnect
device: EFR32MG21A020F512IM32
patchpath: "EmberZNet/SkyConnect"
metadata_extra: "{ \"ezsp_version\": \"7.2.2.0\", \"baudrate\": 115200 }"
baudrate: 115200
- target: zbdonglee
device: EFR32MG21A020F768IM32
patchpath: "EmberZNet/ZBDongleE"
metadata_extra: "{ \"ezsp_version\": \"7.2.2.0\", \"baudrate\": 115200 }"
baudrate: 115200
- target: zbdonglee-230
device: EFR32MG21A020F768IM32
patchpath: "EmberZNet/ZBDongleE-230"
metadata_extra: "{ \"ezsp_version\": \"7.2.2.0\", \"baudrate\": 230400 }"
patchpath: "EmberZNet/ZBDongleE"
baudrate: 230400
- target: zbdonglee-none
device: EFR32MG21A020F768IM32
patchpath: "EmberZNet/ZBDongleE-none"
metadata_extra: "{ \"ezsp_version\": \"7.2.2.0\", \"baudrate\": 115200 }"
baudrate: 115200
- target: zb-gw04-1v1
device: EFR32MG21A020F768IM32
patchpath: "EmberZNet/ZB-GW04-1v1"
metadata_extra: "{ \"ezsp_version\": \"7.2.2.0\", \"baudrate\": 115200 }"
baudrate: 115200
- target: zb-gw04-1v2
device: EFR32MG21A020F768IM32
patchpath: "EmberZNet/ZB-GW04-1v2"
metadata_extra: "{ \"ezsp_version\": \"7.2.2.0\", \"baudrate\": 115200 }"
baudrate: 115200
- target: zb-gw04-1v2-230
device: EFR32MG21A020F768IM32
patchpath: "EmberZNet/ZB-GW04-1v2-230"
metadata_extra: "{ \"ezsp_version\": \"7.2.2.0\", \"baudrate\": 230400 }"
patchpath: "EmberZNet/ZB-GW04-1v2"
baudrate: 230400
uses: ./.github/workflows/silabs-firmware-build.yaml
with:
firmware_name: ncp-uart-hw-${{ matrix.target }}
Expand All @@ -97,7 +97,7 @@ jobs:
extra_c_defs: "'-DEMBER_ADDRESS_TABLE_SIZE=16' '-DEMBER_MULTICAST_TABLE_SIZE=16'"
sdk_version: 4.2.2
metadata_fw_type: "ncp-uart-hw"
metadata_extra: ${{ matrix.metadata_extra }}
metadata_extra: "{ \"ezsp_version\": \"7.2.2.0\" }"

rcp-multi-pan-firmware-build:
name: RCP Multi-PAN
Expand All @@ -109,52 +109,52 @@ jobs:
device: MGM210PA32JIA
components: simple_led:board_activity,cpc_security_secondary_none
patchpath: "RCPMultiPAN/Yellow"
metadata_extra: "{ \"baudrate\": 115200 }"
baudrate: 115200
- target: skyconnect
device: EFR32MG21A020F512IM32
components: cpc_security_secondary_none
patchpath: "RCPMultiPAN/SkyConnect"
metadata_extra: "{ \"baudrate\": 115200 }"
baudrate: 115200
- target: zbdonglee
device: EFR32MG21A020F768IM32
components: cpc_security_secondary_none
patchpath: "RCPMultiPAN/ZBDongleE"
metadata_extra: "{ \"baudrate\": 115200 }"
baudrate: 115200
- target: zbdonglee-230
device: EFR32MG21A020F768IM32
components: cpc_security_secondary_none
patchpath: "RCPMultiPAN/ZBDongleE-230"
metadata_extra: "{ \"baudrate\": 230400 }"
patchpath: "RCPMultiPAN/ZBDongleE"
baudrate: 230400
- target: zbdonglee-460
device: EFR32MG21A020F768IM32
components: cpc_security_secondary_none
patchpath: "RCPMultiPAN/ZBDongleE-460"
metadata_extra: "{ \"baudrate\": 460800 }"
patchpath: "RCPMultiPAN/ZBDongleE"
baudrate: 460800
- target: zbdonglee-none
device: EFR32MG21A020F768IM32
components: cpc_security_secondary_none
patchpath: "RCPMultiPAN/ZBDongleE-none"
metadata_extra: "{ \"baudrate\": 115200 }"
baudrate: 115200
- target: zb-gw04-1v1
device: EFR32MG21A020F768IM32
components: cpc_security_secondary_none
patchpath: "RCPMultiPAN/ZB-GW04-1v1"
metadata_extra: "{ \"baudrate\": 115200 }"
baudrate: 115200
- target: zb-gw04-1v2
device: EFR32MG21A020F768IM32
components: cpc_security_secondary_none
patchpath: "RCPMultiPAN/ZB-GW04-1v2"
metadata_extra: "{ \"baudrate\": 115200 }"
baudrate: 115200
- target: zb-gw04-1v2-230
device: EFR32MG21A020F768IM32
components: cpc_security_secondary_none
patchpath: "RCPMultiPAN/ZB-GW04-1v2-230"
metadata_extra: "{ \"baudrate\": 230400 }"
patchpath: "RCPMultiPAN/ZB-GW04-1v2"
baudrate: 230400
- target: zb-gw04-1v2-460
device: EFR32MG21A020F768IM32
components: cpc_security_secondary_none
patchpath: "RCPMultiPAN/ZB-GW04-1v2-460"
metadata_extra: "{ \"baudrate\": 460800 }"
patchpath: "RCPMultiPAN/ZB-GW04-1v2"
baudrate: 460800
uses: ./.github/workflows/silabs-firmware-build.yaml
with:
firmware_name: rcp-uart-802154-${{ matrix.target }}
Expand All @@ -165,7 +165,6 @@ jobs:
patchpath: ${{ matrix.patchpath }}
sdk_version: 4.2.2
metadata_fw_type: "rcp-uart-802154"
metadata_extra: ${{ matrix.metadata_extra }}

ot-rcp-firmware-build:
name: OpenThread RCP
Expand All @@ -177,52 +176,52 @@ jobs:
device: MGM210PA32JIA
components: simple_led:board_activity,bootloader_interface
patchpath: "OpenThreadRCP/Yellow"
metadata_extra: "{ \"ot_rcp_version\": \"SL-OPENTHREAD/2.2.2.0_GitHub-91fa1f455\", \"baudrate\": 115200 }"
baudrate: 115200
- target: skyconnect
device: EFR32MG21A020F512IM32
components: bootloader_interface
patchpath: "OpenThreadRCP/SkyConnect"
metadata_extra: "{ \"ot_rcp_version\": \"SL-OPENTHREAD/2.2.2.0_GitHub-91fa1f455\", \"baudrate\": 115200 }"
baudrate: 115200
- target: zbdonglee
device: EFR32MG21A020F768IM32
components: bootloader_interface
patchpath: "OpenThreadRCP/ZBDongleE"
metadata_extra: "{ \"ot_rcp_version\": \"SL-OPENTHREAD/2.2.2.0_GitHub-91fa1f455\", \"baudrate\": 115200 }"
baudrate: 115200
- target: zbdonglee-230
device: EFR32MG21A020F768IM32
components: bootloader_interface
patchpath: "OpenThreadRCP/ZBDongleE-230"
metadata_extra: "{ \"ot_rcp_version\": \"SL-OPENTHREAD/2.2.2.0_GitHub-91fa1f455\", \"baudrate\": 230400 }"
patchpath: "OpenThreadRCP/ZBDongleE"
baudrate: 230400
- target: zbdonglee-460
device: EFR32MG21A020F768IM32
components: bootloader_interface
patchpath: "OpenThreadRCP/ZBDongleE-460"
metadata_extra: "{ \"ot_rcp_version\": \"SL-OPENTHREAD/2.2.2.0_GitHub-91fa1f455\", \"baudrate\": 460800 }"
patchpath: "OpenThreadRCP/ZBDongleE"
baudrate: 460800
- target: zbdonglee-none
device: EFR32MG21A020F768IM32
components: bootloader_interface
patchpath: "OpenThreadRCP/ZBDongleE-none"
metadata_extra: "{ \"ot_rcp_version\": \"SL-OPENTHREAD/2.2.2.0_GitHub-91fa1f455\", \"baudrate\": 115200 }"
baudrate: 115200
- target: zb-gw04-1v1
device: EFR32MG21A020F768IM32
components: bootloader_interface
patchpath: "OpenThreadRCP/ZB-GW04-1v1"
metadata_extra: "{ \"ot_rcp_version\": \"SL-OPENTHREAD/2.2.2.0_GitHub-91fa1f455\", \"baudrate\": 115200 }"
baudrate: 115200
- target: zb-gw04-1v2
device: EFR32MG21A020F768IM32
components: bootloader_interface
patchpath: "OpenThreadRCP/ZB-GW04-1v2"
metadata_extra: "{ \"ot_rcp_version\": \"SL-OPENTHREAD/2.2.2.0_GitHub-91fa1f455\", \"baudrate\": 115200 }"
baudrate: 115200
- target: zb-gw04-1v2-230
device: EFR32MG21A020F768IM32
components: bootloader_interface
patchpath: "OpenThreadRCP/ZB-GW04-1v2-230"
metadata_extra: "{ \"ot_rcp_version\": \"SL-OPENTHREAD/2.2.2.0_GitHub-91fa1f455\", \"baudrate\": 230400 }"
patchpath: "OpenThreadRCP/ZB-GW04-1v2"
baudrate: 230400
- target: zb-gw04-1v2-460
device: EFR32MG21A020F768IM32
components: bootloader_interface
patchpath: "OpenThreadRCP/ZB-GW04-1v2-460"
metadata_extra: "{ \"ot_rcp_version\": \"SL-OPENTHREAD/2.2.2.0_GitHub-91fa1f455\", \"baudrate\": 460800 }"
patchpath: "OpenThreadRCP/ZB-GW04-1v2"
baudrate: 460800
uses: ./.github/workflows/silabs-firmware-build.yaml
with:
firmware_name: ot-rcp-${{ matrix.target }}
Expand All @@ -235,5 +234,4 @@ jobs:
extra_c_defs: "'-DOPENTHREAD_CONFIG_NCP_REBOOT_BOOTLOADER_ENABLE=1'"
sdk_version: 4.2.2
metadata_fw_type: "ot-rcp"
metadata_extra: ${{ matrix.metadata_extra }}

metadata_extra: "{ \"ot_rcp_version\": \"SL-OPENTHREAD/2.2.2.0_GitHub-91fa1f455\" }"
20 changes: 15 additions & 5 deletions .github/workflows/silabs-firmware-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ on:
project_name:
required: true
type: string
baudrate:
required: true
type: number
device:
required: true
type: string
Expand Down Expand Up @@ -64,6 +67,13 @@ jobs:
--export-destination=${{ inputs.firmware_name }} \
--copy-proj-sources --copy-sdk-sources --new-project --force \
--configuration="${{ inputs.configuration }}"

- name: Set Baudrate
run: |
cd ${{ inputs.firmware_name }}
sed -Ei "s/^(\s*#define SL_\S+_VCOM_BAUDRATE\s+)[0-9]+/\\1${{ inputs.baudrate }}/" \
config/sl_*usart_vcom_config.h

- name: Patch Firmware
if: "${{ inputs.patchpath != '' }}"
run: |
Expand Down Expand Up @@ -93,13 +103,13 @@ jobs:
run: |
cd ${{ inputs.firmware_name }}
jq --null-input \
--arg sdk_version "${{ inputs.sdk_version }}" \
--argjson metadata_extra '${{ inputs.metadata_extra }}' \
'{
"metadata_version": 1,
"sdk_version": $sdk_version,
"fw_type": "${{ inputs.metadata_fw_type }}"
} + $metadata_extra' > version.json
"sdk_version": "${{ inputs.sdk_version }}",
"fw_type": "${{ inputs.metadata_fw_type }}",
"baudrate": ${{ inputs.baudrate }}
} + ${{ inputs.metadata_extra }}' > version.json

- name: Generate gbl Firmware
run: |
cd ${{ inputs.firmware_name }}
Expand Down
38 changes: 0 additions & 38 deletions EmberZNet/ZB-GW04-1v2-230/0001-config-configure-usart-vcom-B1B0-D3D4.patch
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions EmberZNet/ZB-GW04-1v2-230/0002-config-configure-usart-230400.patch
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions EmberZNet/ZB-GW04-1v2-230/0003-config-configure-hfxo-ctune-128.patch
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions EmberZNet/ZBDongleE-230/0001-config-configure-usart-vcom-B1B0-D3D4.patch
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions EmberZNet/ZBDongleE-230/0002-config-configure-usart-230400.patch
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions EmberZNet/ZBDongleE-230/0003-config-configure-hfxo-ctune-128.patch
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions OpenThreadRCP/SkyConnect/0001-config-configure-usart-vcom-for-SkyConnect.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,6 @@ diff --git a/config/sl_uartdrv_usart_vcom_config.h b/config/sl_uartdrv_usart_vco
index 8a2ab70..7292f1a 100644
--- a/config/sl_uartdrv_usart_vcom_config.h
+++ b/config/sl_uartdrv_usart_vcom_config.h
@@ -24,7 +24,7 @@
// <h> UART settings
// <o SL_UARTDRV_USART_VCOM_BAUDRATE> Baud rate
// <i> Default: 115200
-#define SL_UARTDRV_USART_VCOM_BAUDRATE 115200
+#define SL_UARTDRV_USART_VCOM_BAUDRATE 460800

// <o SL_UARTDRV_USART_VCOM_PARITY> Parity mode to use
// <usartNoParity=> No Parity
@@ -76,21 +76,24 @@
// <<< sl:start pin_tool >>>
// <usart signal=TX,RX,(CTS),(RTS)> SL_UARTDRV_USART_VCOM
Expand Down
Loading