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

Jump to bottom

manifest: sdk-nrfxlib: nrf_modem: DECT NR+ PHY 1.1.0 preview #16142

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

manifest: sdk-nrfxlib: nrf_modem: DECT NR+ PHY 1.1.0 preview #16142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32a846d
manifest: Update sdk-nrfxlib revision (auto-manifest PR)
NordicBuilder Jun 21, 2024
c4c3932
samples: dect_phy: hello_dect: update sample
lemrey Jun 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
67 changes: 30 additions & 37 deletions samples/dect/dect_phy/hello_dect/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,10 @@ struct phy_ctrl_field_common {
K_SEM_DEFINE(operation_sem, 0, 1);

/* Callback after init operation. */
static void init(const uint64_t *time, int16_t temp, enum nrf_modem_dect_phy_err err,
const struct nrf_modem_dect_phy_modem_cfg *cfg)
static void init(const struct nrf_modem_dect_phy_init_event *evt)
{
if (err) {
LOG_ERR("Init failed, err %d", err);
if (evt->err) {
LOG_ERR("PHY initialization failed, err %d", evt->err);
exit = true;
return;
}
Expand All @@ -50,98 +49,92 @@ static void init(const uint64_t *time, int16_t temp, enum nrf_modem_dect_phy_err
}

/* Callback after deinit operation. */
static void deinit(const uint64_t *time, enum nrf_modem_dect_phy_err err)
static void deinit(const struct nrf_modem_dect_phy_deinit_event *evt)
{
if (err) {
LOG_ERR("Deinit failed, err %d", err);
if (evt->err) {
LOG_ERR("Deinit failed, err %d", evt->err);
return;
}

k_sem_give(&operation_sem);
}

/* Operation complete notification. */
static void op_complete(const uint64_t *time, int16_t temperature,
enum nrf_modem_dect_phy_err err, uint32_t handle)
static void op_complete(const struct nrf_modem_dect_phy_op_complete_event *evt)
{
LOG_DBG("op_complete cb time %"PRIu64" status %d", *time, err);
LOG_DBG("Operation 0x%x complete, result 0x%x time %"PRIu64,
evt->handle, evt->err, evt->time);
k_sem_give(&operation_sem);
}

/* Callback after receive stop operation. */
static void rx_stop(const uint64_t *time, enum nrf_modem_dect_phy_err err, uint32_t handle)
static void cancel(const struct nrf_modem_dect_phy_cancel_event *evt)
{
LOG_DBG("rx_stop cb time %"PRIu64" status %d handle %d", *time, err, handle);
LOG_DBG("Operation 0x%x canceled, result 0x%x time %"PRIu64,
evt->handle, evt->err, evt->time);
k_sem_give(&operation_sem);
}

/* Physical Control Channel reception notification. */
static void pcc(
const uint64_t *time,
const struct nrf_modem_dect_phy_rx_pcc_status *status,
const union nrf_modem_dect_phy_hdr *hdr)
static void pcc(const struct nrf_modem_dect_phy_pcc_event *evt)
{
struct phy_ctrl_field_common *header = (struct phy_ctrl_field_common *)hdr->type_1;
struct phy_ctrl_field_common *header = (struct phy_ctrl_field_common *)evt->hdr.type_1;

LOG_INF("Received header from device ID %d",
header->transmitter_id_hi << 8 | header->transmitter_id_lo);
}

/* Physical Control Channel CRC error notification. */
static void pcc_crc_err(const uint64_t *time,
const struct nrf_modem_dect_phy_rx_pcc_crc_failure *crc_failure)
static void pcc_crc_err(const struct nrf_modem_dect_phy_pcc_crc_failure_event *evt)
{
LOG_DBG("pcc_crc_err cb time %"PRIu64"", *time);
LOG_DBG("CRC error on PCC, time %"PRIu64, evt->time);
}

/* Physical Data Channel reception notification. */
static void pdc(const uint64_t *time,
const struct nrf_modem_dect_phy_rx_pdc_status *status,
const void *data, uint32_t len)
static void pdc(const struct nrf_modem_dect_phy_pdc_event *evt)
{
/* Received RSSI value is in fixed precision format Q14.1 */
LOG_INF("Received data (RSSI: %d.%d): %s",
(status->rssi_2 / 2), (status->rssi_2 & 0b1) * 5, (char *)data);
(evt->rssi_2 / 2), (evt->rssi_2 & 0b1) * 5, (char *)evt->data);
}

/* Physical Data Channel CRC error notification. */
static void pdc_crc_err(
const uint64_t *time, const struct nrf_modem_dect_phy_rx_pdc_crc_failure *crc_failure)
static void pdc_crc_err(const struct nrf_modem_dect_phy_pdc_crc_failure_event *evt)
{
LOG_DBG("pdc_crc_err cb time %"PRIu64"", *time);
LOG_DBG("CRC error on PDC, time %"PRIu64, evt->time);
}

/* RSSI measurement result notification. */
static void rssi(const uint64_t *time, const struct nrf_modem_dect_phy_rssi_meas *status)
static void rssi(const struct nrf_modem_dect_phy_rssi_event *evt)
{
LOG_DBG("rssi cb time %"PRIu64" carrier %d", *time, status->carrier);
LOG_DBG("RSSI measurement, handle 0x%x time %"PRIu64" carrier %d",
evt->handle, evt->time, evt->carrier);
}

/* Callback after link configuration operation. */
static void link_config(const uint64_t *time, enum nrf_modem_dect_phy_err err)
static void link_config(const struct nrf_modem_dect_phy_link_config_event *evt)
{
LOG_DBG("link_config cb time %"PRIu64" status %d", *time, err);
LOG_DBG("Link configuration, result 0x%x", evt->err);
}

/* Callback after time query operation. */
static void time_get(const uint64_t *time, enum nrf_modem_dect_phy_err err)
static void time_get(const struct nrf_modem_dect_phy_time_get_event *evt)
{
LOG_DBG("time_get cb time %"PRIu64" status %d", *time, err);
LOG_DBG("Time query configuration, result 0x%x time %"PRIu64, evt->err, evt->time);
}

/* Callback after capability get operation. */
static void capability_get(const uint64_t *time, enum nrf_modem_dect_phy_err err,
const struct nrf_modem_dect_phy_capability *capability)
static void capability_get(const struct nrf_modem_dect_phy_capability_get_event *evt)
{
LOG_DBG("capability_get cb time %"PRIu64" status %d", *time, err);
LOG_DBG("Capability get, result 0x%x time %"PRIu64, evt->err, evt->time);
}

/* Dect PHY callbacks. */
static struct nrf_modem_dect_phy_callbacks dect_phy_callbacks = {
Copy link
Contributor

Choose a reason for hiding this comment

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

missing radio_config

.init = init,
.deinit = deinit,
.op_complete = op_complete,
.rx_stop = rx_stop,
.cancel = cancel,
.pcc = pcc,
.pcc_crc_err = pcc_crc_err,
.pdc = pdc,
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ manifest:
- name: nrfxlib
repo-path: sdk-nrfxlib
path: nrfxlib
revision: 1b12f5c6ff7932fa2cc8642c189b13ca580c7f86
revision: pull/1397/head
- name: trusted-firmware-m
repo-path: sdk-trusted-firmware-m
path: modules/tee/tf-m/trusted-firmware-m
Expand Down
Loading