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

West manifest usage and ZSWatch rev 3 support #79

Merged
merged 11 commits into from
Oct 1, 2023
Prev Previous commit
Next Next commit
Update to latest Zephyr main. Fix depricated warning.
jakkra committed Sep 19, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 9b3662d7a3fe14a50bee0c4f3332efa6bc109929
2 changes: 0 additions & 2 deletions app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_3.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
CONFIG_NFCT_PINS_AS_GPIOS=y

#---------------
# FLASH
#-----------------
Original file line number Diff line number Diff line change
@@ -14,6 +14,10 @@

};

&uicr {
nfct-pins-as-gpios;
};

/ {

chosen {
16 changes: 1 addition & 15 deletions app/west.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,15 @@
# Copyright (c) 2021 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0

manifest:
self:
west-commands: scripts/west-commands.yml

#remotes:
# - name: ncs
# url-base: https://github.com/nrfconnect

remotes:
- name: zephyrproject-rtos
url-base: https://github.com/zephyrproject-rtos

#projects:
# - name: nrf
# remote: ncs
# repo-path: sdk-nrf
# revision: v2.4.2
# import: true

projects:
- name: zephyr
remote: zephyrproject-rtos
revision: 8aa6531aede19a0e4f3871f66ee518b0b5cc76b9
revision: 2ea2d37d60ada33bdf051eb9d699f4db9123c3ff
import:
name-blocklist:
- ci-tools