brianhansonxyz
ab9158bfb7
Discard the modelrevert tree adoption (8b4b7e0) and the in-process park short-circuits / cached-output / dashcam-idle work that came with it (0dc8002,37e095e). Restore the clearpilot tree as it stood atd639e28— the parked-controlsd manager-process split, the GPS-disable in locationd, the controlsd UI hooks, the boardd ignition-edge safety_setter_thread fix. After a full /data/params/d wipe and re-calibration drive, the modelrevert-tree variant overcorrected on turns; reverting to the parked-controlsd architecture (which Brian had previously vetted and documented in887b9c9+27cad05) and starting fresh. Single new commit, no merge — file state matchesd639e28byte-for-byte. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
107 lines
3.3 KiB
Python
Executable File
107 lines
3.3 KiB
Python
Executable File
import datetime
|
|
import http.client
|
|
import os
|
|
import socket
|
|
import time
|
|
import urllib.error
|
|
import urllib.request
|
|
|
|
import cereal.messaging as messaging
|
|
|
|
from cereal import car, log
|
|
from openpilot.common.params import Params
|
|
from openpilot.common.realtime import DT_MDL, Priority, config_realtime_process
|
|
from openpilot.common.time import system_time_valid
|
|
from openpilot.system.hardware import HARDWARE
|
|
|
|
from openpilot.selfdrive.frogpilot.controls.frogpilot_planner import FrogPilotPlanner
|
|
from openpilot.selfdrive.frogpilot.controls.lib.frogpilot_functions import FrogPilotFunctions
|
|
from openpilot.selfdrive.frogpilot.controls.lib.model_manager import DEFAULT_MODEL, DEFAULT_MODEL_NAME, download_model, populate_models
|
|
from openpilot.selfdrive.frogpilot.controls.lib.theme_manager import ThemeManager
|
|
|
|
WIFI = log.DeviceState.NetworkType.wifi
|
|
|
|
# clearpilot disabled
|
|
def automatic_update_check(params):
|
|
return
|
|
# update_available = params.get_bool("UpdaterFetchAvailable")
|
|
# update_ready = params.get_bool("UpdateAvailable")
|
|
# update_state = params.get("UpdaterState", encoding='utf8')
|
|
|
|
# if update_ready:
|
|
# HARDWARE.reboot()
|
|
# elif update_available:
|
|
# os.system("pkill -SIGHUP -f selfdrive.updated.updated")
|
|
# elif update_state == "idle":
|
|
# os.system("pkill -SIGUSR1 -f selfdrive.updated.updated")
|
|
|
|
def github_pinged(url="https://github.com", timeout=5):
|
|
try:
|
|
urllib.request.urlopen(url, timeout=timeout)
|
|
return True
|
|
except (urllib.error.URLError, socket.timeout, http.client.RemoteDisconnected):
|
|
return False
|
|
|
|
# clearpilot disabled
|
|
def time_checks(automatic_updates, deviceState, params):
|
|
return
|
|
# if github_pinged():
|
|
# populate_models()
|
|
|
|
# screen_off = deviceState.screenBrightnessPercent == 0
|
|
# wifi_connection = deviceState.networkType == WIFI
|
|
|
|
# if automatic_updates and screen_off and wifi_connection:
|
|
# automatic_update_check(params)
|
|
|
|
def frogpilot_thread():
|
|
config_realtime_process(5, Priority.CTRL_LOW)
|
|
|
|
params = Params()
|
|
params_memory = Params("/dev/shm/params")
|
|
|
|
frogpilot_functions = FrogPilotFunctions()
|
|
theme_manager = ThemeManager()
|
|
|
|
CP = None
|
|
|
|
time_validated = system_time_valid()
|
|
|
|
pm = messaging.PubMaster(['frogpilotPlan'])
|
|
sm = messaging.SubMaster(['carState', 'controlsState', 'deviceState', 'frogpilotCarControl', 'frogpilotNavigation',
|
|
'frogpilotPlan', 'liveLocationKalman', 'longitudinalPlan', 'modelV2', 'radarState'],
|
|
poll='modelV2', ignore_avg_freq=['radarState'])
|
|
|
|
while True:
|
|
sm.update()
|
|
|
|
deviceState = sm['deviceState']
|
|
started = deviceState.started
|
|
|
|
if started:
|
|
if CP is None:
|
|
with car.CarParams.from_bytes(params.get("CarParams", block=True)) as msg:
|
|
CP = msg
|
|
frogpilot_planner = FrogPilotPlanner(CP)
|
|
frogpilot_planner.update_frogpilot_params()
|
|
|
|
if sm.updated['modelV2']:
|
|
frogpilot_planner.update(sm['carState'], sm['controlsState'], sm['frogpilotCarControl'], sm['frogpilotNavigation'],
|
|
sm['liveLocationKalman'], sm['modelV2'], sm['radarState'])
|
|
frogpilot_planner.publish(sm, pm)
|
|
|
|
if not time_validated:
|
|
time_validated = system_time_valid()
|
|
if not time_validated:
|
|
continue
|
|
|
|
time.sleep(DT_MDL)
|
|
|
|
|
|
|
|
def main():
|
|
frogpilot_thread()
|
|
|
|
if __name__ == "__main__":
|
|
main()
|