From 583784692c02b996bd89be3d7e9c3d305a67ba0a Mon Sep 17 00:00:00 2001 From: Riley Nielsen Date: Mon, 2 Sep 2024 11:19:52 -0700 Subject: [PATCH 01/21] Add CO2, SCD4X --- meshtastic/telemetry.proto | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meshtastic/telemetry.proto b/meshtastic/telemetry.proto index d4e80a8..72bb418 100644 --- a/meshtastic/telemetry.proto +++ b/meshtastic/telemetry.proto @@ -128,6 +128,11 @@ message EnvironmentMetrics { * Wind lull in m/s */ optional float wind_lull = 17; + + /* + * CO2 measurement in ppm + */ + optional uint32 co2 = 18; } /* @@ -463,6 +468,11 @@ enum TelemetrySensorType { * Custom I2C sensor implementation based on https://github.com/meshtastic/i2c-sensor */ CUSTOM_SENSOR = 29; + + /* + * SCD40/SCD41 CO2, humidity, temperature sensor + */ + SCD4X = 30; } /* From d983fef9e47106f6c2e55b6fcae219d99eb5ac60 Mon Sep 17 00:00:00 2001 From: Tom Fifield Date: Sat, 5 Oct 2024 13:45:41 +0800 Subject: [PATCH 02/21] Add RegionCodes for Philippines Required by https://github.com/meshtastic/firmware/pull/4951 --- meshtastic/config.proto | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/meshtastic/config.proto b/meshtastic/config.proto index 0ad0b26..54f1be7 100644 --- a/meshtastic/config.proto +++ b/meshtastic/config.proto @@ -802,6 +802,21 @@ message Config { * Singapore 923mhz */ SG_923 = 18; + + /* + * Philippines 433mhz + */ + PH_433 = 19; + + /* + * Philippines 868mhz + */ + PH_868 = 20; + + /* + * Philippines 915mhz + */ + PH_915 = 21; } /* From 27072c08380e0555d44e979aded47acef49e92eb Mon Sep 17 00:00:00 2001 From: Riley Nielsen Date: Mon, 7 Oct 2024 17:43:15 -0700 Subject: [PATCH 03/21] Update telemetry.proto --- meshtastic/telemetry.proto | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/meshtastic/telemetry.proto b/meshtastic/telemetry.proto index c3b896b..5dd810b 100644 --- a/meshtastic/telemetry.proto +++ b/meshtastic/telemetry.proto @@ -228,6 +228,11 @@ message AirQualityMetrics { * 10.0um Particle Count */ optional uint32 particles_100um = 12; + + /* + * 10.0um Particle Count + */ + optional uint32 co2 = 13; } /* @@ -512,9 +517,14 @@ enum TelemetrySensorType { MAX30102 = 30; /* - * MLX90614 non-contact IR temperature sensor. + * MLX90614 non-contact IR temperature sensor */ MLX90614 = 31; + + /* + * SCD40/SCD41 CO2, humidity, temperature sensor + */ + SCD4X = 32; } /* From c28a677d7dba56295b74ca1c08cb66515c5b1af9 Mon Sep 17 00:00:00 2001 From: mverch67 Date: Wed, 9 Oct 2024 12:49:09 +0200 Subject: [PATCH 04/21] device-ui persistency --- meshtastic/admin.proto | 21 +++++ meshtastic/device_ui.options | 5 ++ meshtastic/device_ui.proto | 167 +++++++++++++++++++++++++++++++++++ meshtastic/mesh.proto | 6 ++ 4 files changed, 199 insertions(+) create mode 100644 meshtastic/device_ui.options create mode 100644 meshtastic/device_ui.proto diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto index 48d3392..17009c4 100644 --- a/meshtastic/admin.proto +++ b/meshtastic/admin.proto @@ -7,6 +7,7 @@ import "meshtastic/config.proto"; import "meshtastic/connection_status.proto"; import "meshtastic/mesh.proto"; import "meshtastic/module_config.proto"; +import "meshtastic/device_ui.proto"; option csharp_namespace = "Meshtastic.Protobufs"; option go_package = "github.com/meshtastic/go/generated"; @@ -76,6 +77,11 @@ message AdminMessage { * */ SESSIONKEY_CONFIG = 8; + + /* + * device-ui config + */ + DEVICEUI_CONFIG = 9; } /* @@ -376,6 +382,21 @@ message AdminMessage { * Tell the node to reset the nodedb. */ int32 nodedb_reset = 100; + + /* + * Tell the node to send the stored ui data. + */ + bool get_ui_config_request = 102; + + /* + * reply stored device ui data. + */ + DeviceUIConfig get_ui_config_response = 103; + + /* + * Tell the node to store UI data persistently. + */ + DeviceUIConfig store_ui_config = 104; } } diff --git a/meshtastic/device_ui.options b/meshtastic/device_ui.options new file mode 100644 index 0000000..0982a74 --- /dev/null +++ b/meshtastic/device_ui.options @@ -0,0 +1,5 @@ +*DeviceUIConfig.screen_brightness int_size:8 +*DeviceUIConfig.screen_timeout int_size:16 +*NodeFilter.node_name max_size:16 +*NodeFilter.hopys_away int_size:8 +*NodeHighlight.node_name max_size:16 diff --git a/meshtastic/device_ui.proto b/meshtastic/device_ui.proto new file mode 100644 index 0000000..ab0c83b --- /dev/null +++ b/meshtastic/device_ui.proto @@ -0,0 +1,167 @@ +syntax = "proto3"; + +package meshtastic; + +option csharp_namespace = "Meshtastic.Protobufs"; +option go_package = "github.com/meshtastic/go/generated"; +option java_outer_classname = "LocalOnlyProtos"; +option java_package = "com.geeksville.mesh"; +option swift_prefix = ""; + +/* + * Protobuf structures for device-ui persistency + */ + +message DeviceUIConfig { + /* + * TFT display brightness 1..255 + */ + uint32 screen_brightness = 1; + + /* + * Screen timeout 0..900 + */ + uint32 screen_timeout = 2; + + /* + * Screen lock enabled + */ + bool screen_lock = 3; + + /* + * Color theme + */ + Theme theme = 4; + + /* + * Audible message alert enabled + */ + bool alert_enabled = 5; + + /* + * Localization + */ + Language language = 6; + + /* + * Node list filter + */ + NodeFilter node_filter = 7; + + /* + * Node list highlightening + */ + NodeHighlight node_highlight = 8; +} + + +message NodeFilter { + /* + * Filter unknown nodes + */ + bool switch_unknown = 1; + + /* + * Filter offline nodes + */ + bool switch_offline = 2; + + /* + * Filter nodes w/o public key + */ + bool switch_public_key = 3; + + /* + * Filter based on hops away + */ + int32 hopys_away = 4; + + /* + * Filter nodes w/o position + */ + bool switch_position = 5; + + /* + * Filter nodes by matching name string + */ + string node_name = 6; + +} + +message NodeHighlight { + /* + * Hightlight nodes w/ active chat + */ + bool switch_chat = 1; + + /* + * Highlight nodes w/ position + */ + bool switch_position = 2; + + /* + * Highlight nodes w/ telemetry data + */ + bool switch_telemetry = 3; + + /* + * Highlight nodes w/ iaq data + */ + bool switch_iaq = 4; + + /* + * Highlight nodes by matching name string + */ + string node_name = 5; + +} + +enum Theme { + /* + * Dark + */ + DARK = 0; + /* + * Light + */ + LIGHT = 1; + /* + * Red + */ + RED = 2; +} + +/* + * Localization + */ +enum Language { + /* + * English + */ + ENGLISH = 0; + + /* + * French + */ + FRENCH = 1; + + /* + * German + */ + GERMAN = 2; + + /* + * Italian + */ + ITALIAN = 3; + + /* + * Portuguese + */ + PORTUGUESE = 4; + + /* + * Spanish + */ + SPANISH = 5; +} \ No newline at end of file diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto index 6b9be53..172f286 100644 --- a/meshtastic/mesh.proto +++ b/meshtastic/mesh.proto @@ -8,6 +8,7 @@ import "meshtastic/module_config.proto"; import "meshtastic/portnums.proto"; import "meshtastic/telemetry.proto"; import "meshtastic/xmodem.proto"; +import "meshtastic/device_ui.proto"; option csharp_namespace = "Meshtastic.Protobufs"; option go_package = "github.com/meshtastic/go/generated"; @@ -1640,6 +1641,11 @@ message FromRadio { * Notification message to the client */ ClientNotification clientNotification = 16; + + /* + * Persistent data for device-ui + */ + DeviceUIConfig deviceuiConfig = 17; } } From 901ce4c1c42e04e6daa9fcf10db4965ea56550d3 Mon Sep 17 00:00:00 2001 From: mverch67 Date: Wed, 9 Oct 2024 22:52:55 +0200 Subject: [PATCH 05/21] renumbering getter/setter --- meshtastic/admin.proto | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto index 17009c4..f6d2014 100644 --- a/meshtastic/admin.proto +++ b/meshtastic/admin.proto @@ -335,6 +335,21 @@ message AdminMessage { */ fixed32 set_time_only = 43; + /* + * Tell the node to send the stored ui data. + */ + bool get_ui_config_request = 102; + + /* + * Reply stored device ui data. + */ + DeviceUIConfig get_ui_config_response = 103; + + /* + * Tell the node to store UI data persistently. + */ + DeviceUIConfig store_ui_config = 104; + /* * Begins an edit transaction for config, module config, owner, and channel settings changes * This will delay the standard *implicit* save to the file system and subsequent reboot behavior until committed (commit_edit_settings) @@ -382,21 +397,6 @@ message AdminMessage { * Tell the node to reset the nodedb. */ int32 nodedb_reset = 100; - - /* - * Tell the node to send the stored ui data. - */ - bool get_ui_config_request = 102; - - /* - * reply stored device ui data. - */ - DeviceUIConfig get_ui_config_response = 103; - - /* - * Tell the node to store UI data persistently. - */ - DeviceUIConfig store_ui_config = 104; } } From 19993f75cea4c802ef8bb15ddd17c326cdeee0ff Mon Sep 17 00:00:00 2001 From: mverch67 Date: Wed, 9 Oct 2024 22:53:02 +0200 Subject: [PATCH 06/21] typo --- meshtastic/device_ui.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshtastic/device_ui.proto b/meshtastic/device_ui.proto index ab0c83b..21d7d23 100644 --- a/meshtastic/device_ui.proto +++ b/meshtastic/device_ui.proto @@ -74,7 +74,7 @@ message NodeFilter { /* * Filter based on hops away */ - int32 hopys_away = 4; + int32 hops_away = 4; /* * Filter nodes w/o position From 50a87ef3aa69372d4618dd42b2dd1bcb0a917269 Mon Sep 17 00:00:00 2001 From: mverch67 Date: Wed, 9 Oct 2024 22:56:10 +0200 Subject: [PATCH 07/21] I should goto sleep --- meshtastic/admin.proto | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto index f6d2014..0f665e7 100644 --- a/meshtastic/admin.proto +++ b/meshtastic/admin.proto @@ -338,17 +338,17 @@ message AdminMessage { /* * Tell the node to send the stored ui data. */ - bool get_ui_config_request = 102; + bool get_ui_config_request = 44; /* * Reply stored device ui data. */ - DeviceUIConfig get_ui_config_response = 103; + DeviceUIConfig get_ui_config_response = 45; /* * Tell the node to store UI data persistently. */ - DeviceUIConfig store_ui_config = 104; + DeviceUIConfig store_ui_config = 46; /* * Begins an edit transaction for config, module config, owner, and channel settings changes From cb37f8ce6162ccecd544b43c3b1ad9df095bdfa8 Mon Sep 17 00:00:00 2001 From: mverch67 Date: Wed, 9 Oct 2024 23:10:03 +0200 Subject: [PATCH 08/21] rewording --- meshtastic/device_ui.proto | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/meshtastic/device_ui.proto b/meshtastic/device_ui.proto index 21d7d23..82474b6 100644 --- a/meshtastic/device_ui.proto +++ b/meshtastic/device_ui.proto @@ -59,17 +59,17 @@ message NodeFilter { /* * Filter unknown nodes */ - bool switch_unknown = 1; + bool unknown_switch = 1; /* * Filter offline nodes */ - bool switch_offline = 2; + bool offline_switch = 2; /* * Filter nodes w/o public key */ - bool switch_public_key = 3; + bool public_key_switch = 3; /* * Filter based on hops away @@ -79,7 +79,7 @@ message NodeFilter { /* * Filter nodes w/o position */ - bool switch_position = 5; + bool position_switch = 5; /* * Filter nodes by matching name string @@ -92,22 +92,22 @@ message NodeHighlight { /* * Hightlight nodes w/ active chat */ - bool switch_chat = 1; + bool chat_switch = 1; /* * Highlight nodes w/ position */ - bool switch_position = 2; + bool position_switch = 2; /* * Highlight nodes w/ telemetry data */ - bool switch_telemetry = 3; + bool telemetry_switch = 3; /* * Highlight nodes w/ iaq data */ - bool switch_iaq = 4; + bool iaq_switch = 4; /* * Highlight nodes by matching name string From 70a52e77d325247ff6b4dfd8a0fed1050708c927 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Thu, 10 Oct 2024 06:14:55 -0500 Subject: [PATCH 09/21] Update device_ui.options --- meshtastic/device_ui.options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshtastic/device_ui.options b/meshtastic/device_ui.options index 0982a74..64ca59c 100644 --- a/meshtastic/device_ui.options +++ b/meshtastic/device_ui.options @@ -1,5 +1,5 @@ *DeviceUIConfig.screen_brightness int_size:8 *DeviceUIConfig.screen_timeout int_size:16 *NodeFilter.node_name max_size:16 -*NodeFilter.hopys_away int_size:8 +*NodeFilter.hops_away int_size:8 *NodeHighlight.node_name max_size:16 From 99280a1a1e03823b4366eebfd9ef3f5750da6870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Fri, 11 Oct 2024 11:55:56 +0200 Subject: [PATCH 10/21] Update config.proto --- meshtastic/config.proto | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meshtastic/config.proto b/meshtastic/config.proto index 54f1be7..63df3a1 100644 --- a/meshtastic/config.proto +++ b/meshtastic/config.proto @@ -126,6 +126,11 @@ message Config { * but takes it step further by also ignoring messages from nodenums not in the node's known list (NodeDB) */ KNOWN_ONLY = 3; + + /* + * Only permitted for SENSOR, TRACKER and TAK_TRACKER roles, this will inhibit all rebroadcasts, not unlike CLIENT_MUTE role. + */ + NONE = 4; } /* From 3990520748751d5d5ed44b6e53aabbd943e0f83d Mon Sep 17 00:00:00 2001 From: Andre K Date: Sat, 12 Oct 2024 06:27:59 -0300 Subject: [PATCH 11/21] fix device_ui Java outer classname --- meshtastic/device_ui.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meshtastic/device_ui.proto b/meshtastic/device_ui.proto index 82474b6..a90e08d 100644 --- a/meshtastic/device_ui.proto +++ b/meshtastic/device_ui.proto @@ -4,7 +4,7 @@ package meshtastic; option csharp_namespace = "Meshtastic.Protobufs"; option go_package = "github.com/meshtastic/go/generated"; -option java_outer_classname = "LocalOnlyProtos"; +option java_outer_classname = "DeviceUIProtos"; option java_package = "com.geeksville.mesh"; option swift_prefix = ""; @@ -164,4 +164,4 @@ enum Language { * Spanish */ SPANISH = 5; -} \ No newline at end of file +} From 1842d2203b9a876c6ae7d76bb7efa7acf4f553ef Mon Sep 17 00:00:00 2001 From: mverch67 Date: Sun, 13 Oct 2024 11:43:34 +0200 Subject: [PATCH 12/21] device-ui: more languages --- meshtastic/device_ui.proto | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/meshtastic/device_ui.proto b/meshtastic/device_ui.proto index 82474b6..53b7894 100644 --- a/meshtastic/device_ui.proto +++ b/meshtastic/device_ui.proto @@ -164,4 +164,24 @@ enum Language { * Spanish */ SPANISH = 5; -} \ No newline at end of file + + /* + * Swedish + */ + SWEDISH = 6; + + /* + * Finnish + */ + FINNISH = 7; + + /* + * Polish + */ + POLISH = 8; + + /* + * Turkish + */ + TURKISH = 9; + } \ No newline at end of file From 7e6177dcd64208586cc5535b9e8682b85f018ce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Mon, 14 Oct 2024 19:44:45 +0200 Subject: [PATCH 13/21] remove oem.proto --- meshtastic/deviceonly.options | 4 --- meshtastic/deviceonly.proto | 68 ----------------------------------- 2 files changed, 72 deletions(-) diff --git a/meshtastic/deviceonly.options b/meshtastic/deviceonly.options index 6f53317..82dffcf 100644 --- a/meshtastic/deviceonly.options +++ b/meshtastic/deviceonly.options @@ -6,10 +6,6 @@ *ChannelFile.channels max_count:8 -*OEMStore.oem_text max_size:40 -*OEMStore.oem_icon_bits max_size:2048 -*OEMStore.oem_aes_key max_size:32 - *DeviceState.node_remote_hardware_pins max_count:12 *NodeInfoLite.channel int_size:8 diff --git a/meshtastic/deviceonly.proto b/meshtastic/deviceonly.proto index 91367bf..76bdfa8 100644 --- a/meshtastic/deviceonly.proto +++ b/meshtastic/deviceonly.proto @@ -3,7 +3,6 @@ syntax = "proto3"; package meshtastic; import "meshtastic/channel.proto"; -import "meshtastic/localonly.proto"; import "meshtastic/mesh.proto"; import "meshtastic/telemetry.proto"; import "meshtastic/config.proto"; @@ -150,27 +149,6 @@ message NodeInfoLite { bool is_favorite = 10; } -/* - * Font sizes for the device screen - */ -enum ScreenFonts { - /* - * TODO: REPLACE - */ - FONT_SMALL = 0; - - /* - * TODO: REPLACE - */ - FONT_MEDIUM = 1; - - /* - * TODO: REPLACE - */ - FONT_LARGE = 2; -} - - /* * This message is never sent over the wire, but it is used for serializing DB * state to flash in the device code @@ -254,49 +232,3 @@ message ChannelFile { */ uint32 version = 2; } - -/* - * This can be used for customizing the firmware distribution. If populated, - * show a secondary bootup screen with custom logo and text for 2.5 seconds. - */ -message OEMStore { - /* - * The Logo width in Px - */ - uint32 oem_icon_width = 1; - - /* - * The Logo height in Px - */ - uint32 oem_icon_height = 2; - - /* - * The Logo in XBM bytechar format - */ - bytes oem_icon_bits = 3; - - /* - * Use this font for the OEM text. - */ - ScreenFonts oem_font = 4; - - /* - * Use this font for the OEM text. - */ - string oem_text = 5; - - /* - * The default device encryption key, 16 or 32 byte - */ - bytes oem_aes_key = 6; - - /* - * A Preset LocalConfig to apply during factory reset - */ - LocalConfig oem_local_config = 7; - - /* - * A Preset LocalModuleConfig to apply during factory reset - */ - LocalModuleConfig oem_local_module_config = 8; -} From 1ab8611a31318c1052e0f9441019e0f63d9c4138 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Fri, 18 Oct 2024 05:45:19 -0500 Subject: [PATCH 14/21] Add uint64 device id --- meshtastic/mesh.proto | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto index 172f286..a48adbc 100644 --- a/meshtastic/mesh.proto +++ b/meshtastic/mesh.proto @@ -1457,6 +1457,11 @@ message MyNodeInfo { * Phone/PC apps should compare this to their build number and if too low tell the user they must update their app */ uint32 min_app_version = 11; + + /* + * Unique hardware identifier for this device + */ + uint64 device_id = 12; } /* From e09bd361a47c6e9a43baf79c57db9c766b39c885 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Mon, 21 Oct 2024 05:05:25 -0500 Subject: [PATCH 15/21] Add rebroadcast mode to ignore non-standard portnum traffic --- meshtastic/config.proto | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meshtastic/config.proto b/meshtastic/config.proto index 63df3a1..47edfa0 100644 --- a/meshtastic/config.proto +++ b/meshtastic/config.proto @@ -131,6 +131,12 @@ message Config { * Only permitted for SENSOR, TRACKER and TAK_TRACKER roles, this will inhibit all rebroadcasts, not unlike CLIENT_MUTE role. */ NONE = 4; + + /* + * Ignores packets from non-standard portnums such as: TAK, RangeTest, PaxCounter, etc. + * Only rebroadcasts packets with standard portnums: NodeInfo, Text, Position, Telemetry, and Routing. + */ + CORE_PORTNUMS_ONLY = 5; } /* From ea6eb85d6ef6b9e97fb4c4fbdebe9a79aadbce6f Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Mon, 21 Oct 2024 14:48:31 -0500 Subject: [PATCH 16/21] Expand to 128 bit bytes --- meshtastic/mesh.options | 1 + meshtastic/mesh.proto | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meshtastic/mesh.options b/meshtastic/mesh.options index cb85daa..4e335d2 100644 --- a/meshtastic/mesh.options +++ b/meshtastic/mesh.options @@ -25,6 +25,7 @@ # Big enough for 1.2.28.568032c-d *MyNodeInfo.firmware_version max_size:18 +*MyNodeInfo.device_id max_size:16 *MyNodeInfo.air_period_tx max_count:8 *MyNodeInfo.air_period_rx max_count:8 diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto index a48adbc..f53ef96 100644 --- a/meshtastic/mesh.proto +++ b/meshtastic/mesh.proto @@ -1461,7 +1461,7 @@ message MyNodeInfo { /* * Unique hardware identifier for this device */ - uint64 device_id = 12; + bytes device_id = 12; } /* From 2f400a078ea673aa74266da80357a52d75a49036 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 23 Oct 2024 09:48:18 -0500 Subject: [PATCH 17/21] Fix RTTL size mismatch --- meshtastic/admin.options | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meshtastic/admin.options b/meshtastic/admin.options index 022c4fd..f6f6c49 100644 --- a/meshtastic/admin.options +++ b/meshtastic/admin.options @@ -6,8 +6,8 @@ *AdminMessage.get_canned_message_module_messages_response max_size:201 *AdminMessage.delete_file_request max_size:201 -*AdminMessage.set_ringtone_message max_size:231 -*AdminMessage.get_ringtone_response max_size:231 +*AdminMessage.set_ringtone_message max_size:230 +*AdminMessage.get_ringtone_response max_size:230 *HamParameters.call_sign max_size:8 *HamParameters.short_name max_size:5 From d91f614dc49c8653502a3da3acbd28e0906c0102 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 23 Oct 2024 09:55:45 -0500 Subject: [PATCH 18/21] Extend device instead of shrink admin --- meshtastic/admin.options | 4 ++-- meshtastic/rtttl.options | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meshtastic/admin.options b/meshtastic/admin.options index f6f6c49..022c4fd 100644 --- a/meshtastic/admin.options +++ b/meshtastic/admin.options @@ -6,8 +6,8 @@ *AdminMessage.get_canned_message_module_messages_response max_size:201 *AdminMessage.delete_file_request max_size:201 -*AdminMessage.set_ringtone_message max_size:230 -*AdminMessage.get_ringtone_response max_size:230 +*AdminMessage.set_ringtone_message max_size:231 +*AdminMessage.get_ringtone_response max_size:231 *HamParameters.call_sign max_size:8 *HamParameters.short_name max_size:5 diff --git a/meshtastic/rtttl.options b/meshtastic/rtttl.options index 1ae0c2f..171e426 100644 --- a/meshtastic/rtttl.options +++ b/meshtastic/rtttl.options @@ -1 +1 @@ -*RTTTLConfig.ringtone max_size:230 +*RTTTLConfig.ringtone max_size:231 From 619bd44654b6d3a5ed9351a0fb58d64b37b382d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Thu, 24 Oct 2024 14:36:57 +0200 Subject: [PATCH 19/21] add device ui to config roll --- meshtastic/config.proto | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meshtastic/config.proto b/meshtastic/config.proto index 47edfa0..aaf340b 100644 --- a/meshtastic/config.proto +++ b/meshtastic/config.proto @@ -2,6 +2,8 @@ syntax = "proto3"; package meshtastic; +import "meshtastic/device_ui.proto"; + option csharp_namespace = "Meshtastic.Protobufs"; option go_package = "github.com/meshtastic/go/generated"; option java_outer_classname = "ConfigProtos"; @@ -1100,5 +1102,6 @@ message Config { BluetoothConfig bluetooth = 7; SecurityConfig security = 8; SessionkeyConfig sessionkey = 9; + DeviceUIConfig device_ui = 10; } } From f0df8545ad776fc20e4497b446e088aa7ecc71eb Mon Sep 17 00:00:00 2001 From: mverch67 Date: Sat, 26 Oct 2024 15:03:39 +0200 Subject: [PATCH 20/21] version control, new languages, lock and alert parameters --- meshtastic/device_ui.options | 2 ++ meshtastic/device_ui.proto | 63 +++++++++++++++++++++++++++++------- 2 files changed, 53 insertions(+), 12 deletions(-) diff --git a/meshtastic/device_ui.options b/meshtastic/device_ui.options index 64ca59c..e66f385 100644 --- a/meshtastic/device_ui.options +++ b/meshtastic/device_ui.options @@ -1,5 +1,7 @@ *DeviceUIConfig.screen_brightness int_size:8 *DeviceUIConfig.screen_timeout int_size:16 +*DeviceUIConfig.pin_code int_size:32 +*DeviceUIConfig.ring_tone_id int_size:8 *NodeFilter.node_name max_size:16 *NodeFilter.hops_away int_size:8 *NodeHighlight.node_name max_size:16 diff --git a/meshtastic/device_ui.proto b/meshtastic/device_ui.proto index 4457bfb..38481d2 100644 --- a/meshtastic/device_ui.proto +++ b/meshtastic/device_ui.proto @@ -13,45 +13,54 @@ option swift_prefix = ""; */ message DeviceUIConfig { + /* + * A version integer used to invalidate saved files when we make incompatible changes. + */ + uint32 version = 1; + /* * TFT display brightness 1..255 */ - uint32 screen_brightness = 1; + uint32 screen_brightness = 2; /* * Screen timeout 0..900 */ - uint32 screen_timeout = 2; + uint32 screen_timeout = 3; /* - * Screen lock enabled + * Screen/Settings lock enabled */ - bool screen_lock = 3; + bool screen_lock = 4; + bool settings_lock = 5; + uint32 pin_code = 6; /* * Color theme */ - Theme theme = 4; + Theme theme = 7; /* - * Audible message alert enabled + * Audible message, banner and ring tone */ - bool alert_enabled = 5; + bool alert_enabled = 8; + bool banner_enabled = 9; + uint32 ring_tone_id = 10; /* * Localization */ - Language language = 6; + Language language = 11; /* * Node list filter */ - NodeFilter node_filter = 7; + NodeFilter node_filter = 12; /* - * Node list highlightening + * Node list highlightening */ - NodeHighlight node_highlight = 8; + NodeHighlight node_highlight = 13; } @@ -184,5 +193,35 @@ enum Language { * Turkish */ TURKISH = 9; -} + + /* + * Serbian + */ + SERBIAN = 10; + + /* + * Russian + */ + RUSSIAN = 11; + + /* + * Dutch + */ + DUTCH = 12; + + /* + * Greek + */ + GREEK = 13; + + /* + * Simplified Chinese (experimental) + */ + SIMPLIFIED_CHINESE = 30; + + /* + * Traditional Chinese (experimental) + */ + TRADITIONAL_CHINESE = 31; + } From 545ba74f71305759e54aebc9207c3426f26c549b Mon Sep 17 00:00:00 2001 From: mverch67 Date: Sun, 27 Oct 2024 13:11:01 +0100 Subject: [PATCH 21/21] remove default int_size:32 --- meshtastic/device_ui.options | 1 - 1 file changed, 1 deletion(-) diff --git a/meshtastic/device_ui.options b/meshtastic/device_ui.options index e66f385..65be467 100644 --- a/meshtastic/device_ui.options +++ b/meshtastic/device_ui.options @@ -1,6 +1,5 @@ *DeviceUIConfig.screen_brightness int_size:8 *DeviceUIConfig.screen_timeout int_size:16 -*DeviceUIConfig.pin_code int_size:32 *DeviceUIConfig.ring_tone_id int_size:8 *NodeFilter.node_name max_size:16 *NodeFilter.hops_away int_size:8