diff --git a/meshtastic/atak.proto b/meshtastic/atak.proto index 182d739..c44479f 100644 --- a/meshtastic/atak.proto +++ b/meshtastic/atak.proto @@ -237,7 +237,7 @@ message PLI { /* * Altitude (ATAK prefers HAE) */ - uint32 altitude = 3; + int32 altitude = 3; /* * Speed @@ -248,4 +248,4 @@ message PLI { * Course in degrees */ uint32 course = 5; -} \ No newline at end of file +} diff --git a/meshtastic/channel.proto b/meshtastic/channel.proto index 7d2361a..2b10aaf 100644 --- a/meshtastic/channel.proto +++ b/meshtastic/channel.proto @@ -81,6 +81,21 @@ message ChannelSettings { * If true, messages seen on the internet will be forwarded to the local mesh. */ bool downlink_enabled = 6; + + /* + * Per-channel module settings. + */ + ModuleSettings module_settings = 7; +} + +/* + * This message is specifically for modules to store per-channel configuration data. + */ +message ModuleSettings { +/* + * Bits of precision for the location sent in position packets. + */ + uint32 position_precision = 1; } /* @@ -132,4 +147,4 @@ message Channel { * TODO: REPLACE */ Role role = 3; -} \ No newline at end of file +} diff --git a/meshtastic/config.options b/meshtastic/config.options index ba8574a..4490f08 100644 --- a/meshtastic/config.options +++ b/meshtastic/config.options @@ -12,5 +12,3 @@ *LoRaConfig.channel_num int_size:16 *PowerConfig.device_battery_ina_address int_size:8 - -*PositionConfig.channel_precision max_count:8 diff --git a/meshtastic/config.proto b/meshtastic/config.proto index c8533bb..7ebbe45 100644 --- a/meshtastic/config.proto +++ b/meshtastic/config.proto @@ -342,11 +342,6 @@ message Config { * Set where GPS is enabled, disabled, or not present */ GpsMode gps_mode = 13; - - /* - * Set GPS precision in bits per channel, or 0 for disabled - */ - repeated uint32 channel_precision = 14; } /* diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto index 4bf2313..28143e4 100644 --- a/meshtastic/mesh.proto +++ b/meshtastic/mesh.proto @@ -203,6 +203,11 @@ message Position { * detect lost updates if needed */ uint32 seq_number = 22; + + /* + * Indicates the bits of precision set by the sending node + */ + uint32 precision_bits = 23; } /* @@ -344,6 +349,11 @@ enum HardwareModel { */ RP2040_LORA = 30; + /* + * B&Q Consulting Station G2: https://wiki.uniteng.com/en/meshtastic/station-g2 + */ + STATION_G2 = 31; + /* * --------------------------------------------------------------------------- * Less common/prototype boards listed here (needs one more byte over the air) @@ -891,13 +901,11 @@ message MeshPacket { * The sending node number. * Note: Our crypto implementation uses this field as well. * See [crypto](/docs/overview/encryption) for details. - * FIXME - really should be fixed32 instead, this encoding only hurts the ble link though. */ fixed32 from = 1; /* - * The (immediatSee Priority description for more details.y should be fixed32 instead, this encoding only - * hurts the ble link though. + * The (immediate) destination for this packet */ fixed32 to = 2; @@ -942,8 +950,6 @@ message MeshPacket { * any ACK or the completion of a mesh broadcast flood). * Note: Our crypto implementation uses this id as well. * See [crypto](/docs/overview/encryption) for details. - * FIXME - really should be fixed32 instead, this encoding only - * hurts the ble link though. */ fixed32 id = 6;