From 377a10b2735133605a931ddd40c88f488d195683 Mon Sep 17 00:00:00 2001 From: Ivan Belokobylskiy Date: Fri, 27 Sep 2024 13:46:24 +0300 Subject: [PATCH] sdk: upgrade to SDL v3.7.1.0 --- .github/workflows/build.yml | 9 ++++++--- README.md | 4 ++-- src/CMakeLists.txt | 12 +++++++++++- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e34c53..9581c13 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,8 @@ name: Build z03mmc firmware on: + repository_dispatch: + workflow_dispatch: push: # branches: [ "master" ] pull_request: @@ -10,7 +12,8 @@ env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) BUILD_TYPE: Release TOOLCHAIN_DIR: ${{github.workspace}}/tc32 - SDK_DIR: ${{github.workspace}}/tl_zigbee_sdk + SDK_DIR: ${{github.workspace}}/telink_zigbee_sdk + SDK_PREFIX: ${{github.workspace}}/telink_zigbee_sdk/tl_zigbee_sdk ARTIFACT_DIR: ${{github.workspace}}/build/src/ jobs: @@ -24,12 +27,12 @@ jobs: run: git clone https://github.com/devbis/tc32.git -b linux --depth 1 ${{ env.TOOLCHAIN_DIR }} - name: Get SDK - run: git clone https://github.com/devbis/tl_zigbee_sdk.git -b 3.6.8.7 --depth 1 ${{ env.SDK_DIR }} + run: git clone https://github.com/telink-semi/telink_zigbee_sdk.git -b V3.7.1.0 --depth 1 ${{ env.SDK_DIR }} - name: Build LYWSD03MMC id: lywsd03mmc run: | - cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DSDK_PREFIX=${{env.SDK_DIR}} -DTOOLCHAIN_PREFIX=${{env.TOOLCHAIN_DIR}} + cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DSDK_PREFIX=${{env.SDK_PREFIX}} -DTOOLCHAIN_PREFIX=${{env.TOOLCHAIN_DIR}} cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target=z03mmc.zigbee echo "status=success" >> $GITHUB_OUTPUT diff --git a/README.md b/README.md index 81608bb..4375385 100644 --- a/README.md +++ b/README.md @@ -136,14 +136,14 @@ Or write 1 to 0x0204/0x0000 (Thermostat User Interface Configuration/Temperature ```sh git clone https://github.com/devbis/z03mmc.git - git clone https://github.com/devbis/tl_zigbee_sdk.git -b 3.6.8.6 --depth 1 + git clone https://github.com/telink-semi/telink_zigbee_sdk.git -b V3.7.1.0 --depth 1 cd z03mmc ``` 3. Configure and build: ```sh - cmake -B build -DSDK_PREFIX=$(pwd)/../tl_zigbee_sdk -DTOOLCHAIN_PREFIX=$(pwd)/../tc32 -DMANUFACTURER_CODE=0x1141 + cmake -B build -DSDK_PREFIX=$(pwd)/../telink_zigbee_sdk/tl_zigbee_sdk -DTOOLCHAIN_PREFIX=$(pwd)/../tc32 -DMANUFACTURER_CODE=0x1141 cmake --build build --target z03mmc.zigbee ``` diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1f93435..3e41ed2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -25,8 +25,16 @@ SET(ZIGBEE_SRC ${SDK_PREFIX}/platform/tc32/div_mod.S ${SDK_PREFIX}/platform/chip_${TELINK_PLATFORM}/flash.c ${SDK_PREFIX}/platform/chip_${TELINK_PLATFORM}/adc.c + ${SDK_PREFIX}/platform/chip_${TELINK_PLATFORM}/flash/flash_common.c + ${SDK_PREFIX}/platform/chip_${TELINK_PLATFORM}/flash/flash_mid011460c8.c + ${SDK_PREFIX}/platform/chip_${TELINK_PLATFORM}/flash/flash_mid1060c8.c ${SDK_PREFIX}/platform/chip_${TELINK_PLATFORM}/flash/flash_mid13325e.c - + ${SDK_PREFIX}/platform/chip_${TELINK_PLATFORM}/flash/flash_mid134051.c + ${SDK_PREFIX}/platform/chip_${TELINK_PLATFORM}/flash/flash_mid136085.c + ${SDK_PREFIX}/platform/chip_${TELINK_PLATFORM}/flash/flash_mid1360c8.c + ${SDK_PREFIX}/platform/chip_${TELINK_PLATFORM}/flash/flash_mid1360eb.c + ${SDK_PREFIX}/platform/chip_${TELINK_PLATFORM}/flash/flash_mid14325e.c + ${SDK_PREFIX}/platform/chip_${TELINK_PLATFORM}/flash/flash_mid1460c8.c ${SDK_PREFIX}/zigbee/bdb/bdb.c ${SDK_PREFIX}/zigbee/aps/aps_group.c ${SDK_PREFIX}/zigbee/mac/mac_phy.c @@ -139,6 +147,7 @@ SET(ZIGBEE_SRC ${SDK_PREFIX}/proj/drivers/drv_pm.c ${SDK_PREFIX}/proj/drivers/drv_putchar.c ${SDK_PREFIX}/proj/drivers/drv_pwm.c + ${SDK_PREFIX}/proj/drivers/drv_security.c ${SDK_PREFIX}/proj/drivers/drv_spi.c ${SDK_PREFIX}/proj/drivers/drv_timer.c ${SDK_PREFIX}/proj/drivers/drv_uart.c @@ -146,6 +155,7 @@ SET(ZIGBEE_SRC ${SDK_PREFIX}/proj/os/ev_buffer.c ${SDK_PREFIX}/proj/os/ev_poll.c ${SDK_PREFIX}/proj/os/ev_queue.c + ${SDK_PREFIX}/proj/os/ev_rtc.c ${SDK_PREFIX}/proj/os/ev_timer.c )