diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index 05e256285..48c690a17 100755 --- a/selfdrive/controls/controlsd.py +++ b/selfdrive/controls/controlsd.py @@ -563,8 +563,8 @@ def controlsd_thread(sm=None, pm=None, can_sock=None): events.append(create_event('canError', [ET.NO_ENTRY, ET.IMMEDIATE_DISABLE])) if not sounds_available: events.append(create_event('soundsUnavailable', [ET.NO_ENTRY, ET.PERMANENT])) - if internet_needed: - events.append(create_event('internetConnectivityNeeded', [ET.NO_ENTRY, ET.PERMANENT])) + # if internet_needed: + # events.append(create_event('internetConnectivityNeeded', [ET.NO_ENTRY, ET.PERMANENT])) if not dragon_toyota_stock_dsu: # Only allow engagement with brake pressed when stopped behind another stopped car diff --git a/selfdrive/thermald.py b/selfdrive/thermald.py index 6a4f23c4a..6babdbb70 100755 --- a/selfdrive/thermald.py +++ b/selfdrive/thermald.py @@ -232,30 +232,30 @@ def thermald_thread(): # **** starting logic **** # Check for last update time and display alerts if needed - now = datetime.datetime.now() - try: - last_update = datetime.datetime.fromisoformat(params.get("LastUpdateTime", encoding='utf8')) - except (TypeError, ValueError): - last_update = now - dt = now - last_update - - if dt.days > DAYS_NO_CONNECTIVITY_MAX: - if current_connectivity_alert != "expired": - current_connectivity_alert = "expired" - params.delete("Offroad_ConnectivityNeededPrompt") - params.put("Offroad_ConnectivityNeeded", json.dumps(OFFROAD_ALERTS["Offroad_ConnectivityNeeded"])) - elif dt.days > DAYS_NO_CONNECTIVITY_PROMPT: - remaining_time = str(DAYS_NO_CONNECTIVITY_MAX - dt.days) - if current_connectivity_alert != "prompt" + remaining_time: - current_connectivity_alert = "prompt" + remaining_time - alert_connectivity_prompt = copy.copy(OFFROAD_ALERTS["Offroad_ConnectivityNeededPrompt"]) - alert_connectivity_prompt["text"] += remaining_time + " days." - params.delete("Offroad_ConnectivityNeeded") - params.put("Offroad_ConnectivityNeededPrompt", json.dumps(alert_connectivity_prompt)) - elif current_connectivity_alert is not None: - current_connectivity_alert = None - params.delete("Offroad_ConnectivityNeeded") - params.delete("Offroad_ConnectivityNeededPrompt") + # now = datetime.datetime.now() + # try: + # last_update = datetime.datetime.fromisoformat(params.get("LastUpdateTime", encoding='utf8')) + # except (TypeError, ValueError): + # last_update = now + # dt = now - last_update + # + # if dt.days > DAYS_NO_CONNECTIVITY_MAX: + # if current_connectivity_alert != "expired": + # current_connectivity_alert = "expired" + # params.delete("Offroad_ConnectivityNeededPrompt") + # params.put("Offroad_ConnectivityNeeded", json.dumps(OFFROAD_ALERTS["Offroad_ConnectivityNeeded"])) + # elif dt.days > DAYS_NO_CONNECTIVITY_PROMPT: + # remaining_time = str(DAYS_NO_CONNECTIVITY_MAX - dt.days) + # if current_connectivity_alert != "prompt" + remaining_time: + # current_connectivity_alert = "prompt" + remaining_time + # alert_connectivity_prompt = copy.copy(OFFROAD_ALERTS["Offroad_ConnectivityNeededPrompt"]) + # alert_connectivity_prompt["text"] += remaining_time + " days." + # params.delete("Offroad_ConnectivityNeeded") + # params.put("Offroad_ConnectivityNeededPrompt", json.dumps(alert_connectivity_prompt)) + # elif current_connectivity_alert is not None: + # current_connectivity_alert = None + params.delete("Offroad_ConnectivityNeeded") + params.delete("Offroad_ConnectivityNeededPrompt") # start constellation of processes when the car starts ignition = health is not None and health.health.started