serial_recovery: Reduce minimum number of members in packet
Was 3, but mcumgr sometimes sends 2 ("off" + "data", "len" is not needed
when "off" != 0). Reduce to 1 to avoid the problem, since the code
has other checks to catch this.
Signed-off-by: Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>
diff --git a/boot/boot_serial/src/serial_recovery.cddl b/boot/boot_serial/src/serial_recovery.cddl
index 9aae63c..d45db08 100644
--- a/boot/boot_serial/src/serial_recovery.cddl
+++ b/boot/boot_serial/src/serial_recovery.cddl
@@ -11,5 +11,5 @@
("sha" => bstr)
Upload = {
- 3**5members: Member
+ 1**5members: Member
}
diff --git a/boot/boot_serial/src/serial_recovery_cbor.c b/boot/boot_serial/src/serial_recovery_cbor.c
index d774f58..45634ef 100644
--- a/boot/boot_serial/src/serial_recovery_cbor.c
+++ b/boot/boot_serial/src/serial_recovery_cbor.c
@@ -10,7 +10,7 @@
*/
/* Generated with cddl_gen.py (https://github.com/oyvindronningstad/cddl_gen)
- * at: 2020-02-26 10:33:34
+ * at: 2020-05-13 12:19:04
*/
#include <stdint.h>
@@ -58,8 +58,8 @@
size_t *p_temp_elem_count = temp_elem_counts;
Upload_t* p_type_result = (Upload_t*)p_result;
- bool result = (((list_start_decode(p_state, &(*(p_temp_elem_count++)), 3, 5))
- && multi_decode(3, 5, &(*p_type_result)._Upload_members_count, (void*)decode_Member, p_state, &((*p_type_result)._Upload_members), NULL, NULL, sizeof(_Member_t))
+ bool result = (((list_start_decode(p_state, &(*(p_temp_elem_count++)), 1, 5))
+ && multi_decode(1, 5, &(*p_type_result)._Upload_members_count, (void*)decode_Member, p_state, &((*p_type_result)._Upload_members), NULL, NULL, sizeof(_Member_t))
&& ((p_state->elem_count = *(--p_temp_elem_count)) || 1)));
if (!result)
diff --git a/boot/boot_serial/src/serial_recovery_cbor.h b/boot/boot_serial/src/serial_recovery_cbor.h
index dd3978f..aa14f5c 100644
--- a/boot/boot_serial/src/serial_recovery_cbor.h
+++ b/boot/boot_serial/src/serial_recovery_cbor.h
@@ -10,7 +10,7 @@
*/
/* Generated with cddl_gen.py (https://github.com/oyvindronningstad/cddl_gen)
- * at: 2020-02-26 10:33:34
+ * at: 2020-05-13 12:19:04
*/
#ifndef SERIAL_RECOVERY_CBOR_H__