Merge branch 'devel-en' into devel-zhs

# Conflicts:
#	apk/ai.comma.plus.offroad.apk

common/params.py

@@ -118,7 +118,6 @@ keys = {
   "DragonSteeringMonitorTimer": [TxType.PERSISTENT],
   "DragonCameraOffset": [TxType.PERSISTENT],
   "DragonUIVolumeBoost": [TxType.PERSISTENT],
-  "DragonChargingCtrl": [TxType.PERSISTENT],
 }
 
 

selfdrive/dragonpilot/dragonconf/__init__.py

@@ -38,7 +38,6 @@ default_conf = {
   'DragonSteeringMonitorTimer': '3',
   'DragonCameraOffset': '6',
   'DragonUIVolumeBoost': '0',
-  'DragonChargingCtrl': '0',
 }
 
 deprecated_conf = {

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,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:
-      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
 
     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,26 +277,6 @@ 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')
-
-  return charging_disabled
-
 
 def main(gctx=None):
   thermald_thread()