Merge branch 'master' into stm32wl-wip

This commit is contained in:
Thomas Göttgens
2023-01-21 21:55:09 +01:00
committed by GitHub
co-authored by GitHub
322 changed files with 8054 additions and 8114 deletions
+5 -5
View File
@@ -46,8 +46,8 @@ class XModemAdapter
XModemAdapter();
void handlePacket(XModem xmodemPacket);
XModem *getForPhone();
void handlePacket(meshtastic_XModem xmodemPacket);
meshtastic_XModem *getForPhone();
private:
bool isReceiving = false;
@@ -64,13 +64,13 @@ class XModemAdapter
File file;
#endif
char filename[sizeof(XModem_buffer_t::bytes)] = {0};
char filename[sizeof(meshtastic_XModem_buffer_t::bytes)] = {0};
protected:
XModem *xmodemStore = NULL;
meshtastic_XModem *xmodemStore = NULL;
unsigned short crc16_ccitt(const pb_byte_t *buffer, int length);
int check(const pb_byte_t *buf, int sz, unsigned short tcrc);
void sendControl(XModem_Control c);
void sendControl(meshtastic_XModem_Control c);
};
extern XModemAdapter xModem;