Skip to content

Commit 26cfaea

Browse files
mniestrojmniestroj
committed
bump NCS to 3.2.1
Signed-off-by: Marcin Niestroj <m.niestroj@emb.dev>
1 parent 35e3181 commit 26cfaea

File tree

7 files changed

+36
-40
lines changed

7 files changed

+36
-40
lines changed

‎examples/zephyr/common/Kconfig‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,6 @@ config GOLIOTH_SAMPLE_DHCP_BIND
3434
help
3535
Obtain an IPv4 address from the DHCP server.
3636

37-
# NCS and Zephyr use different integer sizes for network management events
38-
config GOLIOTH_SAMPLE_NET_EVENT_SIZE
39-
int
40-
default 64 if !NRF_SECURITY
41-
default 32 if NRF_SECURITY
42-
4337
config GOLIOTH_SAMPLE_NRF91_LTE_MONITOR
4438
bool "nRF91 LTE monitor"
4539
default y

‎examples/zephyr/common/net_connect.c‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,8 @@ struct wait_data
1717
struct net_mgmt_event_callback cb;
1818
};
1919

20-
#if CONFIG_GOLIOTH_SAMPLE_NET_EVENT_SIZE == 32
21-
typedef uint32_t net_event_t;
22-
#elif CONFIG_GOLIOTH_SAMPLE_NET_EVENT_SIZE == 64
23-
typedef uint64_t net_event_t;
24-
#else
25-
#error "CONFIG_GOLIOTH_SAMPLE_NET_SIZE invalid"
26-
#endif
27-
2820
static void event_cb_handler(struct net_mgmt_event_callback *cb,
29-
net_event_t mgmt_event,
21+
uint64_t mgmt_event,
3022
struct net_if *iface)
3123
{
3224
struct wait_data *wait = CONTAINER_OF(cb, struct wait_data, cb);
@@ -37,7 +29,7 @@ static void event_cb_handler(struct net_mgmt_event_callback *cb,
3729
}
3830
}
3931

40-
static void wait_for_net_event(struct net_if *iface, net_event_t event)
32+
static void wait_for_net_event(struct net_if *iface, uint64_t event)
4133
{
4234
struct wait_data wait;
4335

‎examples/zephyr/common/nrf91_lte_monitor.c‎

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,45 @@ static void lte_handler(const struct lte_lc_evt *const evt)
2323
case LTE_LC_NW_REG_NOT_REGISTERED:
2424
LOG_INF("Network: Not registered");
2525
break;
26+
case LTE_LC_NW_REG_NO_SUITABLE_CELL:
27+
LOG_INF("Network: No suitable cell");
28+
break;
2629
case LTE_LC_NW_REG_REGISTERED_HOME:
2730
LOG_INF("Network: Registered (home)");
2831
break;
29-
case LTE_LC_NW_REG_SEARCHING:
30-
LOG_INF("Network: Searching");
32+
case LTE_LC_NW_REG_REGISTERED_ROAMING:
33+
LOG_INF("Network: Registered (roaming)");
3134
break;
3235
case LTE_LC_NW_REG_REGISTRATION_DENIED:
3336
LOG_INF("Network: Registration denied");
3437
break;
35-
case LTE_LC_NW_REG_UNKNOWN:
36-
LOG_INF("Network: Unknown");
38+
case LTE_LC_NW_REG_RX_ONLY_NOT_REGISTERED:
39+
LOG_INF("Network: RX only, not registered");
3740
break;
38-
case LTE_LC_NW_REG_REGISTERED_ROAMING:
39-
LOG_INF("Network: Registered (roaming)");
41+
case LTE_LC_NW_REG_RX_ONLY_REGISTERED_HOME:
42+
LOG_INF("Network: RX only, registered (home)");
43+
break;
44+
case LTE_LC_NW_REG_RX_ONLY_REGISTERED_ROAMING:
45+
LOG_INF("Network: RX only, registered (roaming)");
46+
break;
47+
case LTE_LC_NW_REG_RX_ONLY_REGISTRATION_DENIED:
48+
LOG_INF("Network: RX only, registration denied");
49+
break;
50+
case LTE_LC_NW_REG_RX_ONLY_SEARCHING:
51+
LOG_INF("Network: RX only, searching");
52+
break;
53+
case LTE_LC_NW_REG_RX_ONLY_UNKNOWN:
54+
LOG_INF("Network: RX only, unknown");
55+
break;
56+
case LTE_LC_NW_REG_SEARCHING:
57+
LOG_INF("Network: Searching");
4058
break;
4159
case LTE_LC_NW_REG_UICC_FAIL:
4260
LOG_INF("Network: UICC fail");
4361
break;
62+
case LTE_LC_NW_REG_UNKNOWN:
63+
LOG_INF("Network: Unknown");
64+
break;
4465
}
4566
break;
4667
case LTE_LC_EVT_RRC_UPDATE:
@@ -55,7 +76,7 @@ static void lte_handler(const struct lte_lc_evt *const evt)
5576
}
5677
break;
5778
case LTE_LC_EVT_MODEM_EVENT:
58-
switch (evt->modem_evt)
79+
switch (evt->modem_evt.type)
5980
{
6081
case LTE_LC_MODEM_EVT_RESET_LOOP:
6182
LOG_INF("Modem: Reset Loop detected");

‎examples/zephyr/location/Kconfig‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ configdefault WIFI_ESP_AT_SCAN_MAC_ADDRESS
1717
configdefault WIFI_ESP_AT_SCAN_RESULT_RSSI_ORDERED
1818
default y
1919

20-
config GOLIOTH_LOCATION_SAMPLE_NET_EVENT_SIZE
21-
int
22-
default 32 if NRF_SECURITY
23-
default 64 if !NRF_SECURITY
24-
2520
source "${ZEPHYR_GOLIOTH_FIRMWARE_SDK_MODULE_DIR}/examples/zephyr/common/Kconfig.defconfig"
2621

2722
config APP_LOCATION_GET_INTERVAL

‎examples/zephyr/location/src/cellular_nrf91.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@ static const char *lte_mode_to_str(enum lte_lc_lte_mode mode)
2424
{
2525
switch (mode)
2626
{
27+
case LTE_LC_LTE_MODE_NONE:
28+
return "NONE";
2729
case LTE_LC_LTE_MODE_LTEM:
2830
return "LTEM";
2931
case LTE_LC_LTE_MODE_NBIOT:
3032
return "NBIOT";
31-
case LTE_LC_LTE_MODE_NONE:
32-
return "NONE";
33+
case LTE_LC_LTE_MODE_NTN_NBIOT:
34+
return "NTN_NBIOT";
3335
}
3436

3537
return "unknown";

‎examples/zephyr/location/src/main.c‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@ LOG_MODULE_REGISTER(location_main, LOG_LEVEL_DBG);
1919

2020
#include "cellular.h"
2121

22-
#if CONFIG_GOLIOTH_LOCATION_SAMPLE_NET_EVENT_SIZE == 32
23-
typedef uint32_t net_event_t;
24-
#elif CONFIG_GOLIOTH_LOCATION_SAMPLE_NET_EVENT_SIZE == 64
25-
typedef uint64_t net_event_t;
26-
#else
27-
#error "CONFIG_GOLIOTH_LOCATION_SAMPLE_NET_EVENT_SIZE invalid"
28-
#endif
29-
3022
struct golioth_client *client;
3123
static K_SEM_DEFINE(connected, 0, 1);
3224

@@ -111,7 +103,7 @@ static void wifi_scan_done_process(void)
111103
}
112104

113105
static void wifi_mgmt_event_handler(struct net_mgmt_event_callback *cb,
114-
net_event_t mgmt_event,
106+
uint64_t mgmt_event,
115107
struct net_if *iface)
116108
{
117109
switch (mgmt_event)

‎west-ncs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
manifest:
22
projects:
33
- name: nrf
4-
revision: v3.1.1
4+
revision: v3.2.1
55
url: https://github.com/nrfconnect/sdk-nrf
66
import: true
77

0 commit comments

Comments
 (0)