Merge remote-tracking branch 'upstream/dev' into keymindCascade
# Conflicts: # examples/companion_radio/ui-new/UITask.cpp # examples/companion_radio/ui-orig/UITask.cpp # examples/companion_radio/ui-tiny/UITask.cpp # examples/simple_repeater/MyMesh.cpp # src/Mesh.cpp # src/Mesh.h # src/helpers/ESP32Board.cpp # src/helpers/ESP32Board.h # src/helpers/SimpleMeshTables.h # variants/heltec_v3/HeltecV3Board.h # variants/tenstar_c3/target.h
This commit is contained in:
commit
84c166d5cc
53 files changed
+1057
-130
No files matched your search
+1
-1
@@ -25,7 +25,7 @@ namespace mesh {
|
||||
#define PAYLOAD_TYPE_GRP_DATA 0x06 // an (unverified) group datagram (prefixed with channel hash, MAC) (enc data: data_type(uint16), data_len, blob)
|
||||
#define PAYLOAD_TYPE_ANON_REQ 0x07 // generic request (prefixed with dest_hash, ephemeral pub_key, MAC) (enc data: ...)
|
||||
#define PAYLOAD_TYPE_PATH 0x08 // returned path (prefixed with dest/src hashes, MAC) (enc data: path, extra)
|
||||
#define PAYLOAD_TYPE_TRACE 0x09 // trace a path, collecting SNI for each hop
|
||||
#define PAYLOAD_TYPE_TRACE 0x09 // trace a path, collecting SNR for each hop
|
||||
#define PAYLOAD_TYPE_MULTIPART 0x0A // packet is one of a set of packets
|
||||
#define PAYLOAD_TYPE_CONTROL 0x0B // a control/discovery packet
|
||||
//...
|
||||
|
||||
Reference in new issue
Block a user