From db45c6c91bfb7e8fadbde7d5d8f306aa11bf466b Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Fri, 30 Aug 2019 15:17:17 +1000 Subject: [PATCH 1/4] Revert "update logic" This reverts commit d45a88d5 --- selfdrive/thermald.py | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/selfdrive/thermald.py b/selfdrive/thermald.py index 517733737..1928ba987 100755 --- a/selfdrive/thermald.py +++ b/selfdrive/thermald.py @@ -145,9 +145,6 @@ def thermald_thread(): health_sock.RCVTIMEO = int(1000 * 2 * DT_TRML) # 2x the expected health frequency current_filter = FirstOrderFilter(0., CURRENT_TAU, DT_TRML) health_prev = None - last_charging_disabled = False - last_charging_ctrl = False - charging_ctrl = False # Make sure charging is enabled charging_disabled = False @@ -260,11 +257,10 @@ def thermald_thread(): os.system('LD_LIBRARY_PATH="" svc power shutdown') #charging_disabled = check_car_battery_voltage(should_start, health, charging_disabled) - if count % 3 == 0: - charging_ctrl = params.get('DragonChargingCtrl') == "1" - charging_disabled = charging_ctrl(msg.thermal.batteryPercent, charging_disabled, last_charging_disabled, charging_ctrl, last_charging_ctrl) - last_charging_disabled = charging_disabled - last_charging_ctrl = charging_ctrl + print("before logic: %s" % charging_disabled) + if count % 3 == 0 and params.get('DragonChargingCtrl') == "1": + charging_disabled = charging_ctrl(msg.thermal.batteryPercent, charging_disabled) + print("in logic: %s" % charging_disabled) msg.thermal.chargingDisabled = charging_disabled msg.thermal.chargingError = current_filter.x > 0. and msg.thermal.batteryPercent < 90 # if current is positive, then battery is being discharged @@ -285,24 +281,13 @@ def thermald_thread(): count += 1 -def charging_ctrl(battery_percent, charging_disabled, last_charging_disabled, charging_ctrl, last_charging_ctrl): - if charging_ctrl: - if not charging_disabled and battery_percent >= 80: - os.system('echo "0" > /sys/class/power_supply/battery/charging_enabled') - charging_disabled = True - elif charging_disabled and battery_percent <= 60: - os.system('echo "1" > /sys/class/power_supply/battery/charging_enabled') - charging_disabled = False - else: - if not last_charging_ctrl == charging_ctrl: - os.system('echo "1" > /sys/class/power_supply/battery/charging_enabled') - charging_disabled = False - elif not last_charging_disabled == charging_disabled: - if charging_disabled: - os.system('echo "0" > /sys/class/power_supply/battery/charging_enabled') - else: - os.system('echo "1" > /sys/class/power_supply/battery/charging_enabled') - +def charging_ctrl(battery_percent, charging_disabled): + if not charging_disabled and battery_percent >= 80: + os.system('echo "0" > /sys/class/power_supply/battery/charging_enabled') + charging_disabled = True + elif charging_disabled and battery_percent <= 60: + os.system('echo "1" > /sys/class/power_supply/battery/charging_enabled') + charging_disabled = False return charging_disabled From a1396773869315f731b357eb2f46ebe8c0683f8c Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Fri, 30 Aug 2019 15:17:27 +1000 Subject: [PATCH 2/4] =?UTF-8?q?Revert=20"=E4=BF=AE=E6=AD=A3"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 80e24f20 --- selfdrive/thermald.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/selfdrive/thermald.py b/selfdrive/thermald.py index 1928ba987..78bef3118 100755 --- a/selfdrive/thermald.py +++ b/selfdrive/thermald.py @@ -257,10 +257,8 @@ def thermald_thread(): os.system('LD_LIBRARY_PATH="" svc power shutdown') #charging_disabled = check_car_battery_voltage(should_start, health, charging_disabled) - print("before logic: %s" % charging_disabled) if count % 3 == 0 and params.get('DragonChargingCtrl') == "1": charging_disabled = charging_ctrl(msg.thermal.batteryPercent, charging_disabled) - print("in logic: %s" % charging_disabled) msg.thermal.chargingDisabled = charging_disabled msg.thermal.chargingError = current_filter.x > 0. and msg.thermal.batteryPercent < 90 # if current is positive, then battery is being discharged @@ -284,11 +282,10 @@ def thermald_thread(): def charging_ctrl(battery_percent, charging_disabled): if not charging_disabled and battery_percent >= 80: os.system('echo "0" > /sys/class/power_supply/battery/charging_enabled') - charging_disabled = True + return True elif charging_disabled and battery_percent <= 60: os.system('echo "1" > /sys/class/power_supply/battery/charging_enabled') - charging_disabled = False - return charging_disabled + return False def main(gctx=None): From 5992179d681179c7f2980547f70ab7b472b79b80 Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Fri, 30 Aug 2019 15:17:34 +1000 Subject: [PATCH 3/4] =?UTF-8?q?Revert=20"=E6=9B=B4=E6=96=B0APK"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 80a88170 From 0573aa7cea8755ebc0d8cd899ea77f314305aebb Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Fri, 30 Aug 2019 15:17:45 +1000 Subject: [PATCH 4/4] =?UTF-8?q?Revert=20"=E5=8A=A0=E5=85=A5=E9=9B=BB?= =?UTF-8?q?=E6=B1=A0=E5=85=85=E9=9B=BB=E4=BF=9D=E8=AD=B7"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4151d152 --- common/params.py | 1 - selfdrive/dragonpilot/dragonconf/__init__.py | 1 - selfdrive/thermald.py | 10 ---------- 3 files changed, 12 deletions(-) diff --git a/common/params.py b/common/params.py index a6dd855eb..776e3b337 100755 --- a/common/params.py +++ b/common/params.py @@ -118,7 +118,6 @@ keys = { "DragonSteeringMonitorTimer": [TxType.PERSISTENT], "DragonCameraOffset": [TxType.PERSISTENT], "DragonUIVolumeBoost": [TxType.PERSISTENT], - "DragonChargingCtrl": [TxType.PERSISTENT], } diff --git a/selfdrive/dragonpilot/dragonconf/__init__.py b/selfdrive/dragonpilot/dragonconf/__init__.py index 81d72095e..b8efbd4a2 100644 --- a/selfdrive/dragonpilot/dragonconf/__init__.py +++ b/selfdrive/dragonpilot/dragonconf/__init__.py @@ -38,7 +38,6 @@ default_conf = { 'DragonSteeringMonitorTimer': '3', 'DragonCameraOffset': '6', 'DragonUIVolumeBoost': '0', - 'DragonChargingCtrl': '0', } deprecated_conf = { diff --git a/selfdrive/thermald.py b/selfdrive/thermald.py index 78bef3118..a087d670f 100755 --- a/selfdrive/thermald.py +++ b/selfdrive/thermald.py @@ -257,8 +257,6 @@ def thermald_thread(): os.system('LD_LIBRARY_PATH="" svc power shutdown') #charging_disabled = check_car_battery_voltage(should_start, health, charging_disabled) - if count % 3 == 0 and params.get('DragonChargingCtrl') == "1": - charging_disabled = charging_ctrl(msg.thermal.batteryPercent, charging_disabled) msg.thermal.chargingDisabled = charging_disabled msg.thermal.chargingError = current_filter.x > 0. and msg.thermal.batteryPercent < 90 # if current is positive, then battery is being discharged @@ -279,14 +277,6 @@ def thermald_thread(): count += 1 -def charging_ctrl(battery_percent, charging_disabled): - if not charging_disabled and battery_percent >= 80: - os.system('echo "0" > /sys/class/power_supply/battery/charging_enabled') - return True - elif charging_disabled and battery_percent <= 60: - os.system('echo "1" > /sys/class/power_supply/battery/charging_enabled') - return False - def main(gctx=None): thermald_thread()