IQ.Pilot Release Commit @ 322eda2
This commit is contained in:
@@ -8,13 +8,13 @@ if os.path.isdir(venv_site_packages) and venv_site_packages not in sys.path:
|
||||
|
||||
import imgui
|
||||
import libusb
|
||||
# IQ.Pilot patch: iqpilot's opendbc fork lacks the upstream `get_generated_dbcs()`
|
||||
# IQ.Pilot patch: iqpilot's iqdbc fork lacks the upstream `get_generated_dbcs()`
|
||||
# helper. Use the equivalent `create_all(out_dir)` which writes *_generated.dbc
|
||||
# files directly to disk.
|
||||
from opendbc.dbc.generator.generator import create_all as _opendbc_create_all
|
||||
from opendbc.car import Bus
|
||||
from opendbc.car.fingerprints import MIGRATION
|
||||
from opendbc.car.values import PLATFORMS
|
||||
from iqdbc.dbc.generator.generator import create_all as _iqdbc_create_all
|
||||
from iqdbc.car import Bus
|
||||
from iqdbc.car.fingerprints import MIGRATION
|
||||
from iqdbc.car.values import PLATFORMS
|
||||
from openpilot.common.basedir import BASEDIR
|
||||
|
||||
Import('env', 'arch', 'common', 'messaging', 'visionipc', 'cereal', 'replay_lib')
|
||||
@@ -32,10 +32,10 @@ def materialize_generated_dbcs(target, source, env):
|
||||
out_dir = os.path.dirname(str(target[0]))
|
||||
os.makedirs(out_dir, exist_ok=True)
|
||||
|
||||
# IQ.Pilot patch: opendbc's create_all writes *_generated.dbc files directly
|
||||
# IQ.Pilot patch: iqdbc's create_all writes *_generated.dbc files directly
|
||||
# to out_dir (and clears any stale ones first), matching what upstream's
|
||||
# get_generated_dbcs()-based loop produced.
|
||||
_opendbc_create_all(out_dir)
|
||||
_iqdbc_create_all(out_dir)
|
||||
|
||||
with open(str(target[0]), "w") as f:
|
||||
f.write("ok\n")
|
||||
|
||||
@@ -276,7 +276,7 @@ std::string default_dbc_template() {
|
||||
DbcEditorSource resolve_dbc_editor_source(const std::string &dbc_name) {
|
||||
const fs::path generated_dbc_dir = repo_root() / "tools" / "jotpluggler" / "generated_dbcs";
|
||||
const std::array<DbcEditorSource, 2> candidates = {{
|
||||
{.path = repo_root() / "opendbc" / "dbc" / (dbc_name + ".dbc"), .kind = DbcEditorState::SourceKind::Opendbc},
|
||||
{.path = repo_root() / "iqdbc" / "dbc" / (dbc_name + ".dbc"), .kind = DbcEditorState::SourceKind::Opendbc},
|
||||
{.path = generated_dbc_dir / (dbc_name + ".dbc"), .kind = DbcEditorState::SourceKind::Generated},
|
||||
}};
|
||||
for (const DbcEditorSource &candidate : candidates) {
|
||||
@@ -328,7 +328,7 @@ bool save_dbc_editor_contents(AppSession *session, UiState *state) {
|
||||
return false;
|
||||
}
|
||||
if (editor.source_kind == DbcEditorState::SourceKind::Opendbc && editor.save_name == editor.source_name) {
|
||||
state->error_text = "Save edited opendbc files under a new name";
|
||||
state->error_text = "Save edited iqdbc files under a new name";
|
||||
state->open_error_popup = true;
|
||||
return false;
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -391,7 +391,7 @@ std::string detect_dbc_for_fingerprint(std::string_view car_fingerprint) {
|
||||
std::vector<std::string> available_dbc_names_impl() {
|
||||
std::set<std::string> names;
|
||||
for (const fs::path &dbc_dir : {
|
||||
repo_root() / "opendbc" / "dbc",
|
||||
repo_root() / "iqdbc" / "dbc",
|
||||
repo_root() / "tools" / "jotpluggler" / "generated_dbcs",
|
||||
}) {
|
||||
if (fs::exists(dbc_dir) && fs::is_directory(dbc_dir)) {
|
||||
@@ -413,7 +413,7 @@ std::vector<std::string> available_dbc_names_impl() {
|
||||
|
||||
fs::path resolve_dbc_path(const std::string &dbc_name) {
|
||||
for (const fs::path &candidate : {
|
||||
repo_root() / "opendbc" / "dbc" / (dbc_name + ".dbc"),
|
||||
repo_root() / "iqdbc" / "dbc" / (dbc_name + ".dbc"),
|
||||
repo_root() / "tools" / "jotpluggler" / "generated_dbcs" / (dbc_name + ".dbc"),
|
||||
}) {
|
||||
if (fs::exists(candidate)) return candidate;
|
||||
|
||||
Reference in New Issue
Block a user