From 97d7a89644dc815fdc2a352843aa50403427df1b Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sun, 30 Jul 2023 07:58:11 -0500 Subject: [PATCH 1/4] Update protobufs --- protobufs | 2 +- src/mesh/generated/meshtastic/mesh.pb.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/protobufs b/protobufs index 57bd75ea8..6f88374ec 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit 57bd75ea8b3c4fe551dcaf1dcd402646878176a8 +Subproject commit 6f88374ec6939fabc3ef79771843c291db063fae diff --git a/src/mesh/generated/meshtastic/mesh.pb.h b/src/mesh/generated/meshtastic/mesh.pb.h index 6007265d5..7fffe9ea7 100644 --- a/src/mesh/generated/meshtastic/mesh.pb.h +++ b/src/mesh/generated/meshtastic/mesh.pb.h @@ -59,6 +59,8 @@ typedef enum _meshtastic_HardwareModel { meshtastic_HardwareModel_TLORA_T3_S3 = 16, /* B&Q Consulting Nano G1 Explorer: https://wiki.uniteng.com/en/meshtastic/nano-g1-explorer */ meshtastic_HardwareModel_NANO_G1_EXPLORER = 17, + /* B&Q Consulting Nano G2 Ultra: https://wiki.uniteng.com/en/meshtastic/nano-g2-ultra */ + meshtastic_HardwareModel_NANO_G2_ULTRA = 18, /* B&Q Consulting Station Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:station */ meshtastic_HardwareModel_STATION_G1 = 25, /* RAK11310 (RP2040 + SX1262) */ @@ -228,9 +230,9 @@ typedef enum _meshtastic_Routing_Error { 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. */ typedef enum _meshtastic_MeshPacket_Priority { /* Treated as Priority.DEFAULT */ From 76dc80518489a1f4d11e8dd0c70a33bea9bf6859 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sun, 30 Jul 2023 14:07:17 -0500 Subject: [PATCH 2/4] Add Nano-g2-ultra --- .github/workflows/main_matrix.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml index b4a8a4739..09c0635a4 100644 --- a/.github/workflows/main_matrix.yml +++ b/.github/workflows/main_matrix.yml @@ -111,6 +111,7 @@ jobs: - board: t-echo - board: pca10059_diy_eink - board: feather_diy + - board: nano-g2-ultra uses: ./.github/workflows/build_nrf52.yml with: board: ${{ matrix.board }} From 8a49221b7fcb1388ecdc1cc5eb43305f5f875dec Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sun, 30 Jul 2023 20:17:57 -0500 Subject: [PATCH 3/4] Update version.properties --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index 00ddcfc79..c00681305 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ [VERSION] major = 2 minor = 1 -build = 21 +build = 22 From ef5e21d3da5a06635180bc96a0ff655d62ff9ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Mon, 31 Jul 2023 21:37:55 +0200 Subject: [PATCH 4/4] Enable Trunk on Windows --- .vscode/settings.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 3b489975b..03922dc72 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,5 @@ { "editor.formatOnSave": true, - "editor.defaultFormatter": "trunk.io" + "editor.defaultFormatter": "trunk.io", + "trunk.enableWindows": true }