Skip to content

Commit adc234b

Browse files
authored
Merge branch 'master' into pmtiles
2 parents 2b5dbef + 28167c6 commit adc234b

32 files changed

+29857
-2290
lines changed

.trunk/trunk.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,25 @@ runtimes:
1717
# This is the section where you manage your linters. (https://docs.trunk.io/check/configuration)
1818
lint:
1919
enabled:
20-
20+
2121
2222
23-
23+
2424
25-
- trivy@0.65.0
25+
- trivy@0.67.0
2626
2727
28-
- ruff@0.12.10
29-
- isort@6.0.1
28+
- ruff@0.14.0
29+
- isort@6.1.0
3030
3131
3232
3333
3434
35-
- hadolint@2.12.1-beta
35+
- hadolint@2.14.0
3636
3737
38-
- black@25.1.0
38+
- black@25.9.0
3939
- git-diff-check
4040
4141

README.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,22 +71,23 @@ Graphics using <a href="https://lvgl.io/" target="_blank">LVGL</a> library
7171
- [x] Display sleep
7272
- [x] Heartbeat timer based on device input actions
7373
- [x] Localisation support
74+
- [x] Danish translation
75+
- [x] Dutch translation
76+
- [x] Finnish translation
77+
- [x] French translation
7478
- [x] German translation
75-
- [x] Spanish translation
76-
- [x] Portuguese translation
77-
- [x] Swedish translation
79+
- [x] Greek translation
80+
- [x] Italian translation
81+
- [x] Netherlands translation
7882
- [x] Norwegian translation
79-
- [x] Finnish translation
8083
- [x] Polish translation
8184
- [x] Portuguese translation
82-
- [x] Netherlands translation
83-
- [x] Dutch translation
84-
- [x] Italian translation
85-
- [x] French translation
85+
- [x] Portuguese translation
8686
- [x] Russian translation
8787
- [x] Slovenian translation
88+
- [x] Spanish translation
89+
- [x] Swedish translation
8890
- [x] Turkish translation
89-
- [x] Greek translation
9091
- [x] Ukrainian translation
9192
- [ ] Support dynamic OLED / Color(TFT) selection
9293
- [x] Add support for UI scaling and try eliminate fixed positioning (lvgl v9)

cmake/protobuf.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ message(STATUS "Fetching protobufs ...")
22
FetchContent_Declare(
33
Protobuf
44
GIT_REPOSITORY "https://github.com/meshtastic/protobufs"
5-
GIT_TAG v2.6.2
5+
GIT_TAG v2.7.8
66
)
77
FetchContent_MakeAvailable(Protobuf)

generated/ui_320x240/images.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "images.h"
22

3-
const ext_img_desc_t images[89] = {
3+
const ext_img_desc_t images[90] = {
44
{ "meshtastic_boot_logo_image", &img_meshtastic_boot_logo_image },
55
{ "settings_button_image", &img_settings_button_image },
66
{ "map_button_image", &img_map_button_image },
@@ -16,7 +16,6 @@ const ext_img_desc_t images[89] = {
1616
{ "home_memory_button", &img_home_memory_button },
1717
{ "node_client_image", &img_node_client_image },
1818
{ "keyboard_image", &img_keyboard_image },
19-
{ "worldmap_image", &img_worldmap_image },
2019
{ "top_nodes_image", &img_top_nodes_image },
2120
{ "top_group_image", &img_top_group_image },
2221
{ "top_chats_image", &img_top_chats_image },
@@ -86,8 +85,10 @@ const ext_img_desc_t images[89] = {
8685
{ "zoom_plus_image", &img_zoom_plus_image },
8786
{ "gps_location_image", &img_gps_location_image },
8887
{ "location_lock_image", &img_location_lock_image },
89-
{ "node_location_pin_image", &img_node_location_pin_image },
9088
{ "node_location_pin24_image", &img_node_location_pin24_image },
9189
{ "reboot_BT_on_image", &img_reboot_bt_on_image },
9290
{ "unmessagable_image", &img_unmessagable_image },
91+
{ "home_qr_button_image", &img_home_qr_button_image },
92+
{ "groups_bell_slash_image", &img_groups_bell_slash_image },
93+
{ "groups_bell_image", &img_groups_bell_image },
9394
};

generated/ui_320x240/images.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ extern const lv_img_dsc_t img_home_bluetooth_on_button_image;
2222
extern const lv_img_dsc_t img_home_memory_button;
2323
extern const lv_img_dsc_t img_node_client_image;
2424
extern const lv_img_dsc_t img_keyboard_image;
25-
extern const lv_img_dsc_t img_worldmap_image;
2625
extern const lv_img_dsc_t img_top_nodes_image;
2726
extern const lv_img_dsc_t img_top_group_image;
2827
extern const lv_img_dsc_t img_top_chats_image;
@@ -92,10 +91,12 @@ extern const lv_img_dsc_t img_zoom_minus_image;
9291
extern const lv_img_dsc_t img_zoom_plus_image;
9392
extern const lv_img_dsc_t img_gps_location_image;
9493
extern const lv_img_dsc_t img_location_lock_image;
95-
extern const lv_img_dsc_t img_node_location_pin_image;
9694
extern const lv_img_dsc_t img_node_location_pin24_image;
9795
extern const lv_img_dsc_t img_reboot_bt_on_image;
9896
extern const lv_img_dsc_t img_unmessagable_image;
97+
extern const lv_img_dsc_t img_home_qr_button_image;
98+
extern const lv_img_dsc_t img_groups_bell_slash_image;
99+
extern const lv_img_dsc_t img_groups_bell_image;
99100

100101
#ifndef EXT_IMG_DESC_T
101102
#define EXT_IMG_DESC_T
@@ -105,7 +106,7 @@ typedef struct _ext_img_desc_t {
105106
} ext_img_desc_t;
106107
#endif
107108

108-
extern const ext_img_desc_t images[89];
109+
extern const ext_img_desc_t images[90];
109110

110111

111112
#ifdef __cplusplus

0 commit comments

Comments
 (0)