Skip to content

Commit a9bfffa

Browse files
gminngminn
committed
Merge branch 'main' into dogfood
2 parents 7e2eb13 + fd73775 commit a9bfffa

File tree

342 files changed

+14480
-2639
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

342 files changed

+14480
-2639
lines changed

‎CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ Kconfig* @tejlmand
139139
/lib/data_fifo/ @koffes @alexsven @erikrobstad @rick1082 @gWacey
140140
/lib/pcm_mix/ @koffes @alexsven @erikrobstad @rick1082 @gWacey
141141
/lib/pcm_stream_channel_modifier/ @koffes @alexsven @erikrobstad @rick1082 @gWacey
142+
/lib/sample_rate_converter/ @andvib @gWacey
142143
/lib/tone/ @koffes @alexsven @erikrobstad @rick1082 @gWacey
143144
/modules/ @tejlmand
144145
/modules/hostap/ @krish2718 @jukkar @rado17 @sachinthegreen @rlubos
@@ -296,6 +297,7 @@ Kconfig* @tejlmand
296297
/tests/lib/data_fifo/ @koffes @alexsven @erikrobstad @rick1082 @gWacey
297298
/tests/lib/pcm_mix/ @koffes @alexsven @erikrobstad @rick1082 @gWacey
298299
/tests/lib/pcm_stream_channel_modifier/ @koffes @alexsven @erikrobstad @rick1082 @gWacey
300+
/tests/lib/sample_rate_converter/ @andvib @gWacey
299301
/tests/lib/tone/ @koffes @alexsven @erikrobstad @rick1082 @gWacey
300302
/tests/modules/lib/zcbor/ @oyvindronningstad
301303
/tests/modules/mcuboot/direct_xip/ @hakonfam

‎applications/asset_tracker_v2/overlay-lwm2m.conf‎

Lines changed: 48 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,64 @@ CONFIG_LWM2M_RW_SENML_CBOR_RECORDS=45
2626
CONFIG_ZCBOR=y
2727
CONFIG_ZCBOR_CANONICAL=y
2828

29-
# Enable TLS session caching to prevent doing a full TLS handshake for every send.
29+
# Enable DTLS Connection Identifier and TLS session caching
30+
# to prevent doing a full TLS handshake for every send.
3031
CONFIG_LWM2M_TLS_SESSION_CACHING=y
32+
CONFIG_LWM2M_DTLS_CID=y
3133

32-
# Set uptime to once every 12 hours.
34+
# Set uptime to 12 hours.
35+
# Update every 60 minutes (3600 s)
3336
CONFIG_LWM2M_ENGINE_DEFAULT_LIFETIME=43200
37+
CONFIG_LWM2M_UPDATE_PERIOD=3600
38+
CONFIG_LWM2M_SECONDS_TO_UPDATE_EARLY=60
3439

3540
# LwM2M Queue Mode
3641
CONFIG_LWM2M_QUEUE_MODE_ENABLED=y
37-
CONFIG_LWM2M_RD_CLIENT_SUSPEND_SOCKET_AT_IDLE=y
42+
CONFIG_LWM2M_RD_CLIENT_STOP_POLLING_AT_IDLE=y
3843
# Sets the duration that the lwm2m engine will be polling for data after transmission before
3944
# the socket is closed.
4045
CONFIG_LWM2M_QUEUE_MODE_UPTIME=30
4146

42-
## Set Requested Active Time (RAT) to 60 seconds. Preferably a little bit longer than the
43-
## configured LWM2M_QUEUE_MODE_UPTIME. Due to NAT/firewall UDP connections are usually
44-
## closed within 30-60 seconds so there is in general no point in setting a longer
45-
## Queue mode uptime / LTE PSM active time.
46-
CONFIG_LTE_PSM_REQ_RAT="00100001"
47+
# Configure PSM mode
48+
CONFIG_LTE_PSM_REQ=y
49+
# Request periodic TAU of 3600 seconds (60 minutes)
50+
CONFIG_LTE_PSM_REQ_RPTAU="00000110"
51+
52+
# Set Requested Active Time (RAT) to 30 seconds. Preferably same as the
53+
# configured LWM2M_QUEUE_MODE_UPTIME. Due to NAT/firewall UDP connections are usually
54+
# closed within 30-60 seconds so there is in general no point in setting a longer
55+
# Queue mode uptime / LTE PSM active time.
56+
CONFIG_LTE_PSM_REQ_RAT="00001111"
57+
58+
# Request eDRX mode
59+
CONFIG_LTE_EDRX_REQ=y
60+
61+
# Requested eDRX cycle length for LTE-M and NB-IoT
62+
# This should be fine-tuned for the network and the chosen server.
63+
# Lowest value is the most responsive, but uses more energy during the active eDRX period.
64+
# Longer period may cause more CoAP packet drops on server requests.
65+
# "0000" is 5.12 s
66+
# "0001" is 10.24 s
67+
# "0010" is 20.48 s.
68+
CONFIG_LTE_EDRX_REQ_VALUE_LTE_M="0000"
69+
CONFIG_LTE_EDRX_REQ_VALUE_NBIOT="0000"
70+
71+
# Request Paging time window of 1.28 seconds for LTE-M
72+
CONFIG_LTE_PTW_VALUE_LTE_M="0000"
73+
74+
# Request Paging time window of 2.56 seconds for NB-IoT
75+
CONFIG_LTE_PTW_VALUE_NBIOT="0000"
76+
77+
# Get notification before Tracking Area Update (TAU). Notification triggers registration
78+
# update and TAU will be sent with the update which decreases power consumption.
79+
CONFIG_LTE_LC_TAU_PRE_WARNING_NOTIFICATIONS=y
80+
81+
# Optimize powersaving by using tickless mode in LwM2M engine
82+
CONFIG_NET_SOCKETPAIR=y
83+
CONFIG_LWM2M_TICKLESS=y
84+
85+
# Enable Release Assistance Indication
86+
CONFIG_LWM2M_CLIENT_UTILS_RAI=y
4787

4888
# Use LwM2M client bootstrap server.
4989
# CONFIG_LWM2M_RD_CLIENT_SUPPORT_BOOTSTRAP=y

‎applications/asset_tracker_v2/src/cloud/cloud_codec/lwm2m/lwm2m_codec_helpers.c‎

Lines changed: 50 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,33 @@ int lwm2m_codec_helpers_setup_resources(void)
240240
return err;
241241
}
242242

243+
err = lwm2m_set_res_buf(&LWM2M_OBJ(LWM2M_OBJECT_DEVICE_ID, 0, MODEL_NUMBER_RID),
244+
CONFIG_BOARD,
245+
(uint16_t)sizeof(CONFIG_BOARD),
246+
(uint16_t)sizeof(CONFIG_BOARD),
247+
LWM2M_RES_DATA_FLAG_RO);
248+
if (err) {
249+
return err;
250+
}
251+
252+
err = lwm2m_set_res_buf(&LWM2M_OBJ(LWM2M_OBJECT_DEVICE_ID, 0, HARDWARE_VERSION_RID),
253+
CONFIG_SOC,
254+
(uint16_t)sizeof(CONFIG_SOC),
255+
(uint16_t)sizeof(CONFIG_SOC),
256+
LWM2M_RES_DATA_FLAG_RO);
257+
if (err) {
258+
return err;
259+
}
260+
261+
err = lwm2m_set_res_buf(&LWM2M_OBJ(LWM2M_OBJECT_DEVICE_ID, 0, MANUFACTURER_RID),
262+
CONFIG_CLOUD_CODEC_MANUFACTURER,
263+
(uint16_t)sizeof(CONFIG_CLOUD_CODEC_MANUFACTURER),
264+
(uint16_t)sizeof(CONFIG_CLOUD_CODEC_MANUFACTURER),
265+
LWM2M_RES_DATA_FLAG_RO);
266+
if (err) {
267+
return err;
268+
}
269+
243270
#if defined(CONFIG_CLOUD_CODEC_LWM2M_THINGY91_SENSORS)
244271
err = lwm2m_set_res_buf(&LWM2M_OBJ(IPSO_OBJECT_PRESSURE_ID, 0, TIMESTAMP_RID),
245272
&pressure_ts, sizeof(pressure_ts),
@@ -263,23 +290,23 @@ int lwm2m_codec_helpers_setup_resources(void)
263290
}
264291

265292
err = lwm2m_set_res_buf(&LWM2M_OBJ(IPSO_OBJECT_TEMP_SENSOR_ID, 0, SENSOR_UNITS_RID),
266-
BME680_TEMP_UNIT, (uint16_t)strlen(BME680_TEMP_UNIT),
267-
(uint16_t)strlen(BME680_TEMP_UNIT), LWM2M_RES_DATA_FLAG_RO);
293+
BME680_TEMP_UNIT, (uint16_t)strlen(BME680_TEMP_UNIT) + 1,
294+
(uint16_t)strlen(BME680_TEMP_UNIT) + 1, LWM2M_RES_DATA_FLAG_RO);
268295
if (err) {
269296
return err;
270297
}
271298
err = lwm2m_set_res_buf(&LWM2M_OBJ(IPSO_OBJECT_HUMIDITY_SENSOR_ID, 0,
272299
SENSOR_UNITS_RID),
273-
BME680_HUMID_UNIT, (uint16_t)strlen(BME680_HUMID_UNIT),
274-
(uint16_t)strlen(BME680_HUMID_UNIT),
300+
BME680_HUMID_UNIT, (uint16_t)strlen(BME680_HUMID_UNIT) + 1,
301+
(uint16_t)strlen(BME680_HUMID_UNIT) + 1,
275302
LWM2M_RES_DATA_FLAG_RO);
276303
if (err) {
277304
return err;
278305
}
279306

280307
err = lwm2m_set_res_buf(&LWM2M_OBJ(IPSO_OBJECT_PRESSURE_ID, 0, SENSOR_UNITS_RID),
281-
BME680_PRESSURE_UNIT, (uint16_t)strlen(BME680_PRESSURE_UNIT),
282-
(uint16_t)strlen(BME680_PRESSURE_UNIT),
308+
BME680_PRESSURE_UNIT, (uint16_t)strlen(BME680_PRESSURE_UNIT) + 1,
309+
(uint16_t)strlen(BME680_PRESSURE_UNIT) + 1,
283310
LWM2M_RES_DATA_FLAG_RO);
284311
if (err) {
285312
return err;
@@ -293,8 +320,8 @@ int lwm2m_codec_helpers_setup_resources(void)
293320

294321
err = lwm2m_set_res_buf(
295322
&LWM2M_OBJ(IPSO_OBJECT_PUSH_BUTTON_ID, BUTTON1_OBJ_INST_ID, APPLICATION_TYPE_RID),
296-
BUTTON1_APP_NAME, (uint16_t)strlen(BUTTON1_APP_NAME),
297-
(uint16_t)strlen(BUTTON1_APP_NAME), LWM2M_RES_DATA_FLAG_RO);
323+
BUTTON1_APP_NAME, (uint16_t)strlen(BUTTON1_APP_NAME) + 1,
324+
(uint16_t)strlen(BUTTON1_APP_NAME) + 1, LWM2M_RES_DATA_FLAG_RO);
298325
if (err) {
299326
return err;
300327
}
@@ -307,12 +334,11 @@ int lwm2m_codec_helpers_setup_resources(void)
307334
}
308335

309336
if (CONFIG_LWM2M_IPSO_PUSH_BUTTON_INSTANCE_COUNT == 2) {
310-
err = lwm2m_set_res_buf(&LWM2M_OBJ(IPSO_OBJECT_PUSH_BUTTON_ID,
311-
BUTTON2_OBJ_INST_ID,
312-
APPLICATION_TYPE_RID),
313-
BUTTON2_APP_NAME, (uint16_t)strlen(BUTTON2_APP_NAME),
314-
(uint16_t)strlen(BUTTON2_APP_NAME),
315-
LWM2M_RES_DATA_FLAG_RO);
337+
err = lwm2m_set_res_buf(&LWM2M_OBJ(IPSO_OBJECT_PUSH_BUTTON_ID, BUTTON2_OBJ_INST_ID,
338+
APPLICATION_TYPE_RID),
339+
BUTTON2_APP_NAME, (uint16_t)strlen(BUTTON2_APP_NAME) + 1,
340+
(uint16_t)strlen(BUTTON2_APP_NAME) + 1,
341+
LWM2M_RES_DATA_FLAG_RO);
316342
if (err) {
317343
return err;
318344
}
@@ -669,17 +695,17 @@ int lwm2m_codec_helpers_set_modem_dynamic_data(struct cloud_data_modem_dynamic *
669695

670696
err = lwm2m_set_res_buf(&LWM2M_OBJ(LWM2M_OBJECT_CONNECTIVITY_MONITORING_ID,
671697
0, IP_ADDRESSES, 0),
672-
modem_dynamic->ip, (uint16_t)strlen(modem_dynamic->ip),
673-
(uint16_t)strlen(modem_dynamic->ip),
698+
modem_dynamic->ip, (uint16_t)strlen(modem_dynamic->ip) + 1,
699+
(uint16_t)strlen(modem_dynamic->ip) + 1,
674700
LWM2M_RES_DATA_FLAG_RO);
675701
if (err) {
676702
return err;
677703
}
678704

679705
err = lwm2m_set_res_buf(&LWM2M_OBJ(LWM2M_OBJECT_CONNECTIVITY_MONITORING_ID,
680706
0, APN, 0),
681-
modem_dynamic->apn, (uint16_t)strlen(modem_dynamic->apn),
682-
(uint16_t)strlen(modem_dynamic->apn),
707+
modem_dynamic->apn, (uint16_t)strlen(modem_dynamic->apn) + 1,
708+
(uint16_t)strlen(modem_dynamic->apn) + 1,
683709
LWM2M_RES_DATA_FLAG_RO);
684710
if (err) {
685711
return err;
@@ -737,46 +763,19 @@ int lwm2m_codec_helpers_set_modem_static_data(struct cloud_data_modem_static *mo
737763
return -ENODATA;
738764
}
739765

740-
err = lwm2m_set_res_buf(&LWM2M_OBJ(LWM2M_OBJECT_DEVICE_ID, 0, MODEL_NUMBER_RID),
741-
CONFIG_BOARD,
742-
(uint16_t)strlen(CONFIG_BOARD),
743-
(uint16_t)strlen(CONFIG_BOARD),
744-
LWM2M_RES_DATA_FLAG_RO);
745-
if (err) {
746-
return err;
747-
}
748-
749-
err = lwm2m_set_res_buf(&LWM2M_OBJ(LWM2M_OBJECT_DEVICE_ID, 0, HARDWARE_VERSION_RID),
750-
CONFIG_SOC,
751-
(uint16_t)strlen(CONFIG_SOC),
752-
(uint16_t)strlen(CONFIG_SOC),
753-
LWM2M_RES_DATA_FLAG_RO);
754-
if (err) {
755-
return err;
756-
}
757-
758-
err = lwm2m_set_res_buf(&LWM2M_OBJ(LWM2M_OBJECT_DEVICE_ID, 0, MANUFACTURER_RID),
759-
CONFIG_CLOUD_CODEC_MANUFACTURER,
760-
(uint16_t)strlen(CONFIG_CLOUD_CODEC_MANUFACTURER),
761-
(uint16_t)strlen(CONFIG_CLOUD_CODEC_MANUFACTURER),
762-
LWM2M_RES_DATA_FLAG_RO);
763-
if (err) {
764-
return err;
765-
}
766-
767766
err = lwm2m_set_res_buf(&LWM2M_OBJ(LWM2M_OBJECT_DEVICE_ID, 0, FIRMWARE_VERSION_RID),
768767
modem_static->appv,
769-
(uint16_t)strlen(modem_static->appv),
770-
(uint16_t)strlen(modem_static->appv),
768+
(uint16_t)strlen(modem_static->appv) + 1,
769+
(uint16_t)strlen(modem_static->appv) + 1,
771770
LWM2M_RES_DATA_FLAG_RO);
772771
if (err) {
773772
return err;
774773
}
775774

776775
err = lwm2m_set_res_buf(&LWM2M_OBJ(LWM2M_OBJECT_DEVICE_ID, 0, SOFTWARE_VERSION_RID),
777776
modem_static->fw,
778-
(uint16_t)strlen(modem_static->fw),
779-
(uint16_t)strlen(modem_static->fw),
777+
(uint16_t)strlen(modem_static->fw) + 1,
778+
(uint16_t)strlen(modem_static->fw) + 1,
780779
LWM2M_RES_DATA_FLAG_RO);
781780
if (err) {
782781
return err;
@@ -785,8 +784,8 @@ int lwm2m_codec_helpers_set_modem_static_data(struct cloud_data_modem_static *mo
785784
err = lwm2m_set_res_buf(&LWM2M_OBJ(LWM2M_OBJECT_DEVICE_ID, 0,
786785
DEVICE_SERIAL_NUMBER_ID),
787786
modem_static->imei,
788-
(uint16_t)strlen(modem_static->imei),
789-
(uint16_t)strlen(modem_static->imei),
787+
(uint16_t)strlen(modem_static->imei) + 1,
788+
(uint16_t)strlen(modem_static->imei) + 1,
790789
LWM2M_RES_DATA_FLAG_RO);
791790
if (err) {
792791
return err;

‎applications/asset_tracker_v2/src/cloud/lwm2m_integration/lwm2m_integration.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ static void rd_client_event(struct lwm2m_ctx *client, enum lwm2m_rd_client_event
109109
struct cloud_wrap_event cloud_wrap_evt = { 0 };
110110
bool notify = false;
111111

112+
lwm2m_utils_connection_manage(client, &client_event);
113+
112114
switch (client_event) {
113115
case LWM2M_RD_CLIENT_EVENT_NONE:
114116
LOG_DBG("LWM2M_RD_CLIENT_EVENT_NONE");

‎applications/asset_tracker_v2/tests/debug_module/src/debug_module_test.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,13 @@ void test_memfault_trigger_metric_sampling_on_location_timeout(void)
142142

143143
/* Update this function to expect the search time and number of satellites. */
144144
__cmock_memfault_metrics_heartbeat_set_unsigned_ExpectAndReturn(
145-
MEMFAULT_METRICS_KEY(location_timeout_search_time_ms),
146-
30000,
147-
0);
145+
MEMFAULT_METRICS_KEY(location_timeout_search_time_ms),
146+
30000,
147+
0);
148148
__cmock_memfault_metrics_heartbeat_set_unsigned_ExpectAndReturn(
149-
MEMFAULT_METRICS_KEY(gnss_satellites_tracked_count),
150-
2,
151-
0);
149+
MEMFAULT_METRICS_KEY(gnss_satellites_tracked_count),
150+
2,
151+
0);
152152
__cmock_memfault_metrics_heartbeat_debug_trigger_Ignore();
153153

154154
__cmock_app_event_manager_alloc_ExpectAnyArgsAndReturn(&location_module_event_memory);

‎applications/asset_tracker_v2/tests/lwm2m_codec_helpers/src/lwm2m_codec_helpers_test.c‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,20 @@ void test_codec_helpers_setup_resource_buffers(void)
111111
&battery_voltage, sizeof(battery_voltage), sizeof(battery_voltage),
112112
LWM2M_RES_DATA_FLAG_RW, 0);
113113

114+
__cmock_lwm2m_set_res_buf_ExpectAndReturn(
115+
&LWM2M_OBJ(LWM2M_OBJECT_DEVICE_ID, 0, MODEL_NUMBER_RID), CONFIG_BOARD,
116+
sizeof(CONFIG_BOARD), sizeof(CONFIG_BOARD), LWM2M_RES_DATA_FLAG_RO, 0);
117+
118+
__cmock_lwm2m_set_res_buf_ExpectAndReturn(
119+
&LWM2M_OBJ(LWM2M_OBJECT_DEVICE_ID, 0, HARDWARE_VERSION_RID), CONFIG_SOC,
120+
sizeof(CONFIG_SOC), sizeof(CONFIG_SOC), LWM2M_RES_DATA_FLAG_RO, 0);
121+
122+
__cmock_lwm2m_set_res_buf_ExpectAndReturn(
123+
&LWM2M_OBJ(LWM2M_OBJECT_DEVICE_ID, 0, MANUFACTURER_RID),
124+
CONFIG_CLOUD_CODEC_MANUFACTURER, sizeof(CONFIG_CLOUD_CODEC_MANUFACTURER),
125+
sizeof(CONFIG_CLOUD_CODEC_MANUFACTURER), LWM2M_RES_DATA_FLAG_RO, 0);
126+
127+
114128
__cmock_lwm2m_set_res_buf_ExpectAndReturn(
115129
&LWM2M_OBJ(IPSO_OBJECT_PRESSURE_ID, 0, TIMESTAMP_RID),
116130
&pressure_ts, sizeof(pressure_ts), sizeof(pressure_ts),
@@ -128,20 +142,22 @@ void test_codec_helpers_setup_resource_buffers(void)
128142

129143
__cmock_lwm2m_set_res_buf_ExpectAndReturn(
130144
&LWM2M_OBJ(IPSO_OBJECT_TEMP_SENSOR_ID, 0, SENSOR_UNITS_RID), BME680_TEMP_UNIT,
131-
strlen(BME680_TEMP_UNIT), strlen(BME680_TEMP_UNIT), LWM2M_RES_DATA_FLAG_RO, 0);
145+
strlen(BME680_TEMP_UNIT) + 1, strlen(BME680_TEMP_UNIT) + 1, LWM2M_RES_DATA_FLAG_RO,
146+
0);
132147

133148
__cmock_lwm2m_set_res_buf_ExpectAndReturn(
134149
&LWM2M_OBJ(IPSO_OBJECT_HUMIDITY_SENSOR_ID, 0, SENSOR_UNITS_RID), BME680_HUMID_UNIT,
135-
strlen(BME680_HUMID_UNIT), strlen(BME680_HUMID_UNIT), LWM2M_RES_DATA_FLAG_RO, 0);
150+
strlen(BME680_HUMID_UNIT) + 1, strlen(BME680_HUMID_UNIT) + 1,
151+
LWM2M_RES_DATA_FLAG_RO, 0);
136152

137153
__cmock_lwm2m_set_res_buf_ExpectAndReturn(
138154
&LWM2M_OBJ(IPSO_OBJECT_PRESSURE_ID, 0, SENSOR_UNITS_RID), BME680_PRESSURE_UNIT,
139-
strlen(BME680_PRESSURE_UNIT), strlen(BME680_PRESSURE_UNIT), LWM2M_RES_DATA_FLAG_RO,
140-
0);
155+
strlen(BME680_PRESSURE_UNIT) + 1, strlen(BME680_PRESSURE_UNIT) + 1,
156+
LWM2M_RES_DATA_FLAG_RO, 0);
141157

142158
__cmock_lwm2m_set_res_buf_ExpectAndReturn(
143159
&LWM2M_OBJ(IPSO_OBJECT_PUSH_BUTTON_ID, BUTTON1_OBJ_INST_ID, APPLICATION_TYPE_RID),
144-
BUTTON1_APP_NAME, strlen(BUTTON1_APP_NAME), strlen(BUTTON1_APP_NAME),
160+
BUTTON1_APP_NAME, strlen(BUTTON1_APP_NAME) + 1, strlen(BUTTON1_APP_NAME) + 1,
145161
LWM2M_RES_DATA_FLAG_RO, 0);
146162

147163
__cmock_lwm2m_set_res_buf_ExpectAndReturn(
@@ -151,7 +167,7 @@ void test_codec_helpers_setup_resource_buffers(void)
151167

152168
__cmock_lwm2m_set_res_buf_ExpectAndReturn(
153169
&LWM2M_OBJ(IPSO_OBJECT_PUSH_BUTTON_ID, BUTTON2_OBJ_INST_ID, APPLICATION_TYPE_RID),
154-
BUTTON2_APP_NAME, strlen(BUTTON2_APP_NAME), strlen(BUTTON2_APP_NAME),
170+
BUTTON2_APP_NAME, strlen(BUTTON2_APP_NAME) + 1, strlen(BUTTON2_APP_NAME) + 1,
155171
LWM2M_RES_DATA_FLAG_RO, 0);
156172

157173
__cmock_lwm2m_set_res_buf_ExpectAndReturn(
@@ -596,30 +612,20 @@ void test_codec_helpers_set_modem_static_data(void)
596612
.queued = true,
597613
};
598614

599-
__cmock_lwm2m_set_res_buf_ExpectAndReturn(
600-
&LWM2M_OBJ(LWM2M_OBJECT_DEVICE_ID, 0, MODEL_NUMBER_RID), CONFIG_BOARD,
601-
strlen(CONFIG_BOARD), strlen(CONFIG_BOARD), LWM2M_RES_DATA_FLAG_RO, 0);
602-
603-
__cmock_lwm2m_set_res_buf_ExpectAndReturn(
604-
&LWM2M_OBJ(LWM2M_OBJECT_DEVICE_ID, 0, HARDWARE_VERSION_RID), CONFIG_SOC,
605-
strlen(CONFIG_SOC), strlen(CONFIG_SOC), LWM2M_RES_DATA_FLAG_RO, 0);
606-
607-
__cmock_lwm2m_set_res_buf_ExpectAndReturn(
608-
&LWM2M_OBJ(LWM2M_OBJECT_DEVICE_ID, 0, MANUFACTURER_RID),
609-
CONFIG_CLOUD_CODEC_MANUFACTURER, strlen(CONFIG_CLOUD_CODEC_MANUFACTURER),
610-
strlen(CONFIG_CLOUD_CODEC_MANUFACTURER), LWM2M_RES_DATA_FLAG_RO, 0);
611-
612615
__cmock_lwm2m_set_res_buf_ExpectAndReturn(
613616
&LWM2M_OBJ(LWM2M_OBJECT_DEVICE_ID, 0, FIRMWARE_VERSION_RID), modem_static.appv,
614-
strlen(modem_static.appv), strlen(modem_static.appv), LWM2M_RES_DATA_FLAG_RO, 0);
617+
strlen(modem_static.appv) + 1, strlen(modem_static.appv) + 1,
618+
LWM2M_RES_DATA_FLAG_RO, 0);
615619

616620
__cmock_lwm2m_set_res_buf_ExpectAndReturn(
617621
&LWM2M_OBJ(LWM2M_OBJECT_DEVICE_ID, 0, SOFTWARE_VERSION_RID), modem_static.fw,
618-
strlen(modem_static.fw), strlen(modem_static.fw), LWM2M_RES_DATA_FLAG_RO, 0);
622+
strlen(modem_static.fw) + 1, strlen(modem_static.fw) + 1, LWM2M_RES_DATA_FLAG_RO,
623+
0);
619624

620625
__cmock_lwm2m_set_res_buf_ExpectAndReturn(
621626
&LWM2M_OBJ(LWM2M_OBJECT_DEVICE_ID, 0, DEVICE_SERIAL_NUMBER_ID), modem_static.imei,
622-
strlen(modem_static.imei), strlen(modem_static.imei), LWM2M_RES_DATA_FLAG_RO, 0);
627+
strlen(modem_static.imei) + 1, strlen(modem_static.imei) + 1,
628+
LWM2M_RES_DATA_FLAG_RO, 0);
623629

624630
TEST_ASSERT_EQUAL(0, lwm2m_codec_helpers_set_modem_static_data(&modem_static));
625631
}

0 commit comments

Comments
 (0)