From 37f716d27b631d9c801a8c19091a96f916525a0c Mon Sep 17 00:00:00 2001
From: lewishe <lewishe@outlook.com>
Date: Tue, 6 Dec 2022 10:58:59 +0800
Subject: [PATCH 1/2] Change tbeams3-core the default USB mode to TinyUSB

---
 boards/tbeam-s3-core.json | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/boards/tbeam-s3-core.json b/boards/tbeam-s3-core.json
index 82d858df8..06d93c6a0 100644
--- a/boards/tbeam-s3-core.json
+++ b/boards/tbeam-s3-core.json
@@ -1,6 +1,6 @@
 {
   "build": {
-    "arduino":{
+    "arduino": {
       "ldscript": "esp32s3_out.ld"
     },
     "core": "esp32",
@@ -8,9 +8,7 @@
       "-DBOARD_HAS_PSRAM",
       "-DLILYGO_TBEAM_S3_CORE",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_DFU_ON_BOOT=1",
-      "-DARDUINO_USB_MSC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_USB_MODE=0",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],
@@ -45,4 +43,4 @@
   },
   "url": "http://www.lilygo.cn/",
   "vendor": "LilyGo"
-}
+}
\ No newline at end of file

From 63d73383119e1cd7c3bb04d44435183ab298deeb Mon Sep 17 00:00:00 2001
From: lewishe <lewishe@outlook.com>
Date: Tue, 6 Dec 2022 11:01:14 +0800
Subject: [PATCH 2/2] fix tbeams3-core PMU charging cut-off voltage

---
 src/Power.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Power.cpp b/src/Power.cpp
index af10acb5e..3dd3d0e8e 100644
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -455,6 +455,9 @@ bool Power::axpChipInit()
         // Set constant current charging current
         PMU->setChargerConstantCurr(XPOWERS_AXP192_CHG_CUR_450MA);
 
+        //Set up the charging voltage
+        PMU->setChargeTargetVoltage(XPOWERS_AXP192_CHG_VOL_4V2);
+
     } else if (PMU->getChipModel() == XPOWERS_AXP2101) {
 
         // t-beam s3 core 
@@ -507,6 +510,8 @@ bool Power::axpChipInit()
         //Set the constant current charging current of AXP2101, temporarily use 500mA by default
         PMU->setChargerConstantCurr(XPOWERS_AXP2101_CHG_CUR_500MA);
 
+        //Set up the charging voltage
+        PMU->setChargeTargetVoltage(XPOWERS_AXP2101_CHG_VOL_4V2);
     }
     
 
@@ -560,9 +565,6 @@ bool Power::axpChipInit()
     DEBUG_MSG("=======================================================================\n");
 
 
-    //Set up the charging voltage, AXP2101/AXP192 4.2V gear is the same
-    // XPOWERS_AXP192_CHG_VOL_4V2 = XPOWERS_AXP2101_CHG_VOL_4V2
-    PMU->setChargeTargetVoltage(XPOWERS_AXP192_CHG_VOL_4V2);
 
     // Set PMU shutdown voltage at 2.6V to maximize battery utilization
     PMU->setSysPowerDownVoltage(2600);