Merge/template v2.8.0

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
         strategy:
             matrix:
               ZEPHYR_SDK: [0.16.3]
-              BOARD: ["nrf9160dk/nrf9160/ns","aludel_elixir/nrf9160/ns", "aludel_mini/nrf9160/ns"]
+              BOARD: ["nrf9160dk/nrf9160/ns","aludel_elixir/nrf9160/ns"]
 
         uses: ./.github/workflows/build_zephyr.yml
         with:

.github/workflows/test.yml

@@ -22,9 +22,3 @@ jobs:
       ZEPHYR_SDK: 0.16.3
       BOARD: aludel_elixir/nrf9160/ns
       ARTIFACT: false
-  test_build_aludel_mini:
-    uses: ./.github/workflows/build_zephyr.yml
-    with:
-      ZEPHYR_SDK: 0.16.3
-      BOARD: aludel_mini/nrf9160/ns
-      ARTIFACT: false

README.md

@@ -22,7 +22,6 @@ images](https://github.com/golioth/reference-design-modbus-vibration-monitor/rel
 
 - Nordic nRF9160-DK
 - Golioth Aludel Elixir
-- Golioth Aludel Mini
 
 ### Additional Sensors/Components
 

prj.conf

@@ -45,7 +45,6 @@ CONFIG_REBOOT=y
 # The rest of the runtime credentials config
 CONFIG_SETTINGS=y
 CONFIG_SETTINGS_RUNTIME=y
-CONFIG_GOLIOTH_SAMPLE_SETTINGS=y
 CONFIG_GOLIOTH_SAMPLE_SETTINGS_AUTOLOAD=y
 CONFIG_GOLIOTH_SAMPLE_SETTINGS_SHELL=y
 

socs/nrf9160_ns.conf

@@ -29,6 +29,7 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 # Disable options y-selected by NCS for no good reason
 CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED=n
 CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED=n
+CONFIG_MBEDTLS_PK_PARSE_EC_EXTENDED=n
 
 # MbedTLS configuration to support p-384 curve. These options
 # enable using the MbedTLS built-in support for operations not

src/app_sensors.c

@@ -148,9 +148,14 @@ void app_sensors_read_and_stream(void)
 	IF_ENABLED(CONFIG_ALUDEL_BATTERY_MONITOR, (
 		read_and_report_battery(client);
 		IF_ENABLED(CONFIG_LIB_OSTENTUS, (
-			ostentus_slide_set(o_dev, BATTERY_V, get_batt_v_str(), strlen(get_batt_v_str()));
-			ostentus_slide_set(o_dev, BATTERY_LVL, get_batt_lvl_str(),
-					     strlen(get_batt_lvl_str()));
+			ostentus_slide_set(o_dev,
+					   BATTERY_V,
+					   get_batt_v_str(),
+					   strlen(get_batt_v_str()));
+			ostentus_slide_set(o_dev,
+					   BATTERY_PCT,
+					   get_batt_pct_str(),
+					   strlen(get_batt_pct_str()));
 		));
 	));
 

src/app_sensors.h

@@ -70,7 +70,7 @@ typedef enum {
 	X_ACC_RMS_HF,
 #ifdef CONFIG_ALUDEL_BATTERY_MONITOR
 	BATTERY_V,
-	BATTERY_LVL,
+	BATTERY_PCT,
 #endif
 	FIRMWARE
 } slide_key;

src/main.c

@@ -284,7 +284,7 @@ int main(void)
 					   LABEL_BATTERY,
 					   strlen(LABEL_BATTERY));
 			ostentus_slide_add(o_dev,
-					   BATTERY_LVL,
+					   BATTERY_PCT,
 					   LABEL_BATTERY,
 					   strlen(LABEL_BATTERY));
 		));

west.yml

@@ -2,12 +2,12 @@
 # SPDX-License-Identifier: Apache-2.0
 
 manifest:
-  version: 0.8
+  version: 1.0
 
   projects:
     - name: golioth
       path: modules/lib/golioth-firmware-sdk
-      revision: v0.18.0
+      revision: v0.21.0
       url: https://github.com/golioth/golioth-firmware-sdk.git
       west-commands: scripts/west-commands.yml
       submodules: true
@@ -17,7 +17,7 @@ manifest:
         name-allowlist:
           - nrf
           - zephyr
-          - cmsis
+          - cmsis_6
           - hal_nordic
           - mbedtls
           - mbedtls-nrf
@@ -34,7 +34,7 @@ manifest:
 
     - name: golioth-zephyr-boards
       path: deps/modules/lib/golioth-boards
-      revision: v2.0.1
+      revision: v2.1.1
       url: https://github.com/golioth/golioth-zephyr-boards
 
     - name: libostentus
@@ -49,7 +49,7 @@ manifest:
 
     - name: golioth-battery-monitor
       path: deps/modules/lib/battery-monitor
-      revision: v1.0.0
+      revision: v1.1.0
       url: https://github.com/golioth/battery-monitor
 
   self: