diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml
index 2d60d2f0e9..46649a9d5f 100644
--- a/.github/workflows/stale.yaml
+++ b/.github/workflows/stale.yaml
@@ -19,8 +19,9 @@ jobs:
# pull request config
stale-pr-message: 'This PR has had no activity for ${{ env.DAYS_BEFORE_PR_STALE }} days. It will be automatically closed in ${{ env.DAYS_BEFORE_PR_CLOSE }} days if there is no activity.'
close-pr-message: 'This PR has been automatically closed due to inactivity. Feel free to re-open once activity resumes.'
+ stale-pr-label: stale
delete-branch: ${{ github.event.pull_request.head.repo.full_name == 'commaai/openpilot' }} # only delete branches on the main repo
- exempt-pr-labels: "ignore stale,needs testing,car port" # if wip or it needs testing from the community, don't mark as stale
+ exempt-pr-labels: "ignore stale,needs testing,car port,car" # if wip or it needs testing from the community, don't mark as stale
days-before-pr-stale: ${{ env.DAYS_BEFORE_PR_STALE }}
days-before-pr-close: ${{ env.DAYS_BEFORE_PR_CLOSE }}
diff --git a/.github/workflows/tools_tests.yaml b/.github/workflows/tools_tests.yaml
index a051cb1241..ff0e29e9e2 100644
--- a/.github/workflows/tools_tests.yaml
+++ b/.github/workflows/tools_tests.yaml
@@ -31,7 +31,7 @@ jobs:
- uses: ./.github/workflows/setup-with-retry
- name: Build openpilot
timeout-minutes: 5
- run: ${{ env.RUN }} "scons -j$(nproc) cereal/ common/ --minimal"
+ run: ${{ env.RUN }} "scons -j$(nproc) cereal/ common/ opendbc/ --minimal"
- name: Test PlotJuggler
timeout-minutes: 2
run: |
@@ -99,4 +99,4 @@ jobs:
- name: Test notebooks
timeout-minutes: 3
run: |
- ${{ env.RUN }} "pip install nbmake && pytest --nbmake tools/car_porting/examples/"
\ No newline at end of file
+ ${{ env.RUN }} "pip install nbmake && pytest --nbmake tools/car_porting/examples/"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1d152fee2a..02af4473bd 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -33,7 +33,7 @@ repos:
- -L bu,ro,te,ue,alo,hda,ois,nam,nams,ned,som,parm,setts,inout,warmup,bumb,nd,sie,preints
- --builtins clear,rare,informal,usage,code,names,en-GB_to_en-US
- repo: https://github.com/astral-sh/ruff-pre-commit
- rev: v0.3.3
+ rev: v0.3.4
hooks:
- id: ruff
exclude: '^(third_party/)|(cereal/)|(panda/)|(rednose/)|(rednose_repo/)|(tinygrad/)|(tinygrad_repo/)|(teleoprtc/)|(teleoprtc_repo/)'
@@ -98,6 +98,6 @@ repos:
args:
- --lock
- repo: https://github.com/python-jsonschema/check-jsonschema
- rev: 0.28.0
+ rev: 0.28.1
hooks:
- id: check-github-workflows
diff --git a/Jenkinsfile b/Jenkinsfile
index 4afb3964f7..60e3c25008 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -142,6 +142,23 @@ def setupCredentials() {
}
+def build_release(String channel_name) {
+ return parallel (
+ "${channel_name} (git)": {
+ deviceStage("build git", "tici-needs-can", [], [
+ ["build ${channel_name}", "RELEASE_BRANCH=${channel_name} $SOURCE_DIR/release/build_release.sh"],
+ ])
+ },
+ "${channel_name} (casync)": {
+ deviceStage("build casync", "tici-needs-can", [], [
+ ["build ${channel_name}", "RELEASE=1 OPENPILOT_CHANNEL=${channel_name} BUILD_DIR=/data/openpilot CASYNC_DIR=/data/casync $SOURCE_DIR/release/create_casync_build.sh"],
+ //["upload ${channel_name}", "OPENPILOT_CHANNEL=${channel_name} $SOURCE_DIR/release/upload_casync_release.sh"],
+ ])
+ }
+ )
+}
+
+
node {
env.CI = "1"
env.PYTHONWARNINGS = "error"
@@ -164,15 +181,11 @@ node {
try {
if (env.BRANCH_NAME == 'devel-staging') {
- deviceStage("build release3-staging", "tici-needs-can", [], [
- ["build release3-staging", "RELEASE_BRANCH=release3-staging $SOURCE_DIR/release/build_release.sh"],
- ])
+ build_release("release3-staging")
}
if (env.BRANCH_NAME == 'master-ci') {
- deviceStage("build nightly", "tici-needs-can", [], [
- ["build nightly", "RELEASE_BRANCH=nightly $SOURCE_DIR/release/build_release.sh"],
- ])
+ build_release("nightly")
}
if (!env.BRANCH_NAME.matches(excludeRegex)) {
diff --git a/cereal b/cereal
index 430535068a..b9871482a3 160000
--- a/cereal
+++ b/cereal
@@ -1 +1 @@
-Subproject commit 430535068ac3bb94d3e117a3cfbc348ef37eb72d
+Subproject commit b9871482a3cba70c2ab40ab80017019313dc3f31
diff --git a/common/git.py b/common/git.py
index e15a5051d2..bfb18ce25d 100644
--- a/common/git.py
+++ b/common/git.py
@@ -4,38 +4,38 @@ from openpilot.common.run import run_cmd, run_cmd_default
@cache
-def get_commit(branch: str = "HEAD") -> str:
- return run_cmd_default(["git", "rev-parse", branch])
+def get_commit(cwd: str = None, branch: str = "HEAD") -> str:
+ return run_cmd_default(["git", "rev-parse", branch], cwd=cwd)
@cache
-def get_commit_date(commit: str = "HEAD") -> str:
- return run_cmd_default(["git", "show", "--no-patch", "--format='%ct %ci'", commit])
+def get_commit_date(cwd: str = None, commit: str = "HEAD") -> str:
+ return run_cmd_default(["git", "show", "--no-patch", "--format='%ct %ci'", commit], cwd=cwd)
@cache
-def get_short_branch() -> str:
- return run_cmd_default(["git", "rev-parse", "--abbrev-ref", "HEAD"])
+def get_short_branch(cwd: str = None) -> str:
+ return run_cmd_default(["git", "rev-parse", "--abbrev-ref", "HEAD"], cwd=cwd)
@cache
-def get_branch() -> str:
- return run_cmd_default(["git", "rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"])
+def get_branch(cwd: str = None) -> str:
+ return run_cmd_default(["git", "rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"], cwd=cwd)
@cache
-def get_origin() -> str:
+def get_origin(cwd: str = None) -> str:
try:
- local_branch = run_cmd(["git", "name-rev", "--name-only", "HEAD"])
- tracking_remote = run_cmd(["git", "config", "branch." + local_branch + ".remote"])
- return run_cmd(["git", "config", "remote." + tracking_remote + ".url"])
+ local_branch = run_cmd(["git", "name-rev", "--name-only", "HEAD"], cwd=cwd)
+ tracking_remote = run_cmd(["git", "config", "branch." + local_branch + ".remote"], cwd=cwd)
+ return run_cmd(["git", "config", "remote." + tracking_remote + ".url"], cwd=cwd)
except subprocess.CalledProcessError: # Not on a branch, fallback
- return run_cmd_default(["git", "config", "--get", "remote.origin.url"])
+ return run_cmd_default(["git", "config", "--get", "remote.origin.url"], cwd=cwd)
@cache
-def get_normalized_origin() -> str:
- return get_origin() \
+def get_normalized_origin(cwd: str = None) -> str:
+ return get_origin(cwd) \
.replace("git@", "", 1) \
.replace(".git", "", 1) \
.replace("https://", "", 1) \
diff --git a/common/prefix.py b/common/prefix.py
index 4059ac09e2..3292acae86 100644
--- a/common/prefix.py
+++ b/common/prefix.py
@@ -4,6 +4,7 @@ import uuid
from openpilot.common.params import Params
+from openpilot.system.hardware import PC
from openpilot.system.hardware.hw import Paths
from openpilot.system.hardware.hw import DEFAULT_DOWNLOAD_CACHE_ROOT
@@ -45,7 +46,8 @@ class OpenpilotPrefix:
shutil.rmtree(os.path.realpath(symlink_path), ignore_errors=True)
os.remove(symlink_path)
shutil.rmtree(self.msgq_path, ignore_errors=True)
- shutil.rmtree(Paths.log_root(), ignore_errors=True)
+ if PC:
+ shutil.rmtree(Paths.log_root(), ignore_errors=True)
if not os.environ.get("COMMA_CACHE", False):
shutil.rmtree(Paths.download_cache_root(), ignore_errors=True)
shutil.rmtree(Paths.comma_home(), ignore_errors=True)
diff --git a/common/run.py b/common/run.py
index 25abe98c41..06deb6388d 100644
--- a/common/run.py
+++ b/common/run.py
@@ -1,13 +1,13 @@
import subprocess
-def run_cmd(cmd: list[str]) -> str:
- return subprocess.check_output(cmd, encoding='utf8').strip()
+def run_cmd(cmd: list[str], cwd=None, env=None) -> str:
+ return subprocess.check_output(cmd, encoding='utf8', cwd=cwd, env=env).strip()
-def run_cmd_default(cmd: list[str], default: str = "") -> str:
+def run_cmd_default(cmd: list[str], default: str = "", cwd=None, env=None) -> str:
try:
- return run_cmd(cmd)
+ return run_cmd(cmd, cwd=cwd, env=env)
except subprocess.CalledProcessError:
return default
diff --git a/common/time.py b/common/time.py
index f2e49eb546..5379faf22a 100644
--- a/common/time.py
+++ b/common/time.py
@@ -1,6 +1,15 @@
import datetime
+from pathlib import Path
-MIN_DATE = datetime.datetime(year=2024, month=1, day=28)
+_MIN_DATE = datetime.datetime(year=2024, month=3, day=30)
+
+def min_date():
+ # on systemd systems, the default time is the systemd build time
+ systemd_path = Path("/lib/systemd/systemd")
+ if systemd_path.exists():
+ d = datetime.datetime.fromtimestamp(systemd_path.stat().st_mtime)
+ return d + datetime.timedelta(days=1)
+ return _MIN_DATE
def system_time_valid():
- return datetime.datetime.now() > MIN_DATE
+ return datetime.datetime.now() > min_date()
diff --git a/common/util.cc b/common/util.cc
index 8af9f5884c..b6097bf28f 100644
--- a/common/util.cc
+++ b/common/util.cc
@@ -256,8 +256,9 @@ bool starts_with(const std::string &s1, const std::string &s2) {
return strncmp(s1.c_str(), s2.c_str(), s2.size()) == 0;
}
-bool ends_with(const std::string &s1, const std::string &s2) {
- return strcmp(s1.c_str() + (s1.size() - s2.size()), s2.c_str()) == 0;
+bool ends_with(const std::string& s, const std::string& suffix) {
+ return s.size() >= suffix.size() &&
+ strcmp(s.c_str() + (s.size() - suffix.size()), suffix.c_str()) == 0;
}
std::string check_output(const std::string& command) {
diff --git a/common/util.h b/common/util.h
index 0cbad5bd31..3bf5a690a6 100644
--- a/common/util.h
+++ b/common/util.h
@@ -77,7 +77,7 @@ float getenv(const char* key, float default_val);
std::string hexdump(const uint8_t* in, const size_t size);
std::string dir_name(std::string const& path);
bool starts_with(const std::string &s1, const std::string &s2);
-bool ends_with(const std::string &s1, const std::string &s2);
+bool ends_with(const std::string &s, const std::string &suffix);
// ***** random helpers *****
int random_int(int min, int max);
diff --git a/docs/CARS.md b/docs/CARS.md
index 35a77fd78f..31560fffb0 100644
--- a/docs/CARS.md
+++ b/docs/CARS.md
@@ -4,7 +4,7 @@
A supported vehicle is one that just works when you install a comma device. All supported cars provide a better experience than any stock system. Supported vehicles reference the US market unless otherwise specified.
-# 289 Supported Cars
+# 291 Supported Cars
|Make|Model|Supported Package|ACC|No ACC accel below|No ALC below|Steering Torque|Resume from stop|![]()
Hardware Needed
|Video|
|---|---|---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
@@ -51,7 +51,8 @@ A supported vehicle is one that just works when you install a comma device. All
|Ford|Maverick Hybrid 2022|LARIAT Luxury|openpilot available[1](#footnotes)|0 mph|0 mph|[](##)|[](##)|Parts
- 1 Ford Q3 connector
- 1 RJ45 cable (7 ft)
- 1 angled mount (8 degrees)
- 1 comma 3X
- 1 comma power v2
- 1 harness box
- 1 right angle OBD-C cable (1.5 ft)
Buy HereParts
- 1 Ford Q3 connector
- 1 RJ45 cable (7 ft)
- 1 angled mount (8 degrees)
- 1 comma 3X
- 1 comma power v2
- 1 harness box
- 1 right angle OBD-C cable (1.5 ft)
Buy HereParts
- 1 Hyundai F connector
- 1 RJ45 cable (7 ft)
- 1 comma 3X
- 1 comma power v2
- 1 harness box
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy HereParts
- 1 Hyundai F connector
- 1 RJ45 cable (7 ft)
- 1 comma 3X
- 1 comma power v2
- 1 harness box
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy HereParts
- 1 Hyundai F connector
- 1 RJ45 cable (7 ft)
- 1 comma 3X
- 1 comma power v2
- 1 harness box
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy HereParts
- 1 Hyundai L connector
- 1 RJ45 cable (7 ft)
- 1 comma 3X
- 1 comma power v2
- 1 harness box
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy HereParts
- 1 Hyundai J connector
- 1 RJ45 cable (7 ft)
- 1 comma 3X
- 1 comma power v2
- 1 harness box
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy HereParts
- 1 Hyundai H connector
- 1 RJ45 cable (7 ft)
- 1 comma 3X
- 1 comma power v2
- 1 harness box
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy HereParts
- 1 Hyundai C connector
- 1 RJ45 cable (7 ft)
- 1 comma 3X
- 1 comma power v2
- 1 harness box
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy HereParts
- 1 Honda Bosch B connector
- 1 RJ45 cable (7 ft)
- 1 comma 3X
- 1 comma power v2
- 1 harness box
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy Here
|
|Honda|CR-V 2015-16|Touring Trim|openpilot|25 mph|12 mph|[](##)|[](##)|Parts
- 1 Honda Nidec connector
- 1 RJ45 cable (7 ft)
- 1 comma 3X
- 1 comma power v2
- 1 harness box
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy HereParts
- 1 Honda Bosch A connector
- 1 RJ45 cable (7 ft)
- 1 comma 3X
- 1 comma power v2
- 1 harness box
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy HereParts
- 1 Honda Bosch A connector
- 1 RJ45 cable (7 ft)
- 1 comma 3X
- 1 comma power v2
- 1 harness box
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy HereParts
- 1 Honda Bosch A connector
- 1 RJ45 cable (7 ft)
- 1 comma 3X
- 1 comma power v2
- 1 harness box
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy HereParts
- 1 Honda Bosch A connector
- 1 RJ45 cable (7 ft)
- 1 comma 3X
- 1 comma power v2
- 1 harness box
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy HereParts
- 1 Honda Nidec connector
- 1 RJ45 cable (7 ft)
- 1 comma 3X
- 1 comma power v2
- 1 harness box
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy HereParts
- 1 Honda Nidec connector
- 1 RJ45 cable (7 ft)
- 1 comma 3X
- 1 comma power v2
- 1 harness box
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy HereParts
- 1 J533 connector
- 1 USB-C coupler
- 1 comma 3X
- 1 harness box
- 1 long OBD-C cable
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy HereParts
- 1 J533 connector
- 1 USB-C coupler
- 1 comma 3X
- 1 harness box
- 1 long OBD-C cable
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy HereParts
- 1 J533 connector
- 1 USB-C coupler
- 1 comma 3X
- 1 harness box
- 1 long OBD-C cable
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy HereParts
- 1 J533 connector
- 1 USB-C coupler
- 1 comma 3X
- 1 harness box
- 1 long OBD-C cable
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy HereParts
- 1 J533 connector
- 1 USB-C coupler
- 1 comma 3X
- 1 harness box
- 1 long OBD-C cable
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy HereParts
- 1 J533 connector
- 1 USB-C coupler
- 1 comma 3X
- 1 harness box
- 1 long OBD-C cable
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy HereParts
- 1 RJ45 cable (7 ft)
- 1 Toyota A connector
- 1 comma 3X
- 1 comma power v2
- 1 harness box
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy Here