Compare commits

...

4 Commits

Author SHA1 Message Date
Thomas Göttgens
b06d3c0dfd fix braces 2025-04-17 22:23:08 +02:00
Thomas Göttgens
ad4b65c2d4 Merge branch 'master' of https://github.com/meshtastic/firmware into crowpanel
# Conflicts:
#	variants/elecrow_panel/platformio.ini
2025-04-17 17:10:25 +02:00
Thomas Göttgens
ecfa97d068 Add stubs for the bigger panels. WIP! 2025-04-17 17:07:15 +02:00
Thomas Göttgens
ef14967fbf
Crowpanel 2.4,2.8 and 3.5 support (#6355)
Some checks are pending
CI / build-esp32 (push) Blocked by required conditions
CI / build-esp32-s3 (push) Blocked by required conditions
CI / build-esp32-c3 (push) Blocked by required conditions
CI / build-esp32-c6 (push) Blocked by required conditions
CI / build-nrf52 (push) Blocked by required conditions
CI / build-rpi2040 (push) Blocked by required conditions
CI / build-stm32 (push) Blocked by required conditions
CI / build-debian-src (push) Waiting to run
CI / package-pio-deps-native-tft (push) Waiting to run
CI / test-native (push) Waiting to run
CI / docker-debian-amd64 (push) Waiting to run
CI / docker-alpine-amd64 (push) Waiting to run
CI / docker-debian-arm64 (push) Waiting to run
CI / docker-debian-armv7 (push) Waiting to run
CI / after-checks (push) Blocked by required conditions
CI / gather-artifacts (esp32) (push) Blocked by required conditions
CI / gather-artifacts (esp32c3) (push) Blocked by required conditions
CI / gather-artifacts (esp32c6) (push) Blocked by required conditions
CI / gather-artifacts (esp32s3) (push) Blocked by required conditions
CI / gather-artifacts (nrf52840) (push) Blocked by required conditions
CI / gather-artifacts (rp2040) (push) Blocked by required conditions
CI / gather-artifacts (stm32) (push) Blocked by required conditions
CI / release-artifacts (push) Blocked by required conditions
CI / release-firmware (esp32) (push) Blocked by required conditions
CI / release-firmware (esp32c3) (push) Blocked by required conditions
CI / release-firmware (esp32c6) (push) Blocked by required conditions
CI / release-firmware (esp32s3) (push) Blocked by required conditions
CI / release-firmware (nrf52840) (push) Blocked by required conditions
CI / release-firmware (rp2040) (push) Blocked by required conditions
CI / release-firmware (stm32) (push) Blocked by required conditions
Co-authored-by: mverch67 <manuel.verch@gmx.de>
2025-04-17 16:03:37 +02:00
2 changed files with 49 additions and 2 deletions

View File

@ -65,8 +65,8 @@
#endif
#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) || \
defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS)) || \
defined(ILI9488_CS) && !defined(DISPLAY_FORCE_SMALL_FONTS)
defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || \
defined(ILI9488_CS)) && !defined(DISPLAY_FORCE_SMALL_FONTS)
// The screen is bigger so use bigger fonts
#define FONT_SMALL FONT_MEDIUM_LOCAL // Height: 19
#define FONT_MEDIUM FONT_LARGE_LOCAL // Height: 28

View File

@ -121,3 +121,50 @@ build_flags =
-D DISPLAY_SET_RESOLUTION
-D VIEW_320x240
-D MAP_FULL_REDRAW
# 4.3 inch 800x480 IPS ST7265
[env:elecrow-43-tft]
extends = crowpanel_base
board_level = extra
build_flags =
${crowpanel_base.build_flags}
-D TFT_HEIGHT=480
-D TFT_WIDTH=800
-D TFT_OFFSET_X=0
-D TFT_OFFSET_Y=0
-D TFT_BUSY=-1
-D CROW_SELECT=1
# 5 inch 800x480 IPS ST7262
[env:elecrow-50-tft]
extends = crowpanel_base
board_level = extra
build_flags =
${crowpanel_base.build_flags}
-D TFT_HEIGHT=480
-D TFT_WIDTH=800
-D TFT_OFFSET_X=0
-D TFT_OFFSET_Y=0
-D TFT_BUSY=-1
-D CROW_SELECT=2
# 7 inch 800x480 IPS SC7277
[env:elecrow-70-tft]
extends = crowpanel_base
board_level = extra
build_flags =
${crowpanel_base.build_flags}
-D TFT_HEIGHT=480
-D TFT_WIDTH=800
-D TFT_OFFSET_X=0
-D TFT_OFFSET_Y=0
-D TFT_BUSY=-1
-D CROW_SELECT=3
-D LGFX_DRIVER=LGFX_ELECROW70
-D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_ELECROW70.h\"
-D VIEW_800x480
-I lib/device-ui/generated/ui_800x480