Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add batt command #62

Merged
merged 2 commits into from
Sep 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ota-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
11 changes: 0 additions & 11 deletions .gitmessage

This file was deleted.

1 change: 0 additions & 1 deletion .husky/.gitignore

This file was deleted.

4 changes: 0 additions & 4 deletions .husky/commit-msg

This file was deleted.

4 changes: 0 additions & 4 deletions .husky/pre-commit

This file was deleted.

12 changes: 0 additions & 12 deletions .mergify.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .prettierignore

This file was deleted.

3 changes: 0 additions & 3 deletions .prettierrc.js

This file was deleted.

2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ add_subdirectory_ifdef(CONFIG_WATCHDOG_APPLICATION src/watchdog)

# Include nRF modem library header file for PC builds.
# These are used throughout the application in type definitions.
if (CONFIG_BOARD_QEMU_X86 OR CONFIG_BOARD_NATIVE_POSIX)
if (CONFIG_BOARD_NATIVE_SIM)
target_include_directories(app PRIVATE ${NRFXLIB_DIR}/nrf_modem/include/)

# Make the folder that contains the certificates global so that it can be located by the
Expand Down
2 changes: 0 additions & 2 deletions CODE_OF_CONDUCT.md

This file was deleted.

2 changes: 0 additions & 2 deletions CONTRIBUTING.md

This file was deleted.

31 changes: 31 additions & 0 deletions Kconfig.sysbuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#
# Copyright (c) 2023 Nordic Semiconductor
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

choice BOOTLOADER
default BOOTLOADER_MCUBOOT if !BOARD_NATIVE_SIM
endchoice

config SECURE_BOOT_APPCORE
default y if BOARD_NRF9160DK_NRF9160_NS \
|| BOARD_NRF9151DK_NRF9151_NS \
|| BOARD_NRF9161DK_NRF9161_NS

config WIFI_NRF700X
default y if BOARD_THINGY91X_NRF9151_NS

config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
default y if BOARD_NRF9151DK_NRF9151_NS || BOARD_NRF9161DK_NRF9161_NS
default y if BOARD_NRF9160DK_NRF9160_NS \
&& "${BOARD_REVISION}" != "0.1.0" \
&& "${BOARD_REVISION}" != "0.7.0" \
&& "${BOARD_REVISION}" != "0.7.1" \
&& "${BOARD_REVISION}" != "0.8.0" \
&& "${BOARD_REVISION}" != "0.8.2" \
&& "${BOARD_REVISION}" != "0.8.3" \
&& "${BOARD_REVISION}" != "0.8.5" \
&& "${BOARD_REVISION}" != "0.9.0"

source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
17 changes: 0 additions & 17 deletions adr/001-use-saga-as-the-main-branch.md

This file was deleted.

8 changes: 0 additions & 8 deletions adr/002-clean-gitignore.md

This file was deleted.

8 changes: 0 additions & 8 deletions adr/README.md

This file was deleted.

14 changes: 0 additions & 14 deletions asset-tracker-cloud-firmware-aws.conf

This file was deleted.

7 changes: 5 additions & 2 deletions boards/native_posix.conf → boards/native_sim.conf
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ CONFIG_SENSOR_MODULE=n
CONFIG_MODEM_MODULE=n
CONFIG_UI_MODULE=n

# Running the application in native_posix emulator requires functionality
# Running the application in native_sim emulator requires functionality
# that is present in the debug module
CONFIG_DEBUG_MODULE=y

Expand All @@ -66,7 +66,7 @@ CONFIG_NET_NATIVE=y
CONFIG_NET_TCP=y
CONFIG_NET_UDP=y
CONFIG_NET_SOCKETS_OFFLOAD=n
CONFIG_NET_SOCKETS_POSIX_NAMES=y
CONFIG_POSIX_API=y
CONFIG_NET_SOCKETS_SOCKOPT_TLS=y
CONFIG_NET_PKT_RX_COUNT=32
CONFIG_NET_PKT_TX_COUNT=32
Expand Down Expand Up @@ -116,3 +116,6 @@ CONFIG_BUILD_S1_VARIANT=n

# Watchdog
CONFIG_WATCHDOG_APPLICATION=n

# Cloud module certificates
CONFIG_MQTT_HELPER_CERTIFICATES_FOLDER="src/cloud-certs"
18 changes: 18 additions & 0 deletions boards/nrf9151dk_nrf9151_ns.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#
# Copyright (c) 2024 Nordic Semiconductor ASA
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

# This file is merged with prj.conf in the application folder, and options
# set here will take precedence if they are present in both files.

# CAF - Common Application Framework
CONFIG_GPIO=y
CONFIG_LED_GPIO=y

# Enable external flash
CONFIG_SPI=y
CONFIG_SPI_NOR=y
CONFIG_SPI_NOR_SFDP_DEVICETREE=y
CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
63 changes: 63 additions & 0 deletions boards/nrf9151dk_nrf9151_ns.overlay
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
/*
* Copyright (c) 2024 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

/ {
/delete-node/ leds;

leds0 {
compatible = "gpio-leds";
status = "okay";
label = "LED0";
led0: led_0 {
status = "okay";
gpios = <&gpio0 0 0>;
label = "Green LED 1";
};
};

leds1 {
compatible = "gpio-leds";
status = "okay";
label = "LED1";
led1: led_1 {
gpios = <&gpio0 1 0>;
label = "Green LED 2";
};
};

leds2 {
compatible = "gpio-leds";
status = "okay";
label = "LED2";
led2: led_2 {
gpios = <&gpio0 4 0>;
label = "Green LED 3";
};
};

leds3 {
compatible = "gpio-leds";
status = "okay";
label = "LED3";
led3: led_3 {
gpios = <&gpio0 5 0>;
label = "Green LED 4";
};
};

/* Configure partition manager to use gd25wb256 as the external flash */
chosen {
nordic,pm-ext-flash = &gd25wb256;
};

aliases {
ext-flash = &gd25wb256;
};
};

&gd25wb256 {
status = "okay";
};
Loading
Loading