Skip to content

Commit 4ad041d

Browse files
committed
set lilygo-t-cameraplus-s3 seconds_to_shutdown to -1
1 parent c80da8a commit 4ad041d

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

main/boards/common/sy6970.cc

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,22 @@ int Sy6970::GetChargeTargetVoltage() {
4444
}
4545

4646
int Sy6970::GetBatteryLevel() {
47-
int battery_minimum_voltage = 3200; // 电池所能掉电的最低电压
47+
int level = 0;
48+
// 电池所能掉电的最低电压
49+
int battery_minimum_voltage = 3200;
4850
int battery_voltage = GetBatteryVoltage();
4951
int charge_voltage_limit = GetChargeTargetVoltage();
52+
ESP_LOGI(TAG, "battery_voltage: %d, charge_voltage_limit: %d", battery_voltage, charge_voltage_limit);
5053
if (battery_voltage > battery_minimum_voltage && charge_voltage_limit > battery_minimum_voltage) {
51-
return (((float) battery_voltage - (float) battery_minimum_voltage) / ((float) charge_voltage_limit - (float) battery_minimum_voltage)) * 100.0;
54+
level = (((float) battery_voltage - (float) battery_minimum_voltage) / ((float) charge_voltage_limit - (float) battery_minimum_voltage)) * 100.0;
5255
}
53-
return 0;
56+
// 不连接电池时读取的充电状态不稳定且battery_voltage有时会超过charge_voltage_limit
57+
if (level > 100) {
58+
level = 100;
59+
}
60+
return level;
5461
}
5562

5663
void Sy6970::PowerOff() {
57-
WriteReg(0x09,0B01100100);
64+
WriteReg(0x09, 0B01100100);
5865
}

main/boards/lilygo-t-cameraplus-s3/lilygo-t-cameraplus-s3.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class LilygoTCameraPlusS3Board : public WifiBoard {
7676
PowerSaveTimer* power_save_timer_;
7777

7878
void InitializePowerSaveTimer() {
79-
power_save_timer_ = new PowerSaveTimer(-1, 60, 300);
79+
power_save_timer_ = new PowerSaveTimer(-1, 60, -1);
8080
power_save_timer_->OnEnterSleepMode([this]() {
8181
ESP_LOGI(TAG, "Enabling sleep mode");
8282
auto display = GetDisplay();

0 commit comments

Comments
 (0)