rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-24 03:31:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'root/master' into dev1.2

Browse Source 
# Conflicts:
#	src/esp32/main-esp32.cpp
#	src/mesh/generated/deviceonly.pb.h
#	src/mesh/generated/mesh.pb.h
This commit is contained in:
Kevin Hester
2021-03-27 16:44:42 +08:00
parent 1e3b037fea 9fb6b1718f
commit 76269b397f
7 changed files with 43 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesh/generated/deviceonly.pb.h
View File

@@ -125,7 +125,7 @@ extern const pb_msgdesc_t ChannelFile_msg;
/* Maximum encoded size of messages (where known) */
#define LegacyRadioConfig_size 4
#define LegacyRadioConfig_LegacyPreferences_size 2
#define DeviceState_size 5112
#define DeviceState_size 5118
#define ChannelFile_size 832
#ifdef __cplusplus