From 7bfdd09dc184e96f6f53b8b86b5801d4dd28c796 Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Mon, 23 Sep 2019 12:29:51 +1000 Subject: [PATCH 1/2] Fix battery ctrl logic --- selfdrive/thermald.py | 65 ++++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/selfdrive/thermald.py b/selfdrive/thermald.py index 6ec659529..1e795b93a 100755 --- a/selfdrive/thermald.py +++ b/selfdrive/thermald.py @@ -155,10 +155,13 @@ def thermald_thread(): # dragonpilot ts_last_ip = 0. + ts_last_update_vars = 0. + ts_last_charging_ctrl = 0. + ip_addr = '255.255.255.255' dragon_charging_ctrl = True if params.get('DragonChargingCtrl') == "1" else False - dragon_charging_max = params.get('DragonCharging') - dragon_discharging_min = params.get('DragonDisCharging') + dragon_charging_max = int(params.get('DragonCharging')) + dragon_discharging_min = int(params.get('DragonDisCharging')) while 1: health = messaging.recv_sock(health_sock, wait=True) @@ -186,23 +189,6 @@ def thermald_thread(): msg.thermal.batteryVoltage = int(f.read()) with open("/sys/class/power_supply/usb/present") as f: msg.thermal.usbOnline = bool(int(f.read())) - # update ip every 5 seconds - ts = sec_since_boot() - if ts - ts_last_ip > 10.: - try: - result = subprocess.check_output(["service", "call", "connectivity", "2"]).strip().split("\n") - except subprocess.CalledProcessError: - return False - - data = ''.join(''.join(w.decode("hex")[::-1] for w in l[14:49].split()) for l in result[1:]) - - if "\x00".join("WIFI") in data: - result = subprocess.check_output(["ifconfig", "wlan0"]) - ip_addr = re.findall(r"inet addr:((\d+\.){3}\d+)", result)[0][0] - else: - ip_addr = '' - ts_last_ip = ts - msg.thermal.ipAddr = ip_addr current_filter.update(msg.thermal.batteryCurrent / 1e6) @@ -294,6 +280,40 @@ def thermald_thread(): thermal_sock.send(msg.to_bytes()) print(msg) + # dragonpilot + 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_max = int(params.get('DragonCharging')) + dragon_discharging_min = int(params.get('DragonDisCharging')) + ts_last_charging_ctrl = ts + + # update ip every 10 seconds + if ts - ts_last_ip > 10.: + try: + result = subprocess.check_output(["service", "call", "connectivity", "2"]).strip().split("\n") + except subprocess.CalledProcessError: + return False + + data = ''.join(''.join(w.decode("hex")[::-1] for w in l[14:49].split()) for l in result[1:]) + + if "\x00".join("WIFI") in data: + result = subprocess.check_output(["ifconfig", "wlan0"]) + ip_addr = re.findall(r"inet addr:((\d+\.){3}\d+)", result)[0][0] + else: + ip_addr = 'N/A' + ts_last_ip = ts + msg.thermal.ipAddr = "IP: %s" % ip_addr + + # we only update charging status once per min + if dragon_charging_ctrl and ts - ts_last_charging_ctrl > 60.: + if msg.thermal.batteryPercent >= dragon_charging_max: + os.system('echo "0" > /sys/class/power_supply/battery/charging_enabled') + if msg.thermal.batteryPercent <= dragon_discharging_min: + os.system('echo "1" > /sys/class/power_supply/battery/charging_enabled') + ts_last_charging_ctrl = ts + # report to server once per minute if (count % int(60. / DT_TRML)) == 0: cloudlog.event("STATUS_PACKET", @@ -302,13 +322,6 @@ def thermald_thread(): location=(location.to_dict() if location else None), thermal=msg.to_dict()) - # we only update charging status once per min - if dragon_charging_ctrl: - if msg.thermal.batteryPercent >= dragon_charging_max: - os.system('echo "0" > /sys/class/power_supply/battery/charging_enabled') - if msg.thermal.batteryPercent <= dragon_discharging_min: - os.system('echo "1" > /sys/class/power_supply/battery/charging_enabled') - count += 1 From 2463873b145c2b21a52e60801fa8f61b35d0ef53 Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Mon, 23 Sep 2019 12:35:44 +1000 Subject: [PATCH 2/2] Add Taiwan Prius 4.5 FP, by Lin Hsin Hung --- selfdrive/car/toyota/values.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/selfdrive/car/toyota/values.py b/selfdrive/car/toyota/values.py index dad8123c1..90c153d43 100644 --- a/selfdrive/car/toyota/values.py +++ b/selfdrive/car/toyota/values.py @@ -101,6 +101,10 @@ FINGERPRINTS = { # with ipas 36: 8, 37: 8, 166: 8, 170: 8, 180: 8, 295: 8, 296: 8, 426: 6, 452: 8, 466: 8, 467: 8, 512: 6, 513: 6, 550: 8, 552: 4, 560: 7, 562: 6, 581: 5, 608: 8, 610: 8, 614: 8, 643: 7, 658: 8, 713: 8, 740: 5, 742: 8, 743: 8, 800: 8, 810: 2, 814: 8, 824: 2, 829: 2, 830: 7, 835: 8, 836: 8, 845: 5, 863: 8, 869: 7, 870: 7, 871: 2,898: 8, 900: 6, 902: 6, 905: 8, 913: 8, 918: 8, 921: 8, 933: 8, 944: 8, 945: 8, 950: 8, 951: 8, 953: 8, 955: 8, 956: 8, 971: 7, 974: 8, 975: 5, 993: 8, 998: 5, 999: 7, 1000: 8, 1001: 8, 1005: 2, 1014: 8, 1017: 8, 1020: 8, 1041: 8, 1042: 8, 1044: 8, 1056: 8, 1057: 8, 1059: 1, 1071: 8, 1076: 8, 1077: 8, 1082: 8, 1083: 8, 1084: 8, 1085: 8, 1086: 8, 1114: 8, 1132: 8, 1161: 8, 1162: 8, 1163: 8, 1164: 8, 1165: 8, 1166: 8, 1167: 8, 1175: 8, 1227: 8, 1228: 8, 1235: 8, 1237: 8, 1264: 8, 1279: 8, 1552: 8, 1553: 8, 1556: 8, 1557: 8, 1568: 8, 1570: 8, 1571: 8, 1572: 8, 1595: 8, 1777: 8, 1779: 8, 1904: 8, 1912: 8, 1990: 8, 1998: 8 }, + { + # Taiwan Prius 4.5 + 36: 8, 37: 8, 166: 8, 170: 8, 180: 8, 295: 8, 296: 8, 426: 6, 452: 8, 466: 8, 467: 8, 512: 6, 513: 6, 550: 8, 552: 4, 560: 7, 562: 6, 581: 5, 608: 8, 610: 8, 643: 7, 713: 8, 740: 5, 742: 8, 743: 8, 764: 8, 800: 8, 810: 2, 818: 8, 824: 8, 829: 2, 830: 7, 835: 8, 836: 8, 845: 5, 863: 8, 865: 8, 869: 7, 870: 7, 871: 2, 889: 8, 896: 8, 898: 8, 900: 6, 902: 6, 905: 8, 913: 8, 921: 8, 933: 8, 934: 8, 935: 8, 944: 8, 945: 8, 950: 8, 951: 8, 953: 8, 955: 8, 956: 8, 971: 7, 975: 5, 993: 8, 998: 5, 999: 7, 1000: 8, 1001: 8, 1002: 8, 1014: 8, 1017: 8, 1020: 8, 1041: 8, 1042: 8, 1044: 8, 1056: 8, 1057: 8, 1059: 1, 1071: 8, 1076: 8, 1077: 8, 1114: 8, 1161: 8, 1162: 8, 1163: 8, 1164: 8, 1165: 8, 1166: 8, 1167: 8, 1227: 8, 1235: 8, 1237: 8, 1264: 8, 1279: 8, 1552: 8, 1553: 8, 1556: 8, 1557: 8, 1568: 8, 1570: 8, 1571: 8, 1572: 8, 1592: 8, 1595: 8, 1777: 8, 1779: 8, 1786: 8, 1787: 8, 1788: 8, 1789: 8, 1872: 8, 1880: 8, 1904: 8, 1912: 8, 1990: 8, 1998: 8 + }, #2019 LE { 36: 8, 37: 8, 166: 8, 170: 8, 180: 8, 295: 8, 296: 8, 426: 6, 452: 8, 466: 8, 467: 8, 550: 8, 552: 4, 560: 7, 562: 6, 581: 5, 608: 8, 610: 8, 614: 8, 643: 7, 658: 8, 713: 8, 740: 5, 742: 8, 743: 8, 800: 8, 810: 2, 814: 8, 829: 2, 830: 7, 835: 8, 836: 8, 863: 8, 865: 8, 869: 7, 870: 7, 871: 2, 896: 8, 898: 8, 900: 6, 902: 6, 905: 8, 918: 8, 921: 8, 933: 8, 944: 8, 945: 8, 950: 8, 951: 8, 953: 8, 955: 8, 956: 8, 971: 7, 975: 5, 993: 8, 998: 5, 999: 7, 1000: 8, 1001: 8, 1002: 8, 1014: 8, 1017: 8, 1020: 8, 1041: 8, 1042: 8, 1044: 8, 1056: 8, 1057: 8, 1059: 1, 1071: 8, 1076: 8, 1077: 8, 1082: 8, 1083: 8, 1084: 8, 1085: 8, 1086: 8, 1114: 8, 1132: 8, 1161: 8, 1162: 8, 1163: 8, 1175: 8, 1227: 8, 1228: 8, 1235: 8, 1237: 8, 1279: 8, 1552: 8, 1553: 8, 1556: 8, 1557: 8, 1568: 8, 1570: 8, 1571: 8, 1572: 8, 1592: 8, 1595: 8, 1777: 8, 1779: 8, 1904: 8, 1912: 8, 1990: 8, 1998: 8