diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ce6b4e4..4e96ff2 100644 --- a/.github/workflows/release.yml +++ b/.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: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b41af92..e60a76c 100644 --- a/.github/workflows/test.yml +++ b/.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 diff --git a/README.md b/README.md index 1167bd1..963febf 100644 --- a/README.md +++ b/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 diff --git a/boards/aludel_mini_nrf9160_ns.overlay b/boards/aludel_mini_nrf9160_ns.overlay deleted file mode 100644 index 5487974..0000000 --- a/boards/aludel_mini_nrf9160_ns.overlay +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2024 Golioth, Inc. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - zephyr,user { - rs485-8-click-en-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; - }; -}; - -&i2c2 { - /* Needed for I2C writes used by libostentus */ - zephyr,concat-buf-size = <48>; - - ostentus@12 { - status = "okay"; - compatible = "golioth,ostentus"; - reg = <0x12>; - }; -}; - -/* On this board, mikrobus_spi == spi2 & mikrobus_serial == uart2, and a - * limitation of the nRF9160 is that both can't be enabled simultaneously. - * On this board, mikrobus_spi is enabled by default and mikrobus_serial is - * disabled by default, so we need the following to enable mikrobus_serial: - */ -&mikrobus_spi { - status = "disabled"; -}; - -&mikrobus_serial { - status = "okay"; - - modbus0 { - compatible = "zephyr,modbus-serial"; - status = "okay"; - }; -}; diff --git a/prj.conf b/prj.conf index 811d194..3adfb0d 100644 --- a/prj.conf +++ b/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 diff --git a/socs/nrf9160_ns.conf b/socs/nrf9160_ns.conf index ab731cb..9071c8f 100644 --- a/socs/nrf9160_ns.conf +++ b/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 diff --git a/src/app_sensors.c b/src/app_sensors.c index eba0b0d..7489acd 100644 --- a/src/app_sensors.c +++ b/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())); )); )); diff --git a/src/app_sensors.h b/src/app_sensors.h index be34c18..acf1889 100644 --- a/src/app_sensors.h +++ b/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; diff --git a/src/main.c b/src/main.c index d59b814..78212c0 100644 --- a/src/main.c +++ b/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)); )); diff --git a/west.yml b/west.yml index f6df401..d704bfb 100644 --- a/west.yml +++ b/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: