Skip to content

Commit 16dcafa

Browse files
committed
Merge remote-tracking branch 'origin/master' into develop
2 parents 4ac74ed + eeb95d6 commit 16dcafa

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

.github/workflows/main_matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ jobs:
309309
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
310310

311311
- name: Create release
312-
uses: softprops/action-gh-release@v2
312+
uses: softprops/action-gh-release@v3
313313
id: create_release
314314
with:
315315
draft: true

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
node-version: 24
5353

5454
- name: Setup pnpm
55-
uses: pnpm/action-setup@v5
55+
uses: pnpm/action-setup@v6
5656
with:
5757
version: latest
5858

src/graphics/EInkParallelDisplay.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ void EInkParallelDisplay::display(void)
202202

203203
// Get pointers to internal buffers
204204
uint8_t *cur = epaper->currentBuffer();
205-
uint8_t *prev = epaper->previousBuffer(); // may be NULL on first init
205+
const uint8_t *prev = epaper->previousBuffer(); // may be NULL on first init
206206

207207
// Track changed row range while converting
208208
int newTop = h; // min changed row (initialized to out-of-range)

variants/esp32s3/heltec_vision_master_t190/platformio.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ build_flags =
2020
lib_deps =
2121
${esp32s3_base.lib_deps}
2222
# renovate: datasource=git-refs depName=meshtastic-st7789 packageName=https://github.com/meshtastic/st7789 gitBranch=main
23-
https://github.com/meshtastic/st7789/archive/4d957e758eab3ac354e8f2a276c945f5fcbaaa03.zip
23+
https://github.com/meshtastic/st7789/archive/a787beea5c6c8f864ba6787eb432bbefc575e6ad.zip
2424
upload_speed = 921600

variants/esp32s3/m5stack_cardputer_adv/platformio.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ build_src_filter =
1616
lib_deps =
1717
${esp32s3_base.lib_deps}
1818
# renovate: datasource=git-refs depName=meshtastic-st7789 packageName=https://github.com/meshtastic/st7789 gitBranch=main
19-
https://github.com/meshtastic/st7789/archive/4d957e758eab3ac354e8f2a276c945f5fcbaaa03.zip
19+
https://github.com/meshtastic/st7789/archive/a787beea5c6c8f864ba6787eb432bbefc575e6ad.zip
2020
# renovate: datasource=github-tags depName=pschatzmann_arduino-audio-driver packageName=pschatzmann/arduino-audio-driver
2121
https://github.com/pschatzmann/arduino-audio-driver/archive/v0.2.1.zip
2222
# renovate: datasource=git-refs depName=ESP8266Audio packageName=https://github.com/meshtastic/ESP8266Audio gitBranch=meshtastic-2.0.0-dacfix

variants/esp32s3/mini-epaper-s3/nicheGraphics.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ void setupNicheGraphics()
9898
buttons->setTwoWayRockerPressHandlers(
9999
[inkhud]() {
100100
bool systemHandlingInput = false;
101-
for (InkHUD::SystemApplet *sa : inkhud->systemApplets) {
101+
for (const InkHUD::SystemApplet *sa : inkhud->systemApplets) {
102102
if (sa->handleInput) {
103103
systemHandlingInput = true;
104104
break;
@@ -112,7 +112,7 @@ void setupNicheGraphics()
112112
},
113113
[inkhud]() {
114114
bool systemHandlingInput = false;
115-
for (InkHUD::SystemApplet *sa : inkhud->systemApplets) {
115+
for (const InkHUD::SystemApplet *sa : inkhud->systemApplets) {
116116
if (sa->handleInput) {
117117
systemHandlingInput = true;
118118
break;

variants/nrf52840/heltec_mesh_node_t114/platformio.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/heltec_
2323
lib_deps =
2424
${nrf52840_base.lib_deps}
2525
# renovate: datasource=git-refs depName=meshtastic-st7789 packageName=https://github.com/meshtastic/st7789 gitBranch=main
26-
https://github.com/meshtastic/st7789/archive/4d957e758eab3ac354e8f2a276c945f5fcbaaa03.zip
26+
https://github.com/meshtastic/st7789/archive/a787beea5c6c8f864ba6787eb432bbefc575e6ad.zip

variants/nrf52840/heltec_mesh_solar/platformio.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,4 +132,4 @@ build_flags = ${heltec_mesh_solar_base.build_flags}
132132
lib_deps =
133133
${heltec_mesh_solar_base.lib_deps}
134134
# renovate: datasource=git-refs depName=meshtastic-st7789 packageName=https://github.com/meshtastic/st7789 gitBranch=main
135-
https://github.com/meshtastic/st7789/archive/4d957e758eab3ac354e8f2a276c945f5fcbaaa03.zip
135+
https://github.com/meshtastic/st7789/archive/a787beea5c6c8f864ba6787eb432bbefc575e6ad.zip

0 commit comments

Comments
 (0)