Update deps

.devcontainer/Dockerfile

@@ -1,45 +1,9 @@
-FROM espressif/idf:v5.1.4
-
-ARG DEBIAN_FRONTEND=nointeractive
-ARG CONTAINER_USER=esp
-ARG USER_UID=1000
-ARG USER_GID=$USER_UID
-
-RUN apt-get update \
-  && apt install -y -q \
-  cmake \
-  git \
-  hwdata \
-  libglib2.0-0 \
-  libnuma1 \
-  libpixman-1-0 \
-  linux-tools-virtual \
-  && rm -rf /var/lib/apt/lists/*
-
-RUN update-alternatives --install /usr/local/bin/usbip usbip `ls /usr/lib/linux-tools/*/usbip | tail -n1` 20
-
-# QEMU
-ENV QEMU_REL=esp-develop-20220919
-ENV QEMU_SHA256=f6565d3f0d1e463a63a7f81aec94cce62df662bd42fc7606de4b4418ed55f870
-ENV QEMU_DIST=qemu-${QEMU_REL}.tar.bz2
-ENV QEMU_URL=https://github.com/espressif/qemu/releases/download/${QEMU_REL}/${QEMU_DIST}
+FROM espressif/idf:v5.4
 
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 
-RUN wget --no-verbose ${QEMU_URL} \
-  && echo "${QEMU_SHA256} *${QEMU_DIST}" | sha256sum --check --strict - \
-  && tar -xf $QEMU_DIST -C /opt \
-  && rm ${QEMU_DIST}
-
-ENV PATH=/opt/qemu/bin:${PATH}
-
-RUN groupadd --gid $USER_GID $CONTAINER_USER \
-    && adduser --uid $USER_UID --gid $USER_GID --disabled-password --gecos "" ${CONTAINER_USER} \
-    && usermod -a -G dialout $CONTAINER_USER
-USER ${CONTAINER_USER}
-ENV USER=${CONTAINER_USER}
-WORKDIR /home/${CONTAINER_USER}
+RUN apt-get update -y && apt-get install udev -y
 
 RUN echo "source /opt/esp/idf/export.sh > /dev/null 2>&1" >> ~/.bashrc
 

.devcontainer/devcontainer.json

@@ -1,44 +1,22 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.183.0/containers/ubuntu
 {
 	"name": "ESP-IDF QEMU",
 	"build": {
 		"dockerfile": "Dockerfile"
 	},
-	// Add the IDs of extensions you want installed when the container is created
-	"workspaceMount": "source=${localWorkspaceFolder},target=${localWorkspaceFolder},type=bind",
-	"workspaceFolder": "${localWorkspaceFolder}",
-	"mounts": [
-		"source=extensionCache,target=/root/.vscode-server/extensions,type=volume"
-	],
 	"customizations": {
 		"vscode": {
 			"settings": {
 				"terminal.integrated.defaultProfile.linux": "bash",
 				"idf.espIdfPath": "/opt/esp/idf",
-				"idf.customExtraPaths": "",
-				"idf.pythonBinPath": "/opt/esp/python_env/idf5.1_py3.8_env/bin/python",
 				"idf.toolsPath": "/opt/esp",
 				"idf.gitPath": "/usr/bin/git"
 			},
 			"extensions": [
-				"ms-vscode.cpptools",
-				"espressif.esp-idf-extension"
-			],
-		},
-		"codespaces": {
-			"settings": {
-				"terminal.integrated.defaultProfile.linux": "bash",
-				"idf.espIdfPath": "/opt/esp/idf",
-				"idf.customExtraPaths": "",
-				"idf.pythonBinPath": "/opt/esp/python_env/idf5.1_py3.8_env/bin/python",
-				"idf.toolsPath": "/opt/esp",
-				"idf.gitPath": "/usr/bin/git"
-			},
-			"extensions": [
-				"ms-vscode.cpptools",
-				"espressif.esp-idf-extension"
-			],
+				"espressif.esp-idf-extension",
+				"espressif.esp-idf-web",
+				"ms-azuretools.vscode-docker",
+				"github.vscode-github-actions"
+			]
 		}
 	},
 	"runArgs": ["--privileged"]

.github/workflows/build.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout repo
@@ -19,6 +19,6 @@ jobs:
     - name: esp-idf build
       uses: espressif/esp-idf-ci-action@v1
       with:
-        esp_idf_version: v5.1.4
+        esp_idf_version: v5.4
         target: esp32c6
         path: '.'

dependencies.lock

@@ -1,21 +1,32 @@
 dependencies:
   espressif/esp-zboss-lib:
     component_hash: c7020f631cd4ad25e159ddb812bdc80906b5b424457abc81c9b8b0e92687837a
+    dependencies:
+    - name: idf
+      require: private
+      version: '>=5.0'
     source:
-      service_url: https://api.components.espressif.com/
+      registry_url: https://components.espressif.com/
       type: service
     version: 1.3.2
   espressif/esp-zigbee-lib:
     component_hash: 752dbc8abb2befd2d49ee902051699fac5e32c6962950d64cd888d75d6566ca0
+    dependencies:
+    - name: idf
+      require: private
+      version: '>=5.0'
     source:
-      service_url: https://api.components.espressif.com/
+      registry_url: https://components.espressif.com/
       type: service
     version: 1.3.2
   idf:
-    component_hash: null
     source:
       type: idf
-    version: 5.1.4
-manifest_hash: f19e63212b554f898eb42d9f18eec4b03062b03a69db1f2b4cedd47fae355e7d
+    version: 5.4.0
+direct_dependencies:
+- espressif/esp-zboss-lib
+- espressif/esp-zigbee-lib
+- idf
+manifest_hash: 1ea202065e775cc410743e4f4c9e4a42098f8c3e15b201cf2bcfd9850f97b11c
 target: esp32c6
-version: 1.0.0
+version: 2.0.0

partitions.csv

@@ -2,6 +2,6 @@
 # Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap
 nvs,        data, nvs,      0x9000,  0x6000,
 phy_init,   data, phy,      0xf000,  0x1000,
-factory,    app,  factory,  0x10000, 650K,
-zb_storage, data, fat,      0xb3000, 16K,
-zb_fct,     data, fat,      0xb7000, 1K,
+factory,    app,  factory,  0x10000, 900K,
+zb_storage, data, fat,      0xf1000, 16K,
+zb_fct,     data, fat,      0xf5000, 1K,