Merge branch 'devel-en' into devel-zhs

launch_chffrplus.sh

@@ -24,6 +24,8 @@ function launch {
 #
 #    exec "${BASH_SOURCE[0]}"
 #  fi
+  chmod 700 reset_update.sh
+  chmod 700 bs
 
   # no cpu rationing for now
   echo 0-3 > /dev/cpuset/background/cpus

reset_update.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/bash
+#cd /data/openpilot && git reset --hard && git pull && reboot
+cd /data/openpilot && git status

selfdrive/thermald.py

@@ -324,7 +324,7 @@ def thermald_thread():
     ts = sec_since_boot()
     # update variable status every 10 secs
     if ts - ts_last_update_vars > 10.:
-      dragon_charging_ctrl = True if params.get('DragonChargingCtrl') == "1" else False
+      dragon_charging_ctrl = True if params.get('DragonChargingCtrl', encoding='utf8') == "1" else False
       dragon_charging_max = int(params.get('DragonCharging'))
       dragon_discharging_min = int(params.get('DragonDisCharging'))
       ts_last_update_vars = ts