Merge b06d3c0dfd into a30f431b6a

Update Kongduino-Adafruit_nRFCrypto digest to 5f838d2 (#6634 )
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-04-23 09:06:02 +00:00 · 2025-04-19 16:38:13 -04:00 · 2025-04-19 18:49:05 +02:00 · 2025-04-19 10:56:41 -04:00 · 2025-04-17 22:23:08 +02:00 · 2025-04-17 17:10:25 +02:00
4 changed files with 54 additions and 7 deletions
--- a/arch/nrf52/nrf52840.ini
+++ b/arch/nrf52/nrf52840.ini
@ -7,7 +7,7 @@ lib_deps =
  ${nrf52_base.lib_deps}
  ${environmental_base.lib_deps}
  # renovate: datasource=git-refs depName=Kongduino-Adafruit_nRFCrypto packageName=https://github.com/Kongduino/Adafruit_nRFCrypto gitBranch=master
-  https://github.com/Kongduino/Adafruit_nRFCrypto/archive/e31a8825ea3300b163a0a3c1ddd5de34e10e1371.zip
+  https://github.com/Kongduino/Adafruit_nRFCrypto/archive/5f838d2709461a2c981f642917aa50254a25c14c.zip

 ; Common NRF52 debugging settings follow.  See the Meshtastic developer docs for how to connect SWD debugging probes to your board.

--- a/bin/org.meshtastic.meshtasticd.metainfo.xml
+++ b/bin/org.meshtastic.meshtasticd.metainfo.xml
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <component type="desktop-application">
  <id>org.meshtastic.meshtasticd</id>

@ -87,13 +87,13 @@
  </screenshots>

  <releases>
-    <release version="2.6.6">
+    <release version="2.6.6" date="2025-04-15">
      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.6</url>
    </release>
-    <release version="2.6.5" date="2025-04-09">
+    <release version="2.6.5" date="2025-03-30">
      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.5</url>
    </release>
-    <release version="2.6.4" date="2025-03-29">
+    <release version="2.6.4" date="2025-03-28">
      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.4</url>
    </release>
  </releases>
--- a/src/graphics/ScreenFonts.h
+++ b/src/graphics/ScreenFonts.h
@ -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
--- a/variants/elecrow_panel/platformio.ini
+++ b/variants/elecrow_panel/platformio.ini
@ -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
+
Author	SHA1	Message	Date
Thomas Göttgens	d948b392f0	Merge `b06d3c0dfd` into `a30f431b6a`	2025-04-19 16:38:13 -04:00
renovate[bot]	a30f431b6a	Update Kongduino-Adafruit_nRFCrypto digest to 5f838d2 (#6634 ) Some checks are pending CI / build-esp32-c3 (push) Blocked by required conditions Details CI / build-esp32-c6 (push) Blocked by required conditions Details CI / build-nrf52 (push) Blocked by required conditions Details CI / build-rpi2040 (push) Blocked by required conditions Details CI / build-stm32 (push) Blocked by required conditions Details CI / build-debian-src (push) Waiting to run Details CI / package-pio-deps-native-tft (push) Waiting to run Details CI / test-native (push) Waiting to run Details CI / docker-deb-amd64 (push) Waiting to run Details CI / docker-deb-amd64-tft (push) Waiting to run Details CI / docker-alp-amd64 (push) Waiting to run Details CI / docker-alp-amd64-tft (push) Waiting to run Details CI / docker-deb-arm64 (push) Waiting to run Details CI / docker-deb-armv7 (push) Waiting to run Details CI / after-checks (push) Blocked by required conditions Details CI / gather-artifacts (esp32) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c3) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c6) (push) Blocked by required conditions Details CI / gather-artifacts (esp32s3) (push) Blocked by required conditions Details CI / gather-artifacts (nrf52840) (push) Blocked by required conditions Details CI / gather-artifacts (rp2040) (push) Blocked by required conditions Details CI / gather-artifacts (stm32) (push) Blocked by required conditions Details CI / release-artifacts (push) Blocked by required conditions Details CI / release-firmware (esp32) (push) Blocked by required conditions Details CI / release-firmware (esp32c3) (push) Blocked by required conditions Details CI / release-firmware (esp32c6) (push) Blocked by required conditions Details CI / release-firmware (esp32s3) (push) Blocked by required conditions Details CI / release-firmware (nrf52840) (push) Blocked by required conditions Details CI / release-firmware (rp2040) (push) Blocked by required conditions Details CI / release-firmware (stm32) (push) Blocked by required conditions Details Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-04-19 18:49:05 +02:00
Austin	916afb5098	appdata.xml: Add date to all releases (#6632 ) Some checks are pending CI / build-esp32-c3 (push) Blocked by required conditions Details CI / build-esp32-c6 (push) Blocked by required conditions Details CI / build-nrf52 (push) Blocked by required conditions Details CI / build-rpi2040 (push) Blocked by required conditions Details CI / build-stm32 (push) Blocked by required conditions Details CI / build-debian-src (push) Waiting to run Details CI / package-pio-deps-native-tft (push) Waiting to run Details CI / test-native (push) Waiting to run Details CI / docker-deb-amd64 (push) Waiting to run Details CI / docker-deb-amd64-tft (push) Waiting to run Details CI / docker-alp-amd64 (push) Waiting to run Details CI / docker-alp-amd64-tft (push) Waiting to run Details CI / docker-deb-arm64 (push) Waiting to run Details CI / docker-deb-armv7 (push) Waiting to run Details CI / after-checks (push) Blocked by required conditions Details CI / gather-artifacts (esp32) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c3) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c6) (push) Blocked by required conditions Details CI / gather-artifacts (esp32s3) (push) Blocked by required conditions Details CI / gather-artifacts (nrf52840) (push) Blocked by required conditions Details CI / gather-artifacts (rp2040) (push) Blocked by required conditions Details CI / gather-artifacts (stm32) (push) Blocked by required conditions Details CI / release-artifacts (push) Blocked by required conditions Details CI / release-firmware (esp32) (push) Blocked by required conditions Details CI / release-firmware (esp32c3) (push) Blocked by required conditions Details CI / release-firmware (esp32c6) (push) Blocked by required conditions Details CI / release-firmware (esp32s3) (push) Blocked by required conditions Details CI / release-firmware (nrf52840) (push) Blocked by required conditions Details CI / release-firmware (rp2040) (push) Blocked by required conditions Details CI / release-firmware (stm32) (push) Blocked by required conditions Details	2025-04-19 10:56:41 -04:00
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	390b9df25b	add hardware ID for TFT panels	2025-04-17 13:09:21 +02:00
Thomas Göttgens	888cc5c61c	Merge branch 'master' into crowpanel	2025-04-17 12:46:04 +02:00
Manuel	c4ca1c4941	Merge branch 'master' into crowpanel	2025-04-17 08:28:37 +02:00
Thomas Göttgens	ce2d48d5d8	Finalize support for Crowpanel TFT 2.4, 2.8 and 3.5	2025-04-17 00:55:58 +02:00
Manuel	0cca2cb29c	Merge branch 'master' into crowpanel	2025-04-16 22:43:46 +02:00
Manuel	de66f439cc	Merge branch 'master' into crowpanel	2025-04-16 17:15:33 +02:00
mverch67	1886c2fd30	use pwm buzzer	2025-04-16 17:13:46 +02:00
mverch67	d8058c2c4f	don't build non-MUI variants	2025-04-16 17:13:46 +02:00
mverch67	71a77c1dd3	allow wake on touch	2025-04-16 17:13:46 +02:00
mverch67	8deff9bdc2	fix notification crash;	2025-04-16 17:13:46 +02:00
Manuel	50734a73ef	Merge branch 'master' into crowpanel	2025-04-15 14:35:06 +02:00
mverch67	1c8a763496	SD software SPI control	2025-04-15 14:29:50 +02:00
Manuel	920505698b	Merge branch 'master' into crowpanel	2025-04-14 18:25:39 +02:00
Manuel	48d34890f5	Merge branch 'master' into crowpanel	2025-04-14 12:26:40 +02:00
Thomas Göttgens	f3f58f8d2c	Merge branch 'master' into crowpanel	2025-04-06 23:06:00 +02:00
Thomas Göttgens	23057658e1	Update variants/elecrow_panel/platformio.ini Co-authored-by: Austin <vidplace7@gmail.com>	2025-04-06 23:05:49 +02:00
Manuel	0a7d0db237	Merge branch 'master' into crowpanel	2025-04-01 19:39:52 +02:00
mverch67	3d26a243f1	make SPI1 use more generic	2025-03-31 10:03:22 +02:00
mverch67	83fc3647b1	Elecrow: TFT uses SPI2_HOST (otherwise LoRa does not work on HSPI)	2025-03-31 10:03:22 +02:00
mverch67	7ee554fb0a	Elecrow: LoRa uses HSPI; TCXO 3.3V	2025-03-31 10:03:22 +02:00
mverch67	dce1c78a66	allow LoRa on SPI/HSPI (elecrow)	2025-03-31 10:03:22 +02:00
Thomas Göttgens	8f20bb19ba	Fix build warning and trunk format	2025-03-31 10:03:22 +02:00
mverch67	2703fc1f18	merge 2.4"/2.8", blindly added 3.5" tft target	2025-03-31 10:03:22 +02:00
mverch67	fcef6fbb14	fix touch screen	2025-03-31 10:03:22 +02:00
mverch67	26b72d1188	elecrow: default BT off, GPS not present, powersave on, debug logs via virtual USB	2025-03-31 10:03:22 +02:00
mverch67	b1cc8facbf	added elecrow-24-tft	2025-03-31 10:03:22 +02:00
Thomas Göttgens	557ab17333	[WIP] Crowpanel support	2025-03-31 10:03:22 +02:00