sadmen
/
openpilot_comma
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into build-casync-releases-in-ci

Browse Source
pull/31880/head
Justin Newberry 1 year ago
parent c85f1c4f4a effee900c4
commit 0c755f9dd6
18 changed files with 69 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      selfdrive/athena/manage_athenad.py
  2. 13
      selfdrive/car/honda/values.py
  3. 2
      selfdrive/manager/build.py
  4. 4
      selfdrive/manager/manager.py
  5. 2
      selfdrive/sentry.py
  6. 2
      selfdrive/statsd.py
  7. 2
      selfdrive/ui/qt/util.cc
  8. 4
      selfdrive/ui/translations/main_ar.ts
  9. 4
      selfdrive/ui/translations/main_de.ts
  10. 4
      selfdrive/ui/translations/main_fr.ts
  11. 4
      selfdrive/ui/translations/main_ja.ts
  12. 4
      selfdrive/ui/translations/main_ko.ts
  13. 4
      selfdrive/ui/translations/main_pt-BR.ts
  14. 4
      selfdrive/ui/translations/main_th.ts
  15. 4
      selfdrive/ui/translations/main_tr.ts
  16. 4
      selfdrive/ui/translations/main_zh-CHS.ts
  17. 4
      selfdrive/ui/translations/main_zh-CHT.ts
  18. 24
      system/version.py

2
selfdrive/athena/manage_athenad.py
Unescape View File

@ -22,7 +22,7 @@ def main():
origin=build_metadata.openpilot.git_normalized_origin,
branch=build_metadata.channel,
commit=build_metadata.openpilot.git_commit,
dirty=build_metadata.openpilot.git_dirty,
dirty=build_metadata.openpilot.is_dirty,
device=HARDWARE.get_device_type())
try:

13
selfdrive/car/honda/values.py
Unescape View File

@ -307,19 +307,20 @@ FW_QUERY_CONFIG = FwQueryConfig(
# We lose these ECUs without the comma power on these cars.
# Note that we still attempt to match with them when they are present
non_essential_ecus={
Ecu.programmedFuelInjection: [CAR.ACURA_RDX_3G, CAR.HONDA_ACCORD, CAR.HONDA_CIVIC, CAR.HONDA_CIVIC_BOSCH, CAR.HONDA_CRV_5G],
Ecu.transmission: [CAR.ACURA_RDX_3G, CAR.HONDA_ACCORD, CAR.HONDA_CIVIC, CAR.HONDA_CIVIC_BOSCH, CAR.HONDA_CRV_5G],
Ecu.programmedFuelInjection: [CAR.ACURA_RDX_3G, CAR.HONDA_ACCORD, CAR.HONDA_CIVIC, CAR.HONDA_CIVIC_BOSCH, CAR.HONDA_CRV_5G, CAR.HONDA_PILOT],
Ecu.transmission: [CAR.ACURA_RDX_3G, CAR.HONDA_ACCORD, CAR.HONDA_CIVIC, CAR.HONDA_CIVIC_BOSCH, CAR.HONDA_CRV_5G, CAR.HONDA_PILOT],
Ecu.srs: [CAR.ACURA_RDX_3G, CAR.HONDA_ACCORD, CAR.HONDA_E],
Ecu.eps: [CAR.ACURA_RDX_3G, CAR.HONDA_ACCORD, CAR.HONDA_E],
Ecu.vsa: [CAR.ACURA_RDX_3G, CAR.HONDA_ACCORD, CAR.HONDA_CIVIC, CAR.HONDA_CIVIC_BOSCH, CAR.HONDA_CRV_5G, CAR.HONDA_CRV_HYBRID,
CAR.HONDA_E, CAR.HONDA_INSIGHT],
Ecu.combinationMeter: [CAR.ACURA_RDX_3G, CAR.HONDA_ACCORD, CAR.HONDA_CIVIC, CAR.HONDA_CIVIC_BOSCH, CAR.HONDA_FIT,
Ecu.combinationMeter: [CAR.ACURA_ILX, CAR.ACURA_RDX_3G, CAR.HONDA_ACCORD, CAR.HONDA_CIVIC, CAR.HONDA_CIVIC_BOSCH, CAR.HONDA_FIT,
CAR.HONDA_HRV, CAR.HONDA_CRV_5G, CAR.HONDA_CRV_HYBRID, CAR.HONDA_E, CAR.HONDA_INSIGHT, CAR.HONDA_ODYSSEY_CHN],
Ecu.gateway: [CAR.ACURA_RDX_3G, CAR.HONDA_ACCORD, CAR.HONDA_CIVIC, CAR.HONDA_CIVIC_BOSCH, CAR.HONDA_FIT, CAR.HONDA_FREED,
CAR.HONDA_HRV, CAR.HONDA_RIDGELINE, CAR.HONDA_CRV_5G, CAR.HONDA_CRV_HYBRID, CAR.HONDA_E, CAR.HONDA_INSIGHT, CAR.HONDA_ODYSSEY_CHN],
Ecu.gateway: [CAR.ACURA_ILX, CAR.ACURA_RDX_3G, CAR.HONDA_ACCORD, CAR.HONDA_CIVIC, CAR.HONDA_CIVIC_BOSCH, CAR.HONDA_FIT, CAR.HONDA_FREED,
CAR.HONDA_HRV, CAR.HONDA_RIDGELINE, CAR.HONDA_CRV_5G, CAR.HONDA_CRV_HYBRID, CAR.HONDA_E, CAR.HONDA_INSIGHT, CAR.HONDA_ODYSSEY,
CAR.HONDA_ODYSSEY_CHN, CAR.HONDA_PILOT],
Ecu.electricBrakeBooster: [CAR.ACURA_RDX_3G, CAR.HONDA_ACCORD, CAR.HONDA_CIVIC_BOSCH, CAR.HONDA_CRV_5G],
# existence correlates with transmission type for Accord ICE
Ecu.shiftByWire: [CAR.ACURA_RDX_3G, CAR.HONDA_ACCORD, CAR.HONDA_CRV_HYBRID, CAR.HONDA_E, CAR.HONDA_INSIGHT],
Ecu.shiftByWire: [CAR.ACURA_RDX_3G, CAR.HONDA_ACCORD, CAR.HONDA_CRV_HYBRID, CAR.HONDA_E, CAR.HONDA_INSIGHT, CAR.HONDA_PILOT],
# existence correlates with trim level
Ecu.hud: [CAR.HONDA_ACCORD],
},

2
selfdrive/manager/build.py
Unescape View File

@ -87,4 +87,4 @@ if __name__ == "__main__":
spinner = Spinner()
spinner.update_progress(0, 100)
build_metadata = get_build_metadata()
build(spinner, build_metadata.openpilot.git_dirty, minimal = AGNOS)
build(spinner, build_metadata.openpilot.is_dirty, minimal = AGNOS)

4
selfdrive/manager/manager.py
Unescape View File

@ -83,7 +83,7 @@ def manager_init() -> None:
os.environ['GIT_BRANCH'] = build_metadata.channel # Needed for swaglog
os.environ['GIT_COMMIT'] = build_metadata.openpilot.git_commit # Needed for swaglog
if not build_metadata.openpilot.git_dirty:
if not build_metadata.openpilot.is_dirty:
os.environ['CLEAN'] = '1'
# init logging
@ -93,7 +93,7 @@ def manager_init() -> None:
origin=build_metadata.openpilot.git_normalized_origin,
branch=build_metadata.channel,
commit=build_metadata.openpilot.git_commit,
dirty=build_metadata.openpilot.git_dirty,
dirty=build_metadata.openpilot.is_dirty,
device=HARDWARE.get_device_type())
# preimport all processes

2
selfdrive/sentry.py
Unescape View File

@ -66,7 +66,7 @@ def init(project: SentryProject) -> bool:
build_metadata = get_build_metadata()
sentry_sdk.set_user({"id": dongle_id})
sentry_sdk.set_tag("dirty", build_metadata.openpilot.git_dirty)
sentry_sdk.set_tag("dirty", build_metadata.openpilot.is_dirty)
sentry_sdk.set_tag("origin", build_metadata.openpilot.git_origin)
sentry_sdk.set_tag("branch", build_metadata.channel)
sentry_sdk.set_tag("commit", build_metadata.openpilot.git_commit)

2
selfdrive/statsd.py
Unescape View File

@ -93,7 +93,7 @@ def main() -> NoReturn:
'started': False,
'version': build_metadata.openpilot.version,
'branch': build_metadata.channel,
'dirty': build_metadata.openpilot.git_dirty,
'dirty': build_metadata.openpilot.is_dirty,
'origin': build_metadata.openpilot.git_normalized_origin,
'deviceType': HARDWARE.get_device_type(),
}

2
selfdrive/ui/qt/util.cc
Unescape View File

@ -61,7 +61,7 @@ QString timeAgo(const QDateTime &date) {
QString s;
if (diff < 60) {
s = "now";
s = QObject::tr("now");
} else if (diff < 60 * 60) {
int minutes = diff / 60;
s = QObject::tr("%n minute(s) ago", "", minutes);

4
selfdrive/ui/translations/main_ar.ts
Unescape View File

@ -615,6 +615,10 @@
<source>ft</source>
<translation>قدم</translation>
</message>
<message>
<source>now</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Reset</name>

4
selfdrive/ui/translations/main_de.ts
Unescape View File

@ -598,6 +598,10 @@
<source>ft</source>
<translation>fuß</translation>
</message>
<message>
<source>now</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Reset</name>

4
selfdrive/ui/translations/main_fr.ts
Unescape View File

@ -599,6 +599,10 @@
<source>ft</source>
<translation>ft</translation>
</message>
<message>
<source>now</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Reset</name>

4
selfdrive/ui/translations/main_ja.ts
Unescape View File

@ -594,6 +594,10 @@
<source>ft</source>
<translation>ﾌｨｰﾄ</translation>
</message>
<message>
<source>now</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Reset</name>

4
selfdrive/ui/translations/main_ko.ts
Unescape View File

@ -595,6 +595,10 @@
<source>ft</source>
<translation>ft</translation>
</message>
<message>
<source>now</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Reset</name>

4
selfdrive/ui/translations/main_pt-BR.ts
Unescape View File

@ -599,6 +599,10 @@
<source>ft</source>
<translation>pés</translation>
</message>
<message>
<source>now</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Reset</name>

4
selfdrive/ui/translations/main_th.ts
Unescape View File

@ -595,6 +595,10 @@
<source>ft</source>
<translation>ฟุต</translation>
</message>
<message>
<source>now</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Reset</name>

4
selfdrive/ui/translations/main_tr.ts
Unescape View File

@ -594,6 +594,10 @@
<source>ft</source>
<translation>ft</translation>
</message>
<message>
<source>now</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Reset</name>

4
selfdrive/ui/translations/main_zh-CHS.ts
Unescape View File

@ -595,6 +595,10 @@
<source>ft</source>
<translation>ft</translation>
</message>
<message>
<source>now</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Reset</name>

4
selfdrive/ui/translations/main_zh-CHT.ts
Unescape View File

@ -595,6 +595,10 @@
<source>ft</source>
<translation>ft</translation>
</message>
<message>
<source>now</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Reset</name>

24
system/version.py
Unescape View File

@ -33,12 +33,12 @@ def get_release_notes(path: str = BASEDIR) -> str:
@cache
def is_prebuilt() -> bool:
return os.path.exists(os.path.join(BASEDIR, 'prebuilt'))
def is_prebuilt(path: str = BASEDIR) -> bool:
return os.path.exists(os.path.join(path, 'prebuilt'))
@cache
def is_dirty(cwd: str = None) -> bool:
def is_dirty(cwd: str = BASEDIR) -> bool:
origin = get_origin()
branch = get_branch()
if not origin or not branch:
@ -47,14 +47,14 @@ def is_dirty(cwd: str = None) -> bool:
dirty = False
try:
# Actually check dirty files
if not is_prebuilt():
if not is_prebuilt(cwd):
# This is needed otherwise touched files might show up as modified
try:
subprocess.check_call(["git", "update-index", "--refresh"], cwd=cwd)
except subprocess.CalledProcessError:
pass
dirty = (subprocess.call(["git", "diff-index", "--quiet", branch, "--"], cwd=cwd) != 0)
dirty = (subprocess.call(["git", "diff-index", "--quiet", branch, "--"], cwd=cwd)) != 0
except subprocess.CalledProcessError:
cloudlog.exception("git subprocess failed while checking dirty")
dirty = True
@ -69,7 +69,7 @@ class OpenpilotMetadata:
git_commit: str
git_origin: str
git_commit_date: str
git_dirty: bool
is_dirty: bool # whether there are local changes
@property
def short_version(self) -> str:
@ -125,13 +125,19 @@ def get_build_metadata(path: str = BASEDIR) -> BuildMetadata:
git_commit=git_commit,
git_origin=git_origin,
git_commit_date=git_commit_date,
git_dirty=False))
is_dirty=False))
git_folder = pathlib.Path(path) / ".git"
if git_folder.exists():
return BuildMetadata(get_short_branch(path), OpenpilotMetadata(get_version(path), get_release_notes(path), get_commit(path), \
get_origin(path), get_commit_date(path), is_dirty(path)))
return BuildMetadata(get_short_branch(path),
OpenpilotMetadata(
version=get_version(path),
release_notes=get_release_notes(path),
git_commit=get_commit(path),
git_origin=get_origin(path),
git_commit_date=get_commit_date(path),
is_dirty=is_dirty(path)))
cloudlog.exception("unable to get build metadata")
raise Exception("invalid build metadata")

Write Preview
Loading…
Cancel
Save