mirror of
https://github.com/sunnypilot/sunnypilot.git
synced 2026-02-19 20:33:53 +08:00
* Squashed commit of the following:
commit 953bcf0ecf8d03f0fec9ce0d5442cc660ae2347d
Merge: b4198608d efd04715e
Author: Shane Smiskol <shane@smiskol.com>
Date: Fri Apr 1 19:58:06 2022 -0700
Merge remote-tracking branch 'upstream/master' into disengage-on-gas
commit b4198608dac9595bfeb9443f95cd6c5d385cd62d
Merge: 24f90b2c8 0e983562d
Author: Shane Smiskol <shane@smiskol.com>
Date: Fri Apr 1 14:32:54 2022 -0700
Merge remote-tracking branch 'upstream/master' into disengage-on-gas
commit 24f90b2c8d6ae509c0776b6e33b743467aa08dee
Author: Shane Smiskol <shane@smiskol.com>
Date: Thu Mar 31 14:07:52 2022 -0700
revert changes and get ready for override
commit aa514df6b5e8431f0faa07f6b25eb5cb6c9f2749
Author: Shane Smiskol <shane@smiskol.com>
Date: Wed Mar 30 20:52:24 2022 -0700
temporary
commit c874e10c2555968c683f629c4582ab22e51d431f
Author: Shane Smiskol <shane@smiskol.com>
Date: Wed Mar 30 00:30:13 2022 -0700
move gasPressed to controlsd
commit fe670439dff5bc6dfc5963d79ca2febe0c5920c7
Merge: 49d3b6d11 c78701e47
Author: Shane Smiskol <shane@smiskol.com>
Date: Wed Mar 30 00:15:48 2022 -0700
Merge remote-tracking branch 'upstream/master' into disengage-on-gas
commit 49d3b6d1162893fa94b2294152f0718eeb4698ed
Merge: 475b27e74 3e819bc5a
Author: Shane Smiskol <shane@smiskol.com>
Date: Mon Mar 28 13:06:08 2022 -0700
Merge remote-tracking branch 'upstream/master' into disengage-on-gas
commit 475b27e74fd6479f1d148e9ded1eca6ee476865c
Author: Shane Smiskol <shane@smiskol.com>
Date: Thu Mar 24 20:24:59 2022 -0700
update SAFETY.md
commit 0798eadb82749e12ecbaa86f4e57b21bd3dbc7e8
Author: Shane Smiskol <shane@smiskol.com>
Date: Thu Mar 24 17:52:06 2022 -0700
⛽ ➡️ 🔋
bump
commit d2b64b89cf8d7265bc90848b4e3a2276c9a4cb78
Author: Shane Smiskol <shane@smiskol.com>
Date: Thu Mar 24 16:19:34 2022 -0700
these changes will be in border PR
these changes will be border PR
commit bed31e63de2244c161729773978fef8a9246ddb5
Merge: 491417640 603e07793
Author: Shane Smiskol <shane@smiskol.com>
Date: Thu Mar 24 16:17:31 2022 -0700
Merge remote-tracking branch 'upstream/master' into disengage-on-gas
commit 49141764098e3a701ff123ead52de4656b31db4d
Merge: 9291e9f00 46ed8bb8e
Author: Shane Smiskol <shane@smiskol.com>
Date: Wed Mar 23 19:00:26 2022 -0700
Merge remote-tracking branch 'upstream/master' into disengage-on-gas
commit 9291e9f0045780669b2ffa7f08fb10373c03b070
Merge: 2aed64157 2c947f193
Author: Shane Smiskol <shane@smiskol.com>
Date: Fri Mar 18 19:03:13 2022 -0700
Merge remote-tracking branch 'upstream/master' into disengage-on-gas
commit 2aed64157d6e9dc993d103a2c6abf7e643410562
Author: Shane Smiskol <shane@smiskol.com>
Date: Fri Mar 18 19:03:03 2022 -0700
Revert "send pre-enable state when gas is pressed"
This reverts commit 8d82e697dc2efade307413e767d14b56b4d2d079.
commit a219defe5342efa731a957b2ff4fd86292c1f239
Author: Shane Smiskol <shane@smiskol.com>
Date: Thu Mar 17 12:50:46 2022 -0700
bump cereal
commit 8d82e697dc2efade307413e767d14b56b4d2d079
Author: Shane Smiskol <shane@smiskol.com>
Date: Wed Mar 16 22:40:13 2022 -0700
send pre-enable state when gas is pressed
formatting and it's out
forgot one
allow gas press
show toggle
revert changes
revert changes
commit 5eb4d1ab1b77ac65bdd901f692ebfb848d5187ca
Merge: bad1bdc74 d0ef25959
Author: Shane Smiskol <shane@smiskol.com>
Date: Wed Mar 16 22:29:43 2022 -0700
Merge remote-tracking branch 'upstream/master' into disengage-on-gas
commit bad1bdc7428c5d8a4a765b259da504f0ade84424
Author: Shane Smiskol <shane@smiskol.com>
Date: Tue Mar 15 23:03:56 2022 -0700
clean up a bit
commit 7516ed9b786536a07f00a92b9c1742ca252a01d1
Author: Shane Smiskol <shane@smiskol.com>
Date: Tue Mar 15 22:55:09 2022 -0700
these are null checks right now
commit 408f5f1d633521b29b08d966c9b387fa79dff0d6
Author: Shane Smiskol <shane@smiskol.com>
Date: Tue Mar 15 22:51:14 2022 -0700
should work
commit be1978e29c03d8843cf073cc9ddf84020fd2b378
Author: Shane Smiskol <shane@smiskol.com>
Date: Tue Mar 15 22:36:16 2022 -0700
stash
commit f0bd4c47e9d27061c6cd3b88765a7c10995f42db
Author: Shane Smiskol <shane@smiskol.com>
Date: Tue Mar 15 22:26:24 2022 -0700
this was flipped
commit d5b6e30389a727e8559331acd706422e1b246f60
Merge: 820b19894 c814c1383
Author: Shane Smiskol <shane@smiskol.com>
Date: Tue Mar 15 22:25:49 2022 -0700
Merge remote-tracking branch 'upstream/master' into disengage-on-gas
commit 820b1989496225df1f66f39b477f1e9402db1b19
Merge: 91763f9ff 6d2483ff9
Author: Shane Smiskol <shane@smiskol.com>
Date: Mon Mar 14 23:39:34 2022 -0700
Merge remote-tracking branch 'upstream/master' into disengage-on-gas
commit 91763f9ff4321986babce1a7b1272fcf64c8f753
Author: Shane Smiskol <shane@smiskol.com>
Date: Thu Feb 24 20:15:26 2022 -0800
add icon from jozef 🔥
commit 1885c9e2bacd9351c7e421b1436dcbfbde238436
Merge: 1f591736a eae207a84
Author: Shane Smiskol <shane@smiskol.com>
Date: Thu Feb 24 20:08:07 2022 -0800
Merge remote-tracking branch 'upstream/master' into disengage-on-gas
commit 1f591736a2767b1ed892c29ec5000cc7348f01c7
Merge: 465811f0b ebf5b27a7
Author: Jason Wen <47793918+sunnyhaibin@users.noreply.github.com>
Date: Sat Feb 12 10:24:29 2022 -0500
Merge branch 'master' into disengage-on-gas
commit 465811f0b4776e43a289398e4d4369362b7da58c
Author: Jason Wen <haibin.wen3@gmail.com>
Date: Fri Feb 11 11:20:32 2022 -0500
Add param to process replay
commit 0344363a533505435cff87eb33356b2364a4156f
Merge: 700efcb3f 1175355b7
Author: Jason Wen <47793918+sunnyhaibin@users.noreply.github.com>
Date: Fri Feb 11 11:07:31 2022 -0500
Merge branch 'master' into disengage-on-gas
commit 700efcb3f444092f99ef10e9908f83402429d742
Author: Jason Wen <haibin.wen3@gmail.com>
Date: Fri Feb 11 11:04:39 2022 -0500
Add param to unsafeMode
commit 220ce272fee1f7f5ace2a04052605a6e4f95712b
Author: Jason Wen <haibin.wen3@gmail.com>
Date: Fri Feb 11 10:54:16 2022 -0500
Add param to unsafeMode
commit d273bb78acbc23ee5255e461fa71b2f0400a5e03
Author: Jason Wen <haibin.wen3@gmail.com>
Date: Fri Feb 11 10:52:22 2022 -0500
Resolve conflicts
commit 1a85afd60c2f0d3140dfa8e7cd574d6b88abd5e3
Author: Jason Wen <haibin.wen3@gmail.com>
Date: Fri Feb 11 10:51:50 2022 -0500
Resolve conflicts
commit e3be32afc2bb2423d29e2b4f85b3cff3fe72aab9
Author: Jason Wen <haibin.wen3@gmail.com>
Date: Fri Feb 11 10:51:08 2022 -0500
Resolve conflicts
commit f27203af3afe612173bf9a63e15c57118598b5b8
Author: Jason Wen <haibin.wen3@gmail.com>
Date: Wed Jan 19 00:30:09 2022 -0500
Add param to process replay
commit 04c0ad1a54f4fea5efe74b3203d9bdbd693b64a6
Author: Jason Wen <47793918+sunnyhaibin@users.noreply.github.com>
Date: Wed Jan 19 00:28:49 2022 -0500
Update interfaces.py
Co-authored-by: Willem Melching <willem.melching@gmail.com>
commit 99cf13caeb4d9f2c95c25e1e78b6e353ea508cb6
Author: Jason Wen <haibin.wen3@gmail.com>
Date: Sat Jan 15 00:03:38 2022 -0500
Fix missing params lib
commit 2230254ca709625d591b0c73d1a6022c450f6ef6
Author: Jason Wen <haibin.wen3@gmail.com>
Date: Fri Jan 14 23:38:46 2022 -0500
Disengage on gas toggle
commit 87475e02cb63cc39c9b16edc67f303e02d17e6ef
Author: Jason Wen <haibin.wen3@gmail.com>
Date: Fri Jan 14 23:24:00 2022 -0500
Disengage on gas toggle
* bump
* use ALTERNATIVE_EXPERIENCE
* or it
* de-bump
* update refs
* update refs!
* you can just ctrl+click ALTERNATIVE_EXPERIENCE!
* already have a params
* update text
old-commit-hash: f1f40c117a
235 lines
6.4 KiB
Python
Executable File
235 lines
6.4 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
import datetime
|
|
import os
|
|
import signal
|
|
import subprocess
|
|
import sys
|
|
import traceback
|
|
from typing import List, Tuple, Union
|
|
|
|
import cereal.messaging as messaging
|
|
import selfdrive.sentry as sentry
|
|
from common.basedir import BASEDIR
|
|
from common.params import Params, ParamKeyType
|
|
from common.text_window import TextWindow
|
|
from selfdrive.boardd.set_time import set_time
|
|
from selfdrive.hardware import HARDWARE, PC
|
|
from selfdrive.manager.helpers import unblock_stdout
|
|
from selfdrive.manager.process import ensure_running
|
|
from selfdrive.manager.process_config import managed_processes
|
|
from selfdrive.athena.registration import register, UNREGISTERED_DONGLE_ID
|
|
from selfdrive.swaglog import cloudlog, add_file_handler
|
|
from selfdrive.version import is_dirty, get_commit, get_version, get_origin, get_short_branch, \
|
|
terms_version, training_version
|
|
|
|
|
|
sys.path.append(os.path.join(BASEDIR, "pyextra"))
|
|
|
|
|
|
def manager_init() -> None:
|
|
# update system time from panda
|
|
set_time(cloudlog)
|
|
|
|
# save boot log
|
|
subprocess.call("./bootlog", cwd=os.path.join(BASEDIR, "selfdrive/loggerd"))
|
|
|
|
params = Params()
|
|
params.clear_all(ParamKeyType.CLEAR_ON_MANAGER_START)
|
|
|
|
default_params: List[Tuple[str, Union[str, bytes]]] = [
|
|
("CompletedTrainingVersion", "0"),
|
|
("DisengageOnAccelerator", "1"),
|
|
("HasAcceptedTerms", "0"),
|
|
("OpenpilotEnabledToggle", "1"),
|
|
]
|
|
if not PC:
|
|
default_params.append(("LastUpdateTime", datetime.datetime.utcnow().isoformat().encode('utf8')))
|
|
|
|
if params.get_bool("RecordFrontLock"):
|
|
params.put_bool("RecordFront", True)
|
|
|
|
if not params.get_bool("DisableRadar_Allow"):
|
|
params.delete("DisableRadar")
|
|
|
|
# set unset params
|
|
for k, v in default_params:
|
|
if params.get(k) is None:
|
|
params.put(k, v)
|
|
|
|
# is this dashcam?
|
|
if os.getenv("PASSIVE") is not None:
|
|
params.put_bool("Passive", bool(int(os.getenv("PASSIVE", "0"))))
|
|
|
|
if params.get("Passive") is None:
|
|
raise Exception("Passive must be set to continue")
|
|
|
|
# Create folders needed for msgq
|
|
try:
|
|
os.mkdir("/dev/shm")
|
|
except FileExistsError:
|
|
pass
|
|
except PermissionError:
|
|
print("WARNING: failed to make /dev/shm")
|
|
|
|
# set version params
|
|
params.put("Version", get_version())
|
|
params.put("TermsVersion", terms_version)
|
|
params.put("TrainingVersion", training_version)
|
|
params.put("GitCommit", get_commit(default=""))
|
|
params.put("GitBranch", get_short_branch(default=""))
|
|
params.put("GitRemote", get_origin(default=""))
|
|
|
|
# set dongle id
|
|
reg_res = register(show_spinner=True)
|
|
if reg_res:
|
|
dongle_id = reg_res
|
|
else:
|
|
serial = params.get("HardwareSerial")
|
|
raise Exception(f"Registration failed for device {serial}")
|
|
os.environ['DONGLE_ID'] = dongle_id # Needed for swaglog
|
|
|
|
if not is_dirty():
|
|
os.environ['CLEAN'] = '1'
|
|
|
|
# init logging
|
|
sentry.init(sentry.SentryProject.SELFDRIVE)
|
|
cloudlog.bind_global(dongle_id=dongle_id, version=get_version(), dirty=is_dirty(),
|
|
device=HARDWARE.get_device_type())
|
|
|
|
|
|
def manager_prepare() -> None:
|
|
for p in managed_processes.values():
|
|
p.prepare()
|
|
|
|
|
|
def manager_cleanup() -> None:
|
|
# send signals to kill all procs
|
|
for p in managed_processes.values():
|
|
p.stop(block=False)
|
|
|
|
# ensure all are killed
|
|
for p in managed_processes.values():
|
|
p.stop(block=True)
|
|
|
|
cloudlog.info("everything is dead")
|
|
|
|
|
|
def manager_thread() -> None:
|
|
cloudlog.bind(daemon="manager")
|
|
cloudlog.info("manager start")
|
|
cloudlog.info({"environ": os.environ})
|
|
|
|
params = Params()
|
|
|
|
ignore: List[str] = []
|
|
if params.get("DongleId", encoding='utf8') in (None, UNREGISTERED_DONGLE_ID):
|
|
ignore += ["manage_athenad", "uploader"]
|
|
if os.getenv("NOBOARD") is not None:
|
|
ignore.append("pandad")
|
|
ignore += [x for x in os.getenv("BLOCK", "").split(",") if len(x) > 0]
|
|
|
|
ensure_running(managed_processes.values(), started=False, not_run=ignore)
|
|
|
|
started_prev = False
|
|
sm = messaging.SubMaster(['deviceState'])
|
|
pm = messaging.PubMaster(['managerState'])
|
|
|
|
while True:
|
|
sm.update()
|
|
not_run = ignore[:]
|
|
|
|
started = sm['deviceState'].started
|
|
driverview = params.get_bool("IsDriverViewEnabled")
|
|
ensure_running(managed_processes.values(), started, driverview, not_run)
|
|
|
|
# trigger an update after going offroad
|
|
if started_prev and not started and 'updated' in managed_processes:
|
|
os.sync()
|
|
managed_processes['updated'].signal(signal.SIGHUP)
|
|
|
|
started_prev = started
|
|
|
|
running = ' '.join("%s%s\u001b[0m" % ("\u001b[32m" if p.proc.is_alive() else "\u001b[31m", p.name)
|
|
for p in managed_processes.values() if p.proc)
|
|
print(running)
|
|
cloudlog.debug(running)
|
|
|
|
# send managerState
|
|
msg = messaging.new_message('managerState')
|
|
msg.managerState.processes = [p.get_process_state_msg() for p in managed_processes.values()]
|
|
pm.send('managerState', msg)
|
|
|
|
# Exit main loop when uninstall/shutdown/reboot is needed
|
|
shutdown = False
|
|
for param in ("DoUninstall", "DoShutdown", "DoReboot"):
|
|
if params.get_bool(param):
|
|
shutdown = True
|
|
params.put("LastManagerExitReason", param)
|
|
cloudlog.warning(f"Shutting down manager - {param} set")
|
|
|
|
if shutdown:
|
|
break
|
|
|
|
|
|
def main() -> None:
|
|
prepare_only = os.getenv("PREPAREONLY") is not None
|
|
|
|
manager_init()
|
|
|
|
# Start UI early so prepare can happen in the background
|
|
if not prepare_only:
|
|
managed_processes['ui'].start()
|
|
|
|
manager_prepare()
|
|
|
|
if prepare_only:
|
|
return
|
|
|
|
# SystemExit on sigterm
|
|
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit(1))
|
|
|
|
try:
|
|
manager_thread()
|
|
except Exception:
|
|
traceback.print_exc()
|
|
sentry.capture_exception()
|
|
finally:
|
|
manager_cleanup()
|
|
|
|
params = Params()
|
|
if params.get_bool("DoUninstall"):
|
|
cloudlog.warning("uninstalling")
|
|
HARDWARE.uninstall()
|
|
elif params.get_bool("DoReboot"):
|
|
cloudlog.warning("reboot")
|
|
HARDWARE.reboot()
|
|
elif params.get_bool("DoShutdown"):
|
|
cloudlog.warning("shutdown")
|
|
HARDWARE.shutdown()
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unblock_stdout()
|
|
|
|
try:
|
|
main()
|
|
except Exception:
|
|
add_file_handler(cloudlog)
|
|
cloudlog.exception("Manager failed to start")
|
|
|
|
try:
|
|
managed_processes['ui'].stop()
|
|
except Exception:
|
|
pass
|
|
|
|
# Show last 3 lines of traceback
|
|
error = traceback.format_exc(-3)
|
|
error = "Manager failed to start\n\n" + error
|
|
with TextWindow(error) as t:
|
|
t.wait_for_exit()
|
|
|
|
raise
|
|
|
|
# manual exit because we are forked
|
|
sys.exit(0)
|