Merge branch 'master' into support-rak14004

variants/tbeam-s3-core/pins_arduino.h

@@ -25,5 +25,12 @@ static const uint8_t MOSI  = 11;
 static const uint8_t MISO  = 13;
 static const uint8_t SCK   = 12;
 
+#define SDMMC_CMD                   (35)
+#define SDMMC_CLK                   (36)
+#define SDMMC_DATA                  (37)
+
+#define ACCEL_INT1                  (34)
+#define ACCEL_INT2                  (33)
+#define RTC_INT                     (14)
 
 #endif /* Pins_Arduino_h */

variants/tbeam-s3-core/platformio.ini

@@ -5,7 +5,9 @@ board = tbeam-s3-core
 
 lib_deps =
   ${esp32s3_base.lib_deps}
+  lewisxhe/PCF8563_Library@1.0.1
+
 build_flags = 
   ${esp32s3_base.build_flags} 
   -Ivariants/tbeam-s3-core
-
+  -DPCF8563_RTC=0x51            ;Putting definitions in variant.h does not compile correctly

variants/tbeam-s3-core/variant.h

@@ -1,12 +1,18 @@
 // #define BUTTON_NEED_PULLUP // if set we need to turn on the internal CPU pullup during sleep
 
-#define I2C_SDA         42
-#define I2C_SCL         41
+#define I2C_SDA1         42         //Used for PMU management
+#define I2C_SCL1         41         //Used for PMU management
+
+#define I2C_SDA          17         //For sensors and screens
+#define I2C_SCL          18         //For sensors and screens
 
 #define BUTTON_PIN      0     // The middle button GPIO on the T-Beam S3
 //#define BUTTON_PIN_ALT 13 // Alternate GPIO for an external button if needed. Does anyone use this? It is not documented anywhere.
 // #define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Module.
 
+#define BUTTON1_PIN     47      //Additional keys
+
+
 #define LED_INVERTED    1
 // #define LED_PIN 4 // Newer tbeams (1.1) have an extra led on GPIO4
 
@@ -36,6 +42,9 @@
 // #define PMU_IRQ 40
 #define HAS_AXP2101
 
+// Specify the PMU as Wire1. In the t-beam-s3-core, the PMU enjoys a separate bus
+#define PMU_USE_WIRE1
+
 #define RF95_SCK        12
 #define RF95_MISO       13
 #define RF95_MOSI       11
@@ -47,3 +56,10 @@
 #define GPS_1PPS_PIN    6
 
 
+#define HAS_SDCARD  //Have 3-bit SDMMC interface SD card slot
+
+// PCF8563 RTC Module
+// #define PCF8563_RTC 0x51         //Putting definitions in variant. h does not compile correctly
+
+#define HAS_RTC 1
+