rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-30 13:41:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update protos, store multiple relayers

Browse Source
This commit is contained in:
GUVWAF
2024-11-01 17:02:04 +01:00
parent aae4443e25
commit ba4220fe50
18 changed files with 131 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesh/generated/meshtastic/config.pb.cpp
View File

@@ -33,9 +33,6 @@ PB_BIND(meshtastic_Config_LoRaConfig, meshtastic_Config_LoRaConfig, 2)
PB_BIND(meshtastic_Config_BluetoothConfig, meshtastic_Config_BluetoothConfig, AUTO)
<<<<<<< HEAD
PB_BIND(meshtastic_Config_SecurityConfig, meshtastic_Config_SecurityConfig, AUTO)
=======
PB_BIND(meshtastic_Config_SecurityConfig, meshtastic_Config_SecurityConfig, AUTO)
@@ -69,4 +66,3 @@ PB_BIND(meshtastic_Config_SessionkeyConfig, meshtastic_Config_SessionkeyConfig,
>>>>>>> origin/master