mirror of
https://github.com/infiniteCable2/openpilot.git
synced 2026-09-12 03:03:41 +08:00
ee5c1c4507
* allow re-regage
* bump opendbc
* bump panda
* apply pause/resume fix for hyundai (should do this in a separate PR)
* bump opendbc
* fix
* rename
* Fix?
* make sure to disengage for allow always cars
* fix
* combine
* more fix
* not needed
* check if engagement is from openpilot's state machine
* Rename
* fix panda safety
* fix
* no fake lfa button for @devtekve ;)
* fix non drive gear re-engage
* fix settings
* combine
* add replace method
* use replace
* remoev already checks if it exists
* fix
* group
* add todo
* reserve events
* cleaner
* hyundai: only allow for cars with lfa button
* sunnyParams
* make sure it's car only
* Move car-specific changes to opendbc
* no need
* bump opendbc
* more fixes
* no more available
* more!
* final?
* always emit user disable
* no longer needed
* move unit test
* add sunnypilot to unit tests
* bump opendbc
* use new cereal
* bump opendbc
* static analysis
* no unittest
* no need available
* UI border update
* show MADS updates
* Add TODO
* no longer needed
* fix changed events
* fix cluster enabled
* don't add pre enable if not long
* should use enabled
* enabled <-> active
* better format
* bump opendbc
* static analysis
* static analysis
* Rename test as collector was dying
* Show our overriding
* Revert "show MADS updates"
This reverts commit daf0ad62
Revert "fix changed events"
This reverts commit 31d8c97f
* ignoring reserved events
* adjusting creation delays
* back to stock
removing allow_cancel
* should be enabled
* revert
* silent lkas disable
* no need
* user disable tests
* just warning
* MUST REMOVE test process replay
* fix no entry
* fixme
* bump opendbc
* need this check
* cleanup
* allow entering paused state if no entry from disabled
* brake hold should apply to all
* in lists
* update unit test
* simpler
* unused
* same thing
* fix
* only mads in enabled state and long in disabled state
* unify silent enable
* do this for dlob
* bump submodules
* fix
* bump submodules
* bump opendbc
* less frequent
* more events
* fix
* allow no entry to paused for non-drive gears
* fix
* use cereal
* Revert "allow no entry to paused for non-drive gears"
This reverts commit 6d64a4dd9c6de5ad14ef1e88dbc3b6ad174232d8.
* allow in all
* Revert "allow in all"
This reverts commit 6375f1489176dc6c69cb7fa388676e482713f80a.
* should not be all!
* rename for clarity
* silent park brake
* flipped
* bump submodules
* Bump to latest mads-new panda
* bump panda
* more nissan
* bump panda
* bump msgq
* bump panda
* bump submodules
* bump opendbc
* bump opendbc
* improving the state
* Revert "PlayStation® model (#34133)"
This reverts commit 5160bee543.
* should be none
* bump panda
* bump opendbc
* Apply suggestions from code review
* bump panda
* bump ref panda
* add todo-sp
* bump panda ref
* bump more panda
* changing refs
* nuke nuke nuke
* use sunny's newer states
* bump with new panda
* bump panda
* Parse more flags from alt exp, more tests, hyundai main cruise allowed
* Parse more flags from alt exp, more tests, hyundai main cruise allowed
* missed
* mutation for controls allowed rising edge
* ford mutation
* license
* remove
* unused
* bump submodules
* use always allowed mads button alt exp
* fix
* whitelist jason's lastname to codespell
* test_processes: update ref logs to 82c0278
* bump submodules
* bump submodules
* bump submodules
* bump panda
* add controls mismatch lateral event
* Simplify lateral disengagement logic for MADS configuration
Reversed the conditional to align the logic with the `disengage_lateral_on_brake` parameter. This ensures that lateral disengagement behavior is more intuitive and matches the expected configuration. Improves code readability and reduces potential misconfigurations.
* remove unified engagement mode in panda
* controls allow should be allowed at all times
* squash! treat MADS button as user entry
* heartbeat for mads
* heartbeat mismatch exit control
* remove always allow mads button from alt
* move to safety_mads
* remove main cruise allowed from alt
* bump panda
* heartbeat engaged mads mismatch mutation test
* bump panda
* use mads the third panda
* ignore pre enable with mads
* only force exit if actually actuating
* use brake signal instead of pedal events when dlob is active
* fix tests
* fix panda tests
* bump panda
* new events to retain long blocks
* format
* uem: do not engage mads if long is engaged
* bump submodules
* fix not allowed engaged bug
* block uem from engaging
* flipped
* use different heartbeat check if dlob
* hard code to skip heartbeat check
* remove toyota lta status for lkas, causes weird behaviors
* block tesla
* bump panda
* bump to merged panda
* bump opendbc
* bump opendbc
* bump opendbc
* bump opendbc
* Apply suggestions from code review
* code ignore spells
* needs to be in carstate
* Bump opendbc
* Update MADS toggle descriptions for clarity.
Added notes to clarify behavior of the "MadsMainCruiseAllowed" setting, particularly its impact on vehicles without LFA/LKAS buttons. This ensures users are informed about potential implications when disabling this feature.
* Updating translations + Adding spanish
* Disengage Lateral on Brake -> Pause Lateral on Brake
* test_processes: update ref logs to dd41005
* Apply suggestions from code review
* fix mads button not allowed
* bump submodules
* bump submodule
* test_processes: update ref logs to 0a0b998
* has multiple lists
* Revert "has multiple lists"
This reverts commit a37c1d26feac02f63bfb86a08f9b6fb06b095cf1.
* base
* Reapply "has multiple lists"
This reverts commit d1cd8dcc815721a4113b26ab98ee2571c071e225.
* migrate mads toggles to sp panel
* this is why it keeps crashing
* house keeping
* more housekeeping
* more housekeeping
* don't show description by default (yet)
* reset to main panel when clicked away
* more
* some more with interactions
* don't stretch cause it looks weird with descriptions
* simpler to handle offroad transition
* some are toggleable while onroad
* remove unused event
* slight cleanup
* default to true for HKG main cruise toggle
* append to list after
* add Customize MADS to UI preview
* simpler
* move to sp list
* how tf was this removed
* update mads settings button on show event
* test_processes: update ref logs to efa9c32
---------
Co-authored-by: Jason Wen <haibin.wen3@gmail.com>
188 lines
6.2 KiB
C++
188 lines
6.2 KiB
C++
#include "tools/cabana/streams/pandastream.h"
|
|
|
|
#include <QDebug>
|
|
#include <QCheckBox>
|
|
#include <QLabel>
|
|
#include <QMessageBox>
|
|
#include <QPushButton>
|
|
#include <QThread>
|
|
#include <QTimer>
|
|
|
|
PandaStream::PandaStream(QObject *parent, PandaStreamConfig config_) : config(config_), LiveStream(parent) {
|
|
if (!connect()) {
|
|
throw std::runtime_error("Failed to connect to panda");
|
|
}
|
|
}
|
|
|
|
bool PandaStream::connect() {
|
|
try {
|
|
qDebug() << "Connecting to panda " << config.serial;
|
|
panda.reset(new Panda(config.serial.toStdString()));
|
|
config.bus_config.resize(3);
|
|
qDebug() << "Connected";
|
|
} catch (const std::exception& e) {
|
|
return false;
|
|
}
|
|
|
|
panda->set_safety_model(cereal::CarParams::SafetyModel::SILENT);
|
|
for (int bus = 0; bus < config.bus_config.size(); bus++) {
|
|
panda->set_can_speed_kbps(bus, config.bus_config[bus].can_speed_kbps);
|
|
|
|
// CAN-FD
|
|
if (panda->hw_type == cereal::PandaState::PandaType::RED_PANDA || panda->hw_type == cereal::PandaState::PandaType::RED_PANDA_V2) {
|
|
if (config.bus_config[bus].can_fd) {
|
|
panda->set_data_speed_kbps(bus, config.bus_config[bus].data_speed_kbps);
|
|
} else {
|
|
// Hack to disable can-fd by setting data speed to a low value
|
|
panda->set_data_speed_kbps(bus, 10);
|
|
}
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
void PandaStream::streamThread() {
|
|
std::vector<can_frame> raw_can_data;
|
|
|
|
while (!QThread::currentThread()->isInterruptionRequested()) {
|
|
QThread::msleep(1);
|
|
|
|
if (!panda->connected()) {
|
|
qDebug() << "Connection to panda lost. Attempting reconnect.";
|
|
if (!connect()){
|
|
QThread::msleep(1000);
|
|
continue;
|
|
}
|
|
}
|
|
|
|
raw_can_data.clear();
|
|
if (!panda->can_receive(raw_can_data)) {
|
|
qDebug() << "failed to receive";
|
|
continue;
|
|
}
|
|
|
|
MessageBuilder msg;
|
|
auto evt = msg.initEvent();
|
|
auto canData = evt.initCan(raw_can_data.size());
|
|
for (uint i = 0; i<raw_can_data.size(); i++) {
|
|
canData[i].setAddress(raw_can_data[i].address);
|
|
canData[i].setDat(kj::arrayPtr((uint8_t*)raw_can_data[i].dat.data(), raw_can_data[i].dat.size()));
|
|
canData[i].setSrc(raw_can_data[i].src);
|
|
}
|
|
|
|
handleEvent(capnp::messageToFlatArray(msg));
|
|
|
|
panda->send_heartbeat(false, false);
|
|
}
|
|
}
|
|
|
|
// OpenPandaWidget
|
|
|
|
OpenPandaWidget::OpenPandaWidget(QWidget *parent) : AbstractOpenStreamWidget(parent) {
|
|
form_layout = new QFormLayout(this);
|
|
if (can && dynamic_cast<PandaStream *>(can) != nullptr) {
|
|
form_layout->addWidget(new QLabel(tr("Already connected to %1.").arg(can->routeName())));
|
|
form_layout->addWidget(new QLabel("Close the current connection via [File menu -> Close Stream] before connecting to another Panda."));
|
|
QTimer::singleShot(0, [this]() { emit enableOpenButton(false); });
|
|
return;
|
|
}
|
|
|
|
QHBoxLayout *serial_layout = new QHBoxLayout();
|
|
serial_layout->addWidget(serial_edit = new QComboBox());
|
|
|
|
QPushButton *refresh = new QPushButton(tr("Refresh"));
|
|
refresh->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
|
|
serial_layout->addWidget(refresh);
|
|
form_layout->addRow(tr("Serial"), serial_layout);
|
|
|
|
QObject::connect(refresh, &QPushButton::clicked, this, &OpenPandaWidget::refreshSerials);
|
|
QObject::connect(serial_edit, &QComboBox::currentTextChanged, this, &OpenPandaWidget::buildConfigForm);
|
|
|
|
// Populate serials
|
|
refreshSerials();
|
|
buildConfigForm();
|
|
}
|
|
|
|
void OpenPandaWidget::refreshSerials() {
|
|
serial_edit->clear();
|
|
for (auto serial : Panda::list()) {
|
|
serial_edit->addItem(QString::fromStdString(serial));
|
|
}
|
|
}
|
|
|
|
void OpenPandaWidget::buildConfigForm() {
|
|
for (int i = form_layout->rowCount() - 1; i > 0; --i) {
|
|
form_layout->removeRow(i);
|
|
}
|
|
|
|
QString serial = serial_edit->currentText();
|
|
bool has_fd = false;
|
|
bool has_panda = !serial.isEmpty();
|
|
if (has_panda) {
|
|
try {
|
|
Panda panda(serial.toStdString());
|
|
has_fd = (panda.hw_type == cereal::PandaState::PandaType::RED_PANDA) || (panda.hw_type == cereal::PandaState::PandaType::RED_PANDA_V2);
|
|
} catch (const std::exception& e) {
|
|
qDebug() << "failed to open panda" << serial;
|
|
has_panda = false;
|
|
}
|
|
}
|
|
|
|
if (has_panda) {
|
|
config.serial = serial;
|
|
config.bus_config.resize(3);
|
|
for (int i = 0; i < config.bus_config.size(); i++) {
|
|
QHBoxLayout *bus_layout = new QHBoxLayout;
|
|
|
|
// CAN Speed
|
|
bus_layout->addWidget(new QLabel(tr("CAN Speed (kbps):")));
|
|
QComboBox *can_speed = new QComboBox;
|
|
for (int j = 0; j < std::size(speeds); j++) {
|
|
can_speed->addItem(QString::number(speeds[j]));
|
|
|
|
if (data_speeds[j] == config.bus_config[i].can_speed_kbps) {
|
|
can_speed->setCurrentIndex(j);
|
|
}
|
|
}
|
|
QObject::connect(can_speed, qOverload<int>(&QComboBox::currentIndexChanged), [=](int index) {config.bus_config[i].can_speed_kbps = speeds[index];});
|
|
bus_layout->addWidget(can_speed);
|
|
|
|
// CAN-FD Speed
|
|
if (has_fd) {
|
|
QCheckBox *enable_fd = new QCheckBox("CAN-FD");
|
|
bus_layout->addWidget(enable_fd);
|
|
bus_layout->addWidget(new QLabel(tr("Data Speed (kbps):")));
|
|
QComboBox *data_speed = new QComboBox;
|
|
for (int j = 0; j < std::size(data_speeds); j++) {
|
|
data_speed->addItem(QString::number(data_speeds[j]));
|
|
|
|
if (data_speeds[j] == config.bus_config[i].data_speed_kbps) {
|
|
data_speed->setCurrentIndex(j);
|
|
}
|
|
}
|
|
|
|
data_speed->setEnabled(false);
|
|
bus_layout->addWidget(data_speed);
|
|
|
|
QObject::connect(data_speed, qOverload<int>(&QComboBox::currentIndexChanged), [=](int index) {config.bus_config[i].data_speed_kbps = data_speeds[index];});
|
|
QObject::connect(enable_fd, &QCheckBox::stateChanged, data_speed, &QComboBox::setEnabled);
|
|
QObject::connect(enable_fd, &QCheckBox::stateChanged, [=](int state) {config.bus_config[i].can_fd = (bool)state;});
|
|
}
|
|
|
|
form_layout->addRow(tr("Bus %1:").arg(i), bus_layout);
|
|
}
|
|
} else {
|
|
config.serial = "";
|
|
form_layout->addWidget(new QLabel(tr("No panda found")));
|
|
}
|
|
}
|
|
|
|
AbstractStream *OpenPandaWidget::open() {
|
|
try {
|
|
return new PandaStream(qApp, config);
|
|
} catch (std::exception &e) {
|
|
QMessageBox::warning(nullptr, tr("Warning"), tr("Failed to connect to panda: '%1'").arg(e.what()));
|
|
return nullptr;
|
|
}
|
|
}
|