mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-08-20 05:03:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

cabana: fix macOS build and --zmq bridge path (#38484)

Browse Source 
Two macOS-only cabana fixes:

- signalview.h: rename the SignalView::setModel parameter that shadowed
  the `model` member. Newer clang (Apple clang 21) folds
  "parameter shadows a field" into plain -Wshadow, so with -Werror this
  breaks the macOS build. Older clang (CI's image) only flags it under
  -Wshadow-all, which is why CI stays green. The rename is clean under
  any -Wshadow level and gcc.

- devicestream.cc: the --zmq bridge path had a stale `openpilot/`
  segment (`../../openpilot/cereal/messaging/bridge`), a monorepo-layout
  leftover that resolved to a non-existent triple-`openpilot` path, so
  the bridge failed to exec and live streaming was broken. Drop it to
  `../../cereal/messaging/bridge`.

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Shane Smiskol
2026-07-28 20:00:25 -07:00
committed by GitHub
parent 952d2cab8a
commit 4cfdcea1d1
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openpilot/tools/cabana/signalview.h
+4 -4
View File
@@ -129,11 +129,11 @@ private:
// update widget geometries in QTreeView::rowsInserted
QTreeView::rowsInserted(parent, start, end);
}
void setModel(QAbstractItemModel *model) override {
QTreeView::setModel(model);
void setModel(QAbstractItemModel *m) override {
QTreeView::setModel(m);
// Bypass the slow call to QTreeView::dataChanged.
QObject::disconnect(model, &QAbstractItemModel::dataChanged, this, nullptr);
QObject::connect(model, &QAbstractItemModel::dataChanged, this,
QObject::disconnect(m, &QAbstractItemModel::dataChanged, this, nullptr);
QObject::connect(m, &QAbstractItemModel::dataChanged, this,
[this](const QModelIndex &tl, const QModelIndex &br, const auto &roles) { QAbstractItemView::dataChanged(tl, br, roles); });
}
void leaveEvent(QEvent *event) override {
openpilot/tools/cabana/streams/devicestream.cc
+1 -1
View File
@@ -53,7 +53,7 @@ void DeviceStream::start() {
if (!zmq_address.isEmpty()) {
stopBridge();
const std::string path = (std::filesystem::path(QCoreApplication::applicationDirPath().toStdString()) /
"../../openpilot/cereal/messaging/bridge").lexically_normal().string();
"../../cereal/messaging/bridge").lexically_normal().string();
const std::string addr = zmq_address.toStdString();
const char *can_filter = "/\"can/\"";