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
@@ -5,7 +5,7 @@ package meshtastic;
|
||||
option csharp_namespace = "Meshtastic.Protobufs";
|
||||
option go_package = "github.com/meshtastic/go/generated";
|
||||
option java_outer_classname = "TelemetryProtos";
|
||||
option java_package = "com.geeksville.mesh";
|
||||
option java_package = "org.meshtastic.proto";
|
||||
option swift_prefix = "";
|
||||
|
||||
/*
|
||||
@@ -153,6 +153,11 @@ message EnvironmentMetrics {
|
||||
* Soil temperature measured (*C)
|
||||
*/
|
||||
optional float soil_temperature = 22;
|
||||
|
||||
/*
|
||||
* One-wire temperature (*C)
|
||||
*/
|
||||
repeated float one_wire_temperature = 23;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -443,6 +448,51 @@ message LocalStats {
|
||||
* Number of packets that were dropped because the transmit queue was full.
|
||||
*/
|
||||
uint32 num_tx_dropped = 14;
|
||||
|
||||
/*
|
||||
* Noise floor value measured in dBm
|
||||
*/
|
||||
int32 noise_floor = 15;
|
||||
}
|
||||
|
||||
/*
|
||||
* Traffic management statistics for mesh network optimization
|
||||
*/
|
||||
message TrafficManagementStats {
|
||||
/*
|
||||
* Total number of packets inspected by traffic management
|
||||
*/
|
||||
uint32 packets_inspected = 1;
|
||||
|
||||
/*
|
||||
* Number of position packets dropped due to deduplication
|
||||
*/
|
||||
uint32 position_dedup_drops = 2;
|
||||
|
||||
/*
|
||||
* Number of NodeInfo requests answered from cache
|
||||
*/
|
||||
uint32 nodeinfo_cache_hits = 3;
|
||||
|
||||
/*
|
||||
* Number of packets dropped due to rate limiting
|
||||
*/
|
||||
uint32 rate_limit_drops = 4;
|
||||
|
||||
/*
|
||||
* Number of unknown/undecryptable packets dropped
|
||||
*/
|
||||
uint32 unknown_packet_drops = 5;
|
||||
|
||||
/*
|
||||
* Number of packets with hop_limit exhausted for local-only broadcast
|
||||
*/
|
||||
uint32 hop_exhausted_packets = 6;
|
||||
|
||||
/*
|
||||
* Number of times router hop preservation was applied
|
||||
*/
|
||||
uint32 router_hops_preserved = 7;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -560,6 +610,11 @@ message Telemetry {
|
||||
* Linux host metrics
|
||||
*/
|
||||
HostMetrics host_metrics = 8;
|
||||
|
||||
/*
|
||||
* Traffic management statistics
|
||||
*/
|
||||
TrafficManagementStats traffic_management_stats = 9;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -603,7 +658,7 @@ enum TelemetrySensorType {
|
||||
BMP280 = 6;
|
||||
|
||||
/*
|
||||
* High accuracy temperature and humidity
|
||||
* TODO - REMOVE High accuracy temperature and humidity
|
||||
*/
|
||||
SHTC3 = 7;
|
||||
|
||||
@@ -628,7 +683,7 @@ enum TelemetrySensorType {
|
||||
QMC5883L = 11;
|
||||
|
||||
/*
|
||||
* High accuracy temperature and humidity
|
||||
* TODO - REMOVE High accuracy temperature and humidity
|
||||
*/
|
||||
SHT31 = 12;
|
||||
|
||||
@@ -653,7 +708,7 @@ enum TelemetrySensorType {
|
||||
RCWL9620 = 16;
|
||||
|
||||
/*
|
||||
* Sensirion High accuracy temperature and humidity
|
||||
* TODO - REMOVE Sensirion High accuracy temperature and humidity
|
||||
*/
|
||||
SHT4X = 17;
|
||||
|
||||
@@ -786,10 +841,56 @@ enum TelemetrySensorType {
|
||||
* SEN5X PM SENSORS
|
||||
*/
|
||||
SEN5X = 43;
|
||||
|
||||
/*
|
||||
* TSL2561 light sensor
|
||||
*/
|
||||
TSL2561 = 44;
|
||||
|
||||
/*
|
||||
* BH1750 light sensor
|
||||
*/
|
||||
BH1750 = 45;
|
||||
|
||||
/*
|
||||
* HDC1080 Temperature and Humidity Sensor
|
||||
*/
|
||||
HDC1080 = 46;
|
||||
|
||||
/*
|
||||
* TODO - REMOVE STH21 Temperature and R. Humidity sensor
|
||||
*/
|
||||
SHT21 = 47;
|
||||
|
||||
/*
|
||||
* Sensirion STC31 CO2 sensor
|
||||
*/
|
||||
STC31 = 48;
|
||||
|
||||
/*
|
||||
* SCD30 CO2, humidity, temperature sensor
|
||||
*/
|
||||
SCD30 = 49;
|
||||
|
||||
/*
|
||||
* SHT family of sensors for temperature and humidity
|
||||
*/
|
||||
SHTXX = 50;
|
||||
|
||||
/*
|
||||
* DS248X Bridge for one-wire temperature sensors
|
||||
*/
|
||||
DS248X = 51;
|
||||
|
||||
/*
|
||||
* MMC5983MA 3-Axis Digital Magnetic Sensor
|
||||
*/
|
||||
MMC5983MA = 52;
|
||||
|
||||
/*
|
||||
* ICM-42607-P 6‑Axis IMU
|
||||
*/
|
||||
ICM42607P = 53;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -806,3 +907,38 @@ message Nau7802Config {
|
||||
*/
|
||||
float calibrationFactor = 2;
|
||||
}
|
||||
|
||||
/*
|
||||
* SEN5X State, for saving to flash
|
||||
*/
|
||||
message SEN5XState {
|
||||
/*
|
||||
* Last cleaning time for SEN5X
|
||||
*/
|
||||
uint32 last_cleaning_time = 1;
|
||||
|
||||
/*
|
||||
* Last cleaning time for SEN5X - valid flag
|
||||
*/
|
||||
bool last_cleaning_valid = 2;
|
||||
|
||||
/*
|
||||
* Config flag for one-shot mode (see admin.proto)
|
||||
*/
|
||||
bool one_shot_mode = 3;
|
||||
|
||||
/*
|
||||
* Last VOC state time for SEN55
|
||||
*/
|
||||
optional uint32 voc_state_time = 4;
|
||||
|
||||
/*
|
||||
* Last VOC state validity flag for SEN55
|
||||
*/
|
||||
optional bool voc_state_valid = 5;
|
||||
|
||||
/*
|
||||
* VOC state array (8x uint8t) for SEN55
|
||||
*/
|
||||
optional fixed64 voc_state_array = 6;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user