pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-30 03:13:51 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'master' into T-beam-display-no-touch

Browse Source
This commit is contained in:
Nasimovy 2025-04-17 04:45:29 +00:00 committed by GitHub
commit d55e3bf034
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.trunk/trunk.yaml
View File

@ -8,7 +8,7 @@ plugins:
uri: https://github.com/trunk-io/plugins uri: https://github.com/trunk-io/plugins
lint: lint:
enabled: enabled:
- renovate@39.238.1 - renovate@39.243.0
- prettier@3.5.3 - prettier@3.5.3
- trufflehog@3.88.23 - trufflehog@3.88.23
- yamllint@1.37.0 - yamllint@1.37.0
@ -28,7 +28,7 @@ lint:
- shellcheck@0.10.0 - shellcheck@0.10.0
- black@25.1.0 - black@25.1.0
- git-diff-check - git-diff-check
- gitleaks@8.24.2 - gitleaks@8.24.3
- clang-format@16.0.3 - clang-format@16.0.3
ignore: ignore:
- linters: [ALL] - linters: [ALL]

2
src/graphics/Screen.cpp
View File

@ -1833,7 +1833,9 @@ void Screen::setup()
powerStatusObserver.observe(&powerStatus->onNewStatus); powerStatusObserver.observe(&powerStatus->onNewStatus);
gpsStatusObserver.observe(&gpsStatus->onNewStatus); gpsStatusObserver.observe(&gpsStatus->onNewStatus);
nodeStatusObserver.observe(&nodeStatus->onNewStatus); nodeStatusObserver.observe(&nodeStatus->onNewStatus);
#if !MESHTASTIC_EXCLUDE_ADMIN
adminMessageObserver.observe(adminModule); adminMessageObserver.observe(adminModule);
#endif
if (textMessageModule) if (textMessageModule)
textMessageObserver.observe(textMessageModule); textMessageObserver.observe(textMessageModule);
if (inputBroker) if (inputBroker)

1
variants/tlora_v1/platformio.ini
View File

@ -4,3 +4,4 @@ extends = esp32_base
board = ttgo-lora32-v1 board = ttgo-lora32-v1
build_flags = build_flags =
${esp32_base.build_flags} -D TLORA_V1 -I variants/tlora_v1 ${esp32_base.build_flags} -D TLORA_V1 -I variants/tlora_v1
upload_speed = 115200