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.

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

Upmerge 01.03.2024 #14321

Merged
merged 45 commits into from
Mar 21, 2024
Merged

Upmerge 01.03.2024 #14321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
db4346f
manifest: Pull upmerged repositories
rlubos Mar 1, 2024
8101245
cmake: Stop using deprecated to_hex()
rlubos Feb 6, 2024
ff8a7c0
net: lib: aws_iot: Make strnstr declaration visible on native_sim
rlubos Mar 2, 2024
4a92b6d
bluetooth: Align with bt_iso_chan_send() API change
rlubos Mar 2, 2024
b2ee729
ext: Remove manual linking with posix_subsys
rlubos Mar 2, 2024
854fa99
zigbee: Remove deleted NRF_STORE_REBOOT_TYPE_GPREGRET use
rlubos Mar 2, 2024
8d133ef
samples: peripheral: 802154_phy_test: Fix compiler warning
rlubos Mar 4, 2024
1312d6f
tests: Align with ztest_run_all() API change
rlubos Mar 4, 2024
e46926b
samples: wifi: ble_coex: Align with upstream changes
rlubos Mar 4, 2024
c673b79
modules: hostap: Fix conflict on POSIX sigset_t definition
rlubos Mar 4, 2024
3f237f1
applications: nrf5340_audio: Remove deleted BT_ATT_ENFORCE_FLOW use
rlubos Mar 4, 2024
b5e5848
applications: nrf5340_audio: Align with audio API changes
rlubos Mar 4, 2024
a6b144a
lib: tone: Select specific CMSIS_DSP subsys
rlubos Mar 4, 2024
0affd62
lib: sample_rate_converter: Select specifi CMSIS_DSP subsys
rlubos Mar 4, 2024
28df6ca
samples: wifi: raw_tx_packet: Fix build with POSIX_API
jukkar Mar 5, 2024
8391af6
samples: wifi: monitor: Fix build with POSIX_API
jukkar Mar 5, 2024
8fa47f4
samples: wifi: shell: Fix build with POSIX_API
jukkar Mar 5, 2024
484f9b8
drivers: wifi: nrf700x: Select zephyr promisc mode if needed
jukkar Mar 5, 2024
098ae69
samples: wifi: sta: Fix memory overflow
jukkar Mar 5, 2024
091ec7f
samples: wifi: twt: Fix build with POSIX_API
jukkar Mar 5, 2024
81bfbb1
tests: audio_module: Fix compiler warnings
rlubos Mar 5, 2024
aeecde6
scripts: Add ANT samples to quarantine
rlubos Mar 6, 2024
f741dee
scripts: Extend Zephyr samples/tests quarantine
rlubos Mar 6, 2024
b959025
tests: lwm2m_client_utils: Add stubbing for LWM2M init macros
SeppoTakalo Mar 6, 2024
5a3183c
treewide: Fix float to double promotion error
rlubos Mar 2, 2024
67cfb8c
samples: wifi: softap: Enable file system support
jukkar Mar 6, 2024
0e02f42
modules: hostap: Do not use newlib by default
jukkar Mar 6, 2024
39b9a7f
samples: Remove setting newlibc as a libc
jukkar Mar 6, 2024
a0b44f6
doc: zephyr: drop upstream additional pages
gmarull Mar 6, 2024
9dea16f
applications: asset_tracker_v2: Add missing external flash reference
de-nordic Mar 6, 2024
49ba118
tests: lib: location: Fix mock generation
rlubos Mar 6, 2024
d58efb8
lib: location: Fix POSIX gmtime_r() use
rlubos Mar 6, 2024
bf07ccb
tfm: cmake: Link with mbedcrypto_common and tfm_sprt
SebastianBoe Mar 6, 2024
1b0f37c
samples: bluetooth: throughput: Make uuid128 pointer const
rlubos Mar 7, 2024
9d2d7f2
tests: bluetooth: fast_pair: Fix strnlen() warnings
rlubos Mar 7, 2024
b95428e
samples: net: https_client: Fix build with POSIX_API
rlubos Mar 7, 2024
db7fa23
samples: net: http_server: Fix build with POSIX_API
rlubos Mar 7, 2024
ab50fe8
samples: net: udp: Fix build with POSIX_API
rlubos Mar 7, 2024
39c542d
matter: Make bt_uuid pointers const
rlubos Mar 11, 2024
19d7a36
applications: nrf5340_audio: Fix issues for upmerge
rick1082 Mar 12, 2024
bf0c0f4
applications: nrf5340_audio: Improve unicast client service discover
rick1082 Mar 14, 2024
68acbba
sysbuild: Fix issue with MCUboot not being flashed with PM disabled
nordicjm Mar 14, 2024
01c3ddb
samples: bluetooth: Fix ATT buffers configuration
maje-emb Mar 18, 2024
c31f8ce
doc: nrf: release-notes-changelog: Update upmerged SHAs
rlubos Mar 18, 2024
ce03ac9
net: lib: lwm2m_client_utils: Fix strnlen() warnings
rlubos Mar 21, 2024
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
13 changes: 13 additions & 0 deletions applications/asset_tracker_v2/boards/nrf9160dk_nrf9160_ns.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,17 @@
label = "Green LED 4";
};
};

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

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

&mx25r64 {
status = "okay";
};
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 @@ -374,7 +374,7 @@ int ext_sensors_pressure_get(double *ext_press)
k_spinlock_key_t key = k_spin_lock(&(press_sensor.lock));
#if defined(CONFIG_BME680)
/* Pressure is in kPascals */
*ext_press = sensor_value_to_double(&data) * 1000.0f;
*ext_press = sensor_value_to_double(&data) * 1000.0;
#else
/* Pressure is in Pascals */
*ext_press = sensor_value_to_double(&data);
Expand Down
11 changes: 7 additions & 4 deletions applications/asset_tracker_v2/src/modules/location_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,10 +395,13 @@ void location_event_handler(const struct location_event_data *event_data)
LOG_DBG(" method: %s", location_method_str(event_data->method));
LOG_DBG(" latitude: %.06f", event_data->location.latitude);
LOG_DBG(" longitude: %.06f", event_data->location.longitude);
LOG_DBG(" accuracy: %.01f m", event_data->location.accuracy);
LOG_DBG(" altitude: %.01f m", event_data->location.details.gnss.pvt_data.altitude);
LOG_DBG(" speed: %.01f m", event_data->location.details.gnss.pvt_data.speed);
LOG_DBG(" heading: %.01f deg", event_data->location.details.gnss.pvt_data.heading);
LOG_DBG(" accuracy: %.01f m", (double)event_data->location.accuracy);
LOG_DBG(" altitude: %.01f m",
(double)event_data->location.details.gnss.pvt_data.altitude);
LOG_DBG(" speed: %.01f m",
(double)event_data->location.details.gnss.pvt_data.speed);
LOG_DBG(" heading: %.01f deg",
(double)event_data->location.details.gnss.pvt_data.heading);

if (event_data->location.datetime.valid) {
LOG_DBG(" date: %04d-%02d-%02d",
Expand Down
2 changes: 1 addition & 1 deletion applications/asset_tracker_v2/src/modules/modem_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ static void lte_evt_handler(const struct lte_lc_evt *const evt)

len = snprintf(log_buf, sizeof(log_buf),
"eDRX parameter update: eDRX: %.2f, PTW: %.2f",
evt->edrx_cfg.edrx, evt->edrx_cfg.ptw);
(double)evt->edrx_cfg.edrx, (double)evt->edrx_cfg.ptw);
if (len > 0) {
LOG_DBG("%s", log_buf);
}
Expand Down
2 changes: 1 addition & 1 deletion applications/machine_learning/src/events/ml_result_event.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ static void log_ml_result_event(const struct app_event_header *aeh)
const struct ml_result_event *event = cast_ml_result_event(aeh);

APP_EVENT_MANAGER_LOG(aeh, "%s val: %0.2f anomaly: %0.2f",
event->label, event->value, event->anomaly);
event->label, (double)event->value, (double)event->anomaly);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this needed - aren't all float arguments promoted to double in such function calls anyway?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, they are. This results in a warning however (since zephyrproject-rtos/zephyr#57154) as Zephyr enabled -Wdouble-promotion compiler flag, which gives a warning in such cases (implict promotion to double). Therefore, we either need to make the promotion explicit to avoid the warning, or find some other way to avoid implicit promotion.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks. zephyr should have taken on java instead...

}

static void profile_ml_result_event(struct log_event_buf *buf,
Expand Down
4 changes: 2 additions & 2 deletions applications/machine_learning/src/modules/led_state.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ LOG_MODULE_REGISTER(MODULE, CONFIG_ML_APP_LED_STATE_LOG_LEVEL);
#define DISPLAY_SIM_SIGNAL IS_ENABLED(CONFIG_ML_APP_SENSOR_SIM_EVENTS)
#define DISPLAY_DATA_FORWARDER IS_ENABLED(CONFIG_ML_APP_EI_DATA_FORWARDER_EVENTS)

#define ANOMALY_THRESH (CONFIG_ML_APP_LED_STATE_ANOMALY_THRESH / 1000.0)
#define VALUE_THRESH (CONFIG_ML_APP_LED_STATE_VALUE_THRESH / 1000.0)
#define ANOMALY_THRESH (CONFIG_ML_APP_LED_STATE_ANOMALY_THRESH / 1000.0f)
#define VALUE_THRESH (CONFIG_ML_APP_LED_STATE_VALUE_THRESH / 1000.0f)
#define PREDICTION_STREAK_THRESH CONFIG_ML_APP_LED_STATE_PREDICTION_STREAK_THRESH

BUILD_ASSERT(PREDICTION_STREAK_THRESH > 0);
Expand Down
6 changes: 3 additions & 3 deletions applications/matter_bridge/src/app_task.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ using namespace ::chip::DeviceLayer;
namespace
{
#ifdef CONFIG_BRIDGED_DEVICE_BT
static bt_uuid *sUuidLbs = BT_UUID_LBS;
static bt_uuid *sUuidEs = BT_UUID_ESS;
static bt_uuid *sUuidServices[] = { sUuidLbs, sUuidEs };
static const bt_uuid *sUuidLbs = BT_UUID_LBS;
static const bt_uuid *sUuidEs = BT_UUID_ESS;
static const bt_uuid *sUuidServices[] = { sUuidLbs, sUuidEs };
static constexpr uint8_t kUuidServicesNumber = ARRAY_SIZE(sUuidServices);
/**
* @brief Blink rates for indication the BLE Connectivity Manager state.
Expand Down
10 changes: 5 additions & 5 deletions applications/matter_bridge/src/ble_providers/ble_environmental_data_provider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ using namespace ::chip;
using namespace ::chip::app;
using namespace Nrf;

static bt_uuid *sServiceUuid = BT_UUID_ESS;
static bt_uuid *sUuidTemperature = BT_UUID_TEMPERATURE;
static bt_uuid *sUuidHumidity = BT_UUID_HUMIDITY;
static bt_uuid *sUuidCcc = BT_UUID_GATT_CCC;
static const bt_uuid *sServiceUuid = BT_UUID_ESS;
static const bt_uuid *sUuidTemperature = BT_UUID_TEMPERATURE;
static const bt_uuid *sUuidHumidity = BT_UUID_HUMIDITY;
static const bt_uuid *sUuidCcc = BT_UUID_GATT_CCC;

bt_gatt_read_params BleEnvironmentalDataProvider::sHumidityReadParams{};

Expand All @@ -31,7 +31,7 @@ BleEnvironmentalDataProvider *GetProvider(bt_conn *conn)
BLEConnectivityManager::Instance().FindBLEProvider(*bt_conn_get_dst(conn)));
}

bt_uuid *BleEnvironmentalDataProvider::GetServiceUuid()
const bt_uuid *BleEnvironmentalDataProvider::GetServiceUuid()
{
return sServiceUuid;
}
Expand Down
2 changes: 1 addition & 1 deletion applications/matter_bridge/src/ble_providers/ble_environmental_data_provider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class BleEnvironmentalDataProvider : public Nrf::BLEBridgedDeviceProvider {
void NotifyUpdateState(chip::ClusterId clusterId, chip::AttributeId attributeId, void *data,
size_t dataSize) override;
CHIP_ERROR UpdateState(chip::ClusterId clusterId, chip::AttributeId attributeId, uint8_t *buffer) override;
bt_uuid *GetServiceUuid() override;
const bt_uuid *GetServiceUuid() override;
int ParseDiscoveredData(bt_gatt_dm *discoveredData) override;

private:
Expand Down
10 changes: 5 additions & 5 deletions applications/matter_bridge/src/ble_providers/ble_lbs_data_provider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ using namespace ::chip;
using namespace ::chip::app;
using namespace Nrf;

static bt_uuid *sServiceUuid = BT_UUID_LBS;
static bt_uuid *sUuidLED = BT_UUID_LBS_LED;
static bt_uuid *sUuidButton = BT_UUID_LBS_BUTTON;
static bt_uuid *sUuidCcc = BT_UUID_GATT_CCC;
static const bt_uuid *sServiceUuid = BT_UUID_LBS;
static const bt_uuid *sUuidLED = BT_UUID_LBS_LED;
static const bt_uuid *sUuidButton = BT_UUID_LBS_BUTTON;
static const bt_uuid *sUuidCcc = BT_UUID_GATT_CCC;

#ifdef CONFIG_BRIDGE_ONOFF_LIGHT_SWITCH_BRIDGED_DEVICE
void ProcessCommand(const EmberBindingTableEntry &aBinding, OperationalDeviceProxy *aDevice, Nrf::Matter::BindingHandler::BindingData &aData)
Expand Down Expand Up @@ -177,7 +177,7 @@ CHIP_ERROR BleLBSDataProvider::UpdateState(chip::ClusterId clusterId, chip::Attr
return CHIP_NO_ERROR;
}

bt_uuid *BleLBSDataProvider::GetServiceUuid()
const bt_uuid *BleLBSDataProvider::GetServiceUuid()
{
return sServiceUuid;
}
Expand Down
2 changes: 1 addition & 1 deletion applications/matter_bridge/src/ble_providers/ble_lbs_data_provider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class BleLBSDataProvider : public Nrf::BLEBridgedDeviceProvider {
static uint8_t GattNotifyCallback(bt_conn *conn, bt_gatt_subscribe_params *params, const void *data,
uint16_t length);

bt_uuid *GetServiceUuid() override;
const bt_uuid *GetServiceUuid() override;
int ParseDiscoveredData(bt_gatt_dm *discoveredData) override;

private:
Expand Down
3 changes: 3 additions & 0 deletions applications/nrf5340_audio/broadcast_source/Kconfig.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
config BT_CAP_INITIATOR
default y

config BT_MAX_CONN
default 1

# Broadcasting Device - 0x0885
config BT_DEVICE_APPEARANCE
default 2181
Expand Down
2 changes: 1 addition & 1 deletion applications/nrf5340_audio/src/audio/audio_datapath.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,7 +1129,7 @@ static int cmd_i2s_tone_play(const struct shell *shell, size_t argc, const char
}

shell_print(shell, "Tone play: %d Hz for %d ms with amplitude %.02f", freq, dur_ms,
amplitude);
(double)amplitude);

return ret;
}
Expand Down
11 changes: 11 additions & 0 deletions applications/nrf5340_audio/src/bluetooth/bt_content_control/media/bt_content_ctrl_media.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ static void mcc_discover_mcs_cb(struct bt_conn *conn, int err)
}
}

#if defined(CONFIG_BT_MCC_SET_MEDIA_CONTROL_POINT)
/**
* @brief Callback handler for sent MCS commands.
*
Expand All @@ -143,6 +144,7 @@ static void mcc_send_command_cb(struct bt_conn *conn, int err, const struct mpl_
cmd->param);
}
}
#endif /* defined(CONFIG_BT_MCC_SET_MEDIA_CONTROL_POINT) */

/**
* @brief Callback handler for received notifications.
Expand All @@ -160,6 +162,7 @@ static void mcc_cmd_notification_cb(struct bt_conn *conn, int err, const struct
}
}

#if defined(CONFIG_BT_MCC_READ_MEDIA_STATE)
/**
* @brief Callback handler for reading media state.
*
Expand All @@ -177,6 +180,7 @@ static void mcc_read_media_state_cb(struct bt_conn *conn, int err, uint8_t state

media_player_state = state;
}
#endif /* defined(CONFIG_BT_MCC_READ_MEDIA_STATE) */

/**
* @brief Callback handler for received MCS commands.
Expand Down Expand Up @@ -462,10 +466,17 @@ int bt_content_ctrl_media_client_init(void)

static struct bt_mcc_cb mcc_cb;




mcc_cb.discover_mcs = mcc_discover_mcs_cb;
#if defined(CONFIG_BT_MCC_SET_MEDIA_CONTROL_POINT)
mcc_cb.send_cmd = mcc_send_command_cb;
#endif /* defined(CONFIG_BT_MCC_SET_MEDIA_CONTROL_POINT) */
mcc_cb.cmd_ntf = mcc_cmd_notification_cb;
#if defined(CONFIG_BT_MCC_READ_MEDIA_STATE)
mcc_cb.read_media_state = mcc_read_media_state_cb;
#endif /* defined(CONFIG_BT_MCC_READ_MEDIA_STATE) */
return bt_mcc_init(&mcc_cb);
}

Expand Down
4 changes: 0 additions & 4 deletions applications/nrf5340_audio/src/bluetooth/bt_management/controller_config/Kconfig.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
# Bluetooth controller type
if BT_LL_ACS_NRF53

# Not supported on LE Audio Controller Subsystem for nRF53
config BT_ATT_ENFORCE_FLOW
default n

# Disable Zephyr HCI Vendor-Specific extensions
config BT_HCI_VS_EXT
default n
Expand Down
Loading
Loading