feat(protobufs): sync to firmware-current and consume workspace package (#1097)
* feat(protobufs): sync to firmware-current and consume workspace package Sync the vendored .proto sources to firmware-current (v2.7.25+48), regenerate the v2 TS bindings, and consume the workspace @meshtastic/protobufs (workspace:*) in place of the stale JSR 2.7.20 — finishing the monorepo migration (core was already workspace:*). Includes the one required breaking-change fix: admin nodedb_reset changed int32 to bool, so resetNodes() now sends value: true. * build(protobufs): vendor generated bindings for workspace consumers The package is consumed via workspace:* — its exports point at the TS source, which imports ./dist/meshtastic/*_pb.ts — so the generated output must exist at build time. CI builds web/core with no codegen step and the runners have no buf CLI, so the bindings are vendored here (kept gitignored; lint/format skip them). Regenerate with: pnpm --filter @meshtastic/protobufs gen * fix(protobufs): clean script removes the actual generated output dir buf writes bindings to packages/ts/dist, but clean was removing a non-existent root dist — so it never cleaned stale output. Addresses Copilot review feedback. * refactor: move web app packages/web -> apps/web Aligns the web app with the apps/web layout (matching the Vercel web-test Root Directory and the SDK-migration direction). Pure directory move plus root config: pnpm-workspace (adds apps/*), vitest projects, root tsconfig reference, and the pr/release-web/nightly workflows. vercel.json moved with the app. Build + 36 validation tests green. * feat: config fields, module pages, key verification, telemetry capture Incorporates the firmware-current feature work onto the protobuf foundation: new config fields (Display message bubbles; LoRa fem_lna_mode + serial_hal_only; Telemetry air_quality_screen_enabled); 4 new ModuleConfig pages (TrafficManagement, StatusMessage, TAK, RemoteHardware); the manual Key Verification flow (sendKeyVerification + ClientNotificationDialog stages + Verify Key button); live telemetry capture (nodeDB addDeviceMetrics) and admin hardening (toggleMutedNode, graceful PortNum default); plus the sdk-preview ConfigEditor demo and store/config tests. Build + lint + format + 131 tests green. * chore: drop #1062 (unsaved-change-detection) to match upstream revert #1062 was merged to main by accident (per @danditomaso) and is being reverted. Reverse-applied its diff here via 3-way so #1097 stays consistent with where main is headed, while keeping the feature changes layered on the same files (deviceStore/changeRegistry). Build + 131 tests + lint + format green. * fix(nodes): clean up SNR display in node table and map popup SNR is a ratio measured in dB, not dBm (which is absolute power); the node table and map popup both mislabeled it and crammed three values together: '0dBm/50%/50raw'. The trailing '%/raw' pair was the same heuristic ((snr+10)*5) shown twice — once clamped, once not. Render SNR in dB rounded to one decimal, color-coded by a 0-100% signal-quality heuristic (green/yellow/red), with the quality percentage as a muted secondary. Drop the redundant raw value. Adds unit.db; this matches the existing SNRTooltip, which already renders dB.
This commit is contained in:
Ben Meadors
@@ -2,10 +2,12 @@ syntax = "proto3";
|
||||
|
||||
package meshtastic;
|
||||
|
||||
import "meshtastic/atak.proto";
|
||||
|
||||
option csharp_namespace = "Meshtastic.Protobufs";
|
||||
option go_package = "github.com/meshtastic/go/generated";
|
||||
option java_outer_classname = "ModuleConfigProtos";
|
||||
option java_package = "com.geeksville.mesh";
|
||||
option java_package = "org.meshtastic.proto";
|
||||
option swift_prefix = "";
|
||||
|
||||
/*
|
||||
@@ -51,9 +53,9 @@ message ModuleConfig {
|
||||
bool encryption_enabled = 5;
|
||||
|
||||
/*
|
||||
* Whether to send / consume json packets on MQTT
|
||||
* Deprecated: JSON packet support on MQTT was removed, and this field is ignored.
|
||||
*/
|
||||
bool json_enabled = 6;
|
||||
bool json_enabled = 6 [deprecated = true];
|
||||
|
||||
/*
|
||||
* If true, we attempt to establish a secure connection using TLS
|
||||
@@ -295,6 +297,82 @@ message ModuleConfig {
|
||||
int32 ble_threshold = 4;
|
||||
}
|
||||
|
||||
/*
|
||||
* Config for the Traffic Management module.
|
||||
* Provides packet inspection and traffic shaping to help reduce channel utilization
|
||||
*/
|
||||
message TrafficManagementConfig {
|
||||
/*
|
||||
* Master enable for traffic management module
|
||||
*/
|
||||
bool enabled = 1;
|
||||
|
||||
/*
|
||||
* Enable position deduplication to drop redundant position broadcasts
|
||||
*/
|
||||
bool position_dedup_enabled = 2;
|
||||
|
||||
/*
|
||||
* Number of bits of precision for position deduplication (0-32)
|
||||
*/
|
||||
uint32 position_precision_bits = 3;
|
||||
|
||||
/*
|
||||
* Minimum interval in seconds between position updates from the same node
|
||||
*/
|
||||
uint32 position_min_interval_secs = 4;
|
||||
|
||||
/*
|
||||
* Enable direct response to NodeInfo requests from local cache
|
||||
*/
|
||||
bool nodeinfo_direct_response = 5;
|
||||
|
||||
/*
|
||||
* Minimum hop distance from requestor before responding to NodeInfo requests
|
||||
*/
|
||||
uint32 nodeinfo_direct_response_max_hops = 6;
|
||||
|
||||
/*
|
||||
* Enable per-node rate limiting to throttle chatty nodes
|
||||
*/
|
||||
bool rate_limit_enabled = 7;
|
||||
|
||||
/*
|
||||
* Time window in seconds for rate limiting calculations
|
||||
*/
|
||||
uint32 rate_limit_window_secs = 8;
|
||||
|
||||
/*
|
||||
* Maximum packets allowed per node within the rate limit window
|
||||
*/
|
||||
uint32 rate_limit_max_packets = 9;
|
||||
|
||||
/*
|
||||
* Enable dropping of unknown/undecryptable packets per rate_limit_window_secs
|
||||
*/
|
||||
bool drop_unknown_enabled = 10;
|
||||
|
||||
/*
|
||||
* Number of unknown packets before dropping from a node
|
||||
*/
|
||||
uint32 unknown_packet_threshold = 11;
|
||||
|
||||
/*
|
||||
* Set hop_limit to 0 for relayed telemetry broadcasts (own packets unaffected)
|
||||
*/
|
||||
bool exhaust_hop_telemetry = 12;
|
||||
|
||||
/*
|
||||
* Set hop_limit to 0 for relayed position broadcasts (own packets unaffected)
|
||||
*/
|
||||
bool exhaust_hop_position = 13;
|
||||
|
||||
/*
|
||||
* Preserve hop_limit for router-to-router traffic
|
||||
*/
|
||||
bool router_preserve_hops = 14;
|
||||
}
|
||||
|
||||
/*
|
||||
* Serial Config
|
||||
*/
|
||||
@@ -337,9 +415,12 @@ message ModuleConfig {
|
||||
// VE.Direct is a serial protocol used by Victron Energy products
|
||||
// https://beta.ivc.no/wiki/index.php/Victron_VE_Direct_DIY_Cable
|
||||
VE_DIRECT = 7;
|
||||
//Used to configure and view some parameters of MeshSolar.
|
||||
//https://heltec.org/project/meshsolar/
|
||||
// Used to configure and view some parameters of MeshSolar.
|
||||
// https://heltec.org/project/meshsolar/
|
||||
MS_CONFIG = 8;
|
||||
// Logs mesh traffic to the serial pins, ideal for logging via openLog or similar.
|
||||
LOG = 9; // includes other packets
|
||||
LOGTEXT = 10; // only text (channel & DM)
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -621,6 +702,11 @@ message ModuleConfig {
|
||||
* Note: We will still send telemtry to the connected phone / client every minute over the API
|
||||
*/
|
||||
bool device_telemetry_enabled = 14;
|
||||
|
||||
/*
|
||||
* Enable/Disable the air quality telemetry measurement module on-device display
|
||||
*/
|
||||
bool air_quality_screen_enabled = 15;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -761,6 +847,16 @@ message ModuleConfig {
|
||||
uint32 blue = 5;
|
||||
}
|
||||
|
||||
/*
|
||||
* StatusMessage config - Allows setting a status message for a node to periodically rebroadcast
|
||||
*/
|
||||
message StatusMessageConfig {
|
||||
/*
|
||||
* The actual status string
|
||||
*/
|
||||
string node_status = 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* TODO: REPLACE
|
||||
*/
|
||||
@@ -829,6 +925,37 @@ message ModuleConfig {
|
||||
* TODO: REPLACE
|
||||
*/
|
||||
PaxcounterConfig paxcounter = 13;
|
||||
|
||||
/*
|
||||
* TODO: REPLACE
|
||||
*/
|
||||
StatusMessageConfig statusmessage = 14;
|
||||
|
||||
/*
|
||||
* Traffic management module config for mesh network optimization
|
||||
*/
|
||||
TrafficManagementConfig traffic_management = 15;
|
||||
|
||||
/*
|
||||
* TAK team/role configuration for TAK_TRACKER
|
||||
*/
|
||||
TAKConfig tak = 16;
|
||||
}
|
||||
|
||||
/*
|
||||
* TAK team/role configuration
|
||||
*/
|
||||
message TAKConfig {
|
||||
/*
|
||||
* Team color.
|
||||
* Default Unspecifed_Color -> firmware uses Cyan
|
||||
*/
|
||||
Team team = 1;
|
||||
/*
|
||||
* Member role.
|
||||
* Default Unspecifed -> firmware uses TeamMember
|
||||
*/
|
||||
MemberRole role = 2;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user