forked from commaai/openpilot
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into WSL-gotchas
- Loading branch information
Showing
32 changed files
with
343 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| [data-tooltip] { | ||
| position: relative; | ||
| display: inline-block; | ||
| border-bottom: 1px dotted black; | ||
| } | ||
|
|
||
| [data-tooltip] .tooltip-content { | ||
| width: max-content; | ||
| max-width: 25em; | ||
| position: absolute; | ||
| top: 100%; | ||
| left: 50%; | ||
| transform: translateX(-50%); | ||
| background-color: white; | ||
| color: #404040; | ||
| box-shadow: 0 4px 14px 0 rgba(0,0,0,.2), 0 0 0 1px rgba(0,0,0,.05); | ||
| padding: 10px; | ||
| font: 14px/1.5 Lato, proxima-nova, Helvetica Neue, Arial, sans-serif; | ||
| text-decoration: none; | ||
| opacity: 0; | ||
| visibility: hidden; | ||
| transition: opacity 0.1s, visibility 0s; | ||
| z-index: 1000; | ||
| pointer-events: none; /* Prevent accidental interaction */ | ||
| } | ||
|
|
||
| [data-tooltip]:hover .tooltip-content { | ||
| opacity: 1; | ||
| visibility: visible; | ||
| pointer-events: auto; /* Allow interaction when visible */ | ||
| } | ||
|
|
||
| .tooltip-content .tooltip-glossary-link { | ||
| display: inline-block; | ||
| margin-top: 8px; | ||
| font-size: 12px; | ||
| color: #007bff; | ||
| text-decoration: none; | ||
| } | ||
|
|
||
| .tooltip-content .tooltip-glossary-link:hover { | ||
| color: #0056b3; | ||
| text-decoration: underline; | ||
| } |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| import re | ||
| import tomllib | ||
|
|
||
| def load_glossary(file_path="docs/glossary.toml"): | ||
| with open(file_path, "rb") as f: | ||
| glossary_data = tomllib.load(f) | ||
| return glossary_data.get("glossary", {}) | ||
|
|
||
| def generate_anchor_id(name): | ||
| return name.replace(" ", "-").replace("_", "-").lower() | ||
|
|
||
| def format_markdown_term(name, definition): | ||
| anchor_id = generate_anchor_id(name) | ||
| markdown = f"* [**{name.replace('_', ' ').title()}**](#{anchor_id})" | ||
| if definition.get("abbreviation"): | ||
| markdown += f" *({definition['abbreviation']})*" | ||
| if definition.get("description"): | ||
| markdown += f": {definition['description']}\n" | ||
| return markdown | ||
|
|
||
| def glossary_markdown(vocabulary): | ||
| markdown = "" | ||
| for category, terms in vocabulary.items(): | ||
| markdown += f"## {category.replace('_', ' ').title()}\n\n" | ||
| for name, definition in terms.items(): | ||
| markdown += format_markdown_term(name, definition) | ||
| return markdown | ||
|
|
||
| def format_tooltip_html(term_key, definition, html): | ||
| display_term = term_key.replace("_", " ").title() | ||
| clean_description = re.sub(r"\[(.+)]\(.+\)", r"\1", definition["description"]) | ||
| glossary_link = ( | ||
| f"<a href='/concepts/glossary#{term_key}' class='tooltip-glossary-link' title='View in glossary'>Glossary🔗</a>" | ||
| ) | ||
| return re.sub( | ||
| re.escape(display_term), | ||
| lambda | ||
| match: f"<span data-tooltip>{match.group(0)}<span class='tooltip-content'>{clean_description} {glossary_link}</span></span>", | ||
| html, | ||
| flags=re.IGNORECASE, | ||
| ) | ||
|
|
||
| def apply_tooltip(_term_key, _definition, pattern, html): | ||
| return re.sub( | ||
| pattern, | ||
| lambda match: format_tooltip_html(_term_key, _definition, match.group(0)), | ||
| html, | ||
| flags=re.IGNORECASE, | ||
| ) | ||
|
|
||
| def tooltip_html(vocabulary, html): | ||
| for _category, terms in vocabulary.items(): | ||
| for term_key, definition in terms.items(): | ||
| if definition.get("description"): | ||
| pattern = rf"(?<!\w){re.escape(term_key.replace('_', ' ').title())}(?![^<]*<\/a>)(?!\([^)]*\))" | ||
| html = apply_tooltip(term_key, definition, pattern, html) | ||
| return html | ||
|
|
||
| # Page Hooks | ||
| def on_page_markdown(markdown, **kwargs): | ||
| glossary = load_glossary() | ||
| return markdown.replace("{{GLOSSARY_DEFINITIONS}}", glossary_markdown(glossary)) | ||
|
|
||
| def on_page_content(html, **kwargs): | ||
| if kwargs.get("page").title == "Glossary": | ||
| return html | ||
| glossary = load_glossary() | ||
| return tooltip_html(glossary, html) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule opendbc_repo
updated
14 files
| +10 −9 | docs/CARS.md | |
| +2 −2 | opendbc/car/docs.py | |
| +21 −15 | opendbc/car/gm/carstate.py | |
| +3 −0 | opendbc/car/gm/fingerprints.py | |
| +11 −1 | opendbc/car/gm/interface.py | |
| +8 −1 | opendbc/car/gm/values.py | |
| +3 −3 | opendbc/car/hyundai/carcontroller.py | |
| +5 −3 | opendbc/car/hyundai/carstate.py | |
| +11 −8 | opendbc/car/hyundai/hyundaican.py | |
| +3 −3 | opendbc/car/hyundai/interface.py | |
| +1 −0 | opendbc/car/tests/routes.py | |
| +1 −0 | opendbc/car/torque_data/override.toml | |
| +2 −2 | opendbc/dbc/hyundai_kia_generic.dbc | |
| +6 −0 | test.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| #!/usr/bin/env python3 | ||
| import argparse | ||
|
|
||
| import numpy as np | ||
| import matplotlib.pyplot as plt | ||
|
|
||
| from openpilot.tools.lib.logreader import LogReader | ||
|
|
||
| if __name__ == '__main__': | ||
| parser = argparse.ArgumentParser() | ||
| parser.add_argument('--width', default=2160, type=int) | ||
| parser.add_argument('--height', default=1080, type=int) | ||
| parser.add_argument('--route', default='rlog', type=str) | ||
| args = parser.parse_args() | ||
|
|
||
| w = args.width | ||
| h = args.height | ||
| route = args.route | ||
|
|
||
| fingers = [[-1, -1]] * 5 | ||
| touch_points = [] | ||
| current_slot = 0 | ||
|
|
||
| lr = list(LogReader(route)) | ||
| for msg in lr: | ||
| if msg.which() == 'touch': | ||
| for event in msg.touch: | ||
| if event.type == 3 and event.code == 47: | ||
| current_slot = event.value | ||
| elif event.type == 3 and event.code == 57 and event.value == -1: | ||
| fingers[current_slot] = [-1, -1] | ||
| elif event.type == 3 and event.code == 53: | ||
| fingers[current_slot][1] = h - (h - event.value) | ||
| if fingers[current_slot][0] != -1: | ||
| touch_points.append(fingers[current_slot].copy()) | ||
| elif event.type == 3 and event.code == 54: | ||
| fingers[current_slot][0] = w - event.value | ||
| if fingers[current_slot][1] != -1: | ||
| touch_points.append(fingers[current_slot].copy()) | ||
|
|
||
| unique_points, counts = np.unique(touch_points, axis=0, return_counts=True) | ||
|
|
||
| plt.figure(figsize=(10, 3)) | ||
| plt.scatter(unique_points[:, 0], unique_points[:, 1], c=counts, s=counts * 20, edgecolors='red') | ||
| plt.colorbar() | ||
| plt.title(f'Touches for {route}') | ||
| plt.grid(True) | ||
| plt.show() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Git LFS file not shown
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 7a1b6253e715cec2a254c3e7b6839d6f2bd06fb1 | ||
| cae12bc0a2960de17104a9e22fafe33d797fbcee |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.