From c63536d948df8869e047d10c6e89a559f6a9bb0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Mon, 9 Jan 2023 20:23:32 +0100 Subject: [PATCH] switch to 16 bit packet number --- src/mesh/generated/mesh.pb.h | 1 + src/mesh/generated/xmodem.pb.h | 4 ++-- src/xmodem.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mesh/generated/mesh.pb.h b/src/mesh/generated/mesh.pb.h index 064b9cdcb..6380092ac 100644 --- a/src/mesh/generated/mesh.pb.h +++ b/src/mesh/generated/mesh.pb.h @@ -696,6 +696,7 @@ typedef struct _ToRadio { This is useful for serial links where there is no hardware/protocol based notification that the client has dropped the link. (Sending this message is optional for clients) */ bool disconnect; + /* File Transfer Chunk */ XModem xmodemPacket; }; } ToRadio; diff --git a/src/mesh/generated/xmodem.pb.h b/src/mesh/generated/xmodem.pb.h index e5fd33234..453c8ce7c 100644 --- a/src/mesh/generated/xmodem.pb.h +++ b/src/mesh/generated/xmodem.pb.h @@ -25,7 +25,7 @@ typedef enum _XModem_Control { typedef PB_BYTES_ARRAY_T(128) XModem_buffer_t; typedef struct _XModem { XModem_Control control; - uint8_t seq; + uint16_t seq; uint16_t crc16; XModem_buffer_t buffer; } XModem; @@ -68,7 +68,7 @@ extern const pb_msgdesc_t XModem_msg; #define XModem_fields &XModem_msg /* Maximum encoded size of messages (where known) */ -#define XModem_size 140 +#define XModem_size 141 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/xmodem.h b/src/xmodem.h index 3de55ea39..6c2418926 100644 --- a/src/xmodem.h +++ b/src/xmodem.h @@ -56,7 +56,7 @@ class XModemAdapter int retrans = MAXRETRANS; - unsigned char packetno = 0; + uint16_t packetno = 0; #ifdef ARCH_NRF52 File file = File(FSCom);