diff --git a/README.md b/README.md index a291992..9ff7954 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Meshtastic-protobufs [![Open in Visual Studio Code](https://open.vscode.dev/badges/open-in-vscode.svg)](https://open.vscode.dev/meshtastic/Meshtastic-protobufs) [![CI](https://github.com/meshtastic/Meshtastic-protobufs/actions/workflows/ci.yml/badge.svg)](https://github.com/meshtastic/Meshtastic-protobufs/actions/workflows/ci.yml) +[![CLA assistant](https://cla-assistant.io/readme/badge/meshtastic/Meshtastic-protobufs)](https://cla-assistant.io/meshtastic/Meshtastic-protobufs) The protobuf definitions for the Meshtastic project (used by apps and the device code) diff --git a/mesh.proto b/mesh.proto index 60af9b8..8373900 100644 --- a/mesh.proto +++ b/mesh.proto @@ -333,6 +333,16 @@ enum HardwareModel { */ RAK11200 = 40; + /* + * B&Q Consulting Nano Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:nano + */ + NANO_G1 = 41; + + /* + * nRF52840 Dongle : https://www.nordicsemi.com/Products/Development-hardware/nrf52840-dongle/ + */ + NRF52840_PCA10059 = 42; + /* * 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. */ @@ -1017,9 +1027,9 @@ message NodeInfo { */ fixed32 last_heard = 5; /* - * The latest device telemetry data for the node. + * The latest device metrics for the node. */ - Telemetry telemetry = 6; + DeviceMetrics device_metrics = 6; } /* diff --git a/radioconfig.proto b/radioconfig.proto index f022591..389f246 100644 --- a/radioconfig.proto +++ b/radioconfig.proto @@ -384,11 +384,6 @@ message RadioConfig { */ bool position_broadcast_smart_disabled = 17; - /* - * Send our owner info at least this often (also we always send once at boot - to rejoin the mesh) - */ - uint32 send_owner_interval = 2; - /* * If we miss this many owner messages from a node, we declare the node * offline (defaults to 3 - to allow for some lost packets) (FIXME not yet used) @@ -418,13 +413,6 @@ message RadioConfig { */ uint32 phone_timeout_secs = 6; - /* - * Power management state machine option. - * See [power management](/docs/software/other/power) for details. - * 0 for default of two hours, MAXUINT for disabled - */ - uint32 phone_sds_timeout_sec = 7; - /* * Power management state machine option. * See [power management](/docs/software/other/power) for details. @@ -951,7 +939,6 @@ message RadioConfig { * Whether to send encrypted or decrypted packets to MQTT. * This parameter is only honoured if you also set mqtt_server * (the default official mqtt.meshtastic.org server can handle encrypted packets) - * * Decrypted packets may be useful for external systems that want to consume meshtastic packets */ bool mqtt_encryption_enabled = 174;