v0.2.0 rc1 Release

.github/workflows/app-btl-build.yaml

@@ -58,7 +58,7 @@ jobs:
       metadata_extra: "{}"
       ota_string: ${{ inputs.app_ota_string }}
       sdk_extensions: |
-        "https://github.com/Adminiuga/Raz1_custom_components_extension#0.0.1"
+        "https://github.com/Adminiuga/Raz1_custom_components_extension"
 
 
   bootloader-build:
@@ -82,7 +82,7 @@ jobs:
               )
         }}
 
-      export_project_name: "app_btl"
+      export_project_name: "TBS2Torch_btl"
       device: ${{ inputs.device }}
       components: >
         ${{ inputs.board != '' && format('{0},', inputs.board) || '' }}
@@ -127,13 +127,13 @@ jobs:
       btl_project_name: ${{ needs.bootloader-build.outputs.project_name }}
 
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         name: Download App firmware
         with:
           name: ${{ env.app_artifact_name }}
           path: ${{ env.app_artifact_name }}
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         name: Download bootloader build
         with:
           name: ${{ env.btl_artifact_name }}
@@ -182,10 +182,11 @@ jobs:
             --tag-id 0x0000 \
             --tag-file "${{ env.app_project_name }}-btl.gbl"
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         name: Upload bootloader & bootloader OTA image artifact
         with:
           name: ${{ env.btl_project_name }}
+          overwrite: true
           path: |
             ${{ env.btl_project_name }}/version.json
             ${{ env.btl_project_name }}/*.gbl

.github/workflows/buld.yaml

@@ -31,7 +31,7 @@ env:
   sdk_version: ${{
       vars.sdk_version != ''
       && vars.sdk_version 
-      || '4.4.0' 
+      || '4.4.5' 
     }}
   gcc_version: ${{ vars.gcc_version != '' && vars.gcc_version || '12.3.rel1' }}
   zap_version: ${{ vars.zap_version != '' && vars.zap_version || 'v2024.12.13' }}
@@ -51,20 +51,20 @@ jobs:
         run: |
           echo "repository_owner=$(echo $GITHUB_REPOSITORY_OWNER | tr [:upper:] [:lower:])" >> $GITHUB_OUTPUT
 
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
 
       - name: Log in to the GitHub container registry
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v3
         with:
             registry: ghcr.io
             username: ${{ github.repository_owner }}
             password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.2.1
+        uses: docker/setup-buildx-action@v3
 
       - name: Build and Push
-        uses: docker/build-push-action@v3.3.0
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: Dockerfile
@@ -91,4 +91,4 @@ jobs:
       board: ${{ matrix.board }}
       build_btl:  ${{ github.event.inputs.build_btl != '' && inputs.build_btl || startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/tags/rc') || false }}
       image_name: ${{ needs.build-container.outputs.image_name }}
-      btl_version: ${{ vars.btl_version != '' && vars.btl_version || '4' }}
+      btl_version: ${{ vars.btl_version != '' && vars.btl_version || '6' }}

.github/workflows/silabs-project-builder.yaml

@@ -122,7 +122,7 @@ jobs:
       ota_version: ${{ steps.ota_version.outputs.ota_version }}
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
       - name: Adjust permission
         shell: bash
         run: chown -R builder .
@@ -218,10 +218,10 @@ jobs:
         if: "${{ inputs.sdkpatchpath != '' }}"
         run: |
           cd ${{ env.PROJECT_NAME }}/gecko_sdk_${{ inputs.sdk_version }}
-          for patch in "../../${{ inputs.sdkpatchpath }}"/*.patch
+          for patch in $(find "../../${{ inputs.sdkpatchpath }}" -maxdepth 0 -name *.patch)
           do
               echo "Applying ${patch}"
-              patch -p1 < $patch
+              test -r $patch && patch -p1 < $patch
           done
 
       - name: Update OTA version
@@ -319,7 +319,7 @@ jobs:
               --tag-id 0x0000 \
               --tag-file "${{ env.PROJECT_NAME}}.gbl"
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: (success() || failure()) && env.IS_BTL != 'yes'
         name: Upload application firmware
         with:
@@ -330,7 +330,7 @@ jobs:
             ${{ env.PROJECT_NAME }}/build/release/*.hex
             ${{ env.PROJECT_NAME }}/build/release/*.ota
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: (success() || failure()) && env.IS_BTL == 'yes'
         name: Upload bootloader firmware
         with:
@@ -339,7 +339,7 @@ jobs:
             ${{ env.PROJECT_NAME }}/artifact/version.json
             ${{ env.PROJECT_NAME }}/artifact/*.s37
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: (success() || failure()) && vars.ARTIFACT_UPLOAD_SOURCES != ''
         name: Upload generated project sources
         with:

.gitignore

@@ -13,10 +13,18 @@ vscode.conf
 */.projectlinkstore
 */*.Makefile
 */GNU ARM */
+*/build/
+*/*_cmake/
+*/config/*.h
+!*/config/app-global.h
 */.uceditor
 */autogen/*
 */.trash/
 */*.project.mak
+TBS2Torch/gecko_sdk_4.*
+!TBS2Torch/gecko_sdk_4.*/protocol/zigbee/app/framework/plugin/level-control/level-control.c
+TBS2Torch/raz1_custom_components_*/*
+
 
 */.pdm
 *.pdf

Dockerfile

@@ -1,83 +1,83 @@
-FROM debian:bookworm
-
-ARG DEBIAN_FRONTEND=noninteractive
-ARG GCC_ARM_VERSION="12.3.rel1"
-ARG ZAP_TOOL_RELEASE="v2024.12.13"
-ARG GECKO_SDK_VERSION="v4.4.5"
-
-ARG USERNAME=builder
-ARG USER_UID=1000
-ARG USER_GID=$USER_UID
-
-
-RUN \
-    apt-get update \
-    && apt-get install -y --no-install-recommends \
-       bzip2 \
-       curl \
-       git \
-       git-lfs \
-       jq \
-       libgl1 \
-       make \
-       default-jre-headless \
-       patch \
-       python3 \
-       unzip \
-       xz-utils \
-       less \
-    && apt-get clean
-
-WORKDIR /tmp
-# Install Simplicity Commander (unfortunately no stable URL available, this
-# is known to be working with Commander_linux_x86_64_1v15p0b1306.tar.bz).
-RUN \
-    curl -O https://www.silabs.com/documents/login/software/SimplicityCommander-Linux.zip \
-    && unzip -q SimplicityCommander-Linux.zip \
-    && tar -C /opt -xjf SimplicityCommander-Linux/Commander_linux_x86_64_*.tar.bz \
-    && rm -r SimplicityCommander-Linux \
-    && rm SimplicityCommander-Linux.zip
-
-# Install Silicon Labs Configurator (slc)
-RUN \
-    curl -O https://www.silabs.com/documents/login/software/slc_cli_linux.zip \
-    && unzip -d /opt -q slc_cli_linux.zip \
-    && chmod go-w /opt/slc_cli \
-    && rm slc_cli_linux.zip
-
-# Install ARM GCC embedded toolchain
-RUN \
-    curl -L -O https://developer.arm.com/-/media/Files/downloads/gnu/${GCC_ARM_VERSION}/binrel/arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi.tar.xz \
-    && xzcat arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi.tar.xz | tar -C /opt -xf -\
-    && rm arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi.tar.xz
-
-ENV PATH="$PATH:/opt/arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi/bin:/opt/slc_cli:/opt/commander"
-ENV ARM_GCC_DIR="/opt/arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi"
-
-# Install ZAP adapter
-RUN \
-    curl -OL https://github.com/project-chip/zap/releases/download/${ZAP_TOOL_RELEASE}/zap-linux-x64.zip \
-    && umask 022 \
-    && unzip -d /opt/zap -q zap-linux-x64.zip \
-    && rm zap-linux-x64.zip
-
-ENV STUDIO_ADAPTER_PACK_PATH="/opt/zap:/opt/commander"
-ENV POST_BUILD_EXE="/opt/commander/commander"
-
-RUN \
-    git clone --depth 1 -b ${GECKO_SDK_VERSION} https://github.com/SiliconLabs/gecko_sdk.git /gecko_sdk \
-    && rm -rf /gecko_sdk/.git \
-    && chmod 755 /gecko_sdk/protocol/zigbee/tool/image-builder/image-builder-linux
-
-# Create the user
-RUN groupadd --gid $USER_GID $USERNAME \
-    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME
-
-USER $USERNAME
-WORKDIR /build
-
-RUN \
-    slc configuration --sdk="/gecko_sdk/" \
-    && slc signature trust --sdk "/gecko_sdk/" \
-    && slc configuration \
-           --gcc-toolchain="/opt/arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi/"
+FROM debian:bookworm
+
+ARG DEBIAN_FRONTEND=noninteractive
+ARG GCC_ARM_VERSION="12.3.rel1"
+ARG ZAP_TOOL_RELEASE="v2024.12.13"
+ARG GECKO_SDK_VERSION="v4.4.5"
+
+ARG USERNAME=builder
+ARG USER_UID=1000
+ARG USER_GID=$USER_UID
+
+
+RUN \
+    apt-get update \
+    && apt-get install -y --no-install-recommends \
+       bzip2 \
+       curl \
+       git \
+       git-lfs \
+       jq \
+       libgl1 \
+       make \
+       default-jre-headless \
+       patch \
+       python3 \
+       unzip \
+       xz-utils \
+       less \
+    && apt-get clean
+
+WORKDIR /tmp
+# Install Simplicity Commander (unfortunately no stable URL available, this
+# is known to be working with Commander_linux_x86_64_1v15p0b1306.tar.bz).
+RUN \
+    curl -O https://www.silabs.com/documents/login/software/SimplicityCommander-Linux.zip \
+    && unzip -q SimplicityCommander-Linux.zip \
+    && tar -C /opt -xjf SimplicityCommander-Linux/Commander_linux_x86_64_*.tar.bz \
+    && rm -r SimplicityCommander-Linux \
+    && rm SimplicityCommander-Linux.zip
+
+# Install Silicon Labs Configurator (slc)
+RUN \
+    curl -O https://www.silabs.com/documents/login/software/slc_cli_linux.zip \
+    && unzip -d /opt -q slc_cli_linux.zip \
+    && chmod go-w /opt/slc_cli \
+    && rm slc_cli_linux.zip
+
+# Install ARM GCC embedded toolchain
+RUN \
+    curl -L -O https://developer.arm.com/-/media/Files/downloads/gnu/${GCC_ARM_VERSION}/binrel/arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi.tar.xz \
+    && xzcat arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi.tar.xz | tar -C /opt -xf -\
+    && rm arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi.tar.xz
+
+ENV PATH="$PATH:/opt/arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi/bin:/opt/slc_cli:/opt/commander"
+ENV ARM_GCC_DIR="/opt/arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi"
+
+# Install ZAP adapter
+RUN \
+    curl -OL https://github.com/project-chip/zap/releases/download/${ZAP_TOOL_RELEASE}/zap-linux-x64.zip \
+    && umask 022 \
+    && unzip -d /opt/zap -q zap-linux-x64.zip \
+    && rm zap-linux-x64.zip
+
+ENV STUDIO_ADAPTER_PACK_PATH="/opt/zap:/opt/commander"
+ENV POST_BUILD_EXE="/opt/commander/commander"
+
+RUN \
+    git clone --depth 1 -b ${GECKO_SDK_VERSION} https://github.com/SiliconLabs/gecko_sdk.git /gecko_sdk \
+    && rm -rf /gecko_sdk/.git \
+    && chmod 755 /gecko_sdk/protocol/zigbee/tool/image-builder/image-builder-linux
+
+# Create the user
+RUN groupadd --gid $USER_GID $USERNAME \
+    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME
+
+USER $USERNAME
+WORKDIR /build
+
+RUN \
+    slc configuration --sdk="/gecko_sdk/" \
+    && slc signature trust --sdk "/gecko_sdk/" \
+    && slc configuration \
+           --gcc-toolchain="/opt/arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi/"