rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-02-05 08:31:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into NextHopRouter

Browse Source
This commit is contained in:
GUVWAF
2024-11-01 09:41:43 +01:00
parent 6fe42ed4c5 545ebf9b17
commit aae4443e25
469 changed files with 11896 additions and 7255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/* Automatically generated nanopb constant definitions */
/* Generated by nanopb-0.4.8 */
/* Generated by nanopb-0.4.9 */
#include "meshtastic/config.pb.h"
#if PB_PROTO_HEADER_VERSION != 40
@@ -33,4 +33,40 @@ PB_BIND(meshtastic_Config_LoRaConfig, meshtastic_Config_LoRaConfig, 2)
PB_BIND(meshtastic_Config_BluetoothConfig, meshtastic_Config_BluetoothConfig, AUTO)
PB_BIND(meshtastic_Config_SecurityConfig, meshtastic_Config_SecurityConfig, AUTO)
<<<<<<< HEAD
PB_BIND(meshtastic_Config_SecurityConfig, meshtastic_Config_SecurityConfig, AUTO)
=======
PB_BIND(meshtastic_Config_SecurityConfig, meshtastic_Config_SecurityConfig, AUTO)
PB_BIND(meshtastic_Config_SessionkeyConfig, meshtastic_Config_SessionkeyConfig, AUTO)
>>>>>>> origin/master