From 204352cdfcda4f617a2777ce46b75cba70ff4b5c Mon Sep 17 00:00:00 2001 From: puddly <32534428+puddly@users.noreply.github.com> Date: Wed, 25 Sep 2024 16:40:38 -0400 Subject: [PATCH] Fix existing manifests for Zigbee, Thread, and bootloader firmwares --- .../nabucasa/skyconnect_rcp-uart-802154.yaml | 32 ---------------- ...art-xmodem.yaml => yellow_bootloader.yaml} | 4 +- ...ot-rcp.yaml => yellow_openthread_rcp.yaml} | 7 +++- .../nabucasa/yellow_rcp-uart-802154.yaml | 37 ------------------- ...cp-uart-hw.yaml => yellow_zigbee_ncp.yaml} | 16 +++++++- 5 files changed, 24 insertions(+), 72 deletions(-) delete mode 100644 manifests/nabucasa/skyconnect_rcp-uart-802154.yaml rename manifests/nabucasa/{yellow_bootloader-uart-xmodem.yaml => yellow_bootloader.yaml} (89%) rename manifests/nabucasa/{yellow_ot-rcp.yaml => yellow_openthread_rcp.yaml} (86%) delete mode 100644 manifests/nabucasa/yellow_rcp-uart-802154.yaml rename manifests/nabucasa/{yellow_ncp-uart-hw.yaml => yellow_zigbee_ncp.yaml} (70%) diff --git a/manifests/nabucasa/skyconnect_rcp-uart-802154.yaml b/manifests/nabucasa/skyconnect_rcp-uart-802154.yaml deleted file mode 100644 index ea263f97..00000000 --- a/manifests/nabucasa/skyconnect_rcp-uart-802154.yaml +++ /dev/null @@ -1,32 +0,0 @@ -name: SkyConnect Multi-PAN -device: EFR32MG21A020F512IM32 -base_project: src/rcp-uart-802154 -filename: "{manifest_name}_gsdk_{sdk_version}" - -gbl: - fw_type: rcp-uart-802154 - dynamic: ["ezsp_version", "ot_rcp_version", "cpc_version"] - baudrate: 460800 - -configuration: - SL_CPC_DRV_UART_VCOM_BAUDRATE: 460800 - -c_defines: - CPC_SECONDARY_APP_VERSION_SUFFIX: 'template:"-{git_repo_hash}"' - - SL_CPC_DRV_UART_VCOM_PERIPHERAL: USART0 - SL_CPC_DRV_UART_VCOM_PERIPHERAL_NO: 0 - - SL_CPC_DRV_UART_VCOM_TX_PORT: gpioPortA - SL_CPC_DRV_UART_VCOM_TX_PIN: 6 - - SL_CPC_DRV_UART_VCOM_RX_PORT: gpioPortA - SL_CPC_DRV_UART_VCOM_RX_PIN: 5 - - SL_CPC_DRV_UART_VCOM_CTS_PORT: gpioPortB - SL_CPC_DRV_UART_VCOM_CTS_PIN: 1 - - SL_CPC_DRV_UART_VCOM_RTS_PORT: gpioPortB - SL_CPC_DRV_UART_VCOM_RTS_PIN: 0 - - SL_APPLICATION_PRODUCT_ID: '{0xE9, 0x92, 0x67, 0x94, 0xBB, 0x2C, 0x4E, 0xC8, 0x9F, 0x36, 0xD9, 0xC6, 0x79, 0x4A, 0x81, 0xFB}' diff --git a/manifests/nabucasa/yellow_bootloader-uart-xmodem.yaml b/manifests/nabucasa/yellow_bootloader.yaml similarity index 89% rename from manifests/nabucasa/yellow_bootloader-uart-xmodem.yaml rename to manifests/nabucasa/yellow_bootloader.yaml index 9b263385..cbf180dd 100644 --- a/manifests/nabucasa/yellow_bootloader-uart-xmodem.yaml +++ b/manifests/nabucasa/yellow_bootloader.yaml @@ -1,7 +1,9 @@ name: Yellow Bootloader device: MGM210PA32JIA -base_project: src/bootloader-uart-xmodem +base_project: src/bootloader filename: "{manifest_name}_{gecko_bootloader_version}" +sdk: "gecko_sdk:4.4.4" +toolchain: "12.2.1.20221205" gbl: fw_type: gecko-bootloader diff --git a/manifests/nabucasa/yellow_ot-rcp.yaml b/manifests/nabucasa/yellow_openthread_rcp.yaml similarity index 86% rename from manifests/nabucasa/yellow_ot-rcp.yaml rename to manifests/nabucasa/yellow_openthread_rcp.yaml index d795c46c..36fd2134 100644 --- a/manifests/nabucasa/yellow_ot-rcp.yaml +++ b/manifests/nabucasa/yellow_openthread_rcp.yaml @@ -1,7 +1,9 @@ name: Yellow OpenThread RCP device: MGM210PA32JIA -base_project: src/ot-rcp +base_project: src/openthread_rcp filename: "{manifest_name}_{ot_rcp_version.split('/')[-1]}_gsdk_{sdk_version}" +sdk: "gecko_sdk:4.4.4" +toolchain: "12.2.1.20221205" gbl: fw_type: ot-rcp @@ -15,6 +17,9 @@ add_components: configuration: SL_UARTDRV_USART_VCOM_BAUDRATE: 460800 +slcp_defines: + OPENTHREAD_CONFIG_DEFAULT_TRANSMIT_POWER: 6 + c_defines: SL_UARTDRV_USART_VCOM_PERIPHERAL: USART0 SL_UARTDRV_USART_VCOM_PERIPHERAL_NO: 0 diff --git a/manifests/nabucasa/yellow_rcp-uart-802154.yaml b/manifests/nabucasa/yellow_rcp-uart-802154.yaml deleted file mode 100644 index cc8fb465..00000000 --- a/manifests/nabucasa/yellow_rcp-uart-802154.yaml +++ /dev/null @@ -1,37 +0,0 @@ -name: Yellow Multi-PAN -device: MGM210PA32JIA -base_project: src/rcp-uart-802154 - -gbl: - fw_type: rcp-uart-802154 - dynamic: ["ezsp_version", "ot_rcp_version", "cpc_version"] - baudrate: 460800 - -add_components: -- id: simple_led - instance: [board_activity] - -configuration: - SL_CPC_DRV_UART_VCOM_BAUDRATE: 460800 - -c_defines: - CPC_SECONDARY_APP_VERSION_SUFFIX: 'template:"-{git_repo_hash}"' - - SL_CPC_DRV_UART_VCOM_PERIPHERAL: USART0 - SL_CPC_DRV_UART_VCOM_PERIPHERAL_NO: 0 - - SL_CPC_DRV_UART_VCOM_TX_PORT: gpioPortA - SL_CPC_DRV_UART_VCOM_TX_PIN: 5 - - SL_CPC_DRV_UART_VCOM_RX_PORT: gpioPortA - SL_CPC_DRV_UART_VCOM_RX_PIN: 6 - - SL_CPC_DRV_UART_VCOM_CTS_PORT: gpioPortD - SL_CPC_DRV_UART_VCOM_CTS_PIN: 2 - - SL_CPC_DRV_UART_VCOM_RTS_PORT: gpioPortC - SL_CPC_DRV_UART_VCOM_RTS_PIN: 1 - - SL_SIMPLE_LED_BOARD_ACTIVITY_POLARITY: SL_SIMPLE_LED_POLARITY_ACTIVE_LOW - SL_SIMPLE_LED_BOARD_ACTIVITY_PORT: gpioPortB - SL_SIMPLE_LED_BOARD_ACTIVITY_PIN: 1 diff --git a/manifests/nabucasa/yellow_ncp-uart-hw.yaml b/manifests/nabucasa/yellow_zigbee_ncp.yaml similarity index 70% rename from manifests/nabucasa/yellow_ncp-uart-hw.yaml rename to manifests/nabucasa/yellow_zigbee_ncp.yaml index 118a5fb2..3ca0b0b0 100644 --- a/manifests/nabucasa/yellow_ncp-uart-hw.yaml +++ b/manifests/nabucasa/yellow_zigbee_ncp.yaml @@ -1,7 +1,9 @@ name: Yellow Zigbee device: MGM210PA32JIA -base_project: src/ncp-uart-hw +base_project: src/zigbee_ncp filename: "{manifest_name}_{ezsp_version}" +sdk: "gecko_sdk:4.4.4" +toolchain: "12.2.1.20221205" gbl: fw_type: ncp-uart-hw @@ -16,7 +18,19 @@ configuration: SL_IOSTREAM_USART_VCOM_BAUDRATE: 115200 SL_IOSTREAM_USART_VCOM_FLOW_CONTROL_TYPE: usartHwFlowControlCtsAndRts + SL_CLI_MAX_INPUT_ARGUMENTS: 16 + EMBER_AF_PLUGIN_ZIGBEE_PRO_STACK_CHILD_TABLE_SIZE: 32 + c_defines: + EMBER_BINDING_TABLE_SIZE: 32 + EMBER_MAX_END_DEVICE_CHILDREN: 32 + EMBER_PACKET_BUFFER_COUNT: 255 + EMBER_KEY_TABLE_SIZE: 12 + + EMBER_APS_UNICAST_MESSAGE_COUNT: 32 + EMBER_BROADCAST_TABLE_SIZE: 64 + EMBER_SOURCE_ROUTE_TABLE_SIZE: 200 + SL_IOSTREAM_USART_VCOM_PERIPHERAL: USART0 SL_IOSTREAM_USART_VCOM_PERIPHERAL_NO: 0