Update boards.cpp

Xinyuan-LilyGO · Dec 4, 2024 · 100b0a6 · 100b0a6
1 parent 89fecd0
commit 100b0a6
Show file tree

Hide file tree

Showing 47 changed files with 1,316 additions and 376 deletions.
diff --git a/examples/ArduinoLoRa/LoRaReceiver/LoRaBoards.cpp b/examples/ArduinoLoRa/LoRaReceiver/LoRaBoards.cpp
@@ -129,6 +129,7 @@ bool beginPower()
         PMU->disablePowerOutput(XPOWERS_BLDO2);
         PMU->disablePowerOutput(XPOWERS_DLDO1);
         PMU->disablePowerOutput(XPOWERS_DLDO2);
+        PMU->disablePowerOutput(XPOWERS_CPULDO);
 
         // GNSS RTC PowerVDD 3300mV
         PMU->setPowerChannelVoltage(XPOWERS_VBACKUP, 3300);
@@ -341,10 +342,6 @@ void disablePeripherals()
     PMU->disableBattVoltageMeasure();
     PMU->disableTemperatureMeasure();
     PMU->disableBattDetection();
-    // Disable all PMU interrupts
-    PMU->disableIRQ(XPOWERS_AXP2101_ALL_IRQ);
-    // Clear the PMU interrupt status before sleeping, otherwise the sleep current will increase
-    PMU->clearIrqStatus();
 
 #if defined(T_BEAM_S3_BPF)
     PMU->disablePowerOutput(XPOWERS_ALDO4); //gps
@@ -353,10 +350,33 @@ void disablePeripherals()
     PMU->disablePowerOutput(XPOWERS_DCDC5);
     PMU->disablePowerOutput(XPOWERS_ALDO1);
 #else
-    // LoRa VDD
-    PMU->disablePowerOutput(XPOWERS_ALDO2);
-    //GNSS VDD
-    PMU->disablePowerOutput(XPOWERS_ALDO3);
+
+    if (PMU->getChipModel() == XPOWERS_AXP2101) {
+
+        // Disable all PMU interrupts
+        PMU->disableIRQ(XPOWERS_AXP2101_ALL_IRQ);
+        // Clear the PMU interrupt status before sleeping, otherwise the sleep current will increase
+        PMU->clearIrqStatus();
+        // GNSS RTC Power , Turning off GPS backup voltage and current can further reduce ~ 100 uA
+        PMU->disablePowerOutput(XPOWERS_VBACKUP);
+        // LoRa VDD
+        PMU->disablePowerOutput(XPOWERS_ALDO2);
+        // GNSS VDD
+        PMU->disablePowerOutput(XPOWERS_ALDO3);
+
+    } else if (PMU->getChipModel() == XPOWERS_AXP192) {
+
+        // Disable all PMU interrupts
+        PMU->disableIRQ(XPOWERS_AXP192_ALL_IRQ);
+        // Clear the PMU interrupt status before sleeping, otherwise the sleep current will increase
+        PMU->clearIrqStatus();
+        // LoRa VDD
+        PMU->disablePowerOutput(XPOWERS_LDO2);
+        // GNSS VDD
+        PMU->disablePowerOutput(XPOWERS_LDO3);
+
+
+    }
 #endif
 #endif
 }

diff --git a/examples/ArduinoLoRa/LoRaSender/LoRaBoards.cpp b/examples/ArduinoLoRa/LoRaSender/LoRaBoards.cpp
@@ -129,6 +129,7 @@ bool beginPower()
         PMU->disablePowerOutput(XPOWERS_BLDO2);
         PMU->disablePowerOutput(XPOWERS_DLDO1);
         PMU->disablePowerOutput(XPOWERS_DLDO2);
+        PMU->disablePowerOutput(XPOWERS_CPULDO);
 
         // GNSS RTC PowerVDD 3300mV
         PMU->setPowerChannelVoltage(XPOWERS_VBACKUP, 3300);
@@ -341,10 +342,6 @@ void disablePeripherals()
     PMU->disableBattVoltageMeasure();
     PMU->disableTemperatureMeasure();
     PMU->disableBattDetection();
-    // Disable all PMU interrupts
-    PMU->disableIRQ(XPOWERS_AXP2101_ALL_IRQ);
-    // Clear the PMU interrupt status before sleeping, otherwise the sleep current will increase
-    PMU->clearIrqStatus();
 
 #if defined(T_BEAM_S3_BPF)
     PMU->disablePowerOutput(XPOWERS_ALDO4); //gps
@@ -353,10 +350,33 @@ void disablePeripherals()
     PMU->disablePowerOutput(XPOWERS_DCDC5);
     PMU->disablePowerOutput(XPOWERS_ALDO1);
 #else
-    // LoRa VDD
-    PMU->disablePowerOutput(XPOWERS_ALDO2);
-    //GNSS VDD
-    PMU->disablePowerOutput(XPOWERS_ALDO3);
+
+    if (PMU->getChipModel() == XPOWERS_AXP2101) {
+
+        // Disable all PMU interrupts
+        PMU->disableIRQ(XPOWERS_AXP2101_ALL_IRQ);
+        // Clear the PMU interrupt status before sleeping, otherwise the sleep current will increase
+        PMU->clearIrqStatus();
+        // GNSS RTC Power , Turning off GPS backup voltage and current can further reduce ~ 100 uA
+        PMU->disablePowerOutput(XPOWERS_VBACKUP);
+        // LoRa VDD
+        PMU->disablePowerOutput(XPOWERS_ALDO2);
+        // GNSS VDD
+        PMU->disablePowerOutput(XPOWERS_ALDO3);
+
+    } else if (PMU->getChipModel() == XPOWERS_AXP192) {
+
+        // Disable all PMU interrupts
+        PMU->disableIRQ(XPOWERS_AXP192_ALL_IRQ);
+        // Clear the PMU interrupt status before sleeping, otherwise the sleep current will increase
+        PMU->clearIrqStatus();
+        // LoRa VDD
+        PMU->disablePowerOutput(XPOWERS_LDO2);
+        // GNSS VDD
+        PMU->disablePowerOutput(XPOWERS_LDO3);
+
+
+    }
 #endif
 #endif
 }

diff --git a/examples/BPFFactory/LoRaBoards.cpp b/examples/BPFFactory/LoRaBoards.cpp
@@ -129,6 +129,7 @@ bool beginPower()
         PMU->disablePowerOutput(XPOWERS_BLDO2);
         PMU->disablePowerOutput(XPOWERS_DLDO1);
         PMU->disablePowerOutput(XPOWERS_DLDO2);
+        PMU->disablePowerOutput(XPOWERS_CPULDO);
 
         // GNSS RTC PowerVDD 3300mV
         PMU->setPowerChannelVoltage(XPOWERS_VBACKUP, 3300);
@@ -341,10 +342,6 @@ void disablePeripherals()
     PMU->disableBattVoltageMeasure();
     PMU->disableTemperatureMeasure();
     PMU->disableBattDetection();
-    // Disable all PMU interrupts
-    PMU->disableIRQ(XPOWERS_AXP2101_ALL_IRQ);
-    // Clear the PMU interrupt status before sleeping, otherwise the sleep current will increase
-    PMU->clearIrqStatus();
 
 #if defined(T_BEAM_S3_BPF)
     PMU->disablePowerOutput(XPOWERS_ALDO4); //gps
@@ -353,10 +350,33 @@ void disablePeripherals()
     PMU->disablePowerOutput(XPOWERS_DCDC5);
     PMU->disablePowerOutput(XPOWERS_ALDO1);
 #else
-    // LoRa VDD
-    PMU->disablePowerOutput(XPOWERS_ALDO2);
-    //GNSS VDD
-    PMU->disablePowerOutput(XPOWERS_ALDO3);
+
+    if (PMU->getChipModel() == XPOWERS_AXP2101) {
+
+        // Disable all PMU interrupts
+        PMU->disableIRQ(XPOWERS_AXP2101_ALL_IRQ);
+        // Clear the PMU interrupt status before sleeping, otherwise the sleep current will increase
+        PMU->clearIrqStatus();
+        // GNSS RTC Power , Turning off GPS backup voltage and current can further reduce ~ 100 uA
+        PMU->disablePowerOutput(XPOWERS_VBACKUP);
+        // LoRa VDD
+        PMU->disablePowerOutput(XPOWERS_ALDO2);
+        // GNSS VDD
+        PMU->disablePowerOutput(XPOWERS_ALDO3);
+
+    } else if (PMU->getChipModel() == XPOWERS_AXP192) {
+
+        // Disable all PMU interrupts
+        PMU->disableIRQ(XPOWERS_AXP192_ALL_IRQ);
+        // Clear the PMU interrupt status before sleeping, otherwise the sleep current will increase
+        PMU->clearIrqStatus();
+        // LoRa VDD
+        PMU->disablePowerOutput(XPOWERS_LDO2);
+        // GNSS VDD
+        PMU->disablePowerOutput(XPOWERS_LDO3);
+
+
+    }
 #endif
 #endif
 }

diff --git a/examples/Display/Free_Font_Demo/LoRaBoards.cpp b/examples/Display/Free_Font_Demo/LoRaBoards.cpp
@@ -129,6 +129,7 @@ bool beginPower()
         PMU->disablePowerOutput(XPOWERS_BLDO2);
         PMU->disablePowerOutput(XPOWERS_DLDO1);
         PMU->disablePowerOutput(XPOWERS_DLDO2);
+        PMU->disablePowerOutput(XPOWERS_CPULDO);
 
         // GNSS RTC PowerVDD 3300mV
         PMU->setPowerChannelVoltage(XPOWERS_VBACKUP, 3300);
@@ -341,10 +342,6 @@ void disablePeripherals()
     PMU->disableBattVoltageMeasure();
     PMU->disableTemperatureMeasure();
     PMU->disableBattDetection();
-    // Disable all PMU interrupts
-    PMU->disableIRQ(XPOWERS_AXP2101_ALL_IRQ);
-    // Clear the PMU interrupt status before sleeping, otherwise the sleep current will increase
-    PMU->clearIrqStatus();
 
 #if defined(T_BEAM_S3_BPF)
     PMU->disablePowerOutput(XPOWERS_ALDO4); //gps
@@ -353,10 +350,33 @@ void disablePeripherals()
     PMU->disablePowerOutput(XPOWERS_DCDC5);
     PMU->disablePowerOutput(XPOWERS_ALDO1);
 #else
-    // LoRa VDD
-    PMU->disablePowerOutput(XPOWERS_ALDO2);
-    //GNSS VDD
-    PMU->disablePowerOutput(XPOWERS_ALDO3);
+
+    if (PMU->getChipModel() == XPOWERS_AXP2101) {
+
+        // Disable all PMU interrupts
+        PMU->disableIRQ(XPOWERS_AXP2101_ALL_IRQ);
+        // Clear the PMU interrupt status before sleeping, otherwise the sleep current will increase
+        PMU->clearIrqStatus();
+        // GNSS RTC Power , Turning off GPS backup voltage and current can further reduce ~ 100 uA
+        PMU->disablePowerOutput(XPOWERS_VBACKUP);
+        // LoRa VDD
+        PMU->disablePowerOutput(XPOWERS_ALDO2);
+        // GNSS VDD
+        PMU->disablePowerOutput(XPOWERS_ALDO3);
+
+    } else if (PMU->getChipModel() == XPOWERS_AXP192) {
+
+        // Disable all PMU interrupts
+        PMU->disableIRQ(XPOWERS_AXP192_ALL_IRQ);
+        // Clear the PMU interrupt status before sleeping, otherwise the sleep current will increase
+        PMU->clearIrqStatus();
+        // LoRa VDD
+        PMU->disablePowerOutput(XPOWERS_LDO2);
+        // GNSS VDD
+        PMU->disablePowerOutput(XPOWERS_LDO3);
+
+
+    }
 #endif
 #endif
 }

diff --git a/examples/Display/TBeam_TFT_Shield/LoRaBoards.cpp b/examples/Display/TBeam_TFT_Shield/LoRaBoards.cpp
@@ -129,6 +129,7 @@ bool beginPower()
         PMU->disablePowerOutput(XPOWERS_BLDO2);
         PMU->disablePowerOutput(XPOWERS_DLDO1);
         PMU->disablePowerOutput(XPOWERS_DLDO2);
+        PMU->disablePowerOutput(XPOWERS_CPULDO);
 
         // GNSS RTC PowerVDD 3300mV
         PMU->setPowerChannelVoltage(XPOWERS_VBACKUP, 3300);
@@ -341,10 +342,6 @@ void disablePeripherals()
     PMU->disableBattVoltageMeasure();
     PMU->disableTemperatureMeasure();
     PMU->disableBattDetection();
-    // Disable all PMU interrupts
-    PMU->disableIRQ(XPOWERS_AXP2101_ALL_IRQ);
-    // Clear the PMU interrupt status before sleeping, otherwise the sleep current will increase
-    PMU->clearIrqStatus();
 
 #if defined(T_BEAM_S3_BPF)
     PMU->disablePowerOutput(XPOWERS_ALDO4); //gps
@@ -353,10 +350,33 @@ void disablePeripherals()
     PMU->disablePowerOutput(XPOWERS_DCDC5);
     PMU->disablePowerOutput(XPOWERS_ALDO1);
 #else
-    // LoRa VDD
-    PMU->disablePowerOutput(XPOWERS_ALDO2);
-    //GNSS VDD
-    PMU->disablePowerOutput(XPOWERS_ALDO3);
+
+    if (PMU->getChipModel() == XPOWERS_AXP2101) {
+
+        // Disable all PMU interrupts
+        PMU->disableIRQ(XPOWERS_AXP2101_ALL_IRQ);
+        // Clear the PMU interrupt status before sleeping, otherwise the sleep current will increase
+        PMU->clearIrqStatus();
+        // GNSS RTC Power , Turning off GPS backup voltage and current can further reduce ~ 100 uA
+        PMU->disablePowerOutput(XPOWERS_VBACKUP);
+        // LoRa VDD
+        PMU->disablePowerOutput(XPOWERS_ALDO2);
+        // GNSS VDD
+        PMU->disablePowerOutput(XPOWERS_ALDO3);
+
+    } else if (PMU->getChipModel() == XPOWERS_AXP192) {
+
+        // Disable all PMU interrupts
+        PMU->disableIRQ(XPOWERS_AXP192_ALL_IRQ);
+        // Clear the PMU interrupt status before sleeping, otherwise the sleep current will increase
+        PMU->clearIrqStatus();
+        // LoRa VDD
+        PMU->disablePowerOutput(XPOWERS_LDO2);
+        // GNSS VDD
+        PMU->disablePowerOutput(XPOWERS_LDO3);
+
+
+    }
 #endif
 #endif
 }

diff --git a/examples/Display/TFT_Char_times/LoRaBoards.cpp b/examples/Display/TFT_Char_times/LoRaBoards.cpp
@@ -129,6 +129,7 @@ bool beginPower()
         PMU->disablePowerOutput(XPOWERS_BLDO2);
         PMU->disablePowerOutput(XPOWERS_DLDO1);
         PMU->disablePowerOutput(XPOWERS_DLDO2);
+        PMU->disablePowerOutput(XPOWERS_CPULDO);
 
         // GNSS RTC PowerVDD 3300mV
         PMU->setPowerChannelVoltage(XPOWERS_VBACKUP, 3300);
@@ -341,10 +342,6 @@ void disablePeripherals()
     PMU->disableBattVoltageMeasure();
     PMU->disableTemperatureMeasure();
     PMU->disableBattDetection();
-    // Disable all PMU interrupts
-    PMU->disableIRQ(XPOWERS_AXP2101_ALL_IRQ);
-    // Clear the PMU interrupt status before sleeping, otherwise the sleep current will increase
-    PMU->clearIrqStatus();
 
 #if defined(T_BEAM_S3_BPF)
     PMU->disablePowerOutput(XPOWERS_ALDO4); //gps
@@ -353,10 +350,33 @@ void disablePeripherals()
     PMU->disablePowerOutput(XPOWERS_DCDC5);
     PMU->disablePowerOutput(XPOWERS_ALDO1);
 #else
-    // LoRa VDD
-    PMU->disablePowerOutput(XPOWERS_ALDO2);
-    //GNSS VDD
-    PMU->disablePowerOutput(XPOWERS_ALDO3);
+
+    if (PMU->getChipModel() == XPOWERS_AXP2101) {
+
+        // Disable all PMU interrupts
+        PMU->disableIRQ(XPOWERS_AXP2101_ALL_IRQ);
+        // Clear the PMU interrupt status before sleeping, otherwise the sleep current will increase
+        PMU->clearIrqStatus();
+        // GNSS RTC Power , Turning off GPS backup voltage and current can further reduce ~ 100 uA
+        PMU->disablePowerOutput(XPOWERS_VBACKUP);
+        // LoRa VDD
+        PMU->disablePowerOutput(XPOWERS_ALDO2);
+        // GNSS VDD
+        PMU->disablePowerOutput(XPOWERS_ALDO3);
+
+    } else if (PMU->getChipModel() == XPOWERS_AXP192) {
+
+        // Disable all PMU interrupts
+        PMU->disableIRQ(XPOWERS_AXP192_ALL_IRQ);
+        // Clear the PMU interrupt status before sleeping, otherwise the sleep current will increase
+        PMU->clearIrqStatus();
+        // LoRa VDD
+        PMU->disablePowerOutput(XPOWERS_LDO2);
+        // GNSS VDD
+        PMU->disablePowerOutput(XPOWERS_LDO3);
+
+
+    }
 #endif
 #endif
 }

diff --git a/examples/Display/UTFT_demo/LoRaBoards.cpp b/examples/Display/UTFT_demo/LoRaBoards.cpp
@@ -129,6 +129,7 @@ bool beginPower()
         PMU->disablePowerOutput(XPOWERS_BLDO2);
         PMU->disablePowerOutput(XPOWERS_DLDO1);
         PMU->disablePowerOutput(XPOWERS_DLDO2);
+        PMU->disablePowerOutput(XPOWERS_CPULDO);
 
         // GNSS RTC PowerVDD 3300mV
         PMU->setPowerChannelVoltage(XPOWERS_VBACKUP, 3300);
@@ -341,10 +342,6 @@ void disablePeripherals()
     PMU->disableBattVoltageMeasure();
     PMU->disableTemperatureMeasure();
     PMU->disableBattDetection();
-    // Disable all PMU interrupts
-    PMU->disableIRQ(XPOWERS_AXP2101_ALL_IRQ);
-    // Clear the PMU interrupt status before sleeping, otherwise the sleep current will increase
-    PMU->clearIrqStatus();
 
 #if defined(T_BEAM_S3_BPF)
     PMU->disablePowerOutput(XPOWERS_ALDO4); //gps
@@ -353,10 +350,33 @@ void disablePeripherals()
     PMU->disablePowerOutput(XPOWERS_DCDC5);
     PMU->disablePowerOutput(XPOWERS_ALDO1);
 #else
-    // LoRa VDD
-    PMU->disablePowerOutput(XPOWERS_ALDO2);
-    //GNSS VDD
-    PMU->disablePowerOutput(XPOWERS_ALDO3);
+
+    if (PMU->getChipModel() == XPOWERS_AXP2101) {
+
+        // Disable all PMU interrupts
+        PMU->disableIRQ(XPOWERS_AXP2101_ALL_IRQ);
+        // Clear the PMU interrupt status before sleeping, otherwise the sleep current will increase
+        PMU->clearIrqStatus();
+        // GNSS RTC Power , Turning off GPS backup voltage and current can further reduce ~ 100 uA
+        PMU->disablePowerOutput(XPOWERS_VBACKUP);
+        // LoRa VDD
+        PMU->disablePowerOutput(XPOWERS_ALDO2);
+        // GNSS VDD
+        PMU->disablePowerOutput(XPOWERS_ALDO3);
+
+    } else if (PMU->getChipModel() == XPOWERS_AXP192) {
+
+        // Disable all PMU interrupts
+        PMU->disableIRQ(XPOWERS_AXP192_ALL_IRQ);
+        // Clear the PMU interrupt status before sleeping, otherwise the sleep current will increase
+        PMU->clearIrqStatus();
+        // LoRa VDD
+        PMU->disablePowerOutput(XPOWERS_LDO2);
+        // GNSS VDD
+        PMU->disablePowerOutput(XPOWERS_LDO3);
+
+
+    }
 #endif
 #endif
 }