Adaptation for charging function being off by default. (#123)

OneKeyHQ · Jun 7, 2024 · 1337282 · 1337282
1 parent dcb3708
commit 1337282
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/core/src/trezor/uart.py b/core/src/trezor/uart.py
@@ -621,11 +621,11 @@ def ctrl_charge_switch(enable: bool) -> None:
     @param enable: True to open, False to close
     """
     if enable:
-        if not utils.CHARGE_ENABLE:
+        if utils.CHARGE_ENABLE is None or not utils.CHARGE_ENABLE:
             BLE_CTRL.ctrl(0x82, b"\x06")
             utils.CHARGE_ENABLE = True
     else:
-        if utils.CHARGE_ENABLE:
+        if utils.CHARGE_ENABLE is None or utils.CHARGE_ENABLE:
             BLE_CTRL.ctrl(0x82, b"\x07")
             utils.CHARGE_ENABLE = False
 
@@ -634,15 +634,6 @@ def ctrl_wireless_charge(enable: bool) -> None:
     """Request to open or close charge.
     @param enable: True to open, False to close
     """
-    if enable:
-        if (
-            utils.CHARGE_WIRELESS_STATUS != utils.CHARGE_WIRELESS_STOP
-            and not utils.CHARGE_ENABLE
-        ):
-            ctrl_charge_switch(True)
-    else:
-        if (
-            utils.CHARGE_WIRELESS_STATUS != utils.CHARGE_WIRELESS_STOP
-            and utils.CHARGE_ENABLE
-        ):
-            ctrl_charge_switch(False)
+    if utils.CHARGE_WIRELESS_STATUS == utils.CHARGE_WIRELESS_STOP:
+        return
+    ctrl_charge_switch(enable)
diff --git a/core/src/trezor/utils.py b/core/src/trezor/utils.py
@@ -77,7 +77,7 @@ def board_version() -> str:
 CHARGE_WIRELESS_START = const(1)
 CHARGE_WIRELESS_CHARGING = const(2)
 CHARGE_WIRELESS_STATUS = CHARGE_WIRELESS_STOP
-CHARGE_ENABLE = True
+CHARGE_ENABLE: bool | None = None
 CHARGING = False
 
 if __debug__: