From 3deaea45cf3c68998ee5e32cf744bb23f57dd8be Mon Sep 17 00:00:00 2001 From: Gillian Minnehan Date: Thu, 12 Sep 2024 16:42:15 -0400 Subject: [PATCH] ### Summary Update from upstream. Used: diff -duwr memfault-asset-tracker/ nrf/applications/asset_tracker_v2/ | patch -p0 Resolved a few rejected patch changes, and reverted some changes that removed features we've added. Checked with `diff -r memfault-asset-tracker nrf/applications/asset_tracker_v2` for any lingering difference. ### Test Plan - Flashed thingy91, uploaded data - CI --- .github/workflows/build.yaml | 4 +- .github/workflows/ota-deploy.yaml | 2 +- .gitmessage | 11 - .husky/.gitignore | 1 - .husky/commit-msg | 4 - .husky/pre-commit | 4 - .mergify.yml | 12 - .prettierignore | 3 - .prettierrc.js | 3 - CMakeLists.txt | 2 +- CODE_OF_CONDUCT.md | 2 - CONTRIBUTING.md | 2 - Kconfig.sysbuild | 31 + adr/001-use-saga-as-the-main-branch.md | 17 - adr/002-clean-gitignore.md | 8 - adr/README.md | 8 - asset-tracker-cloud-firmware-aws.conf | 14 - boards/{native_posix.conf => native_sim.conf} | 7 +- boards/nrf9151dk_nrf9151_ns.conf | 18 + boards/nrf9151dk_nrf9151_ns.overlay | 63 + boards/qemu_x86.conf | 120 - boards/thingy91x_nrf9151_ns.conf | 83 + boards/thingy91x_nrf9151_ns.overlay | 27 + child_image/mcuboot.conf | 35 - commitlint.config.js | 1 - doc/asset_tracker_v2_description.rst | 14 +- doc/cloud_module.rst | 6 +- doc/cloud_wrapper.rst | 46 +- doc/location_module.rst | 6 +- doc/modules.rst | 28 + doc/sensor_module.rst | 7 +- doc/ui_module.rst | 50 +- doc/unit_test.rst | 59 +- e2e.conf | 1 - include/nrf9151dk/led_state_def.h | 69 + .../led_state_def.h | 0 .../led_state_def.h | 0 .../led_state_def.h | 0 include/thingy91x/led_state_def.h | 63 + nrf9160dk_with_ext_flash.overlay | 39 - nrf9160dk_with_nrf7002ek.overlay | 19 - nrf9161dk_with_ext_flash.overlay | 42 - nrf91xxdk_with_nrf7002ek.overlay | 11 - overlay-carrier.conf | 3 + overlay-nrf7002ek-wifi-scan-only.conf | 4 +- package-lock.json | 6395 ----------------- package.json | 185 - prj_native_posix.conf | 100 - prj_qemu_x86.conf | 102 - renovate.json | 3 - sample.yaml | 632 +- src/cloud-certs/ca-cert.pem | 3 - src/cloud-certs/client-cert.pem | 3 - src/cloud-certs/private-key.pem | 3 - src/cloud/cloud_codec/cloud_codec.h | 21 +- src/cloud/cloud_codec/json_common.c | 14 +- src/cloud/cloud_codec/lwm2m/lwm2m_codec.c | 4 +- .../cloud_codec/lwm2m/lwm2m_codec_helpers.c | 2 +- .../cloud_codec/nrf_cloud/nrf_cloud_codec.c | 4 +- src/events/location_module_event.h | 17 +- src/ext_sensors/ext_sensors.c | 2 +- src/modules/Kconfig.cloud_module | 2 +- src/modules/cloud_module.c | 6 +- src/modules/data_module.c | 12 +- src/modules/debug_module.c | 4 +- src/modules/location_module.c | 18 +- src/modules/modem_module.c | 42 +- sysbuild/mcuboot/app.overlay | 5 + .../mcuboot/boards/nrf9151dk_nrf9151.conf | 20 + .../mcuboot/boards/nrf9151dk_nrf9151.overlay | 17 + .../boards/nrf9160dk_nrf9160_0_14_0.conf | 3 - .../boards/nrf9160dk_nrf9160_0_14_0.overlay | 1 + .../mcuboot/boards/nrf9161dk_nrf9161.conf | 3 - .../mcuboot/boards/nrf9161dk_nrf9161.overlay | 1 + .../boards/nrf9161dk_nrf9161_0_7_0.overlay | 3 +- sysbuild/mcuboot/boards/thingy91_nrf9160.conf | 13 + .../mcuboot/boards/thingy91x_nrf9151.conf | 19 + sysbuild/mcuboot/prj.conf | 43 + tests/debug_module/boards/native_posix.conf | 6 - tests/debug_module/src/debug_module_test.c | 12 +- tests/debug_module/testcase.yaml | 7 +- tests/json_common/boards/native_posix.conf | 6 - tests/json_common/src/json_validate.h | 22 +- tests/json_common/src/main.c | 65 +- tests/json_common/testcase.yaml | 14 +- tests/location_module/CMakeLists.txt | 2 +- .../location_module/boards/native_posix.conf | 6 - tests/location_module/testcase.yaml | 7 +- tests/lwm2m_codec_helpers/CMakeLists.txt | 1 - .../boards/native_posix.conf | 6 - .../src/lwm2m_codec_helpers_test.c | 11 +- tests/lwm2m_codec_helpers/testcase.yaml | 7 +- tests/lwm2m_integration/CMakeLists.txt | 5 +- .../boards/native_posix.conf | 6 - .../src/lwm2m_integration_test.c | 2 +- tests/lwm2m_integration/testcase.yaml | 7 +- .../nrf_cloud_codec/boards/native_posix.conf | 6 - .../src/nrf_cloud_codec_test.c | 58 +- tests/nrf_cloud_codec/testcase.yaml | 7 +- .../boards/native_posix.conf | 6 - .../testcase.yaml | 3 +- tests/ui_module/boards/native_posix.conf | 6 - tests/ui_module/testcase.yaml | 7 +- thingy91_nrf9160ns.overlay | 21 - 104 files changed, 1084 insertions(+), 7873 deletions(-) delete mode 100644 .gitmessage delete mode 100644 .husky/.gitignore delete mode 100755 .husky/commit-msg delete mode 100755 .husky/pre-commit delete mode 100644 .mergify.yml delete mode 100644 .prettierignore delete mode 100644 .prettierrc.js delete mode 100644 CODE_OF_CONDUCT.md delete mode 100644 CONTRIBUTING.md create mode 100644 Kconfig.sysbuild delete mode 100644 adr/001-use-saga-as-the-main-branch.md delete mode 100644 adr/002-clean-gitignore.md delete mode 100644 adr/README.md delete mode 100644 asset-tracker-cloud-firmware-aws.conf rename boards/{native_posix.conf => native_sim.conf} (93%) create mode 100644 boards/nrf9151dk_nrf9151_ns.conf create mode 100644 boards/nrf9151dk_nrf9151_ns.overlay delete mode 100644 boards/qemu_x86.conf create mode 100644 boards/thingy91x_nrf9151_ns.conf create mode 100644 boards/thingy91x_nrf9151_ns.overlay delete mode 100644 child_image/mcuboot.conf delete mode 100644 commitlint.config.js create mode 100644 doc/modules.rst delete mode 100644 e2e.conf create mode 100644 include/nrf9151dk/led_state_def.h rename include/{nrf9160dk_nrf9160_ns => nrf9160dk}/led_state_def.h (100%) rename include/{nrf9161dk_nrf9161_ns => nrf9161dk}/led_state_def.h (100%) rename include/{thingy91_nrf9160_ns => thingy91}/led_state_def.h (100%) create mode 100644 include/thingy91x/led_state_def.h delete mode 100644 nrf9160dk_with_ext_flash.overlay delete mode 100644 nrf9160dk_with_nrf7002ek.overlay delete mode 100644 nrf9161dk_with_ext_flash.overlay delete mode 100644 nrf91xxdk_with_nrf7002ek.overlay delete mode 100644 package-lock.json delete mode 100644 package.json delete mode 100644 prj_native_posix.conf delete mode 100644 prj_qemu_x86.conf delete mode 100644 renovate.json delete mode 100644 src/cloud-certs/ca-cert.pem delete mode 100644 src/cloud-certs/client-cert.pem delete mode 100644 src/cloud-certs/private-key.pem create mode 100644 sysbuild/mcuboot/app.overlay create mode 100644 sysbuild/mcuboot/boards/nrf9151dk_nrf9151.conf create mode 100644 sysbuild/mcuboot/boards/nrf9151dk_nrf9151.overlay rename {child_image => sysbuild}/mcuboot/boards/nrf9160dk_nrf9160_0_14_0.conf (86%) rename {child_image => sysbuild}/mcuboot/boards/nrf9160dk_nrf9160_0_14_0.overlay (86%) rename {child_image => sysbuild}/mcuboot/boards/nrf9161dk_nrf9161.conf (86%) rename {child_image => sysbuild}/mcuboot/boards/nrf9161dk_nrf9161.overlay (86%) rename {child_image => sysbuild}/mcuboot/boards/nrf9161dk_nrf9161_0_7_0.overlay (86%) create mode 100644 sysbuild/mcuboot/boards/thingy91_nrf9160.conf create mode 100644 sysbuild/mcuboot/boards/thingy91x_nrf9151.conf create mode 100644 sysbuild/mcuboot/prj.conf delete mode 100644 tests/debug_module/boards/native_posix.conf delete mode 100644 tests/json_common/boards/native_posix.conf delete mode 100644 tests/location_module/boards/native_posix.conf delete mode 100644 tests/lwm2m_codec_helpers/boards/native_posix.conf delete mode 100644 tests/lwm2m_integration/boards/native_posix.conf delete mode 100644 tests/nrf_cloud_codec/boards/native_posix.conf delete mode 100644 tests/nrf_cloud_codec_mocked_cjson/boards/native_posix.conf delete mode 100644 tests/ui_module/boards/native_posix.conf delete mode 100644 thingy91_nrf9160ns.overlay diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8861607..b90a127 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -47,14 +47,14 @@ jobs: west update --narrow -o=--depth=1 -o=--recurse-submodules --path-cache ~/zephyr-thingy91-path-cache pip install -r zephyr/scripts/requirements.txt pip install -r nrf/scripts/requirements-build.txt - west build -b thingy91_nrf9160_ns -p always memfault-asset-tracker + west build -b thingy91/nrf9160/ns -p always memfault-asset-tracker - name: Build app with Memfault overlay run: | cd $GITHUB_WORKSPACE cd ../ . venv/bin/activate - west build -b thingy91_nrf9160_ns -p always memfault-asset-tracker -- \ + west build -b thingy91/nrf9160/ns -p always memfault-asset-tracker -- \ -DCONFIG_MEMFAULT_NCS_PROJECT_KEY=\"DUMMY_KEY\" \ -DOVERLAY_CONFIG=overlay-memfault.conf \ -DCONFIG_MEMFAULT_NCS_FW_VERSION_STATIC=y \ diff --git a/.github/workflows/ota-deploy.yaml b/.github/workflows/ota-deploy.yaml index e114ee5..1e5ae1c 100644 --- a/.github/workflows/ota-deploy.yaml +++ b/.github/workflows/ota-deploy.yaml @@ -55,7 +55,7 @@ jobs: west update --narrow -o=--depth=1 -o=--recurse-submodules --path-cache ~/zephyr-thingy91-path-cache pip install -r zephyr/scripts/requirements.txt pip install -r nrf/scripts/requirements-build.txt - west build -b thingy91_nrf9160_ns -p always memfault-asset-tracker -- \ + west build -b thingy91/nrf9160/ns -p always memfault-asset-tracker -- \ -DCONFIG_MEMFAULT_NCS_PROJECT_KEY=\"${{ secrets.THINGY91_OTA_PROJECT_KEY }}\" \ -DOVERLAY_CONFIG=overlay-memfault.conf \ -DCONFIG_MEMFAULT_NCS_FW_VERSION_STATIC=y \ diff --git a/.gitmessage b/.gitmessage deleted file mode 100644 index 03b1db2..0000000 --- a/.gitmessage +++ /dev/null @@ -1,11 +0,0 @@ - -# -# All commit messages must follow Angular Commit Message Guidelines: -# -# (): -# -# -# -#