Merge branch 'master' into crowpanelV2

platformio.ini

@@ -123,7 +123,7 @@ lib_deps =
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/4fb5f24787caa841b58dbf623a52c4c5861d6722.zip
+	https://github.com/meshtastic/device-ui/archive/14dc991a4b57066e0a83599be1a87ff08e5e5308.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]

src/configuration.h

@@ -269,6 +269,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TCA9535_ADDR 0x20
 #define TCA9555_ADDR 0x26
 
+// used for display brightness control
+#define STC8H1K28_ADDR 0x30
+
 // -----------------------------------------------------------------------------
 // Touchscreen
 // -----------------------------------------------------------------------------

src/detect/ScanI2C.h

@@ -61,6 +61,7 @@ class ScanI2C
         NAU7802,
         FT6336U,
         STK8BAXX,
+        STC8H1K28,
         ICM20948,
         SCD4X,
         MAX30102,

src/detect/ScanI2CTwoWire.cpp

@@ -234,6 +234,8 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
 #endif
 #ifdef HAS_LP5562
                 SCAN_SIMPLE_CASE(LP5562_ADDR, LP5562, "LP5562", (uint8_t)addr.address);
+#else
+                SCAN_SIMPLE_CASE(STC8H1K28_ADDR, LP5562, "STC8H1K28", (uint8_t)addr.address);
 #endif
             case XPOWERS_AXP192_AXP2101_ADDRESS:
                 // Do we have the axp2101/192 or the TCA8418

variants/esp32s3/elecrow_panel/platformio.ini

@@ -128,3 +128,6 @@ build_flags =
   ${crowpanel_large_esp32s3_base.build_flags}
   -D VIEW_320x240
   -D DISPLAY_SIZE=800x480 ; landscape mode
+build_src_filter =
+  ${esp32s3_base.build_src_filter}
+  +<../variants/esp32s3/elecrow_panel>

variants/esp32s3/elecrow_panel/variant.cpp

@@ -0,0 +1,21 @@
+// meshtastic/firmware/variants/elecrow_panel/variant.cpp
+
+#include "variant.h"
+#include "Arduino.h"
+#include "Wire.h"
+
+bool elecrow_v2 = false; // false = v1, true = v2
+
+extern "C" {
+
+void initVariant()
+{
+    Wire.begin(I2C_SDA, I2C_SCL, 100000);
+    delay(50);
+    Wire.beginTransmission(0x30);
+    if (Wire.endTransmission() == 0) {
+        elecrow_v2 = true;
+    }
+    Wire.end();
+}
+}

variants/esp32s3/elecrow_panel/variant.h

@@ -1,6 +1,8 @@
 #define I2C_SDA 15
 #define I2C_SCL 16
 
+extern bool elecrow_v2; // false = v1, true = v2
+
 #if CROW_SELECT == 1
 #define WAKE_ON_TOUCH
 #define SCREEN_TOUCH_INT 47
@@ -17,7 +19,7 @@
 #define DAC_I2S_DOUT 12
 #define DAC_I2S_MCLK 8 // don't use GPIO0 because it's assigned to LoRa or button
 #else
-#define PIN_BUZZER 8
+#define PIN_BUZZER (elecrow_v2 ? 0 : 8)
 #endif
 
 // GPS via UART1 connector
@@ -72,7 +74,7 @@
 #define SENSOR_POWER_ON LOW
 #else
 // 4.3", 5.0", 7.0"
-#define LORA_CS 0
+#define LORA_CS (elecrow_v2 ? 8 : 0)
 #define LORA_SCK 5
 #define LORA_MISO 4
 #define LORA_MOSI 6