From c9e5dd76cffda02bb420a5e42ece782b05e47970 Mon Sep 17 00:00:00 2001 From: Neil Hao Date: Thu, 27 Jul 2023 13:59:22 +0800 Subject: [PATCH 01/11] Update mesh.proto Added Nano G2 Ultra NANO_G2_ULTRA = 52; has been added. --- meshtastic/mesh.proto | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto index f39b746..98ca75d 100644 --- a/meshtastic/mesh.proto +++ b/meshtastic/mesh.proto @@ -417,6 +417,11 @@ enum HardwareModel { */ T_WATCH_S3 = 51; + /* + * B&Q Consulting Nano G2 Ultra: https://wiki.uniteng.com/en/meshtastic/nano-g2-ultra + */ + NANO_G2_ULTRA = 52; + /* * ------------------------------------------------------------------------------------------------------------------------------------------ * 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. @@ -1525,4 +1530,4 @@ message DeviceMetadata { * Has Remote Hardware enabled */ bool hasRemoteHardware = 10; -} \ No newline at end of file +} From 8ad70564fcd9b31078d843e241e65b6af77e213c Mon Sep 17 00:00:00 2001 From: Neil Hao Date: Thu, 27 Jul 2023 17:55:40 +0800 Subject: [PATCH 02/11] Added Nano G2 Ultra to 18 NANO_G2_ULTRA = 18; has been added for new board. More info about nano g2 ultra: https://wiki.uniteng.com/en/meshtastic/nano-g2-ultra --- meshtastic/mesh.proto | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto index 98ca75d..bc7bff6 100644 --- a/meshtastic/mesh.proto +++ b/meshtastic/mesh.proto @@ -305,6 +305,11 @@ enum HardwareModel { */ NANO_G1_EXPLORER = 17; + /* + * B&Q Consulting Nano G2 Ultra: https://wiki.uniteng.com/en/meshtastic/nano-g2-ultra + */ + NANO_G2_ULTRA = 18; + /* * B&Q Consulting Station Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:station */ @@ -417,11 +422,6 @@ enum HardwareModel { */ T_WATCH_S3 = 51; - /* - * B&Q Consulting Nano G2 Ultra: https://wiki.uniteng.com/en/meshtastic/nano-g2-ultra - */ - NANO_G2_ULTRA = 52; - /* * ------------------------------------------------------------------------------------------------------------------------------------------ * 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. From 2cb0aeb668686edf68cfb8a682b988e7b64ed238 Mon Sep 17 00:00:00 2001 From: charminULTRA Date: Thu, 27 Jul 2023 14:09:17 -0400 Subject: [PATCH 03/11] ALM --- meshtastic/admin.proto | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto index 191707c..c8c2a1f 100644 --- a/meshtastic/admin.proto +++ b/meshtastic/admin.proto @@ -109,6 +109,11 @@ message AdminMessage { * TODO: REPLACE */ REMOTEHARDWARE_CONFIG = 8; + + /* + * TODO: REPLACE + */ + AMBIENTLIGHTING_CONFIG = 10; } /* From 34e550ee2a177e4d8d8443afcc03d5b1d1ba9109 Mon Sep 17 00:00:00 2001 From: charminULTRA Date: Thu, 27 Jul 2023 14:12:37 -0400 Subject: [PATCH 04/11] space --- meshtastic/admin.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto index c8c2a1f..952ecaa 100644 --- a/meshtastic/admin.proto +++ b/meshtastic/admin.proto @@ -113,7 +113,7 @@ message AdminMessage { /* * TODO: REPLACE */ - AMBIENTLIGHTING_CONFIG = 10; + AMBIENTLIGHTING_CONFIG = 10; } /* From 7f047d6357a299f7704debdb2968e7818a1a81e7 Mon Sep 17 00:00:00 2001 From: Jon Date: Thu, 27 Jul 2023 14:39:13 -0400 Subject: [PATCH 05/11] added expeceted code for neighborinfo for simplicity of merge --- meshtastic/admin.proto | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto index 952ecaa..ac2fd5d 100644 --- a/meshtastic/admin.proto +++ b/meshtastic/admin.proto @@ -109,7 +109,12 @@ message AdminMessage { * TODO: REPLACE */ REMOTEHARDWARE_CONFIG = 8; - + + /* + * TODO: REPLACE + */ + NEIGHBORINFO_CONFIG = 9; + /* * TODO: REPLACE */ @@ -330,4 +335,4 @@ message NodeRemoteHardwarePinsResponse { * Nodes and their respective remote hardware GPIO pins */ repeated NodeRemoteHardwarePin node_remote_hardware_pins = 1; -} +} \ No newline at end of file From c48e4085628166943bd94fbf875722cc6605b4cb Mon Sep 17 00:00:00 2001 From: Jon Date: Thu, 27 Jul 2023 16:42:58 -0400 Subject: [PATCH 06/11] space fix --- meshtastic/admin.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto index ac2fd5d..e629a87 100644 --- a/meshtastic/admin.proto +++ b/meshtastic/admin.proto @@ -114,7 +114,7 @@ message AdminMessage { * TODO: REPLACE */ NEIGHBORINFO_CONFIG = 9; - + /* * TODO: REPLACE */ From 673832e45c68d8651b626673cc00e11a07c642f5 Mon Sep 17 00:00:00 2001 From: Jon Date: Fri, 28 Jul 2023 11:03:43 -0400 Subject: [PATCH 07/11] test --- meshtastic/admin.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto index e629a87..a8f87aa 100644 --- a/meshtastic/admin.proto +++ b/meshtastic/admin.proto @@ -119,6 +119,7 @@ message AdminMessage { * TODO: REPLACE */ AMBIENTLIGHTING_CONFIG = 10; + } /* From b69559e22b1da9fd7bbea62231da2d0069a92950 Mon Sep 17 00:00:00 2001 From: Jon Date: Fri, 28 Jul 2023 11:07:05 -0400 Subject: [PATCH 08/11] check --- meshtastic/admin.proto | 1 - 1 file changed, 1 deletion(-) diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto index a8f87aa..e629a87 100644 --- a/meshtastic/admin.proto +++ b/meshtastic/admin.proto @@ -119,7 +119,6 @@ message AdminMessage { * TODO: REPLACE */ AMBIENTLIGHTING_CONFIG = 10; - } /* From 22b6681c86fb6253742af82e1e692d85e8c208d7 Mon Sep 17 00:00:00 2001 From: Jon Date: Fri, 28 Jul 2023 11:07:48 -0400 Subject: [PATCH 09/11] Trying to fix TOKEN error From 6f88374ec6939fabc3ef79771843c291db063fae Mon Sep 17 00:00:00 2001 From: Eugene Maksymenko Date: Fri, 28 Jul 2023 23:35:44 +0300 Subject: [PATCH 10/11] Fix unmappable character (0x98) for encoding windows-1251 #373 --- meshtastic/mesh.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto index bc7bff6..c88c44b 100644 --- a/meshtastic/mesh.proto +++ b/meshtastic/mesh.proto @@ -750,9 +750,9 @@ message MeshPacket { * to make sure that critical packets are sent ASAP. * In the case of meshtastic that means we want to send protocol acks as soon as possible * (to prevent unneeded retransmissions), we want routing messages to be sent next, - * then messages marked as reliable and finally ‘background’ packets like periodic position updates. + * then messages marked as reliable and finally 'background' packets like periodic position updates. * So I bit the bullet and implemented a new (internal - not sent over the air) - * field in MeshPacket called ‘priority’. + * field in MeshPacket called 'priority'. * And the transmission queue in the router object is now a priority queue. */ enum Priority { From 4628e5960b3e39196057a3e552c3900837fb58d9 Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 30 Jul 2023 11:17:06 -0400 Subject: [PATCH 11/11] leave out neighbor --- meshtastic/admin.proto | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto index e629a87..b71588e 100644 --- a/meshtastic/admin.proto +++ b/meshtastic/admin.proto @@ -110,11 +110,6 @@ message AdminMessage { */ REMOTEHARDWARE_CONFIG = 8; - /* - * TODO: REPLACE - */ - NEIGHBORINFO_CONFIG = 9; - /* * TODO: REPLACE */