net: lib: Patch file for generated code fix
Patch for generated lwm2m senml-cbor. Signed-off-by: Juha Heiskanen <juha.heiskanen@nordicsemi.no>
This commit is contained in:
parent
d939c79af1
commit
a70f420b2b
1 changed files with 324 additions and 197 deletions
|
@ -1,10 +1,26 @@
|
||||||
|
From 5c78782be4b1555edbbd959c151d550e9cb2edbd Mon Sep 17 00:00:00 2001
|
||||||
|
From: Juha Heiskanen <juha.heiskanen@nordicsemi.no>
|
||||||
|
Date: Tue, 3 Jan 2023 17:43:00 +0200
|
||||||
|
Subject: [PATCH] net: lib: LwM2M SenML-Cbor regenrated files update
|
||||||
|
|
||||||
|
Patched and fixed regenerated code.
|
||||||
|
|
||||||
|
Signed-off-by: Juha Heiskanen <juha.heiskanen@nordicsemi.no>
|
||||||
|
---
|
||||||
|
.../net/lib/lwm2m/lwm2m_senml_cbor_decode.c | 57 ++---
|
||||||
|
.../net/lib/lwm2m/lwm2m_senml_cbor_decode.h | 11 +-
|
||||||
|
.../net/lib/lwm2m/lwm2m_senml_cbor_encode.c | 197 +++++++++---------
|
||||||
|
.../net/lib/lwm2m/lwm2m_senml_cbor_encode.h | 11 +-
|
||||||
|
subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h | 25 ++-
|
||||||
|
5 files changed, 164 insertions(+), 137 deletions(-)
|
||||||
|
|
||||||
diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c
|
diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c
|
||||||
index 45eec7f404..b1cabba34b 100644
|
index 1e1c513eb2..2ff59a63fb 100644
|
||||||
--- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c
|
--- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c
|
||||||
+++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c
|
+++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c
|
||||||
@@ -1,20 +1,21 @@
|
@@ -1,6 +1,11 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright (c) 2022 Nordic Semiconductor ASA
|
+ * Copyright (c) 2023 Nordic Semiconductor ASA
|
||||||
+ *
|
+ *
|
||||||
+ * SPDX-License-Identifier: Apache-2.0
|
+ * SPDX-License-Identifier: Apache-2.0
|
||||||
+ */
|
+ */
|
||||||
|
@ -15,93 +31,112 @@ index 45eec7f404..b1cabba34b 100644
|
||||||
* Generated with a --default-max-qty of 99
|
* Generated with a --default-max-qty of 99
|
||||||
*/
|
*/
|
||||||
|
|
||||||
-#include "lwm2m_senml_cbor_decode.h"
|
@@ -11,10 +16,6 @@
|
||||||
-#include "zcbor_decode.h"
|
#include "zcbor_decode.h"
|
||||||
|
#include "lwm2m_senml_cbor_decode.h"
|
||||||
|
|
||||||
#include <stdbool.h>
|
|
||||||
#include <stddef.h>
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <string.h>
|
|
||||||
-
|
|
||||||
-#if DEFAULT_MAX_QTY != 99
|
-#if DEFAULT_MAX_QTY != 99
|
||||||
-#error "The type file was generated with a different default_max_qty than this file"
|
-#error "The type file was generated with a different default_max_qty than this file"
|
||||||
-#endif
|
-#endif
|
||||||
+#include "zcbor_decode.h"
|
-
|
||||||
+#include "lwm2m_senml_cbor_decode.h"
|
|
||||||
|
|
||||||
static bool decode_repeated_record_bn(zcbor_state_t *state, struct record_bn *result);
|
static bool decode_repeated_record_bn(zcbor_state_t *state, struct record_bn *result);
|
||||||
static bool decode_repeated_record_bt(zcbor_state_t *state, struct record_bt *result);
|
static bool decode_repeated_record_bt(zcbor_state_t *state, struct record_bt *result);
|
||||||
@@ -47,8 +48,8 @@ static bool decode_repeated_record_bt(zcbor_state_t *state, struct record_bt *re
|
static bool decode_repeated_record_n(zcbor_state_t *state, struct record_n *result);
|
||||||
|
@@ -45,11 +46,11 @@ static bool decode_repeated_record_bt(zcbor_state_t *state, struct record_bt *re
|
||||||
|
{
|
||||||
|
zcbor_print("%s\r\n", __func__);
|
||||||
|
|
||||||
bool tmp_result = ((((zcbor_int32_expect(state, (-3)))) &&
|
- bool tmp_result = ((((zcbor_int32_expect(state, (-3)))) &&
|
||||||
(zcbor_int64_decode(state, (&(*result)._record_bt))) &&
|
- (zcbor_int64_decode(state, (&(*result)._record_bt))) &&
|
||||||
- ((((*result)._record_bt >= -9223372036854775807LL) &&
|
- ((((*result)._record_bt >= -9223372036854775807LL) &&
|
||||||
- ((*result)._record_bt <= 9223372036854775807LL)) ||
|
- ((*result)._record_bt <= 9223372036854775807LL)) ||
|
||||||
+ ((((*result)._record_bt >= INT64_MIN) &&
|
- (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))));
|
||||||
+ ((*result)._record_bt <= INT64_MAX)) ||
|
+ bool tmp_result =
|
||||||
(zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))));
|
+ ((((zcbor_int32_expect(state, (-3)))) &&
|
||||||
|
+ (zcbor_int64_decode(state, (&(*result)._record_bt))) &&
|
||||||
|
+ ((((*result)._record_bt >= INT64_MIN) && ((*result)._record_bt <= INT64_MAX)) ||
|
||||||
|
+ (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))));
|
||||||
|
|
||||||
if (!tmp_result)
|
if (!tmp_result) {
|
||||||
@@ -76,8 +77,8 @@ static bool decode_repeated_record_t(zcbor_state_t *state, struct record_t *resu
|
zcbor_trace();
|
||||||
|
@@ -76,11 +77,11 @@ static bool decode_repeated_record_t(zcbor_state_t *state, struct record_t *resu
|
||||||
|
{
|
||||||
|
zcbor_print("%s\r\n", __func__);
|
||||||
|
|
||||||
bool tmp_result = ((((zcbor_uint32_expect(state, (6)))) &&
|
- bool tmp_result = ((((zcbor_uint32_expect(state, (6)))) &&
|
||||||
(zcbor_int64_decode(state, (&(*result)._record_t))) &&
|
- (zcbor_int64_decode(state, (&(*result)._record_t))) &&
|
||||||
- ((((*result)._record_t >= -9223372036854775807LL) &&
|
- ((((*result)._record_t >= -9223372036854775807LL) &&
|
||||||
- ((*result)._record_t <= 9223372036854775807LL)) ||
|
- ((*result)._record_t <= 9223372036854775807LL)) ||
|
||||||
+ ((((*result)._record_t >= INT64_MIN) &&
|
- (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))));
|
||||||
+ ((*result)._record_t <= INT64_MAX)) ||
|
+ bool tmp_result =
|
||||||
(zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))));
|
+ ((((zcbor_uint32_expect(state, (6)))) &&
|
||||||
|
+ (zcbor_int64_decode(state, (&(*result)._record_t))) &&
|
||||||
|
+ ((((*result)._record_t >= INT64_MIN) && ((*result)._record_t <= INT64_MAX)) ||
|
||||||
|
+ (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))));
|
||||||
|
|
||||||
if (!tmp_result)
|
if (!tmp_result) {
|
||||||
@@ -94,8 +95,8 @@ static bool decode_repeated_record_union(zcbor_state_t *state, struct record_uni
|
zcbor_trace();
|
||||||
bool tmp_result = (((zcbor_union_start_code(state) &&
|
@@ -99,8 +100,8 @@ static bool decode_repeated_record_union(zcbor_state_t *state, struct record_uni
|
||||||
(int_res = (((((zcbor_uint32_expect_union(state, (2)))) &&
|
(((zcbor_union_start_code(state) &&
|
||||||
(zcbor_int64_decode(state, (&(*result)._union_vi))) &&
|
(int_res = (((((zcbor_uint32_expect_union(state, (2)))) &&
|
||||||
- ((((*result)._union_vi >= -9223372036854775807LL) &&
|
(zcbor_int64_decode(state, (&(*result)._union_vi))) &&
|
||||||
- ((*result)._union_vi <= 9223372036854775807LL)) ||
|
- ((((*result)._union_vi >= -9223372036854775807LL) &&
|
||||||
+ ((((*result)._union_vi >= INT64_MIN) &&
|
- ((*result)._union_vi <= 9223372036854775807LL)) ||
|
||||||
+ ((*result)._union_vi <= INT64_MAX)) ||
|
+ ((((*result)._union_vi >= INT64_MIN) &&
|
||||||
(zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))) &&
|
+ ((*result)._union_vi <= INT64_MAX)) ||
|
||||||
(((*result)._record_union_choice = _union_vi), true)) ||
|
(zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))) &&
|
||||||
((((zcbor_uint32_expect_union(state, (2)))) &&
|
(((*result)._record_union_choice = _union_vi), true)) ||
|
||||||
@@ -130,8 +131,8 @@ static bool decode_value(zcbor_state_t *state, struct value_ *result)
|
((((zcbor_uint32_expect_union(state, (2)))) &&
|
||||||
(((zcbor_bstr_decode(state, (&(*result)._value_bstr)))) &&
|
@@ -142,8 +143,8 @@ static bool decode_value(zcbor_state_t *state, struct value_ *result)
|
||||||
(((*result)._value_choice = _value_bstr), true)) ||
|
(((zcbor_bstr_decode(state, (&(*result)._value_bstr)))) &&
|
||||||
(((zcbor_int64_decode(state, (&(*result)._value_int))) &&
|
(((*result)._value_choice = _value_bstr), true)) ||
|
||||||
|
(((zcbor_int64_decode(state, (&(*result)._value_int))) &&
|
||||||
- ((((*result)._value_int >= -9223372036854775807LL) &&
|
- ((((*result)._value_int >= -9223372036854775807LL) &&
|
||||||
- ((*result)._value_int <= 9223372036854775807LL)) ||
|
- ((*result)._value_int <= 9223372036854775807LL)) ||
|
||||||
+ ((((*result)._value_int >= INT64_MIN) &&
|
+ ((((*result)._value_int >= INT64_MIN) &&
|
||||||
+ ((*result)._value_int <= INT64_MAX)) ||
|
+ ((*result)._value_int <= INT64_MAX)) ||
|
||||||
(zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))) &&
|
(zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))) &&
|
||||||
(((*result)._value_choice = _value_int), true)) ||
|
(((*result)._value_choice = _value_int), true)) ||
|
||||||
(((zcbor_float_decode(state, (&(*result)._value_float)))) &&
|
(((zcbor_float_decode(state, (&(*result)._value_float)))) &&
|
||||||
@@ -193,7 +194,8 @@ static bool decode_record(zcbor_state_t *state, struct record *result)
|
@@ -208,7 +209,8 @@ static bool decode_record(zcbor_state_t *state, struct record *result)
|
||||||
zcbor_present_decode(&((*result)._record_union_present),
|
zcbor_present_decode(&((*result)._record_union_present),
|
||||||
(zcbor_decoder_t *)decode_repeated_record_union, state,
|
(zcbor_decoder_t *)decode_repeated_record_union, state,
|
||||||
(&(*result)._record_union)) &&
|
(&(*result)._record_union)) &&
|
||||||
- zcbor_multi_decode(0, 5, &(*result)._record__key_value_pair_count,
|
- zcbor_multi_decode(0, 5, &(*result)._record__key_value_pair_count,
|
||||||
+ zcbor_multi_decode(0, ZCBOR_ARRAY_SIZE(result->_record__key_value_pair),
|
+ zcbor_multi_decode(0, ZCBOR_ARRAY_SIZE(result->_record__key_value_pair),
|
||||||
+ &(*result)._record__key_value_pair_count,
|
+ &(*result)._record__key_value_pair_count,
|
||||||
(zcbor_decoder_t *)decode_repeated_record__key_value_pair,
|
(zcbor_decoder_t *)decode_repeated_record__key_value_pair,
|
||||||
state, (&(*result)._record__key_value_pair),
|
state, (&(*result)._record__key_value_pair),
|
||||||
sizeof(struct record__key_value_pair))) ||
|
sizeof(struct record__key_value_pair))) ||
|
||||||
@@ -212,7 +214,8 @@ static bool decode_lwm2m_senml(zcbor_state_t *state, struct lwm2m_senml *result)
|
@@ -226,13 +228,14 @@ static bool decode_lwm2m_senml(zcbor_state_t *state, struct lwm2m_senml *result)
|
||||||
|
{
|
||||||
|
zcbor_print("%s\r\n", __func__);
|
||||||
|
|
||||||
bool tmp_result = ((
|
- bool tmp_result = ((
|
||||||
(zcbor_list_start_decode(state) &&
|
- (zcbor_list_start_decode(state) &&
|
||||||
- ((zcbor_multi_decode(1, 99, &(*result)._lwm2m_senml__record_count,
|
- ((zcbor_multi_decode(1, 99, &(*result)._lwm2m_senml__record_count,
|
||||||
+ ((zcbor_multi_decode(1, ZCBOR_ARRAY_SIZE(result->_lwm2m_senml__record),
|
- (zcbor_decoder_t *)decode_record, state,
|
||||||
+ &(*result)._lwm2m_senml__record_count,
|
- (&(*result)._lwm2m_senml__record), sizeof(struct record))) ||
|
||||||
(zcbor_decoder_t *)decode_record, state,
|
- (zcbor_list_map_end_force_decode(state), false)) &&
|
||||||
(&(*result)._lwm2m_senml__record), sizeof(struct record))) ||
|
- zcbor_list_end_decode(state))));
|
||||||
(zcbor_list_map_end_force_decode(state), false)) &&
|
+ bool tmp_result =
|
||||||
|
+ (((zcbor_list_start_decode(state) &&
|
||||||
|
+ ((zcbor_multi_decode(
|
||||||
|
+ 1, ZCBOR_ARRAY_SIZE(result->_lwm2m_senml__record),
|
||||||
|
+ &(*result)._lwm2m_senml__record_count, (zcbor_decoder_t *)decode_record,
|
||||||
|
+ state, (&(*result)._lwm2m_senml__record), sizeof(struct record))) ||
|
||||||
|
+ (zcbor_list_map_end_force_decode(state), false)) &&
|
||||||
|
+ zcbor_list_end_decode(state))));
|
||||||
|
|
||||||
|
if (!tmp_result) {
|
||||||
|
zcbor_trace();
|
||||||
diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h
|
diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h
|
||||||
index ea2c98fbe5..cf425e9006 100644
|
index 66124f0b23..027578450d 100644
|
||||||
--- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h
|
--- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h
|
||||||
+++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h
|
+++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h
|
||||||
@@ -1,23 +1,23 @@
|
@@ -1,6 +1,11 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright (c) 2022 Nordic Semiconductor ASA
|
+ * Copyright (c) 2023 Nordic Semiconductor ASA
|
||||||
+ *
|
+ *
|
||||||
+ * SPDX-License-Identifier: Apache-2.0
|
+ * SPDX-License-Identifier: Apache-2.0
|
||||||
+ */
|
+ */
|
||||||
|
@ -112,32 +147,24 @@ index ea2c98fbe5..cf425e9006 100644
|
||||||
* Generated with a --default-max-qty of 99
|
* Generated with a --default-max-qty of 99
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef LWM2M_SENML_CBOR_DECODE_H__
|
@@ -14,10 +19,6 @@
|
||||||
#define LWM2M_SENML_CBOR_DECODE_H__
|
#include "zcbor_decode.h"
|
||||||
|
#include "lwm2m_senml_cbor_types.h"
|
||||||
|
|
||||||
-#include "lwm2m_senml_cbor_types.h"
|
|
||||||
-#include "zcbor_decode.h"
|
|
||||||
-
|
|
||||||
#include <stdbool.h>
|
|
||||||
#include <stddef.h>
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <string.h>
|
|
||||||
-
|
|
||||||
-#if DEFAULT_MAX_QTY != 99
|
-#if DEFAULT_MAX_QTY != 99
|
||||||
-#error "The type file was generated with a different default_max_qty than this file"
|
-#error "The type file was generated with a different default_max_qty than this file"
|
||||||
-#endif
|
-#endif
|
||||||
+#include "zcbor_decode.h"
|
-
|
||||||
+#include "lwm2m_senml_cbor_types.h"
|
|
||||||
|
|
||||||
int cbor_decode_lwm2m_senml(const uint8_t *payload, size_t payload_len, struct lwm2m_senml *result,
|
int cbor_decode_lwm2m_senml(const uint8_t *payload, size_t payload_len, struct lwm2m_senml *result,
|
||||||
size_t *payload_len_out);
|
size_t *payload_len_out);
|
||||||
|
|
||||||
diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c
|
diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c
|
||||||
index cd02029d11..3c0c190981 100644
|
index 1ea3ff89de..6867ce20d3 100644
|
||||||
--- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c
|
--- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c
|
||||||
+++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c
|
+++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c
|
||||||
@@ -1,20 +1,21 @@
|
@@ -1,6 +1,11 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright (c) 2022 Nordic Semiconductor ASA
|
+ * Copyright (c) 2023 Nordic Semiconductor ASA
|
||||||
+ *
|
+ *
|
||||||
+ * SPDX-License-Identifier: Apache-2.0
|
+ * SPDX-License-Identifier: Apache-2.0
|
||||||
+ */
|
+ */
|
||||||
|
@ -148,143 +175,254 @@ index cd02029d11..3c0c190981 100644
|
||||||
* Generated with a --default-max-qty of 99
|
* Generated with a --default-max-qty of 99
|
||||||
*/
|
*/
|
||||||
|
|
||||||
-#include "lwm2m_senml_cbor_encode.h"
|
@@ -10,10 +15,7 @@
|
||||||
-#include "zcbor_encode.h"
|
|
||||||
-
|
|
||||||
#include <stdbool.h>
|
|
||||||
#include <stddef.h>
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include "zcbor_encode.h"
|
||||||
|
#include "lwm2m_senml_cbor_encode.h"
|
||||||
-
|
-
|
||||||
-#if DEFAULT_MAX_QTY != 99
|
-#if DEFAULT_MAX_QTY != 99
|
||||||
-#error "The type file was generated with a different default_max_qty than this file"
|
-#error "The type file was generated with a different default_max_qty than this file"
|
||||||
-#endif
|
-#endif
|
||||||
+#include "zcbor_encode.h"
|
|
||||||
+#include "lwm2m_senml_cbor_encode.h"
|
|
||||||
+#include "lwm2m_senml_cbor_types.h"
|
+#include "lwm2m_senml_cbor_types.h"
|
||||||
|
|
||||||
static bool encode_repeated_record_bn(zcbor_state_t *state, const struct record_bn *input);
|
static bool encode_repeated_record_bn(zcbor_state_t *state, const struct record_bn *input);
|
||||||
static bool encode_repeated_record_bt(zcbor_state_t *state, const struct record_bt *input);
|
static bool encode_repeated_record_bt(zcbor_state_t *state, const struct record_bt *input);
|
||||||
@@ -46,8 +47,8 @@ static bool encode_repeated_record_bt(zcbor_state_t *state, const struct record_
|
@@ -45,11 +47,11 @@ static bool encode_repeated_record_bt(zcbor_state_t *state, const struct record_
|
||||||
zcbor_print("%s\r\n", __func__);
|
{
|
||||||
|
zcbor_print("%s\r\n", __func__);
|
||||||
|
|
||||||
bool tmp_result = ((((zcbor_int32_put(state, (-3)))) &&
|
- bool tmp_result = ((((zcbor_int32_put(state, (-3)))) &&
|
||||||
- ((((*input)._record_bt >= -9223372036854775807LL) &&
|
- ((((*input)._record_bt >= -9223372036854775807LL) &&
|
||||||
- ((*input)._record_bt <= 9223372036854775807LL)) ||
|
- ((*input)._record_bt <= 9223372036854775807LL)) ||
|
||||||
+ ((((*input)._record_bt >= INT64_MIN) &&
|
- (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)) &&
|
||||||
+ ((*input)._record_bt <= INT64_MAX)) ||
|
- (zcbor_int64_encode(state, (&(*input)._record_bt)))));
|
||||||
(zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)) &&
|
+ bool tmp_result =
|
||||||
(zcbor_int64_encode(state, (&(*input)._record_bt)))));
|
+ ((((zcbor_int32_put(state, (-3)))) &&
|
||||||
|
+ ((((*input)._record_bt >= INT64_MIN) && ((*input)._record_bt <= INT64_MAX)) ||
|
||||||
|
+ (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)) &&
|
||||||
|
+ (zcbor_int64_encode(state, (&(*input)._record_bt)))));
|
||||||
|
|
||||||
@@ -75,8 +76,8 @@ static bool encode_repeated_record_t(zcbor_state_t *state, const struct record_t
|
if (!tmp_result) {
|
||||||
zcbor_print("%s\r\n", __func__);
|
zcbor_trace();
|
||||||
|
@@ -76,11 +78,11 @@ static bool encode_repeated_record_t(zcbor_state_t *state, const struct record_t
|
||||||
|
{
|
||||||
|
zcbor_print("%s\r\n", __func__);
|
||||||
|
|
||||||
bool tmp_result = ((((zcbor_uint32_put(state, (6)))) &&
|
- bool tmp_result = ((((zcbor_uint32_put(state, (6)))) &&
|
||||||
- ((((*input)._record_t >= -9223372036854775807LL) &&
|
- ((((*input)._record_t >= -9223372036854775807LL) &&
|
||||||
- ((*input)._record_t <= 9223372036854775807LL)) ||
|
- ((*input)._record_t <= 9223372036854775807LL)) ||
|
||||||
+ ((((*input)._record_t >= INT64_MIN) &&
|
- (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)) &&
|
||||||
+ ((*input)._record_t <= INT64_MAX)) ||
|
- (zcbor_int64_encode(state, (&(*input)._record_t)))));
|
||||||
(zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)) &&
|
+ bool tmp_result =
|
||||||
(zcbor_int64_encode(state, (&(*input)._record_t)))));
|
+ ((((zcbor_uint32_put(state, (6)))) &&
|
||||||
|
+ ((((*input)._record_t >= INT64_MIN) && ((*input)._record_t <= INT64_MAX)) ||
|
||||||
|
+ (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)) &&
|
||||||
|
+ (zcbor_int64_encode(state, (&(*input)._record_t)))));
|
||||||
|
|
||||||
@@ -93,8 +94,8 @@ static bool encode_repeated_record_union(zcbor_state_t *state, const struct reco
|
if (!tmp_result) {
|
||||||
bool tmp_result = (((
|
zcbor_trace();
|
||||||
((*input)._record_union_choice == _union_vi)
|
@@ -97,41 +99,41 @@ static bool encode_repeated_record_union(zcbor_state_t *state, const struct reco
|
||||||
? (((zcbor_uint32_put(state, (2)))) &&
|
bool tmp_result = (((
|
||||||
|
((*input)._record_union_choice == _union_vi)
|
||||||
|
? (((zcbor_uint32_put(state, (2)))) &&
|
||||||
- ((((*input)._union_vi >= -9223372036854775807LL) &&
|
- ((((*input)._union_vi >= -9223372036854775807LL) &&
|
||||||
- ((*input)._union_vi <= 9223372036854775807LL)) ||
|
- ((*input)._union_vi <= 9223372036854775807LL)) ||
|
||||||
+ ((((*input)._union_vi >= INT64_MIN) &&
|
+ ((((*input)._union_vi >= INT64_MIN) &&
|
||||||
+ ((*input)._union_vi <= INT64_MAX)) ||
|
+ ((*input)._union_vi <= INT64_MAX)) ||
|
||||||
(zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)) &&
|
(zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)) &&
|
||||||
(zcbor_int64_encode(state, (&(*input)._union_vi))))
|
(zcbor_int64_encode(state, (&(*input)._union_vi))))
|
||||||
: (((*input)._record_union_choice == _union_vf)
|
- : (((*input)._record_union_choice == _union_vf)
|
||||||
@@ -112,8 +113,8 @@ static bool encode_repeated_record_union(zcbor_state_t *state, const struct reco
|
- ? (((zcbor_uint32_put(state, (2)))) &&
|
||||||
? (((zcbor_uint32_put(state,
|
- (zcbor_float64_encode(state, (&(*input)._union_vf))))
|
||||||
(8)))) &&
|
- : (((*input)._record_union_choice == _union_vs)
|
||||||
(zcbor_bstr_encode(
|
- ? (((zcbor_uint32_put(state, (3)))) &&
|
||||||
|
- (zcbor_tstr_encode(state, (&(*input)._union_vs))))
|
||||||
|
- : (((*input)._record_union_choice == _union_vb)
|
||||||
|
- ? (((zcbor_uint32_put(state, (4)))) &&
|
||||||
|
- (zcbor_bool_encode(
|
||||||
|
- state, (&(*input)._union_vb))))
|
||||||
|
- : (((*input)._record_union_choice ==
|
||||||
|
- _union_vd)
|
||||||
|
- ? (((zcbor_uint32_put(state,
|
||||||
|
- (8)))) &&
|
||||||
|
- (zcbor_bstr_encode(
|
||||||
- state,
|
- state,
|
||||||
- (&(*input)._union_vd))))
|
- (&(*input)._union_vd))))
|
||||||
|
- : (((*input)._record_union_choice ==
|
||||||
|
- _union_vlo)
|
||||||
|
- ? (((zcbor_tstr_encode(
|
||||||
|
- state,
|
||||||
|
- ((tmp_str.value =
|
||||||
|
- (uint8_t *)"vlo",
|
||||||
|
- tmp_str.len =
|
||||||
|
- sizeof("vlo") -
|
||||||
|
- 1,
|
||||||
|
- &tmp_str))))) &&
|
||||||
|
- (zcbor_tstr_encode(
|
||||||
|
- state,
|
||||||
|
- (&(*input)._union_vlo))))
|
||||||
|
- : false))))))));
|
||||||
|
+ : (((*input)._record_union_choice == _union_vf)
|
||||||
|
+ ? (((zcbor_uint32_put(state, (2)))) &&
|
||||||
|
+ (zcbor_float64_encode(state, (&(*input)._union_vf))))
|
||||||
|
+ : (((*input)._record_union_choice == _union_vs)
|
||||||
|
+ ? (((zcbor_uint32_put(state, (3)))) &&
|
||||||
|
+ (zcbor_tstr_encode(state, (&(*input)._union_vs))))
|
||||||
|
+ : (((*input)._record_union_choice == _union_vb)
|
||||||
|
+ ? (((zcbor_uint32_put(state, (4)))) &&
|
||||||
|
+ (zcbor_bool_encode(
|
||||||
|
+ state, (&(*input)._union_vb))))
|
||||||
|
+ : (((*input)._record_union_choice ==
|
||||||
|
+ _union_vd)
|
||||||
|
+ ? (((zcbor_uint32_put(state,
|
||||||
|
+ (8)))) &&
|
||||||
|
+ (zcbor_bstr_encode(
|
||||||
|
+ state,
|
||||||
|
+ (&(*input)._union_vd))))
|
||||||
|
+ : (((*input)._record_union_choice ==
|
||||||
|
+ _union_vlo)
|
||||||
|
+ ? (((zcbor_tstr_encode(
|
||||||
+ state,
|
+ state,
|
||||||
+ (&(*input)._union_vd))))
|
+ ((tmp_str.value =
|
||||||
: false)))))));
|
+ (uint8_t *)"vlo",
|
||||||
|
+ tmp_str.len =
|
||||||
|
+ sizeof("vlo") -
|
||||||
|
+ 1,
|
||||||
|
+ &tmp_str))))) &&
|
||||||
|
+ (zcbor_tstr_encode(
|
||||||
|
+ state,
|
||||||
|
+ (&(*input)._union_vlo))))
|
||||||
|
+ : false))))))));
|
||||||
|
|
||||||
if (!tmp_result)
|
if (!tmp_result) {
|
||||||
@@ -132,10 +133,8 @@ static bool encode_value(zcbor_state_t *state, const struct value_ *input)
|
zcbor_trace();
|
||||||
: (((*input)._value_choice == _value_bstr)
|
@@ -149,24 +151,22 @@ static bool encode_value(zcbor_state_t *state, const struct value_ *input)
|
||||||
? ((zcbor_bstr_encode(state, (&(*input)._value_bstr))))
|
? ((zcbor_tstr_encode(state, (&(*input)._value_tstr))))
|
||||||
: (((*input)._value_choice == _value_int)
|
: (((*input)._value_choice == _value_bstr)
|
||||||
|
? ((zcbor_bstr_encode(state, (&(*input)._value_bstr))))
|
||||||
|
- : (((*input)._value_choice == _value_int)
|
||||||
- ? (((((*input)._value_int >=
|
- ? (((((*input)._value_int >=
|
||||||
- -9223372036854775807LL) &&
|
- -9223372036854775807LL) &&
|
||||||
- ((*input)._value_int <=
|
- ((*input)._value_int <=
|
||||||
- 9223372036854775807LL)) ||
|
- 9223372036854775807LL)) ||
|
||||||
+ ? (((((*input)._value_int >= INT64_MIN) &&
|
- (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE),
|
||||||
+ ((*input)._value_int <= INT64_MAX)) ||
|
- false)) &&
|
||||||
(zcbor_error(state, ZCBOR_ERR_WRONG_RANGE),
|
- (zcbor_int64_encode(state,
|
||||||
false)) &&
|
- (&(*input)._value_int))))
|
||||||
(zcbor_int64_encode(state,
|
- : (((*input)._value_choice == _value_float)
|
||||||
@@ -146,8 +145,8 @@ static bool encode_value(zcbor_state_t *state, const struct value_ *input)
|
- ? ((zcbor_float64_encode(
|
||||||
(&(*input)._value_float))))
|
- state,
|
||||||
: (((*input)._value_choice == _value_bool)
|
- (&(*input)._value_float))))
|
||||||
? ((zcbor_bool_encode(
|
- : (((*input)._value_choice == _value_bool)
|
||||||
|
- ? ((zcbor_bool_encode(
|
||||||
- state,
|
- state,
|
||||||
- (&(*input)._value_bool))))
|
- (&(*input)._value_bool))))
|
||||||
|
- : false)))))));
|
||||||
|
+ : (((*input)._value_choice == _value_int)
|
||||||
|
+ ? (((((*input)._value_int >= INT64_MIN) &&
|
||||||
|
+ ((*input)._value_int <= INT64_MAX)) ||
|
||||||
|
+ (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE),
|
||||||
|
+ false)) &&
|
||||||
|
+ (zcbor_int64_encode(state,
|
||||||
|
+ (&(*input)._value_int))))
|
||||||
|
+ : (((*input)._value_choice == _value_float)
|
||||||
|
+ ? ((zcbor_float64_encode(
|
||||||
|
+ state,
|
||||||
|
+ (&(*input)._value_float))))
|
||||||
|
+ : (((*input)._value_choice == _value_bool)
|
||||||
|
+ ? ((zcbor_bool_encode(
|
||||||
+ state,
|
+ state,
|
||||||
+ (&(*input)._value_bool))))
|
+ (&(*input)._value_bool))))
|
||||||
: false)))))));
|
+ : false)))))));
|
||||||
|
|
||||||
if (!tmp_result)
|
if (!tmp_result) {
|
||||||
@@ -186,7 +185,9 @@ static bool encode_record(zcbor_state_t *state, const struct record *input)
|
zcbor_trace();
|
||||||
|
@@ -207,29 +207,33 @@ static bool encode_record(zcbor_state_t *state, const struct record *input)
|
||||||
{
|
{
|
||||||
zcbor_print("%s\r\n", __func__);
|
zcbor_print("%s\r\n", __func__);
|
||||||
|
|
||||||
- bool tmp_result = (((zcbor_map_start_encode(state, 10) &&
|
- bool tmp_result = (((zcbor_map_start_encode(state, 10) &&
|
||||||
+ int max_keys = ZCBOR_ARRAY_SIZE(input->_record__key_value_pair);
|
- ((zcbor_present_encode(&((*input)._record_bn_present),
|
||||||
+
|
- (zcbor_encoder_t *)encode_repeated_record_bn,
|
||||||
+ bool tmp_result = (((zcbor_map_start_encode(state, max_keys + 5) &&
|
- state, (&(*input)._record_bn)) &&
|
||||||
((zcbor_present_encode(&((*input)._record_bn_present),
|
- zcbor_present_encode(&((*input)._record_bt_present),
|
||||||
(zcbor_encoder_t *)encode_repeated_record_bn,
|
- (zcbor_encoder_t *)encode_repeated_record_bt,
|
||||||
state, (&(*input)._record_bn)) &&
|
- state, (&(*input)._record_bt)) &&
|
||||||
@@ -203,12 +204,12 @@ static bool encode_record(zcbor_state_t *state, const struct record *input)
|
- zcbor_present_encode(&((*input)._record_n_present),
|
||||||
(zcbor_encoder_t *)encode_repeated_record_union,
|
- (zcbor_encoder_t *)encode_repeated_record_n,
|
||||||
state, (&(*input)._record_union)) &&
|
- state, (&(*input)._record_n)) &&
|
||||||
zcbor_multi_encode_minmax(
|
- zcbor_present_encode(&((*input)._record_t_present),
|
||||||
|
- (zcbor_encoder_t *)encode_repeated_record_t,
|
||||||
|
- state, (&(*input)._record_t)) &&
|
||||||
|
- zcbor_present_encode(&((*input)._record_union_present),
|
||||||
|
- (zcbor_encoder_t *)encode_repeated_record_union,
|
||||||
|
- state, (&(*input)._record_union)) &&
|
||||||
|
- zcbor_multi_encode_minmax(
|
||||||
- 0, 5, &(*input)._record__key_value_pair_count,
|
- 0, 5, &(*input)._record__key_value_pair_count,
|
||||||
+ 0, max_keys, &(*input)._record__key_value_pair_count,
|
- (zcbor_encoder_t *)encode_repeated_record__key_value_pair,
|
||||||
(zcbor_encoder_t *)encode_repeated_record__key_value_pair,
|
- state, (&(*input)._record__key_value_pair),
|
||||||
state, (&(*input)._record__key_value_pair),
|
- sizeof(struct record__key_value_pair))) ||
|
||||||
sizeof(struct record__key_value_pair))) ||
|
- (zcbor_list_map_end_force_encode(state), false)) &&
|
||||||
(zcbor_list_map_end_force_encode(state), false)) &&
|
|
||||||
- zcbor_map_end_encode(state, 10))));
|
- zcbor_map_end_encode(state, 10))));
|
||||||
+ zcbor_map_end_encode(state, max_keys + 5))));
|
+ bool tmp_result =
|
||||||
|
+ (((zcbor_map_start_encode(state,
|
||||||
|
+ ZCBOR_ARRAY_SIZE(input->_record__key_value_pair) + 5) &&
|
||||||
|
+ ((zcbor_present_encode(&((*input)._record_bn_present),
|
||||||
|
+ (zcbor_encoder_t *)encode_repeated_record_bn, state,
|
||||||
|
+ (&(*input)._record_bn)) &&
|
||||||
|
+ zcbor_present_encode(&((*input)._record_bt_present),
|
||||||
|
+ (zcbor_encoder_t *)encode_repeated_record_bt, state,
|
||||||
|
+ (&(*input)._record_bt)) &&
|
||||||
|
+ zcbor_present_encode(&((*input)._record_n_present),
|
||||||
|
+ (zcbor_encoder_t *)encode_repeated_record_n, state,
|
||||||
|
+ (&(*input)._record_n)) &&
|
||||||
|
+ zcbor_present_encode(&((*input)._record_t_present),
|
||||||
|
+ (zcbor_encoder_t *)encode_repeated_record_t, state,
|
||||||
|
+ (&(*input)._record_t)) &&
|
||||||
|
+ zcbor_present_encode(&((*input)._record_union_present),
|
||||||
|
+ (zcbor_encoder_t *)encode_repeated_record_union, state,
|
||||||
|
+ (&(*input)._record_union)) &&
|
||||||
|
+ zcbor_multi_encode_minmax(
|
||||||
|
+ 0, ZCBOR_ARRAY_SIZE(input->_record__key_value_pair),
|
||||||
|
+ &(*input)._record__key_value_pair_count,
|
||||||
|
+ (zcbor_encoder_t *)encode_repeated_record__key_value_pair, state,
|
||||||
|
+ (&(*input)._record__key_value_pair),
|
||||||
|
+ sizeof(struct record__key_value_pair))) ||
|
||||||
|
+ (zcbor_list_map_end_force_encode(state), false)) &&
|
||||||
|
+ zcbor_map_end_encode(state,
|
||||||
|
+ ZCBOR_ARRAY_SIZE(input->_record__key_value_pair) + 5))));
|
||||||
|
|
||||||
if (!tmp_result)
|
if (!tmp_result) {
|
||||||
zcbor_trace();
|
zcbor_trace();
|
||||||
@@ -219,14 +220,15 @@ static bool encode_record(zcbor_state_t *state, const struct record *input)
|
@@ -242,13 +246,14 @@ static bool encode_lwm2m_senml(zcbor_state_t *state, const struct lwm2m_senml *i
|
||||||
static bool encode_lwm2m_senml(zcbor_state_t *state, const struct lwm2m_senml *input)
|
|
||||||
{
|
{
|
||||||
zcbor_print("%s\r\n", __func__);
|
zcbor_print("%s\r\n", __func__);
|
||||||
+ size_t max_records = ZCBOR_ARRAY_SIZE(input->_lwm2m_senml__record);
|
|
||||||
|
|
||||||
- bool tmp_result = (((zcbor_list_start_encode(state, 99) &&
|
- bool tmp_result = (((zcbor_list_start_encode(state, 99) &&
|
||||||
+ bool tmp_result = (((zcbor_list_start_encode(state, max_records) &&
|
- ((zcbor_multi_encode_minmax(
|
||||||
((zcbor_multi_encode_minmax(
|
|
||||||
- 1, 99, &(*input)._lwm2m_senml__record_count,
|
- 1, 99, &(*input)._lwm2m_senml__record_count,
|
||||||
+ 1, max_records, &(*input)._lwm2m_senml__record_count,
|
- (zcbor_encoder_t *)encode_record, state,
|
||||||
(zcbor_encoder_t *)encode_record, state,
|
- (&(*input)._lwm2m_senml__record), sizeof(struct record))) ||
|
||||||
(&(*input)._lwm2m_senml__record), sizeof(struct record))) ||
|
- (zcbor_list_map_end_force_encode(state), false)) &&
|
||||||
(zcbor_list_map_end_force_encode(state), false)) &&
|
|
||||||
- zcbor_list_end_encode(state, 99))));
|
- zcbor_list_end_encode(state, 99))));
|
||||||
+ zcbor_list_end_encode(state, max_records))));
|
+ bool tmp_result =
|
||||||
|
+ (((zcbor_list_start_encode(state, ZCBOR_ARRAY_SIZE(input->_lwm2m_senml__record)) &&
|
||||||
|
+ ((zcbor_multi_encode_minmax(
|
||||||
|
+ 1, ZCBOR_ARRAY_SIZE(input->_lwm2m_senml__record),
|
||||||
|
+ &(*input)._lwm2m_senml__record_count, (zcbor_encoder_t *)encode_record,
|
||||||
|
+ state, (&(*input)._lwm2m_senml__record), sizeof(struct record))) ||
|
||||||
|
+ (zcbor_list_map_end_force_encode(state), false)) &&
|
||||||
|
+ zcbor_list_end_encode(state, ZCBOR_ARRAY_SIZE(input->_lwm2m_senml__record)))));
|
||||||
|
|
||||||
if (!tmp_result)
|
if (!tmp_result) {
|
||||||
zcbor_trace();
|
zcbor_trace();
|
||||||
diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h
|
diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h
|
||||||
index e9f7433e06..1a3591ba62 100644
|
index 99b3ef4f27..6a5cc2a1d9 100644
|
||||||
--- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h
|
--- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h
|
||||||
+++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h
|
+++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h
|
||||||
@@ -1,23 +1,23 @@
|
@@ -1,6 +1,11 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright (c) 2022 Nordic Semiconductor ASA
|
+ * Copyright (c) 2023 Nordic Semiconductor ASA
|
||||||
+ *
|
+ *
|
||||||
+ * SPDX-License-Identifier: Apache-2.0
|
+ * SPDX-License-Identifier: Apache-2.0
|
||||||
+ */
|
+ */
|
||||||
|
@ -295,32 +433,24 @@ index e9f7433e06..1a3591ba62 100644
|
||||||
* Generated with a --default-max-qty of 99
|
* Generated with a --default-max-qty of 99
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef LWM2M_SENML_CBOR_ENCODE_H__
|
@@ -14,10 +19,6 @@
|
||||||
#define LWM2M_SENML_CBOR_ENCODE_H__
|
#include "zcbor_encode.h"
|
||||||
|
#include "lwm2m_senml_cbor_types.h"
|
||||||
|
|
||||||
-#include "lwm2m_senml_cbor_types.h"
|
|
||||||
-#include "zcbor_encode.h"
|
|
||||||
-
|
|
||||||
#include <stdbool.h>
|
|
||||||
#include <stddef.h>
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <string.h>
|
|
||||||
-
|
|
||||||
-#if DEFAULT_MAX_QTY != 99
|
-#if DEFAULT_MAX_QTY != 99
|
||||||
-#error "The type file was generated with a different default_max_qty than this file"
|
-#error "The type file was generated with a different default_max_qty than this file"
|
||||||
-#endif
|
-#endif
|
||||||
+#include "zcbor_encode.h"
|
-
|
||||||
+#include "lwm2m_senml_cbor_types.h"
|
|
||||||
|
|
||||||
int cbor_encode_lwm2m_senml(uint8_t *payload, size_t payload_len, const struct lwm2m_senml *input,
|
int cbor_encode_lwm2m_senml(uint8_t *payload, size_t payload_len, const struct lwm2m_senml *input,
|
||||||
size_t *payload_len_out);
|
size_t *payload_len_out);
|
||||||
|
|
||||||
diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h
|
diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h
|
||||||
index 8614d551f4..f7cf2c1baa 100644
|
index 3212a18fe9..1f972c1379 100644
|
||||||
--- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h
|
--- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h
|
||||||
+++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h
|
+++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h
|
||||||
@@ -1,18 +1,35 @@
|
@@ -1,6 +1,11 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright (c) 2022 Nordic Semiconductor ASA
|
+ * Copyright (c) 2023 Nordic Semiconductor ASA
|
||||||
+ *
|
+ *
|
||||||
+ * SPDX-License-Identifier: Apache-2.0
|
+ * SPDX-License-Identifier: Apache-2.0
|
||||||
+ */
|
+ */
|
||||||
|
@ -331,23 +461,18 @@ index 8614d551f4..f7cf2c1baa 100644
|
||||||
* Generated with a --default-max-qty of 99
|
* Generated with a --default-max-qty of 99
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef LWM2M_SENML_CBOR_TYPES_H__
|
@@ -11,7 +16,19 @@
|
||||||
#define LWM2M_SENML_CBOR_TYPES_H__
|
|
||||||
|
|
||||||
-#include "zcbor_encode.h"
|
|
||||||
-
|
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <stdint.h>
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
-#include "zcbor_encode.h"
|
||||||
+#include "zcbor_common.h"
|
+#include "zcbor_common.h"
|
||||||
+
|
+
|
||||||
+
|
|
||||||
+enum lwm2m_senml_cbor_key {
|
+enum lwm2m_senml_cbor_key {
|
||||||
+ lwm2m_senml_cbor_key_bn = -2,
|
+ lwm2m_senml_cbor_key_bn = -2,
|
||||||
+ lwm2m_senml_cbor_key_bt = -3,
|
+ lwm2m_senml_cbor_key_bt = -3,
|
||||||
+ lwm2m_senml_cbor_key_n = 0,
|
+ lwm2m_senml_cbor_key_n = 0,
|
||||||
+ lwm2m_senml_cbor_key_t = 6,
|
+ lwm2m_senml_cbor_key_t = 6,
|
||||||
+ lwm2m_senml_cbor_key_vi = 2,
|
+ lwm2m_senml_cbor_key_vi = 2,
|
||||||
+ lwm2m_senml_cbor_key_vf = 2,
|
+ lwm2m_senml_cbor_key_vf = 2,
|
||||||
+ lwm2m_senml_cbor_key_vs = 3,
|
+ lwm2m_senml_cbor_key_vs = 3,
|
||||||
|
@ -357,7 +482,7 @@ index 8614d551f4..f7cf2c1baa 100644
|
||||||
|
|
||||||
/** Which value for --default-max-qty this file was created with.
|
/** Which value for --default-max-qty this file was created with.
|
||||||
*
|
*
|
||||||
@@ -21,7 +38,7 @@
|
@@ -20,7 +37,7 @@
|
||||||
*
|
*
|
||||||
* See `zcbor --help` for more information about --default-max-qty
|
* See `zcbor --help` for more information about --default-max-qty
|
||||||
*/
|
*/
|
||||||
|
@ -365,13 +490,15 @@ index 8614d551f4..f7cf2c1baa 100644
|
||||||
+#define DEFAULT_MAX_QTY CONFIG_LWM2M_RW_SENML_CBOR_RECORDS
|
+#define DEFAULT_MAX_QTY CONFIG_LWM2M_RW_SENML_CBOR_RECORDS
|
||||||
|
|
||||||
struct record_bn {
|
struct record_bn {
|
||||||
struct zcbor_string _record_bn;
|
struct zcbor_string _record_bn;
|
||||||
@@ -108,7 +125,7 @@ struct record {
|
@@ -111,7 +128,7 @@ struct record {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct lwm2m_senml {
|
struct lwm2m_senml {
|
||||||
- struct record _lwm2m_senml__record[99];
|
- struct record _lwm2m_senml__record[99];
|
||||||
+ struct record _lwm2m_senml__record[DEFAULT_MAX_QTY];
|
+ struct record _lwm2m_senml__record[DEFAULT_MAX_QTY];
|
||||||
uint_fast32_t _lwm2m_senml__record_count;
|
uint_fast32_t _lwm2m_senml__record_count;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue