Merge pull request #661 from krant/fmt

Cleanup formatting - trim excessive spaces, add missing newlines, etc.
pull/662/head
Ben Meadors 2025-03-14 07:00:12 -05:00 zatwierdzone przez GitHub
commit 36dff55e14
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
9 zmienionych plików z 61 dodań i 62 usunięć

Wyświetl plik

@ -41,7 +41,7 @@ message Config {
* Description: Combination of both ROUTER and CLIENT. Not for mobile devices. * Description: Combination of both ROUTER and CLIENT. Not for mobile devices.
* Deprecated in v2.3.15 because improper usage is impacting public meshes: Use ROUTER or CLIENT instead. * Deprecated in v2.3.15 because improper usage is impacting public meshes: Use ROUTER or CLIENT instead.
*/ */
ROUTER_CLIENT = 3 [deprecated = true]; ROUTER_CLIENT = 3 [deprecated = true];
/* /*
@ -207,7 +207,7 @@ message Config {
string tzdef = 11; string tzdef = 11;
/* /*
* If true, disable the default blinking LED (LED_PIN) behavior on the device * If true, disable the default blinking LED (LED_PIN) behavior on the device
*/ */
bool led_heartbeat_disabled = 12; bool led_heartbeat_disabled = 12;
} }
@ -380,7 +380,7 @@ message Config {
*/ */
message PowerConfig { message PowerConfig {
/* /*
* Description: Will sleep everything as much as possible, for the tracker and sensor role this will also include the lora radio. * Description: Will sleep everything as much as possible, for the tracker and sensor role this will also include the lora radio.
* Don't use this setting if you want to use your device with the phone apps or are using a device without a user button. * Don't use this setting if you want to use your device with the phone apps or are using a device without a user button.
* Technical Details: Works for ESP32 devices and NRF52 devices in the Sensor or Tracker roles * Technical Details: Works for ESP32 devices and NRF52 devices in the Sensor or Tracker roles
*/ */
@ -434,7 +434,7 @@ message Config {
* If non-zero, we want powermon log outputs. With the particular (bitfield) sources enabled. * If non-zero, we want powermon log outputs. With the particular (bitfield) sources enabled.
* Note: we picked an ID of 32 so that lower more efficient IDs can be used for more frequently used options. * Note: we picked an ID of 32 so that lower more efficient IDs can be used for more frequently used options.
*/ */
uint64 powermon_enables = 32; uint64 powermon_enables = 32;
} }
/* /*
@ -850,17 +850,17 @@ message Config {
* Singapore 923mhz * Singapore 923mhz
*/ */
SG_923 = 18; SG_923 = 18;
/* /*
* Philippines 433mhz * Philippines 433mhz
*/ */
PH_433 = 19; PH_433 = 19;
/* /*
* Philippines 868mhz * Philippines 868mhz
*/ */
PH_868 = 20; PH_868 = 20;
/* /*
* Philippines 915mhz * Philippines 915mhz
*/ */
@ -1139,4 +1139,4 @@ message Config {
SessionkeyConfig sessionkey = 9; SessionkeyConfig sessionkey = 9;
DeviceUIConfig device_ui = 10; DeviceUIConfig device_ui = 10;
} }
} }

Wyświetl plik

@ -19,24 +19,24 @@ message DeviceUIConfig {
uint32 version = 1; uint32 version = 1;
/* /*
* TFT display brightness 1..255 * TFT display brightness 1..255
*/ */
uint32 screen_brightness = 2; uint32 screen_brightness = 2;
/* /*
* Screen timeout 0..900 * Screen timeout 0..900
*/ */
uint32 screen_timeout = 3; uint32 screen_timeout = 3;
/* /*
* Screen/Settings lock enabled * Screen/Settings lock enabled
*/ */
bool screen_lock = 4; bool screen_lock = 4;
bool settings_lock = 5; bool settings_lock = 5;
uint32 pin_code = 6; uint32 pin_code = 6;
/* /*
* Color theme * Color theme
*/ */
Theme theme = 7; Theme theme = 7;
@ -48,12 +48,12 @@ message DeviceUIConfig {
uint32 ring_tone_id = 10; uint32 ring_tone_id = 10;
/* /*
* Localization * Localization
*/ */
Language language = 11; Language language = 11;
/* /*
* Node list filter * Node list filter
*/ */
NodeFilter node_filter = 12; NodeFilter node_filter = 12;
@ -84,32 +84,32 @@ message NodeFilter {
* Filter offline nodes * Filter offline nodes
*/ */
bool offline_switch = 2; bool offline_switch = 2;
/* /*
* Filter nodes w/o public key * Filter nodes w/o public key
*/ */
bool public_key_switch = 3; bool public_key_switch = 3;
/* /*
* Filter based on hops away * Filter based on hops away
*/ */
int32 hops_away = 4; int32 hops_away = 4;
/* /*
* Filter nodes w/o position * Filter nodes w/o position
*/ */
bool position_switch = 5; bool position_switch = 5;
/* /*
* Filter nodes by matching name string * Filter nodes by matching name string
*/ */
string node_name = 6; string node_name = 6;
/* /*
* Filter based on channel * Filter based on channel
*/ */
int32 channel = 7; int32 channel = 7;
} }
message NodeHighlight { message NodeHighlight {
@ -122,7 +122,7 @@ message NodeHighlight {
* Highlight nodes w/ position * Highlight nodes w/ position
*/ */
bool position_switch = 2; bool position_switch = 2;
/* /*
* Highlight nodes w/ telemetry data * Highlight nodes w/ telemetry data
*/ */
@ -132,12 +132,12 @@ message NodeHighlight {
* Highlight nodes w/ iaq data * Highlight nodes w/ iaq data
*/ */
bool iaq_switch = 4; bool iaq_switch = 4;
/* /*
* Highlight nodes by matching name string * Highlight nodes by matching name string
*/ */
string node_name = 5; string node_name = 5;
} }
message GeoPoint { message GeoPoint {
@ -147,10 +147,10 @@ message GeoPoint {
int32 zoom = 1; int32 zoom = 1;
/* /*
* Coordinate: latitude * Coordinate: latitude
*/ */
int32 latitude = 2; int32 latitude = 2;
/* /*
* Coordinate: longitude * Coordinate: longitude
*/ */
@ -167,7 +167,7 @@ message Map {
* Map tile style * Map tile style
*/ */
string style = 2; string style = 2;
/* /*
* Map scroll follows GPS * Map scroll follows GPS
*/ */
@ -227,17 +227,17 @@ enum Language {
* Swedish * Swedish
*/ */
SWEDISH = 6; SWEDISH = 6;
/* /*
* Finnish * Finnish
*/ */
FINNISH = 7; FINNISH = 7;
/* /*
* Polish * Polish
*/ */
POLISH = 8; POLISH = 8;
/* /*
* Turkish * Turkish
*/ */
@ -283,4 +283,3 @@ enum Language {
*/ */
TRADITIONAL_CHINESE = 31; TRADITIONAL_CHINESE = 31;
} }

Wyświetl plik

@ -156,7 +156,7 @@ message NodeInfoLite {
bool is_ignored = 11; bool is_ignored = 11;
/* /*
* Last byte of the node number of the node that should be used as the next hop to reach this node. * Last byte of the node number of the node that should be used as the next hop to reach this node.
*/ */
uint32 next_hop = 12; uint32 next_hop = 12;
} }
@ -288,4 +288,4 @@ message ChannelFile {
* The node's user (owner) information * The node's user (owner) information
*/ */
User owner = 6; User owner = 6;
} }

Wyświetl plik

@ -41,4 +41,4 @@ message InterdeviceMessage {
string nmea = 1; string nmea = 1;
SensorData sensor = 2; SensorData sensor = 2;
} }
} }

Wyświetl plik

@ -339,7 +339,7 @@ enum HardwareModel {
* Heltec HRU-3601: https://heltec.org/project/hru-3601/ * Heltec HRU-3601: https://heltec.org/project/hru-3601/
*/ */
HELTEC_HRU_3601 = 23; HELTEC_HRU_3601 = 23;
/* /*
* Heltec Wireless Bridge * Heltec Wireless Bridge
*/ */
@ -542,7 +542,7 @@ enum HardwareModel {
CDEBYTE_EORA_S3 = 61; CDEBYTE_EORA_S3 = 61;
/* /*
* TWC_MESH_V4 * TWC_MESH_V4
* Adafruit NRF52840 feather express with SX1262, SSD1306 OLED and NEO6M GPS * Adafruit NRF52840 feather express with SX1262, SSD1306 OLED and NEO6M GPS
*/ */
TWC_MESH_V4 = 62; TWC_MESH_V4 = 62;
@ -558,27 +558,27 @@ enum HardwareModel {
* ESP32-D0WDQ6 With SX1276/SKY66122, SSD1306 OLED and No GPS * ESP32-D0WDQ6 With SX1276/SKY66122, SSD1306 OLED and No GPS
*/ */
RADIOMASTER_900_BANDIT_NANO = 64; RADIOMASTER_900_BANDIT_NANO = 64;
/* /*
* Heltec Capsule Sensor V3 with ESP32-S3 CPU, Portable LoRa device that can replace GNSS modules or sensors * Heltec Capsule Sensor V3 with ESP32-S3 CPU, Portable LoRa device that can replace GNSS modules or sensors
*/ */
HELTEC_CAPSULE_SENSOR_V3 = 65; HELTEC_CAPSULE_SENSOR_V3 = 65;
/* /*
* Heltec Vision Master T190 with ESP32-S3 CPU, and a 1.90 inch TFT display * Heltec Vision Master T190 with ESP32-S3 CPU, and a 1.90 inch TFT display
*/ */
HELTEC_VISION_MASTER_T190 = 66; HELTEC_VISION_MASTER_T190 = 66;
/* /*
* Heltec Vision Master E213 with ESP32-S3 CPU, and a 2.13 inch E-Ink display * Heltec Vision Master E213 with ESP32-S3 CPU, and a 2.13 inch E-Ink display
*/ */
HELTEC_VISION_MASTER_E213 = 67; HELTEC_VISION_MASTER_E213 = 67;
/* /*
* Heltec Vision Master E290 with ESP32-S3 CPU, and a 2.9 inch E-Ink display * Heltec Vision Master E290 with ESP32-S3 CPU, and a 2.9 inch E-Ink display
*/ */
HELTEC_VISION_MASTER_E290 = 68; HELTEC_VISION_MASTER_E290 = 68;
/* /*
* Heltec Mesh Node T114 board with nRF52840 CPU, and a 1.14 inch TFT display, Ultimate low-power design, * Heltec Mesh Node T114 board with nRF52840 CPU, and a 1.14 inch TFT display, Ultimate low-power design,
* specifically adapted for the Meshtatic project * specifically adapted for the Meshtatic project
@ -594,7 +594,7 @@ enum HardwareModel {
* Seeed studio T1000-E tracker card. NRF52840 w/ LR1110 radio, GPS, button, buzzer, and sensors. * Seeed studio T1000-E tracker card. NRF52840 w/ LR1110 radio, GPS, button, buzzer, and sensors.
*/ */
TRACKER_T1000_E = 71; TRACKER_T1000_E = 71;
/* /*
* RAK3172 STM32WLE5 Module (https://store.rakwireless.com/products/wisduo-lpwan-module-rak3172) * RAK3172 STM32WLE5 Module (https://store.rakwireless.com/products/wisduo-lpwan-module-rak3172)
*/ */
@ -626,7 +626,7 @@ enum HardwareModel {
* *
*/ */
RP2040_FEATHER_RFM95 = 76; RP2040_FEATHER_RFM95 = 76;
/* M5 esp32 based MCU modules with enclosure, TFT and LORA Shields. All Variants (Basic, Core, Fire, Core2, CoreS3, Paper) https://m5stack.com/ */ /* M5 esp32 based MCU modules with enclosure, TFT and LORA Shields. All Variants (Basic, Core, Fire, Core2, CoreS3, Paper) https://m5stack.com/ */
M5STACK_COREBASIC = 77; M5STACK_COREBASIC = 77;
M5STACK_CORE2 = 78; M5STACK_CORE2 = 78;
@ -636,7 +636,7 @@ enum HardwareModel {
/* M5 esp32 based MCU modules with enclosure, TFT and LORA Shields. All Variants (Basic, Core, Fire, Core2, CoreS3, Paper) https://m5stack.com/ */ /* M5 esp32 based MCU modules with enclosure, TFT and LORA Shields. All Variants (Basic, Core, Fire, Core2, CoreS3, Paper) https://m5stack.com/ */
M5STACK_CORES3 = 80; M5STACK_CORES3 = 80;
/* Seeed XIAO S3 DK*/ /* Seeed XIAO S3 DK*/
SEEED_XIAO_S3 = 81; SEEED_XIAO_S3 = 81;
@ -1101,12 +1101,12 @@ message MeshPacket {
/* /*
* Higher priority for specific message types (portnums) to distinguish between other reliable packets. * Higher priority for specific message types (portnums) to distinguish between other reliable packets.
*/ */
HIGH = 100; HIGH = 100;
/* /*
* Higher priority alert message used for critical alerts which take priority over other reliable packets. * Higher priority alert message used for critical alerts which take priority over other reliable packets.
*/ */
ALERT = 110; ALERT = 110;
/* /*
@ -1271,7 +1271,7 @@ message MeshPacket {
bool pki_encrypted = 17; bool pki_encrypted = 17;
/* /*
* Last byte of the node number of the node that should be used as the next hop in routing. * Last byte of the node number of the node that should be used as the next hop in routing.
* Set by the firmware internally, clients are not supposed to set this. * Set by the firmware internally, clients are not supposed to set this.
*/ */
uint32 next_hop = 18; uint32 next_hop = 18;

Wyświetl plik

@ -136,7 +136,7 @@ message ModuleConfig {
* Whether in addition to sending it to MQTT and the PhoneAPI, our NeighborInfo should be transmitted over LoRa. * Whether in addition to sending it to MQTT and the PhoneAPI, our NeighborInfo should be transmitted over LoRa.
* Note that this is not available on a channel with default key and name. * Note that this is not available on a channel with default key and name.
*/ */
bool transmit_over_lora = 3; bool transmit_over_lora = 3;
} }
/* /*

Wyświetl plik

@ -229,4 +229,4 @@ enum PortNum {
* Currently we limit port nums to no higher than this value * Currently we limit port nums to no higher than this value
*/ */
MAX = 511; MAX = 511;
} }

Wyświetl plik

@ -101,4 +101,4 @@ message PowerStressMessage {
Opcode cmd = 1; Opcode cmd = 1;
float num_seconds = 2; float num_seconds = 2;
} }

Wyświetl plik

@ -72,7 +72,7 @@ message EnvironmentMetrics {
*/ */
optional float current = 6; optional float current = 6;
/* /*
* relative scale IAQ value as measured by Bosch BME680 . value 0-500. * relative scale IAQ value as measured by Bosch BME680 . value 0-500.
* Belongs to Air Quality but is not particle but VOC measurement. Other VOC values can also be put in here. * Belongs to Air Quality but is not particle but VOC measurement. Other VOC values can also be put in here.
*/ */
@ -143,12 +143,12 @@ message EnvironmentMetrics {
* Rainfall in the last 24 hours in mm * Rainfall in the last 24 hours in mm
*/ */
optional float rainfall_24h = 20; optional float rainfall_24h = 20;
/* /*
* Soil moisture measured (% 1-100) * Soil moisture measured (% 1-100)
*/ */
optional uint32 soil_moisture = 21; optional uint32 soil_moisture = 21;
/* /*
* Soil temperature measured (*C) * Soil temperature measured (*C)
*/ */
@ -253,7 +253,7 @@ message AirQualityMetrics {
* 10.0um Particle Count * 10.0um Particle Count
*/ */
optional uint32 particles_100um = 12; optional uint32 particles_100um = 12;
/* /*
* 10.0um Particle Count * 10.0um Particle Count
*/ */
@ -281,7 +281,7 @@ message LocalStats {
* Number of packets sent * Number of packets sent
*/ */
uint32 num_packets_tx = 4; uint32 num_packets_tx = 4;
/* /*
* Number of packets received (both good and bad) * Number of packets received (both good and bad)
*/ */
@ -500,17 +500,17 @@ enum TelemetrySensorType {
* AMS TSL25911FN RGB Light Sensor * AMS TSL25911FN RGB Light Sensor
*/ */
TSL25911FN = 22; TSL25911FN = 22;
/* /*
* AHT10 Integrated temperature and humidity sensor * AHT10 Integrated temperature and humidity sensor
*/ */
AHT10 = 23; AHT10 = 23;
/* /*
* DFRobot Lark Weather station (temperature, humidity, pressure, wind speed and direction) * DFRobot Lark Weather station (temperature, humidity, pressure, wind speed and direction)
*/ */
DFROBOT_LARK = 24; DFROBOT_LARK = 24;
/* /*
* NAU7802 Scale Chip or compatible * NAU7802 Scale Chip or compatible
*/ */
@ -537,15 +537,15 @@ enum TelemetrySensorType {
CUSTOM_SENSOR = 29; CUSTOM_SENSOR = 29;
/* /*
* MAX30102 Pulse Oximeter and Heart-Rate Sensor * MAX30102 Pulse Oximeter and Heart-Rate Sensor
*/ */
MAX30102 = 30; MAX30102 = 30;
/* /*
* MLX90614 non-contact IR temperature sensor * MLX90614 non-contact IR temperature sensor
*/ */
MLX90614 = 31; MLX90614 = 31;
/* /*
* SCD40/SCD41 CO2, humidity, temperature sensor * SCD40/SCD41 CO2, humidity, temperature sensor
*/ */
@ -555,7 +555,7 @@ enum TelemetrySensorType {
* ClimateGuard RadSens, radiation, Geiger-Muller Tube * ClimateGuard RadSens, radiation, Geiger-Muller Tube
*/ */
RADSENS = 33; RADSENS = 33;
/* /*
* High accuracy current and voltage * High accuracy current and voltage
*/ */
@ -570,7 +570,7 @@ enum TelemetrySensorType {
* Infineon DPS310 High accuracy pressure and temperature * Infineon DPS310 High accuracy pressure and temperature
*/ */
DPS310 = 36; DPS310 = 36;
/* /*
* RAKWireless RAK12035 Soil Moisture Sensor Module * RAKWireless RAK12035 Soil Moisture Sensor Module
*/ */