Skip to content

Upmerge 2021 10 20 #5895

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.

Sign up for GitHub

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

Merged
merged 33 commits into from
Nov 11, 2021
+650 −391
Merged

Upmerge 2021 10 20 #5895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
4d8968c
manifest: Zephyr upmerge
rlubos Oct 19, 2021
faef420
treewide: Rename _image_rom_start symbol
rlubos Oct 20, 2021
f81499f
treewide: Replace deprecated Z_STRUCT_SECTION_* macros
rlubos Oct 20, 2021
ebfd1ab
treewide: Update renamed Bluetooth Kconfigs and symbols
rlubos Oct 20, 2021
b214c92
treewide: Update renamed PM symbol
rlubos Oct 22, 2021
cc74db6
cmake: Update gen_handles.py script usage
rlubos Oct 20, 2021
a28089c
samples: nrf9160: lwm2m_client: Align with upstream float changes
rlubos Oct 20, 2021
a0781c5
samples: peripheral: radio_test: Fix IRQ priorities
rlubos Oct 21, 2021
1e800a7
esb: Make IRQ priorities configurable with Kconfig
rlubos Oct 21, 2021
b7745f8
tests: asset_tracker_v2: Do not create mock for sys_reboot
rlubos Oct 22, 2021
e1fbff8
tests: event_manager: Fix sys_reboot misuse
rlubos Oct 21, 2021
2456a96
tests: drivers: clock_control: Add DTC overlay for nRF9160
rlubos Oct 21, 2021
042c086
treewide: Align with upstream USB changes
rlubos Oct 22, 2021
13b340f
boards: Add common DT label for USB devices
rlubos Oct 22, 2021
0b00d4c
samples: openthread: Align with USB changes
rlubos Oct 22, 2021
a697f47
samples: openthread: coprocessor: Add chosen zephyr,ot-uart
rlubos Oct 20, 2021
a872739
samples: zigbee: Align with USB changes
rlubos Oct 22, 2021
c63a242
samples: bluetooth: Align with USB changes
rlubos Oct 22, 2021
3be9488
applications: connectivity_bridge: Align with USB changes
rlubos Oct 22, 2021
51e9955
applications: Align with USB changes
rlubos Oct 22, 2021
b585224
samples: nrf9160: modem_shell: Align with upstream console changes
rlubos Oct 22, 2021
8aac945
samples: spm: Remove deleted console configs
rlubos Oct 22, 2021
9d6fdae
lib: edge_impulse: Disable FP16 option in samples and apps
rlubos Oct 22, 2021
8e357c3
dts: Add vendor-prefixes.txt file
rlubos Oct 25, 2021
d9b3fd4
samples: crypto: rsa: Remove skip from sample.yaml
rlubos Oct 25, 2021
a22c0b0
samples: keys: random_hw_unique_key: Fix sample.yml
rlubos Oct 25, 2021
2fd0fc7
modules: mcuboot: Enable usb.overlay for mcuboot if USB is present
rlubos Oct 22, 2021
24db13a
tfm: Use CTR instead of HMAC for RNG
SebastianBoe Oct 26, 2021
b09fd36
tests: asset_tracker_v2: Add native_posix conf where needed
rlubos Oct 26, 2021
14985f4
applications: nrf_desktop: Fix setting initial state of QDEC driver
MarekPieta Oct 26, 2021
851feec
drivers: sensor: Align used trigger handlers to API changes
rakons Oct 28, 2021
89496ae
doc: samples: Clarify on how to enable USB support in certain samples
rlubos Nov 3, 2021
c857642
doc: Remove "whitelist" references in nRF Desktop and CAF
rlubos Nov 9, 2021
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
1 change: 1 addition & 0 deletions CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ Kconfig* @tejlmand
/subsys/zigbee/ @tomchy @sebastiandraus
/tests/bluetooth/tester/ @carlescufi @trond-snekvik
/tests/drivers/flash_nop_device/ @de-nordic
/tests/drivers/clock_control/clock_control_mpsl/ @ryanjh
/tests/lib/edge_impulse/ @pdunaj @MarekPieta
/tests/lib/hw_unique_key*/ @oyvindronningstad @Vge0rge
/tests/lib/modem_jwt/ @SeppoTakalo
Expand Down
2 changes: 1 addition & 1 deletion applications/asset_tracker/src/motion/motion.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ static int get_orientation(motion_orientation_state_t *orientation,

/**@brief Callback for sensor trigger events */
static void sensor_trigger_handler(const struct device *dev,
struct sensor_trigger *trigger)
const struct sensor_trigger *trigger)
{
ARG_UNUSED(dev);
ARG_UNUSED(trigger);
Expand Down
2 changes: 1 addition & 1 deletion applications/asset_tracker/src/ui/buzzer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ static void buzzer_disable(void)
pwm_out(0, 0);

#ifdef CONFIG_PM_DEVICE
int err = pm_device_state_set(pwm_dev, PM_DEVICE_STATE_SUSPEND);
int err = pm_device_state_set(pwm_dev, PM_DEVICE_STATE_SUSPENDED);
if (err) {
LOG_ERR("PWM disable failed");
}
Expand Down
2 changes: 1 addition & 1 deletion applications/asset_tracker/src/ui/led_pwm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ void ui_leds_stop(void)
{
k_work_cancel_delayable_sync(&leds.work, &leds.work_sync);
#ifdef CONFIG_PM_DEVICE
int err = pm_device_state_set(leds.pwm_dev, PM_DEVICE_STATE_SUSPEND);
int err = pm_device_state_set(leds.pwm_dev, PM_DEVICE_STATE_SUSPENDED);
if (err) {
LOG_ERR("PWM disable failed");
}
Expand Down
2 changes: 1 addition & 1 deletion applications/asset_tracker/src/ui/nmos.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ static void nmos_pwm_disable(uint32_t nmos_idx)
return;
}

int err = pm_device_state_set(pwm_dev, PM_DEVICE_STATE_SUSPEND);
int err = pm_device_state_set(pwm_dev, PM_DEVICE_STATE_SUSPENDED);
if (err) {
LOG_WRN("PWM disable failed");
}
Expand Down
2 changes: 1 addition & 1 deletion applications/asset_tracker_v2/src/ext_sensors/ext_sensors.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ static ext_sensor_handler_t evt_handler;
static bool initial_trigger;

static void accelerometer_trigger_handler(const struct device *dev,
struct sensor_trigger *trig)
const struct sensor_trigger *trig)
{
int err = 0;
struct sensor_value data[ACCELEROMETER_CHANNELS];
Expand Down
1 change: 0 additions & 1 deletion applications/asset_tracker_v2/tests/debug_module/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ cmock_handle(${MEMFAULT_SDK_DIR}/ports/include/memfault/ports/watchdog.h memfaul

# Create mock for nRF SDK
cmock_handle(${NRF_SDK_DIR}/include/event_manager.h)
cmock_handle(${ZEPHYR_BASE}/include/sys/reboot.h)

# Create mock for Asset Tracker v2 application source files
cmock_handle(${ASSET_TRACKER_V2_DIR}/src/modules/modules_common.h)
Expand Down
3 changes: 3 additions & 0 deletions applications/asset_tracker_v2/tests/debug_module/boards/native_posix.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# The following option is required to silence the linker warning about orphan
# sections. The event manager header files uses orphan sections.
CONFIG_LINKER_ORPHAN_SECTION_PLACE=y
3 changes: 3 additions & 0 deletions applications/asset_tracker_v2/tests/debug_module/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ CONFIG_HEAP_MEM_POOL_SIZE=1024

# Make CONFIG_EVENT_MANAGER_MAX_EVENT_CNT defined
CONFIG_EVENT_MANAGER=y

# Event manager requires sys_reboot()
CONFIG_REBOOT=y
1 change: 0 additions & 1 deletion applications/asset_tracker_v2/tests/gps_module/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ cmock_handle(${ZEPHYR_BASE}/../nrf/include/event_manager.h )
cmock_handle(${ZEPHYR_BASE}/../nrf/include/date_time.h )
cmock_handle(${ZEPHYR_BASE}/../nrf/include/modem/at_cmd.h )
cmock_handle(${ZEPHYR_BASE}/../nrfxlib/nrf_modem/include/nrf_modem_gnss.h )
cmock_handle(${ZEPHYR_BASE}/include/sys/reboot.h sys)



Expand Down
3 changes: 3 additions & 0 deletions applications/asset_tracker_v2/tests/gps_module/boards/native_posix.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# The following option is required to silence the linker warning about orphan
# sections. The event manager header files uses orphan sections.
CONFIG_LINKER_ORPHAN_SECTION_PLACE=y
3 changes: 3 additions & 0 deletions applications/asset_tracker_v2/tests/gps_module/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@ CONFIG_NRF_MODEM_LIB=n

# Make CONFIG_EVENT_MANAGER_MAX_EVENT_CNT defined
CONFIG_EVENT_MANAGER=y

# Event manager requires sys_reboot()
CONFIG_REBOOT=y
17 changes: 17 additions & 0 deletions applications/connectivity_bridge/app.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* Copyright (c) 2021 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/

&zephyr_udc0 {
cdc_acm_uart0 {
compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_0";
};

cdc_acm_uart1 {
compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_1";
};
};
4 changes: 1 addition & 3 deletions applications/connectivity_bridge/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ CONFIG_BRIDGE_MSC_ENABLE=y
CONFIG_BRIDGE_BLE_ENABLE=y

# USB
CONFIG_USB=y
CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor"
CONFIG_USB_DEVICE_PRODUCT="Thingy:91 UART"
Expand All @@ -26,7 +25,6 @@ CONFIG_USB_DEVICE_PID=0x9100
CONFIG_USB_DEVICE_SN="THINGY91 12PLACEHLDRS" # This is overridden at runtime
CONFIG_USB_COMPOSITE_DEVICE=y
CONFIG_USB_CDC_ACM_RINGBUF_SIZE=16384
CONFIG_USB_CDC_ACM_DEVICE_COUNT=2

# Disk and file system
CONFIG_DISK_ACCESS=y
Expand Down Expand Up @@ -89,7 +87,7 @@ CONFIG_BT_DEVICE_NAME_DYNAMIC=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
CONFIG_BT_PERIPHERAL_PREF_MAX_INT=16
CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
CONFIG_BT_BONDABLE=n
CONFIG_BT_LL_SOFTDEVICE=y
Expand Down
2 changes: 1 addition & 1 deletion applications/connectivity_bridge/src/modules/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ source "subsys/logging/Kconfig.template.log_config"

config BRIDGE_CDC_ENABLE
bool "Enable USB CDC ACM"
depends on USB
depends on USB_DEVICE_STACK
select USB_CDC_ACM
help
This option enables USB CDC ACM
Expand Down
2 changes: 1 addition & 1 deletion applications/connectivity_bridge/src/modules/uart_handler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ static void set_uart_power_state(uint8_t dev_idx, bool active)
enum pm_device_state current_state;
enum pm_device_state target_state;

target_state = active ? PM_DEVICE_STATE_ACTIVE : PM_DEVICE_STATE_SUSPEND;
target_state = active ? PM_DEVICE_STATE_ACTIVE : PM_DEVICE_STATE_SUSPENDED;

err = pm_device_state_get(dev, &current_state);
if (err) {
Expand Down
4 changes: 2 additions & 2 deletions applications/connectivity_bridge/src/modules/usb_cdc_handler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#include <logging/log.h>
LOG_MODULE_REGISTER(MODULE, CONFIG_BRIDGE_CDC_LOG_LEVEL);

#define CDC_DEVICE_COUNT CONFIG_USB_CDC_ACM_DEVICE_COUNT
#define CDC_DEVICE_NAME_TEMPLATE CONFIG_USB_CDC_ACM_DEVICE_NAME "_%d"
#define CDC_DEVICE_COUNT 2
#define CDC_DEVICE_NAME_TEMPLATE "CDC_ACM_%d"

#define USB_CDC_DTR_POLL_MS 500
#define USB_CDC_RX_BLOCK_SIZE CONFIG_BRIDGE_BUF_SIZE
Expand Down
1 change: 1 addition & 0 deletions applications/machine_learning/configuration/nrf52840dk_nrf52840/app_ZDebug.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ CONFIG_CPLUSPLUS=y
CONFIG_LIB_CPLUSPLUS=y
CONFIG_STD_CPP11=y
CONFIG_FPU=y
CONFIG_FP16=n

# Use the NCS machine learning model for simulated acceleration signal
CONFIG_EDGE_IMPULSE=y
Expand Down
3 changes: 2 additions & 1 deletion applications/machine_learning/configuration/nrf52840dk_nrf52840/app_ZDebugNUS.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ CONFIG_CPLUSPLUS=y
CONFIG_LIB_CPLUSPLUS=y
CONFIG_STD_CPP11=y
CONFIG_FPU=y
CONFIG_FP16=n

# Use the NCS machine learning model for simulated acceleration signal
CONFIG_EDGE_IMPULSE=y
Expand Down Expand Up @@ -114,7 +115,7 @@ CONFIG_BT_NUS=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=y

Expand Down
1 change: 1 addition & 0 deletions applications/machine_learning/configuration/nrf52840dk_nrf52840/app_ZRelease.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ CONFIG_CPLUSPLUS=y
CONFIG_LIB_CPLUSPLUS=y
CONFIG_STD_CPP11=y
CONFIG_FPU=y
CONFIG_FP16=n

# Use the NCS machine learning model for simulated acceleration signal
CONFIG_EDGE_IMPULSE=y
Expand Down
3 changes: 2 additions & 1 deletion applications/machine_learning/configuration/nrf5340dk_nrf5340_cpuapp/app_ZDebug.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ CONFIG_CPLUSPLUS=y
CONFIG_LIB_CPLUSPLUS=y
CONFIG_STD_CPP11=y
CONFIG_FPU=y
CONFIG_FP16=n

# Use the NCS machine learning model for simulated acceleration signal
CONFIG_EDGE_IMPULSE=y
Expand Down Expand Up @@ -132,7 +133,7 @@ CONFIG_BT_BONDABLE=n
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=42
CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=y

Expand Down
3 changes: 2 additions & 1 deletion applications/machine_learning/configuration/thingy52_nrf52832/app_ZDebug.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ CONFIG_CPLUSPLUS=y
CONFIG_LIB_CPLUSPLUS=y
CONFIG_STD_CPP11=y
CONFIG_FPU=y
CONFIG_FP16=n

# Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
CONFIG_EDGE_IMPULSE=y
Expand Down Expand Up @@ -111,7 +112,7 @@ CONFIG_BT_NUS=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=y

Expand Down
3 changes: 2 additions & 1 deletion applications/machine_learning/configuration/thingy52_nrf52832/app_ZRelease.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ CONFIG_CPLUSPLUS=y
CONFIG_LIB_CPLUSPLUS=y
CONFIG_STD_CPP11=y
CONFIG_FPU=y
CONFIG_FP16=n

# Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
CONFIG_EDGE_IMPULSE=y
Expand Down Expand Up @@ -109,7 +110,7 @@ CONFIG_BT_NUS=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=y

Expand Down
5 changes: 2 additions & 3 deletions applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZDebug.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ CONFIG_CPLUSPLUS=y
CONFIG_LIB_CPLUSPLUS=y
CONFIG_STD_CPP11=y
CONFIG_FPU=y
CONFIG_FP16=n

# Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
CONFIG_EDGE_IMPULSE=y
Expand Down Expand Up @@ -126,7 +127,7 @@ CONFIG_BT_NUS=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=42
CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=y

Expand Down Expand Up @@ -154,7 +155,6 @@ CONFIG_LOG_STRDUP_MAX_STRING=64
################################################################################
# Enable USB CDC ACM

CONFIG_USB=y
CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Application"
CONFIG_USB_DEVICE_VID=0x1915
Expand All @@ -165,7 +165,6 @@ CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y

# Use CDC_ACM_0 for UART console
CONFIG_USB_UART_CONSOLE=y
CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"

################################################################################
# Bootloader Configuration
Expand Down
3 changes: 2 additions & 1 deletion applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZDebugRTT.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ CONFIG_CPLUSPLUS=y
CONFIG_LIB_CPLUSPLUS=y
CONFIG_STD_CPP11=y
CONFIG_FPU=y
CONFIG_FP16=n

# Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
CONFIG_EDGE_IMPULSE=y
Expand Down Expand Up @@ -132,7 +133,7 @@ CONFIG_BT_NUS=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=42
CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=y

Expand Down
3 changes: 2 additions & 1 deletion applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZRelease.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ CONFIG_CPLUSPLUS=y
CONFIG_LIB_CPLUSPLUS=y
CONFIG_STD_CPP11=y
CONFIG_FPU=y
CONFIG_FP16=n

# Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
CONFIG_EDGE_IMPULSE=y
Expand Down Expand Up @@ -125,7 +126,7 @@ CONFIG_BT_NUS=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=42
CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=y

Expand Down
11 changes: 11 additions & 0 deletions applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/dts.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,15 @@
};
};
};

chosen {
zephyr,console = &cdc_acm_uart0;
};
};

&zephyr_udc0 {
cdc_acm_uart0: cdc_acm_uart0 {
compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_0";
};
};
5 changes: 2 additions & 3 deletions applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZDebug.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ CONFIG_CPLUSPLUS=y
CONFIG_LIB_CPLUSPLUS=y
CONFIG_STD_CPP11=y
CONFIG_FPU=y
CONFIG_FP16=n

# Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
CONFIG_EDGE_IMPULSE=y
Expand Down Expand Up @@ -126,7 +127,7 @@ CONFIG_BT_NUS=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=42
CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=y

Expand Down Expand Up @@ -154,7 +155,6 @@ CONFIG_LOG_STRDUP_MAX_STRING=64
################################################################################
# Enable USB CDC ACM

CONFIG_USB=y
CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Application"
CONFIG_USB_DEVICE_VID=0x1915
Expand All @@ -165,7 +165,6 @@ CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y

# Use CDC_ACM_0 for UART console
CONFIG_USB_UART_CONSOLE=y
CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"

################################################################################
# Bootloader Configuration
Expand Down
3 changes: 2 additions & 1 deletion applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZDebugRTT.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ CONFIG_CPLUSPLUS=y
CONFIG_LIB_CPLUSPLUS=y
CONFIG_STD_CPP11=y
CONFIG_FPU=y
CONFIG_FP16=n

# Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
CONFIG_EDGE_IMPULSE=y
Expand Down Expand Up @@ -132,7 +133,7 @@ CONFIG_BT_NUS=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=42
CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=y

Expand Down
3 changes: 2 additions & 1 deletion applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZRelease.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ CONFIG_CPLUSPLUS=y
CONFIG_LIB_CPLUSPLUS=y
CONFIG_STD_CPP11=y
CONFIG_FPU=y
CONFIG_FP16=n

# Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
CONFIG_EDGE_IMPULSE=y
Expand Down Expand Up @@ -125,7 +126,7 @@ CONFIG_BT_NUS=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=42
CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=y

Expand Down
Loading