Skip to content

Commit 6a21a87

Browse files
committed
treewide: Rename to Asset Tracker Template
Rename OOB/hello.nrfcloud.com --> Asset Tracker Template. Signed-off-by: Jan Tore Guggedal <jantore.guggedal@nordicsemi.no>
1 parent d577240 commit 6a21a87

16 files changed

+32
-211
lines changed

.github/workflows/build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ jobs:
157157
158158
- name: Create partition manager report for nRF91 debug firmware
159159
if: ${{ inputs.build_debug }}
160-
working-directory: thingy91x-att/app/build
160+
working-directory: asset-tracker-template/app/build
161161
run: |
162162
ninja partition_manager_report
163163
ninja partition_manager_report > pmr-nrf91-debug-${{ env.VERSION }}.txt
@@ -171,8 +171,8 @@ jobs:
171171
name: firmware-att-debug
172172
if-no-files-found: error
173173
path: |
174-
thingy91x-att/app/build/asset-tracker-template-*.*
175-
thingy91x-att/app/build/pmr-nrf91-*.txt
174+
asset-tracker-template/app/build/asset-tracker-template-*.*
175+
asset-tracker-template/app/build/pmr-nrf91-*.txt
176176
177177
- name: Print run-id and fw version
178178
run: |

.github/workflows/compliance.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ jobs:
1919
- name: Checkout the code
2020
uses: actions/checkout@v4
2121
with:
22-
path: thingy91x-att
22+
path: asset-tracker-template
2323
ref: ${{ github.event.pull_request.head.sha }}
2424
fetch-depth: 0
2525

2626
- name: Initialize
27-
working-directory: thingy91x-att
27+
working-directory: asset-tracker-template
2828
run: |
2929
west init -l .
3030
west config manifest.group-filter +bsec
@@ -38,21 +38,21 @@ jobs:
3838
shell: bash
3939
env:
4040
BASE_REF: ${{ github.base_ref }}
41-
working-directory: thingy91x-att
41+
working-directory: asset-tracker-template
4242
run: |
4343
export ZEPHYR_BASE="../zephyr"
4444
$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}..
4545
4646
- name: check-warns
47-
working-directory: thingy91x-att
47+
working-directory: asset-tracker-template
4848
shell: bash
4949
run: |
5050
if [[ ! -s "compliance.xml" ]]; then
5151
exit 1;
5252
fi
5353
5454
- name: check-warns
55-
working-directory: thingy91x-att
55+
working-directory: asset-tracker-template
5656
shell: bash
5757
run: |
5858
for file in Nits.txt checkpatch.txt Identity.txt Gitlint.txt pylint.txt Devicetree.txt Kconfig.txt KconfigBasic.txt Codeowners.txt; do

.github/workflows/publish-symbol-files-to-memfault.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
3333
- run: node .github/workflows/fetch-release-assets.mjs ${{ inputs.version }}
3434

35-
- name: Publish oob symbol files
35+
- name: Publish symbol files
3636
run: |
3737
source venv/bin/activate
3838
memfault \
@@ -44,7 +44,7 @@ jobs:
4444
--software-version ${{ inputs.version }} \
4545
asset-tracker-template-${{ inputs.version }}-thingy91x-nrf91.elf
4646
47-
- name: Publish oob-debug symbol files
47+
- name: Publish debug symbol files
4848
run: |
4949
source venv/bin/activate
5050
memfault \

app/prj.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66

7-
CONFIG_NCS_APPLICATION_BOOT_BANNER_STRING="Hello, nRF Cloud"
7+
CONFIG_NCS_APPLICATION_BOOT_BANNER_STRING="Asset Tracker Template"
88
CONFIG_NCS_SAMPLES_DEFAULTS=y
99
CONFIG_RESET_ON_FATAL_ERROR=y
1010
CONFIG_LOG_MODE_DEFERRED=y
@@ -134,7 +134,7 @@ CONFIG_COAP_CLIENT_STACK_SIZE=2304
134134
CONFIG_COAP_EXTENDED_OPTIONS_LEN_VALUE=192
135135

136136
# nRF Cloud
137-
CONFIG_NRF_CLOUD_CLIENT_ID_PREFIX="oob-"
137+
CONFIG_NRF_CLOUD_CLIENT_ID_PREFIX="att-"
138138
CONFIG_NRF_CLOUD_COAP_SEC_TAG=4242
139139

140140
#Required if device is provisioned to nRF Cloud using attestation token

sonar-project.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
sonar.projectKey=hello-nrfcloud_firmware
2-
sonar.organization=hello-nrfcloud-com-firmware
1+
sonar.projectKey=asset-tracker-template_firmware
2+
sonar.organization=asset-tracker-template-firmware
33
sonar.host.url=https://sonarcloud.io

tests/module/button/testcase.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tests:
2-
hello_nrfcloud.fw.button:
2+
asset_tracker_template.fw.button:
33
platform_allow:
44
- native_sim
55
- native_sim/native/64

tests/module/environmental/testcase.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tests:
2-
hello_nrfcloud.fw.environmental:
2+
asset_tracker_template.fw.environmental:
33
platform_allow:
44
- native_sim
55
- native_sim/native/64

tests/module/network/testcase.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tests:
2-
hello_nrfcloud.fw.network:
2+
asset_tracker_template.fw.network:
33
platform_allow:
44
- native_sim
55
- native_sim/native/64

tests/module/transport/testcase.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tests:
2-
hello_nrfcloud.fw.transport:
2+
asset_tracker_template.fw.transport:
33
sysbuild: true
44
platform_allow:
55
- native_sim

tests/module/trigger/testcase.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tests:
2-
hello_nrfcloud.fw.trigger:
2+
asset_tracker_template.fw.trigger:
33
platform_allow:
44
- native_sim
55
- native_sim/native/64

tests/on_target/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
# OOB on target test
1+
# Assert Tracker Template on target test
22

33
## Run test locally
44

55
### Setup docker
66
```shell
77
docker pull ghcr.io/hello-nrfcloud/firmware:docker-v1.0.3
8-
cd <path_to_oob_dir>
8+
cd <path_to_att_dir>
99
west build -p -b thingy91x/nrf9151/ns app
10-
cp build/merged.hex tests/on_target/artifacts/hello.nrfcloud.com-aaa000-thingy91x-nrf91.hex
10+
cp build/merged.hex tests/on_target/artifacts/asset-tracker-template-aaa000-thingy91x-nrf91.hex
1111
docker run --rm -it \
1212
--privileged \
1313
-v /dev:/dev:rw \
1414
-v /run/udev:/run/udev \
15-
-v .:/work/thingy91x-oob \
15+
-v .:/work/asset-tracker-template \
1616
-v /opt/setup-jlink:/opt/setup-jlink \
1717
ghcr.io/hello-nrfcloud/firmware:docker-v1.0.3 \
1818
/bin/bash
@@ -28,7 +28,7 @@ nrfutil -V
2828

2929
### Install requirements
3030
```shell
31-
cd thingy91x-oob/tests/on_target
31+
cd asset-tracker-template/tests/on_target
3232
pip install -r requirements.txt --break-system-packages
3333
```
3434

tests/on_target/tests/conftest.py

+2-20
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import types
1010
from utils.flash_tools import recover_device
1111
from utils.uart import Uart, UartBinary
12-
from utils.hellonrfcloud_fota import HelloNrfCloudFOTA
1312
import sys
1413
sys.path.append(os.getcwd())
1514
from utils.logger import get_logger
@@ -20,7 +19,6 @@
2019

2120
SEGGER = os.getenv('SEGGER')
2221
UART_ID = os.getenv('UART_ID', SEGGER)
23-
FOTADEVICE_IMEI = os.getenv('IMEI')
2422
FOTADEVICE_FINGERPRINT = os.getenv('FINGERPRINT')
2523

2624
def get_uarts():
@@ -60,24 +58,8 @@ def t91x_board():
6058
pytest.fail("No UARTs found")
6159
log_uart_string = all_uarts[0]
6260
uart = Uart(log_uart_string, timeout=UART_TIMEOUT)
63-
fota = HelloNrfCloudFOTA(device_id=f"oob-{FOTADEVICE_IMEI}", \
64-
fingerprint=FOTADEVICE_FINGERPRINT)
6561

66-
yield types.SimpleNamespace(
67-
uart=uart,
68-
fota=fota
69-
)
70-
71-
# Cancel pending fota jobs, at fota test teardown
72-
if FOTADEVICE_IMEI:
73-
try:
74-
pending_jobs = fota.check_pending_jobs()
75-
if pending_jobs:
76-
logger.warning(f"{len(pending_jobs)} pending fota jobs found for fota device")
77-
logger.info("Canceling pending jobs")
78-
fota.delete_jobs(pending_jobs)
79-
except Exception as e:
80-
logger.error(f"Error during teardown while canceling pending fota jobs: {e}")
62+
yield types.SimpleNamespace(uart=uart)
8163

8264
uart_log = uart.whole_log
8365
uart.stop()
@@ -102,7 +84,7 @@ def t91x_traces(t91x_board):
10284
def hex_file():
10385
# Search for the firmware hex file in the artifacts folder
10486
artifacts_dir = "artifacts"
105-
hex_pattern = r"hello\.nrfcloud\.com-[0-9a-z\.]+-thingy91x-nrf91\.hex"
87+
hex_pattern = r"asset-tracker-template-[0-9a-z\.]+-thingy91x-nrf91\.hex"
10688

10789
for file in os.listdir(artifacts_dir):
10890
if re.match(hex_pattern, file):

tests/on_target/tests/test_power.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def generate_time_series_html(csv_file, date_column, value_column, output_file="
8383
# Load the CSV file
8484
df = pd.read_csv(csv_file, parse_dates=[date_column])
8585

86-
title = "OOB Current Consumption Plot\n\n"
86+
title = "Asset Tracker Template Current Consumption Plot\n\n"
8787
note_text = "Note: Low power state is reached after ~10 min, earlier than that uart is active (drawing ≳500uA)"
8888
title += f"<br><span style='font-size:12px;color:gray;'>{note_text}</span>"
8989

tests/on_target/tests/test_serial_dfu.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
NRF53_APP_HEX_FILE = get_first_artifact_match("artifacts/connectivity-bridge-*-thingy91x-nrf53-app.hex")
2121
NRF53_APP_UPDATE_ZIP = get_first_artifact_match("artifacts/connectivity-bridge-*-thingy91x-nrf53-dfu.zip")
2222
NRF53_BL_UPDATE_ZIP = get_first_artifact_match("artifacts/connectivity-bridge-*-thingy91x-nrf53-bootloader.zip")
23-
NRF91_APP_UPDATE_ZIP = get_first_artifact_match("artifacts/hello.nrfcloud.com-*-thingy91x-nrf91-dfu.zip")
24-
NRF91_BL_UPDATE_ZIP = get_first_artifact_match("artifacts/hello.nrfcloud.com-*-thingy91x-nrf91-bootloader.zip")
23+
NRF91_APP_UPDATE_ZIP = get_first_artifact_match("artifacts/asset-tracker-template-*-thingy91x-nrf91-dfu.zip")
24+
NRF91_BL_UPDATE_ZIP = get_first_artifact_match("artifacts/asset-tracker-template-*-thingy91x-nrf91-bootloader.zip")
2525
NRF91_HEX_FILE = "artifacts/nrf91-bl-v2.hex"
2626

2727
SEGGER_NRF53 = os.getenv('SEGGER_NRF53')
@@ -32,7 +32,7 @@
3232
def t91x_dfu():
3333
'''
3434
This fixture initializes the nRF53 and nRF91 for dfu test.
35-
First nRF91 is flashed with oob bootloader fw through segger fw on nRF53.
35+
First nRF91 is flashed with Asset Tracker Template bootloader fw through segger fw on nRF53.
3636
Then nRF53 is flashed with connectivity bridge fw.
3737
'''
3838
logger.info(("Flashing nRF53 with Segger firmware"))
@@ -105,7 +105,7 @@ def test_dfu(t91x_dfu):
105105
t91x_dfu.uart.start()
106106

107107
# Look for correct firmware version
108-
expected_lines = ["Attempting to boot slot 1", "Firmware version 3", "*** Booting Hello, nRF Cloud"]
108+
expected_lines = ["Attempting to boot slot 1", "Firmware version 3", "*** Booting Asset Tracker Template"]
109109
for _ in range(3):
110110
try:
111111
# reset nrf91

0 commit comments

Comments
 (0)