Skip to content

Commit 3c618ff

Browse files
authored
Merge pull request #11 from golioth/merge/template_v2.8.0
Merge/template v2.8.0
2 parents 563a167 + a58e181 commit 3c618ff

23 files changed

+89
-740
lines changed

.github/workflows/build_zephyr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
BOARD:
1414
required: true
1515
type: string
16-
default: aludel_mini_v1_sparkfun9160_ns
16+
default: nrf9160dk/nrf9160/ns
1717
ARTIFACT:
1818
required: true
1919
type: boolean

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
matrix:
1919
ZEPHYR_SDK: [0.16.3]
20-
BOARD: ["nrf9160dk/nrf9160/ns","aludel_mini/nrf9160/ns","aludel_elixir/nrf9160/ns"]
20+
BOARD: ["nrf9160dk/nrf9160/ns","aludel_elixir/nrf9160/ns"]
2121

2222
uses: ./.github/workflows/build_zephyr.yml
2323
with:

.github/workflows/test.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,3 @@ jobs:
2222
ZEPHYR_SDK: 0.16.3
2323
BOARD: aludel_elixir/nrf9160/ns
2424
ARTIFACT: false
25-
test_build_aludel_mini:
26-
uses: ./.github/workflows/build_zephyr.yml
27-
with:
28-
ZEPHYR_SDK: 0.16.3
29-
BOARD: aludel_mini/nrf9160/ns
30-
ARTIFACT: false

CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,3 @@ target_sources(app PRIVATE src/app_rpc.c)
1212
target_sources(app PRIVATE src/app_settings.c)
1313
target_sources(app PRIVATE src/app_state.c)
1414
target_sources(app PRIVATE src/app_sensors.c)
15-
16-
add_subdirectory_ifdef(CONFIG_ALUDEL_BATTERY_MONITOR src/battery_monitor)

Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,4 @@ config DNS_SERVER1
1313

1414
endif # DNS_RESOLVER
1515

16-
rsource "src/battery_monitor/Kconfig"
17-
1816
source "Kconfig.zephyr"

README.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,9 @@ images](https://github.com/golioth/reference-design-soil-moisture/releases).
2424

2525
- Nordic nRF9160-DK
2626
- Golioth Aludel Elixir
27-
- Golioth Aludel Mini
2827

2928
### Additional Sensors/Components
3029

31-
3230
- Broadcom ADPS-9960 digital ambient light sensor
3331
- Bosch BME280 digital humidity, pressure, and temperature Sensors
3432
- MirkoElektronika MIKROE-4131 Hydro Probe Click (x2)
@@ -52,8 +50,8 @@ This app implements:
5250

5351
### Settings Service
5452

55-
The following settings should be set in the Device Settings menu of the
56-
[Golioth Console](https://console.golioth.io).
53+
The following settings should be set in [the Device Settings menu of the
54+
Golioth Console](https://console.golioth.io/device-settings).
5755

5856
- `LOOP_DELAY_S`
5957
Adjusts the delay between sensor readings. Set to an integer value
@@ -73,8 +71,8 @@ The following settings should be set in the Device Settings menu of the
7371

7472
### Remote Procedure Call (RPC) Service
7573

76-
The following RPCs can be initiated in the Remote Procedure Call menu of
77-
the [Golioth Console](https://console.golioth.io).
74+
The following RPCs can be initiated in the Remote Procedure Call tab of
75+
each device in the [Golioth Console](https://console.golioth.io).
7876

7977
- `get_network_info`
8078
Query and return network information.
@@ -172,7 +170,7 @@ The concept of Digital Twin is demonstrated with the LightDB State
172170
}
173171
```
174172

175-
But default the state values will be `0` and `1`. Try updating the
173+
By default the state values will be `0` and `1`. Try updating the
176174
`desired` values and observe how the device updates its state.
177175

178176
### OTA Firmware Update
@@ -212,7 +210,7 @@ without requiring updated device firmware.
212210

213211
Whenever sending stream data, you must enable a pipeline in your Golioth
214212
project to configure how that data is handled. Add the contents of
215-
`pipelines/jsoni-to-lightdb.yml` as a new pipeline as follows (note that
213+
`pipelines/json-to-lightdb.yml` as a new pipeline as follows (note that
216214
this is the default pipeline for new projects and may already be
217215
present):
218216

boards/aludel_elixir_ns.conf

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,8 @@
11
# Copyright (c) 2024 Golioth, Inc.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
# General config
5-
CONFIG_HEAP_MEM_POOL_SIZE=4096
6-
CONFIG_NEWLIB_LIBC=y
7-
8-
# Networking
9-
CONFIG_NET_SOCKETS_OFFLOAD=y
10-
CONFIG_NET_IPV6=y
11-
CONFIG_NET_IPV6_NBR_CACHE=n
12-
CONFIG_NET_IPV6_MLD=n
13-
14-
# Increase native TLS socket implementation, so that it is chosen instead of
15-
# offloaded nRF91 sockets
16-
CONFIG_NET_SOCKETS_TLS_PRIORITY=35
17-
18-
# Modem library
19-
CONFIG_NRF_MODEM_LIB=y
20-
21-
# LTE connectivity with network connection manager
22-
CONFIG_NRF_MODEM_LIB_NET_IF=y
23-
CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_START=y
24-
CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_CONNECT=n
25-
CONFIG_NET_CONNECTION_MANAGER=y
26-
CONFIG_NET_CONNECTION_MANAGER_MONITOR_STACK_SIZE=1024
27-
28-
# Add Logs for LTE Link Handler
29-
CONFIG_GOLIOTH_SAMPLE_NRF91_LTE_MONITOR=y
30-
31-
# Disable options y-selected by NCS for no good reason
32-
CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED=n
33-
CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED=n
34-
35-
# Add Network Info Support
36-
CONFIG_MODEM_INFO=y
37-
38-
# Generate MCUboot compatible images
39-
CONFIG_BOOTLOADER_MCUBOOT=y
40-
41-
# Use Golioth Ostentus Faceplate
42-
CONFIG_LIB_OSTENTUS=y
4+
# Battery Support
5+
CONFIG_ALUDEL_BATTERY_MONITOR=y
436

7+
# Turn on regulator to power click headers
448
CONFIG_REGULATOR=y

boards/aludel_mini_nrf9160_ns.conf

Lines changed: 0 additions & 42 deletions
This file was deleted.

boards/aludel_mini_nrf9160_ns.overlay

Lines changed: 0 additions & 22 deletions
This file was deleted.

boards/aludel_mini_v1_sparkfun9160_ns.overlay

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)