diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml
index e9a067041..ea591cbf4 100644
--- a/.github/workflows/selfdrive_tests.yaml
+++ b/.github/workflows/selfdrive_tests.yaml
@@ -123,7 +123,6 @@ jobs:
timeout-minutes: 15
run: |
${{ env.RUN }} "source selfdrive/test/setup_xvfb.sh && \
- export MAPBOX_TOKEN='pk.eyJ1Ijoiam5ld2IiLCJhIjoiY2xxNW8zZXprMGw1ZzJwbzZneHd2NHljbSJ9.gV7VPRfbXFetD-1OVF0XZg' && \
$PYTEST --timeout 60 -m 'not slow' && \
./selfdrive/ui/tests/create_test_translations.sh && \
QT_QPA_PLATFORM=offscreen ./selfdrive/ui/tests/test_translations && \
@@ -301,7 +300,6 @@ jobs:
run: >
${{ env.RUN }} "PYTHONWARNINGS=ignore &&
source selfdrive/test/setup_xvfb.sh &&
- export MAPBOX_TOKEN='pk.eyJ1Ijoiam5ld2IiLCJhIjoiY2xxNW8zZXprMGw1ZzJwbzZneHd2NHljbSJ9.gV7VPRfbXFetD-1OVF0XZg' &&
python selfdrive/ui/tests/test_ui/run.py"
- name: Upload Test Report
uses: actions/upload-artifact@v4
diff --git a/.github/workflows/tools_tests.yaml b/.github/workflows/tools_tests.yaml
index 9a26ca9a2..a1c95c046 100644
--- a/.github/workflows/tools_tests.yaml
+++ b/.github/workflows/tools_tests.yaml
@@ -34,8 +34,7 @@ jobs:
${{ env.RUN }} "scons -j$(nproc)"
- name: Run bridge test
run: |
- ${{ env.RUN }} "export MAPBOX_TOKEN='pk.eyJ1Ijoiam5ld2IiLCJhIjoiY2xxNW8zZXprMGw1ZzJwbzZneHd2NHljbSJ9.gV7VPRfbXFetD-1OVF0XZg' && \
- source selfdrive/test/setup_xvfb.sh && \
+ ${{ env.RUN }} "source selfdrive/test/setup_xvfb.sh && \
source selfdrive/test/setup_vsound.sh && \
CI=1 pytest tools/sim/tests/test_metadrive_bridge.py"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ecde9fe77..b853523e4 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,whit,indexIn
- --builtins clear,rare,informal,usage,code,names,en-GB_to_en-US
- repo: https://github.com/astral-sh/ruff-pre-commit
- rev: v0.4.9
+ rev: v0.4.10
hooks:
- id: ruff
exclude: '^(third_party/)|(msgq/)|(panda/)|(rednose/)|(rednose_repo/)|(tinygrad/)|(tinygrad_repo/)|(teleoprtc/)|(teleoprtc_repo/)'
diff --git a/Jenkinsfile b/Jenkinsfile
index 321237716..654aed49c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,7 +26,6 @@ export SOURCE_DIR=${env.SOURCE_DIR}
export GIT_BRANCH=${env.GIT_BRANCH}
export GIT_COMMIT=${env.GIT_COMMIT}
export AZURE_TOKEN='${env.AZURE_TOKEN}'
-export MAPBOX_TOKEN='${env.MAPBOX_TOKEN}'
# only use 1 thread for tici tests since most require HIL
export PYTEST_ADDOPTS="-n 0"
@@ -135,10 +134,8 @@ def pcStage(String stageName, Closure body) {
def setupCredentials() {
withCredentials([
string(credentialsId: 'azure_token', variable: 'AZURE_TOKEN'),
- string(credentialsId: 'mapbox_token', variable: 'MAPBOX_TOKEN')
]) {
env.AZURE_TOKEN = "${AZURE_TOKEN}"
- env.MAPBOX_TOKEN = "${MAPBOX_TOKEN}"
}
}
diff --git a/cereal/car.capnp b/cereal/car.capnp
index c17e1c063..3df23d992 100644
--- a/cereal/car.capnp
+++ b/cereal/car.capnp
@@ -116,6 +116,7 @@ struct CarEvent @0x9b1657f34caf3ad3 {
paramsdTemporaryError @50;
paramsdPermanentError @119;
actuatorsApiUnavailable @120;
+ espActive @121;
radarCanErrorDEPRECATED @15;
communityFeatureDisallowedDEPRECATED @62;
@@ -194,6 +195,7 @@ struct CarState {
espDisabled @32 :Bool;
accFaulted @42 :Bool;
carFaultedNonCritical @47 :Bool; # some ECU is faulted, but car remains controllable
+ espActive @51 :Bool;
# cruise state
cruiseState @10 :CruiseState;
diff --git a/docs/CARS.md b/docs/CARS.md
index 2c32a77f0..769fe6e27 100644
--- a/docs/CARS.md
+++ b/docs/CARS.md
@@ -27,7 +27,7 @@ A supported vehicle is one that just works when you install a comma device. All
|Chrysler|Pacifica 2021-23|All|Stock|0 mph|39 mph|[](##)|[](##)|Parts
- 1 FCA 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 FCA 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 FCA 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 FCA 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 FCA 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 USB-C coupler
- 1 VW J533 connector
- 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 FCA 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 Hyundai 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 Hyundai K 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 M 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 M 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 M 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 GM connector
- 1 comma 3X
- 1 harness box
- 1 mount
- 1 right angle OBD-C cable (1.5 ft)
Buy Here
|
|Honda|Accord 2018-22|All|openpilot available[1](#footnotes)|0 mph|3 mph|[](##)|[](##)|Parts
- 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 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 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 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 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 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 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 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 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 Here
@@ -177,8 +176,11 @@ QRect ChartsWidget::chartVisibleRect(ChartView *chart) {
}
void ChartsWidget::showValueTip(double sec) {
+ if (sec < 0 && !value_tip_visible_) return;
+
+ value_tip_visible_ = sec >= 0;
for (auto c : currentCharts()) {
- sec >= 0 ? c->showTip(sec) : c->hideTip();
+ value_tip_visible_ ? c->showTip(sec) : c->hideTip();
}
}
@@ -209,6 +211,12 @@ void ChartsWidget::setMaxChartRange(int value) {
updateState();
}
+void ChartsWidget::setIsDocked(bool docked) {
+ is_docked = docked;
+ dock_btn->setIcon(is_docked ? "arrow-up-right-square" : "arrow-down-left-square");
+ dock_btn->setToolTip(is_docked ? tr("Float the charts window") : tr("Dock the charts window"));
+}
+
void ChartsWidget::updateToolBar() {
title_label->setText(tr("Charts: %1").arg(charts.size()));
columns_action->setText(tr("Column: %1").arg(column_count));
@@ -222,8 +230,6 @@ void ChartsWidget::updateToolBar() {
reset_zoom_action->setVisible(is_zoomed);
reset_zoom_btn->setText(is_zoomed ? tr("%1-%2").arg(can->timeRange()->first, 0, 'f', 2).arg(can->timeRange()->second, 0, 'f', 2) : "");
remove_all_btn->setEnabled(!charts.isEmpty());
- dock_btn->setIcon(docking ? "arrow-up-right-square" : "arrow-down-left-square");
- dock_btn->setToolTip(docking ? tr("Undock charts") : tr("Dock charts"));
}
void ChartsWidget::settingChanged() {
@@ -375,11 +381,6 @@ QSize ChartsWidget::minimumSizeHint() const {
return QSize(CHART_MIN_WIDTH, QWidget::minimumSizeHint().height());
}
-void ChartsWidget::resizeEvent(QResizeEvent *event) {
- QWidget::resizeEvent(event);
- updateLayout();
-}
-
void ChartsWidget::newChart() {
SignalSelector dlg(tr("New Chart"), this);
if (dlg.exec() == QDialog::Accepted) {
@@ -432,10 +433,16 @@ void ChartsWidget::alignCharts() {
}
}
-bool ChartsWidget::eventFilter(QObject *obj, QEvent *event) {
- if (obj != this && event->type() == QEvent::Close) {
- emit dock_btn->clicked();
- return true;
+bool ChartsWidget::eventFilter(QObject *o, QEvent *e) {
+ if (value_tip_visible_ && e->type() == QEvent::MouseMove) {
+ auto pos = static_cast(e)->globalPos();
+ bool outside_plot_area =std::none_of(charts.begin(), charts.end(), [&pos](auto c) {
+ return c->chart()->plotArea().contains(c->mapFromGlobal(pos));
+ });
+
+ if (outside_plot_area) {
+ showValueTip(-1);
+ }
}
return false;
}
@@ -443,30 +450,25 @@ bool ChartsWidget::eventFilter(QObject *obj, QEvent *event) {
bool ChartsWidget::event(QEvent *event) {
bool back_button = false;
switch (event->type()) {
- case QEvent::MouseButtonPress: {
- QMouseEvent *ev = static_cast(event);
- back_button = ev->button() == Qt::BackButton;
+ case QEvent::Resize:
+ updateLayout();
break;
- }
- case QEvent::NativeGesture: {
- QNativeGestureEvent *ev = static_cast(event);
- back_button = (ev->value() == 180);
+ case QEvent::MouseButtonPress:
+ back_button = static_cast(event)->button() == Qt::BackButton;
+ break;
+ case QEvent::NativeGesture:
+ back_button = (static_cast(event)->value() == 180);
break;
- }
- case QEvent::WindowActivate:
case QEvent::WindowDeactivate:
- case QEvent::FocusIn:
case QEvent::FocusOut:
- case QEvent::Leave:
showValueTip(-1);
- break;
default:
break;
}
if (back_button) {
zoom_undo_stack->undo();
- return true;
+ return true; // Return true since the event has been handled
}
return QFrame::event(event);
}
diff --git a/tools/cabana/chart/chartswidget.h b/tools/cabana/chart/chartswidget.h
index a9ac05db2..0b948b342 100644
--- a/tools/cabana/chart/chartswidget.h
+++ b/tools/cabana/chart/chartswidget.h
@@ -47,14 +47,14 @@ public slots:
void setColumnCount(int n);
void removeAll();
void timeRangeChanged(const std::optional> &time_range);
+ void setIsDocked(bool dock);
signals:
- void dock(bool floating);
+ void toggleChartsDocking();
void seriesChanged();
private:
QSize minimumSizeHint() const override;
- void resizeEvent(QResizeEvent *event) override;
bool event(QEvent *event) override;
void alignCharts();
void newChart();
@@ -85,7 +85,7 @@ private:
LogSlider *range_slider;
QAction *range_lb_action;
QAction *range_slider_action;
- bool docking = true;
+ bool is_docked = true;
ToolButton *dock_btn;
QAction *undo_zoom_action;
@@ -109,6 +109,7 @@ private:
QTimer *auto_scroll_timer;
QTimer *align_timer;
int current_theme = 0;
+ bool value_tip_visible_ = false;
friend class ZoomCommand;
friend class ChartView;
friend class ChartsContainer;
diff --git a/tools/cabana/chart/tiplabel.cc b/tools/cabana/chart/tiplabel.cc
index f5c9cc9cb..be7160283 100644
--- a/tools/cabana/chart/tiplabel.cc
+++ b/tools/cabana/chart/tiplabel.cc
@@ -9,8 +9,12 @@
#include "tools/cabana/settings.h"
TipLabel::TipLabel(QWidget *parent) : QLabel(parent, Qt::ToolTip | Qt::FramelessWindowHint) {
+ setAttribute(Qt::WA_ShowWithoutActivating);
+ setAttribute(Qt::WA_TransparentForMouseEvents);
+
setForegroundRole(QPalette::ToolTipText);
setBackgroundRole(QPalette::ToolTipBase);
+
QFont font;
font.setPointSizeF(8.34563465);
setFont(font);
@@ -22,9 +26,7 @@ TipLabel::TipLabel(QWidget *parent) : QLabel(parent, Qt::ToolTip | Qt::Frameless
setPalette(palette);
ensurePolished();
setMargin(1 + style()->pixelMetric(QStyle::PM_ToolTipLabelFrameWidth, nullptr, this));
- setAttribute(Qt::WA_ShowWithoutActivating);
setTextFormat(Qt::RichText);
- setVisible(false);
}
void TipLabel::showText(const QPoint &pt, const QString &text, QWidget *w, const QRect &rect) {
diff --git a/tools/cabana/mainwin.cc b/tools/cabana/mainwin.cc
index d099fcec9..bf1db63ee 100644
--- a/tools/cabana/mainwin.cc
+++ b/tools/cabana/mainwin.cc
@@ -198,7 +198,7 @@ void MainWindow::createDockWidgets() {
video_splitter->restoreState(settings.video_splitter_state);
video_splitter->handle(1)->setEnabled(!can->liveStreaming());
video_dock->setWidget(video_splitter);
- QObject::connect(charts_widget, &ChartsWidget::dock, this, &MainWindow::dockCharts);
+ QObject::connect(charts_widget, &ChartsWidget::toggleChartsDocking, this, &MainWindow::toggleChartsDocking);
}
void MainWindow::createStatusBar() {
@@ -577,20 +577,31 @@ void MainWindow::updateStatus() {
status_label->setText(tr("Cached Minutes:%1 FPS:%2").arg(settings.max_cached_minutes).arg(settings.fps));
}
-void MainWindow::dockCharts(bool dock) {
- if (dock && floating_window) {
- floating_window->removeEventFilter(charts_widget);
+bool MainWindow::eventFilter(QObject *obj, QEvent *event) {
+ if (obj == floating_window && event->type() == QEvent::Close) {
+ toggleChartsDocking();
+ return true;
+ }
+ return QMainWindow::eventFilter(obj, event);
+}
+
+void MainWindow::toggleChartsDocking() {
+ if (floating_window) {
+ // Dock the charts widget back to the main window
+ floating_window->removeEventFilter(this);
charts_layout->insertWidget(0, charts_widget, 1);
floating_window->deleteLater();
floating_window = nullptr;
- } else if (!dock && !floating_window) {
- floating_window = new QWidget(this);
- floating_window->setWindowFlags(Qt::Window);
+ charts_widget->setIsDocked(true);
+ } else {
+ // Float the charts widget in a separate window
+ floating_window = new QWidget(this, Qt::Window);
floating_window->setWindowTitle("Charts");
floating_window->setLayout(new QVBoxLayout());
floating_window->layout()->addWidget(charts_widget);
- floating_window->installEventFilter(charts_widget);
+ floating_window->installEventFilter(this);
floating_window->showMaximized();
+ charts_widget->setIsDocked(false);
}
}
diff --git a/tools/cabana/mainwin.h b/tools/cabana/mainwin.h
index 0b869f153..77add4d78 100644
--- a/tools/cabana/mainwin.h
+++ b/tools/cabana/mainwin.h
@@ -21,7 +21,7 @@ class MainWindow : public QMainWindow {
public:
MainWindow();
- void dockCharts(bool dock);
+ void toggleChartsDocking();
void showStatusMessage(const QString &msg, int timeout = 0) { statusBar()->showMessage(msg, timeout); }
void loadFile(const QString &fn, SourceSet s = SOURCE_ALL);
ChartsWidget *charts_widget = nullptr;
@@ -46,6 +46,7 @@ signals:
void updateProgressBar(uint64_t cur, uint64_t total, bool success);
protected:
+ bool eventFilter(QObject *obj, QEvent *event) override;
void remindSaveChanges();
void closeFile(SourceSet s = SOURCE_ALL);
void closeFile(DBCFile *dbc_file);
diff --git a/tools/cabana/messageswidget.cc b/tools/cabana/messageswidget.cc
index 396cfdc38..d6c2fd0ea 100644
--- a/tools/cabana/messageswidget.cc
+++ b/tools/cabana/messageswidget.cc
@@ -411,7 +411,7 @@ void MessageView::updateBytesSectionSize() {
max_bytes = std::max(max_bytes, m.dat.size());
}
}
- setUniformRowHeights(!delegate->multipleLines() || max_bytes <= 8);
+ setUniformRowHeights(!delegate->multipleLines());
header()->resizeSection(MessageListModel::Column::DATA, delegate->sizeForBytes(max_bytes).width());
}
diff --git a/tools/install_ubuntu_dependencies.sh b/tools/install_ubuntu_dependencies.sh
index 2513df86b..4373760ce 100755
--- a/tools/install_ubuntu_dependencies.sh
+++ b/tools/install_ubuntu_dependencies.sh
@@ -53,6 +53,7 @@ function install_ubuntu_common_requirements() {
ocl-icd-libopencl1 \
ocl-icd-opencl-dev \
portaudio19-dev \
+ qml-module-qtquick2 \
qtmultimedia5-dev \
qtdeclarative5-dev \
qttools5-dev-tools \