From f0df8545ad776fc20e4497b446e088aa7ecc71eb Mon Sep 17 00:00:00 2001 From: mverch67 Date: Sat, 26 Oct 2024 15:03:39 +0200 Subject: [PATCH 1/2] 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 64ca59c3..e66f3852 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 4457bfb4..38481d2c 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 2/2] 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 e66f3852..65be4670 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