From cfcc891d3d8f3a03145cd1307bd4532c777f678a Mon Sep 17 00:00:00 2001 From: Veijo Pesonen Date: Tue, 19 Apr 2022 12:20:00 +0300 Subject: [PATCH] net: lwm2m: makes CBOR as one of the default... ...content formats In case that SenML CBOR or SenML JSON are both disabled there is need to use plain CBOR as backup. Signed-off-by: Veijo Pesonen --- subsys/net/lib/lwm2m/lwm2m_engine.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/subsys/net/lib/lwm2m/lwm2m_engine.c b/subsys/net/lib/lwm2m/lwm2m_engine.c index 86ee59fff2d..352921f6520 100644 --- a/subsys/net/lib/lwm2m/lwm2m_engine.c +++ b/subsys/net/lib/lwm2m/lwm2m_engine.c @@ -4453,8 +4453,11 @@ static int lwm2m_engine_default_content_format(uint16_t *accept_format) if (IS_ENABLED(CONFIG_LWM2M_RW_SENML_JSON_SUPPORT)) { LOG_DBG("No accept option given. Assume SenML Json."); *accept_format = LWM2M_FORMAT_APP_SEML_JSON; + } else if (IS_ENABLED(CONFIG_LWM2M_RW_CBOR_SUPPORT)) { + LOG_DBG("No accept option given. Assume CBOR."); + *accept_format = LWM2M_FORMAT_APP_CBOR; } else { - LOG_ERR("SenML CBOR or JSON is not supported"); + LOG_ERR("CBOR, SenML CBOR or SenML JSON is not supported"); return -ENOTSUP; } } else if (IS_ENABLED(CONFIG_LWM2M_RW_OMA_TLV_SUPPORT)) {