Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Color fix platformio #4216

Closed
wants to merge 307 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
307 commits
Select commit Hold shift + click to select a range
cc330ea
increase TFT stack size
mverch67 Mar 18, 2024
bdb3882
Merge branch 'tft-gui-work' of https://github.com/meshtastic/firmware…
mverch67 Mar 18, 2024
352ac20
Merge branch 'tft-gui-work' of https://github.com/meshtastic/firmware…
mverch67 Mar 18, 2024
5813ccf
esp debug logs
mverch67 Mar 18, 2024
3a8bb5b
fix gui freeze
mverch67 Mar 18, 2024
13a9c00
updated device-ui
mverch67 Mar 18, 2024
140eb94
try-fix acessing d172503
mverch67 Mar 19, 2024
4d647ca
added device-ui logging
mverch67 Mar 19, 2024
78af6d0
Merge branch 'master' into tft-gui-work
mverch67 Mar 19, 2024
6e61a9a
refactored receivePacket
mverch67 Mar 19, 2024
ac70627
Merge branch 'master' into tft-gui-work
mverch67 Mar 21, 2024
662df5b
Set default position precision of mapReport to 14 (#3456)
GUVWAF Mar 21, 2024
3913865
Let NeighborInfo Module ignore packets coming from MQTT (#3457)
GUVWAF Mar 21, 2024
65e1993
Clear local position on nodedb-reset (#3451)
thebentern Mar 21, 2024
9ecd5a3
Bump actions to node 20 (#3461)
jp-bennett Mar 21, 2024
b5b9f34
Remove double run of build-raspbian
jp-bennett Mar 21, 2024
d694525
Revert previous attempt
jp-bennett Mar 21, 2024
3db09e2
Add sanity check for map report interval and position precision (#3459)
GUVWAF Mar 21, 2024
8f2f222
Revert "Bump actions to node 20 (#3461)" (#3462)
jp-bennett Mar 21, 2024
326e0a5
Make MAX_NUM_NODES configurable in variant.h (#3453)
jp-bennett Mar 21, 2024
753fc78
[create-pull-request] automated change (#3463)
github-actions[bot] Mar 21, 2024
ae32c24
Skip favorite nodes when clearing out oldest in NodeDB (#3464)
thebentern Mar 22, 2024
e7738fa
Log warning cleanup and truth (#3466)
thebentern Mar 22, 2024
9a8be51
[create-pull-request] automated change (#3470)
github-actions[bot] Mar 22, 2024
37ae3cc
Enforce consistent polite channel utilization limits except for Senso…
thebentern Mar 22, 2024
771b181
Add set and remove favorite nodes admin commands (#3471)
thebentern Mar 22, 2024
fcbdd69
Fix #3452: only alter received packet if port number matches (#3474)
GUVWAF Mar 23, 2024
87acb4c
Actually update last_report_to_map
GUVWAF Mar 23, 2024
f2e68af
Crash fix and remove hard-coded path from PiWebServer (#3478)
jp-bennett Mar 23, 2024
2ae09ef
Set unused header bytes to zero for future use (#3479)
GUVWAF Mar 23, 2024
92d0d89
[create-pull-request] automated change (#3483)
github-actions[bot] Mar 24, 2024
51ab613
Merge branch 'master' into tft-gui-work
mverch67 Mar 24, 2024
cef0f01
Merge branch 'master' into tft-gui-work
mverch67 Mar 25, 2024
d9291aa
Merge branch 'master' into tft-gui-work
mverch67 Mar 26, 2024
7d38af3
Merge branch 'master' into tft-gui-work
mverch67 Mar 27, 2024
4c1625b
configurable RAM usage
mverch67 Mar 27, 2024
a5c0601
Merge branch 'master' into tft-gui-work
mverch67 Mar 28, 2024
1a94393
Merge branch 'master' into tft-gui-work
mverch67 Mar 29, 2024
3f7f92c
I2C keyboard crash workaround
mverch67 Mar 29, 2024
5a7ea9d
trunk fmt
mverch67 Mar 29, 2024
a5f330a
Merge branch 'master' into tft-gui-work
mverch67 Mar 30, 2024
fb4b632
Merge branch 'master' into tft-gui-work
mverch67 Mar 31, 2024
d6e690e
Merge branch 'master' into tft-gui-work
mverch67 Apr 2, 2024
95dfe49
Merge branch 'master' into tft-gui-work
mverch67 Apr 3, 2024
14e9839
Merge branch 'master' into tft-gui-work
mverch67 Apr 4, 2024
5a6bc00
Merge branch 'master' into tft-gui-work
mverch67 Apr 4, 2024
26606a1
Merge branch 'master' into tft-gui-work
mverch67 Apr 4, 2024
e6a87b4
Merge branch 'master' into tft-gui-work
mverch67 Apr 5, 2024
dd63849
Merge branch 'master' into tft-gui-work
mverch67 Apr 6, 2024
25d8be3
refactoring part 1: remove MeshPacketClient/Server layer
mverch67 Apr 6, 2024
9e6766b
refactoring part 2: move queue stuff into library
mverch67 Apr 6, 2024
1c73b42
Merge branch 'master' into tft-gui-work
mverch67 Apr 6, 2024
9eda643
Merge branch 'master' into tft-gui-work
mverch67 Apr 7, 2024
d369c5b
USE_PACKET_API compiler switch
mverch67 Apr 7, 2024
c0a5304
refactoring part 3: move PacketClient/Server into lib
mverch67 Apr 7, 2024
bec15f0
Merge branch 'master' into tft-gui-work
mverch67 Apr 8, 2024
f50d8a4
Merge branch 'master' into tft-gui-work
mverch67 Apr 9, 2024
8dcc42c
device-ui checkout master
mverch67 Apr 9, 2024
7578d40
Merge branch 'master' into tft-gui-work
mverch67 Apr 12, 2024
2d2caf3
Merge branch 'master' into tft-gui-work
mverch67 Apr 13, 2024
d83838d
update platform definitions to refactored lib
mverch67 Apr 15, 2024
a983943
add portduino seetingsMap configuration
mverch67 Apr 17, 2024
e588b7e
Merge branch 'master' into tft-gui-work
mverch67 Apr 17, 2024
0840f07
remove PacketServer -> PacketAPI dependency
mverch67 Apr 17, 2024
fbc0c8b
platformio.ini updates
mverch67 Apr 17, 2024
99f0dea
refactoring PacketServer/API device-ui update
mverch67 Apr 17, 2024
ab277ee
fix linker error
mverch67 Apr 17, 2024
774002d
protobufs update
mverch67 Apr 17, 2024
4c08639
Merge branch 'tft-gui-work' of https://github.com/meshtastic/firmware…
mverch67 Apr 17, 2024
562cd30
Merge branch 'master' into tft-gui-work
mverch67 Apr 17, 2024
29bd134
revert ulfius
mverch67 Apr 17, 2024
a5ea8a6
Merge branch 'master' into tft-gui-work
mverch67 Apr 18, 2024
dd4bd98
fix X11 usage
mverch67 Apr 18, 2024
b56fec9
added release build for performance
mverch67 Apr 18, 2024
53c5d22
Merge branch 'master' into tft-gui-work
mverch67 Apr 18, 2024
695568e
added release build + tryfix touch crash
mverch67 Apr 18, 2024
684295c
Merge branch 'tft-gui-work' of https://github.com/meshtastic/firmware…
mverch67 Apr 18, 2024
6652683
added ILI9488+ST7796
mverch67 Apr 18, 2024
1525002
Merge branch 'master' into tft-gui-work
mverch67 Apr 18, 2024
e8706ec
Merge branch 'master' into tft-gui-work
mverch67 Apr 19, 2024
a3f8677
update repository links
mverch67 Apr 19, 2024
7217569
Merge branch 'master' into tft-gui-work
mverch67 Apr 20, 2024
0c29166
add X11 panel setting (among others)
mverch67 Apr 20, 2024
e9b7502
remove x11 target
mverch67 Apr 20, 2024
95e9b2e
Merge branch 'master' into tft-gui-work
mverch67 Apr 20, 2024
8e66cbf
update want_ack / hop_limit
mverch67 Apr 20, 2024
ffca6c6
Merge branch 'master' into tft-gui-work
mverch67 Apr 20, 2024
548b57c
update lib
mverch67 Apr 20, 2024
6d945e0
added heartbeat
mverch67 Apr 20, 2024
a24def6
lib update (heartbeat)
mverch67 Apr 20, 2024
566f2ea
Merge branch 'master' into tft-gui-work
mverch67 Apr 20, 2024
d315c74
Merge branch 'master' into tft-gui-work
mverch67 Apr 21, 2024
269e861
Merge branch 'master' into tft-gui-work
mverch67 Apr 22, 2024
22f6a71
Merge branch 'master' into tft-gui-work
jp-bennett Apr 29, 2024
5c05c81
Merge branch 'master' into tft-gui-work
mverch67 Apr 29, 2024
ae82c32
add spi_host support
mverch67 Apr 29, 2024
0a7e15b
Merge branch 'master' into tft-gui-work
mverch67 May 1, 2024
fab3028
spi_host support
mverch67 May 1, 2024
128ec63
Merge branch 'master' into tft-gui-work
jp-bennett May 1, 2024
5ec8e02
add spi_host + missing rotation
mverch67 May 1, 2024
7990e7e
update lib spi_host
mverch67 May 1, 2024
500c7d4
retry update lib
mverch67 May 1, 2024
3f30a84
try-fix i2c touch
mverch67 May 1, 2024
3fb8cdf
fix SPI touch
mverch67 May 2, 2024
62c0acf
fix BL/PWM (update lib)
mverch67 May 2, 2024
e23faf2
Merge branch 'master' into tft-gui-work
mverch67 May 2, 2024
9c36b9f
unphone part 1
mverch67 May 2, 2024
cc13540
Merge branch 'master' into tft-gui-work
jp-bennett May 2, 2024
3bb506e
Unphone support
mverch67 May 2, 2024
c445af3
fix includes
mverch67 May 2, 2024
c74eec0
Merge branch 'master' into tft-gui-work
mverch67 May 3, 2024
1ec40f2
Merge branch 'master' into tft-gui-work
mverch67 May 4, 2024
5340d0a
Merge branch 'master' into tft-gui-work
mverch67 May 8, 2024
324962b
X11 panel dimensions
mverch67 May 9, 2024
b9dcff5
lib update
mverch67 May 9, 2024
7593886
Merge branch 'master' into tft-gui-work
mverch67 May 11, 2024
7c3519d
Merge branch 'master' into tft-gui-work
caveman99 May 13, 2024
e1f347d
fix compiler errors
mverch67 May 14, 2024
ff9c7da
Merge branch 'master' into tft-gui-work
mverch67 May 15, 2024
3412bad
fix PortduinoGlue
mverch67 May 15, 2024
55e28b2
remove lvglv8 drivers
mverch67 May 15, 2024
279cdd0
add custom dimension support to X11 panel
mverch67 May 15, 2024
96d97bc
update lib (lvgl v9)
mverch67 May 15, 2024
ca3f009
Merge branch 'master' into tft-gui-work
mverch67 May 15, 2024
3e0a7f4
Merge branch 'master' into tft-gui-work
mverch67 May 15, 2024
3836249
no lvgl log in release build
mverch67 May 16, 2024
4df9da1
add ARCH_PORTDUINO
mverch67 May 16, 2024
5eabfaa
fix for ILI9488
mverch67 May 16, 2024
4e1ed32
update lib
mverch67 May 16, 2024
70c1d9b
Merge branch 'master' into tft-gui-work
mverch67 May 16, 2024
c9ed792
support ILI9486
mverch67 May 16, 2024
0e7a4b3
support SHCHV 3.5 RPi TFT+Touchscreen
mverch67 May 16, 2024
dc04550
Merge branch 'master' into tft-gui-work
mverch67 May 18, 2024
857bf3b
Merge branch 'master' into tft-gui-work
mverch67 May 18, 2024
d5720d4
Merge branch 'master' into tft-gui-work
jp-bennett May 20, 2024
c94c5f4
Merge branch 'master' into tft-gui-work
mverch67 May 20, 2024
64d0e94
add defines for log and monitor
mverch67 May 20, 2024
c2fe1ef
Merge branch 'master' into tft-gui-work
mverch67 May 22, 2024
568e43b
Merge branch 'master' into tft-gui-work
mverch67 May 22, 2024
79ac5f1
Merge branch 'master' into tft-gui-work
mverch67 May 23, 2024
72b0986
keyboard & mouse input
mverch67 May 24, 2024
b867ab5
defines for monitoring control
mverch67 May 25, 2024
77ad95e
Merge branch 'master' into tft-gui-work
mverch67 May 27, 2024
b8b8e47
keyboard/mouse control for native
mverch67 May 28, 2024
1dec9ea
Merge branch 'master' into tft-gui-work
mverch67 May 28, 2024
342de9c
open sauce t-deck edition
mverch67 May 28, 2024
85c1771
Merge branch 'master' into tft-gui-work
mverch67 May 29, 2024
4bac908
fixes native keyboard+mouse handling
mverch67 May 29, 2024
a6d3e06
Merge branch 'master' into tft-gui-work
mverch67 May 31, 2024
7904f07
Merge branch 'master' into tft-gui-work
mverch67 May 31, 2024
aff71f3
Merge branch 'master' into tft-gui-work
mverch67 May 31, 2024
bab1db3
Merge branch 'master' into tft-gui-work
mverch67 May 31, 2024
606e51d
update lib: message acknowlegdgement
mverch67 May 31, 2024
c511b8b
Merge branch 'master' into tft-gui-work
mverch67 Jun 1, 2024
e772ead
fix unPhone-tft compilation
mverch67 May 31, 2024
36ac07c
reduce size of native target
mverch67 Jun 1, 2024
e1d2774
Merge branch 'master' into tft-gui-work
mverch67 Jun 1, 2024
83bd87e
frequency slot setting
mverch67 Jun 1, 2024
ef57929
Merge branch 'master' into tft-gui-work
mverch67 Jun 2, 2024
617cb4b
message alert settings
mverch67 Jun 2, 2024
01a0c52
Merge branch 'master' into tft-gui-work
mverch67 Jun 2, 2024
a4443b4
add TZT 2.0inch ST7789 config
mverch67 Jun 3, 2024
599e148
lib update: fix display issue
mverch67 Jun 3, 2024
4ee414b
Merge branch 'master' into tft-gui-work
mverch67 Jun 3, 2024
30ce5a4
Merge branch 'master' into tft-gui-work
mverch67 Jun 3, 2024
0046f91
Merge branch 'master' into tft-gui-work
mverch67 Jun 4, 2024
2b350ba
Merge branch 'master' into tft-gui-work
mverch67 Jun 4, 2024
ca6b38b
Merge branch 'master' into tft-gui-work
mverch67 Jun 4, 2024
0e6f6e1
Merge branch 'master' into tft-gui-work
mverch67 Jun 5, 2024
dd5f1ba
Merge branch 'master' into tft-gui-work
mverch67 Jun 5, 2024
ed7f631
update lib: channel settings
mverch67 Jun 6, 2024
509e385
update lib: stability
mverch67 Jun 6, 2024
2738af8
update lib: fix channels, add alert
mverch67 Jun 6, 2024
cb5fa5c
update lib: fix active chats
mverch67 Jun 6, 2024
d49fd46
Merge branch 'master' into tft-gui-work
mverch67 Jun 6, 2024
a613e74
update lib: fix DEL chat button
mverch67 Jun 7, 2024
57d47a0
tweak t-deck defaults
mverch67 Jun 7, 2024
6c00fe5
Merge branch 'master' into tft-gui-work
mverch67 Jun 7, 2024
b5155cc
Merge branch 'master' into tft-gui-work
mverch67 Jun 7, 2024
bc32dfb
update lib: added latin-1 extended font
mverch67 Jun 7, 2024
320a052
update lib: frequency slot defaults
mverch67 Jun 8, 2024
bf7d61c
Merge branch 'master' into tft-gui-work
mverch67 Jun 9, 2024
007237d
update lib: fix channels
mverch67 Jun 9, 2024
105258e
Merge branch 'master' into tft-gui-work
mverch67 Jun 9, 2024
cf8a04f
Merge branch 'master' into tft-gui-work
mverch67 Jun 9, 2024
ad36ad9
update lib: channel deletion and fix
mverch67 Jun 9, 2024
63e5ea5
fix unphone display and touch calibration
mverch67 Jun 10, 2024
21a93a4
update lib: unphone display fixes
mverch67 Jun 10, 2024
2eba053
Merge branch 'master' into tft-gui-work
mverch67 Jun 10, 2024
73311dd
Merge branch 'master' into tft-gui-work
mverch67 Jun 10, 2024
f488193
update lib: node details
mverch67 Jun 10, 2024
a527465
warning: extra tokens at end of #ifdef directive
caveman99 Jun 11, 2024
cd9665c
Merge branch 'master' into tft-gui-work
mverch67 Jun 12, 2024
eac27df
Merge branch 'master' into tft-gui-work
mverch67 Jun 12, 2024
caca1ed
Merge branch 'master' into tft-gui-work
mverch67 Jun 12, 2024
470f5f2
Merge branch 'master' into tft-gui-work
mverch67 Jun 13, 2024
e6f7314
update HWid unphone
mverch67 Jun 13, 2024
106f228
update lib: node options part 1
mverch67 Jun 14, 2024
dd1bfb6
Merge branch 'master' into tft-gui-work
mverch67 Jun 14, 2024
f022d46
Merge branch 'master' into tft-gui-work
mverch67 Jun 14, 2024
f7a4f51
Merge branch 'master' into tft-gui-work
mverch67 Jun 14, 2024
8a2e29d
Merge branch 'master' into tft-gui-work
mverch67 Jun 15, 2024
2081278
Merge branch 'master' into tft-gui-work
mverch67 Jun 15, 2024
696eaa2
Merge branch 'master' into tft-gui-work
mverch67 Jun 16, 2024
cf1f003
lib update: node options + localisation preparations
mverch67 Jun 16, 2024
f6fa649
update lib: textarea and keyboard fixes
mverch67 Jun 16, 2024
fc80c3b
Merge branch 'master' into tft-gui-work
mverch67 Jun 16, 2024
2c2dfcf
reduce load of TFT task
mverch67 Jun 17, 2024
58102ac
exclude inputbroker fixes crash
mverch67 Jun 17, 2024
5936d0c
Merge branch 'master' into tft-gui-work
mverch67 Jun 17, 2024
d5d4312
Merge branch 'master' into tft-gui-work
mverch67 Jun 18, 2024
bebee05
add ext notification module to portduino
mverch67 Jun 18, 2024
d7d5cd0
give little more time for other threads
mverch67 Jun 18, 2024
d4776d2
lib update: ringtones
mverch67 Jun 18, 2024
2cb83d7
Merge branch 'master' into tft-gui-work
mverch67 Jun 18, 2024
01a1d86
update lib: time display
mverch67 Jun 18, 2024
ffb18db
disable BT when TFT in use
mverch67 Jun 19, 2024
5a6d01a
add comment BT disable
mverch67 Jun 19, 2024
c080b0f
lib update: bunch of fixes
mverch67 Jun 19, 2024
aec970b
lib update: channel + buzzer fix
mverch67 Jun 19, 2024
008b3c4
Merge branch 'master' into tft-gui-work
mverch67 Jun 20, 2024
179027e
fix wifi/bt connection status
mverch67 Jun 20, 2024
02922c4
lib update: home screen
mverch67 Jun 20, 2024
ca0c9a2
Merge branch 'master' into tft-gui-work
mverch67 Jun 20, 2024
d973d30
Merge branch 'master' into tft-gui-work
mverch67 Jun 21, 2024
963c109
lib update: initial PIComputer support
mverch67 Jun 20, 2024
1f14192
lib update: kbd matrix driver
mverch67 Jun 21, 2024
8423f9d
Merge branch 'master' into tft-gui-work
mverch67 Jun 22, 2024
a29497e
Merge branch 'master' into tft-gui-work
mverch67 Jun 24, 2024
7489e70
gcc option can be removed
mverch67 Jun 24, 2024
5682081
fix MESHTASTIC_EXCLUDE_GPS
mverch67 Jun 24, 2024
669d3b0
add diy TFT build to T3S3 (for tests)
mverch67 Jun 24, 2024
2f2ac71
lib update: generic driver
mverch67 Jun 24, 2024
ad5dbc2
Merge branch 'master' into tft-gui-work
mverch67 Jun 27, 2024
02a4f45
Merge branch 'master' into tft-gui-work
mverch67 Jun 27, 2024
520a8a8
trackball support
mverch67 Jun 27, 2024
5045284
enable buzzer alert for picomputer
mverch67 Jun 27, 2024
fc0e97d
lib update: inputnavigation
mverch67 Jun 27, 2024
e8f293f
Merge branch 'master' into tft-gui-work
mverch67 Jun 27, 2024
1776e99
Merge branch 'master' into tft-gui-work
mverch67 Jun 28, 2024
a57e493
bump up lovyanGFX driver version
mverch67 Jun 28, 2024
d73975c
bump lovyanGFX version
mverch67 Jun 28, 2024
106db1f
Merge branch 'tft-gui-work' of https://github.com/meshtastic/firmware…
mverch67 Jun 28, 2024
bf7f9ba
Merge branch 'master' into tft-gui-work
mverch67 Jun 28, 2024
f1a0da3
Merge branch 'master' into tft-gui-work
mverch67 Jun 28, 2024
ba56d1d
Merge branch 'master' into tft-gui-work
mverch67 Jun 29, 2024
9dc9307
Merge branch 'master' into tft-gui-work
mverch67 Jun 30, 2024
1ccea6a
Merge branch 'master' into tft-gui-work
mverch67 Jun 30, 2024
5cb8283
lib update: PICOmputer fixes
mverch67 Jun 30, 2024
e0d3768
display debug log colors in platformio serial monitor
mverch67 Jun 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "protobufs"]
path = protobufs
url = https://github.com/meshtastic/protobufs.git
[submodule "lib/device-ui"]
path = lib/device-ui
url = https://github.com/meshtastic/device-ui.git
3 changes: 2 additions & 1 deletion arch/nrf52/nrf52.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ lib_deps=
${arduino_base.lib_deps}

lib_ignore =
BluetoothOTA
BluetoothOTA
lvgl
4 changes: 2 additions & 2 deletions arch/portduino/portduino.ini
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ lib_deps =
${env.lib_deps}
${networking_base.lib_deps}
rweather/Crypto@^0.4.0
https://github.com/lovyan03/LovyanGFX.git#5a39989aa2c9492572255b22f033843ec8900233

https://github.com/lovyan03/LovyanGFX.git#6f211f91e10244f143b7c92b0216853647c6f927
build_flags =
${arduino_base.build_flags}
-fPIC
Expand Down
1 change: 1 addition & 0 deletions arch/rp2040/rp2040.ini
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ build_src_filter =

lib_ignore =
BluetoothOTA
lvgl

lib_deps =
${arduino_base.lib_deps}
Expand Down
23 changes: 23 additions & 0 deletions bin/config-dist.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,29 @@ Display:
# Height: 320
# Rotate: true

### SHCHV 3.5 RPi TFT+Touchscreen
# Panel: ILI9486
# spidev: spidev0.0
# BusFrequency: 30000000
# DC: 24
# Reset: 25
# Width: 320
# Height: 480
# OffsetRotate: 2

### TZT 2.0 Inch TFT Display ST7789V 240RGBx320
# Panel: ST7789
# spidev: spidev0.0
# # CS: 8 # can be freely chosen
# BusFrequency: 80000000
# DC: 24 # can be freely chosen
# Width: 320
# Height: 240
# Reset: 25 # can be freely chosen
# Rotate: true
# OffsetRotate: 1
# Invert: true

Touchscreen:
### Note, at least for now, the touchscreen must have a CS pin defined, even if you let Linux manage the CS switching.

Expand Down
4 changes: 2 additions & 2 deletions boards/t-deck.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"extra_flags": [
"-DBOARD_HAS_PSRAM",
"-DARDUINO_USB_CDC_ON_BOOT=1",
"-DARDUINO_USB_MODE=0",
"-DARDUINO_USB_MODE=1",
"-DARDUINO_RUNNING_CORE=1",
"-DARDUINO_EVENT_RUNNING_CORE=0"
"-DARDUINO_EVENT_RUNNING_CORE=1"
],
"f_cpu": "240000000L",
"f_flash": "80000000L",
Expand Down
46 changes: 46 additions & 0 deletions boards/unphone.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"build": {
"arduino": {
"ldscript": "esp32s3_out.ld",
"memory_type": "qio_opi",
"partitions": "default_8MB.csv"
},
"core": "esp32",
"extra_flags": [
"-DBOARD_HAS_PSRAM",
"-DUNPHONE_SPIN=9",
"-DARDUINO_USB_CDC_ON_BOOT=1",
"-DARDUINO_USB_MODE=0",
"-DARDUINO_RUNNING_CORE=1",
"-DARDUINO_EVENT_RUNNING_CORE=1"
],
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "qio",
"hwids": [
["0x16D0", "0x1178"],
["0x303a", "0x1001"]
],
"mcu": "esp32s3",
"variant": "unphone"
},
"connectivity": ["wifi", "bluetooth", "lora"],
"debug": {
"default_tool": "esp-builtin",
"onboard_tools": ["esp-builtin"],
"openocd_target": "esp32s3.cfg"
},
"frameworks": ["arduino", "espidf"],
"name": "unPhone",
"upload": {
"flash_size": "8MB",
"maximum_ram_size": 327680,
"maximum_size": 8323072,
"use_1200bps_touch": true,
"wait_for_upload_port": true,
"require_upload_port": true,
"speed": 921600
},
"url": "https://unphone.net/",
"vendor": "University of Sheffield"
}
1 change: 1 addition & 0 deletions lib/device-ui
Submodule device-ui added at b5a5a1
1 change: 1 addition & 0 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ build_flags = -Wno-missing-field-initializers
-DMESHTASTIC_EXCLUDE_DROPZONE=1

monitor_speed = 115200
monitor_filters = direct

lib_deps =
jgromes/RadioLib@~6.6.0
Expand Down
3 changes: 3 additions & 0 deletions src/configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef HAS_SCREEN
#define HAS_SCREEN 0
#endif
#ifndef HAS_TFT
#define HAS_TFT 0
#endif
#ifndef HAS_WIRE
#define HAS_WIRE 0
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/detect/ScanI2CTwoWire.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
}
break;

SCAN_SIMPLE_CASE(TDECK_KB_ADDR, TDECKKB, "T-Deck keyboard found\n");
// SCAN_SIMPLE_CASE(TDECK_KB_ADDR, TDECKKB, "T-Deck keyboard found\n");
SCAN_SIMPLE_CASE(BBQ10_KB_ADDR, BBQ10KB, "BB Q10 keyboard found\n");
SCAN_SIMPLE_CASE(ST7567_ADDRESS, SCREEN_ST7567, "st7567 display found\n");
#ifdef HAS_NCP5623
Expand Down
2 changes: 1 addition & 1 deletion src/graphics/Screen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1685,7 +1685,7 @@ void Screen::setup()
#endif
serialSinceMsec = millis();

#if ARCH_PORTDUINO
#if ARCH_PORTDUINO && !HAS_TFT
if (settingsMap[touchscreenModule]) {
touchScreenImpl1 =
new TouchScreenImpl1(dispdev->getWidth(), dispdev->getHeight(), static_cast<TFTDisplay *>(dispdev)->getTouch);
Expand Down
4 changes: 4 additions & 0 deletions src/graphics/Screen.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ class Screen
void doDeepSleep() {}
void forceDisplay(bool forceUiUpdate = false) {}
void startFirmwareUpdateScreen() {}
void increaseBrightness() {}
void decreaseBrightness() {}
void setFunctionSymbal(std::string) {}
void removeFunctionSymbal(std::string) {}
void startAlert(const char *) {}
void endAlert() {}
};
Expand Down
29 changes: 20 additions & 9 deletions src/graphics/TFTDisplay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -347,12 +347,12 @@ static LGFX *tft = nullptr;
#include <TFT_eSPI.h> // Graphics and font library for ILI9341 driver chip

static TFT_eSPI *tft = nullptr; // Invoke library, pins defined in User_Setup.h
#elif ARCH_PORTDUINO && HAS_SCREEN != 0
#elif ARCH_PORTDUINO && HAS_SCREEN != 0 && !HAS_TFT
#include <LovyanGFX.hpp> // Graphics and font library for ST7735 driver chip

class LGFX : public lgfx::LGFX_Device
{
lgfx::Panel_LCD *_panel_instance;
lgfx::Panel_Device *_panel_instance;
lgfx::Bus_SPI _bus_instance;

lgfx::ITouch *_touch_instance;
Expand All @@ -366,8 +366,19 @@ class LGFX : public lgfx::LGFX_Device
_panel_instance = new lgfx::Panel_ST7735;
else if (settingsMap[displayPanel] == st7735s)
_panel_instance = new lgfx::Panel_ST7735S;
else if (settingsMap[displayPanel] == st7796)
_panel_instance = new lgfx::Panel_ST7796;
else if (settingsMap[displayPanel] == ili9341)
_panel_instance = new lgfx::Panel_ILI9341;
else if (settingsMap[displayPanel] == ili9488)
_panel_instance = new lgfx::Panel_ILI9488;
else if (settingsMap[displayPanel] == hx8357d)
_panel_instance = new lgfx::Panel_HX8357D;
else {
_panel_instance = new lgfx::Panel_NULL;
LOG_ERROR("Unknown display panel configured!\n");
}

auto buscfg = _bus_instance.config();
buscfg.spi_mode = 0;
buscfg.spi_host = settingsMap[displayspidev];
Expand All @@ -381,12 +392,12 @@ class LGFX : public lgfx::LGFX_Device
LOG_DEBUG("Height: %d, Width: %d \n", settingsMap[displayHeight], settingsMap[displayWidth]);
cfg.pin_cs = settingsMap[displayCS]; // Pin number where CS is connected (-1 = disable)
cfg.pin_rst = settingsMap[displayReset];
cfg.panel_width = settingsMap[displayWidth]; // actual displayable width
cfg.panel_height = settingsMap[displayHeight]; // actual displayable height
cfg.offset_x = settingsMap[displayOffsetX]; // Panel offset amount in X direction
cfg.offset_y = settingsMap[displayOffsetY]; // Panel offset amount in Y direction
cfg.offset_rotation = 0; // Rotation direction value offset 0~7 (4~7 is mirrored)
cfg.invert = settingsMap[displayInvert]; // Set to true if the light/darkness of the panel is reversed
cfg.panel_width = settingsMap[displayWidth]; // actual displayable width
cfg.panel_height = settingsMap[displayHeight]; // actual displayable height
cfg.offset_x = settingsMap[displayOffsetX]; // Panel offset amount in X direction
cfg.offset_y = settingsMap[displayOffsetY]; // Panel offset amount in Y direction
cfg.offset_rotation = settingsMap[displayOffsetRotate]; // Rotation direction value offset 0~7 (4~7 is mirrored)
cfg.invert = settingsMap[displayInvert]; // Set to true if the light/darkness of the panel is reversed

_panel_instance->config(cfg);

Expand All @@ -408,7 +419,7 @@ class LGFX : public lgfx::LGFX_Device
touch_cfg.y_max = settingsMap[displayWidth] - 1;
touch_cfg.pin_int = settingsMap[touchscreenIRQ];
touch_cfg.bus_shared = true;
touch_cfg.offset_rotation = 1;
touch_cfg.offset_rotation = settingsMap[touchscreenRotate];
if (settingsMap[touchscreenI2CAddr] != -1) {
touch_cfg.i2c_addr = settingsMap[touchscreenI2CAddr];
} else {
Expand Down
Loading
Loading