mirror of
https://github.com/meshtastic/protobufs.git
synced 2026-04-20 22:13:55 +00:00
Merge master
This commit is contained in:
oscgonfer
commit
c42d097198
10 changed files with 2006 additions and 27 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -2,3 +2,4 @@
|
|||
|
||||
# Generated protobuf files
|
||||
packages/ts/lib/
|
||||
.bin/
|
||||
|
|
|
|||
|
|
@ -5,4 +5,106 @@
|
|||
*GeoChat.message max_size:200
|
||||
*GeoChat.to max_size:120
|
||||
*GeoChat.to_callsign max_size:120
|
||||
*TAKPacket.detail max_size:220
|
||||
*TAKPacket.detail max_size:220
|
||||
*TAKPacketV2.cot_type_str max_size:32
|
||||
*TAKPacketV2.callsign max_size:120
|
||||
*TAKPacketV2.uid max_size:48
|
||||
*TAKPacketV2.device_callsign max_size:120
|
||||
*TAKPacketV2.tak_version max_size:64
|
||||
*TAKPacketV2.tak_device max_size:32
|
||||
*TAKPacketV2.tak_platform max_size:32
|
||||
*TAKPacketV2.tak_os max_size:16
|
||||
*TAKPacketV2.endpoint max_size:32
|
||||
*TAKPacketV2.phone max_size:20
|
||||
*TAKPacketV2.raw_detail max_size:220
|
||||
*TAKPacketV2.stale_seconds int_size:16
|
||||
*TAKPacketV2.battery int_size:8
|
||||
*TAKPacketV2.course int_size:16
|
||||
*AircraftTrack.icao max_size:8
|
||||
*AircraftTrack.registration max_size:16
|
||||
*AircraftTrack.flight max_size:16
|
||||
*AircraftTrack.aircraft_type max_size:8
|
||||
*AircraftTrack.squawk int_size:16
|
||||
*AircraftTrack.category max_size:4
|
||||
*AircraftTrack.cot_host_id max_size:64
|
||||
|
||||
# --- Typed geometry payloads (v2 protocol extension) ---
|
||||
#
|
||||
# CotGeoPoint: sint32 deltas from the enclosing event's latitude_i/longitude_i.
|
||||
# For nearby vertices (telestrations, small rectangles) the varint+zigzag
|
||||
# encoding is 2-3 bytes per field, cutting telestration vertex data in half
|
||||
# versus sfixed32. int_size:32 keeps the C type a plain int32.
|
||||
# Named with a `Cot` prefix to avoid a collision with `meshtastic.GeoPoint`
|
||||
# in device_ui.proto, which is an unrelated zoom/latitude/longitude type.
|
||||
*CotGeoPoint.lat_delta_i int_size:32
|
||||
*CotGeoPoint.lon_delta_i int_size:32
|
||||
#
|
||||
# DrawnShape pool sizing. `kind` and `style` are varint enums (no int_size
|
||||
# needed). stroke_color / fill_color are Team enum, also varint. stroke_argb
|
||||
# / fill_argb are fixed32 (always 4 bytes on the wire). Vertex pool is 32
|
||||
# entries x ~12B each ~= 384B worst case. Telestrations beyond 32 vertices
|
||||
# MUST be pre-truncated by the sender with `truncated = true`.
|
||||
*DrawnShape.vertices max_count:32
|
||||
*DrawnShape.major_cm int_size:32
|
||||
*DrawnShape.minor_cm int_size:32
|
||||
*DrawnShape.angle_deg int_size:16
|
||||
*DrawnShape.stroke_weight_x10 int_size:16
|
||||
*DrawnShape.bullseye_distance_dm int_size:32
|
||||
*DrawnShape.bullseye_bearing_ref int_size:8
|
||||
*DrawnShape.bullseye_flags int_size:8
|
||||
*DrawnShape.bullseye_uid_ref max_size:48
|
||||
|
||||
# Marker pool sizing. Strings bounded tight to keep fixed pool small on
|
||||
# ESP32 nanopb. parent_uid matches existing TAKPacketV2.uid cap (48).
|
||||
# iconset fits "f7f71666-8b28-4b57-9fbb-e38e61d33b79/Google/hiker.png"
|
||||
# (~52 chars) with slack.
|
||||
*Marker.parent_uid max_size:48
|
||||
*Marker.parent_type max_size:24
|
||||
*Marker.parent_callsign max_size:24
|
||||
*Marker.iconset max_size:80
|
||||
|
||||
# RangeAndBearing pool sizing.
|
||||
*RangeAndBearing.anchor_uid max_size:48
|
||||
*RangeAndBearing.range_cm int_size:32
|
||||
*RangeAndBearing.bearing_cdeg int_size:16
|
||||
*RangeAndBearing.stroke_weight_x10 int_size:16
|
||||
|
||||
# Route pool sizing. 16 links x ~24B each ~= 384B worst case. prefix is
|
||||
# ATAK's short waypoint name prefix ("CP", "RP", etc.) — 8 chars is plenty.
|
||||
*Route.links max_count:16
|
||||
*Route.prefix max_size:8
|
||||
*Route.stroke_weight_x10 int_size:16
|
||||
*Route.Link.uid max_size:48
|
||||
*Route.Link.callsign max_size:16
|
||||
*Route.Link.link_type int_size:8
|
||||
|
||||
# GeoChat receipt extension. receipt_for_uid matches TAKPacketV2.uid caps.
|
||||
*GeoChat.receipt_for_uid max_size:48
|
||||
|
||||
# CasevacReport pool sizing. All numeric fields are small (0..255 for
|
||||
# patient counts, 1 byte for flags bitfields); strings are short.
|
||||
*CasevacReport.equipment_flags int_size:8
|
||||
*CasevacReport.terrain_flags int_size:8
|
||||
*CasevacReport.litter_patients int_size:8
|
||||
*CasevacReport.ambulatory_patients int_size:8
|
||||
*CasevacReport.us_military int_size:8
|
||||
*CasevacReport.us_civilian int_size:8
|
||||
*CasevacReport.non_us_military int_size:8
|
||||
*CasevacReport.non_us_civilian int_size:8
|
||||
*CasevacReport.epw int_size:8
|
||||
*CasevacReport.child int_size:8
|
||||
*CasevacReport.zone_marker max_size:16
|
||||
*CasevacReport.frequency max_size:16
|
||||
|
||||
# EmergencyAlert pool sizing. UIDs match TAKPacketV2.uid caps (48).
|
||||
*EmergencyAlert.authoring_uid max_size:48
|
||||
*EmergencyAlert.cancel_reference_uid max_size:48
|
||||
|
||||
# TaskRequest pool sizing. All four strings are capped tight so the
|
||||
# worst-case wire size stays under the LoRa MTU with headroom. task_type
|
||||
# is a short category tag; target_uid/assignee_uid match TAKPacketV2.uid
|
||||
# conventions; note is the one user-entered field.
|
||||
*TaskRequest.task_type max_size:12
|
||||
*TaskRequest.target_uid max_size:32
|
||||
*TaskRequest.assignee_uid max_size:32
|
||||
*TaskRequest.note max_size:48
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -74,6 +74,8 @@
|
|||
*StoreForwardPlusPlus.root_hash max_size:32
|
||||
*StoreForwardPlusPlus.message max_size:240
|
||||
|
||||
*RemoteShell.payload max_size:200
|
||||
|
||||
*StatusMessage.status max_size:80
|
||||
|
||||
# MyMessage.name max_size:40
|
||||
|
|
|
|||
|
|
@ -870,6 +870,24 @@ enum HardwareModel {
|
|||
*/
|
||||
TDISPLAY_S3_PRO = 126;
|
||||
|
||||
/*
|
||||
* Heltec Mesh Node T096 board features an nRF52840 CPU and a TFT screen.
|
||||
*/
|
||||
HELTEC_MESH_NODE_T096 = 127;
|
||||
|
||||
/*
|
||||
* Seeed studio T1000-E Pro tracker card. NRF52840 w/ LR2021 radio,
|
||||
* GPS, button, buzzer, and sensors.
|
||||
*/
|
||||
TRACKER_T1000_E_PRO = 128;
|
||||
|
||||
/*
|
||||
* Elecrow ThinkNode M7, M8 and M9
|
||||
*/
|
||||
THINKNODE_M7 = 129;
|
||||
THINKNODE_M8 = 130;
|
||||
THINKNODE_M9 = 131;
|
||||
|
||||
/*
|
||||
* ------------------------------------------------------------------------------------------------------------------------------------------
|
||||
* Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
|
||||
|
|
@ -1280,6 +1298,86 @@ message StoreForwardPlusPlus {
|
|||
uint32 chain_count = 10;
|
||||
}
|
||||
|
||||
/*
|
||||
* The actual over-the-mesh message doing RemoteShell
|
||||
*/
|
||||
message RemoteShell {
|
||||
/*
|
||||
* Frame op code for PTY session control and stream transport.
|
||||
*
|
||||
* Values 1-63 are client->server requests.
|
||||
* Values 64-127 are server->client responses/events.
|
||||
*/
|
||||
enum OpCode {
|
||||
OP_UNSET = 0;
|
||||
|
||||
// Client -> server
|
||||
OPEN = 1;
|
||||
INPUT = 2;
|
||||
RESIZE = 3;
|
||||
CLOSE = 4;
|
||||
PING = 5;
|
||||
ACK = 6;
|
||||
|
||||
// Server -> client
|
||||
OPEN_OK = 64;
|
||||
OUTPUT = 65;
|
||||
CLOSED = 66;
|
||||
ERROR = 67;
|
||||
PONG = 68;
|
||||
}
|
||||
|
||||
/*
|
||||
* Structured frame operation.
|
||||
*/
|
||||
OpCode op = 1;
|
||||
|
||||
/*
|
||||
* Logical PTY session identifier.
|
||||
*/
|
||||
uint32 session_id = 2;
|
||||
|
||||
/*
|
||||
* Monotonic sequence number for this frame.
|
||||
*/
|
||||
uint32 seq = 3;
|
||||
|
||||
/*
|
||||
* Cumulative ack sequence number.
|
||||
*/
|
||||
uint32 ack_seq = 4;
|
||||
|
||||
/*
|
||||
* Opaque bytes payload for INPUT/OUTPUT/ERROR and other frame bodies.
|
||||
*/
|
||||
bytes payload = 5;
|
||||
|
||||
/*
|
||||
* Terminal size columns used for OPEN/RESIZE signaling.
|
||||
*/
|
||||
uint32 cols = 6;
|
||||
|
||||
/*
|
||||
* Terminal size rows used for OPEN/RESIZE signaling.
|
||||
*/
|
||||
uint32 rows = 7;
|
||||
|
||||
/*
|
||||
* Bit flags for protocol extensions.
|
||||
*/
|
||||
uint32 flags = 8;
|
||||
|
||||
/*
|
||||
* The last sequence number TX'd.
|
||||
*/
|
||||
uint32 last_tx_seq = 9;
|
||||
|
||||
/*
|
||||
* The last sequence number RX'd.
|
||||
*/
|
||||
uint32 last_rx_seq = 10;
|
||||
}
|
||||
|
||||
/*
|
||||
* Waypoint message, used to share arbitrary locations across the mesh
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -115,6 +115,11 @@ enum PortNum {
|
|||
*/
|
||||
KEY_VERIFICATION_APP = 12;
|
||||
|
||||
/*
|
||||
* Module/port for handling primitive remote shell access.
|
||||
*/
|
||||
REMOTE_SHELL_APP = 13;
|
||||
|
||||
/*
|
||||
* Provides a 'ping' service that replies to any packet it receives.
|
||||
* Also serves as a small example module.
|
||||
|
|
@ -246,6 +251,13 @@ enum PortNum {
|
|||
*/
|
||||
CAYENNE_APP = 77;
|
||||
|
||||
/*
|
||||
* ATAK Plugin V2
|
||||
* Portnum for payloads from the official Meshtastic ATAK plugin using
|
||||
* TAKPacketV2 with zstd dictionary compression.
|
||||
*/
|
||||
ATAK_PLUGIN_V2 = 78;
|
||||
|
||||
/*
|
||||
* GroupAlarm integration
|
||||
* Used for transporting GroupAlarm-related messages between Meshtastic nodes
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
*EnvironmentMetrics.iaq int_size:16
|
||||
*EnvironmentMetrics.wind_direction int_size:16
|
||||
*EnvironmentMetrics.soil_moisture int_size:8
|
||||
*EnvironmentMetrics.one_wire_temperature max_count:8
|
||||
|
||||
*LocalStats.num_online_nodes int_size:16
|
||||
*LocalStats.num_total_nodes int_size:16
|
||||
|
|
|
|||
|
|
@ -193,6 +193,11 @@ message EnvironmentMetrics {
|
|||
* ADC Voltage (Ch8)
|
||||
*/
|
||||
optional float adc_voltage_ch8 = 30;
|
||||
|
||||
/*
|
||||
* One-wire temperature (*C)
|
||||
*/
|
||||
repeated float one_wire_temperature = 31;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -911,6 +916,11 @@ enum TelemetrySensorType {
|
|||
* SHT family of sensors for temperature and humidity
|
||||
*/
|
||||
SHTXX = 50;
|
||||
|
||||
/*
|
||||
* DS248X Bridge for one-wire temperature sensors
|
||||
*/
|
||||
DS248X = 51;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
46
packages/rust/Cargo.lock
generated
46
packages/rust/Cargo.lock
generated
|
|
@ -1,30 +1,30 @@
|
|||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
version = 4
|
||||
|
||||
[[package]]
|
||||
name = "anyhow"
|
||||
version = "1.0.89"
|
||||
version = "1.0.102"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
|
||||
checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
|
||||
|
||||
[[package]]
|
||||
name = "bytes"
|
||||
version = "1.7.2"
|
||||
version = "1.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
|
||||
checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
|
||||
|
||||
[[package]]
|
||||
name = "either"
|
||||
version = "1.13.0"
|
||||
version = "1.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
|
||||
checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
|
||||
|
||||
[[package]]
|
||||
name = "itertools"
|
||||
version = "0.13.0"
|
||||
version = "0.14.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
|
||||
checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
|
||||
dependencies = [
|
||||
"either",
|
||||
]
|
||||
|
|
@ -39,18 +39,18 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.86"
|
||||
version = "1.0.106"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
|
||||
checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "prost"
|
||||
version = "0.13.3"
|
||||
version = "0.14.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f"
|
||||
checksum = "d2ea70524a2f82d518bce41317d0fae74151505651af45faf1ffbd6fd33f0568"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"prost-derive",
|
||||
|
|
@ -58,9 +58,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "prost-derive"
|
||||
version = "0.13.3"
|
||||
version = "0.14.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5"
|
||||
checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"itertools",
|
||||
|
|
@ -71,27 +71,27 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "prost-types"
|
||||
version = "0.13.3"
|
||||
version = "0.14.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670"
|
||||
checksum = "8991c4cbdb8bc5b11f0b074ffe286c30e523de90fee5ba8132f1399f23cb3dd7"
|
||||
dependencies = [
|
||||
"prost",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.37"
|
||||
version = "1.0.45"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
|
||||
checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.79"
|
||||
version = "2.0.117"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
|
||||
checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -100,6 +100,6 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.13"
|
||||
version = "1.0.24"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
|
||||
checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
|
||||
|
|
|
|||
|
|
@ -11,5 +11,5 @@ include = [
|
|||
]
|
||||
|
||||
[dependencies]
|
||||
prost = "0.13.3"
|
||||
prost-types = "0.13.3"
|
||||
prost = "0.14.3"
|
||||
prost-types = "0.14.3"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue