From 6ce720dc3cfccee3998d2961eb2f37936f885327 Mon Sep 17 00:00:00 2001 From: Mike Szczys Date: Tue, 14 Oct 2025 16:40:29 -0500 Subject: [PATCH 1/3] fw_update: use different package names for each board Update this reference design to work with Cohorts by assigning package names to each type of unique hardware. Signed-off-by: Mike Szczys --- README.md | 5 ++++- boards/aludel_elixir_ns.conf | 3 +++ boards/nrf9160dk_nrf9160_ns.conf | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 boards/nrf9160dk_nrf9160_ns.conf diff --git a/README.md b/README.md index c5a06c0..fccccfd 100644 --- a/README.md +++ b/README.md @@ -189,7 +189,10 @@ version number than what is currently running on the device. 2. Upload the `build/app/zephyr/zephyr.signed.bin` file as a Package for your Golioth project. - - Use `main` as the package name. + - Use either `nrf9160dk` or `aludel_elixir` as the package name, + depending on which board the update file was built for. (These + package names were configured in this repository's board `.conf` + files.) Use `main` as the package name. - Use the same version number from step 1. 3. Create a Cohort and add your device to it. diff --git a/boards/aludel_elixir_ns.conf b/boards/aludel_elixir_ns.conf index 8140ab4..9373bb9 100644 --- a/boards/aludel_elixir_ns.conf +++ b/boards/aludel_elixir_ns.conf @@ -6,3 +6,6 @@ CONFIG_ALUDEL_BATTERY_MONITOR=y # Turn on regulator to power click headers CONFIG_REGULATOR=y + +# Use a unique package name to use with Packages/Cohorts/Deployments +CONFIG_GOLIOTH_FW_UPDATE_PACKAGE_NAME="aludel_elixir" diff --git a/boards/nrf9160dk_nrf9160_ns.conf b/boards/nrf9160dk_nrf9160_ns.conf new file mode 100644 index 0000000..ad711b7 --- /dev/null +++ b/boards/nrf9160dk_nrf9160_ns.conf @@ -0,0 +1,2 @@ +# Use a unique package name to use with Packages/Cohorts/Deployments +CONFIG_GOLIOTH_FW_UPDATE_PACKAGE_NAME="nrf9160dk" From e1465184af74018638b0a90e7607577cc9d12ecb Mon Sep 17 00:00:00 2001 From: Mike Szczys Date: Tue, 14 Oct 2025 17:09:10 -0500 Subject: [PATCH 2/3] sensor: configure APDS-9960 to work without interrupt pin Signed-off-by: Mike Szczys --- boards/aludel_elixir_ns.conf | 3 +++ boards/aludel_elixir_ns.overlay | 2 +- boards/nrf9160dk_nrf9160_ns.conf | 3 +++ boards/nrf9160dk_nrf9160_ns.overlay | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/boards/aludel_elixir_ns.conf b/boards/aludel_elixir_ns.conf index 9373bb9..b280ce0 100644 --- a/boards/aludel_elixir_ns.conf +++ b/boards/aludel_elixir_ns.conf @@ -7,5 +7,8 @@ CONFIG_ALUDEL_BATTERY_MONITOR=y # Turn on regulator to power click headers CONFIG_REGULATOR=y +# Use Sensor without a GPIO INT line +CONFIG_APDS9960_FETCH_MODE_POLL=y + # Use a unique package name to use with Packages/Cohorts/Deployments CONFIG_GOLIOTH_FW_UPDATE_PACKAGE_NAME="aludel_elixir" diff --git a/boards/aludel_elixir_ns.overlay b/boards/aludel_elixir_ns.overlay index 042012a..0eedde6 100644 --- a/boards/aludel_elixir_ns.overlay +++ b/boards/aludel_elixir_ns.overlay @@ -11,6 +11,6 @@ apds9960: apds9960@39 { compatible = "avago,apds9960"; reg = <0x39>; - int-gpios = <&gpio0 2 (GPIO_ACTIVE_LOW)>; + int-gpios = <&gpio0 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; }; }; diff --git a/boards/nrf9160dk_nrf9160_ns.conf b/boards/nrf9160dk_nrf9160_ns.conf index ad711b7..0bf8ef4 100644 --- a/boards/nrf9160dk_nrf9160_ns.conf +++ b/boards/nrf9160dk_nrf9160_ns.conf @@ -1,2 +1,5 @@ +# Use Sensor without a GPIO INT line +CONFIG_APDS9960_FETCH_MODE_POLL=y + # Use a unique package name to use with Packages/Cohorts/Deployments CONFIG_GOLIOTH_FW_UPDATE_PACKAGE_NAME="nrf9160dk" diff --git a/boards/nrf9160dk_nrf9160_ns.overlay b/boards/nrf9160dk_nrf9160_ns.overlay index 28dc2b6..0eae27f 100644 --- a/boards/nrf9160dk_nrf9160_ns.overlay +++ b/boards/nrf9160dk_nrf9160_ns.overlay @@ -24,7 +24,7 @@ apds9960: apds9960@39 { compatible = "avago,apds9960"; reg = <0x39>; - int-gpios = <&gpio0 3 (GPIO_ACTIVE_LOW)>; + int-gpios = <&gpio0 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; }; lis2dh: lis2dh@18 { From 661dd98f94adb47a669ee196710d2cbcaf311166 Mon Sep 17 00:00:00 2001 From: Mike Szczys Date: Tue, 14 Oct 2025 16:42:04 -0500 Subject: [PATCH 3/3] release v1.1.0 see CHANGELOG for details. Signed-off-by: Mike Szczys --- CHANGELOG.md | 8 ++++++-- VERSION | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4301cc4..284a873 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [1.1.0] - Unreleased +## [1.1.0] - 2025-10-14 ### Added @@ -18,10 +18,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Merge changes from - [`golioth/reference-design-template@template_v2.4.1`](https://github.com/golioth/reference-design-template/tree/template_v2.4.1). + [`golioth/reference-design-template@template_v2.8.0`](https://github.com/golioth/reference-design-template/tree/template_v2.8.0). - Update board names for Zephyr hardware model v2 - Use `VERSION` file instead of `prj.conf` to set firmware version +### Removed + +- Aludel Mini is EOL and no longer supported + ## [1.0.0] - 2023-09-05 ### Added diff --git a/VERSION b/VERSION index 397f73e..0891064 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ -VERSION_MAJOR = 0 -VERSION_MINOR = 0 -PATCHLEVEL = 1 +VERSION_MAJOR = 1 +VERSION_MINOR = 1 +PATCHLEVEL = 0 VERSION_TWEAK = 0 EXTRAVERSION =