manifest: Update to ncs-3.2.0

Update to ncs-3.2.0.

Signed-off-by: Jorgen Kvalvaag <jorgen.kvalvaag@nordicsemi.no>

Author: jorgenmk

.github/workflows/build.yml

@@ -316,16 +316,16 @@ jobs:
         if: ${{ inputs.build_bl_update }}
         working-directory: thingy91x-oob
         run: |
-          west twister -T . --test app/app.build.bootloader_update -v -p thingy91x/nrf9151/ns --inline-logs
-          cp twister-out/thingy91x_nrf9151_ns/zephyr/app/app.build.bootloader_update/dfu_mcuboot.zip \
-            hello.nrfcloud.com-${{ env.VERSION }}-thingy91x-nrf91-bootloader.zip
+          west twister -T app --test app.build.bootloader_update -v -p thingy91x/nrf9151/ns --inline-logs
+          MCUBOOT_ZIP=$(find twister-out -name dfu_mcuboot.zip)
+          cp $MCUBOOT_ZIP hello.nrfcloud.com-${{ env.VERSION }}-thingy91x-nrf91-bootloader.zip
           rm -rf twister-out
           west build -b thingy91x/nrf5340/cpuapp -p --sysbuild \
               -d ../nrf/applications/connectivity_bridge/build-bl-update \
               ../nrf/applications/connectivity_bridge -- \
               -Dmcuboot_CONFIG_FW_INFO_FIRMWARE_VERSION=4
-          cp ../nrf/applications/connectivity_bridge/build-bl-update/dfu_mcuboot.zip \
-            connectivity-bridge-${{ env.VERSION }}-thingy91x-nrf53-bootloader.zip
+          MCUBOOT_ZIP=$(find ../nrf/applications/connectivity_bridge/build-bl-update -name dfu_mcuboot.zip)
+          cp $MCUBOOT_ZIP connectivity-bridge-${{ env.VERSION }}-thingy91x-nrf53-bootloader.zip
 
       - name: Upload artifact
         if: ${{ inputs.build_bl_update }}

.github/workflows/compliance.yml

@@ -10,7 +10,10 @@ jobs:
   compliance_job:
     runs-on: ubuntu-24.04
     name: Run compliance checks on patch series (PR)
-    container: ghcr.io/zephyrproject-rtos/ci:v0.27.4
+    container: ghcr.io/nrfconnect/sdk-nrf-toolchain:v3.2.0
+    defaults:
+      run:
+        shell: bash
 
     # Skip job if it was triggered by Renovate Bot
     if: ${{ !contains(github.actor, 'renovate') }}
@@ -26,6 +29,8 @@ jobs:
     - name: Initialize
       working-directory: thingy91x-oob
       run: |
+        apt update
+        apt install -y libmagic-dev
         west init -l .
         west config manifest.group-filter +bsec
         west config build.sysbuild True
@@ -40,6 +45,11 @@ jobs:
         BASE_REF: ${{ github.base_ref }}
       working-directory: thingy91x-oob
       run: |
+        # WARNING: Ugly workaround
+        # git in toolchain doesn't work with check_compliance.py - missing USE_LIBPCRE
+
+        GIT_EXE=$(which git)
+        cp /usr/bin/git $GIT_EXE
         export ZEPHYR_BASE="../zephyr"
         $ZEPHYR_BASE/scripts/ci/check_compliance.py -m Codeowners -m Devicetree -m Gitlint -m Identity -m Nits -m pylint -m checkpatch -m KconfigBasic -c origin/${BASE_REF}..
 

.github/workflows/sonarcloud.yml

@@ -17,7 +17,7 @@ on:
 jobs:
   build:
     name: Build and analyze
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     container: ghcr.io/zephyrproject-rtos/ci:v0.27.4
     env:
       BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
@@ -39,63 +39,79 @@ jobs:
       - name: Initialize
         working-directory: thingy91x-oob
         run: |
+          if [ ! -d "../.west" ]; then
             west init -l .
-            west config manifest.group-filter +bsec
-            west config build.sysbuild True
-            west update -o=--depth=1 -n
-            west blobs fetch hal_nordic
+          else
+            echo ".west folder already exists, skipping west init."
+          fi
+          west update -o=--depth=1 -n
+          west blobs fetch hal_nordic
 
       - name: Install dependencies
         run: |
-            pip install -r nrf/scripts/requirements-build.txt
-            apt-get update
-            apt install -y curl ruby-full
+          # The Matter IDL is part of requirements-build.txt, but it's not available
+          # in pypi so we need to install it from the source code
+          MATTER_IDL_PATH=modules/lib/matter/scripts/py_matter_idl
+          if [ -d $MATTER_IDL_PATH ]; then
+            pip install -e $MATTER_IDL_PATH
+          fi
+          pip install -r nrf/scripts/requirements-fixed.txt
+          apt-get update
+          apt install -y curl ruby-full
 
-      - name: Install sonar-scanner and build-wrapper
-        uses: SonarSource/sonarcloud-github-c-cpp@v3
+      - name: Install Build Wrapper
+        uses: SonarSource/sonarqube-scan-action/install-build-wrapper@v6.0.0
 
       - name: Build and test
         working-directory: thingy91x-oob
         run: |
-          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} west twister -T . -C --coverage-platform=native_sim -v --inline-logs --integration
+          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} \
+              west twister -T tests/ \
+              --enable-coverage \
+              --coverage-platform=native_sim \
+              -v \
+              --inline-logs \
+              --integration
 
       - name: Extract coverage into sonarqube xml format
         working-directory: thingy91x-oob
         run: |
           gcovr twister-out -v --merge-mode-functions=separate --exclude='twister-out|drivers' --sonarqube coverage.xml
 
-      - name: Run sonar-scanner on main
-        working-directory: thingy91x-oob
+      - name: SonarQube Scan on main
         if: github.event_name != 'pull_request'
+        uses: SonarSource/sonarqube-scan-action@v6.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: |
-          sonar-scanner \
-            --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}" \
-            --define project.settings=sonar-project.properties \
-            --define sonar.coverageReportPaths=coverage.xml \
-            --define sonar.inclusions=**/*.c,**/*.h \
+        with:
+          args: |
+            --define sonar.cfamily.build-wrapper-output=thingy91x-oob/${{ env.BUILD_WRAPPER_OUT_DIR }}
+            --define sonar.projectKey=hello-nrfcloud_firmware
+            --define sonar.organization=hello-nrfcloud-com-firmware
+            --define sonar.host.url=https://sonarcloud.io
+            --define sonar.coverageReportPaths=coverage.xml
+            --define sonar.inclusions=**/*.c,**/*.h
             --define sonar.exclusions=tests/,drivers/sensor/*_dummy/
+          projectBaseDir: thingy91x-oob
 
-      - name: Run sonar-scanner on PR
-        working-directory: thingy91x-oob
+      - name: SonarQube Scan on PR
         if: github.event_name == 'pull_request'
+        uses: SonarSource/sonarqube-scan-action@v6.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-          PR_BRANCH: ${{ github.event.pull_request.head.ref }}
-          BASE_REF: ${{ github.event.pull_request.base.ref }}
-          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
-        run: |
-          sonar-scanner \
-            --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}" \
-            --define project.settings=sonar-project.properties \
-            --define sonar.coverageReportPaths=coverage.xml \
-            --define sonar.inclusions=**/*.c,**/*.h \
-            --define sonar.exclusions=tests/,drivers/sensor/*_dummy/ \
-            --define sonar.scm.revision=${{ env.HEAD_SHA }} \
-            --define sonar.pullrequest.key=${{ env.PR_NUMBER }} \
-            --define sonar.pullrequest.branch=${{ env.PR_BRANCH }} \
-            --define sonar.pullrequest.base=${{ env.BASE_REF }}
+        with:
+          args: |
+            --define sonar.cfamily.build-wrapper-output=thingy91x-oob/${{ env.BUILD_WRAPPER_OUT_DIR }}
+            --define sonar.projectKey=hello-nrfcloud_firmware
+            --define sonar.organization=hello-nrfcloud-com-firmware
+            --define sonar.host.url=https://sonarcloud.io
+            --define sonar.coverageReportPaths=coverage.xml
+            --define sonar.inclusions=**/*.c,**/*.h
+            --define sonar.exclusions=tests/,drivers/sensor/*_dummy/
+            --define sonar.scm.revision=${{ github.event.pull_request.head.sha }}
+            --define sonar.pullrequest.key=${{ github.event.pull_request.number }}
+            --define sonar.pullrequest.branch=${{ github.event.pull_request.head.ref }}
+            --define sonar.pullrequest.base=${{ github.event.pull_request.base.ref }}
+          projectBaseDir: thingy91x-oob

app/CMakeLists.txt

@@ -30,6 +30,7 @@ add_subdirectory_ifdef(CONFIG_APP_SHELL src/modules/shell)
 
 # Include Memfault configuration folder
 zephyr_include_directories(config)
+zephyr_include_directories(src/common)
 
 if (CONFIG_NRF_CLOUD_COAP_SEC_TAG GREATER_EQUAL 2147483648 AND CONFIG_NRF_CLOUD_COAP_SEC_TAG LESS_EQUAL 2147483667)
 	message(WARNING "CONFIG_NRF_CLOUD_COAP_SEC_TAG is set to a developer security tag. "

app/overlay-memfault.conf

@@ -14,6 +14,7 @@ CONFIG_MEMFAULT_NCS_LOCATION_METRICS=y
 CONFIG_MEMFAULT_HTTP_DEDICATED_WORKQUEUE_STACK_SIZE=1560
 CONFIG_MEMFAULT_COREDUMP_FULL_THREAD_STACKS=y
 CONFIG_MEMFAULT_EVENT_STORAGE_SIZE=2048
+CONFIG_MEMFAULT_NRF_PLATFORM_BATTERY_NPM13XX=y
 
 # Memfault depends on POSIX, disable unneeded POSIX features
 CONFIG_POSIX_FILE_SYSTEM=n

app/src/modules/battery/lp803448_model.h app/src/common/lp803448_model.happ/src/modules/battery/lp803448_model.h renamed to app/src/common/lp803448_model.h

@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+ #ifndef __MEMFAULT_NRF_PLATFORM_BATTERY_MODEL_H__
+ #define __MEMFAULT_NRF_PLATFORM_BATTERY_MODEL_H__
+
+ #include "lp803448_model.h"
+
+ #endif /* __MEMFAULT_NRF_PLATFORM_BATTERY_MODEL_H__ */

app/src/common/memfault_nrf_platform_battery_model.h

@@ -8,6 +8,7 @@ menu "Sampler"
 
 config APP_BATTERY_THREAD_STACK_SIZE
 	int "Thread stack size"
+	default 2048 if MEMFAULT_NRF_PLATFORM_BATTERY_NPM13XX
 	default 1536
 
 config APP_BATTERY_WATCHDOG_TIMEOUT_SECONDS

app/src/modules/battery/Kconfig.battery

@@ -86,8 +86,8 @@ struct s_object {
 
 /* Forward declarations of state handlers */
 static void state_init_entry(void *o);
-static void state_init_run(void *o);
-static void state_sampling_run(void *o);
+static enum smf_state_result state_init_run(void *o);
+static enum smf_state_result state_sampling_run(void *o);
 
 static struct s_object s_obj;
 static const struct smf_state states[] = {
@@ -143,7 +143,7 @@ static void state_init_entry(void *o)
 	}
 }
 
-static void state_init_run(void *o)
+static enum smf_state_result state_init_run(void *o)
 {
 	struct s_object *state_object = o;
 
@@ -154,11 +154,14 @@ static void state_init_run(void *o)
 			LOG_DBG("Time available, sampling can start");
 
 			STATE_SET(STATE_SAMPLING);
+			return SMF_EVENT_HANDLED;
 		}
 	}
+
+	return SMF_EVENT_PROPAGATE;
 }
 
-static void state_sampling_run(void *o)
+static enum smf_state_result state_sampling_run(void *o)
 {
 	struct s_object *state_object = o;
 
@@ -170,6 +173,8 @@ static void state_sampling_run(void *o)
 			sample(&state_object->fuel_gauge_ref_time);
 		}
 	}
+
+	return SMF_EVENT_PROPAGATE;
 }
 
 /* End of state handling */
@@ -200,6 +205,10 @@ static int charger_read_sensors(float *voltage, float *current, float *temp, int
 	return 0;
 }
 
+#if defined(CONFIG_MEMFAULT_NRF_PLATFORM_BATTERY_NPM13XX)
+#include "memfault/metrics/platform/battery.h"
+#endif /* CONFIG_MEMFAULT_NRF_PLATFORM_BATTERY_NPM13XX */
+
 static void sample(int64_t *ref_time)
 {
 	int err;
@@ -213,6 +222,9 @@ static void sample(int64_t *ref_time)
 	struct bat_object bat_object = { 0 };
 	struct payload payload = { 0 };
 	int64_t system_time;
+#if defined(CONFIG_MEMFAULT_NRF_PLATFORM_BATTERY_NPM13XX)
+	sMfltPlatformBatterySoc soc;
+#endif /* CONFIG_MEMFAULT_NRF_PLATFORM_BATTERY_NPM13XX */
 
 	err = date_time_now(&system_time);
 	if (err) {
@@ -227,14 +239,28 @@ static void sample(int64_t *ref_time)
 		return;
 	}
 
+#if defined(CONFIG_MEMFAULT_NRF_PLATFORM_BATTERY_NPM13XX)
+	err = memfault_platform_get_stateofcharge(&soc);
+	if (err) {
+		LOG_ERR("memfault_platform_get_stateofcharge, error: %d", err);
+		SEND_FATAL_ERROR();
+		return;
+	}
+
+	state_of_charge = (float)soc.soc / (float)CONFIG_MEMFAULT_METRICS_BATTERY_SOC_PCT_SCALE_VALUE;
+	charging = soc.discharging;
+
+	(void)delta;
+#else /* CONFIG_MEMFAULT_NRF_PLATFORM_BATTERY_NPM13XX */
+
 	delta = (float)k_uptime_delta(ref_time) / 1000.f;
 
 	charging = (chg_status & (NPM1300_CHG_STATUS_TC_MASK |
 				  NPM1300_CHG_STATUS_CC_MASK |
 				  NPM1300_CHG_STATUS_CV_MASK)) != 0;
 
 	state_of_charge = nrf_fuel_gauge_process(voltage, current, temp, delta, NULL);
-
+#endif /* CONFIG_MEMFAULT_NRF_PLATFORM_BATTERY_NPM13XX */
 	LOG_DBG("State of charge: %f", (double)roundf(state_of_charge));
 	LOG_DBG("The battery is %s", charging ? "charging" : "not charging");
 

app/src/modules/battery/battery.c

@@ -66,8 +66,8 @@ struct s_object {
 };
 
 /* Forward declarations of state handlers */
-static void state_init_run(void *o);
-static void state_sampling_run(void *o);
+static enum smf_state_result state_init_run(void *o);
+static enum smf_state_result state_sampling_run(void *o);
 
 static struct s_object s_obj;
 static const struct smf_state states[] = {
@@ -83,7 +83,7 @@ static const struct smf_state states[] = {
 
 /* State handlers */
 
-static void state_init_run(void *o)
+static enum smf_state_result state_init_run(void *o)
 {
 	struct s_object *state_object = o;
 
@@ -94,11 +94,14 @@ static void state_init_run(void *o)
 			LOG_DBG("Time available, sampling can start");
 
 			STATE_SET(STATE_SAMPLING);
+			return SMF_EVENT_HANDLED;
 		}
 	}
+
+	return SMF_EVENT_PROPAGATE;
 }
 
-static void state_sampling_run(void *o)
+static enum smf_state_result state_sampling_run(void *o)
 {
 	struct s_object *state_object = o;
 
@@ -110,6 +113,8 @@ static void state_sampling_run(void *o)
 			sample();
 		}
 	}
+
+	return SMF_EVENT_PROPAGATE;
 }
 
 /* End of state handling */