From ad62a448fa7b6608b95adfe29461bac0bf9b9111 Mon Sep 17 00:00:00 2001 From: Vivek Aithal Date: Thu, 3 Nov 2022 13:21:11 -0700 Subject: [PATCH 001/184] [torqued] Set HYUNDAI ELANTRA 2021 Offline vlaues (#26344) change elantra values --- selfdrive/car/torque_data/params.yaml | 1 + selfdrive/car/torque_data/substitute.yaml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/selfdrive/car/torque_data/params.yaml b/selfdrive/car/torque_data/params.yaml index 5c828fa669..c2ebadfc7a 100644 --- a/selfdrive/car/torque_data/params.yaml +++ b/selfdrive/car/torque_data/params.yaml @@ -25,6 +25,7 @@ HONDA ODYSSEY 2018: [1.8774809275211801, 0.8394431662987996, 0.2096978613792822] HONDA PASSPORT 2021: [1.5305538930036766, 0.7956063674638759, 0.19599407381531284] HONDA PILOT 2017: [1.7262026201812795, 0.9470005614967523, 0.21351430733218763] HONDA RIDGELINE 2017: [1.4146525028237624, 0.7356572861629564, 0.23307177552211328] +HYUNDAI ELANTRA 2021: [3.169, 2.1259108157250735, 0.0819] HYUNDAI GENESIS 2015-2016: [1.8466226943929824, 1.5552063647830634, 0.0984484465421171] HYUNDAI IONIQ ELECTRIC LIMITED 2019: [1.7662975472852054, 1.613755614526594, 0.17087579756306276] HYUNDAI IONIQ PHEV 2020: [3.2928700076638537, 2.1193482926455656, 0.12463700961468778] diff --git a/selfdrive/car/torque_data/substitute.yaml b/selfdrive/car/torque_data/substitute.yaml index acd7526003..c043c9d455 100644 --- a/selfdrive/car/torque_data/substitute.yaml +++ b/selfdrive/car/torque_data/substitute.yaml @@ -35,7 +35,6 @@ HYUNDAI IONIQ HYBRID 2020-2022: HYUNDAI IONIQ PLUG-IN HYBRID 2019 HYUNDAI IONIQ ELECTRIC 2020: HYUNDAI IONIQ PLUG-IN HYBRID 2019 HYUNDAI ELANTRA 2017: HYUNDAI SONATA 2019 HYUNDAI ELANTRA HYBRID 2021: HYUNDAI SONATA 2020 -HYUNDAI ELANTRA 2021: HYUNDAI SONATA 2020 HYUNDAI TUCSON 2019: HYUNDAI SANTA FE 2019 HYUNDAI SANTA FE 2022: HYUNDAI SANTA FE HYBRID 2022 GENESIS G90 2017: GENESIS G70 2018 From 70363e2491ea4150f85b44ff221d3318208581a9 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Fri, 4 Nov 2022 04:23:53 +0800 Subject: [PATCH 002/184] Cabana: word wrap header (#26341) * auto wrap header * custom headerview --- tools/cabana/historylog.cc | 17 +++++++++++++++-- tools/cabana/historylog.h | 7 +++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/tools/cabana/historylog.cc b/tools/cabana/historylog.cc index 5737421f28..7bb2f37699 100644 --- a/tools/cabana/historylog.cc +++ b/tools/cabana/historylog.cc @@ -1,9 +1,10 @@ #include "tools/cabana/historylog.h" #include -#include #include +// HistoryLogModel + QVariant HistoryLogModel::data(const QModelIndex &index, int role) const { bool has_signal = dbc_msg && !dbc_msg->sigs.empty(); if (role == Qt::DisplayRole) { @@ -37,7 +38,7 @@ QVariant HistoryLogModel::headerData(int section, Qt::Orientation orientation, i if (section == 0) { return "Time"; } - return has_signal ? dbc_msg->sigs[section - 1].name.c_str() : "Data"; + return has_signal ? QString::fromStdString(dbc_msg->sigs[section - 1].name).replace('_', ' ') : "Data"; } else if (role == Qt::BackgroundRole && section > 0 && has_signal) { return QBrush(QColor(getColor(section - 1))); } @@ -64,10 +65,22 @@ void HistoryLogModel::updateState() { } } +// HeaderView + +QSize HeaderView::sectionSizeFromContents(int logicalIndex) const { + const QString text = model()->headerData(logicalIndex, this->orientation(), Qt::DisplayRole).toString(); + const QRect rect = fontMetrics().boundingRect(QRect(0, 0, sectionSize(logicalIndex), 1000), defaultAlignment(), text); + return rect.size() + QSize{10, 5}; +} + +// HistoryLog + HistoryLog::HistoryLog(QWidget *parent) : QTableView(parent) { model = new HistoryLogModel(this); setModel(model); + setHorizontalHeader(new HeaderView(Qt::Horizontal, this)); horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch); + horizontalHeader()->setDefaultAlignment(Qt::AlignLeft | (Qt::Alignment)Qt::TextWordWrap); horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents); verticalHeader()->setVisible(false); setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); diff --git a/tools/cabana/historylog.h b/tools/cabana/historylog.h index 0bfc409fe1..e1c1319166 100644 --- a/tools/cabana/historylog.h +++ b/tools/cabana/historylog.h @@ -1,10 +1,17 @@ #pragma once +#include #include #include "tools/cabana/canmessages.h" #include "tools/cabana/dbcmanager.h" +class HeaderView : public QHeaderView { +public: + HeaderView(Qt::Orientation orientation, QWidget *parent = nullptr) : QHeaderView(orientation, parent) {} + QSize sectionSizeFromContents(int logicalIndex) const; +}; + class HistoryLogModel : public QAbstractTableModel { Q_OBJECT From d172cbbcc8c35b834812871d6768072b9bb1f594 Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Thu, 3 Nov 2022 16:33:01 -0400 Subject: [PATCH 003/184] VW MQB: Add FW for 2021 Audi Q3 (#26343) * VW MQB: Add FW for 2021 Audi Q3 * update docs --- docs/CARS.md | 2 +- selfdrive/car/volkswagen/values.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/CARS.md b/docs/CARS.md index ad288a1cc6..e9d7b9c82f 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -14,7 +14,7 @@ A supported vehicle is one that just works when you install a comma three. All s |Audi|A3 2014-19|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| |Audi|A3 Sportback e-tron 2017-18|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| |Audi|Q2 2018|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| -|Audi|Q3 2020-21|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| +|Audi|Q3 2019-23|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| |Audi|RS3 2018|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| |Audi|S3 2015-17|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| |Cadillac|Escalade ESV 2016[3](#footnotes)|Adaptive Cruise Control (ACC) & LKAS|openpilot|0 mph|6 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|OBD-II| diff --git a/selfdrive/car/volkswagen/values.py b/selfdrive/car/volkswagen/values.py index 695868452d..ee5687eb1d 100755 --- a/selfdrive/car/volkswagen/values.py +++ b/selfdrive/car/volkswagen/values.py @@ -227,7 +227,7 @@ CAR_INFO: Dict[str, Union[VWCarInfo, List[VWCarInfo]]] = { VWCarInfo("Audi S3 2015-17"), ], CAR.AUDI_Q2_MK1: VWCarInfo("Audi Q2 2018"), - CAR.AUDI_Q3_MK2: VWCarInfo("Audi Q3 2020-21"), + CAR.AUDI_Q3_MK2: VWCarInfo("Audi Q3 2019-23"), CAR.SEAT_ATECA_MK1: VWCarInfo("SEAT Ateca 2018"), CAR.SEAT_LEON_MK3: VWCarInfo("SEAT Leon 2014-20"), CAR.SKODA_KAMIQ_MK1: VWCarInfo("Škoda Kamiq 2021", footnotes=[Footnote.KAMIQ]), @@ -872,20 +872,24 @@ FW_VERSIONS = { CAR.AUDI_Q3_MK2: { (Ecu.engine, 0x7e0, None): [ b'\xf1\x8705E906018N \xf1\x899970', + b'\xf1\x8705L906022M \xf1\x890901', b'\xf1\x8783A906259 \xf1\x890001', b'\xf1\x8783A906259 \xf1\x890005', ], (Ecu.transmission, 0x7e1, None): [ b'\xf1\x8709G927158CN\xf1\x893608', + b'\xf1\x870GC300045D \xf1\x892802', b'\xf1\x870GC300046F \xf1\x892701', ], (Ecu.srs, 0x715, None): [ b'\xf1\x875Q0959655BF\xf1\x890403\xf1\x82\x1321211111211200311121232152219321422111', + b'\xf1\x875Q0959655CC\xf1\x890421\xf1\x82\x131111111111120031111224118A119321532111', b'\xf1\x875Q0959655CC\xf1\x890421\xf1\x82\x131111111111120031111237116A119321532111', ], (Ecu.eps, 0x712, None): [ b'\xf1\x875Q0910143C \xf1\x892211\xf1\x82\x0567G6000300', b'\xf1\x875Q0910143C \xf1\x892211\xf1\x82\x0567G6000800', + b'\xf1\x875QF909144B \xf1\x895582\xf1\x82\x0571G60533A1', ], (Ecu.fwdRadar, 0x757, None): [ b'\xf1\x872Q0907572R \xf1\x890372', From aab4b7941665528dd8dbf59eb125cfd377f07250 Mon Sep 17 00:00:00 2001 From: ZwX1616 Date: Thu, 3 Nov 2022 14:27:45 -0700 Subject: [PATCH 004/184] CI: set OX frame sync tolerance (#26347) * ox tolerate * int * update comments --- system/camerad/test/test_camerad.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/system/camerad/test/test_camerad.py b/system/camerad/test/test_camerad.py index 378d4b7058..3c6d466a69 100755 --- a/system/camerad/test/test_camerad.py +++ b/system/camerad/test/test_camerad.py @@ -4,12 +4,14 @@ import unittest from collections import defaultdict import cereal.messaging as messaging +from cereal import log from cereal.services import service_list from selfdrive.manager.process_config import managed_processes from system.hardware import TICI TEST_TIMESPAN = 30 -LAG_FRAME_TOLERANCE = 0.5 # ms +LAG_FRAME_TOLERANCE = {log.FrameData.ImageSensor.ar0321: 0.5, # ARs use synced pulses for frame starts + log.FrameData.ImageSensor.ox03c10: 1.0} # OXs react to out-of-sync at next frame CAMERAS = ('roadCameraState', 'driverCameraState', 'wideRoadCameraState') @@ -62,6 +64,7 @@ class TestCamerad(unittest.TestCase): assert len(skips) == 0, f"Found frame skips, missing cameras for the following frames: {skips}" def test_frame_sync(self): + sensor_type = [getattr(msgs[0], msgs[0].which()).sensor for frame_id, msgs in self.log_by_frame_id.items()][0].raw frame_times = {frame_id: [getattr(m, m.which()).timestampSof for m in msgs] for frame_id, msgs in self.log_by_frame_id.items()} diffs = {frame_id: (max(ts) - min(ts))/1e6 for frame_id, ts in frame_times.items()} @@ -69,7 +72,7 @@ class TestCamerad(unittest.TestCase): def get_desc(fid, diff): cam_times = [(m.which(), getattr(m, m.which()).timestampSof/1e6) for m in self.log_by_frame_id[fid]] return f"{diff=} {cam_times=}" - laggy_frames = {k: get_desc(k, v) for k, v in diffs.items() if v > LAG_FRAME_TOLERANCE} + laggy_frames = {k: get_desc(k, v) for k, v in diffs.items() if v > LAG_FRAME_TOLERANCE[sensor_type]} assert len(laggy_frames) == 0, f"Frames not synced properly: {laggy_frames=}" if __name__ == "__main__": From c9e65be9b16064c57814218b7c0ebb67a168333f Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Thu, 3 Nov 2022 17:37:21 -0400 Subject: [PATCH 005/184] VW MQB: Harness updates and docs cleanup (#26313) * VW MQB: Harness updates * don't need the variant footnote Co-authored-by: Adeeb Shihadeh --- docs/CARS.md | 95 +++++++++++++++--------------- selfdrive/car/volkswagen/values.py | 76 +++++++++++------------- 2 files changed, 82 insertions(+), 89 deletions(-) diff --git a/docs/CARS.md b/docs/CARS.md index e9d7b9c82f..fa1b54c1c3 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -11,12 +11,12 @@ A supported vehicle is one that just works when you install a comma three. All s |Acura|ILX 2016-19|AcuraWatch Plus|openpilot|25 mph|25 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Honda Nidec| |Acura|RDX 2016-18|AcuraWatch Plus|openpilot|25 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Honda Nidec| |Acura|RDX 2019-22|All|openpilot available[1](#footnotes)|0 mph|3 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Honda Bosch A| -|Audi|A3 2014-19|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| -|Audi|A3 Sportback e-tron 2017-18|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| -|Audi|Q2 2018|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| -|Audi|Q3 2019-23|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| -|Audi|RS3 2018|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| -|Audi|S3 2015-17|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| +|Audi|A3 2014-19|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Audi|A3 Sportback e-tron 2017-18|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Audi|Q2 2018|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Audi|Q3 2019-23|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Audi|RS3 2018|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Audi|S3 2015-17|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| |Cadillac|Escalade ESV 2016[3](#footnotes)|Adaptive Cruise Control (ACC) & LKAS|openpilot|0 mph|6 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|OBD-II| |Chevrolet|Bolt EUV 2022-23|Premier or Premier Redline Trim without Super Cruise Package|openpilot available[1](#footnotes)|3 mph|6 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|GM| |Chevrolet|Silverado 1500 2020-21|Safety Package II|openpilot available[1](#footnotes)|3 mph|6 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|GM| @@ -129,8 +129,8 @@ A supported vehicle is one that just works when you install a comma three. All s |Nissan|Rogue 2018-20|ProPILOT Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Nissan A| |Nissan|X-Trail 2017|ProPILOT Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Nissan A| |Ram|1500 2019-22|Adaptive Cruise Control (ACC)|Stock|0 mph|32 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Ram| -|SEAT|Ateca 2018|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| -|SEAT|Leon 2014-20|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| +|SEAT|Ateca 2018|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|SEAT|Leon 2014-20|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| |Subaru|Ascent 2019-21|All|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Subaru A| |Subaru|Crosstrek 2018-19|EyeSight Driver Assistance|Stock|0 mph|0 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Subaru A| |Subaru|Crosstrek 2020-21|EyeSight Driver Assistance|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Subaru A| @@ -141,13 +141,13 @@ A supported vehicle is one that just works when you install a comma three. All s |Subaru|Outback 2020-22|All|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Subaru B| |Subaru|XV 2018-19|EyeSight Driver Assistance|Stock|0 mph|0 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Subaru A| |Subaru|XV 2020-21|EyeSight Driver Assistance|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Subaru A| -|Škoda|Kamiq 2021[6](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| -|Škoda|Karoq 2019-21[8](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| -|Škoda|Kodiaq 2018-19|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| -|Škoda|Octavia 2015, 2018-19|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| -|Škoda|Octavia RS 2016|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| -|Škoda|Scala 2020|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| -|Škoda|Superb 2015-18|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| +|Škoda|Kamiq 2021[6](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533[8](#footnotes)| +|Škoda|Karoq 2019-21|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Škoda|Kodiaq 2018-19|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Škoda|Octavia 2015, 2018-19|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Škoda|Octavia RS 2016|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Škoda|Scala 2020|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533[8](#footnotes)| +|Škoda|Superb 2015-18|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| |Toyota|Alphard 2019-20|All|openpilot|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Toyota| |Toyota|Alphard Hybrid 2021|All|openpilot|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Toyota| |Toyota|Avalon 2016|Toyota Safety Sense P|openpilot available[2](#footnotes)|19 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Toyota| @@ -188,37 +188,37 @@ A supported vehicle is one that just works when you install a comma three. All s |Toyota|RAV4 Hybrid 2019-21|All|openpilot|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Toyota| |Toyota|RAV4 Hybrid 2022|All|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Toyota| |Toyota|Sienna 2018-20|All|openpilot available[2](#footnotes)|19 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Toyota| -|Volkswagen|Arteon 2018-22[8,9](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Arteon eHybrid 2020-22[8,9](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Arteon R 2020-22[8,9](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Atlas 2018-23[8](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Atlas Cross Sport 2021-22[8](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|California 2021[8](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|31 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Caravelle 2020[8](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|31 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|CC 2018-22[8,9](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|e-Golf 2014-20|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| -|Volkswagen|Golf 2015-20[9](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| -|Volkswagen|Golf Alltrack 2015-19|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| -|Volkswagen|Golf GTD 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| -|Volkswagen|Golf GTE 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| -|Volkswagen|Golf GTI 2015-21|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| -|Volkswagen|Golf R 2015-19[9](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| -|Volkswagen|Golf SportsVan 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| -|Volkswagen|Jetta 2018-22[8](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Jetta GLI 2021-22[8](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Passat 2015-22[7,8,9](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Passat Alltrack 2015-22[8](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Passat GTE 2015-22[8,9](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Polo 2020-22[8](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Polo GTI 2020-22[8](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|T-Cross 2021[8](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|T-Roc 2021[8](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Taos 2022[8](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Teramont 2018-22[8](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Teramont Cross Sport 2021-22[8](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Teramont X 2021-22[8](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Tiguan 2019-22[8](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Touran 2017|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|VW| +|Volkswagen|Arteon 2018-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Arteon eHybrid 2020-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Arteon R 2020-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Atlas 2018-23|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Atlas Cross Sport 2021-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|California 2021|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|31 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Caravelle 2020|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|31 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|CC 2018-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|e-Golf 2014-20|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Golf 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Golf Alltrack 2015-19|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Golf GTD 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Golf GTE 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Golf GTI 2015-21|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Golf R 2015-19|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Golf SportsVan 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Jetta 2018-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Jetta GLI 2021-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Passat 2015-22[7](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Passat Alltrack 2015-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Passat GTE 2015-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Polo 2020-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533[8](#footnotes)| +|Volkswagen|Polo GTI 2020-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533[8](#footnotes)| +|Volkswagen|T-Cross 2021|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533[8](#footnotes)| +|Volkswagen|T-Roc 2021|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533[8](#footnotes)| +|Volkswagen|Taos 2022|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Teramont 2018-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Teramont Cross Sport 2021-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Teramont X 2021-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Tiguan 2019-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Touran 2017|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| 1Experimental openpilot longitudinal control is available behind a toggle; the toggle is only available in non-release branches such as `master-ci`. Using openpilot longitudinal may disable Automatic Emergency Braking (AEB).
@@ -228,8 +228,7 @@ A supported vehicle is one that just works when you install a comma three. All s 5openpilot operates above 28mph for Camry 4CYL L, 4CYL LE and 4CYL SE which don't have Full-Speed Range Dynamic Radar Cruise Control.
6Not including the China market Kamiq, which is based on the (currently) unsupported PQ34 platform.
7Refers only to the MQB-based European B8 Passat, not the NMS Passat in the USA/China/Mideast markets.
-8Model-years 2021 and beyond may have a new camera harness design, which isn't yet available from the comma store. Before ordering, remove the Lane Assist camera cover and check to see if the connector is black (older design) or light brown (newer design). In the interim, if your car has a J533 connector CAN gateway inside the dashboard, choose "VW J533 Development" from the vehicle drop-down for a suitable harness. (Some newer models are also observed to not have a J533 connector.)
-9Includes versions with extra rear cargo space (may be called Variant, Estate, SportWagen, Shooting Brake, etc.)
+8Model-years 2022 and beyond may have a combined CAN gateway and BCM, which is supported by openpilot in software, but doesn't yet have a harness available from the comma store.
## Community Maintained Cars Although they're not upstream, the community has openpilot running on other makes and models. See the 'Community Supported Models' section of each make [on our wiki](https://wiki.comma.ai/). diff --git a/selfdrive/car/volkswagen/values.py b/selfdrive/car/volkswagen/values.py index ee5687eb1d..74b111a99e 100755 --- a/selfdrive/car/volkswagen/values.py +++ b/selfdrive/car/volkswagen/values.py @@ -151,75 +151,69 @@ class Footnote(Enum): PASSAT = CarFootnote( "Refers only to the MQB-based European B8 Passat, not the NMS Passat in the USA/China/Mideast markets.", Column.MODEL) - VW_HARNESS = CarFootnote( - "Model-years 2021 and beyond may have a new camera harness design, which isn't yet available from the comma " + - "store. Before ordering, remove the Lane Assist camera cover and check to see if the connector is black " + - "(older design) or light brown (newer design). In the interim, if your car has a J533 connector CAN gateway " + - "inside the dashboard, choose \"VW J533 Development\" from the vehicle drop-down for a suitable harness. " + - "(Some newer models are also observed to not have a J533 connector.)", - Column.MODEL) - VW_VARIANT = CarFootnote( - "Includes versions with extra rear cargo space (may be called Variant, Estate, SportWagen, Shooting Brake, etc.)", - Column.MODEL) + VW_MQB_A0 = CarFootnote( + "Model-years 2022 and beyond may have a combined CAN gateway and BCM, which is supported by openpilot " + + "in software, but doesn't yet have a harness available from the comma store.", + Column.HARNESS) @dataclass class VWCarInfo(CarInfo): package: str = "Adaptive Cruise Control (ACC) & Lane Assist" - harness: Enum = Harness.vw + harness: Enum = Harness.j533 CAR_INFO: Dict[str, Union[VWCarInfo, List[VWCarInfo]]] = { CAR.ARTEON_MK1: [ - VWCarInfo("Volkswagen Arteon 2018-22", footnotes=[Footnote.VW_HARNESS, Footnote.VW_VARIANT], harness=Harness.j533, video_link="https://youtu.be/FAomFKPFlDA"), - VWCarInfo("Volkswagen Arteon R 2020-22", footnotes=[Footnote.VW_HARNESS, Footnote.VW_VARIANT], harness=Harness.j533, video_link="https://youtu.be/FAomFKPFlDA"), - VWCarInfo("Volkswagen Arteon eHybrid 2020-22", footnotes=[Footnote.VW_HARNESS, Footnote.VW_VARIANT], harness=Harness.j533, video_link="https://youtu.be/FAomFKPFlDA"), - VWCarInfo("Volkswagen CC 2018-22", footnotes=[Footnote.VW_HARNESS, Footnote.VW_VARIANT], harness=Harness.j533, video_link="https://youtu.be/FAomFKPFlDA"), + VWCarInfo("Volkswagen Arteon 2018-22", video_link="https://youtu.be/FAomFKPFlDA"), + VWCarInfo("Volkswagen Arteon R 2020-22", video_link="https://youtu.be/FAomFKPFlDA"), + VWCarInfo("Volkswagen Arteon eHybrid 2020-22", video_link="https://youtu.be/FAomFKPFlDA"), + VWCarInfo("Volkswagen CC 2018-22", video_link="https://youtu.be/FAomFKPFlDA"), ], CAR.ATLAS_MK1: [ - VWCarInfo("Volkswagen Atlas 2018-23", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533), - VWCarInfo("Volkswagen Atlas Cross Sport 2021-22", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533), - VWCarInfo("Volkswagen Teramont 2018-22", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533), - VWCarInfo("Volkswagen Teramont Cross Sport 2021-22", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533), - VWCarInfo("Volkswagen Teramont X 2021-22", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533), + VWCarInfo("Volkswagen Atlas 2018-23"), + VWCarInfo("Volkswagen Atlas Cross Sport 2021-22"), + VWCarInfo("Volkswagen Teramont 2018-22"), + VWCarInfo("Volkswagen Teramont Cross Sport 2021-22"), + VWCarInfo("Volkswagen Teramont X 2021-22"), ], CAR.GOLF_MK7: [ VWCarInfo("Volkswagen e-Golf 2014-20"), - VWCarInfo("Volkswagen Golf 2015-20", footnotes=[Footnote.VW_VARIANT]), + VWCarInfo("Volkswagen Golf 2015-20"), VWCarInfo("Volkswagen Golf Alltrack 2015-19"), VWCarInfo("Volkswagen Golf GTD 2015-20"), VWCarInfo("Volkswagen Golf GTE 2015-20"), VWCarInfo("Volkswagen Golf GTI 2015-21"), - VWCarInfo("Volkswagen Golf R 2015-19", footnotes=[Footnote.VW_VARIANT]), + VWCarInfo("Volkswagen Golf R 2015-19"), VWCarInfo("Volkswagen Golf SportsVan 2015-20"), ], CAR.JETTA_MK7: [ - VWCarInfo("Volkswagen Jetta 2018-22", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533), - VWCarInfo("Volkswagen Jetta GLI 2021-22", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533), + VWCarInfo("Volkswagen Jetta 2018-22"), + VWCarInfo("Volkswagen Jetta GLI 2021-22"), ], CAR.PASSAT_MK8: [ - VWCarInfo("Volkswagen Passat 2015-22", footnotes=[Footnote.VW_HARNESS, Footnote.PASSAT, Footnote.VW_VARIANT], harness=Harness.j533), - VWCarInfo("Volkswagen Passat Alltrack 2015-22", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533), - VWCarInfo("Volkswagen Passat GTE 2015-22", footnotes=[Footnote.VW_HARNESS, Footnote.VW_VARIANT], harness=Harness.j533), + VWCarInfo("Volkswagen Passat 2015-22", footnotes=[Footnote.PASSAT]), + VWCarInfo("Volkswagen Passat Alltrack 2015-22"), + VWCarInfo("Volkswagen Passat GTE 2015-22"), ], - CAR.PASSAT_NMS: VWCarInfo("Volkswagen Passat NMS 2017-22", harness=Harness.j533), + CAR.PASSAT_NMS: VWCarInfo("Volkswagen Passat NMS 2017-22"), CAR.POLO_MK6: [ - VWCarInfo("Volkswagen Polo 2020-22", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533), - VWCarInfo("Volkswagen Polo GTI 2020-22", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533), + VWCarInfo("Volkswagen Polo 2020-22", footnotes=[Footnote.VW_MQB_A0]), + VWCarInfo("Volkswagen Polo GTI 2020-22", footnotes=[Footnote.VW_MQB_A0]), ], CAR.SHARAN_MK2: [ - VWCarInfo("Volkswagen Sharan 2018-22", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533), - VWCarInfo("SEAT Alhambra 2018-20", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533), + VWCarInfo("Volkswagen Sharan 2018-22"), + VWCarInfo("SEAT Alhambra 2018-20"), ], - CAR.TAOS_MK1: VWCarInfo("Volkswagen Taos 2022", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533), - CAR.TCROSS_MK1: VWCarInfo("Volkswagen T-Cross 2021", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533), - CAR.TIGUAN_MK2: VWCarInfo("Volkswagen Tiguan 2019-22", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533), + CAR.TAOS_MK1: VWCarInfo("Volkswagen Taos 2022"), + CAR.TCROSS_MK1: VWCarInfo("Volkswagen T-Cross 2021", footnotes=[Footnote.VW_MQB_A0]), + CAR.TIGUAN_MK2: VWCarInfo("Volkswagen Tiguan 2019-22"), CAR.TOURAN_MK2: VWCarInfo("Volkswagen Touran 2017"), CAR.TRANSPORTER_T61: [ - VWCarInfo("Volkswagen Caravelle 2020", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533), - VWCarInfo("Volkswagen California 2021", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533), + VWCarInfo("Volkswagen Caravelle 2020"), + VWCarInfo("Volkswagen California 2021"), ], - CAR.TROC_MK1: VWCarInfo("Volkswagen T-Roc 2021", footnotes=[Footnote.VW_HARNESS], harness=Harness.j533), + CAR.TROC_MK1: VWCarInfo("Volkswagen T-Roc 2021", footnotes=[Footnote.VW_MQB_A0]), CAR.AUDI_A3_MK3: [ VWCarInfo("Audi A3 2014-19"), VWCarInfo("Audi A3 Sportback e-tron 2017-18"), @@ -230,10 +224,10 @@ CAR_INFO: Dict[str, Union[VWCarInfo, List[VWCarInfo]]] = { CAR.AUDI_Q3_MK2: VWCarInfo("Audi Q3 2019-23"), CAR.SEAT_ATECA_MK1: VWCarInfo("SEAT Ateca 2018"), CAR.SEAT_LEON_MK3: VWCarInfo("SEAT Leon 2014-20"), - CAR.SKODA_KAMIQ_MK1: VWCarInfo("Škoda Kamiq 2021", footnotes=[Footnote.KAMIQ]), - CAR.SKODA_KAROQ_MK1: VWCarInfo("Škoda Karoq 2019-21", footnotes=[Footnote.VW_HARNESS]), + CAR.SKODA_KAMIQ_MK1: VWCarInfo("Škoda Kamiq 2021", footnotes=[Footnote.VW_MQB_A0, Footnote.KAMIQ]), + CAR.SKODA_KAROQ_MK1: VWCarInfo("Škoda Karoq 2019-21"), CAR.SKODA_KODIAQ_MK1: VWCarInfo("Škoda Kodiaq 2018-19"), - CAR.SKODA_SCALA_MK1: VWCarInfo("Škoda Scala 2020"), + CAR.SKODA_SCALA_MK1: VWCarInfo("Škoda Scala 2020", footnotes=[Footnote.VW_MQB_A0]), CAR.SKODA_SUPERB_MK3: VWCarInfo("Škoda Superb 2015-18"), CAR.SKODA_OCTAVIA_MK3: [ VWCarInfo("Škoda Octavia 2015, 2018-19"), From ee0dd36a3c775dbd82493c84f4e7272c1eb3fcbd Mon Sep 17 00:00:00 2001 From: Mehmet Tolga Avcioglu Date: Fri, 4 Nov 2022 01:17:36 +0300 Subject: [PATCH 006/184] Kona EV 2022: add missing FW versions (#26278) * add fingerprint for kona electric 2022 * Update selfdrive/car/hyundai/values.py Co-authored-by: Shane Smiskol --- selfdrive/car/hyundai/values.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/selfdrive/car/hyundai/values.py b/selfdrive/car/hyundai/values.py index c760c724a9..4415679175 100644 --- a/selfdrive/car/hyundai/values.py +++ b/selfdrive/car/hyundai/values.py @@ -1052,6 +1052,7 @@ FW_VERSIONS = { b'\xf1\x8758520-K4010\xf1\x00OS IEB \x02 101 \x11\x13 58520-K4010', b'\xf1\x8758520-K4010\xf1\x00OS IEB \x04 101 \x11\x13 58520-K4010', b'\xf1\x8758520-K4010\xf1\x00OS IEB \x03 101 \x11\x13 58520-K4010', + b'\xf1\x00OS IEB \r 102"\x05\x16 58520-K4010', # TODO: these return from the MULTI request, above return from LONG b'\x01\x04\x7f\xff\xff\xf8\xff\xff\x00\x00\x01\xd3\x00\x00\x00\x00\xff\xb7\xff\xee\xff\xe0\x00\xc0\xc0\xfc\xd5\xfc\x00\x00U\x10\xffP\xf5\xff\xfd\x00\x00\x00\x00\xfc\x00\x01', b'\x01\x04\x7f\xff\xff\xf8\xff\xff\x00\x00\x01\xdb\x00\x00\x00\x00\xff\xb1\xff\xd9\xff\xd2\x00\xc0\xc0\xfc\xd5\xfc\x00\x00U\x10\xff\xd6\xf5\x00\x06\x00\x00\x00\x14\xfd\x00\x04', @@ -1061,10 +1062,12 @@ FW_VERSIONS = { b'\xf1\x00OSP LKA AT CND LHD 1.00 1.02 99211-J9110 802', b'\xf1\x00OSP LKA AT EUR RHD 1.00 1.02 99211-J9110 802', b'\xf1\x00OSP LKA AT AUS RHD 1.00 1.04 99211-J9200 904', + b'\xf1\x00OSP LKA AT EUR LHD 1.00 1.04 99211-J9200 904', ], (Ecu.eps, 0x7D4, None): [ b'\xf1\x00OSP MDPS C 1.00 1.02 56310K4260\x00 4OEPC102', b'\xf1\x00OSP MDPS C 1.00 1.02 56310/K4970 4OEPC102', + b'\xf1\x00OSP MDPS C 1.00 1.02 56310/K4271 4OEPC102', ], (Ecu.fwdRadar, 0x7D0, None): [ b'\xf1\x00YB__ FCA ----- 1.00 1.01 99110-K4500 \x00\x00\x00', From 9a8c7f2453bcb917eb428704c1733f28e5d42d11 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Thu, 3 Nov 2022 15:51:14 -0700 Subject: [PATCH 007/184] boardd: remove canfd whitelist --- selfdrive/boardd/panda.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/selfdrive/boardd/panda.cc b/selfdrive/boardd/panda.cc index 0b8630b0c0..329ce91c44 100644 --- a/selfdrive/boardd/panda.cc +++ b/selfdrive/boardd/panda.cc @@ -399,8 +399,7 @@ void Panda::pack_can_buffer(const capnp::List::Reader &can_data } auto can_data = cmsg.getDat(); uint8_t data_len_code = len_to_dlc(can_data.size()); - assert(can_data.size() <= ((hw_type == cereal::PandaState::PandaType::RED_PANDA || - hw_type == cereal::PandaState::PandaType::RED_PANDA_V2) ? 64 : 8)); + assert(can_data.size() <= 64); assert(can_data.size() == dlc_to_len[data_len_code]); can_header header; From 15828c4feaa69af43867cae89c4de2ca2e8a734b Mon Sep 17 00:00:00 2001 From: Cameron Clough Date: Thu, 3 Nov 2022 19:02:39 -0700 Subject: [PATCH 008/184] updated: reset working tree in each submodule (#26316) * updated: reset working tree in each submodule * run after fetch too --- selfdrive/updated.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/selfdrive/updated.py b/selfdrive/updated.py index c261a92a84..9da2a05a11 100755 --- a/selfdrive/updated.py +++ b/selfdrive/updated.py @@ -175,7 +175,7 @@ def finalize_update() -> None: shutil.copytree(OVERLAY_MERGED, FINALIZED, symlinks=True) run(["git", "reset", "--hard"], FINALIZED) - run(["git", "submodule", "foreach", "--recursive", "git", "reset"], FINALIZED) + run(["git", "submodule", "foreach", "--recursive", "git", "reset", "--hard"], FINALIZED) cloudlog.info("Starting git cleanup in finalized update") t = time.monotonic() @@ -374,8 +374,8 @@ class Updater: ["git", "reset", "--hard"], ["git", "clean", "-xdff"], ["git", "submodule", "sync"], - ["git", "submodule", "init"], - ["git", "submodule", "update"], + ["git", "submodule", "update", "--init", "--recursive"], + ["git", "submodule", "foreach", "--recursive", "git", "reset", "--hard"], ] r = [run(cmd, OVERLAY_MERGED) for cmd in cmds] cloudlog.info("git reset success: %s", '\n'.join(r)) From 241d88c018d2acae4dbc71b5a033644959e2b24a Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Fri, 4 Nov 2022 11:09:14 +0800 Subject: [PATCH 009/184] Cabana: update viewport after mouse released (#26355) update viewport after mouse released --- tools/cabana/chartswidget.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/cabana/chartswidget.cc b/tools/cabana/chartswidget.cc index 5bf66ebb2d..7540abbcb2 100644 --- a/tools/cabana/chartswidget.cc +++ b/tools/cabana/chartswidget.cc @@ -410,6 +410,7 @@ void ChartView::mouseReleaseEvent(QMouseEvent *event) { // zoom in if selected range is greater than 0.5s emit zoomIn(min, max); } + viewport()->update(); event->accept(); } else if (event->button() == Qt::RightButton) { emit zoomReset(); From 384f9402374e341843f503f871421a7b43437444 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 3 Nov 2022 23:07:29 -0700 Subject: [PATCH 010/184] ui: fix disappearing path with wide cam (#26354) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * split lat long icons * no overriding border status, consider steering pressed for lat icon, spacing for readability * add engageable back add engageable back add engageable back * all the debugging code 🙃 * revert that stuff * only the fix * comment comment * fix dat * explicit Co-authored-by: Adeeb Shihadeh --- selfdrive/ui/ui.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index 821064f81f..e1ef5192b6 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -63,6 +63,8 @@ void update_line_data(const UIState *s, const cereal::ModelDataV2::XYZTData::Rea right_points.reserve(max_idx + 1); for (int i = 0; i <= max_idx; i++) { + // highly negative x positions cause flickering, clip to zy plane of camera + if (line_x[i] < 0) continue; QPointF left, right; bool l = calib_frame_to_full_frame(s, line_x[i], line_y[i] - y_off, line_z[i] + z_off, &left); bool r = calib_frame_to_full_frame(s, line_x[i], line_y[i] + y_off, line_z[i] + z_off, &right); From aebb08e10542758c458c3abb219f8b57485e0b61 Mon Sep 17 00:00:00 2001 From: Kurt Nistelberger Date: Fri, 4 Nov 2022 07:43:30 +0100 Subject: [PATCH 011/184] locationd: add gps sanity check for quectel gps (#26352) * update check * . * . * remove gps kf time check for gps ok * upsi * dont use gps_mode * update refs * Update selfdrive/locationd/locationd.cc Co-authored-by: Shane Smiskol Co-authored-by: Kurt Nistelberger Co-authored-by: Cameron Clough Co-authored-by: Shane Smiskol --- selfdrive/locationd/locationd.cc | 20 ++++++++++++++------ selfdrive/locationd/locationd.h | 3 ++- selfdrive/test/process_replay/ref_commit | 2 +- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/selfdrive/locationd/locationd.cc b/selfdrive/locationd/locationd.cc index e156af5d64..8d9e247655 100755 --- a/selfdrive/locationd/locationd.cc +++ b/selfdrive/locationd/locationd.cc @@ -270,15 +270,22 @@ void Localizer::handle_gps(double current_time, const cereal::GpsLocationData::R bool gps_lat_lng_alt_insane = ((std::abs(log.getLatitude()) > 90) || (std::abs(log.getLongitude()) > 180) || (std::abs(log.getAltitude()) > ALTITUDE_SANITY_CHECK)); bool gps_vel_insane = (floatlist2vector(log.getVNED()).norm() > TRANS_SANITY_CHECK); - if (gps_invalid_flag || gps_unreasonable || gps_accuracy_insane || gps_lat_lng_alt_insane || gps_vel_insane) { + // quectel gps verticalAccuracy is clipped to 500 + bool gps_accuracy_insane_quectel = false; + if (!ublox_available) { + gps_accuracy_insane_quectel = log.getVerticalAccuracy() == 500; + } + + if (gps_invalid_flag || gps_unreasonable || gps_accuracy_insane || gps_lat_lng_alt_insane || gps_vel_insane || gps_accuracy_insane_quectel) { + this->gps_valid = false; this->determine_gps_mode(current_time); return; } - + double sensor_time = current_time - sensor_time_offset; // Process message - this->last_gps_fix = sensor_time; + this->gps_valid = true; this->gps_mode = true; Geodetic geodetic = { log.getLatitude(), log.getLongitude(), log.getAltitude() }; this->converter = std::make_unique(geodetic); @@ -476,9 +483,8 @@ kj::ArrayPtr Localizer::get_message_bytes(MessageBuilder& msg_build return msg_builder.toBytes(); } - bool Localizer::isGpsOK() { - return this->kf->get_filter_time() - this->last_gps_fix < 1.0; + return this->gps_valid; } void Localizer::determine_gps_mode(double current_time) { @@ -498,8 +504,10 @@ void Localizer::determine_gps_mode(double current_time) { } int Localizer::locationd_thread() { + ublox_available = Params().getBool("UbloxAvailable", true); + const char* gps_location_socket; - if (Params().getBool("UbloxAvailable", true)) { + if (ublox_available) { gps_location_socket = "gpsLocationExternal"; } else { gps_location_socket = "gpsLocation"; diff --git a/selfdrive/locationd/locationd.h b/selfdrive/locationd/locationd.h index 280296b06c..d6bb5347c5 100755 --- a/selfdrive/locationd/locationd.h +++ b/selfdrive/locationd/locationd.h @@ -68,8 +68,9 @@ private: std::unique_ptr converter; int64_t unix_timestamp_millis = 0; - double last_gps_fix = 0; double reset_tracker = 0.0; bool device_fell = false; bool gps_mode = false; + bool gps_valid = false; + bool ublox_available = true; }; diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index 68bd35c38c..8eae3ce8b4 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -01b24beff6855e8c4d2fb0efeeefafb46343e013 +6abe3ec1ee19710bdd89ce2882b9503d4aff8e7f From 81f6ebebaaeda467fd7a4552711cc1109b33ddd5 Mon Sep 17 00:00:00 2001 From: Vivek Aithal Date: Fri, 4 Nov 2022 01:32:29 -0700 Subject: [PATCH 012/184] [paramsd] Prevent low speed drifting (#26360) * lower active speed for paramsd observations * update refs --- selfdrive/locationd/paramsd.py | 2 +- selfdrive/test/process_replay/ref_commit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/selfdrive/locationd/paramsd.py b/selfdrive/locationd/paramsd.py index 86672b0460..9bd4ed0837 100755 --- a/selfdrive/locationd/paramsd.py +++ b/selfdrive/locationd/paramsd.py @@ -92,7 +92,7 @@ class ParamsLearner: self.speed = msg.vEgo in_linear_region = abs(self.steering_angle) < 45 or not self.steering_pressed - self.active = self.speed > 5 and in_linear_region + self.active = self.speed > 1 and in_linear_region if self.active: self.kf.predict_and_observe(t, ObservationKind.STEER_ANGLE, np.array([[math.radians(msg.steeringAngleDeg)]])) diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index 8eae3ce8b4..40f3c522de 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -6abe3ec1ee19710bdd89ce2882b9503d4aff8e7f +2ba23c5d1c4e0c34295d38f31ed35e3482608b16 \ No newline at end of file From 033ffa4a88bd4632e0e1ba5c4bcd4c4ba43e47bc Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 4 Nov 2022 02:30:14 -0700 Subject: [PATCH 013/184] Update comment in ui.cc --- selfdrive/ui/ui.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index e1ef5192b6..945218ec11 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -63,7 +63,7 @@ void update_line_data(const UIState *s, const cereal::ModelDataV2::XYZTData::Rea right_points.reserve(max_idx + 1); for (int i = 0; i <= max_idx; i++) { - // highly negative x positions cause flickering, clip to zy plane of camera + // highly negative x positions are drawn above the frame and cause flickering, clip to zy plane of camera if (line_x[i] < 0) continue; QPointF left, right; bool l = calib_frame_to_full_frame(s, line_x[i], line_y[i] - y_off, line_z[i] + z_off, &left); From 0e3edf7877e2a219ae67f7e71d36d8458d50f7e4 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Sat, 5 Nov 2022 02:16:15 +0800 Subject: [PATCH 014/184] Cabana: fix signal list glitch (#26357) * fix signal list glitch * fix glitch when open new msg * reduce spacing * fix binaryview glitch * spacing 3 * create form on demand * dont close form after save * remove timer * remove sizepolicy * cleanup --- tools/cabana/binaryview.cc | 11 +++---- tools/cabana/binaryview.h | 5 ++- tools/cabana/detailwidget.cc | 61 +++++++++++++++++------------------- tools/cabana/detailwidget.h | 1 + tools/cabana/signaledit.cc | 55 +++++++++++++++++++------------- tools/cabana/signaledit.h | 12 ++++--- 6 files changed, 76 insertions(+), 69 deletions(-) diff --git a/tools/cabana/binaryview.cc b/tools/cabana/binaryview.cc index 875bd034ec..ba50b101fc 100644 --- a/tools/cabana/binaryview.cc +++ b/tools/cabana/binaryview.cc @@ -11,7 +11,7 @@ // BinaryView -const int CELL_HEIGHT = 30; +const int CELL_HEIGHT = 26; BinaryView::BinaryView(QWidget *parent) : QTableView(parent) { model = new BinaryViewModel(this); @@ -105,15 +105,9 @@ void BinaryView::leaveEvent(QEvent *event) { } void BinaryView::setMessage(const QString &message_id) { - msg_id = message_id; model->setMessage(message_id); clearSelection(); updateState(); - updateGeometry(); -} - -void BinaryView::updateState() { - model->updateState(); } const Signal *BinaryView::getResizingSignal() const { @@ -176,6 +170,9 @@ void BinaryViewModel::setMessage(const QString &message_id) { items[idx].sigs.push_back(&dbc_msg->sigs[i]); } } + } else { + row_count = can->lastMessage(msg_id).dat.size(); + items.resize(row_count * column_count); } endResetModel(); diff --git a/tools/cabana/binaryview.h b/tools/cabana/binaryview.h index 0f58e9ed20..a907a673bf 100644 --- a/tools/cabana/binaryview.h +++ b/tools/cabana/binaryview.h @@ -57,10 +57,10 @@ class BinaryView : public QTableView { public: BinaryView(QWidget *parent = nullptr); void setMessage(const QString &message_id); - void updateState(); void highlight(const Signal *sig); - const Signal *hoveredSignal() const { return hovered_sig; } QSet getOverlappingSignals() const; + inline const Signal *hoveredSignal() const { return hovered_sig; } + inline void updateState() { model->updateState(); } signals: void signalHovered(const Signal *sig); @@ -75,7 +75,6 @@ private: void leaveEvent(QEvent *event) override; const Signal *getResizingSignal() const; - QString msg_id; QModelIndex anchor_index; BinaryViewModel *model; BinaryItemDelegate *delegate; diff --git a/tools/cabana/detailwidget.cc b/tools/cabana/detailwidget.cc index 9bbc442154..f3e3438229 100644 --- a/tools/cabana/detailwidget.cc +++ b/tools/cabana/detailwidget.cc @@ -31,7 +31,6 @@ DetailWidget::DetailWidget(ChartsWidget *charts, QWidget *parent) : charts(chart QFrame *title_frame = new QFrame(this); QVBoxLayout *frame_layout = new QVBoxLayout(title_frame); title_frame->setFrameShape(QFrame::StyledPanel); - title_frame->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); // message title QHBoxLayout *title_layout = new QHBoxLayout(); @@ -80,7 +79,6 @@ DetailWidget::DetailWidget(ChartsWidget *charts, QWidget *parent) : charts(chart // signals signals_container = new QWidget(this); signals_container->setLayout(new QVBoxLayout); - signals_container->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum); container_layout->addWidget(signals_container); // history log @@ -147,32 +145,35 @@ void DetailWidget::setMessage(const QString &message_id) { void DetailWidget::dbcMsgChanged(int show_form_idx) { if (msg_id.isEmpty()) return; - warning_widget->hide(); + setUpdatesEnabled(false); QStringList warnings; + for (auto f : signal_list) f->hide(); - clearLayout(signals_container->layout()); - QString msg_name = tr("untitled"); - if (auto msg = dbc()->msg(msg_id)) { + const Msg *msg = dbc()->msg(msg_id); + if (msg) { for (int i = 0; i < msg->sigs.size(); ++i) { - auto form = new SignalEdit(i, msg_id, &(msg->sigs[i])); - form->setChartOpened(charts->isChartOpened(msg_id, &(msg->sigs[i]))); - signals_container->layout()->addWidget(form); - QObject::connect(form, &SignalEdit::showFormClicked, this, &DetailWidget::showForm); - QObject::connect(form, &SignalEdit::remove, this, &DetailWidget::removeSignal); - QObject::connect(form, &SignalEdit::save, this, &DetailWidget::saveSignal); - QObject::connect(form, &SignalEdit::highlight, binary_view, &BinaryView::highlight); - QObject::connect(binary_view, &BinaryView::signalHovered, form, &SignalEdit::signalHovered); - QObject::connect(form, &SignalEdit::showChart, [this, sig = &msg->sigs[i]](bool show) { charts->showChart(msg_id, sig, show); }); - if (i == show_form_idx) { - QTimer::singleShot(0, [=]() { emit form->showFormClicked(); }); + SignalEdit *form = i < signal_list.size() ? signal_list[i] : nullptr; + if (!form) { + form = new SignalEdit(i); + QObject::connect(form, &SignalEdit::showFormClicked, this, &DetailWidget::showForm); + QObject::connect(form, &SignalEdit::remove, this, &DetailWidget::removeSignal); + QObject::connect(form, &SignalEdit::save, this, &DetailWidget::saveSignal); + QObject::connect(form, &SignalEdit::highlight, binary_view, &BinaryView::highlight); + QObject::connect(binary_view, &BinaryView::signalHovered, form, &SignalEdit::signalHovered); + QObject::connect(form, &SignalEdit::showChart, charts, &ChartsWidget::showChart); + signals_container->layout()->addWidget(form); + signal_list.push_back(form); } + form->setSignal(msg_id, &(msg->sigs[i]), i == show_form_idx); + form->setChartOpened(charts->isChartOpened(msg_id, &(msg->sigs[i]))); + form->show(); } - msg_name = msg->name.c_str(); if (msg->size != can->lastMessage(msg_id).dat.size()) warnings.push_back(tr("Message size (%1) is incorrect.").arg(msg->size)); } + edit_btn->setVisible(true); - name_label->setText(msg_name); + name_label->setText(msg ? msg->name.c_str() : "untitled"); binary_view->setMessage(msg_id); history_log->setMessage(msg_id); @@ -183,10 +184,9 @@ void DetailWidget::dbcMsgChanged(int show_form_idx) { warnings.push_back(tr("%1 has overlapping bits.").arg(s->name.c_str())); } - if (!warnings.isEmpty()) { - warning_label->setText(warnings.join('\n')); - warning_widget->show(); - } + warning_label->setText(warnings.join('\n')); + warning_widget->setVisible(!warnings.isEmpty()); + setUpdatesEnabled(true); } void DetailWidget::updateState() { @@ -199,18 +199,15 @@ void DetailWidget::updateState() { void DetailWidget::showForm() { SignalEdit *sender = qobject_cast(QObject::sender()); - for (auto f : signals_container->findChildren()) { + setUpdatesEnabled(false); + for (auto f : signal_list) f->setFormVisible(f == sender && !f->isFormVisible()); - if (f == sender) - QTimer::singleShot(0, [=]() { scroll->ensureWidgetVisible(f); }); - } + QTimer::singleShot(1, [this]() { setUpdatesEnabled(true); }); } void DetailWidget::updateChartState(const QString &id, const Signal *sig, bool opened) { - if (id == msg_id) { - for (auto f : signals_container->findChildren()) - if (f->sig == sig) f->setChartOpened(opened); - } + for (auto f : signal_list) + if (f->msg_id == id && f->sig == sig) f->setChartOpened(opened); } void DetailWidget::editMsg() { @@ -265,7 +262,7 @@ void DetailWidget::saveSignal(const Signal *sig, const Signal &new_sig) { dbc()->updateSignal(msg_id, sig->name.c_str(), new_sig); // update binary view and history log - dbcMsgChanged(); + updateState(); } void DetailWidget::removeSignal(const Signal *sig) { diff --git a/tools/cabana/detailwidget.h b/tools/cabana/detailwidget.h index d8784f3f14..ce3468e472 100644 --- a/tools/cabana/detailwidget.h +++ b/tools/cabana/detailwidget.h @@ -50,4 +50,5 @@ private: BinaryView *binary_view; QScrollArea *scroll; ChartsWidget *charts; + QList signal_list; }; diff --git a/tools/cabana/signaledit.cc b/tools/cabana/signaledit.cc index ef0a85eba3..ee91887d0a 100644 --- a/tools/cabana/signaledit.cc +++ b/tools/cabana/signaledit.cc @@ -13,40 +13,37 @@ // SignalForm -SignalForm::SignalForm(const Signal &sig, QWidget *parent) : QWidget(parent) { +SignalForm::SignalForm(QWidget *parent) : QWidget(parent) { QFormLayout *form_layout = new QFormLayout(this); + form_layout->setContentsMargins(0, 0, 0, 0); - name = new QLineEdit(sig.name.c_str()); + name = new QLineEdit(); form_layout->addRow(tr("Name"), name); size = new QSpinBox(); size->setMinimum(1); - size->setValue(sig.size); form_layout->addRow(tr("Size"), size); endianness = new QComboBox(); endianness->addItems({"Little", "Big"}); - endianness->setCurrentIndex(sig.is_little_endian ? 0 : 1); form_layout->addRow(tr("Endianness"), endianness); - form_layout->addRow(tr("lsb"), new QLabel(QString::number(sig.lsb))); - form_layout->addRow(tr("msb"), new QLabel(QString::number(sig.msb))); + ; + form_layout->addRow(tr("lsb"), lsb = new QLabel()); + form_layout->addRow(tr("msb"), msb = new QLabel()); sign = new QComboBox(); sign->addItems({"Signed", "Unsigned"}); - sign->setCurrentIndex(sig.is_signed ? 0 : 1); form_layout->addRow(tr("sign"), sign); auto double_validator = new QDoubleValidator(this); factor = new QLineEdit(); factor->setValidator(double_validator); - factor->setText(QString::number(sig.factor)); form_layout->addRow(tr("Factor"), factor); offset = new QLineEdit(); offset->setValidator(double_validator); - offset->setText(QString::number(sig.offset)); form_layout->addRow(tr("Offset"), offset); // TODO: parse the following parameters in opendbc @@ -66,18 +63,15 @@ SignalForm::SignalForm(const Signal &sig, QWidget *parent) : QWidget(parent) { // SignalEdit -SignalEdit::SignalEdit(int index, const QString &msg_id, const Signal *sig, QWidget *parent) : msg_id(msg_id), sig(sig), form_idx(index), QWidget(parent) { +SignalEdit::SignalEdit(int index, QWidget *parent) : form_idx(index), QWidget(parent) { QVBoxLayout *main_layout = new QVBoxLayout(this); main_layout->setContentsMargins(0, 0, 0, 0); // title bar QHBoxLayout *title_layout = new QHBoxLayout(); - icon = new QLabel(">"); - icon->setStyleSheet("font-weight:bold"); + icon = new QLabel(); title_layout->addWidget(icon); title = new ElidedLabel(this); - title->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); - title->setText(QString("%1. %2").arg(index + 1).arg(sig->name.c_str())); title->setStyleSheet(QString("font-weight:bold; color:%1").arg(getColor(index))); title_layout->addWidget(title, 1); @@ -96,9 +90,6 @@ SignalEdit::SignalEdit(int index, const QString &msg_id, const Signal *sig, QWid // signal form form_container = new QWidget(this); QVBoxLayout *v_layout = new QVBoxLayout(form_container); - form = new SignalForm(*sig, this); - v_layout->addWidget(form); - QHBoxLayout *h = new QHBoxLayout(); QPushButton *remove_btn = new QPushButton(tr("Remove Signal")); h->addWidget(remove_btn); @@ -106,8 +97,6 @@ SignalEdit::SignalEdit(int index, const QString &msg_id, const Signal *sig, QWid QPushButton *save_btn = new QPushButton(tr("Save")); h->addWidget(save_btn); v_layout->addLayout(h); - - form_container->setVisible(false); main_layout->addWidget(form_container); // bottom line @@ -119,11 +108,19 @@ SignalEdit::SignalEdit(int index, const QString &msg_id, const Signal *sig, QWid QObject::connect(remove_btn, &QPushButton::clicked, [this]() { emit remove(this->sig); }); QObject::connect(title, &ElidedLabel::clicked, this, &SignalEdit::showFormClicked); QObject::connect(save_btn, &QPushButton::clicked, this, &SignalEdit::saveSignal); - QObject::connect(plot_btn, &QPushButton::clicked, [this]() { emit showChart(!chart_opened); }); - QObject::connect(seek_btn, &QPushButton::clicked, [this, msg_id]() { - SignalFindDlg dlg(msg_id, this->sig, this); + QObject::connect(plot_btn, &QPushButton::clicked, [this]() { emit showChart(msg_id, sig, !chart_opened); }); + QObject::connect(seek_btn, &QPushButton::clicked, [this]() { + SignalFindDlg dlg(msg_id, sig, this); dlg.exec(); }); + setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); +} + +void SignalEdit::setSignal(const QString &message_id, const Signal *signal, bool show_form) { + msg_id = message_id; + sig = signal; + title->setText(QString("%1. %2").arg(form_idx + 1).arg(sig->name.c_str())); + setFormVisible(show_form); } void SignalEdit::saveSignal() { @@ -152,6 +149,20 @@ void SignalEdit::setChartOpened(bool opened) { } void SignalEdit::setFormVisible(bool visible) { + if (visible) { + if (!form) { + form = new SignalForm(this); + ((QVBoxLayout *)form_container->layout())->insertWidget(0, form); + } + form->name->setText(sig->name.c_str()); + form->size->setValue(sig->size); + form->endianness->setCurrentIndex(sig->is_little_endian ? 0 : 1); + form->sign->setCurrentIndex(sig->is_signed ? 0 : 1); + form->factor->setText(QString::number(sig->factor)); + form->offset->setText(QString::number(sig->offset)); + form->msb->setText(QString::number(sig->msb)); + form->lsb->setText(QString::number(sig->lsb)); + } form_container->setVisible(visible); icon->setText(visible ? "▼" : ">"); } diff --git a/tools/cabana/signaledit.h b/tools/cabana/signaledit.h index e3d38d5b25..dce9d27479 100644 --- a/tools/cabana/signaledit.h +++ b/tools/cabana/signaledit.h @@ -14,9 +14,10 @@ class SignalForm : public QWidget { public: - SignalForm(const Signal &sig, QWidget *parent); + SignalForm(QWidget *parent); QLineEdit *name, *unit, *comment, *val_desc, *offset, *factor, *min_val, *max_val; + QLabel *lsb, *msb; QSpinBox *size; QComboBox *sign, *endianness; }; @@ -25,16 +26,18 @@ class SignalEdit : public QWidget { Q_OBJECT public: - SignalEdit(int index, const QString &msg_id, const Signal *sig, QWidget *parent = nullptr); + SignalEdit(int index, QWidget *parent = nullptr); + void setSignal(const QString &msg_id, const Signal *sig, bool show_form); void setChartOpened(bool opened); void setFormVisible(bool show); void signalHovered(const Signal *sig); inline bool isFormVisible() const { return form_container->isVisible(); } const Signal *sig = nullptr; + QString msg_id; signals: void highlight(const Signal *sig); - void showChart(bool show); + void showChart(const QString &name, const Signal *sig, bool show); void showFormClicked(); void remove(const Signal *sig); void save(const Signal *sig, const Signal &new_sig); @@ -44,12 +47,11 @@ protected: void leaveEvent(QEvent *event) override; void saveSignal(); - SignalForm *form; + SignalForm *form = nullptr; ElidedLabel *title; QWidget *form_container; QLabel *icon; int form_idx = 0; - QString msg_id; bool chart_opened = false; QPushButton *plot_btn; }; From 9382d5528013417e5261050bd6ccfd6eedf8d51c Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Fri, 4 Nov 2022 15:45:35 -0400 Subject: [PATCH 015/184] VW MQB: Enable experimental long (#26359) * VW MQB: Harness updates * don't need the variant footnote * VW MQB: Enable experimental long * autogen doc fixes * rename that --- docs/CARS.md | 95 ++++++++++++++------------- selfdrive/car/volkswagen/interface.py | 10 +-- selfdrive/car/volkswagen/values.py | 21 +++--- 3 files changed, 67 insertions(+), 59 deletions(-) diff --git a/docs/CARS.md b/docs/CARS.md index fa1b54c1c3..55413e208b 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -11,12 +11,12 @@ A supported vehicle is one that just works when you install a comma three. All s |Acura|ILX 2016-19|AcuraWatch Plus|openpilot|25 mph|25 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Honda Nidec| |Acura|RDX 2016-18|AcuraWatch Plus|openpilot|25 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Honda Nidec| |Acura|RDX 2019-22|All|openpilot available[1](#footnotes)|0 mph|3 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Honda Bosch A| -|Audi|A3 2014-19|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Audi|A3 Sportback e-tron 2017-18|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Audi|Q2 2018|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Audi|Q3 2019-23|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Audi|RS3 2018|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Audi|S3 2015-17|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Audi|A3 2014-19|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Audi|A3 Sportback e-tron 2017-18|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Audi|Q2 2018|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Audi|Q3 2019-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Audi|RS3 2018|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Audi|S3 2015-17|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| |Cadillac|Escalade ESV 2016[3](#footnotes)|Adaptive Cruise Control (ACC) & LKAS|openpilot|0 mph|6 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|OBD-II| |Chevrolet|Bolt EUV 2022-23|Premier or Premier Redline Trim without Super Cruise Package|openpilot available[1](#footnotes)|3 mph|6 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|GM| |Chevrolet|Silverado 1500 2020-21|Safety Package II|openpilot available[1](#footnotes)|3 mph|6 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|GM| @@ -129,8 +129,8 @@ A supported vehicle is one that just works when you install a comma three. All s |Nissan|Rogue 2018-20|ProPILOT Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Nissan A| |Nissan|X-Trail 2017|ProPILOT Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Nissan A| |Ram|1500 2019-22|Adaptive Cruise Control (ACC)|Stock|0 mph|32 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Ram| -|SEAT|Ateca 2018|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|SEAT|Leon 2014-20|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|SEAT|Ateca 2018|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|SEAT|Leon 2014-20|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| |Subaru|Ascent 2019-21|All|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Subaru A| |Subaru|Crosstrek 2018-19|EyeSight Driver Assistance|Stock|0 mph|0 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Subaru A| |Subaru|Crosstrek 2020-21|EyeSight Driver Assistance|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Subaru A| @@ -141,13 +141,13 @@ A supported vehicle is one that just works when you install a comma three. All s |Subaru|Outback 2020-22|All|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Subaru B| |Subaru|XV 2018-19|EyeSight Driver Assistance|Stock|0 mph|0 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Subaru A| |Subaru|XV 2020-21|EyeSight Driver Assistance|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Subaru A| -|Škoda|Kamiq 2021[6](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533[8](#footnotes)| -|Škoda|Karoq 2019-21|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Škoda|Kodiaq 2018-19|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Škoda|Octavia 2015, 2018-19|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Škoda|Octavia RS 2016|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Škoda|Scala 2020|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533[8](#footnotes)| -|Škoda|Superb 2015-18|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Škoda|Kamiq 2021[6](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533[9](#footnotes)| +|Škoda|Karoq 2019-21|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Škoda|Kodiaq 2018-19|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Škoda|Octavia 2015, 2018-19|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Škoda|Octavia RS 2016|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Škoda|Scala 2020|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533[9](#footnotes)| +|Škoda|Superb 2015-18|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| |Toyota|Alphard 2019-20|All|openpilot|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Toyota| |Toyota|Alphard Hybrid 2021|All|openpilot|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Toyota| |Toyota|Avalon 2016|Toyota Safety Sense P|openpilot available[2](#footnotes)|19 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Toyota| @@ -188,37 +188,37 @@ A supported vehicle is one that just works when you install a comma three. All s |Toyota|RAV4 Hybrid 2019-21|All|openpilot|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Toyota| |Toyota|RAV4 Hybrid 2022|All|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Toyota| |Toyota|Sienna 2018-20|All|openpilot available[2](#footnotes)|19 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Toyota| -|Volkswagen|Arteon 2018-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Arteon eHybrid 2020-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Arteon R 2020-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Atlas 2018-23|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Atlas Cross Sport 2021-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|California 2021|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|31 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Caravelle 2020|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|31 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|CC 2018-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|e-Golf 2014-20|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Golf 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Golf Alltrack 2015-19|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Golf GTD 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Golf GTE 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Golf GTI 2015-21|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Golf R 2015-19|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Golf SportsVan 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Jetta 2018-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Jetta GLI 2021-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Passat 2015-22[7](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Passat Alltrack 2015-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Passat GTE 2015-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Polo 2020-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533[8](#footnotes)| -|Volkswagen|Polo GTI 2020-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533[8](#footnotes)| -|Volkswagen|T-Cross 2021|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533[8](#footnotes)| -|Volkswagen|T-Roc 2021|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533[8](#footnotes)| -|Volkswagen|Taos 2022|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Teramont 2018-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Teramont Cross Sport 2021-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Teramont X 2021-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Tiguan 2019-22|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -|Volkswagen|Touran 2017|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Arteon 2018-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Arteon eHybrid 2020-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Arteon R 2020-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Atlas 2018-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Atlas Cross Sport 2021-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|California 2021|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|31 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Caravelle 2020|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|31 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|CC 2018-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|e-Golf 2014-20|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Golf 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Golf Alltrack 2015-19|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Golf GTD 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Golf GTE 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Golf GTI 2015-21|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Golf R 2015-19|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Golf SportsVan 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Jetta 2018-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Jetta GLI 2021-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Passat 2015-22[7](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Passat Alltrack 2015-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Passat GTE 2015-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Polo 2020-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533[9](#footnotes)| +|Volkswagen|Polo GTI 2020-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533[9](#footnotes)| +|Volkswagen|T-Cross 2021|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533[9](#footnotes)| +|Volkswagen|T-Roc 2021|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533[9](#footnotes)| +|Volkswagen|Taos 2022|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Teramont 2018-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Teramont Cross Sport 2021-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Teramont X 2021-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Tiguan 2019-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Volkswagen|Touran 2017|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| 1Experimental openpilot longitudinal control is available behind a toggle; the toggle is only available in non-release branches such as `master-ci`. Using openpilot longitudinal may disable Automatic Emergency Braking (AEB).
@@ -228,7 +228,8 @@ A supported vehicle is one that just works when you install a comma three. All s 5openpilot operates above 28mph for Camry 4CYL L, 4CYL LE and 4CYL SE which don't have Full-Speed Range Dynamic Radar Cruise Control.
6Not including the China market Kamiq, which is based on the (currently) unsupported PQ34 platform.
7Refers only to the MQB-based European B8 Passat, not the NMS Passat in the USA/China/Mideast markets.
-8Model-years 2022 and beyond may have a combined CAN gateway and BCM, which is supported by openpilot in software, but doesn't yet have a harness available from the comma store.
+8Only available for vehicles using a gateway (J533) harness. At this time, vehicles using a camera harness are limited to using stock ACC.
+9Model-years 2022 and beyond may have a combined CAN gateway and BCM, which is supported by openpilot in software, but doesn't yet have a harness available from the comma store.
## Community Maintained Cars Although they're not upstream, the community has openpilot running on other makes and models. See the 'Community Supported Models' section of each make [on our wiki](https://wiki.comma.ai/). diff --git a/selfdrive/car/volkswagen/interface.py b/selfdrive/car/volkswagen/interface.py index ca6d1fa7f8..816e7fcf34 100644 --- a/selfdrive/car/volkswagen/interface.py +++ b/selfdrive/car/volkswagen/interface.py @@ -27,12 +27,14 @@ class CarInterface(CarInterfaceBase): ret.carName = "volkswagen" ret.radarOffCan = True + use_off_car_defaults = len(fingerprint[0]) == 0 # Pick sensible carParams during offline doc generation/CI jobs + if candidate in PQ_CARS: # Set global PQ35/PQ46/NMS parameters ret.safetyConfigs = [get_safety_config(car.CarParams.SafetyModel.volkswagenPq)] ret.enableBsm = 0x3BA in fingerprint[0] # SWA_1 - if 0x440 in fingerprint[0] or len(fingerprint[0]) == 0: # Getriebe_1, or empty FP for CI/docs generation + if 0x440 in fingerprint[0] or use_off_car_defaults: # Getriebe_1 ret.transmissionType = TransmissionType.automatic else: ret.transmissionType = TransmissionType.manual @@ -55,7 +57,7 @@ class CarInterface(CarInterfaceBase): ret.safetyConfigs = [get_safety_config(car.CarParams.SafetyModel.volkswagen)] ret.enableBsm = 0x30F in fingerprint[0] # SWA_01 - if 0xAD in fingerprint[0] or len(fingerprint[0]) == 0: # Getriebe_11, or empty FP for CI/docs generation + if 0xAD in fingerprint[0] or use_off_car_defaults: # Getriebe_11 ret.transmissionType = TransmissionType.automatic elif 0x187 in fingerprint[0]: # EV_Gearshift ret.transmissionType = TransmissionType.direct @@ -81,8 +83,8 @@ class CarInterface(CarInterfaceBase): # Global longitudinal tuning defaults, can be overridden per-vehicle - ret.experimentalLongitudinalAvailable = ret.networkLocation == NetworkLocation.gateway and False # Disabled for now - if experimental_long and False: # Disabled for now + ret.experimentalLongitudinalAvailable = ret.networkLocation == NetworkLocation.gateway or use_off_car_defaults + if experimental_long: # Proof-of-concept, prep for E2E only. No radar points available. Panda ALLOW_DEBUG firmware required. ret.openpilotLongitudinalControl = True ret.safetyConfigs[0].safetyParam |= Panda.FLAG_VOLKSWAGEN_LONG_CONTROL diff --git a/selfdrive/car/volkswagen/values.py b/selfdrive/car/volkswagen/values.py index 74b111a99e..babaffbcbe 100755 --- a/selfdrive/car/volkswagen/values.py +++ b/selfdrive/car/volkswagen/values.py @@ -1,5 +1,5 @@ from collections import defaultdict, namedtuple -from dataclasses import dataclass +from dataclasses import dataclass, field from enum import Enum from typing import Dict, List, Union @@ -151,6 +151,10 @@ class Footnote(Enum): PASSAT = CarFootnote( "Refers only to the MQB-based European B8 Passat, not the NMS Passat in the USA/China/Mideast markets.", Column.MODEL) + VW_EXP_LONG = CarFootnote ( + "Only available for vehicles using a gateway (J533) harness. At this time, vehicles using a camera harness " + + "are limited to using stock ACC.", + Column.LONGITUDINAL) VW_MQB_A0 = CarFootnote( "Model-years 2022 and beyond may have a combined CAN gateway and BCM, which is supported by openpilot " + "in software, but doesn't yet have a harness available from the comma store.", @@ -161,6 +165,7 @@ class Footnote(Enum): class VWCarInfo(CarInfo): package: str = "Adaptive Cruise Control (ACC) & Lane Assist" harness: Enum = Harness.j533 + footnotes: List[Enum] = field(default_factory=lambda: [Footnote.VW_EXP_LONG]) CAR_INFO: Dict[str, Union[VWCarInfo, List[VWCarInfo]]] = { @@ -192,28 +197,28 @@ CAR_INFO: Dict[str, Union[VWCarInfo, List[VWCarInfo]]] = { VWCarInfo("Volkswagen Jetta GLI 2021-22"), ], CAR.PASSAT_MK8: [ - VWCarInfo("Volkswagen Passat 2015-22", footnotes=[Footnote.PASSAT]), + VWCarInfo("Volkswagen Passat 2015-22", footnotes=[Footnote.VW_EXP_LONG, Footnote.PASSAT]), VWCarInfo("Volkswagen Passat Alltrack 2015-22"), VWCarInfo("Volkswagen Passat GTE 2015-22"), ], CAR.PASSAT_NMS: VWCarInfo("Volkswagen Passat NMS 2017-22"), CAR.POLO_MK6: [ - VWCarInfo("Volkswagen Polo 2020-22", footnotes=[Footnote.VW_MQB_A0]), - VWCarInfo("Volkswagen Polo GTI 2020-22", footnotes=[Footnote.VW_MQB_A0]), + VWCarInfo("Volkswagen Polo 2020-22", footnotes=[Footnote.VW_EXP_LONG, Footnote.VW_MQB_A0]), + VWCarInfo("Volkswagen Polo GTI 2020-22", footnotes=[Footnote.VW_EXP_LONG, Footnote.VW_MQB_A0]), ], CAR.SHARAN_MK2: [ VWCarInfo("Volkswagen Sharan 2018-22"), VWCarInfo("SEAT Alhambra 2018-20"), ], CAR.TAOS_MK1: VWCarInfo("Volkswagen Taos 2022"), - CAR.TCROSS_MK1: VWCarInfo("Volkswagen T-Cross 2021", footnotes=[Footnote.VW_MQB_A0]), + CAR.TCROSS_MK1: VWCarInfo("Volkswagen T-Cross 2021", footnotes=[Footnote.VW_EXP_LONG, Footnote.VW_MQB_A0]), CAR.TIGUAN_MK2: VWCarInfo("Volkswagen Tiguan 2019-22"), CAR.TOURAN_MK2: VWCarInfo("Volkswagen Touran 2017"), CAR.TRANSPORTER_T61: [ VWCarInfo("Volkswagen Caravelle 2020"), VWCarInfo("Volkswagen California 2021"), ], - CAR.TROC_MK1: VWCarInfo("Volkswagen T-Roc 2021", footnotes=[Footnote.VW_MQB_A0]), + CAR.TROC_MK1: VWCarInfo("Volkswagen T-Roc 2021", footnotes=[Footnote.VW_EXP_LONG, Footnote.VW_MQB_A0]), CAR.AUDI_A3_MK3: [ VWCarInfo("Audi A3 2014-19"), VWCarInfo("Audi A3 Sportback e-tron 2017-18"), @@ -224,10 +229,10 @@ CAR_INFO: Dict[str, Union[VWCarInfo, List[VWCarInfo]]] = { CAR.AUDI_Q3_MK2: VWCarInfo("Audi Q3 2019-23"), CAR.SEAT_ATECA_MK1: VWCarInfo("SEAT Ateca 2018"), CAR.SEAT_LEON_MK3: VWCarInfo("SEAT Leon 2014-20"), - CAR.SKODA_KAMIQ_MK1: VWCarInfo("Škoda Kamiq 2021", footnotes=[Footnote.VW_MQB_A0, Footnote.KAMIQ]), + CAR.SKODA_KAMIQ_MK1: VWCarInfo("Škoda Kamiq 2021", footnotes=[Footnote.VW_EXP_LONG, Footnote.VW_MQB_A0, Footnote.KAMIQ]), CAR.SKODA_KAROQ_MK1: VWCarInfo("Škoda Karoq 2019-21"), CAR.SKODA_KODIAQ_MK1: VWCarInfo("Škoda Kodiaq 2018-19"), - CAR.SKODA_SCALA_MK1: VWCarInfo("Škoda Scala 2020", footnotes=[Footnote.VW_MQB_A0]), + CAR.SKODA_SCALA_MK1: VWCarInfo("Škoda Scala 2020", footnotes=[Footnote.VW_EXP_LONG, Footnote.VW_MQB_A0]), CAR.SKODA_SUPERB_MK3: VWCarInfo("Škoda Superb 2015-18"), CAR.SKODA_OCTAVIA_MK3: [ VWCarInfo("Škoda Octavia 2015, 2018-19"), From 615198bfd09586a763955f13a27af9a84d5b997d Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Fri, 4 Nov 2022 12:46:06 -0700 Subject: [PATCH 016/184] bump panda (#26362) --- panda | 2 +- poetry.lock | 63 +++++++++++++++++++++++++++++++++----------------- pyproject.toml | 1 + 3 files changed, 44 insertions(+), 22 deletions(-) diff --git a/panda b/panda index 9147cba1af..0b86dfa5fb 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit 9147cba1af0a8d72379242eb1ce0bfd42ab8075e +Subproject commit 0b86dfa5fbfcb77a127f980f81484aa7558e8c1e diff --git a/poetry.lock b/poetry.lock index 2dff4fecf1..d79a3f035f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -230,7 +230,7 @@ python-versions = ">=3.5" dev = ["cloudpickle", "coverage[toml] (>=5.0.2)", "furo", "hypothesis", "mypy (>=0.900,!=0.940)", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "sphinx", "sphinx-notfound-page", "zope.interface"] docs = ["furo", "sphinx", "sphinx-notfound-page", "zope.interface"] tests = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "zope.interface"] -tests_no_zope = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins"] +tests-no-zope = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins"] [[package]] name = "av" @@ -531,7 +531,7 @@ optional = false python-versions = ">=3.6.0" [package.extras] -unicode_backport = ["unicodedata2"] +unicode-backport = ["unicodedata2"] [[package]] name = "cleo" @@ -1410,7 +1410,7 @@ notebook = ["ipywidgets", "notebook"] parallel = ["ipyparallel"] qtconsole = ["qtconsole"] test = ["pytest (<7.1)", "pytest-asyncio", "testpath"] -test_extra = ["curio", "matplotlib (!=3.2.0)", "nbformat", "numpy (>=1.19)", "pandas", "pytest (<7.1)", "pytest-asyncio", "testpath", "trio"] +test-extra = ["curio", "matplotlib (!=3.2.0)", "nbformat", "numpy (>=1.19)", "pandas", "pytest (<7.1)", "pytest-asyncio", "testpath", "trio"] [[package]] name = "ipython-genutils" @@ -1459,9 +1459,9 @@ python-versions = ">=3.6.1,<4.0" [package.extras] colors = ["colorama (>=0.4.3,<0.5.0)"] -pipfile_deprecated_finder = ["pipreqs", "requirementslib"] +pipfile-deprecated-finder = ["pipreqs", "requirementslib"] plugins = ["setuptools"] -requirements_deprecated_finder = ["pip-api", "pipreqs"] +requirements-deprecated-finder = ["pip-api", "pipreqs"] [[package]] name = "itsdangerous" @@ -1892,7 +1892,7 @@ mdurl = ">=0.1,<1.0" [package.extras] benchmarking = ["psutil", "pytest", "pytest-benchmark (>=3.2,<4.0)"] -code_style = ["pre-commit (==2.6)"] +code-style = ["pre-commit (==2.6)"] compare = ["commonmark (>=0.9.1,<0.10.0)", "markdown (>=3.3.6,<3.4.0)", "mistletoe (>=0.8.1,<0.9.0)", "mistune (>=2.0.2,<2.1.0)", "panflute (>=2.1.3,<2.2.0)"] linkify = ["linkify-it-py (>=1.0,<2.0)"] plugins = ["mdit-py-plugins"] @@ -1959,7 +1959,7 @@ python-versions = ">=3.7" markdown-it-py = ">=1.0.0,<3.0.0" [package.extras] -code_style = ["pre-commit"] +code-style = ["pre-commit"] rtd = ["attrs", "myst-parser (>=0.16.1,<0.17.0)", "sphinx-book-theme (>=0.1.0,<0.2.0)"] testing = ["coverage", "pytest", "pytest-cov", "pytest-regressions"] @@ -2169,7 +2169,7 @@ sphinx = ">=4,<6" typing-extensions = "*" [package.extras] -code_style = ["pre-commit (>=2.12,<3.0)"] +code-style = ["pre-commit (>=2.12,<3.0)"] linkify = ["linkify-it-py (>=1.0,<2.0)"] rtd = ["ipython", "sphinx-book-theme", "sphinx-design", "sphinxcontrib.mermaid (>=0.7.1,<0.8.0)", "sphinxext-opengraph (>=0.6.3,<0.7.0)", "sphinxext-rediraffe (>=0.2.7,<0.3.0)"] testing = ["beautifulsoup4", "coverage[toml]", "pytest (>=6,<7)", "pytest-cov", "pytest-param-files (>=0.3.4,<0.4.0)", "pytest-regressions", "sphinx (<5.2)", "sphinx-pytest"] @@ -3193,7 +3193,7 @@ optional = false python-versions = ">=3.6" [package.extras] -asyncio_client = ["aiohttp (>=3.4)"] +asyncio-client = ["aiohttp (>=3.4)"] client = ["requests (>=2.21.0)", "websocket-client (>=0.54.0)"] [[package]] @@ -3217,7 +3217,7 @@ bidict = ">=0.21.0" python-engineio = ">=4.3.0" [package.extras] -asyncio_client = ["aiohttp (>=3.4)"] +asyncio-client = ["aiohttp (>=3.4)"] client = ["requests (>=2.21.0)", "websocket-client (>=0.54.0)"] [[package]] @@ -3393,7 +3393,7 @@ urllib3 = ">=1.21.1,<1.27" [package.extras] socks = ["PySocks (>=1.5.6,!=1.5.7)"] -use_chardet_on_py3 = ["chardet (>=3.0.2,<6)"] +use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] [[package]] name = "requests-oauthlib" @@ -3584,7 +3584,7 @@ falcon = ["falcon (>=1.4)"] fastapi = ["fastapi (>=0.79.0)"] flask = ["blinker (>=1.1)", "flask (>=0.11)"] httpx = ["httpx (>=0.16.0)"] -pure_eval = ["asttokens", "executing", "pure-eval"] +pure-eval = ["asttokens", "executing", "pure-eval"] pyspark = ["pyspark (>=2.4.4)"] quart = ["blinker (>=1.1)", "quart (>=0.16.1)"] rq = ["rq (>=0.6)"] @@ -3834,6 +3834,14 @@ python-versions = ">=3.5" lint = ["docutils-stubs", "flake8", "mypy"] test = ["pytest"] +[[package]] +name = "spidev" +version = "3.6" +description = "Python bindings for Linux SPI access through spidev" +category = "main" +optional = false +python-versions = "*" + [[package]] name = "sqlalchemy" version = "1.4.42" @@ -3850,19 +3858,19 @@ aiomysql = ["aiomysql", "greenlet (!=0.4.17)"] aiosqlite = ["aiosqlite", "greenlet (!=0.4.17)", "typing_extensions (!=3.10.0.1)"] asyncio = ["greenlet (!=0.4.17)"] asyncmy = ["asyncmy (>=0.2.3,!=0.2.4)", "greenlet (!=0.4.17)"] -mariadb_connector = ["mariadb (>=1.0.1,!=1.1.2)"] +mariadb-connector = ["mariadb (>=1.0.1,!=1.1.2)"] mssql = ["pyodbc"] -mssql_pymssql = ["pymssql"] -mssql_pyodbc = ["pyodbc"] +mssql-pymssql = ["pymssql"] +mssql-pyodbc = ["pyodbc"] mypy = ["mypy (>=0.910)", "sqlalchemy2-stubs"] mysql = ["mysqlclient (>=1.4.0)", "mysqlclient (>=1.4.0,<2)"] -mysql_connector = ["mysql-connector-python"] +mysql-connector = ["mysql-connector-python"] oracle = ["cx_oracle (>=7)", "cx_oracle (>=7,<8)"] postgresql = ["psycopg2 (>=2.7)"] -postgresql_asyncpg = ["asyncpg", "greenlet (!=0.4.17)"] -postgresql_pg8000 = ["pg8000 (>=1.16.6,!=1.29.0)"] -postgresql_psycopg2binary = ["psycopg2-binary"] -postgresql_psycopg2cffi = ["psycopg2cffi"] +postgresql-asyncpg = ["asyncpg", "greenlet (!=0.4.17)"] +postgresql-pg8000 = ["pg8000 (>=1.16.6,!=1.29.0)"] +postgresql-psycopg2binary = ["psycopg2-binary"] +postgresql-psycopg2cffi = ["psycopg2cffi"] pymysql = ["pymysql", "pymysql (<1)"] sqlcipher = ["sqlcipher3_binary"] @@ -4378,7 +4386,7 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [metadata] lock-version = "1.1" python-versions = "~3.8" -content-hash = "76f06d46b1c308e59968994e42193599d8ba3cab6d552460c9c48f282313b64d" +content-hash = "d2854112975a9d83a9540175b2d430487e40e0292d48a1ba6c591db60a08c136" [metadata.files] adal = [ @@ -5384,6 +5392,7 @@ gevent = [ {file = "gevent-22.10.1-cp310-cp310-win_amd64.whl", hash = "sha256:d2ea4ce36c09355379bc038be2bd50118f97d2eb6381b7096de4d05aa4c3e241"}, {file = "gevent-22.10.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3e73c9f71aa2a6795ecbec9b57282b002375e863e283558feb87b62840c8c1ac"}, {file = "gevent-22.10.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5bc3758f0dc95007c1780d28a9fd2150416a79c50f308f62a674d78a845ea1b9"}, + {file = "gevent-22.10.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:03c10ca0beeab0c6be516030471ea630447ddd1f649d3335e5b162097cd4130a"}, {file = "gevent-22.10.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:fe2c0ff095171c49f78f1d4e6dc89fa58253783c7b6dccab9f1d76e2ee391f10"}, {file = "gevent-22.10.1-cp36-cp36m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d18fcc324f39a3b21795022eb47c7752d6e4f4ed89d8cca41f1cc604553265b3"}, {file = "gevent-22.10.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:06ea39c70ce166c4a1d4386c7fae96cb8d84ad799527b3378406051104d15443"}, @@ -6554,6 +6563,11 @@ pillow-avif-plugin = [ {file = "pillow_avif_plugin-1.2.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:017e5e52cb4320414e8ce3e2089eae2cb87c22c73ff6012b17ae326fc5753b20"}, {file = "pillow_avif_plugin-1.2.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:2a57136d4866de5dc80cfb24d66655955fbdd87acf1d11d88c8dc2ab41023e46"}, {file = "pillow_avif_plugin-1.2.2-cp310-cp310-win_amd64.whl", hash = "sha256:f339511d0fccb69e3a5e3af39f8fe6700b0a07279015006ea56f8f49e7fecff4"}, + {file = "pillow_avif_plugin-1.2.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:05e821ecd90bb0b8d2dc7610625372cc47de9cb893d09662528bad572f669d1c"}, + {file = "pillow_avif_plugin-1.2.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d33886a5f9796fe9a8a3bc25ccfdeba7db119adb50b7004f1928a14b07d0213a"}, + {file = "pillow_avif_plugin-1.2.2-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:75b7ed186c2f740dd26e556f6a966c59a170b70263e429a2c81920fe444da8a7"}, + {file = "pillow_avif_plugin-1.2.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a11aef6b79078b8dad25c928e5871c146ab94424472851d5bf539ba62abde9ac"}, + {file = "pillow_avif_plugin-1.2.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:10696c536d68a14cefea3b98edb8d5a7ae29e8e07458f1d59c5d1cd780a8bf2a"}, {file = "pillow_avif_plugin-1.2.2-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:1a7291d6a5fb7336e72685a31d193e0b3a6bee9986c9ac4d8bd4b68dbe6d4f7f"}, {file = "pillow_avif_plugin-1.2.2-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:14b9c5dbf237e7dc12f69819ea181a457b3bd4f59f8cd71d028d3635fd3bcab4"}, {file = "pillow_avif_plugin-1.2.2-cp36-cp36m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:799cbfbeee831332d280c80df9ce16b5c3b1224c318264e97e89df8da32e870e"}, @@ -6942,11 +6956,13 @@ pyprof2calltree = [ ] pyproj = [ {file = "pyproj-3.4.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f343725566267a296b09ee7e591894f1fdc90f84f8ad5ec476aeb53bd4479c07"}, + {file = "pyproj-3.4.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5816807ca0bdc7256558770c6206a6783a3f02bcf844f94ee245f197bb5f7285"}, {file = "pyproj-3.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e7e609903572a56cca758bbaee5c1663c3e829ddce5eec4f368e68277e37022b"}, {file = "pyproj-3.4.0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4fd425ee8b6781c249c7adb7daa2e6c41ce573afabe4f380f5eecd913b56a3be"}, {file = "pyproj-3.4.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:954b068136518b3174d0a99448056e97af62b63392a95c420894f7de2229dae6"}, {file = "pyproj-3.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:4a23d84c5ffc383c7d9f0bde3a06fc1f6697b1b96725597f8f01e7b4bef0a2b5"}, {file = "pyproj-3.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1f9c100fd0fd80edbc7e4daa303600a8cbef6f0de43d005617acb38276b88dc0"}, + {file = "pyproj-3.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:aa5171f700f174777a9e9ed8f4655583243967c0f9cf2c90e3f54e54ff740134"}, {file = "pyproj-3.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9a496d9057b2128db9d733e66b206f2d5954bbae6b800d412f562d780561478c"}, {file = "pyproj-3.4.0-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:52e54796e2d9554a5eb8f11df4748af1fbbc47f76aa234d6faf09216a84554c5"}, {file = "pyproj-3.4.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a454a7c4423faa2a14e939d08ef293ee347fa529c9df79022b0585a6e1d8310c"}, @@ -6957,6 +6973,7 @@ pyproj = [ {file = "pyproj-3.4.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f80adda8c54b84271a93829477a01aa57bc178c834362e9f74e1de1b5033c74c"}, {file = "pyproj-3.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:221d8939685e0c43ee594c9f04b6a73a10e8e1cc0e85f28be0b4eb2f1bc8777d"}, {file = "pyproj-3.4.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d94afed99f31673d3d19fe750283621e193e2a53ca9e0443bf9d092c3905833b"}, + {file = "pyproj-3.4.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:0fff9c3a991508f16027be27d153f6c5583d03799443639d13c681e60f49e2d7"}, {file = "pyproj-3.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3b85acf09e5a9e35cd9ee72989793adb7089b4e611be02a43d3d0bda50ad116b"}, {file = "pyproj-3.4.0-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:45554f47d1a12a84b0620e4abc08a2a1b5d9f273a4759eaef75e74788ec7162a"}, {file = "pyproj-3.4.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:12f62c20656ac9b6076ebb213e9a635d52f4f01fef95310121d337e62e910cb6"}, @@ -7537,6 +7554,10 @@ sphinxcontrib-serializinghtml = [ {file = "sphinxcontrib-serializinghtml-1.1.5.tar.gz", hash = "sha256:aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952"}, {file = "sphinxcontrib_serializinghtml-1.1.5-py2.py3-none-any.whl", hash = "sha256:352a9a00ae864471d3a7ead8d7d79f5fc0b57e8b3f95e9867eb9eb28999b92fd"}, ] +spidev = [ + {file = "spidev-3.6-cp39-cp39-linux_armv7l.whl", hash = "sha256:280abc00a1ef7780ef62c3f294f52a2527b6c47d8c269fea98664970bcaf6da5"}, + {file = "spidev-3.6.tar.gz", hash = "sha256:14dbc37594a4aaef85403ab617985d3c3ef464d62bc9b769ef552db53701115b"}, +] sqlalchemy = [ {file = "SQLAlchemy-1.4.42-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:28e881266a172a4d3c5929182fde6bb6fba22ac93f137d5380cc78a11a9dd124"}, {file = "SQLAlchemy-1.4.42-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:ca9389a00f639383c93ed00333ed763812f80b5ae9e772ea32f627043f8c9c88"}, diff --git a/pyproject.toml b/pyproject.toml index ebb7954536..7e76b9cdfc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,6 +55,7 @@ tqdm = "^4.64.0" urllib3 = "^1.26.10" utm = "^0.7.0" websocket_client = "^1.3.3" +spidev = "^3.6" [tool.poetry.group.dev.dependencies] From a7ced7c54b86107cb4095423158e28398aa62143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Sch=C3=A4fer?= Date: Fri, 4 Nov 2022 13:21:34 -0700 Subject: [PATCH 017/184] Longcontrol: faster transition from starting to stopping (#26361) * Never command accel when stopping * Update ref_commit --- selfdrive/controls/lib/longcontrol.py | 1 + selfdrive/test/process_replay/ref_commit | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/selfdrive/controls/lib/longcontrol.py b/selfdrive/controls/lib/longcontrol.py index db5bf4d3e6..92a4f1f99b 100644 --- a/selfdrive/controls/lib/longcontrol.py +++ b/selfdrive/controls/lib/longcontrol.py @@ -103,6 +103,7 @@ class LongControl: elif self.long_control_state == LongCtrlState.stopping: if output_accel > self.CP.stopAccel: + output_accel = min(output_accel, 0.0) output_accel -= self.CP.stoppingDecelRate * DT_CTRL self.reset(CS.vEgo) diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index 40f3c522de..a0cfd2201f 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -2ba23c5d1c4e0c34295d38f31ed35e3482608b16 \ No newline at end of file +89641653a0fc765105dc1c6a2a995cba2fb3f344 From d257e28479f49339e7f79491ff9d67e9ba034dfe Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 4 Nov 2022 13:52:24 -0700 Subject: [PATCH 018/184] ui: minor e2e path tweaks (#26351) * new e2e path * clean up * fix * 2.5 seconds feels disjointed --- selfdrive/ui/qt/onroad.cc | 17 ++++++++--------- selfdrive/ui/qt/onroad.h | 1 + 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc index d3bc931b67..85b55697be 100644 --- a/selfdrive/ui/qt/onroad.cc +++ b/selfdrive/ui/qt/onroad.cc @@ -170,7 +170,7 @@ void OnroadAlerts::paintEvent(QPaintEvent *event) { } -AnnotatedCameraWidget::AnnotatedCameraWidget(VisionStreamType type, QWidget* parent) : fps_filter(UI_FREQ, 3, 1. / UI_FREQ), CameraWidget("camerad", type, true, parent) { +AnnotatedCameraWidget::AnnotatedCameraWidget(VisionStreamType type, QWidget* parent) : fps_filter(UI_FREQ, 3, 1. / UI_FREQ), accel_filter(UI_FREQ, .5, 1. / UI_FREQ), CameraWidget("camerad", type, true, parent) { pm = std::make_unique>({"uiDebug"}); engage_img = loadPixmap("../assets/img_chffr_wheel.png", {img_size, img_size}); @@ -463,19 +463,18 @@ void AnnotatedCameraWidget::drawLaneLines(QPainter &painter, const UIState *s) { if (scene.end_to_end_long) { const auto &acceleration = (*s->sm)["modelV2"].getModelV2().getAcceleration(); float acceleration_future = 0; - if (acceleration.getZ().size() > 16) { - acceleration_future = acceleration.getX()[16]; // 2.5 seconds + if (acceleration.getZ().size() > 10) { + acceleration_future = acceleration.getX()[10]; // 1.0 second } - start_hue = 60; - // speed up: 120, slow down: 0 - end_hue = fmax(fmin(start_hue + acceleration_future * 30, 120), 0); + // speed up: 148, slow down: 0 + start_hue = fmax(fmin(60 + accel_filter.update(acceleration_future) * 80, 148), 0); // FIXME: painter.drawPolygon can be slow if hue is not rounded - end_hue = int(end_hue * 100 + 0.5) / 100; + start_hue = int(start_hue * 100 + 0.5) / 100; bg.setColorAt(0.0, QColor::fromHslF(start_hue / 360., 0.97, 0.56, 0.4)); - bg.setColorAt(0.5, QColor::fromHslF(end_hue / 360., 1.0, 0.68, 0.35)); - bg.setColorAt(1.0, QColor::fromHslF(end_hue / 360., 1.0, 0.68, 0.0)); + bg.setColorAt(0.75, QColor::fromHslF(63 / 360., 1.0, 0.68, 0.35)); + bg.setColorAt(1.0, QColor::fromHslF(63 / 360., 1.0, 0.68, 0.0)); } else { const auto &orientation = (*s->sm)["modelV2"].getModelV2().getOrientation(); float orientation_future = 0; diff --git a/selfdrive/ui/qt/onroad.h b/selfdrive/ui/qt/onroad.h index 7edca6b3d5..1f6a49bf8c 100644 --- a/selfdrive/ui/qt/onroad.h +++ b/selfdrive/ui/qt/onroad.h @@ -87,6 +87,7 @@ protected: double prev_draw_t = 0; FirstOrderFilter fps_filter; + FirstOrderFilter accel_filter; }; // container for all onroad widgets From 2837e73a70b8b8faba7047db5124a582635439ff Mon Sep 17 00:00:00 2001 From: ZwX1616 Date: Fri, 4 Nov 2022 14:18:51 -0700 Subject: [PATCH 019/184] DM: compensate for non-calibrated pitch spread (#26348) --- selfdrive/monitoring/driver_monitor.py | 3 ++- selfdrive/test/process_replay/ref_commit | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/selfdrive/monitoring/driver_monitor.py b/selfdrive/monitoring/driver_monitor.py index a2dda5da9d..48163dcf2a 100644 --- a/selfdrive/monitoring/driver_monitor.py +++ b/selfdrive/monitoring/driver_monitor.py @@ -44,6 +44,7 @@ class DRIVER_MONITOR_SETTINGS(): self._POSE_YAW_THRESHOLD_SLACK = 0.5042 self._POSE_YAW_THRESHOLD_STRICT = self._POSE_YAW_THRESHOLD self._PITCH_NATURAL_OFFSET = 0.029 # initial value before offset is learned + self._PITCH_NATURAL_THRESHOLD = 0.449 self._YAW_NATURAL_OFFSET = 0.097 # initial value before offset is learned self._PITCH_MAX_OFFSET = 0.124 self._PITCH_MIN_OFFSET = -0.0881 @@ -197,7 +198,7 @@ class DriverStatus(): self.settings._YAW_MIN_OFFSET), self.settings._YAW_MAX_OFFSET) pitch_error = 0 if pitch_error > 0 else abs(pitch_error) # no positive pitch limit yaw_error = abs(yaw_error) - if pitch_error > self.settings._POSE_PITCH_THRESHOLD*self.pose.cfactor_pitch or \ + if pitch_error > (self.settings._POSE_PITCH_THRESHOLD*self.pose.cfactor_pitch if self.pose_calibrated else self.settings._PITCH_NATURAL_THRESHOLD) or \ yaw_error > self.settings._POSE_YAW_THRESHOLD*self.pose.cfactor_yaw: distracted_types.append(DistractedType.DISTRACTED_POSE) diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index a0cfd2201f..8bc13f37d4 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -89641653a0fc765105dc1c6a2a995cba2fb3f344 +24a8d02b148b7f6d20f641d56a7bed71c244b6e3 \ No newline at end of file From 91a1f1a91e8ac321ad2a69c3a44f41464147fc19 Mon Sep 17 00:00:00 2001 From: Cameron Clough Date: Fri, 4 Nov 2022 15:37:41 -0700 Subject: [PATCH 020/184] ui: toggle confirmation and dialog redesign (#26331) * toggle confirmation * change text * not for e2e * get current description * remove are you sure * merge rich text and confirmation dialogs * add some line breaks * font colour * fix padding a little * revert * updated toggle design --- selfdrive/ui/qt/offroad/settings.cc | 20 +++++++--- selfdrive/ui/qt/widgets/controls.h | 16 +++++++- selfdrive/ui/qt/widgets/input.cc | 50 ++++++------------------ selfdrive/ui/qt/widgets/input.h | 12 +----- selfdrive/ui/translations/main_ja.ts | 18 +++++---- selfdrive/ui/translations/main_ko.ts | 18 +++++---- selfdrive/ui/translations/main_pt-BR.ts | 18 +++++---- selfdrive/ui/translations/main_zh-CHS.ts | 18 +++++---- selfdrive/ui/translations/main_zh-CHT.ts | 18 +++++---- 9 files changed, 97 insertions(+), 91 deletions(-) diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index ae878c5419..b154447eb8 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -27,49 +27,56 @@ #include "selfdrive/ui/qt/widgets/input.h" TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) { - // param, title, desc, icon - std::vector> toggle_defs{ + // param, title, desc, icon, confirm + std::vector> toggle_defs{ { "OpenpilotEnabledToggle", tr("Enable openpilot"), tr("Use the openpilot system for adaptive cruise control and lane keep driver assistance. Your attention is required at all times to use this feature. Changing this setting takes effect when the car is powered off."), "../assets/offroad/icon_openpilot.png", + false, }, { "IsLdwEnabled", tr("Enable Lane Departure Warnings"), tr("Receive alerts to steer back into the lane when your vehicle drifts over a detected lane line without a turn signal activated while driving over 31 mph (50 km/h)."), "../assets/offroad/icon_warning.png", + false, }, { "IsMetric", tr("Use Metric System"), tr("Display speed in km/h instead of mph."), "../assets/offroad/icon_metric.png", + false, }, { "RecordFront", tr("Record and Upload Driver Camera"), tr("Upload data from the driver facing camera and help improve the driver monitoring algorithm."), "../assets/offroad/icon_monitoring.png", + false, }, { "DisengageOnAccelerator", tr("Disengage On Accelerator Pedal"), tr("When enabled, pressing the accelerator pedal will disengage openpilot."), "../assets/offroad/icon_disengage_on_accelerator.svg", + false, }, { "EndToEndLong", tr("🌮 End-to-end longitudinal (extremely alpha) 🌮"), "", "../assets/offroad/icon_road.png", + false, }, { "ExperimentalLongitudinalEnabled", tr("Experimental openpilot longitudinal control"), tr("WARNING: openpilot longitudinal control is experimental for this car and will disable AEB."), "../assets/offroad/icon_speed_limit.png", + true, }, #ifdef ENABLE_MAPS { @@ -77,19 +84,20 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) { tr("Show ETA in 24h Format"), tr("Use 24h format instead of am/pm"), "../assets/offroad/icon_metric.png", + false, }, { "NavSettingLeftSide", tr("Show Map on Left Side of UI"), tr("Show map on left side when in split screen view."), "../assets/offroad/icon_road.png", + false, }, #endif - }; - for (auto &[param, title, desc, icon] : toggle_defs) { - auto toggle = new ParamControl(param, title, desc, icon, this); + for (auto &[param, title, desc, icon, confirm] : toggle_defs) { + auto toggle = new ParamControl(param, title, desc, icon, confirm, this); bool locked = params.getBool((param + "Lock").toStdString()); toggle->setEnabled(!locked); @@ -181,7 +189,7 @@ DevicePanel::DevicePanel(SettingsWindow *parent) : ListWidget(parent) { auto regulatoryBtn = new ButtonControl(tr("Regulatory"), tr("VIEW"), ""); connect(regulatoryBtn, &ButtonControl::clicked, [=]() { const std::string txt = util::read_file("../assets/offroad/fcc.html"); - RichTextDialog::alert(QString::fromStdString(txt), this); + ConfirmationDialog::rich(QString::fromStdString(txt), this); }); addItem(regulatoryBtn); } diff --git a/selfdrive/ui/qt/widgets/controls.h b/selfdrive/ui/qt/widgets/controls.h index f11f9baf59..243c078f85 100644 --- a/selfdrive/ui/qt/widgets/controls.h +++ b/selfdrive/ui/qt/widgets/controls.h @@ -7,6 +7,7 @@ #include #include "common/params.h" +#include "selfdrive/ui/qt/widgets/input.h" #include "selfdrive/ui/qt/widgets/toggle.h" QFrame *horizontal_line(QWidget *parent = nullptr); @@ -49,6 +50,10 @@ public: value->setText(val); } + const QString getDescription() { + return description->text(); + } + public slots: void showDescription() { description->setVisible(true); @@ -134,10 +139,17 @@ class ParamControl : public ToggleControl { Q_OBJECT public: - ParamControl(const QString ¶m, const QString &title, const QString &desc, const QString &icon, QWidget *parent = nullptr) : ToggleControl(title, desc, icon, false, parent) { + ParamControl(const QString ¶m, const QString &title, const QString &desc, const QString &icon, const bool confirm, QWidget *parent = nullptr) : ToggleControl(title, desc, icon, false, parent) { key = param.toStdString(); QObject::connect(this, &ParamControl::toggleFlipped, [=](bool state) { - params.putBool(key, state); + QString content("

" + title + "



" + "

" + getDescription() + "

"); + ConfirmationDialog dialog(content, tr("Ok"), tr("Cancel"), true, this); + if (!confirm || !state || dialog.exec()) { + params.putBool(key, state); + } else { + toggle.togglePosition(); + } }); } diff --git a/selfdrive/ui/qt/widgets/input.cc b/selfdrive/ui/qt/widgets/input.cc index d703825885..897e4b5a05 100644 --- a/selfdrive/ui/qt/widgets/input.cc +++ b/selfdrive/ui/qt/widgets/input.cc @@ -183,17 +183,17 @@ void InputDialog::setMinLength(int length) { // ConfirmationDialog ConfirmationDialog::ConfirmationDialog(const QString &prompt_text, const QString &confirm_text, const QString &cancel_text, - QWidget *parent) : QDialogBase(parent) { + const bool rich, QWidget *parent) : QDialogBase(parent) { QFrame *container = new QFrame(this); - container->setStyleSheet("QFrame { border-radius: 0; background-color: #ECECEC; }"); + container->setStyleSheet("QFrame { background-color: #1B1B1B; color: #C9C9C9; }"); QVBoxLayout *main_layout = new QVBoxLayout(container); - main_layout->setContentsMargins(32, 120, 32, 32); + main_layout->setContentsMargins(32, rich ? 32 : 120, 32, 32); QLabel *prompt = new QLabel(prompt_text, this); prompt->setWordWrap(true); - prompt->setAlignment(Qt::AlignHCenter); - prompt->setStyleSheet("font-size: 70px; font-weight: bold; color: black;"); - main_layout->addWidget(prompt, 1, Qt::AlignTop | Qt::AlignHCenter); + prompt->setAlignment(rich ? Qt::AlignLeft : Qt::AlignHCenter); + prompt->setStyleSheet((rich ? "font-size: 42px; font-weight: light;" : "font-size: 70px; font-weight: bold;") + QString(" margin: 45px;")); + main_layout->addWidget(rich ? (QWidget*)new ScrollView(prompt, this) : (QWidget*)prompt, 1, Qt::AlignTop); // cancel + confirm buttons QHBoxLayout *btn_layout = new QHBoxLayout(); @@ -213,49 +213,23 @@ ConfirmationDialog::ConfirmationDialog(const QString &prompt_text, const QString } QVBoxLayout *outer_layout = new QVBoxLayout(this); - outer_layout->setContentsMargins(210, 170, 210, 170); + int margin = rich ? 100 : 200; + outer_layout->setContentsMargins(margin, margin, margin, margin); outer_layout->addWidget(container); } bool ConfirmationDialog::alert(const QString &prompt_text, QWidget *parent) { - ConfirmationDialog d = ConfirmationDialog(prompt_text, tr("Ok"), "", parent); + ConfirmationDialog d = ConfirmationDialog(prompt_text, tr("Ok"), "", false, parent); return d.exec(); } bool ConfirmationDialog::confirm(const QString &prompt_text, QWidget *parent) { - ConfirmationDialog d = ConfirmationDialog(prompt_text, tr("Ok"), tr("Cancel"), parent); + ConfirmationDialog d = ConfirmationDialog(prompt_text, tr("Ok"), tr("Cancel"), false, parent); return d.exec(); } - -// RichTextDialog - -RichTextDialog::RichTextDialog(const QString &prompt_text, const QString &btn_text, - QWidget *parent) : QDialogBase(parent) { - QFrame *container = new QFrame(this); - container->setStyleSheet("QFrame { background-color: #1B1B1B; }"); - QVBoxLayout *main_layout = new QVBoxLayout(container); - main_layout->setContentsMargins(32, 32, 32, 32); - - QLabel *prompt = new QLabel(prompt_text, this); - prompt->setWordWrap(true); - prompt->setAlignment(Qt::AlignLeft); - prompt->setTextFormat(Qt::RichText); - prompt->setStyleSheet("font-size: 42px; font-weight: light; color: #C9C9C9; margin: 45px;"); - main_layout->addWidget(new ScrollView(prompt, this), 1, Qt::AlignTop); - - // confirm button - QPushButton* confirm_btn = new QPushButton(btn_text); - main_layout->addWidget(confirm_btn); - QObject::connect(confirm_btn, &QPushButton::clicked, this, &QDialog::accept); - - QVBoxLayout *outer_layout = new QVBoxLayout(this); - outer_layout->setContentsMargins(100, 100, 100, 100); - outer_layout->addWidget(container); -} - -bool RichTextDialog::alert(const QString &prompt_text, QWidget *parent) { - auto d = RichTextDialog(prompt_text, tr("Ok"), parent); +bool ConfirmationDialog::rich(const QString &prompt_text, QWidget *parent) { + ConfirmationDialog d = ConfirmationDialog(prompt_text, tr("Ok"), "", true, parent); return d.exec(); } diff --git a/selfdrive/ui/qt/widgets/input.h b/selfdrive/ui/qt/widgets/input.h index 6c47a31d87..117e6ca05e 100644 --- a/selfdrive/ui/qt/widgets/input.h +++ b/selfdrive/ui/qt/widgets/input.h @@ -55,18 +55,10 @@ class ConfirmationDialog : public QDialogBase { public: explicit ConfirmationDialog(const QString &prompt_text, const QString &confirm_text, - const QString &cancel_text, QWidget* parent); + const QString &cancel_text, const bool rich, QWidget* parent); static bool alert(const QString &prompt_text, QWidget *parent); static bool confirm(const QString &prompt_text, QWidget *parent); -}; - -// larger ConfirmationDialog for rich text -class RichTextDialog : public QDialogBase { - Q_OBJECT - -public: - explicit RichTextDialog(const QString &prompt_text, const QString &btn_text, QWidget* parent); - static bool alert(const QString &prompt_text, QWidget *parent); + static bool rich(const QString &prompt_text, QWidget *parent); }; class MultiOptionDialog : public QDialogBase { diff --git a/selfdrive/ui/translations/main_ja.ts b/selfdrive/ui/translations/main_ja.ts index a11333a54d..d3c55b5be4 100644 --- a/selfdrive/ui/translations/main_ja.ts +++ b/selfdrive/ui/translations/main_ja.ts @@ -463,6 +463,17 @@ location set 「connect.comma.ai」をホーム画面に追加して、アプリのように使うことができます。 + + ParamControl + + Ok + OK + + + Cancel + キャンセル + + PrimeAdWidget @@ -585,13 +596,6 @@ location set 「data」パーティションをマウントできません。「確認」ボタンを押すとデバイスが初期化されます。 - - RichTextDialog - - Ok - OK - - SettingsWindow diff --git a/selfdrive/ui/translations/main_ko.ts b/selfdrive/ui/translations/main_ko.ts index 021243595e..4112087f72 100644 --- a/selfdrive/ui/translations/main_ko.ts +++ b/selfdrive/ui/translations/main_ko.ts @@ -463,6 +463,17 @@ location set connect.comma.ai을 앱처럼 사용하려면 홈 화면에 바로가기를 만드십시오 + + ParamControl + + Ok + 확인 + + + Cancel + 취소 + + PrimeAdWidget @@ -585,13 +596,6 @@ location set 데이터 파티션을 마운트할 수 없습니다. 확인 버튼을 눌러 장치를 리셋합니다. - - RichTextDialog - - Ok - 확인 - - SettingsWindow diff --git a/selfdrive/ui/translations/main_pt-BR.ts b/selfdrive/ui/translations/main_pt-BR.ts index 2afdaf3388..ab1946e6af 100644 --- a/selfdrive/ui/translations/main_pt-BR.ts +++ b/selfdrive/ui/translations/main_pt-BR.ts @@ -464,6 +464,17 @@ trabalho definido Salve connect.comma.ai como sua página inicial para utilizar como um app + + ParamControl + + Ok + OK + + + Cancel + Cancelar + + PrimeAdWidget @@ -589,13 +600,6 @@ trabalho definido Não foi possível montar a partição de dados. Pressione confirmar para resetar seu dispositivo. - - RichTextDialog - - Ok - Ok - - SettingsWindow diff --git a/selfdrive/ui/translations/main_zh-CHS.ts b/selfdrive/ui/translations/main_zh-CHS.ts index 9e7c354444..2baae98669 100644 --- a/selfdrive/ui/translations/main_zh-CHS.ts +++ b/selfdrive/ui/translations/main_zh-CHS.ts @@ -461,6 +461,17 @@ location set 将 connect.comma.ai 收藏到您的主屏幕，以便像应用程序一样使用它 + + ParamControl + + Ok + 好的 + + + Cancel + 取消 + + PrimeAdWidget @@ -583,13 +594,6 @@ location set 无法挂载数据分区。 确认以重置您的设备。 - - RichTextDialog - - Ok - 好的 - - SettingsWindow diff --git a/selfdrive/ui/translations/main_zh-CHT.ts b/selfdrive/ui/translations/main_zh-CHT.ts index 513135c7f4..44c231311a 100644 --- a/selfdrive/ui/translations/main_zh-CHT.ts +++ b/selfdrive/ui/translations/main_zh-CHT.ts @@ -463,6 +463,17 @@ location set 將 connect.comma.ai 加入您的主屏幕，以便像手機 App 一樣使用它 + + ParamControl + + Ok + 確定 + + + Cancel + 取消 + + PrimeAdWidget @@ -585,13 +596,6 @@ location set 無法掛載數據分區。請按確認重置您的設備。 - - RichTextDialog - - Ok - 確定 - - SettingsWindow From 31dbd21f07c90182472d00c2d4197947dc83861a Mon Sep 17 00:00:00 2001 From: Jason Wen <47793918+sunnyhaibin@users.noreply.github.com> Date: Fri, 4 Nov 2022 19:32:40 -0400 Subject: [PATCH 021/184] Hyundai: Add FW for 2023 Ioniq 5 HDA2 (#26145) --- docs/CARS.md | 2 +- selfdrive/car/hyundai/values.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/CARS.md b/docs/CARS.md index 55413e208b..9d279e918e 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -59,7 +59,7 @@ A supported vehicle is one that just works when you install a comma three. All s |Hyundai|Elantra Hybrid 2021-23|Smart Cruise Control (SCC)|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai K| |Hyundai|Genesis 2015-16|Smart Cruise Control (SCC)|Stock|19 mph|37 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai J| |Hyundai|i30 2019|Smart Cruise Control (SCC)|Stock|0 mph|32 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai E| -|Hyundai|Ioniq 5 (with HDA II) 2022|Highway Driving Assist II|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai Q| +|Hyundai|Ioniq 5 (with HDA II) 2022-23|Highway Driving Assist II|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai Q| |Hyundai|Ioniq 5 (without HDA II) 2022|Highway Driving Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai K| |Hyundai|Ioniq Electric 2019|Smart Cruise Control (SCC)|Stock|0 mph|32 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai C| |Hyundai|Ioniq Electric 2020|All|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai H| diff --git a/selfdrive/car/hyundai/values.py b/selfdrive/car/hyundai/values.py index 4415679175..0df9850d0b 100644 --- a/selfdrive/car/hyundai/values.py +++ b/selfdrive/car/hyundai/values.py @@ -143,7 +143,7 @@ CAR_INFO: Dict[str, Optional[Union[HyundaiCarInfo, List[HyundaiCarInfo]]]] = { CAR.SONATA_HYBRID: HyundaiCarInfo("Hyundai Sonata Hybrid 2020-22", "All", harness=Harness.hyundai_a), CAR.IONIQ_5: [ HyundaiCarInfo("Hyundai Ioniq 5 (without HDA II) 2022" , "Highway Driving Assist", harness=Harness.hyundai_k), - HyundaiCarInfo("Hyundai Ioniq 5 (with HDA II) 2022", "Highway Driving Assist II", harness=Harness.hyundai_q), + HyundaiCarInfo("Hyundai Ioniq 5 (with HDA II) 2022-23", "Highway Driving Assist II", harness=Harness.hyundai_q), ], CAR.TUCSON_HYBRID_4TH_GEN: HyundaiCarInfo("Hyundai Tucson Hybrid 2022", "All", harness=Harness.hyundai_n), @@ -1379,6 +1379,7 @@ FW_VERSIONS = { (Ecu.fwdCamera, 0x7c4, None): [ b'\xf1\x00NE1 MFC AT USA LHD 1.00 1.02 99211-GI010 211206', b'\xf1\x00NE1 MFC AT EUR LHD 1.00 1.06 99211-GI000 210813', + b'\xf1\x00NE1 MFC AT USA LHD 1.00 1.05 99211-GI010 220614', ], }, CAR.TUCSON_HYBRID_4TH_GEN: { From 06be96cae29bb347da2a9df43976613f3f2cc025 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Fri, 4 Nov 2022 16:36:27 -0700 Subject: [PATCH 022/184] boardd: prep for SPI + factor out USB (#26356) * merge origin/spi-panda * just prep * boardd: factor out USB comms * fix those * add to release files * little more --- release/files_common | 2 + selfdrive/boardd/SConscript | 4 +- selfdrive/boardd/boardd.cc | 18 +- selfdrive/boardd/panda.cc | 284 +++++--------------------------- selfdrive/boardd/panda.h | 45 ++--- selfdrive/boardd/panda_comms.cc | 232 ++++++++++++++++++++++++++ selfdrive/boardd/panda_comms.h | 51 ++++++ 7 files changed, 350 insertions(+), 286 deletions(-) create mode 100644 selfdrive/boardd/panda_comms.cc create mode 100644 selfdrive/boardd/panda_comms.h diff --git a/release/files_common b/release/files_common index e3c417040c..61d16a2088 100644 --- a/release/files_common +++ b/release/files_common @@ -90,6 +90,8 @@ selfdrive/boardd/boardd_api_impl.pyx selfdrive/boardd/can_list_to_can_capnp.cc selfdrive/boardd/panda.cc selfdrive/boardd/panda.h +selfdrive/boardd/panda_comms.h +selfdrive/boardd/panda_comms.cc selfdrive/boardd/set_time.py selfdrive/boardd/pandad.py diff --git a/selfdrive/boardd/SConscript b/selfdrive/boardd/SConscript index dcbea03d3c..356b5de663 100644 --- a/selfdrive/boardd/SConscript +++ b/selfdrive/boardd/SConscript @@ -1,9 +1,9 @@ Import('env', 'envCython', 'common', 'cereal', 'messaging') libs = ['usb-1.0', common, cereal, messaging, 'pthread', 'zmq', 'capnp', 'kj'] -env.Program('boardd', ['main.cc', 'boardd.cc', 'panda.cc'], LIBS=libs) +env.Program('boardd', ['main.cc', 'boardd.cc', 'panda.cc', 'panda_comms.cc'], LIBS=libs) env.Library('libcan_list_to_can_capnp', ['can_list_to_can_capnp.cc']) envCython.Program('boardd_api_impl.so', 'boardd_api_impl.pyx', LIBS=["can_list_to_can_capnp", 'capnp', 'kj'] + envCython["LIBS"]) if GetOption('test'): - env.Program('tests/test_boardd_usbprotocol', ['tests/test_boardd_usbprotocol.cc', 'panda.cc'], LIBS=libs) + env.Program('tests/test_boardd_usbprotocol', ['tests/test_boardd_usbprotocol.cc', 'panda.cc', 'panda_comms.cc'], LIBS=libs) diff --git a/selfdrive/boardd/boardd.cc b/selfdrive/boardd/boardd.cc index 2d613b68ce..5496902252 100644 --- a/selfdrive/boardd/boardd.cc +++ b/selfdrive/boardd/boardd.cc @@ -19,8 +19,6 @@ #include #include -#include - #include "cereal/gen/cpp/car.capnp.h" #include "cereal/messaging/messaging.h" #include "common/params.h" @@ -67,7 +65,7 @@ static std::string get_time_str(const struct tm &time) { bool check_all_connected(const std::vector &pandas) { for (const auto& panda : pandas) { - if (!panda->connected) { + if (!panda->connected()) { do_exit = true; return false; } @@ -184,7 +182,7 @@ bool safety_setter_thread(std::vector pandas) { return true; } -Panda *usb_connect(std::string serial="", uint32_t index=0) { +Panda *connect(std::string serial="", uint32_t index=0) { std::unique_ptr panda; try { panda = std::make_unique(serial, (index * PANDA_BUS_CNT)); @@ -227,9 +225,9 @@ void can_send_thread(std::vector pandas, bool fake_send) { //Dont send if older than 1 second if ((nanos_since_boot() - event.getLogMonoTime() < 1e9) && !fake_send) { for (const auto& panda : pandas) { - LOGT("sending sendcan to panda: %s", (panda->usb_serial).c_str()); + LOGT("sending sendcan to panda: %s", (panda->hw_serial).c_str()); panda->can_send(event.getSendcan()); - LOGT("sendcan sent to panda: %s", (panda->usb_serial).c_str()); + LOGT("sendcan sent to panda: %s", (panda->hw_serial).c_str()); } } } @@ -357,7 +355,7 @@ std::optional send_panda_states(PubMaster *pm, const std::vector } #endif - if (!panda->comms_healthy) { + if (!panda->comms_healthy()) { evt.setValid(false); } @@ -433,7 +431,7 @@ void send_peripheral_state(PubMaster *pm, Panda *panda) { // build msg MessageBuilder msg; auto evt = msg.initEvent(); - evt.setValid(panda->comms_healthy); + evt.setValid(panda->comms_healthy()); auto ps = evt.initPeripheralState(); ps.setPandaType(panda->hw_type); @@ -526,7 +524,7 @@ void peripheral_control_thread(Panda *panda, bool no_fan_control) { FirstOrderFilter integ_lines_filter(0, 30.0, 0.05); - while (!do_exit && panda->connected) { + while (!do_exit && panda->connected()) { cnt++; sm.update(1000); // TODO: what happens if EINTR is sent while in sm.update? @@ -595,7 +593,7 @@ void boardd_main_thread(std::vector serials) { // connect to all provided serials std::vector pandas; for (int i = 0; i < serials.size() && !do_exit; /**/) { - Panda *p = usb_connect(serials[i], i); + Panda *p = connect(serials[i], i); if (!p) { // send empty pandaState & peripheralState and try again send_empty_panda_state(&pm); diff --git a/selfdrive/boardd/panda.cc b/selfdrive/boardd/panda.cc index 329ce91c44..e68558632e 100644 --- a/selfdrive/boardd/panda.cc +++ b/selfdrive/boardd/panda.cc @@ -4,75 +4,15 @@ #include #include -#include #include "cereal/messaging/messaging.h" #include "panda/board/dlc_to_len.h" -#include "common/gpio.h" #include "common/swaglog.h" #include "common/util.h" -static int init_usb_ctx(libusb_context **context) { - assert(context != nullptr); - - int err = libusb_init(context); - if (err != 0) { - LOGE("libusb initialization error"); - return err; - } - -#if LIBUSB_API_VERSION >= 0x01000106 - libusb_set_option(*context, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_INFO); -#else - libusb_set_debug(*context, 3); -#endif - - return err; -} - - Panda::Panda(std::string serial, uint32_t bus_offset) : bus_offset(bus_offset) { - // init libusb - ssize_t num_devices; - libusb_device **dev_list = NULL; - int err = init_usb_ctx(&ctx); - if (err != 0) { goto fail; } - - // connect by serial - num_devices = libusb_get_device_list(ctx, &dev_list); - if (num_devices < 0) { goto fail; } - for (size_t i = 0; i < num_devices; ++i) { - libusb_device_descriptor desc; - libusb_get_device_descriptor(dev_list[i], &desc); - if (desc.idVendor == 0xbbaa && desc.idProduct == 0xddcc) { - int ret = libusb_open(dev_list[i], &dev_handle); - if (dev_handle == NULL || ret < 0) { goto fail; } - - unsigned char desc_serial[26] = { 0 }; - ret = libusb_get_string_descriptor_ascii(dev_handle, desc.iSerialNumber, desc_serial, std::size(desc_serial)); - if (ret < 0) { goto fail; } - - usb_serial = std::string((char *)desc_serial, ret).c_str(); - if (serial.empty() || serial == usb_serial) { - break; - } - libusb_close(dev_handle); - dev_handle = NULL; - } - } - if (dev_handle == NULL) goto fail; - libusb_free_device_list(dev_list, 1); - dev_list = nullptr; - - if (libusb_kernel_driver_active(dev_handle, 0) == 1) { - libusb_detach_kernel_driver(dev_handle, 0); - } - - err = libusb_set_configuration(dev_handle, 1); - if (err != 0) { goto fail; } - - err = libusb_claim_interface(dev_handle, 0); - if (err != 0) { goto fail; } + // TODO: support SPI here one day... + handle = std::make_unique(serial); hw_type = get_hw_type(); @@ -83,194 +23,44 @@ Panda::Panda(std::string serial, uint32_t bus_offset) : bus_offset(bus_offset) { (hw_type == cereal::PandaState::PandaType::DOS); return; - -fail: - if (dev_list != NULL) { - libusb_free_device_list(dev_list, 1); - } - cleanup(); - throw std::runtime_error("Error connecting to panda"); } -Panda::~Panda() { - std::lock_guard lk(usb_lock); - cleanup(); - connected = false; +bool Panda::connected() { + return handle->connected; } -void Panda::cleanup() { - if (dev_handle) { - libusb_release_interface(dev_handle, 0); - libusb_close(dev_handle); - } - - if (ctx) { - libusb_exit(ctx); - } +bool Panda::comms_healthy() { + return handle->comms_healthy; } std::vector Panda::list() { - // init libusb - ssize_t num_devices; - libusb_context *context = NULL; - libusb_device **dev_list = NULL; - std::vector serials; - - int err = init_usb_ctx(&context); - if (err != 0) { return serials; } - - num_devices = libusb_get_device_list(context, &dev_list); - if (num_devices < 0) { - LOGE("libusb can't get device list"); - goto finish; - } - for (size_t i = 0; i < num_devices; ++i) { - libusb_device *device = dev_list[i]; - libusb_device_descriptor desc; - libusb_get_device_descriptor(device, &desc); - if (desc.idVendor == 0xbbaa && desc.idProduct == 0xddcc) { - libusb_device_handle *handle = NULL; - int ret = libusb_open(device, &handle); - if (ret < 0) { goto finish; } - - unsigned char desc_serial[26] = { 0 }; - ret = libusb_get_string_descriptor_ascii(handle, desc.iSerialNumber, desc_serial, std::size(desc_serial)); - libusb_close(handle); - if (ret < 0) { goto finish; } - - serials.push_back(std::string((char *)desc_serial, ret).c_str()); - } - } - -finish: - if (dev_list != NULL) { - libusb_free_device_list(dev_list, 1); - } - if (context) { - libusb_exit(context); - } - return serials; -} - -void Panda::handle_usb_issue(int err, const char func[]) { - LOGE_100("usb error %d \"%s\" in %s", err, libusb_strerror((enum libusb_error)err), func); - if (err == LIBUSB_ERROR_NO_DEVICE) { - LOGE("lost connection"); - connected = false; - } - // TODO: check other errors, is simply retrying okay? -} - -int Panda::usb_write(uint8_t bRequest, uint16_t wValue, uint16_t wIndex, unsigned int timeout) { - int err; - const uint8_t bmRequestType = LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE; - - if (!connected) { - return LIBUSB_ERROR_NO_DEVICE; - } - - std::lock_guard lk(usb_lock); - do { - err = libusb_control_transfer(dev_handle, bmRequestType, bRequest, wValue, wIndex, NULL, 0, timeout); - if (err < 0) handle_usb_issue(err, __func__); - } while (err < 0 && connected); - - return err; -} - -int Panda::usb_read(uint8_t bRequest, uint16_t wValue, uint16_t wIndex, unsigned char *data, uint16_t wLength, unsigned int timeout) { - int err; - const uint8_t bmRequestType = LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE; - - if (!connected) { - return LIBUSB_ERROR_NO_DEVICE; - } - - std::lock_guard lk(usb_lock); - do { - err = libusb_control_transfer(dev_handle, bmRequestType, bRequest, wValue, wIndex, data, wLength, timeout); - if (err < 0) handle_usb_issue(err, __func__); - } while (err < 0 && connected); - - return err; -} - -int Panda::usb_bulk_write(unsigned char endpoint, unsigned char* data, int length, unsigned int timeout) { - int err; - int transferred = 0; - - if (!connected) { - return 0; - } - - std::lock_guard lk(usb_lock); - do { - // Try sending can messages. If the receive buffer on the panda is full it will NAK - // and libusb will try again. After 5ms, it will time out. We will drop the messages. - err = libusb_bulk_transfer(dev_handle, endpoint, data, length, &transferred, timeout); - - if (err == LIBUSB_ERROR_TIMEOUT) { - LOGW("Transmit buffer full"); - break; - } else if (err != 0 || length != transferred) { - handle_usb_issue(err, __func__); - } - } while(err != 0 && connected); - - return transferred; -} - -int Panda::usb_bulk_read(unsigned char endpoint, unsigned char* data, int length, unsigned int timeout) { - int err; - int transferred = 0; - - if (!connected) { - return 0; - } - - std::lock_guard lk(usb_lock); - - do { - err = libusb_bulk_transfer(dev_handle, endpoint, data, length, &transferred, timeout); - - if (err == LIBUSB_ERROR_TIMEOUT) { - break; // timeout is okay to exit, recv still happened - } else if (err == LIBUSB_ERROR_OVERFLOW) { - comms_healthy = false; - LOGE_100("overflow got 0x%x", transferred); - } else if (err != 0) { - handle_usb_issue(err, __func__); - } - - } while(err != 0 && connected); - - return transferred; + return PandaUsbHandle::list(); } void Panda::set_safety_model(cereal::CarParams::SafetyModel safety_model, uint16_t safety_param) { - usb_write(0xdc, (uint16_t)safety_model, safety_param); + handle->control_write(0xdc, (uint16_t)safety_model, safety_param); } void Panda::set_alternative_experience(uint16_t alternative_experience) { - usb_write(0xdf, alternative_experience, 0); + handle->control_write(0xdf, alternative_experience, 0); } cereal::PandaState::PandaType Panda::get_hw_type() { unsigned char hw_query[1] = {0}; - usb_read(0xc1, 0, 0, hw_query, 1); + handle->control_read(0xc1, 0, 0, hw_query, 1); return (cereal::PandaState::PandaType)(hw_query[0]); } void Panda::set_rtc(struct tm sys_time) { // tm struct has year defined as years since 1900 - usb_write(0xa1, (uint16_t)(1900 + sys_time.tm_year), 0); - usb_write(0xa2, (uint16_t)(1 + sys_time.tm_mon), 0); - usb_write(0xa3, (uint16_t)sys_time.tm_mday, 0); - // usb_write(0xa4, (uint16_t)(1 + sys_time.tm_wday), 0); - usb_write(0xa5, (uint16_t)sys_time.tm_hour, 0); - usb_write(0xa6, (uint16_t)sys_time.tm_min, 0); - usb_write(0xa7, (uint16_t)sys_time.tm_sec, 0); + handle->control_write(0xa1, (uint16_t)(1900 + sys_time.tm_year), 0); + handle->control_write(0xa2, (uint16_t)(1 + sys_time.tm_mon), 0); + handle->control_write(0xa3, (uint16_t)sys_time.tm_mday, 0); + // handle->control_write(0xa4, (uint16_t)(1 + sys_time.tm_wday), 0); + handle->control_write(0xa5, (uint16_t)sys_time.tm_hour, 0); + handle->control_write(0xa6, (uint16_t)sys_time.tm_min, 0); + handle->control_write(0xa7, (uint16_t)sys_time.tm_sec, 0); } struct tm Panda::get_rtc() { @@ -284,7 +74,7 @@ struct tm Panda::get_rtc() { uint8_t second; } rtc_time = {0}; - usb_read(0xa0, 0, 0, (unsigned char*)&rtc_time, sizeof(rtc_time)); + handle->control_read(0xa0, 0, 0, (unsigned char*)&rtc_time, sizeof(rtc_time)); struct tm new_time = { 0 }; new_time.tm_year = rtc_time.year - 1900; // tm struct has year defined as years since 1900 @@ -298,70 +88,70 @@ struct tm Panda::get_rtc() { } void Panda::set_fan_speed(uint16_t fan_speed) { - usb_write(0xb1, fan_speed, 0); + handle->control_write(0xb1, fan_speed, 0); } uint16_t Panda::get_fan_speed() { uint16_t fan_speed_rpm = 0; - usb_read(0xb2, 0, 0, (unsigned char*)&fan_speed_rpm, sizeof(fan_speed_rpm)); + handle->control_read(0xb2, 0, 0, (unsigned char*)&fan_speed_rpm, sizeof(fan_speed_rpm)); return fan_speed_rpm; } void Panda::set_ir_pwr(uint16_t ir_pwr) { - usb_write(0xb0, ir_pwr, 0); + handle->control_write(0xb0, ir_pwr, 0); } std::optional Panda::get_state() { health_t health {0}; - int err = usb_read(0xd2, 0, 0, (unsigned char*)&health, sizeof(health)); + int err = handle->control_read(0xd2, 0, 0, (unsigned char*)&health, sizeof(health)); return err >= 0 ? std::make_optional(health) : std::nullopt; } std::optional Panda::get_can_state(uint16_t can_number) { can_health_t can_health {0}; - int err = usb_read(0xc2, can_number, 0, (unsigned char*)&can_health, sizeof(can_health)); + int err = handle->control_read(0xc2, can_number, 0, (unsigned char*)&can_health, sizeof(can_health)); return err >= 0 ? std::make_optional(can_health) : std::nullopt; } void Panda::set_loopback(bool loopback) { - usb_write(0xe5, loopback, 0); + handle->control_write(0xe5, loopback, 0); } std::optional> Panda::get_firmware_version() { std::vector fw_sig_buf(128); - int read_1 = usb_read(0xd3, 0, 0, &fw_sig_buf[0], 64); - int read_2 = usb_read(0xd4, 0, 0, &fw_sig_buf[64], 64); + int read_1 = handle->control_read(0xd3, 0, 0, &fw_sig_buf[0], 64); + int read_2 = handle->control_read(0xd4, 0, 0, &fw_sig_buf[64], 64); return ((read_1 == 64) && (read_2 == 64)) ? std::make_optional(fw_sig_buf) : std::nullopt; } std::optional Panda::get_serial() { char serial_buf[17] = {'\0'}; - int err = usb_read(0xd0, 0, 0, (uint8_t*)serial_buf, 16); + int err = handle->control_read(0xd0, 0, 0, (uint8_t*)serial_buf, 16); return err >= 0 ? std::make_optional(serial_buf) : std::nullopt; } void Panda::set_power_saving(bool power_saving) { - usb_write(0xe7, power_saving, 0); + handle->control_write(0xe7, power_saving, 0); } void Panda::enable_deepsleep() { - usb_write(0xfb, 0, 0); + handle->control_write(0xfb, 0, 0); } void Panda::send_heartbeat(bool engaged) { - usb_write(0xf3, engaged, 0); + handle->control_write(0xf3, engaged, 0); } void Panda::set_can_speed_kbps(uint16_t bus, uint16_t speed) { - usb_write(0xde, bus, (speed * 10)); + handle->control_write(0xde, bus, (speed * 10)); } void Panda::set_data_speed_kbps(uint16_t bus, uint16_t speed) { - usb_write(0xf9, bus, (speed * 10)); + handle->control_write(0xf9, bus, (speed * 10)); } void Panda::set_canfd_non_iso(uint16_t bus, bool non_iso) { - usb_write(0xfc, bus, non_iso); + handle->control_write(0xfc, bus, non_iso); } static uint8_t len_to_dlc(uint8_t len) { @@ -422,14 +212,14 @@ void Panda::pack_can_buffer(const capnp::List::Reader &can_data void Panda::can_send(capnp::List::Reader can_data_list) { pack_can_buffer(can_data_list, [=](uint8_t* data, size_t size) { - usb_bulk_write(3, data, size, 5); + handle->bulk_write(3, data, size, 5); }); } bool Panda::can_receive(std::vector& out_vec) { uint8_t data[RECV_SIZE]; - int recv = usb_bulk_read(0x81, (uint8_t*)data, RECV_SIZE); - if (!comms_healthy) { + int recv = handle->bulk_read(0x81, (uint8_t*)data, RECV_SIZE); + if (!comms_healthy()) { return false; } if (recv == RECV_SIZE) { @@ -444,7 +234,7 @@ bool Panda::unpack_can_buffer(uint8_t *data, int size, std::vector &o for (int i = 0; i < size; i += USBPACKET_MAX_SIZE) { if (data[i] != i / USBPACKET_MAX_SIZE) { LOGE("CAN: MALFORMED USB RECV PACKET"); - comms_healthy = false; + handle->comms_healthy = false; return false; } int chunk_len = std::min(USBPACKET_MAX_SIZE, (size - i)); diff --git a/selfdrive/boardd/panda.h b/selfdrive/boardd/panda.h index c7a0e7a6c1..5b3cbb9a3e 100644 --- a/selfdrive/boardd/panda.h +++ b/selfdrive/boardd/panda.h @@ -1,26 +1,26 @@ #pragma once -#include #include #include #include #include -#include +#include #include #include -#include - #include "cereal/gen/cpp/car.capnp.h" #include "cereal/gen/cpp/log.capnp.h" #include "panda/board/health.h" +#include "selfdrive/boardd/panda_comms.h" + -#define TIMEOUT 0 #define PANDA_CAN_CNT 3 #define PANDA_BUS_CNT 4 -#define RECV_SIZE (0x4000U) + #define USB_TX_SOFT_LIMIT (0x100U) #define USBPACKET_MAX_SIZE (0x40) + +#define RECV_SIZE (0x4000U) #define CANPACKET_HEAD_SIZE 5U #define CANPACKET_MAX_SIZE 72U #define CANPACKET_REJECTED (0xC0U) @@ -37,41 +37,32 @@ struct __attribute__((packed)) can_header { }; struct can_frame { - long address; - std::string dat; - long busTime; - long src; + long address; + std::string dat; + long busTime; + long src; }; + class Panda { - private: - libusb_context *ctx = NULL; - libusb_device_handle *dev_handle = NULL; - std::mutex usb_lock; +private: + std::unique_ptr handle; std::vector recv_buf; - void handle_usb_issue(int err, const char func[]); - void cleanup(); - public: +public: Panda(std::string serial="", uint32_t bus_offset=0); - ~Panda(); - std::string usb_serial; - std::atomic connected = true; - std::atomic comms_healthy = true; + std::string hw_serial; cereal::PandaState::PandaType hw_type = cereal::PandaState::PandaType::UNKNOWN; bool has_rtc = false; const uint32_t bus_offset; + bool connected(); + bool comms_healthy(); + // Static functions static std::vector list(); - // HW communication - int usb_write(uint8_t bRequest, uint16_t wValue, uint16_t wIndex, unsigned int timeout=TIMEOUT); - int usb_read(uint8_t bRequest, uint16_t wValue, uint16_t wIndex, unsigned char *data, uint16_t wLength, unsigned int timeout=TIMEOUT); - int usb_bulk_write(unsigned char endpoint, unsigned char* data, int length, unsigned int timeout=TIMEOUT); - int usb_bulk_read(unsigned char endpoint, unsigned char* data, int length, unsigned int timeout=TIMEOUT); - // Panda functionality cereal::PandaState::PandaType get_hw_type(); void set_safety_model(cereal::CarParams::SafetyModel safety_model, uint16_t safety_param=0U); diff --git a/selfdrive/boardd/panda_comms.cc b/selfdrive/boardd/panda_comms.cc new file mode 100644 index 0000000000..e73cb69318 --- /dev/null +++ b/selfdrive/boardd/panda_comms.cc @@ -0,0 +1,232 @@ +#include "selfdrive/boardd/panda.h" + +#include +#include + +#include "common/swaglog.h" + +static int init_usb_ctx(libusb_context **context) { + assert(context != nullptr); + + int err = libusb_init(context); + if (err != 0) { + LOGE("libusb initialization error"); + return err; + } + +#if LIBUSB_API_VERSION >= 0x01000106 + libusb_set_option(*context, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_INFO); +#else + libusb_set_debug(*context, 3); +#endif + + return err; +} + +PandaUsbHandle::PandaUsbHandle(std::string serial) : PandaCommsHandle(serial) { + // init libusb + ssize_t num_devices; + libusb_device **dev_list = NULL; + int err = init_usb_ctx(&ctx); + if (err != 0) { goto fail; } + + // connect by serial + num_devices = libusb_get_device_list(ctx, &dev_list); + if (num_devices < 0) { goto fail; } + for (size_t i = 0; i < num_devices; ++i) { + libusb_device_descriptor desc; + libusb_get_device_descriptor(dev_list[i], &desc); + if (desc.idVendor == 0xbbaa && desc.idProduct == 0xddcc) { + int ret = libusb_open(dev_list[i], &dev_handle); + if (dev_handle == NULL || ret < 0) { goto fail; } + + unsigned char desc_serial[26] = { 0 }; + ret = libusb_get_string_descriptor_ascii(dev_handle, desc.iSerialNumber, desc_serial, std::size(desc_serial)); + if (ret < 0) { goto fail; } + + auto hw_serial = std::string((char *)desc_serial, ret); + if (serial.empty() || serial == hw_serial) { + break; + } + libusb_close(dev_handle); + dev_handle = NULL; + } + } + if (dev_handle == NULL) goto fail; + libusb_free_device_list(dev_list, 1); + dev_list = nullptr; + + if (libusb_kernel_driver_active(dev_handle, 0) == 1) { + libusb_detach_kernel_driver(dev_handle, 0); + } + + err = libusb_set_configuration(dev_handle, 1); + if (err != 0) { goto fail; } + + err = libusb_claim_interface(dev_handle, 0); + if (err != 0) { goto fail; } + + return; + +fail: + if (dev_list != NULL) { + libusb_free_device_list(dev_list, 1); + } + cleanup(); + throw std::runtime_error("Error connecting to panda"); +} + +PandaUsbHandle::~PandaUsbHandle() { + std::lock_guard lk(hw_lock); + cleanup(); + connected = false; +} + +void PandaUsbHandle::cleanup() { + if (dev_handle) { + libusb_release_interface(dev_handle, 0); + libusb_close(dev_handle); + } + + if (ctx) { + libusb_exit(ctx); + } +} + +std::vector PandaUsbHandle::list() { + // init libusb + ssize_t num_devices; + libusb_context *context = NULL; + libusb_device **dev_list = NULL; + std::vector serials; + + int err = init_usb_ctx(&context); + if (err != 0) { return serials; } + + num_devices = libusb_get_device_list(context, &dev_list); + if (num_devices < 0) { + LOGE("libusb can't get device list"); + goto finish; + } + for (size_t i = 0; i < num_devices; ++i) { + libusb_device *device = dev_list[i]; + libusb_device_descriptor desc; + libusb_get_device_descriptor(device, &desc); + if (desc.idVendor == 0xbbaa && desc.idProduct == 0xddcc) { + libusb_device_handle *handle = NULL; + int ret = libusb_open(device, &handle); + if (ret < 0) { goto finish; } + + unsigned char desc_serial[26] = { 0 }; + ret = libusb_get_string_descriptor_ascii(handle, desc.iSerialNumber, desc_serial, std::size(desc_serial)); + libusb_close(handle); + if (ret < 0) { goto finish; } + + serials.push_back(std::string((char *)desc_serial, ret).c_str()); + } + } + +finish: + if (dev_list != NULL) { + libusb_free_device_list(dev_list, 1); + } + if (context) { + libusb_exit(context); + } + return serials; +} + +void PandaUsbHandle::handle_usb_issue(int err, const char func[]) { + LOGE_100("usb error %d \"%s\" in %s", err, libusb_strerror((enum libusb_error)err), func); + if (err == LIBUSB_ERROR_NO_DEVICE) { + LOGE("lost connection"); + connected = false; + } + // TODO: check other errors, is simply retrying okay? +} + +int PandaUsbHandle::control_write(uint8_t bRequest, uint16_t wValue, uint16_t wIndex, unsigned int timeout) { + int err; + const uint8_t bmRequestType = LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE; + + if (!connected) { + return LIBUSB_ERROR_NO_DEVICE; + } + + std::lock_guard lk(hw_lock); + do { + err = libusb_control_transfer(dev_handle, bmRequestType, bRequest, wValue, wIndex, NULL, 0, timeout); + if (err < 0) handle_usb_issue(err, __func__); + } while (err < 0 && connected); + + return err; +} + +int PandaUsbHandle::control_read(uint8_t bRequest, uint16_t wValue, uint16_t wIndex, unsigned char *data, uint16_t wLength, unsigned int timeout) { + int err; + const uint8_t bmRequestType = LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE; + + if (!connected) { + return LIBUSB_ERROR_NO_DEVICE; + } + + std::lock_guard lk(hw_lock); + do { + err = libusb_control_transfer(dev_handle, bmRequestType, bRequest, wValue, wIndex, data, wLength, timeout); + if (err < 0) handle_usb_issue(err, __func__); + } while (err < 0 && connected); + + return err; +} + +int PandaUsbHandle::bulk_write(unsigned char endpoint, unsigned char* data, int length, unsigned int timeout) { + int err; + int transferred = 0; + + if (!connected) { + return 0; + } + + std::lock_guard lk(hw_lock); + do { + // Try sending can messages. If the receive buffer on the panda is full it will NAK + // and libusb will try again. After 5ms, it will time out. We will drop the messages. + err = libusb_bulk_transfer(dev_handle, endpoint, data, length, &transferred, timeout); + + if (err == LIBUSB_ERROR_TIMEOUT) { + LOGW("Transmit buffer full"); + break; + } else if (err != 0 || length != transferred) { + handle_usb_issue(err, __func__); + } + } while(err != 0 && connected); + + return transferred; +} + +int PandaUsbHandle::bulk_read(unsigned char endpoint, unsigned char* data, int length, unsigned int timeout) { + int err; + int transferred = 0; + + if (!connected) { + return 0; + } + + std::lock_guard lk(hw_lock); + + do { + err = libusb_bulk_transfer(dev_handle, endpoint, data, length, &transferred, timeout); + + if (err == LIBUSB_ERROR_TIMEOUT) { + break; // timeout is okay to exit, recv still happened + } else if (err == LIBUSB_ERROR_OVERFLOW) { + comms_healthy = false; + LOGE_100("overflow got 0x%x", transferred); + } else if (err != 0) { + handle_usb_issue(err, __func__); + } + + } while(err != 0 && connected); + + return transferred; +} diff --git a/selfdrive/boardd/panda_comms.h b/selfdrive/boardd/panda_comms.h new file mode 100644 index 0000000000..c5143b16b3 --- /dev/null +++ b/selfdrive/boardd/panda_comms.h @@ -0,0 +1,51 @@ +#pragma once + +#include +#include +#include +#include + +#include + +#define TIMEOUT 0 + + +// comms base class +class PandaCommsHandle { +public: + PandaCommsHandle(std::string serial) {}; + virtual ~PandaCommsHandle() {}; + virtual void cleanup() = 0; + + std::atomic connected = true; + std::atomic comms_healthy = true; + static std::vector list(); + + // HW communication + virtual int control_write(uint8_t request, uint16_t param1, uint16_t param2, unsigned int timeout=TIMEOUT) = 0; + virtual int control_read(uint8_t request, uint16_t param1, uint16_t param2, unsigned char *data, uint16_t length, unsigned int timeout=TIMEOUT) = 0; + virtual int bulk_write(unsigned char endpoint, unsigned char* data, int length, unsigned int timeout=TIMEOUT) = 0; + virtual int bulk_read(unsigned char endpoint, unsigned char* data, int length, unsigned int timeout=TIMEOUT) = 0; + +protected: + std::mutex hw_lock; +}; + +class PandaUsbHandle : public PandaCommsHandle { +public: + PandaUsbHandle(std::string serial); + ~PandaUsbHandle(); + int control_write(uint8_t request, uint16_t param1, uint16_t param2, unsigned int timeout=TIMEOUT); + int control_read(uint8_t request, uint16_t param1, uint16_t param2, unsigned char *data, uint16_t length, unsigned int timeout=TIMEOUT); + int bulk_write(unsigned char endpoint, unsigned char* data, int length, unsigned int timeout=TIMEOUT); + int bulk_read(unsigned char endpoint, unsigned char* data, int length, unsigned int timeout=TIMEOUT); + void cleanup(); + + static std::vector list(); + +private: + libusb_context *ctx = NULL; + libusb_device_handle *dev_handle = NULL; + std::vector recv_buf; + void handle_usb_issue(int err, const char func[]); +}; From fa4a36800534ede59850f1d9be1cdd6f023d4707 Mon Sep 17 00:00:00 2001 From: Kurt Nistelberger Date: Sat, 5 Nov 2022 00:44:06 +0100 Subject: [PATCH 023/184] CI: add OX0C310 camerad box (#26318) * update jenkins file * . * revert * Update Jenkinsfile Co-authored-by: Adeeb Shihadeh Co-authored-by: Kurt Nistelberger Co-authored-by: Adeeb Shihadeh --- Jenkinsfile | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ea62ff3c49..0d624954ea 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -137,10 +137,21 @@ pipeline { } } - stage('camerad') { + stage('camerad-ar') { agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } steps { - phone_steps("tici-party", [ + phone_steps("tici-ar0321", [ + ["build", "cd selfdrive/manager && ./build.py"], + ["test camerad", "python system/camerad/test/test_camerad.py"], + ["test exposure", "python system/camerad/test/test_exposure.py"], + ]) + } + } + + stage('camerad-ox') { + agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } + steps { + phone_steps("tici-ox03c10", [ ["build", "cd selfdrive/manager && ./build.py"], ["test camerad", "python system/camerad/test/test_camerad.py"], ["test exposure", "python system/camerad/test/test_exposure.py"], From 1db915ec1f2a426782b90ab4a2e68c5d31d80a3e Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 4 Nov 2022 17:03:41 -0700 Subject: [PATCH 024/184] Hyundai CAN-FD: remove check on unused msg (#26368) remove check on unused msg --- selfdrive/car/hyundai/carstate.py | 1 - 1 file changed, 1 deletion(-) diff --git a/selfdrive/car/hyundai/carstate.py b/selfdrive/car/hyundai/carstate.py index 3cce581868..8ce6aada6b 100644 --- a/selfdrive/car/hyundai/carstate.py +++ b/selfdrive/car/hyundai/carstate.py @@ -443,7 +443,6 @@ class CarState(CarStateBase): checks = [ ("WHEEL_SPEEDS", 100), ("GEAR_SHIFTER", 100), - ("BRAKE", 100), ("STEERING_SENSORS", 100), ("MDPS", 100), ("TCS", 50), From b22fc70f52f3a9b62c718011819126abd7552f9c Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 4 Nov 2022 17:06:34 -0700 Subject: [PATCH 025/184] Hyundai CAN-FD: support ICE alt gears (#26367) * Hyundai: Car Port for Santa Cruz 2022 * bump opendbc * New struct and params for CAN-FD ICE models * fixup! New struct and params for CAN-FD ICE models * bump panda * bump panda * HKG: Car Port for Sportage 2023 * fixup! HKG: Car Port for Sportage 2023 * Kia Sportage 2023: Add FW versions * Longitudinal Control: ICE CAN-FD models * fixup! Longitudinal Control: ICE CAN-FD models * bump panda * fixup! Longitudinal Control: ICE CAN-FD models * Update car info * fixup! Longitudinal Control: ICE CAN-FD models * Gate radar disable behind HDA2 only * Gate radar disable behind camera SCC cars * Update CARS.md * Add FW versions for Santa Cruz 2021 * Test route for Kia Sportage 2023 (openpilot longitudinal enabled) * Test route for Santa Cruz 2021 (openpilot longitudinal enabled) * fixup! Kia Sportage 2023: Add FW versions * HKG: Car Port for Genesis GV70 2023 thanks to @zunichky! Co-authored-by: kyle zunich * Update car info * Add torque param for GENESIS GV70 1ST GEN * Fix CARS.md * Update test route * Remove unnecessary HDA2 checks * Add additional FW versions for Sportage 2023 * Fix Kia Sportage supported MY * Fix MISRA violation * Fix release note * Use IntFlag to gate camera SCC for CAN-FD * Parse 0x1A0 on bus 4 dynamically * bump panda * Car code cleanup * Typo * Add additional 0x1A0 signals to bus 4 * Fix weird bitwise logic * Check 0x1a0 after safety config is set * Revert "Check 0x1a0 after safety config is set" This reverts commit 141bbf79792bcde9cfadbc0680654acf61d8d16f. * Check car list instead * Add GV70 2022 test route * Add fwdRadar FW version for GV70 2022 * Fix CARS.md * Fix CARS.md * Fix CARS.md * new santa cruz route * bump panda to commaai/panda#1031 * bumppanda * some clean up * lets refactor CAMERA_SCC_CAR in another pr * minor clean up * revert car stuff * revert panda * revvy * revvy * it's all ice * revert * revert Co-authored-by: Jason Wen Co-authored-by: kyle zunich Co-authored-by: Adeeb Shihadeh Co-authored-by: Jason Wen <47793918+sunnyhaibin@users.noreply.github.com> --- selfdrive/car/hyundai/carstate.py | 10 ++++++---- selfdrive/car/hyundai/interface.py | 3 +++ selfdrive/car/hyundai/values.py | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/selfdrive/car/hyundai/carstate.py b/selfdrive/car/hyundai/carstate.py index 8ce6aada6b..e83b83f432 100644 --- a/selfdrive/car/hyundai/carstate.py +++ b/selfdrive/car/hyundai/carstate.py @@ -21,8 +21,9 @@ class CarState(CarStateBase): self.cruise_buttons = deque([Buttons.NONE] * PREV_BUTTON_SAMPLES, maxlen=PREV_BUTTON_SAMPLES) self.main_buttons = deque([Buttons.NONE] * PREV_BUTTON_SAMPLES, maxlen=PREV_BUTTON_SAMPLES) + self.gear_msg_canfd = "GEAR_ALT" if CP.flags & HyundaiFlags.CANFD_ALT_GEARS else "GEAR_SHIFTER" if CP.carFingerprint in CANFD_CAR: - self.shifter_values = can_define.dv["GEAR_SHIFTER"]["GEAR"] + self.shifter_values = can_define.dv[self.gear_msg_canfd]["GEAR"] elif self.CP.carFingerprint in FEATURES["use_cluster_gears"]: self.shifter_values = can_define.dv["CLU15"]["CF_Clu_Gear"] elif self.CP.carFingerprint in FEATURES["use_tcu_gears"]: @@ -164,7 +165,7 @@ class CarState(CarStateBase): ret.doorOpen = cp.vl["DOORS_SEATBELTS"]["DRIVER_DOOR_OPEN"] == 1 ret.seatbeltUnlatched = cp.vl["DOORS_SEATBELTS"]["DRIVER_SEATBELT_LATCHED"] == 0 - gear = cp.vl["GEAR_SHIFTER"]["GEAR"] + gear = cp.vl[self.gear_msg_canfd]["GEAR"] ret.gearShifter = self.parse_gear_shifter(self.shifter_values.get(gear)) # TODO: figure out positions @@ -411,13 +412,14 @@ class CarState(CarStateBase): def get_can_parser_canfd(CP): cruise_btn_msg = "CRUISE_BUTTONS_ALT" if CP.flags & HyundaiFlags.CANFD_ALT_BUTTONS else "CRUISE_BUTTONS" + gear_msg = "GEAR_ALT" if CP.flags & HyundaiFlags.CANFD_ALT_GEARS else "GEAR_SHIFTER" signals = [ ("WHEEL_SPEED_1", "WHEEL_SPEEDS"), ("WHEEL_SPEED_2", "WHEEL_SPEEDS"), ("WHEEL_SPEED_3", "WHEEL_SPEEDS"), ("WHEEL_SPEED_4", "WHEEL_SPEEDS"), - ("GEAR", "GEAR_SHIFTER"), + ("GEAR", gear_msg), ("STEERING_RATE", "STEERING_SENSORS"), ("STEERING_ANGLE", "STEERING_SENSORS"), @@ -442,7 +444,7 @@ class CarState(CarStateBase): checks = [ ("WHEEL_SPEEDS", 100), - ("GEAR_SHIFTER", 100), + (gear_msg, 100), ("STEERING_SENSORS", 100), ("MDPS", 100), ("TCS", 50), diff --git a/selfdrive/car/hyundai/interface.py b/selfdrive/car/hyundai/interface.py index 4b4d51f3f1..7587cfe146 100644 --- a/selfdrive/car/hyundai/interface.py +++ b/selfdrive/car/hyundai/interface.py @@ -41,6 +41,9 @@ class CarInterface(CarInterfaceBase): # non-HDA2 if 0x1cf not in fingerprint[4]: ret.flags |= HyundaiFlags.CANFD_ALT_BUTTONS.value + # ICE cars do not have 0x130; GEARS message on 0x40 instead + if 0x130 not in fingerprint[4]: + ret.flags |= HyundaiFlags.CANFD_ALT_GEARS.value ret.steerActuatorDelay = 0.1 # Default delay ret.steerLimitTimer = 0.4 diff --git a/selfdrive/car/hyundai/values.py b/selfdrive/car/hyundai/values.py index 0df9850d0b..5940036aac 100644 --- a/selfdrive/car/hyundai/values.py +++ b/selfdrive/car/hyundai/values.py @@ -47,6 +47,7 @@ class CarControllerParams: class HyundaiFlags(IntFlag): CANFD_HDA2 = 1 CANFD_ALT_BUTTONS = 2 + CANFD_ALT_GEARS = 4 class CAR: From e78280da12c799ca7b5e391c53421607a5df617c Mon Sep 17 00:00:00 2001 From: Cameron Clough Date: Fri, 4 Nov 2022 17:27:58 -0700 Subject: [PATCH 026/184] ui: set dialog confirm button text (#26365) * ui: set dialog confirm button text * short * blue confirm --- selfdrive/ui/qt/offroad/networking.cc | 2 +- selfdrive/ui/qt/offroad/settings.cc | 8 ++++---- selfdrive/ui/qt/offroad/software_settings.cc | 2 +- selfdrive/ui/qt/widgets/input.cc | 11 ++++++++--- selfdrive/ui/qt/widgets/input.h | 2 +- selfdrive/ui/translations/main_ja.ts | 16 ++++++++++++++++ selfdrive/ui/translations/main_ko.ts | 16 ++++++++++++++++ selfdrive/ui/translations/main_pt-BR.ts | 16 ++++++++++++++++ selfdrive/ui/translations/main_zh-CHS.ts | 16 ++++++++++++++++ selfdrive/ui/translations/main_zh-CHT.ts | 16 ++++++++++++++++ 10 files changed, 95 insertions(+), 10 deletions(-) diff --git a/selfdrive/ui/qt/offroad/networking.cc b/selfdrive/ui/qt/offroad/networking.cc index 13697adfb5..d69d67edeb 100644 --- a/selfdrive/ui/qt/offroad/networking.cc +++ b/selfdrive/ui/qt/offroad/networking.cc @@ -314,7 +314,7 @@ void WifiUI::refresh() { QPushButton *forgetBtn = new QPushButton(tr("FORGET")); forgetBtn->setObjectName("forgetBtn"); QObject::connect(forgetBtn, &QPushButton::clicked, [=]() { - if (ConfirmationDialog::confirm(tr("Forget Wi-Fi Network \"%1\"?").arg(QString::fromUtf8(network.ssid)), this)) { + if (ConfirmationDialog::confirm(tr("Forget Wi-Fi Network \"%1\"?").arg(QString::fromUtf8(network.ssid)), tr("Forget"), this)) { wifi->forgetConnection(network.ssid); } }); diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index b154447eb8..51b5ce6bd7 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -169,7 +169,7 @@ DevicePanel::DevicePanel(SettingsWindow *parent) : ListWidget(parent) { auto resetCalibBtn = new ButtonControl(tr("Reset Calibration"), tr("RESET"), ""); connect(resetCalibBtn, &ButtonControl::showDescriptionEvent, this, &DevicePanel::updateCalibDescription); connect(resetCalibBtn, &ButtonControl::clicked, [&]() { - if (ConfirmationDialog::confirm(tr("Are you sure you want to reset calibration?"), this)) { + if (ConfirmationDialog::confirm(tr("Are you sure you want to reset calibration?"), tr("Reset"), this)) { params.remove("CalibrationParams"); } }); @@ -178,7 +178,7 @@ DevicePanel::DevicePanel(SettingsWindow *parent) : ListWidget(parent) { if (!params.getBool("Passive")) { auto retrainingBtn = new ButtonControl(tr("Review Training Guide"), tr("REVIEW"), tr("Review the rules, features, and limitations of openpilot")); connect(retrainingBtn, &ButtonControl::clicked, [=]() { - if (ConfirmationDialog::confirm(tr("Are you sure you want to review the training guide?"), this)) { + if (ConfirmationDialog::confirm(tr("Are you sure you want to review the training guide?"), tr("Review"), this)) { emit reviewTrainingGuide(); } }); @@ -266,7 +266,7 @@ void DevicePanel::updateCalibDescription() { void DevicePanel::reboot() { if (!uiState()->engaged()) { - if (ConfirmationDialog::confirm(tr("Are you sure you want to reboot?"), this)) { + if (ConfirmationDialog::confirm(tr("Are you sure you want to reboot?"), tr("Reboot"), this)) { // Check engaged again in case it changed while the dialog was open if (!uiState()->engaged()) { Params().putBool("DoReboot", true); @@ -279,7 +279,7 @@ void DevicePanel::reboot() { void DevicePanel::poweroff() { if (!uiState()->engaged()) { - if (ConfirmationDialog::confirm(tr("Are you sure you want to power off?"), this)) { + if (ConfirmationDialog::confirm(tr("Are you sure you want to power off?"), tr("Power Off"), this)) { // Check engaged again in case it changed while the dialog was open if (!uiState()->engaged()) { Params().putBool("DoShutdown", true); diff --git a/selfdrive/ui/qt/offroad/software_settings.cc b/selfdrive/ui/qt/offroad/software_settings.cc index e08a02a4d6..12d62e63fb 100644 --- a/selfdrive/ui/qt/offroad/software_settings.cc +++ b/selfdrive/ui/qt/offroad/software_settings.cc @@ -77,7 +77,7 @@ SoftwarePanel::SoftwarePanel(QWidget* parent) : ListWidget(parent) { // uninstall button auto uninstallBtn = new ButtonControl(tr("Uninstall %1").arg(getBrand()), tr("UNINSTALL")); connect(uninstallBtn, &ButtonControl::clicked, [&]() { - if (ConfirmationDialog::confirm(tr("Are you sure you want to uninstall?"), this)) { + if (ConfirmationDialog::confirm(tr("Are you sure you want to uninstall?"), tr("Uninstall"), this)) { params.putBool("DoUninstall", true); } }); diff --git a/selfdrive/ui/qt/widgets/input.cc b/selfdrive/ui/qt/widgets/input.cc index 897e4b5a05..75453e1b90 100644 --- a/selfdrive/ui/qt/widgets/input.cc +++ b/selfdrive/ui/qt/widgets/input.cc @@ -185,7 +185,11 @@ void InputDialog::setMinLength(int length) { ConfirmationDialog::ConfirmationDialog(const QString &prompt_text, const QString &confirm_text, const QString &cancel_text, const bool rich, QWidget *parent) : QDialogBase(parent) { QFrame *container = new QFrame(this); - container->setStyleSheet("QFrame { background-color: #1B1B1B; color: #C9C9C9; }"); + container->setStyleSheet(R"( + QFrame { background-color: #1B1B1B; color: #C9C9C9; } + #confirm_btn { background-color: #465BEA; } + #confirm_btn:pressed { background-color: #3049F4; } + )"); QVBoxLayout *main_layout = new QVBoxLayout(container); main_layout->setContentsMargins(32, rich ? 32 : 120, 32, 32); @@ -208,6 +212,7 @@ ConfirmationDialog::ConfirmationDialog(const QString &prompt_text, const QString if (confirm_text.length()) { QPushButton* confirm_btn = new QPushButton(confirm_text); + confirm_btn->setObjectName("confirm_btn"); btn_layout->addWidget(confirm_btn); QObject::connect(confirm_btn, &QPushButton::clicked, this, &ConfirmationDialog::accept); } @@ -223,8 +228,8 @@ bool ConfirmationDialog::alert(const QString &prompt_text, QWidget *parent) { return d.exec(); } -bool ConfirmationDialog::confirm(const QString &prompt_text, QWidget *parent) { - ConfirmationDialog d = ConfirmationDialog(prompt_text, tr("Ok"), tr("Cancel"), false, parent); +bool ConfirmationDialog::confirm(const QString &prompt_text, const QString &confirm_text, QWidget *parent) { + ConfirmationDialog d = ConfirmationDialog(prompt_text, confirm_text, tr("Cancel"), false, parent); return d.exec(); } diff --git a/selfdrive/ui/qt/widgets/input.h b/selfdrive/ui/qt/widgets/input.h index 117e6ca05e..e6c0fba86d 100644 --- a/selfdrive/ui/qt/widgets/input.h +++ b/selfdrive/ui/qt/widgets/input.h @@ -57,7 +57,7 @@ public: explicit ConfirmationDialog(const QString &prompt_text, const QString &confirm_text, const QString &cancel_text, const bool rich, QWidget* parent); static bool alert(const QString &prompt_text, QWidget *parent); - static bool confirm(const QString &prompt_text, QWidget *parent); + static bool confirm(const QString &prompt_text, const QString &confirm_text, QWidget *parent); static bool rich(const QString &prompt_text, QWidget *parent); }; diff --git a/selfdrive/ui/translations/main_ja.ts b/selfdrive/ui/translations/main_ja.ts index d3c55b5be4..5ee2d86756 100644 --- a/selfdrive/ui/translations/main_ja.ts +++ b/selfdrive/ui/translations/main_ja.ts @@ -238,6 +238,14 @@ Disengage to Power Off openpilot をキャンセルしてシャットダウンができます + + Reset + + + + Review + + DriveStats @@ -854,6 +862,10 @@ location set CHECK 確認 + + Uninstall + + SshControl @@ -1056,5 +1068,9 @@ location set Forget Wi-Fi Network "%1"? Wi-Fiﾈｯﾄﾜｰｸ%1を削除してもよろしいですか？ + + Forget + + diff --git a/selfdrive/ui/translations/main_ko.ts b/selfdrive/ui/translations/main_ko.ts index 4112087f72..397b43f545 100644 --- a/selfdrive/ui/translations/main_ko.ts +++ b/selfdrive/ui/translations/main_ko.ts @@ -238,6 +238,14 @@ Disengage to Power Off 전원을 종료하려면 해제하세요 + + Reset + + + + Review + + DriveStats @@ -854,6 +862,10 @@ location set CHECK 확인 + + Uninstall + + SshControl @@ -1056,5 +1068,9 @@ location set Forget Wi-Fi Network "%1"? wifi 네트워크 저장안함 "%1"? + + Forget + + diff --git a/selfdrive/ui/translations/main_pt-BR.ts b/selfdrive/ui/translations/main_pt-BR.ts index ab1946e6af..6774555b73 100644 --- a/selfdrive/ui/translations/main_pt-BR.ts +++ b/selfdrive/ui/translations/main_pt-BR.ts @@ -238,6 +238,14 @@ Disengage to Power Off Desacione para Desligar + + Reset + + + + Review + + DriveStats @@ -858,6 +866,10 @@ trabalho definido CHECK VERIFICAR + + Uninstall + + SshControl @@ -1060,5 +1072,9 @@ trabalho definido Forget Wi-Fi Network "%1"? Esquecer Rede Wi-Fi "%1"? + + Forget + + diff --git a/selfdrive/ui/translations/main_zh-CHS.ts b/selfdrive/ui/translations/main_zh-CHS.ts index 2baae98669..6189a235e8 100644 --- a/selfdrive/ui/translations/main_zh-CHS.ts +++ b/selfdrive/ui/translations/main_zh-CHS.ts @@ -238,6 +238,14 @@ Disengage to Power Off 取消openpilot以关机 + + Reset + + + + Review + + DriveStats @@ -852,6 +860,10 @@ location set CHECK 查看 + + Uninstall + + SshControl @@ -1054,5 +1066,9 @@ location set Forget Wi-Fi Network "%1"? 忘记WiFi网络 "%1"? + + Forget + + diff --git a/selfdrive/ui/translations/main_zh-CHT.ts b/selfdrive/ui/translations/main_zh-CHT.ts index 44c231311a..0b0dbe4ae5 100644 --- a/selfdrive/ui/translations/main_zh-CHT.ts +++ b/selfdrive/ui/translations/main_zh-CHT.ts @@ -238,6 +238,14 @@ Disengage to Power Off 請先取消控車才能關機 + + Reset + + + + Review + + DriveStats @@ -854,6 +862,10 @@ location set CHECK 檢查 + + Uninstall + + SshControl @@ -1056,5 +1068,9 @@ location set Forget Wi-Fi Network "%1"? 清除 Wi-Fi 網路 "%1"? + + Forget + + From e4342b5e169127cc17c659665e038b22eb995f23 Mon Sep 17 00:00:00 2001 From: Jason Wen <47793918+sunnyhaibin@users.noreply.github.com> Date: Fri, 4 Nov 2022 21:44:38 -0400 Subject: [PATCH 027/184] Hyundai CAN-FD: support 2023 Kia Sportage & 2022 Hyundai Santa Cruz (#25434) * Hyundai: Car Port for Santa Cruz 2022 * bump opendbc * New struct and params for CAN-FD ICE models * fixup! New struct and params for CAN-FD ICE models * bump panda * bump panda * HKG: Car Port for Sportage 2023 * fixup! HKG: Car Port for Sportage 2023 * Kia Sportage 2023: Add FW versions * Longitudinal Control: ICE CAN-FD models * fixup! Longitudinal Control: ICE CAN-FD models * bump panda * fixup! Longitudinal Control: ICE CAN-FD models * Update car info * fixup! Longitudinal Control: ICE CAN-FD models * Gate radar disable behind HDA2 only * Gate radar disable behind camera SCC cars * Update CARS.md * Add FW versions for Santa Cruz 2021 * Test route for Kia Sportage 2023 (openpilot longitudinal enabled) * Test route for Santa Cruz 2021 (openpilot longitudinal enabled) * fixup! Kia Sportage 2023: Add FW versions * HKG: Car Port for Genesis GV70 2023 thanks to @zunichky! Co-authored-by: kyle zunich * Update car info * Add torque param for GENESIS GV70 1ST GEN * Fix CARS.md * Update test route * Remove unnecessary HDA2 checks * Add additional FW versions for Sportage 2023 * Fix Kia Sportage supported MY * Fix MISRA violation * Fix release note * Use IntFlag to gate camera SCC for CAN-FD * Parse 0x1A0 on bus 4 dynamically * bump panda * Car code cleanup * Typo * Add additional 0x1A0 signals to bus 4 * Fix weird bitwise logic * Check 0x1a0 after safety config is set * Revert "Check 0x1a0 after safety config is set" This reverts commit 141bbf79792bcde9cfadbc0680654acf61d8d16f. * Check car list instead * Add GV70 2022 test route * Add fwdRadar FW version for GV70 2022 * Fix CARS.md * Fix CARS.md * Fix CARS.md * new santa cruz route * bump panda to commaai/panda#1031 * bumppanda * some clean up * lets refactor CAMERA_SCC_CAR in another pr * minor clean up * update docs! * GV70 is a radar-SCC car :( (another PR) * fix removed sportage hybrid versions * update docs Co-authored-by: kyle zunich Co-authored-by: Adeeb Shihadeh Co-authored-by: sshane --- RELEASES.md | 2 ++ docs/CARS.md | 4 +++- panda | 2 +- selfdrive/car/hyundai/carstate.py | 21 +++++++++++++++----- selfdrive/car/hyundai/interface.py | 8 ++++++++ selfdrive/car/hyundai/values.py | 26 ++++++++++++++++++++++++- selfdrive/car/tests/routes.py | 2 ++ selfdrive/car/torque_data/override.yaml | 2 ++ 8 files changed, 59 insertions(+), 8 deletions(-) diff --git a/RELEASES.md b/RELEASES.md index 744168c8fb..83b3ac46f4 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -15,6 +15,8 @@ Version 0.8.17 (2022-XX-XX) * Added button to bookmark events while driving; view them later in comma connect * AGNOS 6 * tools: new and improved cabana thanks to deanlee! +* Hyundai Santa Cruz 2021-22 support thanks to sunnyhaibin! +* Kia Sportage 2023 support thanks to sunnyhaibin! * Kia Sportage Hybrid 2023 support thanks to sunnyhaibin! Version 0.8.16 (2022-08-26) diff --git a/docs/CARS.md b/docs/CARS.md index 9d279e918e..c347868968 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -4,7 +4,7 @@ A supported vehicle is one that just works when you install a comma three. All supported cars provide a better experience than any stock system. -# 211 Supported Cars +# 213 Supported Cars |Make|Model|Supported Package|ACC|No ACC accel below|No ALC below|Steering Torque|Resume from stop|Harness| |---|---|---|:---:|:---:|:---:|:---:|:---:|:---:| @@ -72,6 +72,7 @@ A supported vehicle is one that just works when you install a comma three. All s |Hyundai|Kona Electric 2022|Smart Cruise Control (SCC)|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai O| |Hyundai|Kona Hybrid 2020|Smart Cruise Control (SCC)|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai I| |Hyundai|Palisade 2020-22|All|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai H| +|Hyundai|Santa Cruz 2021-22|Smart Cruise Control (SCC)|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai N| |Hyundai|Santa Fe 2019-20|All|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai D| |Hyundai|Santa Fe 2021-22|All|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai L| |Hyundai|Santa Fe Hybrid 2022|All|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai L| @@ -102,6 +103,7 @@ A supported vehicle is one that just works when you install a comma three. All s |Kia|Seltos 2021|Smart Cruise Control (SCC)|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai A| |Kia|Sorento 2018|Advanced Smart Cruise Control|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai C| |Kia|Sorento 2019|Smart Cruise Control (SCC)|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai E| +|Kia|Sportage 2023|Smart Cruise Control (SCC)|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai N| |Kia|Sportage Hybrid 2023|Smart Cruise Control (SCC)|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai N| |Kia|Stinger 2018-20|Smart Cruise Control (SCC)|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai C| |Kia|Telluride 2020|All|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai H| diff --git a/panda b/panda index 0b86dfa5fb..f3fc343262 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit 0b86dfa5fbfcb77a127f980f81484aa7558e8c1e +Subproject commit f3fc343262818801f037e9dca1a96ca99d7e64c5 diff --git a/selfdrive/car/hyundai/carstate.py b/selfdrive/car/hyundai/carstate.py index e83b83f432..7cf1515fda 100644 --- a/selfdrive/car/hyundai/carstate.py +++ b/selfdrive/car/hyundai/carstate.py @@ -155,11 +155,15 @@ class CarState(CarStateBase): def update_canfd(self, cp, cp_cam): ret = car.CarState.new_message() - if self.CP.carFingerprint in EV_CAR: - ret.gas = cp.vl["ACCELERATOR"]["ACCELERATOR_PEDAL"] / 255. - elif self.CP.carFingerprint in HYBRID_CAR: - ret.gas = cp.vl["ACCELERATOR_ALT"]["ACCELERATOR_PEDAL"] / 1023. - ret.gasPressed = ret.gas > 1e-5 + if self.CP.carFingerprint in (EV_CAR | HYBRID_CAR): + if self.CP.carFingerprint in EV_CAR: + ret.gas = cp.vl["ACCELERATOR"]["ACCELERATOR_PEDAL"] / 255. + else: + ret.gas = cp.vl["ACCELERATOR_ALT"]["ACCELERATOR_PEDAL"] / 1023. + ret.gasPressed = ret.gas > 1e-5 + else: + ret.gasPressed = bool(cp.vl["ACCELERATOR_BRAKE_ALT"]["ACCELERATOR_PEDAL_PRESSED"]) + ret.brakePressed = cp.vl["TCS"]["DriverBraking"] == 1 ret.doorOpen = cp.vl["DOORS_SEATBELTS"]["DRIVER_DOOR_OPEN"] == 1 @@ -487,6 +491,13 @@ class CarState(CarStateBase): checks += [ ("ACCELERATOR_ALT", 100), ] + else: + signals += [ + ("ACCELERATOR_PEDAL_PRESSED", "ACCELERATOR_BRAKE_ALT"), + ] + checks += [ + ("ACCELERATOR_BRAKE_ALT", 100), + ] bus = 5 if CP.flags & HyundaiFlags.CANFD_HDA2 else 4 return CANParser(DBC[CP.carFingerprint]["pt"], signals, checks, bus) diff --git a/selfdrive/car/hyundai/interface.py b/selfdrive/car/hyundai/interface.py index 7587cfe146..6c8d0076f1 100644 --- a/selfdrive/car/hyundai/interface.py +++ b/selfdrive/car/hyundai/interface.py @@ -123,6 +123,10 @@ class CarInterface(CarInterfaceBase): ret.wheelbase = 2.756 ret.steerRatio = 16. tire_stiffness_factor = 0.385 + elif candidate == CAR.SANTA_CRUZ_1ST_GEN: + ret.mass = 1870. + STD_CARGO_KG # weight from Limited trim - the only supported trim + ret.wheelbase = 3.000 + ret.steerRatio = 14.2 # steering ratio according to Hyundai News https://www.hyundainews.com/assets/documents/original/48035-2022SantaCruzProductGuideSpecsv2081521.pdf # Kia elif candidate == CAR.KIA_SORENTO: @@ -141,6 +145,10 @@ class CarInterface(CarInterfaceBase): ret.wheelbase = 2.63 ret.steerRatio = 14.56 tire_stiffness_factor = 1 + elif candidate == CAR.KIA_SPORTAGE_5TH_GEN: + ret.mass = 1700. + STD_CARGO_KG # weight from SX and above trims, average of FWD and AWD versions + ret.wheelbase = 2.756 + ret.steerRatio = 13.6 # steering ratio according to Kia News https://www.kiamedia.com/us/en/models/sportage/2023/specifications elif candidate in (CAR.KIA_OPTIMA_G4, CAR.KIA_OPTIMA_G4_FL, CAR.KIA_OPTIMA_H): ret.mass = 3558. * CV.LB_TO_KG ret.wheelbase = 2.80 diff --git a/selfdrive/car/hyundai/values.py b/selfdrive/car/hyundai/values.py index 5940036aac..536af7cf01 100644 --- a/selfdrive/car/hyundai/values.py +++ b/selfdrive/car/hyundai/values.py @@ -78,6 +78,7 @@ class CAR: SONATA_HYBRID = "HYUNDAI SONATA HYBRID 2021" IONIQ_5 = "HYUNDAI IONIQ 5 2022" TUCSON_HYBRID_4TH_GEN = "HYUNDAI TUCSON HYBRID 4TH GEN" + SANTA_CRUZ_1ST_GEN = "HYUNDAI SANTA CRUZ 1ST GEN" # Kia KIA_FORTE = "KIA FORTE E 2018 & GT 2021" @@ -89,6 +90,7 @@ class CAR: KIA_OPTIMA_G4_FL = "KIA OPTIMA 4TH GEN FACELIFT" KIA_OPTIMA_H = "KIA OPTIMA HYBRID 2017 & SPORTS 2019" KIA_SELTOS = "KIA SELTOS 2021" + KIA_SPORTAGE_5TH_GEN = "KIA SPORTAGE 5TH GEN" KIA_SORENTO = "KIA SORENTO GT LINE 2018" KIA_SPORTAGE_HYBRID_5TH_GEN = "KIA SPORTAGE HYBRID 5TH GEN" KIA_STINGER = "KIA STINGER GT2 2018" @@ -147,6 +149,7 @@ CAR_INFO: Dict[str, Optional[Union[HyundaiCarInfo, List[HyundaiCarInfo]]]] = { HyundaiCarInfo("Hyundai Ioniq 5 (with HDA II) 2022-23", "Highway Driving Assist II", harness=Harness.hyundai_q), ], CAR.TUCSON_HYBRID_4TH_GEN: HyundaiCarInfo("Hyundai Tucson Hybrid 2022", "All", harness=Harness.hyundai_n), + CAR.SANTA_CRUZ_1ST_GEN: HyundaiCarInfo("Hyundai Santa Cruz 2021-22", "Smart Cruise Control (SCC)", harness=Harness.hyundai_n), # Kia CAR.KIA_FORTE: HyundaiCarInfo("Kia Forte 2019-21", harness=Harness.hyundai_g), @@ -169,6 +172,7 @@ CAR_INFO: Dict[str, Optional[Union[HyundaiCarInfo, List[HyundaiCarInfo]]]] = { HyundaiCarInfo("Kia Optima Hybrid 2019"), ], CAR.KIA_SELTOS: HyundaiCarInfo("Kia Seltos 2021", harness=Harness.hyundai_a), + CAR.KIA_SPORTAGE_5TH_GEN: HyundaiCarInfo("Kia Sportage 2023", "Smart Cruise Control (SCC)", harness=Harness.hyundai_n), CAR.KIA_SORENTO: [ HyundaiCarInfo("Kia Sorento 2018", "Advanced Smart Cruise Control", "https://www.youtube.com/watch?v=Fkh3s6WHJz8", harness=Harness.hyundai_c), HyundaiCarInfo("Kia Sorento 2019", video_link="https://www.youtube.com/watch?v=Fkh3s6WHJz8", harness=Harness.hyundai_e), @@ -1400,6 +1404,24 @@ FW_VERSIONS = { b'\xf1\x00NQ5__ 1.01 1.03 99110-CH000 ', ], }, + CAR.SANTA_CRUZ_1ST_GEN: { + (Ecu.fwdCamera, 0x7c4, None): [ + b'\xf1\x00NX4 FR_CMR AT USA LHD 1.00 1.00 99211-CW000 14M', + ], + (Ecu.fwdRadar, 0x7d0, None): [ + b'\xf1\x00NX4__ 1.00 1.00 99110-K5000 ', + ], + }, + CAR.KIA_SPORTAGE_5TH_GEN: { + (Ecu.fwdCamera, 0x7c4, None): [ + b'\xf1\x00NQ5 FR_CMR AT USA LHD 1.00 1.00 99211-P1030 662', + b'\xf1\x00NQ5 FR_CMR AT USA LHD 1.00 1.00 99211-P1040 663', + ], + (Ecu.fwdRadar, 0x7d0, None): [ + b'\xf1\x00NQ5__ 1.00 1.02 99110-P1000 ', + b'\xf1\x00NQ5__ 1.00 1.03 99110-P1000 ', + ], + }, } CHECKSUM = { @@ -1417,7 +1439,7 @@ FEATURES = { "use_fca": {CAR.SONATA, CAR.SONATA_HYBRID, CAR.ELANTRA, CAR.ELANTRA_2021, CAR.ELANTRA_HEV_2021, CAR.KIA_STINGER, CAR.IONIQ_EV_2020, CAR.IONIQ_PHEV, CAR.KONA_EV, CAR.KIA_FORTE, CAR.KIA_NIRO_EV, CAR.PALISADE, CAR.GENESIS_G70, CAR.GENESIS_G70_2020, CAR.KONA, CAR.SANTA_FE, CAR.KIA_SELTOS, CAR.KONA_HEV, CAR.SANTA_FE_2022, CAR.KIA_K5_2021, CAR.IONIQ_HEV_2022, CAR.SANTA_FE_HEV_2022, CAR.SANTA_FE_PHEV_2022, CAR.TUCSON, CAR.KONA_EV_2022}, } -CANFD_CAR = {CAR.KIA_EV6, CAR.IONIQ_5, CAR.TUCSON_HYBRID_4TH_GEN, CAR.KIA_SPORTAGE_HYBRID_5TH_GEN} +CANFD_CAR = {CAR.KIA_EV6, CAR.IONIQ_5, CAR.TUCSON_HYBRID_4TH_GEN, CAR.KIA_SPORTAGE_HYBRID_5TH_GEN, CAR.SANTA_CRUZ_1ST_GEN, CAR.KIA_SPORTAGE_5TH_GEN} # The camera does SCC on these cars, rather than the radar CAMERA_SCC_CAR = {CAR.KONA_EV_2022, } @@ -1474,5 +1496,7 @@ DBC = { CAR.SONATA_HYBRID: dbc_dict('hyundai_kia_generic', 'hyundai_kia_mando_front_radar_generated'), CAR.TUCSON_HYBRID_4TH_GEN: dbc_dict('hyundai_canfd', None), CAR.IONIQ_5: dbc_dict('hyundai_canfd', None), + CAR.SANTA_CRUZ_1ST_GEN: dbc_dict('hyundai_canfd', None), + CAR.KIA_SPORTAGE_5TH_GEN: dbc_dict('hyundai_canfd', None), CAR.KIA_SPORTAGE_HYBRID_5TH_GEN: dbc_dict('hyundai_canfd', None), } diff --git a/selfdrive/car/tests/routes.py b/selfdrive/car/tests/routes.py index d833203427..bf949d3492 100644 --- a/selfdrive/car/tests/routes.py +++ b/selfdrive/car/tests/routes.py @@ -82,6 +82,7 @@ routes = [ CarTestRoute("6fe86b4e410e4c37|2020-07-22--16-27-13", HYUNDAI.HYUNDAI_GENESIS), CarTestRoute("70c5bec28ec8e345|2020-08-08--12-22-23", HYUNDAI.GENESIS_G70), CarTestRoute("6b301bf83f10aa90|2020-11-22--16-45-07", HYUNDAI.GENESIS_G80), + CarTestRoute("f0709d2bc6ca451f|2022-10-15--08-13-54", HYUNDAI.SANTA_CRUZ_1ST_GEN), CarTestRoute("4dbd55df87507948|2022-03-01--09-45-38", HYUNDAI.SANTA_FE), CarTestRoute("bf43d9df2b660eb0|2021-09-23--14-16-37", HYUNDAI.SANTA_FE_2022), CarTestRoute("37398f32561a23ad|2021-11-18--00-11-35", HYUNDAI.SANTA_FE_HEV_2022), @@ -117,6 +118,7 @@ routes = [ CarTestRoute("173219cf50acdd7b|2021-07-05--10-27-41", HYUNDAI.KIA_NIRO_PHEV), CarTestRoute("34a875f29f69841a|2021-07-29--13-02-09", HYUNDAI.KIA_NIRO_HEV_2021), CarTestRoute("50a2212c41f65c7b|2021-05-24--16-22-06", HYUNDAI.KIA_FORTE), + CarTestRoute("192283cdbb7a58c2|2022-10-15--01-43-18", HYUNDAI.KIA_SPORTAGE_5TH_GEN), CarTestRoute("c5ac319aa9583f83|2021-06-01--18-18-31", HYUNDAI.ELANTRA), CarTestRoute("734ef96182ddf940|2022-10-02--16-41-44", HYUNDAI.ELANTRA), # 2019 Elantra GT CarTestRoute("82e9cdd3f43bf83e|2021-05-15--02-42-51", HYUNDAI.ELANTRA_2021), diff --git a/selfdrive/car/torque_data/override.yaml b/selfdrive/car/torque_data/override.yaml index 460b9a9097..c5a316aaaf 100644 --- a/selfdrive/car/torque_data/override.yaml +++ b/selfdrive/car/torque_data/override.yaml @@ -31,6 +31,8 @@ CHEVROLET EQUINOX 2019: [2.0, 2.0, 0.05] VOLKSWAGEN PASSAT NMS: [2.5, 2.5, 0.1] VOLKSWAGEN SHARAN 2ND GEN: [2.5, 2.5, 0.1] HYUNDAI TUCSON HYBRID 4TH GEN: [2.5, 2.5, 0.0] +HYUNDAI SANTA CRUZ 1ST GEN: [2.7, 2.7, 0.0] +KIA SPORTAGE 5TH GEN: [2.7, 2.7, 0.0] KIA SPORTAGE HYBRID 5TH GEN: [2.5, 2.5, 0.0] # Dashcam or fallback configured as ideal car From e4cd8a15db6b0e16e06485924395d725ecdc23df Mon Sep 17 00:00:00 2001 From: Kurt Nistelberger Date: Sat, 5 Nov 2022 04:36:44 +0100 Subject: [PATCH 028/184] sensord: lsm self test (#25855) * lsm self test v1 * add lsm6ds3 accel self test * add self test for lsm6ds3 gyro * add c variant self test * code CleanUp * address PR comments Co-authored-by: Kurt Nistelberger --- selfdrive/sensord/sensors/lsm6ds3_accel.cc | 133 +++++++++++++++++++++ selfdrive/sensord/sensors/lsm6ds3_accel.h | 18 ++- selfdrive/sensord/sensors/lsm6ds3_gyro.cc | 115 +++++++++++++++++- selfdrive/sensord/sensors/lsm6ds3_gyro.h | 12 ++ selfdrive/sensord/tests/test_sensord.py | 5 + 5 files changed, 281 insertions(+), 2 deletions(-) diff --git a/selfdrive/sensord/sensors/lsm6ds3_accel.cc b/selfdrive/sensord/sensors/lsm6ds3_accel.cc index 27cd4d0c70..c19e3de7ed 100644 --- a/selfdrive/sensord/sensors/lsm6ds3_accel.cc +++ b/selfdrive/sensord/sensors/lsm6ds3_accel.cc @@ -1,17 +1,132 @@ #include "lsm6ds3_accel.h" #include +#include +#include #include "common/swaglog.h" #include "common/timing.h" +#include "common/util.h" LSM6DS3_Accel::LSM6DS3_Accel(I2CBus *bus, int gpio_nr, bool shared_gpio) : I2CSensor(bus, gpio_nr, shared_gpio) {} +void LSM6DS3_Accel::wait_for_data_ready() { + uint8_t drdy = 0; + uint8_t buffer[6]; + + do { + read_register(LSM6DS3_ACCEL_I2C_REG_STAT_REG, &drdy, sizeof(drdy)); + drdy &= LSM6DS3_ACCEL_DRDY_XLDA; + } while (drdy == 0); + + read_register(LSM6DS3_ACCEL_I2C_REG_OUTX_L_XL, buffer, sizeof(buffer)); +} + +void LSM6DS3_Accel::read_and_avg_data(float* out_buf) { + uint8_t drdy = 0; + uint8_t buffer[6]; + + float scaling = 0.061f; + if (source == cereal::SensorEventData::SensorSource::LSM6DS3TRC) { + scaling = 0.122f; + } + + for (int i = 0; i < 5; i++) { + do { + read_register(LSM6DS3_ACCEL_I2C_REG_STAT_REG, &drdy, sizeof(drdy)); + drdy &= LSM6DS3_ACCEL_DRDY_XLDA; + } while (drdy == 0); + + int len = read_register(LSM6DS3_ACCEL_I2C_REG_OUTX_L_XL, buffer, sizeof(buffer)); + assert(len == sizeof(buffer)); + + for (int j = 0; j < 3; j++) { + out_buf[j] += (float)read_16_bit(buffer[j*2], buffer[j*2+1]) * scaling; + } + } + + for (int i = 0; i < 3; i++) { + out_buf[i] /= 5.0f; + } +} + +int LSM6DS3_Accel::self_test(int test_type) { + float val_st_off[3] = {0}; + float val_st_on[3] = {0}; + float test_val[3] = {0}; + uint8_t ODR_FS_MO = LSM6DS3_ACCEL_ODR_52HZ; // full scale: +-2g, ODR: 52Hz + + // prepare sensor for self-test + + // enable block data update and automatic increment + int ret = set_register(LSM6DS3_ACCEL_I2C_REG_CTRL3_C, LSM6DS3_ACCEL_IF_INC_BDU); + if (ret < 0) { + return ret; + } + + if (source == cereal::SensorEventData::SensorSource::LSM6DS3TRC) { + ODR_FS_MO = LSM6DS3_ACCEL_FS_4G | LSM6DS3_ACCEL_ODR_52HZ; + } + ret = set_register(LSM6DS3_ACCEL_I2C_REG_CTRL1_XL, ODR_FS_MO); + if (ret < 0) { + return ret; + } + + // wait for stable output, and discard first values + util::sleep_for(100); + wait_for_data_ready(); + read_and_avg_data(val_st_off); + + // enable Self Test positive (or negative) + ret = set_register(LSM6DS3_ACCEL_I2C_REG_CTRL5_C, test_type); + if (ret < 0) { + return ret; + } + + // wait for stable output, and discard first values + util::sleep_for(100); + wait_for_data_ready(); + read_and_avg_data(val_st_on); + + // disable sensor + ret = set_register(LSM6DS3_ACCEL_I2C_REG_CTRL1_XL, 0); + if (ret < 0) { + return ret; + } + + // disable self test + ret = set_register(LSM6DS3_ACCEL_I2C_REG_CTRL5_C, 0); + if (ret < 0) { + return ret; + } + + // calculate the mg values for self test + for (int i = 0; i < 3; i++) { + test_val[i] = fabs(val_st_on[i] - val_st_off[i]); + } + + // verify test result + for (int i = 0; i < 3; i++) { + if ((LSM6DS3_ACCEL_MIN_ST_LIMIT_mg > test_val[i]) || + (test_val[i] > LSM6DS3_ACCEL_MAX_ST_LIMIT_mg)) { + return -1; + } + } + + return ret; +} + int LSM6DS3_Accel::init() { int ret = 0; uint8_t buffer[1]; uint8_t value = 0; + bool do_self_test = false; + + const char* env_lsm_selftest =env_lsm_selftest = std::getenv("LSM_SELF_TEST"); + if (env_lsm_selftest != nullptr && strncmp(env_lsm_selftest, "1", 1) == 0) { + do_self_test = true; + } ret = read_register(LSM6DS3_ACCEL_I2C_REG_ID, buffer, 1); if(ret < 0) { @@ -29,11 +144,29 @@ int LSM6DS3_Accel::init() { source = cereal::SensorEventData::SensorSource::LSM6DS3TRC; } + ret = self_test(LSM6DS3_ACCEL_POSITIVE_TEST); + if (ret < 0) { + LOGE("LSM6DS3 accel positive self-test failed!"); + if (do_self_test) goto fail; + } + + ret = self_test(LSM6DS3_ACCEL_NEGATIVE_TEST); + if (ret < 0) { + LOGE("LSM6DS3 accel negative self-test failed!"); + if (do_self_test) goto fail; + } + ret = init_gpio(); if (ret < 0) { goto fail; } + // enable continuous update, and automatic increase + ret = set_register(LSM6DS3_ACCEL_I2C_REG_CTRL3_C, LSM6DS3_ACCEL_IF_INC); + if (ret < 0) { + goto fail; + } + // TODO: set scale and bandwidth. Default is +- 2G, 50 Hz ret = set_register(LSM6DS3_ACCEL_I2C_REG_CTRL1_XL, LSM6DS3_ACCEL_ODR_104HZ); if (ret < 0) { diff --git a/selfdrive/sensord/sensors/lsm6ds3_accel.h b/selfdrive/sensord/sensors/lsm6ds3_accel.h index 84084fc916..c3f66f5803 100644 --- a/selfdrive/sensord/sensors/lsm6ds3_accel.h +++ b/selfdrive/sensord/sensors/lsm6ds3_accel.h @@ -10,21 +10,37 @@ #define LSM6DS3_ACCEL_I2C_REG_ID 0x0F #define LSM6DS3_ACCEL_I2C_REG_INT1_CTRL 0x0D #define LSM6DS3_ACCEL_I2C_REG_CTRL1_XL 0x10 +#define LSM6DS3_ACCEL_I2C_REG_CTRL3_C 0x12 +#define LSM6DS3_ACCEL_I2C_REG_CTRL5_C 0x14 +#define LSM6DS3_ACCEL_I2C_REG_CTR9_XL 0x18 #define LSM6DS3_ACCEL_I2C_REG_STAT_REG 0x1E #define LSM6DS3_ACCEL_I2C_REG_OUTX_L_XL 0x28 // Constants #define LSM6DS3_ACCEL_CHIP_ID 0x69 #define LSM6DS3TRC_ACCEL_CHIP_ID 0x6A +#define LSM6DS3_ACCEL_FS_4G (0b10 << 2) +#define LSM6DS3_ACCEL_ODR_52HZ (0b0011 << 4) #define LSM6DS3_ACCEL_ODR_104HZ (0b0100 << 4) #define LSM6DS3_ACCEL_INT1_DRDY_XL 0b1 #define LSM6DS3_ACCEL_DRDY_XLDA 0b1 #define LSM6DS3_ACCEL_DRDY_PULSE_MODE (1 << 7) - +#define LSM6DS3_ACCEL_IF_INC 0b00000100 +#define LSM6DS3_ACCEL_IF_INC_BDU 0b01000100 +#define LSM6DS3_ACCEL_XYZ_DEN 0b11100000 +#define LSM6DS3_ACCEL_POSITIVE_TEST 0b01 +#define LSM6DS3_ACCEL_NEGATIVE_TEST 0b10 +#define LSM6DS3_ACCEL_MIN_ST_LIMIT_mg 90.0f +#define LSM6DS3_ACCEL_MAX_ST_LIMIT_mg 1700.0f class LSM6DS3_Accel : public I2CSensor { uint8_t get_device_address() {return LSM6DS3_ACCEL_I2C_ADDR;} cereal::SensorEventData::SensorSource source = cereal::SensorEventData::SensorSource::LSM6DS3; + + // self test functions + int self_test(int test_type); + void wait_for_data_ready(); + void read_and_avg_data(float* val_st_off); public: LSM6DS3_Accel(I2CBus *bus, int gpio_nr = 0, bool shared_gpio = false); int init(); diff --git a/selfdrive/sensord/sensors/lsm6ds3_gyro.cc b/selfdrive/sensord/sensors/lsm6ds3_gyro.cc index 014a72bb73..f306be0fe8 100644 --- a/selfdrive/sensord/sensors/lsm6ds3_gyro.cc +++ b/selfdrive/sensord/sensors/lsm6ds3_gyro.cc @@ -2,19 +2,120 @@ #include #include +#include #include "common/swaglog.h" #include "common/timing.h" +#include "common/util.h" #define DEG2RAD(x) ((x) * M_PI / 180.0) LSM6DS3_Gyro::LSM6DS3_Gyro(I2CBus *bus, int gpio_nr, bool shared_gpio) : I2CSensor(bus, gpio_nr, shared_gpio) {} +void LSM6DS3_Gyro::wait_for_data_ready() { + uint8_t drdy = 0; + uint8_t buffer[6]; + + do { + read_register(LSM6DS3_GYRO_I2C_REG_STAT_REG, &drdy, sizeof(drdy)); + drdy &= LSM6DS3_GYRO_DRDY_GDA; + } while (drdy == 0); + + read_register(LSM6DS3_GYRO_I2C_REG_OUTX_L_G, buffer, sizeof(buffer)); +} + +void LSM6DS3_Gyro::read_and_avg_data(float* out_buf) { + uint8_t drdy = 0; + uint8_t buffer[6]; + + for (int i = 0; i < 5; i++) { + do { + read_register(LSM6DS3_GYRO_I2C_REG_STAT_REG, &drdy, sizeof(drdy)); + drdy &= LSM6DS3_GYRO_DRDY_GDA; + } while (drdy == 0); + + int len = read_register(LSM6DS3_GYRO_I2C_REG_OUTX_L_G, buffer, sizeof(buffer)); + assert(len == sizeof(buffer)); + + for (int j = 0; j < 3; j++) { + out_buf[j] += (float)read_16_bit(buffer[j*2], buffer[j*2+1]) * 70.0f; + } + } + + // calculate the mg average values + for (int i = 0; i < 3; i++) { + out_buf[i] /= 5.0f; + } +} + +int LSM6DS3_Gyro::self_test(int test_type) { + float val_st_off[3] = {0}; + float val_st_on[3] = {0}; + float test_val[3] = {0}; + + // prepare sensor for self-test + + // full scale: 2000dps, ODR: 208Hz + int ret = set_register(LSM6DS3_GYRO_I2C_REG_CTRL2_G, LSM6DS3_GYRO_ODR_208HZ | LSM6DS3_GYRO_FS_2000dps); + if (ret < 0) { + return ret; + } + + // wait for stable output, and discard first values + util::sleep_for(150); + wait_for_data_ready(); + read_and_avg_data(val_st_off); + + // enable Self Test positive (or negative) + ret = set_register(LSM6DS3_GYRO_I2C_REG_CTRL5_C, test_type); + if (ret < 0) { + return ret; + } + + // wait for stable output, and discard first values + util::sleep_for(50); + wait_for_data_ready(); + read_and_avg_data(val_st_on); + + // disable sensor + ret = set_register(LSM6DS3_GYRO_I2C_REG_CTRL2_G, 0); + if (ret < 0) { + return ret; + } + + // disable self test + ret = set_register(LSM6DS3_GYRO_I2C_REG_CTRL5_C, 0); + if (ret < 0) { + return ret; + } + + // calculate the mg values for self test + for (int i = 0; i < 3; i++) { + test_val[i] = fabs(val_st_on[i] - val_st_off[i]); + } + + // verify test result + for (int i = 0; i < 3; i++) { + if ((LSM6DS3_GYRO_MIN_ST_LIMIT_mdps > test_val[i]) || + (test_val[i] > LSM6DS3_GYRO_MAX_ST_LIMIT_mdps)) { + return -1; + } + } + + return ret; +} + int LSM6DS3_Gyro::init() { int ret = 0; uint8_t buffer[1]; uint8_t value = 0; + bool do_self_test = false; + + const char* env_lsm_selftest =env_lsm_selftest = std::getenv("LSM_SELF_TEST"); + if (env_lsm_selftest != nullptr && strncmp(env_lsm_selftest, "1", 1) == 0) { + do_self_test = true; + } ret = read_register(LSM6DS3_GYRO_I2C_REG_ID, buffer, 1); if(ret < 0) { @@ -37,6 +138,18 @@ int LSM6DS3_Gyro::init() { goto fail; } + ret = self_test(LSM6DS3_GYRO_POSITIVE_TEST); + if (ret < 0 ) { + LOGE("LSM6DS3 gyro positive self-test failed!"); + if (do_self_test) goto fail; + } + + ret = self_test(LSM6DS3_GYRO_NEGATIVE_TEST); + if (ret < 0) { + LOGE("LSM6DS3 gyro negative self-test failed!"); + if (do_self_test) goto fail; + } + // TODO: set scale. Default is +- 250 deg/s ret = set_register(LSM6DS3_GYRO_I2C_REG_CTRL2_G, LSM6DS3_GYRO_ODR_104HZ); if (ret < 0) { @@ -65,7 +178,7 @@ fail: int LSM6DS3_Gyro::shutdown() { int ret = 0; - // disable data ready interrupt for accel on INT1 + // disable data ready interrupt for gyro on INT1 uint8_t value = 0; ret = read_register(LSM6DS3_GYRO_I2C_REG_INT1_CTRL, &value, 1); if (ret < 0) { diff --git a/selfdrive/sensord/sensors/lsm6ds3_gyro.h b/selfdrive/sensord/sensors/lsm6ds3_gyro.h index 6c61ffcef2..220e6b0cec 100644 --- a/selfdrive/sensord/sensors/lsm6ds3_gyro.h +++ b/selfdrive/sensord/sensors/lsm6ds3_gyro.h @@ -10,21 +10,33 @@ #define LSM6DS3_GYRO_I2C_REG_ID 0x0F #define LSM6DS3_GYRO_I2C_REG_INT1_CTRL 0x0D #define LSM6DS3_GYRO_I2C_REG_CTRL2_G 0x11 +#define LSM6DS3_GYRO_I2C_REG_CTRL5_C 0x14 #define LSM6DS3_GYRO_I2C_REG_STAT_REG 0x1E #define LSM6DS3_GYRO_I2C_REG_OUTX_L_G 0x22 +#define LSM6DS3_GYRO_POSITIVE_TEST (0b01 << 2) +#define LSM6DS3_GYRO_NEGATIVE_TEST (0b11 << 2) // Constants #define LSM6DS3_GYRO_CHIP_ID 0x69 #define LSM6DS3TRC_GYRO_CHIP_ID 0x6A +#define LSM6DS3_GYRO_FS_2000dps (0b11 << 2) #define LSM6DS3_GYRO_ODR_104HZ (0b0100 << 4) +#define LSM6DS3_GYRO_ODR_208HZ (0b0101 << 4) #define LSM6DS3_GYRO_INT1_DRDY_G 0b10 #define LSM6DS3_GYRO_DRDY_GDA 0b10 #define LSM6DS3_GYRO_DRDY_PULSE_MODE (1 << 7) +#define LSM6DS3_GYRO_MIN_ST_LIMIT_mdps 150000.0f +#define LSM6DS3_GYRO_MAX_ST_LIMIT_mdps 700000.0f class LSM6DS3_Gyro : public I2CSensor { uint8_t get_device_address() {return LSM6DS3_GYRO_I2C_ADDR;} cereal::SensorEventData::SensorSource source = cereal::SensorEventData::SensorSource::LSM6DS3; + + // self test functions + int self_test(int test_type); + void wait_for_data_ready(); + void read_and_avg_data(float* val_st_off); public: LSM6DS3_Gyro(I2CBus *bus, int gpio_nr = 0, bool shared_gpio = false); int init(); diff --git a/selfdrive/sensord/tests/test_sensord.py b/selfdrive/sensord/tests/test_sensord.py index 82bd28446b..c6fe33129a 100755 --- a/selfdrive/sensord/tests/test_sensord.py +++ b/selfdrive/sensord/tests/test_sensord.py @@ -104,6 +104,9 @@ class TestSensord(unittest.TestCase): # make sure gpiochip0 is readable HARDWARE.initialize_hardware() + # enable LSM self test + os.environ["LSM_SELF_TEST"] = "1" + # read initial sensor values every test case can use os.system("pkill -f ./_sensord") try: @@ -118,6 +121,8 @@ class TestSensord(unittest.TestCase): @classmethod def tearDownClass(cls): managed_processes["sensord"].stop() + if "LSM_SELF_TEST" in os.environ: + del os.environ['LSM_SELF_TEST'] def tearDown(self): managed_processes["sensord"].stop() From 0b385a5650c4e0b06eb83e44bdba3fcff117beeb Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 4 Nov 2022 21:04:53 -0700 Subject: [PATCH 029/184] ui: fade to default path color when inactive (#26375) * fade to default path color when inactive * long! --- selfdrive/ui/qt/onroad.cc | 2 +- selfdrive/ui/ui.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc index 85b55697be..c4e4beb76a 100644 --- a/selfdrive/ui/qt/onroad.cc +++ b/selfdrive/ui/qt/onroad.cc @@ -463,7 +463,7 @@ void AnnotatedCameraWidget::drawLaneLines(QPainter &painter, const UIState *s) { if (scene.end_to_end_long) { const auto &acceleration = (*s->sm)["modelV2"].getModelV2().getAcceleration(); float acceleration_future = 0; - if (acceleration.getZ().size() > 10) { + if (acceleration.getZ().size() > 10 && (*s->sm)["carControl"].getCarControl().getLongActive()) { acceleration_future = acceleration.getX()[10]; // 1.0 second } // speed up: 148, slow down: 0 diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index 945218ec11..0198405769 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -214,7 +214,7 @@ void UIState::updateStatus() { UIState::UIState(QObject *parent) : QObject(parent) { sm = std::make_unique>({ - "modelV2", "controlsState", "liveCalibration", "radarState", "deviceState", "roadCameraState", + "modelV2", "carControl", "controlsState", "liveCalibration", "radarState", "deviceState", "roadCameraState", "pandaStates", "carParams", "driverMonitoringState", "carState", "liveLocationKalman", "wideRoadCameraState", "managerState", "navInstruction", "navRoute", "gnssMeasurements", }); From e23a25c3ae82e65b8adad47e799c588cc46bba0e Mon Sep 17 00:00:00 2001 From: Kurt Nistelberger Date: Fri, 4 Nov 2022 21:54:06 -0700 Subject: [PATCH 030/184] fix gps test runner --- tools/gpstest/run_unittest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/gpstest/run_unittest.sh b/tools/gpstest/run_unittest.sh index 9f93fdfc9a..e0ca017a6d 100755 --- a/tools/gpstest/run_unittest.sh +++ b/tools/gpstest/run_unittest.sh @@ -4,7 +4,7 @@ # run limeGPS with random static location timeout 300 ./simulate_gps_signal.py 32.7518 -117.1962 & -gps_PID=$(ps -aux | grep -m 1 "timeout 300" | cut -d ' ' -f 7) +gps_PID=$(ps -aux | grep -m 1 "timeout 300" | awk '{print $2}') echo "starting limeGPS..." sleep 10 From 50fddb52ba2e816123fa89a802a9e603e7407ada Mon Sep 17 00:00:00 2001 From: Lee Jong Mun <43285072+crwusiz@users.noreply.github.com> Date: Sat, 5 Nov 2022 17:44:18 +0900 Subject: [PATCH 031/184] Multilang: kor translation update (#26380) --- selfdrive/ui/translations/main_ko.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/selfdrive/ui/translations/main_ko.ts b/selfdrive/ui/translations/main_ko.ts index 397b43f545..f58c4f34d5 100644 --- a/selfdrive/ui/translations/main_ko.ts +++ b/selfdrive/ui/translations/main_ko.ts @@ -240,11 +240,11 @@ Reset - + 리셋 Review - + 다시보기 @@ -475,11 +475,11 @@ location set ParamControl Ok - 확인 + 확인 Cancel - 취소 + 취소 @@ -864,7 +864,7 @@ location set Uninstall - + 삭제 @@ -1070,7 +1070,7 @@ location set Forget - + 저장안함 From 5768af09c06bc5e4774a30e1f94bba32d50721c4 Mon Sep 17 00:00:00 2001 From: ZwX1616 Date: Sat, 5 Nov 2022 13:24:38 -0700 Subject: [PATCH 032/184] DM: lower bound ee calib (#26370) keep in linear region --- selfdrive/monitoring/driver_monitor.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/selfdrive/monitoring/driver_monitor.py b/selfdrive/monitoring/driver_monitor.py index 48163dcf2a..e3f6a5094d 100644 --- a/selfdrive/monitoring/driver_monitor.py +++ b/selfdrive/monitoring/driver_monitor.py @@ -34,6 +34,7 @@ class DRIVER_MONITOR_SETTINGS(): self._EE_THRESH11 = 0.275 self._EE_THRESH12 = 5.5 self._EE_MAX_OFFSET1 = 0.06 + self._EE_MIN_OFFSET1 = 0.025 self._EE_THRESH21 = 0.01 self._EE_THRESH22 = 0.35 @@ -206,7 +207,7 @@ class DriverStatus(): distracted_types.append(DistractedType.DISTRACTED_BLINK) if self.ee1_calibrated: - ee1_dist = self.eev1 > min(self.ee1_offseter.filtered_stat.M, self.settings._EE_MAX_OFFSET1) * self.settings._EE_THRESH12 + ee1_dist = self.eev1 > max(min(self.ee1_offseter.filtered_stat.M, self.settings._EE_MAX_OFFSET1), self.settings._EE_MIN_OFFSET1) * self.settings._EE_THRESH12 else: ee1_dist = self.eev1 > self.settings._EE_THRESH11 # if self.ee2_calibrated: From e079751f79c5256b1881cb34d1a92d08faa128d7 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Sat, 5 Nov 2022 15:05:30 -0700 Subject: [PATCH 033/184] ui: revert e2e path changes (#26382) * Revert "ui: fade to default path color when inactive (#26375)" This reverts commit 0b385a5650c4e0b06eb83e44bdba3fcff117beeb. * Revert "ui: minor e2e path tweaks (#26351)" This reverts commit d257e28479f49339e7f79491ff9d67e9ba034dfe. * stronger colors 45 --- selfdrive/ui/qt/onroad.cc | 17 +++++++++-------- selfdrive/ui/qt/onroad.h | 1 - selfdrive/ui/ui.cc | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc index c4e4beb76a..bfd2f44561 100644 --- a/selfdrive/ui/qt/onroad.cc +++ b/selfdrive/ui/qt/onroad.cc @@ -170,7 +170,7 @@ void OnroadAlerts::paintEvent(QPaintEvent *event) { } -AnnotatedCameraWidget::AnnotatedCameraWidget(VisionStreamType type, QWidget* parent) : fps_filter(UI_FREQ, 3, 1. / UI_FREQ), accel_filter(UI_FREQ, .5, 1. / UI_FREQ), CameraWidget("camerad", type, true, parent) { +AnnotatedCameraWidget::AnnotatedCameraWidget(VisionStreamType type, QWidget* parent) : fps_filter(UI_FREQ, 3, 1. / UI_FREQ), CameraWidget("camerad", type, true, parent) { pm = std::make_unique>({"uiDebug"}); engage_img = loadPixmap("../assets/img_chffr_wheel.png", {img_size, img_size}); @@ -463,18 +463,19 @@ void AnnotatedCameraWidget::drawLaneLines(QPainter &painter, const UIState *s) { if (scene.end_to_end_long) { const auto &acceleration = (*s->sm)["modelV2"].getModelV2().getAcceleration(); float acceleration_future = 0; - if (acceleration.getZ().size() > 10 && (*s->sm)["carControl"].getCarControl().getLongActive()) { - acceleration_future = acceleration.getX()[10]; // 1.0 second + if (acceleration.getZ().size() > 16) { + acceleration_future = acceleration.getX()[16]; // 2.5 seconds } - // speed up: 148, slow down: 0 - start_hue = fmax(fmin(60 + accel_filter.update(acceleration_future) * 80, 148), 0); + start_hue = 60; + // speed up: 120, slow down: 0 + end_hue = fmax(fmin(start_hue + acceleration_future * 45, 148), 0); // FIXME: painter.drawPolygon can be slow if hue is not rounded - start_hue = int(start_hue * 100 + 0.5) / 100; + end_hue = int(end_hue * 100 + 0.5) / 100; bg.setColorAt(0.0, QColor::fromHslF(start_hue / 360., 0.97, 0.56, 0.4)); - bg.setColorAt(0.75, QColor::fromHslF(63 / 360., 1.0, 0.68, 0.35)); - bg.setColorAt(1.0, QColor::fromHslF(63 / 360., 1.0, 0.68, 0.0)); + bg.setColorAt(0.5, QColor::fromHslF(end_hue / 360., 1.0, 0.68, 0.35)); + bg.setColorAt(1.0, QColor::fromHslF(end_hue / 360., 1.0, 0.68, 0.0)); } else { const auto &orientation = (*s->sm)["modelV2"].getModelV2().getOrientation(); float orientation_future = 0; diff --git a/selfdrive/ui/qt/onroad.h b/selfdrive/ui/qt/onroad.h index 1f6a49bf8c..7edca6b3d5 100644 --- a/selfdrive/ui/qt/onroad.h +++ b/selfdrive/ui/qt/onroad.h @@ -87,7 +87,6 @@ protected: double prev_draw_t = 0; FirstOrderFilter fps_filter; - FirstOrderFilter accel_filter; }; // container for all onroad widgets diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index 0198405769..945218ec11 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -214,7 +214,7 @@ void UIState::updateStatus() { UIState::UIState(QObject *parent) : QObject(parent) { sm = std::make_unique>({ - "modelV2", "carControl", "controlsState", "liveCalibration", "radarState", "deviceState", "roadCameraState", + "modelV2", "controlsState", "liveCalibration", "radarState", "deviceState", "roadCameraState", "pandaStates", "carParams", "driverMonitoringState", "carState", "liveLocationKalman", "wideRoadCameraState", "managerState", "navInstruction", "navRoute", "gnssMeasurements", }); From ac76cc93256578f24db255cefd10c013dd906c28 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Sun, 6 Nov 2022 07:52:16 +0800 Subject: [PATCH 034/184] Cabana: cleanup code (#26369) * remove ChartView::enterEvent * cleanup ChartsWidget::removeAll * group graphics items * remove rubber->setPalette * helper function DBCManager::parseId * remove variable name from dbcManager * fix readme/Usage * use QSlider::setRange * cleanup include * use emplace_back * remove varialbe routeName from CanMessages * remove tmp variable * remove blank line * cleanup layout * clean settings layout * connect to streamStarted * cleanup signal/slot --- tools/cabana/README.md | 2 +- tools/cabana/canmessages.cc | 14 +++------- tools/cabana/canmessages.h | 5 ++-- tools/cabana/chartswidget.cc | 47 ++++++++-------------------------- tools/cabana/chartswidget.h | 3 +-- tools/cabana/dbcmanager.cc | 20 ++++++--------- tools/cabana/dbcmanager.h | 7 +++-- tools/cabana/detailwidget.cc | 8 ++---- tools/cabana/detailwidget.h | 3 --- tools/cabana/mainwin.cc | 3 +-- tools/cabana/messageswidget.cc | 2 +- tools/cabana/settings.cc | 7 ++--- tools/cabana/videowidget.cc | 13 +++++----- tools/cabana/videowidget.h | 1 - 14 files changed, 42 insertions(+), 93 deletions(-) diff --git a/tools/cabana/README.md b/tools/cabana/README.md index 99d0d4c9ce..dd131880a6 100644 --- a/tools/cabana/README.md +++ b/tools/cabana/README.md @@ -8,7 +8,7 @@ Cabana is a tool developed to view raw CAN data. One use for this is creating an ```bash $ ./cabana -h -Usage: ./_cabana [options] route +Usage: ./cabana [options] route Options: -h, --help Displays this help. diff --git a/tools/cabana/canmessages.cc b/tools/cabana/canmessages.cc index 3ffc29916f..f1f5c2cd23 100644 --- a/tools/cabana/canmessages.cc +++ b/tools/cabana/canmessages.cc @@ -1,6 +1,5 @@ #include "tools/cabana/canmessages.h" -#include #include #include "tools/cabana/dbcmanager.h" @@ -9,7 +8,6 @@ CANMessages *can = nullptr; CANMessages::CANMessages(QObject *parent) : QObject(parent) { can = this; - QObject::connect(this, &CANMessages::received, this, &CANMessages::process, Qt::QueuedConnection); QObject::connect(&settings, &Settings::changed, this, &CANMessages::settingChanged); } @@ -24,11 +22,11 @@ static bool event_filter(const Event *e, void *opaque) { } bool CANMessages::loadRoute(const QString &route, const QString &data_dir, bool use_qcam) { - routeName = route; replay = new Replay(route, {"can", "roadEncodeIdx", "carParams"}, {}, nullptr, use_qcam ? REPLAY_FLAG_QCAMERA : 0, data_dir, this); replay->setSegmentCacheLimit(settings.cached_segment_limit); replay->installEventFilter(event_filter, this); QObject::connect(replay, &Replay::segmentsMerged, this, &CANMessages::eventsMerged); + QObject::connect(replay, &Replay::streamStarted, this, &CANMessages::streamStarted); if (replay->load()) { replay->start(); return true; @@ -40,12 +38,9 @@ QList CANMessages::findSignalValues(const QString &id, const Signal *si auto evts = events(); if (!evts) return {}; - auto l = id.split(':'); - int bus = l[0].toInt(); - uint32_t address = l[1].toUInt(nullptr, 16); - QList ret; ret.reserve(max_count); + auto [bus, address] = DBCManager::parseId(id); for (auto &evt : *evts) { if (evt->which != cereal::Event::Which::CAN) continue; @@ -101,10 +96,9 @@ bool CANMessages::eventFilter(const Event *event) { data.bus_time = c.getBusTime(); data.dat.append((char *)c.getDat().begin(), c.getDat().size()); - auto &count = counters[id]; - data.count = ++count; + data.count = ++counters[id]; if (double delta = (current_sec - counters_begin_sec); delta > 0) { - data.freq = count / delta; + data.freq = data.count / delta; } (*new_msgs)[id] = data; } diff --git a/tools/cabana/canmessages.h b/tools/cabana/canmessages.h index 5fbccdbe12..14e2423d01 100644 --- a/tools/cabana/canmessages.h +++ b/tools/cabana/canmessages.h @@ -32,7 +32,7 @@ public: QList findSignalValues(const QString&id, const Signal* signal, double value, FindFlags flag, int max_count); bool eventFilter(const Event *event); - inline QString route() const { return routeName; } + inline QString route() const { return replay->route()->name(); } inline QString carFingerprint() const { return replay->carFingerprint().c_str(); } inline double totalSeconds() const { return replay->totalSeconds(); } inline double routeStartTime() const { return replay->routeStartTime() / (double)1e9; } @@ -47,6 +47,7 @@ public: inline const std::vector> getTimeline() { return replay->getTimeline(); } signals: + void streamStarted(); void eventsMerged(); void updated(); void received(QHash *); @@ -58,9 +59,7 @@ protected: void process(QHash *); void settingChanged(); - QString routeName; Replay *replay = nullptr; - std::mutex lock; std::atomic counters_begin_sec = 0; QHash counters; diff --git a/tools/cabana/chartswidget.cc b/tools/cabana/chartswidget.cc index 7540abbcb2..6432cb7079 100644 --- a/tools/cabana/chartswidget.cc +++ b/tools/cabana/chartswidget.cc @@ -176,16 +176,8 @@ void ChartsWidget::removeChart(ChartWidget *chart) { } void ChartsWidget::removeAll(const Signal *sig) { - QMutableListIterator it(charts); - while (it.hasNext()) { - auto c = it.next(); - if (sig == nullptr || c->signal == sig) { - c->deleteLater(); - emit chartClosed(c->id, c->signal); - it.remove(); - } - } - updateTitleBar(); + for (auto c : charts.toVector()) + if (!sig || c->signal == sig) removeChart(c); } void ChartsWidget::signalUpdated(const Signal *sig) { @@ -267,26 +259,21 @@ ChartView::ChartView(const QString &id, const Signal *sig, QWidget *parent) chart->setMargins({0, 0, 0, 0}); chart->layout()->setContentsMargins(0, 0, 0, 0); + line_marker = new QGraphicsLineItem(chart); + line_marker->setZValue(chart->zValue() + 10); + track_line = new QGraphicsLineItem(chart); - track_line->setZValue(chart->zValue() + 10); track_line->setPen(QPen(Qt::darkGray, 1, Qt::DashLine)); track_ellipse = new QGraphicsEllipseItem(chart); - track_ellipse->setZValue(chart->zValue() + 10); track_ellipse->setBrush(Qt::darkGray); value_text = new QGraphicsTextItem(chart); - value_text->setZValue(chart->zValue() + 10); - line_marker = new QGraphicsLineItem(chart); - line_marker->setZValue(chart->zValue() + 10); + item_group = scene()->createItemGroup({track_line, track_ellipse, value_text}); + item_group->setZValue(chart->zValue() + 10); setChart(chart); setRenderHint(QPainter::Antialiasing); setRubberBand(QChartView::HorizontalRubberBand); - if (auto rubber = findChild()) { - QPalette pal; - pal.setBrush(QPalette::Base, QColor(0, 0, 0, 80)); - rubber->setPalette(pal); - } QTimer *timer = new QTimer(this); timer->setInterval(100); @@ -335,12 +322,9 @@ void ChartView::updateSeries(const std::pair range) { auto events = can->events(); if (!events) return; - auto l = id.split(':'); - int bus = l[0].toInt(); - uint32_t address = l[1].toUInt(nullptr, 16); - vals.clear(); vals.reserve((range.second - range.first) * 1000); // [n]seconds * 1000hz + auto [bus, address] = DBCManager::parseId(id); double route_start_time = can->routeStartTime(); Event begin_event(cereal::Event::Which::INIT_DATA, (route_start_time + range.first) * 1e9); auto begin = std::lower_bound(events->begin(), events->end(), &begin_event, Event::lessThan()); @@ -380,17 +364,8 @@ void ChartView::updateAxisY() { } } -void ChartView::enterEvent(QEvent *event) { - track_line->setVisible(true); - value_text->setVisible(true); - track_ellipse->setVisible(true); - QChartView::enterEvent(event); -} - void ChartView::leaveEvent(QEvent *event) { - track_line->setVisible(false); - value_text->setVisible(false); - track_ellipse->setVisible(false); + item_group->setVisible(false); QChartView::leaveEvent(event); } @@ -442,9 +417,7 @@ void ChartView::mouseMoveEvent(QMouseEvent *ev) { } value_text->setPos(text_x, pos.y() - 10); } - track_line->setVisible(value != vals.end()); - value_text->setVisible(value != vals.end()); - track_ellipse->setVisible(value != vals.end()); + item_group->setVisible(value != vals.end()); } else { setViewportUpdateMode(QGraphicsView::FullViewportUpdate); } diff --git a/tools/cabana/chartswidget.h b/tools/cabana/chartswidget.h index ff56008e7d..70e0774c3e 100644 --- a/tools/cabana/chartswidget.h +++ b/tools/cabana/chartswidget.h @@ -8,7 +8,6 @@ #include #include #include -#include #include #include "tools/cabana/canmessages.h" @@ -33,11 +32,11 @@ signals: private: void mouseReleaseEvent(QMouseEvent *event) override; void mouseMoveEvent(QMouseEvent *ev) override; - void enterEvent(QEvent *event) override; void leaveEvent(QEvent *event) override; void adjustChartMargins(); void updateAxisY(); + QGraphicsItemGroup *item_group; QGraphicsLineItem *track_line; QGraphicsEllipseItem *track_ellipse; QGraphicsTextItem *value_text; diff --git a/tools/cabana/dbcmanager.cc b/tools/cabana/dbcmanager.cc index 0ab67dd305..3ddcf41788 100644 --- a/tools/cabana/dbcmanager.cc +++ b/tools/cabana/dbcmanager.cc @@ -9,8 +9,7 @@ DBCManager::DBCManager(QObject *parent) : QObject(parent) {} DBCManager::~DBCManager() {} void DBCManager::open(const QString &dbc_file_name) { - dbc_name = dbc_file_name; - dbc = const_cast(dbc_lookup(dbc_name.toStdString())); + dbc = const_cast(dbc_lookup(dbc_file_name.toStdString())); msg_map.clear(); for (auto &msg : dbc->msgs) { msg_map[msg.address] = &msg; @@ -19,7 +18,6 @@ void DBCManager::open(const QString &dbc_file_name) { } void DBCManager::open(const QString &name, const QString &content) { - this->dbc_name = name; std::istringstream stream(content.toStdString()); dbc = const_cast(dbc_parse_from_stream(name.toStdString(), stream)); msg_map.clear(); @@ -51,22 +49,19 @@ QString DBCManager::generateDBC() { } void DBCManager::updateMsg(const QString &id, const QString &name, uint32_t size) { - auto m = const_cast(msg(id)); - if (m) { + if (auto m = const_cast(msg(id))) { m->name = name.toStdString(); m->size = size; } else { - uint32_t address = addressFromId(id); - dbc->msgs.push_back({.address = address, .name = name.toStdString(), .size = size}); - msg_map[address] = &dbc->msgs.back(); + m = &dbc->msgs.emplace_back(Msg{.address = parseId(id).second, .name = name.toStdString(), .size = size}); + msg_map[m->address] = m; } emit msgUpdated(id); } void DBCManager::addSignal(const QString &id, const Signal &sig) { if (Msg *m = const_cast(msg(id))) { - m->sigs.push_back(sig); - emit signalAdded(&m->sigs.back()); + emit signalAdded(&m->sigs.emplace_back(sig)); } } @@ -90,8 +85,9 @@ void DBCManager::removeSignal(const QString &id, const QString &sig_name) { } } -uint32_t DBCManager::addressFromId(const QString &id) { - return id.mid(id.indexOf(':') + 1).toUInt(nullptr, 16); +std::pair DBCManager::parseId(const QString &id) { + const auto list = id.split(':'); + return {list[0].toInt(), list[1].toUInt(nullptr, 16)}; } DBCManager *dbc() { diff --git a/tools/cabana/dbcmanager.h b/tools/cabana/dbcmanager.h index 913445d44e..d8a8da9b7a 100644 --- a/tools/cabana/dbcmanager.h +++ b/tools/cabana/dbcmanager.h @@ -18,13 +18,13 @@ public: void updateSignal(const QString &id, const QString &sig_name, const Signal &sig); void removeSignal(const QString &id, const QString &sig_name); - static uint32_t addressFromId(const QString &id); + static std::pair parseId(const QString &id); inline static std::vector allDBCNames() { return get_dbc_names(); } - inline QString name() const { return dbc_name; } + inline QString name() const { return dbc ? dbc->name.c_str() : ""; } void updateMsg(const QString &id, const QString &name, uint32_t size); inline const DBC *getDBC() const { return dbc; } - inline const Msg *msg(const QString &id) const { return msg(addressFromId(id)); } + inline const Msg *msg(const QString &id) const { return msg(parseId(id).second); } inline const Msg *msg(uint32_t address) const { auto it = msg_map.find(address); return it != msg_map.end() ? it->second : nullptr; @@ -38,7 +38,6 @@ signals: void DBCFileChanged(); private: - QString dbc_name; DBC *dbc = nullptr; std::unordered_map msg_map; }; diff --git a/tools/cabana/detailwidget.cc b/tools/cabana/detailwidget.cc index f3e3438229..db731333d3 100644 --- a/tools/cabana/detailwidget.cc +++ b/tools/cabana/detailwidget.cc @@ -277,9 +277,7 @@ void DetailWidget::removeSignal(const Signal *sig) { EditMessageDialog::EditMessageDialog(const QString &msg_id, const QString &title, int size, QWidget *parent) : QDialog(parent) { setWindowTitle(tr("Edit message")); - QVBoxLayout *main_layout = new QVBoxLayout(this); - - QFormLayout *form_layout = new QFormLayout(); + QFormLayout *form_layout = new QFormLayout(this); form_layout->addRow("ID", new QLabel(msg_id)); name_edit = new QLineEdit(title, this); @@ -291,10 +289,8 @@ EditMessageDialog::EditMessageDialog(const QString &msg_id, const QString &title size_spin->setValue(size); form_layout->addRow(tr("Size"), size_spin); - main_layout->addLayout(form_layout); - auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); - main_layout->addWidget(buttonBox); + form_layout->addRow(buttonBox); setFixedWidth(parent->width() * 0.9); connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); diff --git a/tools/cabana/detailwidget.h b/tools/cabana/detailwidget.h index ce3468e472..ac32d5952e 100644 --- a/tools/cabana/detailwidget.h +++ b/tools/cabana/detailwidget.h @@ -26,9 +26,6 @@ public: void setMessage(const QString &message_id); void dbcMsgChanged(int show_form_idx = -1); -signals: - void binaryViewMoved(bool in); - private: void updateChartState(const QString &id, const Signal *sig, bool opened); void showTabBarContextMenu(const QPoint &pt); diff --git a/tools/cabana/mainwin.cc b/tools/cabana/mainwin.cc index c2baca4d22..be643c58d9 100644 --- a/tools/cabana/mainwin.cc +++ b/tools/cabana/mainwin.cc @@ -81,11 +81,10 @@ MainWindow::MainWindow() : QWidget() { QObject::connect(this, &MainWindow::showMessage, status_bar, &QStatusBar::showMessage); QObject::connect(this, &MainWindow::updateProgressBar, this, &MainWindow::updateDownloadProgress); QObject::connect(messages_widget, &MessagesWidget::msgSelectionChanged, detail_widget, &DetailWidget::setMessage); - QObject::connect(detail_widget, &DetailWidget::binaryViewMoved, [this](bool in) { splitter->setSizes({in ? 100 : 0, 500}); }); QObject::connect(charts_widget, &ChartsWidget::dock, this, &MainWindow::dockCharts); QObject::connect(charts_widget, &ChartsWidget::rangeChanged, video_widget, &VideoWidget::rangeChanged); QObject::connect(settings_btn, &QPushButton::clicked, this, &MainWindow::setOption); - QObject::connect(can, &CANMessages::eventsMerged, [=]() { fingerprint_label->setText(can->carFingerprint() ); }); + QObject::connect(can, &CANMessages::streamStarted, [=]() { fingerprint_label->setText(can->carFingerprint() ); }); main_win = this; qInstallMessageHandler(qLogMessageHandler); diff --git a/tools/cabana/messageswidget.cc b/tools/cabana/messageswidget.cc index e80a66bce9..3639789239 100644 --- a/tools/cabana/messageswidget.cc +++ b/tools/cabana/messageswidget.cc @@ -67,7 +67,7 @@ MessagesWidget::MessagesWidget(QWidget *parent) : QWidget(parent) { // signals/slots QObject::connect(filter, &QLineEdit::textChanged, model, &MessageListModel::setFilterString); - QObject::connect(can, &CANMessages::eventsMerged, this, &MessagesWidget::loadDBCFromFingerprint); + QObject::connect(can, &CANMessages::streamStarted, this, &MessagesWidget::loadDBCFromFingerprint); QObject::connect(can, &CANMessages::updated, [this]() { model->updateState(); }); QObject::connect(dbc_combo, SIGNAL(activated(const QString &)), SLOT(loadDBCFromName(const QString &))); QObject::connect(load_from_paste, &QPushButton::clicked, this, &MessagesWidget::loadDBCFromPaste); diff --git a/tools/cabana/settings.cc b/tools/cabana/settings.cc index bba59c0d74..b173b41df3 100644 --- a/tools/cabana/settings.cc +++ b/tools/cabana/settings.cc @@ -36,8 +36,7 @@ void Settings::load() { SettingsDlg::SettingsDlg(QWidget *parent) : QDialog(parent) { setWindowTitle(tr("Settings")); - QVBoxLayout *main_layout = new QVBoxLayout(this); - QFormLayout *form_layout = new QFormLayout(); + QFormLayout *form_layout = new QFormLayout(this); fps = new QSpinBox(this); fps->setRange(10, 100); @@ -74,10 +73,8 @@ SettingsDlg::SettingsDlg(QWidget *parent) : QDialog(parent) { chart_theme->setCurrentIndex(settings.chart_theme == 1 ? 1 : 0); form_layout->addRow(tr("Chart theme"), chart_theme); - main_layout->addLayout(form_layout); - auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); - main_layout->addWidget(buttonBox); + form_layout->addRow(buttonBox); setFixedWidth(360); connect(buttonBox, &QDialogButtonBox::accepted, this, &SettingsDlg::save); diff --git a/tools/cabana/videowidget.cc b/tools/cabana/videowidget.cc index 9a28f71bb9..d5e640b5f7 100644 --- a/tools/cabana/videowidget.cc +++ b/tools/cabana/videowidget.cc @@ -28,11 +28,9 @@ VideoWidget::VideoWidget(QWidget *parent) : QWidget(parent) { slider = new Slider(this); slider->setSingleStep(0); - slider->setMinimum(0); - slider->setMaximum(can->totalSeconds() * 1000); slider_layout->addWidget(slider); - end_time_label = new QLabel(formatTime(can->totalSeconds())); + end_time_label = new QLabel(this); slider_layout->addWidget(end_time_label); main_layout->addLayout(slider_layout); @@ -61,6 +59,10 @@ VideoWidget::VideoWidget(QWidget *parent) : QWidget(parent) { QObject::connect(slider, &QSlider::valueChanged, [=](int value) { time_label->setText(formatTime(value / 1000)); }); QObject::connect(cam_widget, &CameraWidget::clicked, [this]() { pause(!can->isPaused()); }); QObject::connect(play_btn, &QPushButton::clicked, [=]() { pause(!can->isPaused()); }); + QObject::connect(can, &CANMessages::streamStarted, [this]() { + end_time_label->setText(formatTime(can->totalSeconds())); + slider->setRange(0, can->totalSeconds() * 1000); + }); } void VideoWidget::pause(bool pause) { @@ -74,8 +76,7 @@ void VideoWidget::rangeChanged(double min, double max, bool is_zoomed) { max = can->totalSeconds(); } end_time_label->setText(formatTime(max)); - slider->setMinimum(min * 1000); - slider->setMaximum(max * 1000); + slider->setRange(min * 1000, max * 1000); } void VideoWidget::updateState() { @@ -91,7 +92,7 @@ Slider::Slider(QWidget *parent) : QSlider(Qt::Horizontal, parent) { timeline = can->getTimeline(); update(); }); - timer->start(); + QObject::connect(can, SIGNAL(streamStarted()), timer, SLOT(start())); } void Slider::sliderChange(QAbstractSlider::SliderChange change) { diff --git a/tools/cabana/videowidget.h b/tools/cabana/videowidget.h index 51dae4c76f..16f60b0b03 100644 --- a/tools/cabana/videowidget.h +++ b/tools/cabana/videowidget.h @@ -3,7 +3,6 @@ #include #include #include -#include #include "selfdrive/ui/qt/widgets/cameraview.h" #include "tools/cabana/canmessages.h" From ea5587d1d14e01b7a2aeae34f8abc73886699519 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Mon, 7 Nov 2022 03:03:57 +0800 Subject: [PATCH 035/184] Cabana: fix wrong hardcoded column index (#26392) fix wrong column count --- tools/cabana/messageswidget.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cabana/messageswidget.cc b/tools/cabana/messageswidget.cc index 3639789239..9444ea9c48 100644 --- a/tools/cabana/messageswidget.cc +++ b/tools/cabana/messageswidget.cc @@ -224,7 +224,7 @@ void MessageListModel::updateState(bool sort) { changePersistentIndex(idx, index(std::distance(msgs.begin(), it), idx.column())); } } - emit dataChanged(index(0, 0), index(msgs.size() - 1, 3), {Qt::DisplayRole}); + emit dataChanged(index(0, 0), index(msgs.size() - 1, columnCount() - 1), {Qt::DisplayRole}); } } From 529504e201a4130bad7ff9ab712e01c1341ac349 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Mon, 7 Nov 2022 03:05:14 +0800 Subject: [PATCH 036/184] Cabana: move dbc related code from MessagesWidget to MainWin (#26387) * move dbc related code to mainwin * trigger ci --- tools/cabana/mainwin.cc | 138 ++++++++++++++++++++++++++++++++- tools/cabana/mainwin.h | 31 ++++++++ tools/cabana/messageswidget.cc | 133 +------------------------------ tools/cabana/messageswidget.h | 31 -------- 4 files changed, 167 insertions(+), 166 deletions(-) diff --git a/tools/cabana/mainwin.cc b/tools/cabana/mainwin.cc index be643c58d9..d3d7ff4156 100644 --- a/tools/cabana/mainwin.cc +++ b/tools/cabana/mainwin.cc @@ -1,7 +1,13 @@ #include "tools/cabana/mainwin.h" #include +#include +#include +#include +#include +#include #include +#include #include #include @@ -23,8 +29,38 @@ MainWindow::MainWindow() : QWidget() { splitter = new QSplitter(Qt::Horizontal, this); splitter->setHandleWidth(11); + + // DBC file selector + QWidget *messages_container = new QWidget(this); + QVBoxLayout *messages_layout = new QVBoxLayout(messages_container); + messages_layout->setContentsMargins(0, 0, 0, 0); + QHBoxLayout *dbc_file_layout = new QHBoxLayout(); + dbc_combo = new QComboBox(this); + auto dbc_names = dbc()->allDBCNames(); + for (const auto &name : dbc_names) { + dbc_combo->addItem(QString::fromStdString(name)); + } + dbc_combo->model()->sort(0); + dbc_combo->setEditable(true); + dbc_combo->setCurrentText(QString()); + dbc_combo->setInsertPolicy(QComboBox::NoInsert); + dbc_combo->completer()->setCompletionMode(QCompleter::PopupCompletion); + QFont font; + font.setBold(true); + dbc_combo->lineEdit()->setFont(font); + dbc_file_layout->addWidget(dbc_combo); + + QPushButton *load_from_paste = new QPushButton(tr("Load from paste"), this); + dbc_file_layout->addWidget(load_from_paste); + + dbc_file_layout->addStretch(); + QPushButton *save_btn = new QPushButton(tr("Save DBC"), this); + dbc_file_layout->addWidget(save_btn); + messages_layout->addLayout(dbc_file_layout); + messages_widget = new MessagesWidget(this); - splitter->addWidget(messages_widget); + messages_layout->addWidget(messages_widget); + splitter->addWidget(messages_container); charts_widget = new ChartsWidget(this); detail_widget = new DetailWidget(charts_widget, this); @@ -78,16 +114,55 @@ MainWindow::MainWindow() : QWidget() { emit updateProgressBar(cur, total, success); }); + main_win = this; + qInstallMessageHandler(qLogMessageHandler); + QFile json_file("./car_fingerprint_to_dbc.json"); + if (json_file.open(QIODevice::ReadOnly)) { + fingerprint_to_dbc = QJsonDocument::fromJson(json_file.readAll()); + } + + QObject::connect(dbc_combo, SIGNAL(activated(const QString &)), SLOT(loadDBCFromName(const QString &))); + QObject::connect(load_from_paste, &QPushButton::clicked, this, &MainWindow::loadDBCFromPaste); + QObject::connect(save_btn, &QPushButton::clicked, this, &MainWindow::saveDBC); QObject::connect(this, &MainWindow::showMessage, status_bar, &QStatusBar::showMessage); QObject::connect(this, &MainWindow::updateProgressBar, this, &MainWindow::updateDownloadProgress); QObject::connect(messages_widget, &MessagesWidget::msgSelectionChanged, detail_widget, &DetailWidget::setMessage); QObject::connect(charts_widget, &ChartsWidget::dock, this, &MainWindow::dockCharts); QObject::connect(charts_widget, &ChartsWidget::rangeChanged, video_widget, &VideoWidget::rangeChanged); QObject::connect(settings_btn, &QPushButton::clicked, this, &MainWindow::setOption); + QObject::connect(can, &CANMessages::streamStarted, this, &MainWindow::loadDBCFromFingerprint); QObject::connect(can, &CANMessages::streamStarted, [=]() { fingerprint_label->setText(can->carFingerprint() ); }); +} - main_win = this; - qInstallMessageHandler(qLogMessageHandler); +void MainWindow::loadDBCFromName(const QString &name) { + if (name != dbc()->name()) { + dbc()->open(name); + dbc_combo->setCurrentText(name); + } +} + +void MainWindow::loadDBCFromPaste() { + LoadDBCDialog dlg(this); + if (dlg.exec()) { + dbc()->open("from paste", dlg.dbc_edit->toPlainText()); + dbc_combo->setCurrentText("loaded from paste"); + } +} + +void MainWindow::loadDBCFromFingerprint() { + auto fingerprint = can->carFingerprint(); + if (!fingerprint.isEmpty() && dbc()->name().isEmpty()) { + auto dbc_name = fingerprint_to_dbc[fingerprint]; + if (dbc_name != QJsonValue::Undefined) { + loadDBCFromName(dbc_name.toString()); + } + } +} + +void MainWindow::saveDBC() { + SaveDBCDialog dlg(this); + dlg.dbc_edit->setText(dbc()->generateDBC()); + dlg.exec(); } void MainWindow::updateDownloadProgress(uint64_t cur, uint64_t total, bool success) { @@ -127,3 +202,60 @@ void MainWindow::setOption() { SettingsDlg dlg(this); dlg.exec(); } + +// LoadDBCDialog + +LoadDBCDialog::LoadDBCDialog(QWidget *parent) : QDialog(parent) { + QVBoxLayout *main_layout = new QVBoxLayout(this); + dbc_edit = new QTextEdit(this); + dbc_edit->setAcceptRichText(false); + dbc_edit->setPlaceholderText(tr("paste DBC file here")); + main_layout->addWidget(dbc_edit); + auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); + main_layout->addWidget(buttonBox); + + setMinimumSize({640, 480}); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); +} + +// SaveDBCDialog + +SaveDBCDialog::SaveDBCDialog(QWidget *parent) : QDialog(parent) { + setWindowTitle(tr("Save DBC")); + QVBoxLayout *main_layout = new QVBoxLayout(this); + dbc_edit = new QTextEdit(this); + dbc_edit->setAcceptRichText(false); + main_layout->addWidget(dbc_edit); + + QPushButton *copy_to_clipboard = new QPushButton(tr("Copy To Clipboard"), this); + QPushButton *save_as = new QPushButton(tr("Save As"), this); + + QHBoxLayout *btn_layout = new QHBoxLayout(); + btn_layout->addStretch(); + btn_layout->addWidget(copy_to_clipboard); + btn_layout->addWidget(save_as); + main_layout->addLayout(btn_layout); + setMinimumSize({640, 480}); + + QObject::connect(copy_to_clipboard, &QPushButton::clicked, this, &SaveDBCDialog::copytoClipboard); + QObject::connect(save_as, &QPushButton::clicked, this, &SaveDBCDialog::saveAs); +} + +void SaveDBCDialog::copytoClipboard() { + dbc_edit->selectAll(); + dbc_edit->copy(); + QDialog::accept(); +} + +void SaveDBCDialog::saveAs() { + QString file_name = QFileDialog::getSaveFileName(this, tr("Save File"), + QDir::homePath() + "/untitled.dbc", tr("DBC (*.dbc)")); + if (!file_name.isEmpty()) { + QFile file(file_name); + if (file.open(QIODevice::WriteOnly)) { + file.write(dbc_edit->toPlainText().toUtf8()); + } + QDialog::accept(); + } +} diff --git a/tools/cabana/mainwin.h b/tools/cabana/mainwin.h index b77744ba9c..f6853a5ea3 100644 --- a/tools/cabana/mainwin.h +++ b/tools/cabana/mainwin.h @@ -1,8 +1,12 @@ #pragma once +#include +#include +#include #include #include #include +#include #include "tools/cabana/chartswidget.h" #include "tools/cabana/detailwidget.h" @@ -17,6 +21,12 @@ public: void dockCharts(bool dock); void showStatusMessage(const QString &msg, int timeout = 0) { status_bar->showMessage(msg, timeout); } +public slots: + void loadDBCFromName(const QString &name); + void loadDBCFromFingerprint(); + void loadDBCFromPaste(); + void saveDBC(); + signals: void showMessage(const QString &msg, int timeout); void updateProgressBar(uint64_t cur, uint64_t total, bool success); @@ -35,4 +45,25 @@ protected: QVBoxLayout *r_layout; QProgressBar *progress_bar; QStatusBar *status_bar; + QJsonDocument fingerprint_to_dbc; + QComboBox *dbc_combo; +}; + + +class LoadDBCDialog : public QDialog { + Q_OBJECT + +public: + LoadDBCDialog(QWidget *parent); + QTextEdit *dbc_edit; +}; + +class SaveDBCDialog : public QDialog { + Q_OBJECT + +public: + SaveDBCDialog(QWidget *parent); + void copytoClipboard(); + void saveAs(); + QTextEdit *dbc_edit; }; diff --git a/tools/cabana/messageswidget.cc b/tools/cabana/messageswidget.cc index 9444ea9c48..b2e8e50b55 100644 --- a/tools/cabana/messageswidget.cc +++ b/tools/cabana/messageswidget.cc @@ -1,15 +1,8 @@ #include "tools/cabana/messageswidget.h" -#include -#include -#include -#include -#include #include #include #include -#include -#include #include #include "tools/cabana/dbcmanager.h" @@ -18,31 +11,6 @@ MessagesWidget::MessagesWidget(QWidget *parent) : QWidget(parent) { QVBoxLayout *main_layout = new QVBoxLayout(this); main_layout->setContentsMargins(0, 0, 0, 0); - // DBC file selector - QHBoxLayout *dbc_file_layout = new QHBoxLayout(); - dbc_combo = new QComboBox(this); - auto dbc_names = dbc()->allDBCNames(); - for (const auto &name : dbc_names) { - dbc_combo->addItem(QString::fromStdString(name)); - } - dbc_combo->model()->sort(0); - dbc_combo->setEditable(true); - dbc_combo->setCurrentText(QString()); - dbc_combo->setInsertPolicy(QComboBox::NoInsert); - dbc_combo->completer()->setCompletionMode(QCompleter::PopupCompletion); - QFont font; - font.setBold(true); - dbc_combo->lineEdit()->setFont(font); - dbc_file_layout->addWidget(dbc_combo); - - QPushButton *load_from_paste = new QPushButton(tr("Load from paste"), this); - dbc_file_layout->addWidget(load_from_paste); - - dbc_file_layout->addStretch(); - QPushButton *save_btn = new QPushButton(tr("Save DBC"), this); - dbc_file_layout->addWidget(save_btn); - main_layout->addLayout(dbc_file_layout); - // message filter QLineEdit *filter = new QLineEdit(this); filter->setClearButtonEnabled(true); @@ -67,55 +35,13 @@ MessagesWidget::MessagesWidget(QWidget *parent) : QWidget(parent) { // signals/slots QObject::connect(filter, &QLineEdit::textChanged, model, &MessageListModel::setFilterString); - QObject::connect(can, &CANMessages::streamStarted, this, &MessagesWidget::loadDBCFromFingerprint); QObject::connect(can, &CANMessages::updated, [this]() { model->updateState(); }); - QObject::connect(dbc_combo, SIGNAL(activated(const QString &)), SLOT(loadDBCFromName(const QString &))); - QObject::connect(load_from_paste, &QPushButton::clicked, this, &MessagesWidget::loadDBCFromPaste); - QObject::connect(save_btn, &QPushButton::clicked, this, &MessagesWidget::saveDBC); + QObject::connect(dbc(), &DBCManager::DBCFileChanged, [this]() { model->updateState(true); }); QObject::connect(table_widget->selectionModel(), &QItemSelectionModel::currentChanged, [=](const QModelIndex ¤t, const QModelIndex &previous) { if (current.isValid()) { emit msgSelectionChanged(current.data(Qt::UserRole).toString()); } }); - - QFile json_file("./car_fingerprint_to_dbc.json"); - if (json_file.open(QIODevice::ReadOnly)) { - fingerprint_to_dbc = QJsonDocument::fromJson(json_file.readAll()); - } -} - -void MessagesWidget::loadDBCFromName(const QString &name) { - if (name != dbc()->name()) { - dbc()->open(name); - dbc_combo->setCurrentText(name); - // re-sort model to refresh column 'Name' - model->updateState(true); - } -} - -void MessagesWidget::loadDBCFromPaste() { - LoadDBCDialog dlg(this); - if (dlg.exec()) { - dbc()->open("from paste", dlg.dbc_edit->toPlainText()); - dbc_combo->setCurrentText("loaded from paste"); - model->updateState(true); - } -} - -void MessagesWidget::loadDBCFromFingerprint() { - auto fingerprint = can->carFingerprint(); - if (!fingerprint.isEmpty() && dbc()->name().isEmpty()) { - auto dbc_name = fingerprint_to_dbc[fingerprint]; - if (dbc_name != QJsonValue::Undefined) { - loadDBCFromName(dbc_name.toString()); - } - } -} - -void MessagesWidget::saveDBC() { - SaveDBCDialog dlg(this); - dlg.dbc_edit->setText(dbc()->generateDBC()); - dlg.exec(); } // MessageListModel @@ -235,60 +161,3 @@ void MessageListModel::sort(int column, Qt::SortOrder order) { updateState(true); } } - -// LoadDBCDialog - -LoadDBCDialog::LoadDBCDialog(QWidget *parent) : QDialog(parent) { - QVBoxLayout *main_layout = new QVBoxLayout(this); - dbc_edit = new QTextEdit(this); - dbc_edit->setAcceptRichText(false); - dbc_edit->setPlaceholderText(tr("paste DBC file here")); - main_layout->addWidget(dbc_edit); - auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); - main_layout->addWidget(buttonBox); - - setMinimumSize({640, 480}); - QObject::connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); - QObject::connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); -} - -// SaveDBCDialog - -SaveDBCDialog::SaveDBCDialog(QWidget *parent) : QDialog(parent) { - setWindowTitle(tr("Save DBC")); - QVBoxLayout *main_layout = new QVBoxLayout(this); - dbc_edit = new QTextEdit(this); - dbc_edit->setAcceptRichText(false); - main_layout->addWidget(dbc_edit); - - QPushButton *copy_to_clipboard = new QPushButton(tr("Copy To Clipboard"), this); - QPushButton *save_as = new QPushButton(tr("Save As"), this); - - QHBoxLayout *btn_layout = new QHBoxLayout(); - btn_layout->addStretch(); - btn_layout->addWidget(copy_to_clipboard); - btn_layout->addWidget(save_as); - main_layout->addLayout(btn_layout); - setMinimumSize({640, 480}); - - QObject::connect(copy_to_clipboard, &QPushButton::clicked, this, &SaveDBCDialog::copytoClipboard); - QObject::connect(save_as, &QPushButton::clicked, this, &SaveDBCDialog::saveAs); -} - -void SaveDBCDialog::copytoClipboard() { - dbc_edit->selectAll(); - dbc_edit->copy(); - QDialog::accept(); -} - -void SaveDBCDialog::saveAs() { - QString file_name = QFileDialog::getSaveFileName(this, tr("Save File"), - QDir::homePath() + "/untitled.dbc", tr("DBC (*.dbc)")); - if (!file_name.isEmpty()) { - QFile file(file_name); - if (file.open(QIODevice::WriteOnly)) { - file.write(dbc_edit->toPlainText().toUtf8()); - } - QDialog::accept(); - } -} diff --git a/tools/cabana/messageswidget.h b/tools/cabana/messageswidget.h index 255dce7dc8..450c7003b7 100644 --- a/tools/cabana/messageswidget.h +++ b/tools/cabana/messageswidget.h @@ -1,32 +1,9 @@ #pragma once #include -#include -#include -#include #include -#include #include "tools/cabana/canmessages.h" - -class LoadDBCDialog : public QDialog { - Q_OBJECT - -public: - LoadDBCDialog(QWidget *parent); - QTextEdit *dbc_edit; -}; - -class SaveDBCDialog : public QDialog { - Q_OBJECT - -public: - SaveDBCDialog(QWidget *parent); - void copytoClipboard(); - void saveAs(); - QTextEdit *dbc_edit; -}; - class MessageListModel : public QAbstractTableModel { Q_OBJECT @@ -58,18 +35,10 @@ class MessagesWidget : public QWidget { public: MessagesWidget(QWidget *parent); -public slots: - void loadDBCFromName(const QString &name); - void loadDBCFromFingerprint(); - void loadDBCFromPaste(); - void saveDBC(); - signals: void msgSelectionChanged(const QString &message_id); protected: QTableView *table_widget; - QComboBox *dbc_combo; MessageListModel *model; - QJsonDocument fingerprint_to_dbc; }; From 3dc5dbf103290355b85a146f213f733cbb1dfeb5 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Mon, 7 Nov 2022 03:05:46 +0800 Subject: [PATCH 037/184] Cabana: move the chart title into graphics view (#26389) remove class ChartWidget --- tools/cabana/chartswidget.cc | 109 ++++++++++++++--------------------- tools/cabana/chartswidget.h | 45 +++++---------- 2 files changed, 55 insertions(+), 99 deletions(-) diff --git a/tools/cabana/chartswidget.cc b/tools/cabana/chartswidget.cc index 6432cb7079..9a8d95633c 100644 --- a/tools/cabana/chartswidget.cc +++ b/tools/cabana/chartswidget.cc @@ -2,9 +2,9 @@ #include #include -#include #include #include +#include #include #include #include @@ -13,7 +13,6 @@ ChartsWidget::ChartsWidget(QWidget *parent) : QWidget(parent) { QVBoxLayout *main_layout = new QVBoxLayout(this); - main_layout->setContentsMargins(0, 0, 0, 0); // title bar title_bar = new QWidget(this); @@ -120,14 +119,14 @@ void ChartsWidget::updateState() { if (prev_range != display_range) { QFutureSynchronizer future_synchronizer; for (auto c : charts) - future_synchronizer.addFuture(QtConcurrent::run(c->chart_view, &ChartView::updateSeries, display_range)); + future_synchronizer.addFuture(QtConcurrent::run(c, &ChartView::updateSeries, display_range)); } } const auto &range = is_zoomed ? zoomed_range : display_range; for (auto c : charts) { - c->chart_view->setRange(range.first, range.second); - c->chart_view->updateLineMarker(current_sec); + c->setRange(range.first, range.second); + c->updateLineMarker(current_sec); } } @@ -150,11 +149,11 @@ void ChartsWidget::showChart(const QString &id, const Signal *sig, bool show) { if (it != charts.end()) { if (!show) removeChart((*it)); } else if (show) { - auto chart = new ChartWidget(id, sig, this); - chart->chart_view->updateSeries(display_range); - QObject::connect(chart, &ChartWidget::remove, [=]() { removeChart(chart); }); - QObject::connect(chart->chart_view, &ChartView::zoomIn, this, &ChartsWidget::zoomIn); - QObject::connect(chart->chart_view, &ChartView::zoomReset, this, &ChartsWidget::zoomReset); + auto chart = new ChartView(id, sig, this); + chart->updateSeries(display_range); + QObject::connect(chart, &ChartView::remove, [=]() { removeChart(chart); }); + QObject::connect(chart, &ChartView::zoomIn, this, &ChartsWidget::zoomIn); + QObject::connect(chart, &ChartView::zoomReset, this, &ChartsWidget::zoomReset); charts_layout->insertWidget(0, chart); charts.push_back(chart); emit chartOpened(chart->id, chart->signal); @@ -168,7 +167,7 @@ bool ChartsWidget::isChartOpened(const QString &id, const Signal *sig) { return it != charts.end(); } -void ChartsWidget::removeChart(ChartWidget *chart) { +void ChartsWidget::removeChart(ChartView *chart) { charts.removeOne(chart); chart->deleteLater(); updateTitleBar(); @@ -184,8 +183,8 @@ void ChartsWidget::signalUpdated(const Signal *sig) { for (auto c : charts) { if (c->signal == sig) { c->updateTitle(); - c->chart_view->updateSeries(display_range); - c->chart_view->setRange(display_range.first, display_range.second, true); + c->updateSeries(display_range); + c->setRange(display_range.first, display_range.second, true); } } } @@ -198,54 +197,6 @@ bool ChartsWidget::eventFilter(QObject *obj, QEvent *event) { return false; } -// ChartWidget - -ChartWidget::ChartWidget(const QString &id, const Signal *sig, QWidget *parent) : id(id), signal(sig), QWidget(parent) { - QVBoxLayout *main_layout = new QVBoxLayout(this); - main_layout->setSpacing(0); - main_layout->setContentsMargins(0, 0, 0, 0); - - header = new QWidget(this); - QGridLayout *header_layout = new QGridLayout(header); - header_layout->setContentsMargins(11, 11, 11, 0); - msg_name_label = new QLabel(this); - msg_name_label->setTextFormat(Qt::RichText); - header_layout->addWidget(msg_name_label, 0, 0, Qt::AlignLeft); - sig_name_label = new QLabel(this); - header_layout->addWidget(sig_name_label, 0, 1, Qt::AlignCenter); //, 0, Qt::AlignCenter); - - remove_btn = new QPushButton("✖", this); - remove_btn->setFixedSize(20, 20); - remove_btn->setToolTip(tr("Remove chart")); - header_layout->addWidget(remove_btn, 0, 2, Qt::AlignRight); - main_layout->addWidget(header); - - chart_view = new ChartView(id, sig, this); - main_layout->addWidget(chart_view); - main_layout->addStretch(); - - setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); - updateTitle(); - updateFromSettings(); - - QObject::connect(remove_btn, &QPushButton::clicked, [=]() { emit remove(id, sig); }); - QObject::connect(&settings, &Settings::changed, this, &ChartWidget::updateFromSettings); -} - -void ChartWidget::updateTitle() { - msg_name_label->setText(tr("%1 %2").arg(dbc()->msg(id)->name.c_str()).arg(id)); - sig_name_label->setText(signal->name.c_str()); -} - -void ChartWidget::updateFromSettings() { - header->setStyleSheet(settings.chart_theme == 0 ? "background-color:white" : "background-color:#23242c"); - QString color_style = settings.chart_theme == 0 ? "color:black" : "color:white"; - sig_name_label->setStyleSheet("font-weight:bold;" + color_style); - msg_name_label->setStyleSheet(color_style); - remove_btn->setStyleSheet(color_style); - chart_view->updateFromSettings(); -} - // ChartView ChartView::ChartView(const QString &id, const Signal *sig, QWidget *parent) @@ -256,7 +207,6 @@ ChartView::ChartView(const QString &id, const Signal *sig, QWidget *parent) chart->addSeries(series); chart->createDefaultAxes(); chart->legend()->hide(); - chart->setMargins({0, 0, 0, 0}); chart->layout()->setContentsMargins(0, 0, 0, 0); line_marker = new QGraphicsLineItem(chart); @@ -270,26 +220,51 @@ ChartView::ChartView(const QString &id, const Signal *sig, QWidget *parent) item_group = scene()->createItemGroup({track_line, track_ellipse, value_text}); item_group->setZValue(chart->zValue() + 10); - setChart(chart); + // title + msg_title = new QGraphicsTextItem(chart); + QToolButton *remove_btn = new QToolButton(); + remove_btn->setText("X"); + remove_btn->setAutoRaise(true); + remove_btn->setToolTip(tr("Remove Chart")); + close_btn_proxy = new QGraphicsProxyWidget(chart); + close_btn_proxy->setWidget(remove_btn); + setChart(chart); setRenderHint(QPainter::Antialiasing); setRubberBand(QChartView::HorizontalRubberBand); + updateFromSettings(); + updateTitle(); QTimer *timer = new QTimer(this); timer->setInterval(100); timer->setSingleShot(true); timer->callOnTimeout(this, &ChartView::adjustChartMargins); + QObject::connect(&settings, &Settings::changed, this, &ChartView::updateFromSettings); + QObject::connect(remove_btn, &QToolButton::clicked, [=]() { emit remove(id, sig); }); QObject::connect(chart, &QChart::plotAreaChanged, [=](const QRectF &plotArea) { // use a singleshot timer to avoid recursion call. timer->start(); }); } +void ChartView::resizeEvent(QResizeEvent *event) { + QChartView::resizeEvent(event); + msg_title->setPos(11, 6); + close_btn_proxy->setPos(event->size().width() - close_btn_proxy->size().width() - 11, 8); +} + +void ChartView::updateTitle() { + chart()->setTitle(signal->name.c_str()); + msg_title->setHtml(tr("%1 %2").arg(dbc()->msg(id)->name.c_str()).arg(id)); +} + void ChartView::updateFromSettings() { setFixedHeight(settings.chart_height); chart()->setTheme(settings.chart_theme == 0 ? QChart::ChartThemeLight : QChart::QChart::ChartThemeDark); - line_marker->setPen(QPen(settings.chart_theme == 0 ? Qt::black : Qt::white, 2)); + auto color = chart()->titleBrush().color(); + line_marker->setPen(QPen(color, 2)); + msg_title->setDefaultTextColor(color); } void ChartView::setRange(double min, double max, bool force_update) { @@ -305,7 +280,7 @@ void ChartView::adjustChartMargins() { const int aligned_pos = 60; if (chart()->plotArea().left() != aligned_pos) { const float left_margin = chart()->margins().left() + aligned_pos - chart()->plotArea().left(); - chart()->setMargins(QMargins(left_margin, 0, 0, 0)); + chart()->setMargins(QMargins(left_margin, 11, 0, 0)); } } @@ -314,7 +289,7 @@ void ChartView::updateLineMarker(double current_sec) { int x = chart()->plotArea().left() + chart()->plotArea().width() * (current_sec - axis_x->min()) / (axis_x->max() - axis_x->min()); if (int(line_marker->line().x1()) != x) { - line_marker->setLine(x, 0, x, height()); + line_marker->setLine(x, chart()->plotArea().top() - chart()->margins().top() + 3, x, height()); } } @@ -402,7 +377,7 @@ void ChartView::mouseMoveEvent(QMouseEvent *ev) { if (!is_zooming) { const auto plot_area = chart()->plotArea(); auto axis_x = dynamic_cast(chart()->axisX()); - double x = std::clamp((double)ev->pos().x(), plot_area.left(), plot_area.right()-1); + double x = std::clamp((double)ev->pos().x(), plot_area.left(), plot_area.right() - 1); double sec = axis_x->min() + (axis_x->max() - axis_x->min()) * (x - plot_area.left()) / plot_area.width(); auto value = std::upper_bound(vals.begin(), vals.end(), sec, [](double x, auto &p) { return x < p.x(); }); if (value != vals.end()) { diff --git a/tools/cabana/chartswidget.h b/tools/cabana/chartswidget.h index 70e0774c3e..4d33e91cb9 100644 --- a/tools/cabana/chartswidget.h +++ b/tools/cabana/chartswidget.h @@ -1,10 +1,9 @@ #pragma once -#include - #include #include #include +#include #include #include #include @@ -24,48 +23,31 @@ public: void setRange(double min, double max, bool force_update = false); void updateLineMarker(double current_sec); void updateFromSettings(); + void updateTitle(); + + QString id; + const Signal *signal; signals: void zoomIn(double min, double max); void zoomReset(); + void remove(const QString &msg_id, const Signal *sig); private: void mouseReleaseEvent(QMouseEvent *event) override; void mouseMoveEvent(QMouseEvent *ev) override; void leaveEvent(QEvent *event) override; + void resizeEvent(QResizeEvent *event) override; void adjustChartMargins(); void updateAxisY(); QGraphicsItemGroup *item_group; - QGraphicsLineItem *track_line; + QGraphicsLineItem *line_marker, *track_line; QGraphicsEllipseItem *track_ellipse; - QGraphicsTextItem *value_text; - QGraphicsLineItem *line_marker; + QGraphicsTextItem *value_text, *msg_title; + QGraphicsProxyWidget *close_btn_proxy; QVector vals; - QString id; - const Signal *signal; -}; - -class ChartWidget : public QWidget { -Q_OBJECT - -public: - ChartWidget(const QString &id, const Signal *sig, QWidget *parent); - void updateTitle(); - void updateFromSettings(); - -signals: - void remove(const QString &msg_id, const Signal *sig); - -public: - QString id; - const Signal *signal; - QWidget *header; - QLabel *msg_name_label; - QLabel *sig_name_label; - QPushButton *remove_btn; - ChartView *chart_view = nullptr; -}; + }; class ChartsWidget : public QWidget { Q_OBJECT @@ -73,7 +55,7 @@ class ChartsWidget : public QWidget { public: ChartsWidget(QWidget *parent = nullptr); void showChart(const QString &id, const Signal *sig, bool show); - void removeChart(ChartWidget *chart); + void removeChart(ChartView *chart); bool isChartOpened(const QString &id, const Signal *sig); signals: @@ -100,8 +82,7 @@ private: QPushButton *reset_zoom_btn; QPushButton *remove_all_btn; QVBoxLayout *charts_layout; - QList charts; - + QList charts; bool is_zoomed = false; std::pair event_range; std::pair display_range; From cdcc0fb3695d75e781053f9feda6b6b91a08ea86 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Mon, 7 Nov 2022 03:06:10 +0800 Subject: [PATCH 038/184] Cabana: Reimplement HistoryLog::sizeHintForColumn to improve performance (#26393) Reimplement sizeHintForColumn to improve performance --- tools/cabana/historylog.cc | 6 +++++- tools/cabana/historylog.h | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/cabana/historylog.cc b/tools/cabana/historylog.cc index 7bb2f37699..4b1818cf68 100644 --- a/tools/cabana/historylog.cc +++ b/tools/cabana/historylog.cc @@ -1,7 +1,6 @@ #include "tools/cabana/historylog.h" #include -#include // HistoryLogModel @@ -89,3 +88,8 @@ HistoryLog::HistoryLog(QWidget *parent) : QTableView(parent) { setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); setStyleSheet("QTableView::item { border:0px; padding-left:5px; padding-right:5px; }"); } + +int HistoryLog::sizeHintForColumn(int column) const { + // sizeHintForColumn is only called for column 0 (ResizeToContents) + return itemDelegate()->sizeHint(viewOptions(), model->index(0, 0)).width() + 1; // +1 for grid +} diff --git a/tools/cabana/historylog.h b/tools/cabana/historylog.h index e1c1319166..e8b0f5a35b 100644 --- a/tools/cabana/historylog.h +++ b/tools/cabana/historylog.h @@ -9,7 +9,7 @@ class HeaderView : public QHeaderView { public: HeaderView(Qt::Orientation orientation, QWidget *parent = nullptr) : QHeaderView(orientation, parent) {} - QSize sectionSizeFromContents(int logicalIndex) const; + QSize sectionSizeFromContents(int logicalIndex) const override; }; class HistoryLogModel : public QAbstractTableModel { @@ -40,5 +40,6 @@ public: void setMessage(const QString &message_id) { model->setMessage(message_id); } void updateState() { model->updateState(); } private: + int sizeHintForColumn(int column) const override; HistoryLogModel *model; }; From 45891c79079ae4404b8828d9bcfe5cd79bce0c90 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Mon, 7 Nov 2022 03:06:42 +0800 Subject: [PATCH 039/184] Cabana: use QToolBar to manage the controls in ChartsView (#26388) use QToolBar --- tools/cabana/chartswidget.cc | 73 +++++++++++++----------------------- tools/cabana/chartswidget.h | 9 ++--- 2 files changed, 30 insertions(+), 52 deletions(-) diff --git a/tools/cabana/chartswidget.cc b/tools/cabana/chartswidget.cc index 9a8d95633c..b4d6d89e6d 100644 --- a/tools/cabana/chartswidget.cc +++ b/tools/cabana/chartswidget.cc @@ -8,47 +8,31 @@ #include #include #include +#include // ChartsWidget ChartsWidget::ChartsWidget(QWidget *parent) : QWidget(parent) { QVBoxLayout *main_layout = new QVBoxLayout(this); - // title bar - title_bar = new QWidget(this); - title_bar->setVisible(false); - QHBoxLayout *title_layout = new QHBoxLayout(title_bar); - title_layout->setContentsMargins(0, 0, 0, 0); - title_label = new QLabel(tr("Charts")); - - title_layout->addWidget(title_label); - title_layout->addStretch(); - - range_label = new QLabel(); - title_layout->addWidget(range_label); - - reset_zoom_btn = new QPushButton("⟲", this); - reset_zoom_btn->setFixedSize(30, 30); + // toolbar + QToolBar *toolbar = new QToolBar(tr("Charts"), this); + title_label = new QLabel(); + title_label->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred); + toolbar->addWidget(title_label); + toolbar->addWidget(range_label = new QLabel()); + reset_zoom_btn = toolbar->addAction("⟲"); reset_zoom_btn->setToolTip(tr("Reset zoom (drag on chart to zoom X-Axis)")); - title_layout->addWidget(reset_zoom_btn); - - remove_all_btn = new QPushButton("✖", this); + remove_all_btn = toolbar->addAction("✖"); remove_all_btn->setToolTip(tr("Remove all charts")); - remove_all_btn->setFixedSize(30, 30); - title_layout->addWidget(remove_all_btn); - - dock_btn = new QPushButton(); - dock_btn->setFixedSize(30, 30); - title_layout->addWidget(dock_btn); - - main_layout->addWidget(title_bar, 0, Qt::AlignTop); + dock_btn = toolbar->addAction(""); + main_layout->addWidget(toolbar); + updateToolBar(); // charts QWidget *charts_container = new QWidget(this); - QVBoxLayout *charts_main = new QVBoxLayout(charts_container); - charts_layout = new QVBoxLayout(); - charts_main->addLayout(charts_layout); - charts_main->addStretch(); + charts_layout = new QVBoxLayout(charts_container); + charts_layout->addStretch(); QScrollArea *charts_scroll = new QScrollArea(this); charts_scroll->setWidgetResizable(true); @@ -67,12 +51,12 @@ ChartsWidget::ChartsWidget(QWidget *parent) : QWidget(parent) { }); QObject::connect(can, &CANMessages::eventsMerged, this, &ChartsWidget::eventsMerged); QObject::connect(can, &CANMessages::updated, this, &ChartsWidget::updateState); - QObject::connect(remove_all_btn, &QPushButton::clicked, [this]() { removeAll(); }); - QObject::connect(reset_zoom_btn, &QPushButton::clicked, this, &ChartsWidget::zoomReset); - QObject::connect(dock_btn, &QPushButton::clicked, [this]() { + QObject::connect(remove_all_btn, &QAction::triggered, [this]() { removeAll(); }); + QObject::connect(reset_zoom_btn, &QAction::triggered, this, &ChartsWidget::zoomReset); + QObject::connect(dock_btn, &QAction::triggered, [this]() { emit dock(!docking); docking = !docking; - updateTitleBar(); + updateToolBar(); }); } @@ -91,7 +75,7 @@ void ChartsWidget::eventsMerged() { void ChartsWidget::zoomIn(double min, double max) { zoomed_range = {min, max}; is_zoomed = zoomed_range != display_range; - updateTitleBar(); + updateToolBar(); emit rangeChanged(min, max, is_zoomed); updateState(); } @@ -130,16 +114,11 @@ void ChartsWidget::updateState() { } } -void ChartsWidget::updateTitleBar() { - title_bar->setVisible(!charts.isEmpty()); - if (charts.isEmpty()) return; - - range_label->setVisible(is_zoomed); +void ChartsWidget::updateToolBar() { + remove_all_btn->setEnabled(!charts.isEmpty()); reset_zoom_btn->setEnabled(is_zoomed); - if (is_zoomed) { - range_label->setText(tr("%1 - %2").arg(zoomed_range.first, 0, 'f', 2).arg(zoomed_range.second, 0, 'f', 2)); - } - title_label->setText(tr("Charts (%1)").arg(charts.size())); + range_label->setText(is_zoomed ? tr("%1 - %2").arg(zoomed_range.first, 0, 'f', 2).arg(zoomed_range.second, 0, 'f', 2) : ""); + title_label->setText(charts.size() > 0 ? tr("Charts (%1)").arg(charts.size()) : tr("Charts")); dock_btn->setText(docking ? "⬈" : "⬋"); dock_btn->setToolTip(docking ? tr("Undock charts") : tr("Dock charts")); } @@ -159,7 +138,7 @@ void ChartsWidget::showChart(const QString &id, const Signal *sig, bool show) { emit chartOpened(chart->id, chart->signal); updateState(); } - updateTitleBar(); + updateToolBar(); } bool ChartsWidget::isChartOpened(const QString &id, const Signal *sig) { @@ -170,7 +149,7 @@ bool ChartsWidget::isChartOpened(const QString &id, const Signal *sig) { void ChartsWidget::removeChart(ChartView *chart) { charts.removeOne(chart); chart->deleteLater(); - updateTitleBar(); + updateToolBar(); emit chartClosed(chart->id, chart->signal); } @@ -191,7 +170,7 @@ void ChartsWidget::signalUpdated(const Signal *sig) { bool ChartsWidget::eventFilter(QObject *obj, QEvent *event) { if (obj != this && event->type() == QEvent::Close) { - emit dock_btn->clicked(); + emit dock_btn->triggered(); return true; } return false; diff --git a/tools/cabana/chartswidget.h b/tools/cabana/chartswidget.h index 4d33e91cb9..e32a6697ce 100644 --- a/tools/cabana/chartswidget.h +++ b/tools/cabana/chartswidget.h @@ -70,17 +70,16 @@ private: void zoomIn(double min, double max); void zoomReset(); void signalUpdated(const Signal *sig); - void updateTitleBar(); + void updateToolBar(); void removeAll(const Signal *sig = nullptr); bool eventFilter(QObject *obj, QEvent *event) override; - QWidget *title_bar; QLabel *title_label; QLabel *range_label; bool docking = true; - QPushButton *dock_btn; - QPushButton *reset_zoom_btn; - QPushButton *remove_all_btn; + QAction *dock_btn; + QAction *reset_zoom_btn; + QAction *remove_all_btn; QVBoxLayout *charts_layout; QList charts; bool is_zoomed = false; From 253e5d7f9d7741e61f010f2ffd6b82a2e908019a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Sch=C3=A4fer?= Date: Sun, 6 Nov 2022 12:17:07 -0800 Subject: [PATCH 040/184] FCW: less false positives (#26366) * Less FP for FCW * enable fcw for e2e long --- selfdrive/controls/lib/longitudinal_mpc_lib/long_mpc.py | 5 +++-- selfdrive/controls/lib/longitudinal_planner.py | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/selfdrive/controls/lib/longitudinal_mpc_lib/long_mpc.py b/selfdrive/controls/lib/longitudinal_mpc_lib/long_mpc.py index 49eb5988e2..080782ad0f 100644 --- a/selfdrive/controls/lib/longitudinal_mpc_lib/long_mpc.py +++ b/selfdrive/controls/lib/longitudinal_mpc_lib/long_mpc.py @@ -36,7 +36,7 @@ A_EGO_COST = 0. J_EGO_COST = 5.0 A_CHANGE_COST = 200. DANGER_ZONE_COST = 100. -CRASH_DISTANCE = .5 +CRASH_DISTANCE = .25 LEAD_DANGER_FACTOR = 0.75 LIMIT_COST = 1e6 ACADOS_SOLVER_TYPE = 'SQP_RTI' @@ -49,6 +49,7 @@ MAX_T = 10.0 T_IDXS_LST = [index_function(idx, max_val=MAX_T, max_idx=N) for idx in range(N+1)] T_IDXS = np.array(T_IDXS_LST) +FCW_IDXS = T_IDXS < 5.0 T_DIFFS = np.diff(T_IDXS, prepend=[0.]) MIN_ACCEL = -3.5 MAX_ACCEL = 2.0 @@ -369,7 +370,7 @@ class LongitudinalMpc: self.params[:,4] = T_FOLLOW self.run() - if (np.any(lead_xv_0[:,0] - self.x_sol[:,0] < CRASH_DISTANCE) and + if (np.any(lead_xv_0[FCW_IDXS,0] - self.x_sol[FCW_IDXS,0] < CRASH_DISTANCE) and radarstate.leadOne.modelProb > 0.9): self.crash_cnt += 1 else: diff --git a/selfdrive/controls/lib/longitudinal_planner.py b/selfdrive/controls/lib/longitudinal_planner.py index 457065d3b5..5a336d18c9 100755 --- a/selfdrive/controls/lib/longitudinal_planner.py +++ b/selfdrive/controls/lib/longitudinal_planner.py @@ -132,8 +132,7 @@ class LongitudinalPlanner: self.j_desired_trajectory = np.interp(T_IDXS[:CONTROL_N], T_IDXS_MPC[:-1], self.mpc.j_solution) # TODO counter is only needed because radar is glitchy, remove once radar is gone - # TODO write fcw in e2e_long mode - self.fcw = self.mpc.mode == 'acc' and self.mpc.crash_cnt > 5 and not sm['carState'].standstill + self.fcw = self.mpc.crash_cnt > 2 and not sm['carState'].standstill if self.fcw: cloudlog.info("FCW triggered") From 1cf293f3a6c02bb44af9ef1e715b005104de1bc1 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Mon, 7 Nov 2022 23:53:42 +0800 Subject: [PATCH 041/184] Cabana: improve message sorting,filtering and updating. (#26396) * optimize sort/filter/update * helper function msgName * cleanup --- tools/cabana/canmessages.cc | 3 +- tools/cabana/canmessages.h | 1 + tools/cabana/dbcmanager.h | 5 +- tools/cabana/detailwidget.cc | 7 +-- tools/cabana/messageswidget.cc | 108 +++++++++++++-------------------- tools/cabana/messageswidget.h | 13 ++-- 6 files changed, 56 insertions(+), 81 deletions(-) diff --git a/tools/cabana/canmessages.cc b/tools/cabana/canmessages.cc index f1f5c2cd23..e670ee8c94 100644 --- a/tools/cabana/canmessages.cc +++ b/tools/cabana/canmessages.cc @@ -62,8 +62,9 @@ void CANMessages::process(QHash *messages) { for (auto it = messages->begin(); it != messages->end(); ++it) { can_msgs[it.key()] = it.value(); } - delete messages; emit updated(); + emit msgsReceived(messages); + delete messages; } bool CANMessages::eventFilter(const Event *event) { diff --git a/tools/cabana/canmessages.h b/tools/cabana/canmessages.h index 14e2423d01..5ee33bce0d 100644 --- a/tools/cabana/canmessages.h +++ b/tools/cabana/canmessages.h @@ -50,6 +50,7 @@ signals: void streamStarted(); void eventsMerged(); void updated(); + void msgsReceived(const QHash *); void received(QHash *); public: diff --git a/tools/cabana/dbcmanager.h b/tools/cabana/dbcmanager.h index d8a8da9b7a..cbe4531d2a 100644 --- a/tools/cabana/dbcmanager.h +++ b/tools/cabana/dbcmanager.h @@ -48,5 +48,8 @@ int bigEndianStartBitsIndex(int start_bit); int bigEndianBitIndex(int index); void updateSigSizeParamsFromRange(Signal &s, int from, int to); std::pair getSignalRange(const Signal *s); - DBCManager *dbc(); +inline QString msgName(const QString &id, const char *def = "untitled") { + auto msg = dbc()->msg(id); + return msg ? msg->name.c_str() : def; +} diff --git a/tools/cabana/detailwidget.cc b/tools/cabana/detailwidget.cc index db731333d3..18510c86ea 100644 --- a/tools/cabana/detailwidget.cc +++ b/tools/cabana/detailwidget.cc @@ -132,8 +132,7 @@ void DetailWidget::setMessage(const QString &message_id) { } if (index == -1) { index = tabbar->addTab(message_id); - auto msg = dbc()->msg(message_id); - tabbar->setTabToolTip(index, msg ? msg->name.c_str() : "untitled"); + tabbar->setTabToolTip(index, msgName(message_id)); } tabbar->setCurrentIndex(index); msg_id = message_id; @@ -173,7 +172,7 @@ void DetailWidget::dbcMsgChanged(int show_form_idx) { } edit_btn->setVisible(true); - name_label->setText(msg ? msg->name.c_str() : "untitled"); + name_label->setText(msgName(msg_id)); binary_view->setMessage(msg_id); history_log->setMessage(msg_id); @@ -212,7 +211,7 @@ void DetailWidget::updateChartState(const QString &id, const Signal *sig, bool o void DetailWidget::editMsg() { auto msg = dbc()->msg(msg_id); - QString name = msg ? msg->name.c_str() : "untitled"; + QString name = msgName(msg_id); int size = msg ? msg->size : can->lastMessage(msg_id).dat.size(); EditMessageDialog dlg(msg_id, name, size, this); if (dlg.exec()) { diff --git a/tools/cabana/messageswidget.cc b/tools/cabana/messageswidget.cc index b2e8e50b55..f24b6b0317 100644 --- a/tools/cabana/messageswidget.cc +++ b/tools/cabana/messageswidget.cc @@ -35,13 +35,19 @@ MessagesWidget::MessagesWidget(QWidget *parent) : QWidget(parent) { // signals/slots QObject::connect(filter, &QLineEdit::textChanged, model, &MessageListModel::setFilterString); - QObject::connect(can, &CANMessages::updated, [this]() { model->updateState(); }); - QObject::connect(dbc(), &DBCManager::DBCFileChanged, [this]() { model->updateState(true); }); + QObject::connect(can, &CANMessages::msgsReceived, model, &MessageListModel::msgsReceived); + QObject::connect(dbc(), &DBCManager::DBCFileChanged, model, &MessageListModel::sortMessages); + QObject::connect(dbc(), &DBCManager::msgUpdated, model, &MessageListModel::sortMessages); QObject::connect(table_widget->selectionModel(), &QItemSelectionModel::currentChanged, [=](const QModelIndex ¤t, const QModelIndex &previous) { - if (current.isValid()) { - emit msgSelectionChanged(current.data(Qt::UserRole).toString()); + if (current.isValid() && current.row() < model->msgs.size()) { + current_msg_id = model->msgs[current.row()]; + emit msgSelectionChanged(current_msg_id); } }); + QObject::connect(model, &MessageListModel::modelReset, [this]() { + if (int row = model->msgs.indexOf(current_msg_id); row != -1) + table_widget->selectionModel()->select(model->index(row, 0), QItemSelectionModel::Rows | QItemSelectionModel::ClearAndSelect); + }); } // MessageListModel @@ -54,103 +60,71 @@ QVariant MessageListModel::headerData(int section, Qt::Orientation orientation, QVariant MessageListModel::data(const QModelIndex &index, int role) const { if (role == Qt::DisplayRole) { - const auto &m = msgs[index.row()]; - auto &can_data = can->lastMessage(m->id); + const auto &id = msgs[index.row()]; + auto &can_data = can->lastMessage(id); switch (index.column()) { - case 0: return m->name; - case 1: return m->id; + case 0: return msgName(id); + case 1: return id; case 2: return can_data.freq; case 3: return can_data.count; case 4: return toHex(can_data.dat); } - } else if (role == Qt::UserRole) { - return msgs[index.row()]->id; - } else if (role == Qt::FontRole) { - if (index.column() == columnCount() - 1) { - return QFontDatabase::systemFont(QFontDatabase::FixedFont); - } + } else if (role == Qt::FontRole && index.column() == columnCount() - 1) { + return QFontDatabase::systemFont(QFontDatabase::FixedFont); } return {}; } -void MessageListModel::setFilterString(const QString &string) { +void MessageListModel::setFilterString(const QString &string) { filter_str = string; - updateState(true); -} - -bool MessageListModel::updateMessages(bool sort) { - if (msgs.size() == can->can_msgs.size() && filter_str.isEmpty() && !sort) - return false; - - // update message list - int i = 0; bool search_id = filter_str.contains(':'); + msgs.clear(); for (auto it = can->can_msgs.begin(); it != can->can_msgs.end(); ++it) { - const Msg *msg = dbc()->msg(it.key()); - QString msg_name = msg ? msg->name.c_str() : "untitled"; - if (!filter_str.isEmpty() && !(search_id ? it.key() : msg_name).contains(filter_str, Qt::CaseInsensitive)) - continue; - auto &m = i < msgs.size() ? msgs[i] : msgs.emplace_back(new Message); - m->id = it.key(); - m->name = msg_name; - ++i; + if ((search_id ? it.key() : msgName(it.key())).contains(filter_str, Qt::CaseInsensitive)) + msgs.push_back(it.key()); } - msgs.resize(i); + sortMessages(); +} +void MessageListModel::sortMessages() { + beginResetModel(); if (sort_column == 0) { std::sort(msgs.begin(), msgs.end(), [this](auto &l, auto &r) { - bool ret = l->name < r->name || (l->name == r->name && l->id < r->id); + bool ret = std::pair{msgName(l), l} < std::pair{msgName(r), r}; return sort_order == Qt::AscendingOrder ? ret : !ret; }); } else if (sort_column == 1) { std::sort(msgs.begin(), msgs.end(), [this](auto &l, auto &r) { - return sort_order == Qt::AscendingOrder ? l->id < r->id : l->id > r->id; + return sort_order == Qt::AscendingOrder ? l < r : l > r; }); } else if (sort_column == 2) { - // sort by frequency std::sort(msgs.begin(), msgs.end(), [this](auto &l, auto &r) { - uint32_t lfreq = can->lastMessage(l->id).freq; - uint32_t rfreq = can->lastMessage(r->id).freq; - bool ret = lfreq < rfreq || (lfreq == rfreq && l->id < r->id); + bool ret = std::pair{can->lastMessage(l).freq, l} < std::pair{can->lastMessage(r).freq, r}; return sort_order == Qt::AscendingOrder ? ret : !ret; }); } else if (sort_column == 3) { - // sort by count std::sort(msgs.begin(), msgs.end(), [this](auto &l, auto &r) { - uint32_t lcount = can->lastMessage(l->id).count; - uint32_t rcount = can->lastMessage(r->id).count; - bool ret = lcount < rcount || (lcount == rcount && l->id < r->id); + bool ret = std::pair{can->lastMessage(l).count, l} < std::pair{can->lastMessage(r).count, r}; return sort_order == Qt::AscendingOrder ? ret : !ret; }); } - return true; + endResetModel(); } -void MessageListModel::updateState(bool sort) { +void MessageListModel::msgsReceived(const QHash *new_msgs) { int prev_row_count = msgs.size(); - auto prev_idx = persistentIndexList(); - QString selected_msg_id = prev_idx.empty() ? "" : prev_idx[0].data(Qt::UserRole).toString(); - - bool msg_updated = updateMessages(sort); - int delta = msgs.size() - prev_row_count; - if (delta > 0) { - beginInsertRows({}, prev_row_count, msgs.size() - 1); - endInsertRows(); - } else if (delta < 0) { - beginRemoveRows({}, msgs.size(), prev_row_count - 1); - endRemoveRows(); + if (filter_str.isEmpty() && msgs.size() != can->can_msgs.size()) { + msgs = can->can_msgs.keys(); } - - if (!msgs.empty()) { - if (msg_updated && !prev_idx.isEmpty()) { - // keep selection - auto it = std::find_if(msgs.begin(), msgs.end(), [&](auto &m) { return m->id == selected_msg_id; }); - if (it != msgs.end()) { - for (auto &idx : prev_idx) - changePersistentIndex(idx, index(std::distance(msgs.begin(), it), idx.column())); - } + if (msgs.size() != prev_row_count) { + sortMessages(); + return; + } + for (int i = 0; i < msgs.size(); ++i) { + if (new_msgs->contains(msgs[i])) { + for (int col = 2; col < columnCount(); ++col) + emit dataChanged(index(i, col), index(i, col), {Qt::DisplayRole}); } - emit dataChanged(index(0, 0), index(msgs.size() - 1, columnCount() - 1), {Qt::DisplayRole}); } } @@ -158,6 +132,6 @@ void MessageListModel::sort(int column, Qt::SortOrder order) { if (column != columnCount() - 1) { sort_column = column; sort_order = order; - updateState(true); + sortMessages(); } } diff --git a/tools/cabana/messageswidget.h b/tools/cabana/messageswidget.h index 450c7003b7..3a42bed4be 100644 --- a/tools/cabana/messageswidget.h +++ b/tools/cabana/messageswidget.h @@ -4,6 +4,7 @@ #include #include "tools/cabana/canmessages.h" + class MessageListModel : public QAbstractTableModel { Q_OBJECT @@ -14,16 +15,12 @@ public: QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override { return msgs.size(); } void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override; - void updateState(bool sort = false); void setFilterString(const QString &string); + void msgsReceived(const QHash *new_msgs = nullptr); + void sortMessages(); + QStringList msgs; private: - bool updateMessages(bool sort); - - struct Message { - QString id, name; - }; - std::vector> msgs; QString filter_str; int sort_column = 0; Qt::SortOrder sort_order = Qt::AscendingOrder; @@ -34,11 +31,11 @@ class MessagesWidget : public QWidget { public: MessagesWidget(QWidget *parent); - signals: void msgSelectionChanged(const QString &message_id); protected: QTableView *table_widget; + QString current_msg_id; MessageListModel *model; }; From 1fe45ab3c5bae9983c11a82fed04167802f75b36 Mon Sep 17 00:00:00 2001 From: Alen <3875050+alenl2@users.noreply.github.com> Date: Mon, 7 Nov 2022 23:07:40 +0100 Subject: [PATCH 042/184] Kia EV6: Add EU fwdCamera firmware (#26398) --- selfdrive/car/hyundai/values.py | 1 + 1 file changed, 1 insertion(+) diff --git a/selfdrive/car/hyundai/values.py b/selfdrive/car/hyundai/values.py index 536af7cf01..972aad0c90 100644 --- a/selfdrive/car/hyundai/values.py +++ b/selfdrive/car/hyundai/values.py @@ -1374,6 +1374,7 @@ FW_VERSIONS = { b'\xf1\x00CV1 MFC AT USA LHD 1.00 1.05 99210-CV000 211027', b'\xf1\x00CV1 MFC AT USA LHD 1.00 1.06 99210-CV000 220328', b'\xf1\x00CV1 MFC AT EUR LHD 1.00 1.05 99210-CV000 211027', + b'\xf1\x00CV1 MFC AT EUR LHD 1.00 1.06 99210-CV000 220328', ], }, CAR.IONIQ_5: { From ed3bf4f12332556c6684141f1a8b2aed6b342ecc Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 7 Nov 2022 16:39:53 -0800 Subject: [PATCH 043/184] onroad ui: fix opacity affecting other drawn icons (#26378) * save painter in drawIcon * fix * Update selfdrive/ui/qt/onroad.cc --- selfdrive/ui/qt/onroad.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc index bfd2f44561..b4925c2f73 100644 --- a/selfdrive/ui/qt/onroad.cc +++ b/selfdrive/ui/qt/onroad.cc @@ -404,6 +404,7 @@ void AnnotatedCameraWidget::drawText(QPainter &p, int x, int y, const QString &t } void AnnotatedCameraWidget::drawIcon(QPainter &p, int x, int y, QPixmap &img, QBrush bg, float opacity) { + p.setOpacity(1.0); // bg dictates opacity of ellipse p.setPen(Qt::NoPen); p.setBrush(bg); p.drawEllipse(x - radius / 2, y - radius / 2, radius, radius); From ea813a9a7dd1457899d5c1fe5ac67449c674eb0f Mon Sep 17 00:00:00 2001 From: brownspaceman Date: Mon, 7 Nov 2022 16:48:54 -0800 Subject: [PATCH 044/184] Subaru: add missing engine FW for 2019 Impreza (#26385) added fw for 2019 subaru impreza --- selfdrive/car/subaru/values.py | 1 + 1 file changed, 1 insertion(+) diff --git a/selfdrive/car/subaru/values.py b/selfdrive/car/subaru/values.py index da5ff1785a..7a1e9a8a3d 100644 --- a/selfdrive/car/subaru/values.py +++ b/selfdrive/car/subaru/values.py @@ -196,6 +196,7 @@ FW_VERSIONS = { b'\xaa!dt\a', b'\xc5!ar\a', b'\xbe!as\a', + b'\xc5!as\x07', b'\xc5!ds\a', b'\xc5!`s\a', b'\xaa!au\a', From 1b6e37daa64c6fda8eaf0ade26d6d8c11274ef68 Mon Sep 17 00:00:00 2001 From: Jason Wen <47793918+sunnyhaibin@users.noreply.github.com> Date: Mon, 7 Nov 2022 19:51:32 -0500 Subject: [PATCH 045/184] Hyundai: update Ioniq 5 HDA I supported model years (#26376) * Hyundai: Add FW for 2023 Ioniq 5 HDA2 * Update values.py * Update CARS.md * Update values.py * Update CARS.md --- docs/CARS.md | 2 +- selfdrive/car/hyundai/values.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/CARS.md b/docs/CARS.md index c347868968..7066b94f61 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -60,7 +60,7 @@ A supported vehicle is one that just works when you install a comma three. All s |Hyundai|Genesis 2015-16|Smart Cruise Control (SCC)|Stock|19 mph|37 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai J| |Hyundai|i30 2019|Smart Cruise Control (SCC)|Stock|0 mph|32 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai E| |Hyundai|Ioniq 5 (with HDA II) 2022-23|Highway Driving Assist II|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai Q| -|Hyundai|Ioniq 5 (without HDA II) 2022|Highway Driving Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai K| +|Hyundai|Ioniq 5 (without HDA II) 2022-23|Highway Driving Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai K| |Hyundai|Ioniq Electric 2019|Smart Cruise Control (SCC)|Stock|0 mph|32 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai C| |Hyundai|Ioniq Electric 2020|All|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai H| |Hyundai|Ioniq Hybrid 2017-19|Smart Cruise Control (SCC)|Stock|0 mph|32 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai C| diff --git a/selfdrive/car/hyundai/values.py b/selfdrive/car/hyundai/values.py index 972aad0c90..4b2ef474b8 100644 --- a/selfdrive/car/hyundai/values.py +++ b/selfdrive/car/hyundai/values.py @@ -145,7 +145,7 @@ CAR_INFO: Dict[str, Optional[Union[HyundaiCarInfo, List[HyundaiCarInfo]]]] = { CAR.VELOSTER: HyundaiCarInfo("Hyundai Veloster 2019-20", min_enable_speed=5. * CV.MPH_TO_MS, harness=Harness.hyundai_e), CAR.SONATA_HYBRID: HyundaiCarInfo("Hyundai Sonata Hybrid 2020-22", "All", harness=Harness.hyundai_a), CAR.IONIQ_5: [ - HyundaiCarInfo("Hyundai Ioniq 5 (without HDA II) 2022" , "Highway Driving Assist", harness=Harness.hyundai_k), + HyundaiCarInfo("Hyundai Ioniq 5 (without HDA II) 2022-23" , "Highway Driving Assist", harness=Harness.hyundai_k), HyundaiCarInfo("Hyundai Ioniq 5 (with HDA II) 2022-23", "Highway Driving Assist II", harness=Harness.hyundai_q), ], CAR.TUCSON_HYBRID_4TH_GEN: HyundaiCarInfo("Hyundai Tucson Hybrid 2022", "All", harness=Harness.hyundai_n), From e9eb5d99ff659a3f5e1b4e0bead321c469d8d889 Mon Sep 17 00:00:00 2001 From: Vivek Aithal Date: Mon, 7 Nov 2022 17:01:24 -0800 Subject: [PATCH 046/184] [torqued] Fix high speed oscillations (#26338) * modify low speed factor during high speeds and rescale friction * update refs --- selfdrive/car/interfaces.py | 2 +- selfdrive/controls/lib/latcontrol_torque.py | 8 +++++--- selfdrive/test/process_replay/ref_commit | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/selfdrive/car/interfaces.py b/selfdrive/car/interfaces.py index 4647a04244..982ba40b17 100644 --- a/selfdrive/car/interfaces.py +++ b/selfdrive/car/interfaces.py @@ -23,7 +23,7 @@ TorqueFromLateralAccelCallbackType = Callable[[float, car.CarParams.LateralTorqu MAX_CTRL_SPEED = (V_CRUISE_MAX + 4) * CV.KPH_TO_MS ACCEL_MAX = 2.0 ACCEL_MIN = -3.5 -FRICTION_THRESHOLD = 0.2 +FRICTION_THRESHOLD = 0.3 TORQUE_PARAMS_PATH = os.path.join(BASEDIR, 'selfdrive/car/torque_data/params.yaml') TORQUE_OVERRIDE_PATH = os.path.join(BASEDIR, 'selfdrive/car/torque_data/override.yaml') diff --git a/selfdrive/controls/lib/latcontrol_torque.py b/selfdrive/controls/lib/latcontrol_torque.py index 51676086ba..d10d39d945 100644 --- a/selfdrive/controls/lib/latcontrol_torque.py +++ b/selfdrive/controls/lib/latcontrol_torque.py @@ -17,7 +17,8 @@ from selfdrive.controls.lib.vehicle_model import ACCELERATION_DUE_TO_GRAVITY # friction in the steering wheel that needs to be overcome to # move it at all, this is compensated for too. -LOW_SPEED_FACTOR = 200 +LOW_SPEED_X = [0, 10, 20, 30] +LOW_SPEED_Y = [15, 13, 10, 5] class LatControlTorque(LatControl): @@ -57,8 +58,9 @@ class LatControlTorque(LatControl): actual_lateral_accel = actual_curvature * CS.vEgo ** 2 lateral_accel_deadzone = curvature_deadzone * CS.vEgo ** 2 - setpoint = desired_lateral_accel + LOW_SPEED_FACTOR * desired_curvature - measurement = actual_lateral_accel + LOW_SPEED_FACTOR * actual_curvature + low_speed_factor = interp(CS.vEgo, LOW_SPEED_X, LOW_SPEED_Y)**2 + setpoint = desired_lateral_accel + low_speed_factor * desired_curvature + measurement = actual_lateral_accel + low_speed_factor * actual_curvature error = setpoint - measurement gravity_adjusted_lateral_accel = desired_lateral_accel - params.roll * ACCELERATION_DUE_TO_GRAVITY pid_log.error = self.torque_from_lateral_accel(error, self.torque_params, error, diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index 8bc13f37d4..0608a6d14b 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -24a8d02b148b7f6d20f641d56a7bed71c244b6e3 \ No newline at end of file +2991a54ea491633f93fae76da4f5f1d265ce311a \ No newline at end of file From f63f0de80a78ade6ad12fe98ea27094035d97457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Sch=C3=A4fer?= Date: Mon, 7 Nov 2022 17:49:36 -0800 Subject: [PATCH 047/184] E2e long model: calibrate model speed to wheel speed (#26395) * calibrate! * Fix test * Fix proc replay * check len * get v_ego from model 8501d20-bb59-4193-aa82-82b2737dedd6/449 609d90f3-65e6-4617-a60c-d6d99eead408/700 * bump cereal * initialize v_model_error * typo * better names * cleanup * bump cereal * update model replay ref commit * bump to cereal master Co-authored-by: Yassine Yousfi --- cereal | 2 +- selfdrive/controls/lib/longitudinal_planner.py | 12 ++++++++---- selfdrive/modeld/models/driving.cc | 11 +++++++++++ selfdrive/modeld/models/driving.h | 9 +++++++++ selfdrive/modeld/models/supercombo.onnx | 4 ++-- .../test/process_replay/model_replay_ref_commit | 2 +- 6 files changed, 32 insertions(+), 8 deletions(-) diff --git a/cereal b/cereal index 1d25fc3f20..cdba1aafec 160000 --- a/cereal +++ b/cereal @@ -1 +1 @@ -Subproject commit 1d25fc3f202d5ddeee97848480323e9b14f9bdfa +Subproject commit cdba1aafec5e36505ef6ace675568e1f15003c47 diff --git a/selfdrive/controls/lib/longitudinal_planner.py b/selfdrive/controls/lib/longitudinal_planner.py index 5a336d18c9..19ea40a8f4 100755 --- a/selfdrive/controls/lib/longitudinal_planner.py +++ b/selfdrive/controls/lib/longitudinal_planner.py @@ -58,6 +58,7 @@ class LongitudinalPlanner: self.a_desired = init_a self.v_desired_filter = FirstOrderFilter(init_v, 2.0, DT_MDL) + self.v_model_error = 0.0 self.v_desired_trajectory = np.zeros(CONTROL_N) self.a_desired_trajectory = np.zeros(CONTROL_N) @@ -68,12 +69,12 @@ class LongitudinalPlanner: e2e = self.params.get_bool('EndToEndLong') and self.CP.openpilotLongitudinalControl self.mpc.mode = 'blended' if e2e else 'acc' - def parse_model(self, model_msg): + def parse_model(self, model_msg, model_error): if (len(model_msg.position.x) == 33 and len(model_msg.velocity.x) == 33 and len(model_msg.acceleration.x) == 33): - x = np.interp(T_IDXS_MPC, T_IDXS, model_msg.position.x) - v = np.interp(T_IDXS_MPC, T_IDXS, model_msg.velocity.x) + x = np.interp(T_IDXS_MPC, T_IDXS, model_msg.position.x) - model_error * T_IDXS_MPC + v = np.interp(T_IDXS_MPC, T_IDXS, model_msg.velocity.x) - model_error a = np.interp(T_IDXS_MPC, T_IDXS, model_msg.acceleration.x) j = np.zeros(len(T_IDXS_MPC)) else: @@ -112,6 +113,9 @@ class LongitudinalPlanner: # Prevent divergence, smooth in current v_ego self.v_desired_filter.x = max(0.0, self.v_desired_filter.update(v_ego)) + # Compute model v_ego error + if len(sm['modelV2'].temporalPose.trans): + self.v_model_error = sm['modelV2'].temporalPose.trans[0] - v_ego if force_slow_decel: # if required so, force a smooth deceleration @@ -124,7 +128,7 @@ class LongitudinalPlanner: self.mpc.set_weights(prev_accel_constraint) self.mpc.set_accel_limits(accel_limits_turns[0], accel_limits_turns[1]) self.mpc.set_cur_state(self.v_desired_filter.x, self.a_desired) - x, v, a, j = self.parse_model(sm['modelV2']) + x, v, a, j = self.parse_model(sm['modelV2'], self.v_model_error) self.mpc.update(sm['carState'], sm['radarState'], v_cruise, x, v, a, j) self.v_desired_trajectory = np.interp(T_IDXS[:CONTROL_N], T_IDXS_MPC, self.mpc.v_solution) diff --git a/selfdrive/modeld/models/driving.cc b/selfdrive/modeld/models/driving.cc index cc4a83de62..4015731c42 100644 --- a/selfdrive/modeld/models/driving.cc +++ b/selfdrive/modeld/models/driving.cc @@ -337,6 +337,17 @@ void fill_model(cereal::ModelDataV2::Builder &framed, const ModelOutput &net_out for (int i=0; i Date: Mon, 7 Nov 2022 18:25:39 -0800 Subject: [PATCH 048/184] [controlsd] Revert Rav4 TSS2 to PID control (#26403) * revert rav4 tss2 to pid control * Update interface.py --- selfdrive/car/toyota/interface.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/selfdrive/car/toyota/interface.py b/selfdrive/car/toyota/interface.py index 02e4caa9d6..6c360fc2c7 100644 --- a/selfdrive/car/toyota/interface.py +++ b/selfdrive/car/toyota/interface.py @@ -110,6 +110,19 @@ class CarInterface(CarInterfaceBase): ret.steerRatio = 14.3 tire_stiffness_factor = 0.7933 ret.mass = 3585. * CV.LB_TO_KG + STD_CARGO_KG # Average between ICE and Hybrid + ret.lateralTuning.init('pid') + ret.lateralTuning.pid.kpV = [0.6] + ret.lateralTuning.pid.kiV = [0.1] + ret.lateralTuning.pid.kf = 0.00007818594 + + # 2019+ RAV4 TSS2 uses two different steering racks and specific tuning seems to be necessary. + # See https://github.com/commaai/openpilot/pull/21429#issuecomment-873652891 + for fw in car_fw: + if fw.ecu == "eps" and (fw.fwVersion.startswith(b'\x02') or fw.fwVersion in [b'8965B42181\x00\x00\x00\x00\x00\x00']): + ret.lateralTuning.pid.kpV = [0.15] + ret.lateralTuning.pid.kiV = [0.05] + ret.lateralTuning.pid.kf = 0.00004 + break elif candidate in (CAR.COROLLA_TSS2, CAR.COROLLAH_TSS2): stop_and_go = True From e971bb11c2170d8d6d66f430741d7234a77a0499 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 7 Nov 2022 22:14:47 -0800 Subject: [PATCH 049/184] Hyundai: bump safety params (#26407) * bump panda * bump panda * bump panda * update refs * bump panda * bump panda --- panda | 2 +- selfdrive/test/process_replay/ref_commit | 2 +- selfdrive/test/process_replay/test_processes.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/panda b/panda index f3fc343262..ca681ff829 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit f3fc343262818801f037e9dca1a96ca99d7e64c5 +Subproject commit ca681ff8299c91491558c0e44f4a4779dc0a2998 diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index 0608a6d14b..3120b8a7cf 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -2991a54ea491633f93fae76da4f5f1d265ce311a \ No newline at end of file +cf8700aa252d55d4d5b9f5bec136e34151c2de61 \ No newline at end of file diff --git a/selfdrive/test/process_replay/test_processes.py b/selfdrive/test/process_replay/test_processes.py index 5c754d9312..c58909bf7f 100755 --- a/selfdrive/test/process_replay/test_processes.py +++ b/selfdrive/test/process_replay/test_processes.py @@ -18,7 +18,7 @@ from tools.lib.logreader import LogReader source_segments = [ ("BODY", "937ccb7243511b65|2022-05-24--16-03-09--1"), # COMMA.BODY ("HYUNDAI", "02c45f73a2e5c6e9|2021-01-01--19-08-22--1"), # HYUNDAI.SONATA - ("HYUNDAI2", "d545129f3ca90f28|2022-10-19--09-22-54--9"), # HYUNDAI.KIA_EV6 + ("HYUNDAI2", "d545129f3ca90f28|2022-11-07--20-43-08--3"), # HYUNDAI.KIA_EV6 ("TOYOTA", "0982d79ebb0de295|2021-01-04--17-13-21--13"), # TOYOTA.PRIUS (INDI) ("TOYOTA2", "0982d79ebb0de295|2021-01-03--20-03-36--6"), # TOYOTA.RAV4 (LQR) ("TOYOTA3", "f7d7e3538cda1a2a|2021-08-16--08-55-34--6"), # TOYOTA.COROLLA_TSS2 @@ -41,7 +41,7 @@ source_segments = [ segments = [ ("BODY", "regenFA002A80700|2022-09-27--15-37-02--0"), ("HYUNDAI", "regenBE53A59065B|2022-09-27--16-52-03--0"), - ("HYUNDAI2", "d545129f3ca90f28|2022-10-19--09-22-54--9"), + ("HYUNDAI2", "d545129f3ca90f28|2022-11-07--20-43-08--3"), ("TOYOTA", "regen929C5790007|2022-09-27--16-27-47--0"), ("TOYOTA2", "regenEA3950D7F22|2022-09-27--15-43-24--0"), ("TOYOTA3", "regen89026F6BD8D|2022-09-27--15-45-37--0"), From d62cdc400ce5f49b22ac42d5e9b74398e7c636b6 Mon Sep 17 00:00:00 2001 From: Jason Wen <47793918+sunnyhaibin@users.noreply.github.com> Date: Tue, 8 Nov 2022 02:03:36 -0500 Subject: [PATCH 050/184] HKG: Car Port for Genesis GV70 2022 (#26373) * HKG: Car Port for Genesis GV70 2023 thanks to @zunichky! Co-authored-by: kyle zunich * Update docs * Update selfdrive/car/hyundai/values.py * GV70 does radar SCC, separate them * One more * bump panda * Gate 0x1A0 away from bus 6 * Can't leave out the OG * EV6 non-HDA2 too? * bump panda * bump panda * Check 0x1a0 based on param * bump panda * bump panda * bit simpler * fix bit op * fixes * bump panda to master * cmt * flip Co-authored-by: kyle zunich Co-authored-by: Shane Smiskol --- RELEASES.md | 1 + docs/CARS.md | 3 ++- panda | 2 +- selfdrive/car/hyundai/carstate.py | 16 +++++++++------- selfdrive/car/hyundai/interface.py | 10 +++++++++- selfdrive/car/hyundai/values.py | 17 ++++++++++++++++- selfdrive/car/tests/routes.py | 1 + selfdrive/car/torque_data/override.yaml | 1 + 8 files changed, 40 insertions(+), 11 deletions(-) diff --git a/RELEASES.md b/RELEASES.md index 83b3ac46f4..4103361b93 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -15,6 +15,7 @@ Version 0.8.17 (2022-XX-XX) * Added button to bookmark events while driving; view them later in comma connect * AGNOS 6 * tools: new and improved cabana thanks to deanlee! +* Genesis GV70 2022-23 support thanks to zunichky and sunnyhaibin! * Hyundai Santa Cruz 2021-22 support thanks to sunnyhaibin! * Kia Sportage 2023 support thanks to sunnyhaibin! * Kia Sportage Hybrid 2023 support thanks to sunnyhaibin! diff --git a/docs/CARS.md b/docs/CARS.md index 7066b94f61..04f7712016 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -4,7 +4,7 @@ A supported vehicle is one that just works when you install a comma three. All supported cars provide a better experience than any stock system. -# 213 Supported Cars +# 214 Supported Cars |Make|Model|Supported Package|ACC|No ACC accel below|No ALC below|Steering Torque|Resume from stop|Harness| |---|---|---|:---:|:---:|:---:|:---:|:---:|:---:| @@ -31,6 +31,7 @@ A supported vehicle is one that just works when you install a comma three. All s |Genesis|G70 2020|All|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai F| |Genesis|G80 2017-19|All|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai H| |Genesis|G90 2017-18|All|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai C| +|Genesis|GV70 2022-23|All|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai L| |GMC|Acadia 2018[3](#footnotes)|Adaptive Cruise Control (ACC)|openpilot|0 mph|6 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|OBD-II| |GMC|Sierra 1500 2020-21|Driver Alert Package II|openpilot available[1](#footnotes)|3 mph|6 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|GM| |Honda|Accord 2018-22|All|openpilot available[1](#footnotes)|0 mph|3 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Honda Bosch A| diff --git a/panda b/panda index ca681ff829..1ccdff90c5 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit ca681ff8299c91491558c0e44f4a4779dc0a2998 +Subproject commit 1ccdff90c564154489a3394691a4830a4ae19027 diff --git a/selfdrive/car/hyundai/carstate.py b/selfdrive/car/hyundai/carstate.py index 7cf1515fda..2c309fa0df 100644 --- a/selfdrive/car/hyundai/carstate.py +++ b/selfdrive/car/hyundai/carstate.py @@ -200,7 +200,7 @@ class CarState(CarStateBase): self.is_metric = cp.vl["CLUSTER_INFO"]["DISTANCE_UNIT"] != 1 if not self.CP.openpilotLongitudinalControl: speed_factor = CV.KPH_TO_MS if self.is_metric else CV.MPH_TO_MS - cp_cruise_info = cp if self.CP.flags & HyundaiFlags.CANFD_HDA2 else cp_cam + cp_cruise_info = cp_cam if self.CP.flags & HyundaiFlags.CANFD_CAMERA_SCC else cp ret.cruiseState.speed = cp_cruise_info.vl["SCC_CONTROL"]["VSetDis"] * speed_factor ret.cruiseState.standstill = cp_cruise_info.vl["SCC_CONTROL"]["CRUISE_STANDSTILL"] == 1 ret.cruiseState.enabled = cp_cruise_info.vl["SCC_CONTROL"]["ACCMode"] in (1, 2) @@ -467,7 +467,7 @@ class CarState(CarStateBase): ("BLINDSPOTS_REAR_CORNERS", 20), ] - if CP.flags & HyundaiFlags.CANFD_HDA2 and not CP.openpilotLongitudinalControl: + if not (CP.flags & HyundaiFlags.CANFD_CAMERA_SCC.value) and not CP.openpilotLongitudinalControl: signals += [ ("ACCMode", "SCC_CONTROL"), ("VSetDis", "SCC_CONTROL"), @@ -504,11 +504,13 @@ class CarState(CarStateBase): @staticmethod def get_cam_can_parser_canfd(CP): + signals = [] + checks = [] if CP.flags & HyundaiFlags.CANFD_HDA2: - signals = [(f"BYTE{i}", "CAM_0x2a4") for i in range(3, 24)] - checks = [("CAM_0x2a4", 20)] - else: - signals = [ + signals += [(f"BYTE{i}", "CAM_0x2a4") for i in range(3, 24)] + checks += [("CAM_0x2a4", 20)] + elif CP.flags & HyundaiFlags.CANFD_CAMERA_SCC: + signals += [ ("COUNTER", "SCC_CONTROL"), ("NEW_SIGNAL_1", "SCC_CONTROL"), ("MainMode_ACC", "SCC_CONTROL"), @@ -521,7 +523,7 @@ class CarState(CarStateBase): ("VSetDis", "SCC_CONTROL"), ] - checks = [ + checks += [ ("SCC_CONTROL", 50), ] diff --git a/selfdrive/car/hyundai/interface.py b/selfdrive/car/hyundai/interface.py index 6c8d0076f1..0306f7e104 100644 --- a/selfdrive/car/hyundai/interface.py +++ b/selfdrive/car/hyundai/interface.py @@ -2,7 +2,7 @@ from cereal import car from panda import Panda from common.conversions import Conversions as CV -from selfdrive.car.hyundai.values import HyundaiFlags, CAR, DBC, CANFD_CAR, CAMERA_SCC_CAR, EV_CAR, HYBRID_CAR, LEGACY_SAFETY_MODE_CAR, Buttons, CarControllerParams +from selfdrive.car.hyundai.values import HyundaiFlags, CAR, DBC, CANFD_CAR, CAMERA_SCC_CAR, CANFD_RADAR_SCC_CAR, EV_CAR, HYBRID_CAR, LEGACY_SAFETY_MODE_CAR, Buttons, CarControllerParams from selfdrive.car.hyundai.radar_interface import RADAR_START_ADDR from selfdrive.car import STD_CARGO_KG, create_button_event, scale_rot_inertia, scale_tire_stiffness, gen_empty_fingerprint, get_safety_config from selfdrive.car.interfaces import CarInterfaceBase @@ -44,6 +44,8 @@ class CarInterface(CarInterfaceBase): # ICE cars do not have 0x130; GEARS message on 0x40 instead if 0x130 not in fingerprint[4]: ret.flags |= HyundaiFlags.CANFD_ALT_GEARS.value + if candidate not in CANFD_RADAR_SCC_CAR: + ret.flags |= HyundaiFlags.CANFD_CAMERA_SCC.value ret.steerActuatorDelay = 0.1 # Default delay ret.steerLimitTimer = 0.4 @@ -200,6 +202,10 @@ class CarInterface(CarInterfaceBase): ret.mass = 3673.0 * CV.LB_TO_KG + STD_CARGO_KG ret.wheelbase = 2.83 ret.steerRatio = 12.9 + elif candidate == CAR.GENESIS_GV70_1ST_GEN: + ret.mass = 1950. + STD_CARGO_KG + ret.wheelbase = 2.87 + ret.steerRatio = 14.6 elif candidate == CAR.GENESIS_G80: ret.mass = 2060. + STD_CARGO_KG ret.wheelbase = 3.01 @@ -244,6 +250,8 @@ class CarInterface(CarInterfaceBase): ret.safetyConfigs[1].safetyParam |= Panda.FLAG_HYUNDAI_CANFD_HDA2 if ret.flags & HyundaiFlags.CANFD_ALT_BUTTONS: ret.safetyConfigs[1].safetyParam |= Panda.FLAG_HYUNDAI_CANFD_ALT_BUTTONS + if ret.flags & HyundaiFlags.CANFD_CAMERA_SCC: + ret.safetyConfigs[1].safetyParam |= Panda.FLAG_HYUNDAI_CAMERA_SCC else: if candidate in LEGACY_SAFETY_MODE_CAR: # these cars require a special panda safety mode due to missing counters and checksums in the messages diff --git a/selfdrive/car/hyundai/values.py b/selfdrive/car/hyundai/values.py index 4b2ef474b8..e5ddc5cac7 100644 --- a/selfdrive/car/hyundai/values.py +++ b/selfdrive/car/hyundai/values.py @@ -48,6 +48,7 @@ class HyundaiFlags(IntFlag): CANFD_HDA2 = 1 CANFD_ALT_BUTTONS = 2 CANFD_ALT_GEARS = 4 + CANFD_CAMERA_SCC = 8 class CAR: @@ -100,6 +101,7 @@ class CAR: # Genesis GENESIS_G70 = "GENESIS G70 2018" GENESIS_G70_2020 = "GENESIS G70 2020" + GENESIS_GV70_1ST_GEN = "GENESIS GV70 1ST GEN" GENESIS_G80 = "GENESIS G80 2017" GENESIS_G90 = "GENESIS G90 2017" @@ -188,6 +190,7 @@ CAR_INFO: Dict[str, Optional[Union[HyundaiCarInfo, List[HyundaiCarInfo]]]] = { # Genesis CAR.GENESIS_G70: HyundaiCarInfo("Genesis G70 2018-19", "All", harness=Harness.hyundai_f), CAR.GENESIS_G70_2020: HyundaiCarInfo("Genesis G70 2020", "All", harness=Harness.hyundai_f), + CAR.GENESIS_GV70_1ST_GEN: HyundaiCarInfo("Genesis GV70 2022-23", "All", harness=Harness.hyundai_l), CAR.GENESIS_G80: HyundaiCarInfo("Genesis G80 2017-19", "All", harness=Harness.hyundai_h), CAR.GENESIS_G90: HyundaiCarInfo("Genesis G90 2017-18", "All", harness=Harness.hyundai_c), } @@ -1423,6 +1426,14 @@ FW_VERSIONS = { b'\xf1\x00NQ5__ 1.00 1.03 99110-P1000 ', ], }, + CAR.GENESIS_GV70_1ST_GEN: { + (Ecu.fwdCamera, 0x7c4, None): [ + b'\xf1\x00JK1 MFC AT USA LHD 1.00 1.04 99211-AR000 210204', + ], + (Ecu.fwdRadar, 0x7d0, None): [ + b'\xf1\x00JK1_ SCC FHCUP 1.00 1.02 99110-AR000 ', + ], + }, } CHECKSUM = { @@ -1440,7 +1451,10 @@ FEATURES = { "use_fca": {CAR.SONATA, CAR.SONATA_HYBRID, CAR.ELANTRA, CAR.ELANTRA_2021, CAR.ELANTRA_HEV_2021, CAR.KIA_STINGER, CAR.IONIQ_EV_2020, CAR.IONIQ_PHEV, CAR.KONA_EV, CAR.KIA_FORTE, CAR.KIA_NIRO_EV, CAR.PALISADE, CAR.GENESIS_G70, CAR.GENESIS_G70_2020, CAR.KONA, CAR.SANTA_FE, CAR.KIA_SELTOS, CAR.KONA_HEV, CAR.SANTA_FE_2022, CAR.KIA_K5_2021, CAR.IONIQ_HEV_2022, CAR.SANTA_FE_HEV_2022, CAR.SANTA_FE_PHEV_2022, CAR.TUCSON, CAR.KONA_EV_2022}, } -CANFD_CAR = {CAR.KIA_EV6, CAR.IONIQ_5, CAR.TUCSON_HYBRID_4TH_GEN, CAR.KIA_SPORTAGE_HYBRID_5TH_GEN, CAR.SANTA_CRUZ_1ST_GEN, CAR.KIA_SPORTAGE_5TH_GEN} +CANFD_CAR = {CAR.KIA_EV6, CAR.IONIQ_5, CAR.TUCSON_HYBRID_4TH_GEN, CAR.KIA_SPORTAGE_HYBRID_5TH_GEN, CAR.SANTA_CRUZ_1ST_GEN, CAR.KIA_SPORTAGE_5TH_GEN, CAR.GENESIS_GV70_1ST_GEN} + +# The radar does SCC on these cars when HDA I, rather than the camera +CANFD_RADAR_SCC_CAR = {CAR.GENESIS_GV70_1ST_GEN, } # The camera does SCC on these cars, rather than the radar CAMERA_SCC_CAR = {CAR.KONA_EV_2022, } @@ -1500,4 +1514,5 @@ DBC = { CAR.SANTA_CRUZ_1ST_GEN: dbc_dict('hyundai_canfd', None), CAR.KIA_SPORTAGE_5TH_GEN: dbc_dict('hyundai_canfd', None), CAR.KIA_SPORTAGE_HYBRID_5TH_GEN: dbc_dict('hyundai_canfd', None), + CAR.GENESIS_GV70_1ST_GEN: dbc_dict('hyundai_canfd', None), } diff --git a/selfdrive/car/tests/routes.py b/selfdrive/car/tests/routes.py index bf949d3492..d0051454a6 100644 --- a/selfdrive/car/tests/routes.py +++ b/selfdrive/car/tests/routes.py @@ -81,6 +81,7 @@ routes = [ CarTestRoute("6fe86b4e410e4c37|2020-07-22--16-27-13", HYUNDAI.HYUNDAI_GENESIS), CarTestRoute("70c5bec28ec8e345|2020-08-08--12-22-23", HYUNDAI.GENESIS_G70), + CarTestRoute("ca4de5b12321bd98|2022-10-18--21-15-59", HYUNDAI.GENESIS_GV70_1ST_GEN), CarTestRoute("6b301bf83f10aa90|2020-11-22--16-45-07", HYUNDAI.GENESIS_G80), CarTestRoute("f0709d2bc6ca451f|2022-10-15--08-13-54", HYUNDAI.SANTA_CRUZ_1ST_GEN), CarTestRoute("4dbd55df87507948|2022-03-01--09-45-38", HYUNDAI.SANTA_FE), diff --git a/selfdrive/car/torque_data/override.yaml b/selfdrive/car/torque_data/override.yaml index c5a316aaaf..2ef5a1cd0f 100644 --- a/selfdrive/car/torque_data/override.yaml +++ b/selfdrive/car/torque_data/override.yaml @@ -34,6 +34,7 @@ HYUNDAI TUCSON HYBRID 4TH GEN: [2.5, 2.5, 0.0] HYUNDAI SANTA CRUZ 1ST GEN: [2.7, 2.7, 0.0] KIA SPORTAGE 5TH GEN: [2.7, 2.7, 0.0] KIA SPORTAGE HYBRID 5TH GEN: [2.5, 2.5, 0.0] +GENESIS GV70 1ST GEN: [2.42, 2.42, 0.01] # Dashcam or fallback configured as ideal car mock: [10.0, 10, 0.0] From 52a644e6564582632559255230c82b550db50c76 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 8 Nov 2022 00:03:23 -0800 Subject: [PATCH 051/184] Toyota: add hysteresis to cluster speed (#26386) * add hysteresis to cluster speed * add minimum cluster scaling * fix * Update ref_commit --- selfdrive/car/toyota/carstate.py | 2 ++ selfdrive/test/process_replay/ref_commit | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/selfdrive/car/toyota/carstate.py b/selfdrive/car/toyota/carstate.py index 4758149916..a959633281 100644 --- a/selfdrive/car/toyota/carstate.py +++ b/selfdrive/car/toyota/carstate.py @@ -15,6 +15,8 @@ class CarState(CarStateBase): can_define = CANDefine(DBC[CP.carFingerprint]["pt"]) self.shifter_values = can_define.dv["GEAR_PACKET"]["GEAR"] self.eps_torque_scale = EPS_SCALE[CP.carFingerprint] / 100. + self.cluster_speed_hyst_gap = CV.KPH_TO_MS / 2. + self.cluster_min_speed = CV.KPH_TO_MS / 2. # On cars with cp.vl["STEER_TORQUE_SENSOR"]["STEER_ANGLE"] # the signal is zeroed to where the steering angle is at start. diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index 3120b8a7cf..08eb063d41 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -cf8700aa252d55d4d5b9f5bec136e34151c2de61 \ No newline at end of file +caa8fb2a046a6c2c186e66af339212a5fae6b7a4 From 5960ba5def7c42b3944f96cf103a0c4a6e633754 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 8 Nov 2022 12:49:22 -0800 Subject: [PATCH 052/184] UI: widecam only in e2e mode (#26412) --- selfdrive/ui/qt/onroad.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc index b4925c2f73..15672d33c1 100644 --- a/selfdrive/ui/qt/onroad.cc +++ b/selfdrive/ui/qt/onroad.cc @@ -567,6 +567,7 @@ void AnnotatedCameraWidget::paintGL() { } else if (v_ego > 15) { wide_cam_requested = false; } + wide_cam_requested = wide_cam_requested && s->scene.end_to_end_long; // TODO: also detect when ecam vision stream isn't available // for replay of old routes, never go to widecam wide_cam_requested = wide_cam_requested && s->scene.calibration_wide_valid; From 8ba9a5107b353cc0fc5ab3bbab589b70c2fe9aaa Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 8 Nov 2022 13:21:07 -0800 Subject: [PATCH 053/184] boardd: SPI support (#26374) * spi handle * put usb back * handle eintr Co-authored-by: Comma Device --- common/util.cc | 9 ++ common/util.h | 1 + release/files_common | 1 + selfdrive/boardd/SConscript | 4 +- selfdrive/boardd/panda.cc | 6 +- selfdrive/boardd/panda_comms.h | 22 +++ selfdrive/boardd/spi.cc | 252 +++++++++++++++++++++++++++++++ system/hardware/tici/hardware.py | 3 + 8 files changed, 295 insertions(+), 3 deletions(-) create mode 100644 selfdrive/boardd/spi.cc diff --git a/common/util.cc b/common/util.cc index b6a8322a27..010fe8a11a 100644 --- a/common/util.cc +++ b/common/util.cc @@ -1,5 +1,6 @@ #include "common/util.h" +#include #include #include @@ -149,6 +150,14 @@ int safe_fflush(FILE *stream) { return ret; } +int safe_ioctl(int fd, unsigned long request, void *argp) { + int ret; + do { + ret = ioctl(fd, request, argp); + } while ((ret == -1) && (errno == EINTR)); + return ret; +} + std::string readlink(const std::string &path) { char buff[4096]; ssize_t len = ::readlink(path.c_str(), buff, sizeof(buff)-1); diff --git a/common/util.h b/common/util.h index e13f4dc130..b46f7bde4a 100644 --- a/common/util.h +++ b/common/util.h @@ -86,6 +86,7 @@ int write_file(const char* path, const void* data, size_t size, int flags = O_WR FILE* safe_fopen(const char* filename, const char* mode); size_t safe_fwrite(const void * ptr, size_t size, size_t count, FILE * stream); int safe_fflush(FILE *stream); +int safe_ioctl(int fd, unsigned long request, void *argp); std::string readlink(const std::string& path); bool file_exists(const std::string& fn); diff --git a/release/files_common b/release/files_common index 61d16a2088..26662f1ef1 100644 --- a/release/files_common +++ b/release/files_common @@ -90,6 +90,7 @@ selfdrive/boardd/boardd_api_impl.pyx selfdrive/boardd/can_list_to_can_capnp.cc selfdrive/boardd/panda.cc selfdrive/boardd/panda.h +selfdrive/boardd/spi.cc selfdrive/boardd/panda_comms.h selfdrive/boardd/panda_comms.cc selfdrive/boardd/set_time.py diff --git a/selfdrive/boardd/SConscript b/selfdrive/boardd/SConscript index 356b5de663..d99e67a9f0 100644 --- a/selfdrive/boardd/SConscript +++ b/selfdrive/boardd/SConscript @@ -1,9 +1,9 @@ Import('env', 'envCython', 'common', 'cereal', 'messaging') libs = ['usb-1.0', common, cereal, messaging, 'pthread', 'zmq', 'capnp', 'kj'] -env.Program('boardd', ['main.cc', 'boardd.cc', 'panda.cc', 'panda_comms.cc'], LIBS=libs) +env.Program('boardd', ['main.cc', 'boardd.cc', 'panda.cc', 'panda_comms.cc', 'spi.cc'], LIBS=libs) env.Library('libcan_list_to_can_capnp', ['can_list_to_can_capnp.cc']) envCython.Program('boardd_api_impl.so', 'boardd_api_impl.pyx', LIBS=["can_list_to_can_capnp", 'capnp', 'kj'] + envCython["LIBS"]) if GetOption('test'): - env.Program('tests/test_boardd_usbprotocol', ['tests/test_boardd_usbprotocol.cc', 'panda.cc', 'panda_comms.cc'], LIBS=libs) + env.Program('tests/test_boardd_usbprotocol', ['tests/test_boardd_usbprotocol.cc', 'panda.cc', 'panda_comms.cc', 'spi.cc'], LIBS=libs) diff --git a/selfdrive/boardd/panda.cc b/selfdrive/boardd/panda.cc index e68558632e..deccee3e76 100644 --- a/selfdrive/boardd/panda.cc +++ b/selfdrive/boardd/panda.cc @@ -12,7 +12,11 @@ Panda::Panda(std::string serial, uint32_t bus_offset) : bus_offset(bus_offset) { // TODO: support SPI here one day... - handle = std::make_unique(serial); + if (serial.find("spi") != std::string::npos) { + handle = std::make_unique(serial); + } else { + handle = std::make_unique(serial); + } hw_type = get_hw_type(); diff --git a/selfdrive/boardd/panda_comms.h b/selfdrive/boardd/panda_comms.h index c5143b16b3..08d0c1a2af 100644 --- a/selfdrive/boardd/panda_comms.h +++ b/selfdrive/boardd/panda_comms.h @@ -8,6 +8,7 @@ #include #define TIMEOUT 0 +#define SPI_BUF_SIZE 1024 // comms base class @@ -49,3 +50,24 @@ private: std::vector recv_buf; void handle_usb_issue(int err, const char func[]); }; + +class PandaSpiHandle : public PandaCommsHandle { +public: + PandaSpiHandle(std::string serial); + ~PandaSpiHandle(); + int control_write(uint8_t request, uint16_t param1, uint16_t param2, unsigned int timeout=TIMEOUT); + int control_read(uint8_t request, uint16_t param1, uint16_t param2, unsigned char *data, uint16_t length, unsigned int timeout=TIMEOUT); + int bulk_write(unsigned char endpoint, unsigned char* data, int length, unsigned int timeout=TIMEOUT); + int bulk_read(unsigned char endpoint, unsigned char* data, int length, unsigned int timeout=TIMEOUT); + void cleanup(); + + static std::vector list(); + +private: + int spi_fd = -1; + int spi_transfer(uint8_t endpoint, uint8_t *tx_data, uint16_t tx_len, uint8_t *rx_data, uint16_t max_rx_len); + int wait_for_ack(); + + uint8_t tx_buf[SPI_BUF_SIZE]; + uint8_t rx_buf[SPI_BUF_SIZE]; +}; diff --git a/selfdrive/boardd/spi.cc b/selfdrive/boardd/spi.cc new file mode 100644 index 0000000000..1ec5e89c71 --- /dev/null +++ b/selfdrive/boardd/spi.cc @@ -0,0 +1,252 @@ +#include +#include + +#include +#include + +#include "common/util.h" +#include "common/swaglog.h" +#include "selfdrive/boardd/panda_comms.h" + + +#define SPI_SYNC 0x5AU +#define SPI_HACK 0x79U +#define SPI_DACK 0x85U +#define SPI_NACK 0x1FU +#define SPI_CHECKSUM_START 0xABU + +struct __attribute__((packed)) spi_header { + uint8_t sync; + uint8_t endpoint; + uint16_t tx_len; + uint16_t max_rx_len; +}; + +struct __attribute__((packed)) spi_control_packet { + uint16_t request; + uint16_t param1; + uint16_t param2; + uint16_t length; +}; + + +PandaSpiHandle::PandaSpiHandle(std::string serial) : PandaCommsHandle(serial) { + LOGD("opening SPI panda: %s", serial.c_str()); + + int err; + uint32_t spi_mode = SPI_MODE_0; + uint32_t spi_speed = 30000000; + uint8_t spi_bits_per_word = 8; + + spi_fd = open(serial.c_str(), O_RDWR); + if (spi_fd < 0) { + LOGE("failed setting SPI mode %d", err); + goto fail; + } + + // SPI settings + err = util::safe_ioctl(spi_fd, SPI_IOC_WR_MODE, &spi_mode); + if (err < 0) { + LOGE("failed setting SPI mode %d", err); + goto fail; + } + + err = util::safe_ioctl(spi_fd, SPI_IOC_WR_MAX_SPEED_HZ, &spi_speed); + if (err < 0) { + LOGE("failed setting SPI speed"); + goto fail; + } + + err = util::safe_ioctl(spi_fd, SPI_IOC_WR_BITS_PER_WORD, &spi_bits_per_word); + if (err < 0) { + LOGE("failed setting SPI bits per word"); + goto fail; + } + + return; + +fail: + cleanup(); + throw std::runtime_error("Error connecting to panda"); +} + +PandaSpiHandle::~PandaSpiHandle() { + std::lock_guard lk(hw_lock); + cleanup(); +} + +void PandaSpiHandle::cleanup() { + if (spi_fd != -1) { + close(spi_fd); + spi_fd = -1; + } +} + + + +int PandaSpiHandle::control_write(uint8_t request, uint16_t param1, uint16_t param2, unsigned int timeout) { + int err; + + std::lock_guard lk(hw_lock); + do { + spi_control_packet packet = { + .request = request, + .param1 = param1, + .param2 = param2, + .length = 0 + }; + + // TODO: handle error + err = spi_transfer(0, (uint8_t *) &packet, sizeof(packet), NULL, 0); + } while (err < 0 && connected); + + return err; +} + +int PandaSpiHandle::control_read(uint8_t request, uint16_t param1, uint16_t param2, unsigned char *data, uint16_t length, unsigned int timeout) { + int err; + + std::lock_guard lk(hw_lock); + do { + spi_control_packet packet = { + .request = request, + .param1 = param1, + .param2 = param2, + .length = length + }; + + // TODO: handle error + err = spi_transfer(0, (uint8_t *) &packet, sizeof(packet), data, length); + } while (err < 0 && connected); + + return err; +} + +int PandaSpiHandle::bulk_write(unsigned char endpoint, unsigned char* data, int length, unsigned int timeout) { + return 0; +} + +int PandaSpiHandle::bulk_read(unsigned char endpoint, unsigned char* data, int length, unsigned int timeout) { + return 0; +} + +std::vector PandaSpiHandle::list() { + // TODO: list all pandas available over SPI + return {}; +} + + + +void add_checksum(uint8_t *data, int data_len) { + data[data_len] = SPI_CHECKSUM_START; + for (int i=0; i < data_len; i++) { + data[data_len] ^= data[i]; + } +} + + +int PandaSpiHandle::spi_transfer(uint8_t endpoint, uint8_t *tx_data, uint16_t tx_len, uint8_t *rx_data, uint16_t max_rx_len) { + int ret; + uint16_t rx_data_len; + + // needs to be less, since we need to have space for the checksum + assert(tx_len < SPI_BUF_SIZE); + assert(max_rx_len < SPI_BUF_SIZE); + + spi_header header = { + .sync = SPI_SYNC, + .endpoint = endpoint, + .tx_len = tx_len, + .max_rx_len = max_rx_len + }; + + spi_ioc_transfer transfer = { + .tx_buf = (uint64_t)tx_buf, + .rx_buf = (uint64_t)rx_buf + }; + + // Send header + memcpy(tx_buf, &header, sizeof(header)); + add_checksum(tx_buf, sizeof(header)); + transfer.len = sizeof(header) + 1; + ret = util::safe_ioctl(spi_fd, SPI_IOC_MESSAGE(1), &transfer); + if (ret < 0) { + LOGE("SPI: failed to send header"); + goto transfer_fail; + } + + // Wait for (N)ACK + tx_buf[0] = 0x12; + transfer.len = 1; + while (true) { + ret = util::safe_ioctl(spi_fd, SPI_IOC_MESSAGE(1), &transfer); + if (ret < 0) { + LOGE("SPI: failed to send ACK request"); + goto transfer_fail; + } + + if (rx_buf[0] == SPI_HACK) { + break; + } else if (rx_buf[0] == SPI_NACK) { + LOGW("SPI: got header NACK"); + goto transfer_fail; + } + } + + // Send data + if (tx_data != NULL) { + memcpy(tx_buf, tx_data, tx_len); + } + add_checksum(tx_buf, tx_len); + transfer.len = tx_len + 1; + ret = util::safe_ioctl(spi_fd, SPI_IOC_MESSAGE(1), &transfer); + if (ret < 0) { + LOGE("SPI: failed to send data"); + goto transfer_fail; + } + + // Wait for (N)ACK + tx_buf[0] = 0xab; + transfer.len = 1; + while (true) { + ret = util::safe_ioctl(spi_fd, SPI_IOC_MESSAGE(1), &transfer); + if (ret < 0) { + LOGE("SPI: failed to send ACK request"); + goto transfer_fail; + } + + if (rx_buf[0] == SPI_DACK) { + break; + } else if (rx_buf[0] == SPI_NACK) { + LOGE("SPI: got data NACK"); + goto transfer_fail; + } + } + + // Read data len + transfer.len = 2; + ret = util::safe_ioctl(spi_fd, SPI_IOC_MESSAGE(1), &transfer); + if (ret < 0) { + LOGE("SPI: failed to read rx data len"); + goto transfer_fail; + } + rx_data_len = *(uint16_t *)rx_buf; + assert(rx_data_len < SPI_BUF_SIZE); + + // Read data + transfer.len = rx_data_len + 1; + ret = util::safe_ioctl(spi_fd, SPI_IOC_MESSAGE(1), &transfer); + if (ret < 0) { + LOGE("SPI: failed to read rx data"); + goto transfer_fail; + } + // TODO: check checksum + + if (rx_data != NULL) { + memcpy(rx_data, rx_buf, rx_data_len); + } + ret = rx_data_len; + +transfer_fail: + return ret; +} diff --git a/system/hardware/tici/hardware.py b/system/hardware/tici/hardware.py index e2fd20c1be..c5b931ddae 100644 --- a/system/hardware/tici/hardware.py +++ b/system/hardware/tici/hardware.py @@ -431,6 +431,9 @@ class Tici(HardwareBase): def initialize_hardware(self): self.amplifier.initialize_configuration() + # TODO: this should go in AGNOS + os.system("sudo chmod 666 /dev/spidev0.0") + # Allow thermald to write engagement status to kmsg os.system("sudo chmod a+w /dev/kmsg") From 4ec1c7e614a2ca3fbf38f302a82b87d112d06b02 Mon Sep 17 00:00:00 2001 From: Kurt Nistelberger Date: Tue, 8 Nov 2022 22:51:16 +0100 Subject: [PATCH 054/184] CI: camera box update (#26414) * check if all frames are laggy * apply tolerance Co-authored-by: Kurt Nistelberger --- system/camerad/test/test_camerad.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/system/camerad/test/test_camerad.py b/system/camerad/test/test_camerad.py index 3c6d466a69..6c2ef1c7bc 100755 --- a/system/camerad/test/test_camerad.py +++ b/system/camerad/test/test_camerad.py @@ -11,7 +11,7 @@ from system.hardware import TICI TEST_TIMESPAN = 30 LAG_FRAME_TOLERANCE = {log.FrameData.ImageSensor.ar0321: 0.5, # ARs use synced pulses for frame starts - log.FrameData.ImageSensor.ox03c10: 1.0} # OXs react to out-of-sync at next frame + log.FrameData.ImageSensor.ox03c10: 1.0} # OXs react to out-of-sync at next frame CAMERAS = ('roadCameraState', 'driverCameraState', 'wideRoadCameraState') @@ -68,12 +68,17 @@ class TestCamerad(unittest.TestCase): frame_times = {frame_id: [getattr(m, m.which()).timestampSof for m in msgs] for frame_id, msgs in self.log_by_frame_id.items()} diffs = {frame_id: (max(ts) - min(ts))/1e6 for frame_id, ts in frame_times.items()} - def get_desc(fid, diff): cam_times = [(m.which(), getattr(m, m.which()).timestampSof/1e6) for m in self.log_by_frame_id[fid]] - return f"{diff=} {cam_times=}" + return (diff, cam_times) laggy_frames = {k: get_desc(k, v) for k, v in diffs.items() if v > LAG_FRAME_TOLERANCE[sensor_type]} - assert len(laggy_frames) == 0, f"Frames not synced properly: {laggy_frames=}" + + def in_tol(diff): + return 50 - LAG_FRAME_TOLERANCE[sensor_type] < diff and diff < 50 + LAG_FRAME_TOLERANCE[sensor_type] + if len(laggy_frames) != 0 and all( in_tol(laggy_frames[lf][0]) for lf in laggy_frames): + print("TODO: handle camera out of sync") + else: + assert len(laggy_frames) == 0, f"Frames not synced properly: {laggy_frames=}" if __name__ == "__main__": unittest.main() From 1181efb288db18420e5a376ed5dba53eadf8c2cb Mon Sep 17 00:00:00 2001 From: Kurt Nistelberger Date: Tue, 8 Nov 2022 23:01:07 +0100 Subject: [PATCH 055/184] CI: update qcom tests (#26404) update qcom tests Co-authored-by: Kurt Nistelberger --- tools/gpstest/test_gps_qcom.py | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/tools/gpstest/test_gps_qcom.py b/tools/gpstest/test_gps_qcom.py index 0909316c5e..b3ce93fc81 100644 --- a/tools/gpstest/test_gps_qcom.py +++ b/tools/gpstest/test_gps_qcom.py @@ -40,14 +40,10 @@ class TestGPS(unittest.TestCase): if ublox_available: raise unittest.SkipTest - @unittest.skip("Skip cold start test due to time") - def test_quectel_cold_start(self): + def test_a_quectel_cold_start(self): # delete assistance data to enforce cold start for GNSS # testing shows that this takes up to 20min - # invalidate supl setting, cannot be reset - _, err = exec_mmcli("--location-set-supl-server=unittest:1") - _, err = exec_mmcli("--command='AT+QGPSDEL=0'") assert len(err) == 0, f"GPSDEL failed: {err}" @@ -55,27 +51,6 @@ class TestGPS(unittest.TestCase): start_time = time.monotonic() glo = messaging.sub_sock("gpsLocation", timeout=0.1) - timeout = 10*60*25 # 25 minute - timedout = wait_for_location(glo, timeout) - managed_processes['rawgpsd'].stop() - - assert timedout is False, "Waiting for location timed out (25min)!" - - duration = time.monotonic() - start_time - assert duration < 50, f"Received GPS location {duration}!" - - - def test_a_quectel_cold_start_AGPS(self): - _, err = exec_mmcli("--command='AT+QGPSDEL=0'") - assert len(err) == 0, f"GPSDEL failed: {err}" - - # setup AGPS - exec_mmcli("--location-set-supl-server=supl.google.com:7276") - - managed_processes['rawgpsd'].start() - start_time = time.monotonic() - glo = messaging.sub_sock("gpsLocation", timeout=0.1) - timeout = 10*60*3 # 3 minute timedout = wait_for_location(glo, timeout) managed_processes['rawgpsd'].stop() @@ -87,15 +62,11 @@ class TestGPS(unittest.TestCase): def test_b_quectel_startup(self): - - # setup AGPS - exec_mmcli("--location-set-supl-server=supl.google.com:7276") - managed_processes['rawgpsd'].start() start_time = time.monotonic() glo = messaging.sub_sock("gpsLocation", timeout=0.1) - timeout = 10*60*3 # 3 minute + timeout = 10*60 # 1 minute timedout = wait_for_location(glo, timeout) managed_processes['rawgpsd'].stop() From 9a3f46805104c4bcb5cffa304b9b322874ccf412 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 8 Nov 2022 14:45:01 -0800 Subject: [PATCH 056/184] experimental mode (#26416) * experimental mode * rename param * red lights --- RELEASES.md | 8 +++- common/params.cc | 2 +- selfdrive/controls/controlsd.py | 2 +- .../controls/lib/longitudinal_planner.py | 2 +- selfdrive/controls/tests/test_cruise_speed.py | 2 +- .../controls/tests/test_following_distance.py | 2 +- .../test_longitudinal.py | 4 +- selfdrive/ui/qt/offroad/settings.cc | 41 +++++++++++-------- selfdrive/ui/qt/onroad.cc | 4 +- selfdrive/ui/translations/main_ja.ts | 24 +++++------ selfdrive/ui/translations/main_ko.ts | 24 +++++------ selfdrive/ui/translations/main_pt-BR.ts | 24 +++++------ selfdrive/ui/translations/main_zh-CHS.ts | 24 +++++------ selfdrive/ui/translations/main_zh-CHT.ts | 24 +++++------ selfdrive/ui/ui.cc | 2 +- selfdrive/ui/ui.h | 2 +- 16 files changed, 101 insertions(+), 90 deletions(-) diff --git a/RELEASES.md b/RELEASES.md index 4103361b93..e175050eaf 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,9 +1,13 @@ -Version 0.8.17 (2022-XX-XX) +Version 0.8.17 (2022-11-XX) ======================== * New driving model * Internal feature space accuracy increased tenfold during training, this makes the model dramatically more accurate. * New driver monitoring model * New end-to-end distracted trigger +* Experimental driving mode + * End-to-end longitudinal control + * Stops for red lights and stop signs + * openpilot defaults to chill mode, enable experimental in settings * Self-tuning torque lateral controller parameters * Parameters learned live for each car * Torque controller used on all Toyota, Lexus, Hyundai, Kia, and Genesis models @@ -12,7 +16,7 @@ Version 0.8.17 (2022-XX-XX) * Matched speeds shown on car's dash * Improved update experience * Border turns grey while overriding steering - * Added button to bookmark events while driving; view them later in comma connect + * Bookmark events while driving; view them in comma connect * AGNOS 6 * tools: new and improved cabana thanks to deanlee! * Genesis GV70 2022-23 support thanks to zunichky and sunnyhaibin! diff --git a/common/params.cc b/common/params.cc index 155bc88487..e17d1f1b13 100644 --- a/common/params.cc +++ b/common/params.cc @@ -102,7 +102,7 @@ std::unordered_map keys = { {"DashcamOverride", PERSISTENT}, {"DisableLogging", CLEAR_ON_MANAGER_START | CLEAR_ON_IGNITION_ON}, {"DisablePowerDown", PERSISTENT}, - {"EndToEndLong", PERSISTENT}, + {"ExperimentalMode", PERSISTENT}, {"ExperimentalLongitudinalEnabled", PERSISTENT}, // WARNING: THIS MAY DISABLE AEB {"DisableUpdates", PERSISTENT}, {"DisengageOnAccelerator", PERSISTENT}, diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index 1adbba4171..0bdaadf6ef 100755 --- a/selfdrive/controls/controlsd.py +++ b/selfdrive/controls/controlsd.py @@ -147,7 +147,7 @@ class Controls: if not self.CP.experimentalLongitudinalAvailable: self.params.remove("ExperimentalLongitudinalEnabled") if not self.CP.openpilotLongitudinalControl: - self.params.remove("EndToEndLong") + self.params.remove("ExperimentalMode") self.CC = car.CarControl.new_message() self.CS_prev = car.CarState.new_message() diff --git a/selfdrive/controls/lib/longitudinal_planner.py b/selfdrive/controls/lib/longitudinal_planner.py index 19ea40a8f4..2fa13bfb15 100755 --- a/selfdrive/controls/lib/longitudinal_planner.py +++ b/selfdrive/controls/lib/longitudinal_planner.py @@ -66,7 +66,7 @@ class LongitudinalPlanner: self.solverExecutionTime = 0.0 def read_param(self): - e2e = self.params.get_bool('EndToEndLong') and self.CP.openpilotLongitudinalControl + e2e = self.params.get_bool('ExperimentalMode') and self.CP.openpilotLongitudinalControl self.mpc.mode = 'blended' if e2e else 'acc' def parse_model(self, model_msg, model_error): diff --git a/selfdrive/controls/tests/test_cruise_speed.py b/selfdrive/controls/tests/test_cruise_speed.py index a972bfb073..ca070f1c3f 100644 --- a/selfdrive/controls/tests/test_cruise_speed.py +++ b/selfdrive/controls/tests/test_cruise_speed.py @@ -26,7 +26,7 @@ class TestCruiseSpeed(unittest.TestCase): def test_cruise_speed(self): params = Params() for e2e in [False, True]: - params.put_bool("EndToEndLong", e2e) + params.put_bool("ExperimentalMode", e2e) for speed in np.arange(5, 40, 5): print(f'Testing {speed} m/s') cruise_speed = float(speed) diff --git a/selfdrive/controls/tests/test_following_distance.py b/selfdrive/controls/tests/test_following_distance.py index 3534f58235..0535caab84 100644 --- a/selfdrive/controls/tests/test_following_distance.py +++ b/selfdrive/controls/tests/test_following_distance.py @@ -27,7 +27,7 @@ class TestFollowingDistance(unittest.TestCase): def test_following_distance(self): params = Params() for e2e in [False, True]: - params.put_bool("EndToEndLong", e2e) + params.put_bool("ExperimentalMode", e2e) for speed in np.arange(0, 40, 5): print(f'Testing {speed} m/s') v_lead = float(speed) diff --git a/selfdrive/test/longitudinal_maneuvers/test_longitudinal.py b/selfdrive/test/longitudinal_maneuvers/test_longitudinal.py index c7c2915878..7cc95b104a 100755 --- a/selfdrive/test/longitudinal_maneuvers/test_longitudinal.py +++ b/selfdrive/test/longitudinal_maneuvers/test_longitudinal.py @@ -143,11 +143,11 @@ def run_maneuver_worker(k): params = Params() man = maneuvers[k] - params.put_bool("EndToEndLong", True) + params.put_bool("ExperimentalMode", True) print(man.title, ' in e2e mode') valid, _ = man.evaluate() self.assertTrue(valid, msg=man.title) - params.put_bool("EndToEndLong", False) + params.put_bool("ExperimentalMode", False) print(man.title, ' in acc mode') valid, _ = man.evaluate() self.assertTrue(valid, msg=man.title) diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index 51b5ce6bd7..29069155b2 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -36,6 +36,21 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) { "../assets/offroad/icon_openpilot.png", false, }, + { + "ExperimentalMode", + tr("Experimental mode"), + "", + "../assets/offroad/icon_road.png", + false, + }, + { + "ExperimentalLongitudinalEnabled", + tr("Experimental openpilot longitudinal control"), + tr("WARNING: openpilot longitudinal control is experimental for this car and will disable AEB.
\ + openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control."), + "../assets/offroad/icon_speed_limit.png", + true, + }, { "IsLdwEnabled", tr("Enable Lane Departure Warnings"), @@ -64,20 +79,6 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) { "../assets/offroad/icon_disengage_on_accelerator.svg", false, }, - { - "EndToEndLong", - tr("🌮 End-to-end longitudinal (extremely alpha) 🌮"), - "", - "../assets/offroad/icon_road.png", - false, - }, - { - "ExperimentalLongitudinalEnabled", - tr("Experimental openpilot longitudinal control"), - tr("WARNING: openpilot longitudinal control is experimental for this car and will disable AEB."), - "../assets/offroad/icon_speed_limit.png", - true, - }, #ifdef ENABLE_MAPS { "NavSettingTime24h", @@ -116,9 +117,15 @@ void TogglesPanel::showEvent(QShowEvent *event) { } void TogglesPanel::updateToggles() { - auto e2e_toggle = toggles["EndToEndLong"]; + auto e2e_toggle = toggles["ExperimentalMode"]; auto op_long_toggle = toggles["ExperimentalLongitudinalEnabled"]; - const QString e2e_description = tr("Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would. Super experimental."); + const QString e2e_description = tr("\ + openpilot defaults to driving in chill mode.\ + Experimental mode enables alpha-level features that aren't ready for chill mode. \ + Experimental features are listed below:\ +
\ +

🌮 End-to-End Longitudinal Control 🌮

\ + Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs."); auto cp_bytes = params.get("CarParamsPersistent"); if (!cp_bytes.empty()) { @@ -140,7 +147,7 @@ void TogglesPanel::updateToggles() { } else { // no long for now e2e_toggle->setEnabled(false); - params.remove("EndToEndLong"); + params.remove("ExperimentalMode"); const QString no_long = tr("openpilot longitudinal control is not currently available for this car."); const QString exp_long = tr("Enable experimental longitudinal control to enable this."); diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc index 15672d33c1..37c1913743 100644 --- a/selfdrive/ui/qt/onroad.cc +++ b/selfdrive/ui/qt/onroad.cc @@ -461,7 +461,7 @@ void AnnotatedCameraWidget::drawLaneLines(QPainter &painter, const UIState *s) { // paint path QLinearGradient bg(0, height(), 0, height() / 4); float start_hue, end_hue; - if (scene.end_to_end_long) { + if (scene.experimental_mode) { const auto &acceleration = (*s->sm)["modelV2"].getModelV2().getAcceleration(); float acceleration_future = 0; if (acceleration.getZ().size() > 16) { @@ -567,7 +567,7 @@ void AnnotatedCameraWidget::paintGL() { } else if (v_ego > 15) { wide_cam_requested = false; } - wide_cam_requested = wide_cam_requested && s->scene.end_to_end_long; + wide_cam_requested = wide_cam_requested && s->scene.experimental_mode; // TODO: also detect when ecam vision stream isn't available // for replay of old routes, never go to widecam wide_cam_requested = wide_cam_requested && s->scene.calibration_wide_valid; diff --git a/selfdrive/ui/translations/main_ja.ts b/selfdrive/ui/translations/main_ja.ts index 5ee2d86756..039ad7b2a4 100644 --- a/selfdrive/ui/translations/main_ja.ts +++ b/selfdrive/ui/translations/main_ja.ts @@ -966,22 +966,10 @@ location set Upload data from the driver facing camera and help improve the driver monitoring algorithm. 車内カメラの映像をアップロードし、ドライバー監視システムのアルゴリズムの向上に役立てます。 - - 🌮 End-to-end longitudinal (extremely alpha) 🌮 - 🌮 エンドツーエンドのアクセル制御 (超α版) 🌮 - Experimental openpilot longitudinal control 実験段階のopenpilotによるアクセル制御 - - <b>WARNING: openpilot longitudinal control is experimental for this car and will disable AEB.</b> - <b>警告: openpilotによるアクセル制御は実験段階であり、AEBを無効化します。</b> - - - Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would. Super experimental. - アクセルとブレーキの制御をopenpilotに任せます。openpilotが人間と同じように運転します。最初期の実験段階です。 - openpilot longitudinal control is not currently available for this car. openpilotによるアクセル制御は、この車では現在利用できません。 @@ -1014,6 +1002,18 @@ location set Show map on left side when in split screen view. 分割画面表示の場合、ディスプレイの左側にマップを表示します。 + + Experimental mode + + + + <b>WARNING: openpilot longitudinal control is experimental for this car and will disable AEB.</b><br> openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. + + + + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. + + Updater diff --git a/selfdrive/ui/translations/main_ko.ts b/selfdrive/ui/translations/main_ko.ts index f58c4f34d5..e9b4943650 100644 --- a/selfdrive/ui/translations/main_ko.ts +++ b/selfdrive/ui/translations/main_ko.ts @@ -966,22 +966,10 @@ location set Upload data from the driver facing camera and help improve the driver monitoring algorithm. 운전자 카메라에서 데이터를 업로드하고 운전자 모니터링 알고리즘을 개선합니다. - - 🌮 End-to-end longitudinal (extremely alpha) 🌮 - 🌮 e2e 롱컨트롤 사용 (매우 실험적) 🌮 - Experimental openpilot longitudinal control openpilot 롱컨트롤 (실험적) - - <b>WARNING: openpilot longitudinal control is experimental for this car and will disable AEB.</b> - <b>경고: openpilot 롱컨트롤은 실험적인 기능으로 차량의 AEB를 비활성화합니다.</b> - - - Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would. Super experimental. - 주행모델이 가속과 감속을 제어하도록 하면 openpilot은 운전자가 생각하는것처럼 운전합니다. (매우 실험적) - openpilot longitudinal control is not currently available for this car. 현재 이 차량에는 openpilot 롱컨트롤을 사용할 수 없습니다. @@ -1014,6 +1002,18 @@ location set Show map on left side when in split screen view. 분할 화면 보기에서 지도를 왼쪽에 표시합니다. + + Experimental mode + + + + <b>WARNING: openpilot longitudinal control is experimental for this car and will disable AEB.</b><br> openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. + + + + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. + + Updater diff --git a/selfdrive/ui/translations/main_pt-BR.ts b/selfdrive/ui/translations/main_pt-BR.ts index 6774555b73..a5187af50f 100644 --- a/selfdrive/ui/translations/main_pt-BR.ts +++ b/selfdrive/ui/translations/main_pt-BR.ts @@ -970,22 +970,10 @@ trabalho definido Upload data from the driver facing camera and help improve the driver monitoring algorithm. Upload dados da câmera voltada para o motorista e ajude a melhorar o algoritmo de monitoramentor. - - 🌮 End-to-end longitudinal (extremely alpha) 🌮 - 🌮 End-to-end longitudinal (experimental) 🌮 - Experimental openpilot longitudinal control Controle longitudinal experimental openpilot - - <b>WARNING: openpilot longitudinal control is experimental for this car and will disable AEB.</b> - <b>AVISO: o controle longitudinal openpilot é experimental para este carro e irá desabilitar AEB.</b> - - - Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would. Super experimental. - Deixe o modelo controlar o acelerador e os freios. openpilot irá conduzir como pensa que um humano faria. Super experimental. - openpilot longitudinal control is not currently available for this car. controle longitudinal openpilot não está disponível para este carro. @@ -1018,6 +1006,18 @@ trabalho definido Show map on left side when in split screen view. Exibir mapa do lado esquerdo quando a tela for dividida. + + Experimental mode + + + + <b>WARNING: openpilot longitudinal control is experimental for this car and will disable AEB.</b><br> openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. + + + + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. + + Updater diff --git a/selfdrive/ui/translations/main_zh-CHS.ts b/selfdrive/ui/translations/main_zh-CHS.ts index 6189a235e8..44e707e49c 100644 --- a/selfdrive/ui/translations/main_zh-CHS.ts +++ b/selfdrive/ui/translations/main_zh-CHS.ts @@ -964,22 +964,10 @@ location set Upload data from the driver facing camera and help improve the driver monitoring algorithm. 上传驾驶员摄像头的数据，帮助改进驾驶员监控算法。 - - 🌮 End-to-end longitudinal (extremely alpha) 🌮 - 🌮 端对端纵向控制（实验性功能） 🌮 - Experimental openpilot longitudinal control - - <b>WARNING: openpilot longitudinal control is experimental for this car and will disable AEB.</b> - - - - Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would. Super experimental. - 让驾驶模型直接控制油门和刹车，openpilot将会模仿人类司机的驾驶方式。该功能仍非常实验性。 - openpilot longitudinal control is not currently available for this car. @@ -1012,6 +1000,18 @@ location set Show map on left side when in split screen view. 在分屏模式中，将地图置于屏幕左侧。 + + Experimental mode + + + + <b>WARNING: openpilot longitudinal control is experimental for this car and will disable AEB.</b><br> openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. + + + + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. + + Updater diff --git a/selfdrive/ui/translations/main_zh-CHT.ts b/selfdrive/ui/translations/main_zh-CHT.ts index 0b0dbe4ae5..274cff3a5a 100644 --- a/selfdrive/ui/translations/main_zh-CHT.ts +++ b/selfdrive/ui/translations/main_zh-CHT.ts @@ -966,22 +966,10 @@ location set Upload data from the driver facing camera and help improve the driver monitoring algorithm. 上傳駕駛監控的錄像來協助我們提升駕駛監控的準確率。 - - 🌮 End-to-end longitudinal (extremely alpha) 🌮 - 🌮 端對端縱向控制（實驗性功能） 🌮 - Experimental openpilot longitudinal control 使用 openpilot 縱向控制（實驗） - - <b>WARNING: openpilot longitudinal control is experimental for this car and will disable AEB.</b> - <b>注意：這台車的 openpilot 縱向控制仍然是實驗中的功能，開啟這功能將會關閉自動緊急煞車 (AEB)。</b> - - - Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would. Super experimental. - 讓駕駛模型直接控製油門和剎車，openpilot將會模仿人類司機的駕駛方式。該功能仍非常實驗性。 - openpilot longitudinal control is not currently available for this car. openpilot 縱向控制目前不適用於這輛車。 @@ -1014,6 +1002,18 @@ location set Show map on left side when in split screen view. 進入分割畫面後，地圖將會顯示在畫面的左側。 + + Experimental mode + + + + <b>WARNING: openpilot longitudinal control is experimental for this car and will disable AEB.</b><br> openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. + + + + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. + + Updater diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index 945218ec11..970448359e 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -174,7 +174,7 @@ void ui_update_params(UIState *s) { auto params = Params(); s->scene.is_metric = params.getBool("IsMetric"); s->scene.map_on_left = params.getBool("NavSettingLeftSide"); - s->scene.end_to_end_long = params.getBool("EndToEndLong"); + s->scene.experimental_mode = params.getBool("ExperimentalMode"); } void UIState::updateStatus() { diff --git a/selfdrive/ui/ui.h b/selfdrive/ui/ui.h index e550afd5f2..38e2ffe3ce 100644 --- a/selfdrive/ui/ui.h +++ b/selfdrive/ui/ui.h @@ -104,7 +104,7 @@ typedef struct UIScene { QPointF lead_vertices[2]; float light_sensor; - bool started, ignition, is_metric, map_on_left, longitudinal_control, end_to_end_long; + bool started, ignition, is_metric, map_on_left, longitudinal_control, experimental_mode; uint64_t started_frame; } UIScene; From 191b8081b2a9f3f9db0131edd270e40166570cfa Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 8 Nov 2022 20:52:35 -0800 Subject: [PATCH 057/184] GM Camera: use ECM brake pressed bit (#26400) * GM camera: use ECM brake pressed bit * bump panda and use more reliable bit * bump panda * back to ECMEngineStatus * bump * Update selfdrive/car/gm/carstate.py * bump panda * Update ref_commit --- panda | 2 +- selfdrive/car/gm/carstate.py | 14 +++++++++----- selfdrive/test/process_replay/ref_commit | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/panda b/panda index 1ccdff90c5..281eb7731b 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit 1ccdff90c564154489a3394691a4830a4ae19027 +Subproject commit 281eb7731b4338fef049977593fdf3315adf09e9 diff --git a/selfdrive/car/gm/carstate.py b/selfdrive/car/gm/carstate.py index af69307a2c..f4b3f88e99 100644 --- a/selfdrive/car/gm/carstate.py +++ b/selfdrive/car/gm/carstate.py @@ -51,12 +51,15 @@ class CarState(CarStateBase): else: ret.gearShifter = self.parse_gear_shifter(self.shifter_values.get(pt_cp.vl["ECMPRDNL2"]["PRNDL2"], None)) - # Some Volt 2016-17 have loose brake pedal push rod retainers which causes the ECM to believe - # that the brake is being intermittently pressed without user interaction. - # To avoid a cruise fault we need to match the ECM's brake pressed signal and threshold - # https://static.nhtsa.gov/odi/tsbs/2017/MC-10137629-9999.pdf ret.brake = pt_cp.vl["ECMAcceleratorPos"]["BrakePedalPos"] - ret.brakePressed = ret.brake >= 8 + if self.CP.networkLocation == NetworkLocation.fwdCamera: + ret.brakePressed = pt_cp.vl["ECMEngineStatus"]["BrakePressed"] != 0 + else: + # Some Volt 2016-17 have loose brake pedal push rod retainers which causes the ECM to believe + # that the brake is being intermittently pressed without user interaction. + # To avoid a cruise fault we need to use a conservative brake position threshold + # https://static.nhtsa.gov/odi/tsbs/2017/MC-10137629-9999.pdf + ret.brakePressed = ret.brake >= 8 # Regen braking is braking if self.CP.transmissionType == TransmissionType.direct: @@ -154,6 +157,7 @@ class CarState(CarStateBase): ("TractionControlOn", "ESPStatus"), ("ParkBrake", "VehicleIgnitionAlt"), ("CruiseMainOn", "ECMEngineStatus"), + ("BrakePressed", "ECMEngineStatus"), ] checks = [ diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index 08eb063d41..da954d76a6 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -caa8fb2a046a6c2c186e66af339212a5fae6b7a4 +372a67c524342bbf15e22f0caea08d2038973281 From 9f1fe1193c4779f692028e1b054d4c76b6e55119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Sch=C3=A4fer?= Date: Tue, 8 Nov 2022 21:57:01 -0800 Subject: [PATCH 058/184] Update RELEASES.md --- RELEASES.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/RELEASES.md b/RELEASES.md index e175050eaf..18817bda4d 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,7 +1,11 @@ Version 0.8.17 (2022-11-XX) ======================== * New driving model - * Internal feature space accuracy increased tenfold during training, this makes the model dramatically more accurate. + * Internal feature space information content increased tenfold during training (to ~700 bits), this makes the model dramatically more accurate + * Less reliance on previous frames makes model more reactive and snappy + * Trained in new reprojective simulator + * Model trained in openpilot was trained in 36hrs from scratch, compared to around 1 week of previous releases + * Model training now simulates lateral and longitudinal behavior, this allows openpilot to slow down for turns, stop at traffic lights, etc,... in experimental mode * New driver monitoring model * New end-to-end distracted trigger * Experimental driving mode From 34f580e75ee148398e6a44980053c20bf10f9797 Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Wed, 9 Nov 2022 04:55:37 -0500 Subject: [PATCH 059/184] VW PQ: Fix exception with openpilot longitudinal (#26417) * VW PQ: Fix exception in long control * move default value to init --- selfdrive/car/volkswagen/carstate.py | 1 + 1 file changed, 1 insertion(+) diff --git a/selfdrive/car/volkswagen/carstate.py b/selfdrive/car/volkswagen/carstate.py index d09420cf7a..def14ab019 100644 --- a/selfdrive/car/volkswagen/carstate.py +++ b/selfdrive/car/volkswagen/carstate.py @@ -12,6 +12,7 @@ class CarState(CarStateBase): super().__init__(CP) self.CCP = CarControllerParams(CP) self.button_states = {button.event_type: False for button in self.CCP.BUTTONS} + self.esp_hold_confirmation = False def create_button_events(self, pt_cp, buttons): button_events = [] From fc872271ae73a0139be6b085b90467c2e8d83c66 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Thu, 10 Nov 2022 03:10:57 +0800 Subject: [PATCH 060/184] Cabana: add menu bar to main window (#26419) * add menu bar * show DBC name in title * cleanup --- tools/cabana/chartswidget.cc | 1 + tools/cabana/mainwin.cc | 197 ++++++++++++++--------------------- tools/cabana/mainwin.h | 36 ++----- 3 files changed, 87 insertions(+), 147 deletions(-) diff --git a/tools/cabana/chartswidget.cc b/tools/cabana/chartswidget.cc index b4d6d89e6d..812a805810 100644 --- a/tools/cabana/chartswidget.cc +++ b/tools/cabana/chartswidget.cc @@ -14,6 +14,7 @@ ChartsWidget::ChartsWidget(QWidget *parent) : QWidget(parent) { QVBoxLayout *main_layout = new QVBoxLayout(this); + main_layout->setContentsMargins(0, 0, 0, 0); // toolbar QToolBar *toolbar = new QToolBar(tr("Charts"), this); diff --git a/tools/cabana/mainwin.cc b/tools/cabana/mainwin.cc index d3d7ff4156..9b85ba7e8d 100644 --- a/tools/cabana/mainwin.cc +++ b/tools/cabana/mainwin.cc @@ -1,14 +1,17 @@ #include "tools/cabana/mainwin.h" #include +#include #include -#include #include #include #include #include -#include +#include +#include +#include #include +#include #include #include "tools/replay/util.h" @@ -18,15 +21,13 @@ void qLogMessageHandler(QtMsgType type, const QMessageLogContext &context, const if (main_win) emit main_win->showMessage(msg, 0); } -MainWindow::MainWindow() : QWidget() { - QVBoxLayout *main_layout = new QVBoxLayout(this); - main_layout->setContentsMargins(11, 11, 11, 5); +MainWindow::MainWindow() : QMainWindow() { + setWindowTitle("Cabana"); + QWidget *central_widget = new QWidget(this); + QHBoxLayout *main_layout = new QHBoxLayout(central_widget); + main_layout->setContentsMargins(11, 11, 11, 0); main_layout->setSpacing(0); - QHBoxLayout *h_layout = new QHBoxLayout(); - h_layout->setContentsMargins(0, 0, 0, 0); - main_layout->addLayout(h_layout); - splitter = new QSplitter(Qt::Horizontal, this); splitter->setHandleWidth(11); @@ -34,7 +35,6 @@ MainWindow::MainWindow() : QWidget() { QWidget *messages_container = new QWidget(this); QVBoxLayout *messages_layout = new QVBoxLayout(messages_container); messages_layout->setContentsMargins(0, 0, 0, 0); - QHBoxLayout *dbc_file_layout = new QHBoxLayout(); dbc_combo = new QComboBox(this); auto dbc_names = dbc()->allDBCNames(); for (const auto &name : dbc_names) { @@ -42,21 +42,9 @@ MainWindow::MainWindow() : QWidget() { } dbc_combo->model()->sort(0); dbc_combo->setEditable(true); - dbc_combo->setCurrentText(QString()); dbc_combo->setInsertPolicy(QComboBox::NoInsert); dbc_combo->completer()->setCompletionMode(QCompleter::PopupCompletion); - QFont font; - font.setBold(true); - dbc_combo->lineEdit()->setFont(font); - dbc_file_layout->addWidget(dbc_combo); - - QPushButton *load_from_paste = new QPushButton(tr("Load from paste"), this); - dbc_file_layout->addWidget(load_from_paste); - - dbc_file_layout->addStretch(); - QPushButton *save_btn = new QPushButton(tr("Save DBC"), this); - dbc_file_layout->addWidget(save_btn); - messages_layout->addLayout(dbc_file_layout); + messages_layout->addWidget(dbc_combo); messages_widget = new MessagesWidget(this); messages_layout->addWidget(messages_widget); @@ -65,8 +53,7 @@ MainWindow::MainWindow() : QWidget() { charts_widget = new ChartsWidget(this); detail_widget = new DetailWidget(charts_widget, this); splitter->addWidget(detail_widget); - - h_layout->addWidget(splitter); + main_layout->addWidget(splitter); // right widgets QWidget *right_container = new QWidget(this); @@ -74,35 +61,21 @@ MainWindow::MainWindow() : QWidget() { r_layout = new QVBoxLayout(right_container); r_layout->setContentsMargins(11, 0, 0, 0); QHBoxLayout *right_hlayout = new QHBoxLayout(); - QLabel *fingerprint_label = new QLabel(this); - right_hlayout->addWidget(fingerprint_label); + fingerprint_label = new QLabel(this); + right_hlayout->addWidget(fingerprint_label, 0, Qt::AlignLeft); // TODO: click to select another route. - right_hlayout->addWidget(new QLabel(can->route())); - QPushButton *settings_btn = new QPushButton("Settings"); - right_hlayout->addWidget(settings_btn, 0, Qt::AlignRight); - + right_hlayout->addWidget(new QLabel(can->route()), 0, Qt::AlignRight); r_layout->addLayout(right_hlayout); video_widget = new VideoWidget(this); r_layout->addWidget(video_widget, 0, Qt::AlignTop); - r_layout->addWidget(charts_widget); + main_layout->addWidget(right_container); - h_layout->addWidget(right_container); - - // status bar - status_bar = new QStatusBar(this); - status_bar->setFixedHeight(20); - status_bar->setContentsMargins(0, 0, 0, 0); - status_bar->setSizeGripEnabled(true); - progress_bar = new QProgressBar(); - progress_bar->setRange(0, 100); - progress_bar->setTextVisible(true); - progress_bar->setFixedSize({230, 16}); - progress_bar->setVisible(false); - status_bar->addPermanentWidget(progress_bar); - main_layout->addWidget(status_bar); + setCentralWidget(central_widget); + createActions(); + createStatusBar(); qRegisterMetaType("uint64_t"); qRegisterMetaType("ReplyMsgType"); @@ -122,35 +95,65 @@ MainWindow::MainWindow() : QWidget() { } QObject::connect(dbc_combo, SIGNAL(activated(const QString &)), SLOT(loadDBCFromName(const QString &))); - QObject::connect(load_from_paste, &QPushButton::clicked, this, &MainWindow::loadDBCFromPaste); - QObject::connect(save_btn, &QPushButton::clicked, this, &MainWindow::saveDBC); - QObject::connect(this, &MainWindow::showMessage, status_bar, &QStatusBar::showMessage); + QObject::connect(this, &MainWindow::showMessage, statusBar(), &QStatusBar::showMessage); QObject::connect(this, &MainWindow::updateProgressBar, this, &MainWindow::updateDownloadProgress); QObject::connect(messages_widget, &MessagesWidget::msgSelectionChanged, detail_widget, &DetailWidget::setMessage); QObject::connect(charts_widget, &ChartsWidget::dock, this, &MainWindow::dockCharts); QObject::connect(charts_widget, &ChartsWidget::rangeChanged, video_widget, &VideoWidget::rangeChanged); - QObject::connect(settings_btn, &QPushButton::clicked, this, &MainWindow::setOption); QObject::connect(can, &CANMessages::streamStarted, this, &MainWindow::loadDBCFromFingerprint); - QObject::connect(can, &CANMessages::streamStarted, [=]() { fingerprint_label->setText(can->carFingerprint() ); }); + QObject::connect(dbc(), &DBCManager::DBCFileChanged, [this]() { + dbc_combo->setCurrentText(QFileInfo(dbc()->name()).baseName()); + setWindowTitle(tr("%1 - Cabana").arg(dbc()->name())); + }); +} + +void MainWindow::createActions() { + QMenu *file_menu = menuBar()->addMenu(tr("&File")); + file_menu->addAction(tr("Open DBC File..."), this, &MainWindow::loadDBCFromFile); + file_menu->addAction(tr("Load DBC From Clipboard"), this, &MainWindow::loadDBCFromClipboard); + file_menu->addSeparator(); + file_menu->addAction(tr("Save DBC As..."), this, &MainWindow::saveDBCToFile); + file_menu->addAction(tr("Copy DBC To Clipboard"), this, &MainWindow::saveDBCToClipboard); + file_menu->addSeparator(); + file_menu->addAction(tr("Settings..."), this, &MainWindow::setOption); + QMenu *help_menu = menuBar()->addMenu(tr("&Help")); + help_menu->addAction(tr("About &Qt"), qApp, &QApplication::aboutQt); +} + +void MainWindow::createStatusBar() { + progress_bar = new QProgressBar(); + progress_bar->setRange(0, 100); + progress_bar->setTextVisible(true); + progress_bar->setFixedSize({230, 16}); + progress_bar->setVisible(false); + statusBar()->addPermanentWidget(progress_bar); } void MainWindow::loadDBCFromName(const QString &name) { - if (name != dbc()->name()) { + if (name != dbc()->name()) dbc()->open(name); - dbc_combo->setCurrentText(name); - } } -void MainWindow::loadDBCFromPaste() { - LoadDBCDialog dlg(this); - if (dlg.exec()) { - dbc()->open("from paste", dlg.dbc_edit->toPlainText()); - dbc_combo->setCurrentText("loaded from paste"); +void MainWindow::loadDBCFromFile() { + QString file_name = QFileDialog::getOpenFileName(this, tr("Open File"), QDir::homePath(), "DBC (*.dbc)"); + if (!file_name.isEmpty()) { + QFile file(file_name); + if (file.open(QIODevice::ReadOnly)) { + auto dbc_name = QFileInfo(file_name).baseName(); + dbc()->open(dbc_name, file.readAll()); + } } } +void MainWindow::loadDBCFromClipboard() { + QString dbc_str = QGuiApplication::clipboard()->text(); + dbc()->open("From Clipboard", dbc_str); + QMessageBox::information(this, tr("Load From Clipboard"), tr("DBC Successfully Loaded!")); +} + void MainWindow::loadDBCFromFingerprint() { auto fingerprint = can->carFingerprint(); + fingerprint_label->setText(fingerprint); if (!fingerprint.isEmpty() && dbc()->name().isEmpty()) { auto dbc_name = fingerprint_to_dbc[fingerprint]; if (dbc_name != QJsonValue::Undefined) { @@ -159,14 +162,23 @@ void MainWindow::loadDBCFromFingerprint() { } } -void MainWindow::saveDBC() { - SaveDBCDialog dlg(this); - dlg.dbc_edit->setText(dbc()->generateDBC()); - dlg.exec(); +void MainWindow::saveDBCToFile() { + QString file_name = QFileDialog::getSaveFileName(this, tr("Save File"), + QDir::homePath() + "/untitled.dbc", tr("DBC (*.dbc)")); + if (!file_name.isEmpty()) { + QFile file(file_name); + if (file.open(QIODevice::WriteOnly)) + file.write(dbc()->generateDBC().toUtf8()); + } +} + +void MainWindow::saveDBCToClipboard() { + QGuiApplication::clipboard()->setText(dbc()->generateDBC()); + QMessageBox::information(this, tr("Copy To Clipboard"), tr("DBC Successfully copied!")); } void MainWindow::updateDownloadProgress(uint64_t cur, uint64_t total, bool success) { - if (success && cur < total) { + if (success && cur < total) { progress_bar->setValue((cur / (double)total) * 100); progress_bar->setFormat(tr("Downloading %p% (%1)").arg(formattedDataSize(total).c_str())); progress_bar->show(); @@ -202,60 +214,3 @@ void MainWindow::setOption() { SettingsDlg dlg(this); dlg.exec(); } - -// LoadDBCDialog - -LoadDBCDialog::LoadDBCDialog(QWidget *parent) : QDialog(parent) { - QVBoxLayout *main_layout = new QVBoxLayout(this); - dbc_edit = new QTextEdit(this); - dbc_edit->setAcceptRichText(false); - dbc_edit->setPlaceholderText(tr("paste DBC file here")); - main_layout->addWidget(dbc_edit); - auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); - main_layout->addWidget(buttonBox); - - setMinimumSize({640, 480}); - QObject::connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); - QObject::connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); -} - -// SaveDBCDialog - -SaveDBCDialog::SaveDBCDialog(QWidget *parent) : QDialog(parent) { - setWindowTitle(tr("Save DBC")); - QVBoxLayout *main_layout = new QVBoxLayout(this); - dbc_edit = new QTextEdit(this); - dbc_edit->setAcceptRichText(false); - main_layout->addWidget(dbc_edit); - - QPushButton *copy_to_clipboard = new QPushButton(tr("Copy To Clipboard"), this); - QPushButton *save_as = new QPushButton(tr("Save As"), this); - - QHBoxLayout *btn_layout = new QHBoxLayout(); - btn_layout->addStretch(); - btn_layout->addWidget(copy_to_clipboard); - btn_layout->addWidget(save_as); - main_layout->addLayout(btn_layout); - setMinimumSize({640, 480}); - - QObject::connect(copy_to_clipboard, &QPushButton::clicked, this, &SaveDBCDialog::copytoClipboard); - QObject::connect(save_as, &QPushButton::clicked, this, &SaveDBCDialog::saveAs); -} - -void SaveDBCDialog::copytoClipboard() { - dbc_edit->selectAll(); - dbc_edit->copy(); - QDialog::accept(); -} - -void SaveDBCDialog::saveAs() { - QString file_name = QFileDialog::getSaveFileName(this, tr("Save File"), - QDir::homePath() + "/untitled.dbc", tr("DBC (*.dbc)")); - if (!file_name.isEmpty()) { - QFile file(file_name); - if (file.open(QIODevice::WriteOnly)) { - file.write(dbc_edit->toPlainText().toUtf8()); - } - QDialog::accept(); - } -} diff --git a/tools/cabana/mainwin.h b/tools/cabana/mainwin.h index f6853a5ea3..bb9280c3ea 100644 --- a/tools/cabana/mainwin.h +++ b/tools/cabana/mainwin.h @@ -1,37 +1,40 @@ #pragma once #include -#include #include +#include #include #include #include -#include #include "tools/cabana/chartswidget.h" #include "tools/cabana/detailwidget.h" #include "tools/cabana/messageswidget.h" #include "tools/cabana/videowidget.h" -class MainWindow : public QWidget { +class MainWindow : public QMainWindow { Q_OBJECT public: MainWindow(); void dockCharts(bool dock); - void showStatusMessage(const QString &msg, int timeout = 0) { status_bar->showMessage(msg, timeout); } + void showStatusMessage(const QString &msg, int timeout = 0) { statusBar()->showMessage(msg, timeout); } public slots: void loadDBCFromName(const QString &name); void loadDBCFromFingerprint(); - void loadDBCFromPaste(); - void saveDBC(); + void loadDBCFromFile(); + void loadDBCFromClipboard(); + void saveDBCToFile(); + void saveDBCToClipboard(); signals: void showMessage(const QString &msg, int timeout); void updateProgressBar(uint64_t cur, uint64_t total, bool success); protected: + void createActions(); + void createStatusBar(); void closeEvent(QCloseEvent *event) override; void updateDownloadProgress(uint64_t cur, uint64_t total, bool success); void setOption(); @@ -44,26 +47,7 @@ protected: QWidget *floating_window = nullptr; QVBoxLayout *r_layout; QProgressBar *progress_bar; - QStatusBar *status_bar; + QLabel *fingerprint_label; QJsonDocument fingerprint_to_dbc; QComboBox *dbc_combo; }; - - -class LoadDBCDialog : public QDialog { - Q_OBJECT - -public: - LoadDBCDialog(QWidget *parent); - QTextEdit *dbc_edit; -}; - -class SaveDBCDialog : public QDialog { - Q_OBJECT - -public: - SaveDBCDialog(QWidget *parent); - void copytoClipboard(); - void saveAs(); - QTextEdit *dbc_edit; -}; From c64e2c228a57dd82685f9ca4251c49e953e1ac69 Mon Sep 17 00:00:00 2001 From: Vivek Aithal Date: Wed, 9 Nov 2022 12:09:55 -0800 Subject: [PATCH 061/184] [controlsd] Toyota Rav4 TSS2 bugfix (#26421) bugfix toyota rav4 pid init values --- selfdrive/car/toyota/interface.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/selfdrive/car/toyota/interface.py b/selfdrive/car/toyota/interface.py index 6c360fc2c7..3f4edb36d2 100644 --- a/selfdrive/car/toyota/interface.py +++ b/selfdrive/car/toyota/interface.py @@ -111,6 +111,8 @@ class CarInterface(CarInterfaceBase): tire_stiffness_factor = 0.7933 ret.mass = 3585. * CV.LB_TO_KG + STD_CARGO_KG # Average between ICE and Hybrid ret.lateralTuning.init('pid') + ret.lateralTuning.pid.kiBP = [0.0] + ret.lateralTuning.pid.kpBP = [0.0] ret.lateralTuning.pid.kpV = [0.6] ret.lateralTuning.pid.kiV = [0.1] ret.lateralTuning.pid.kf = 0.00007818594 From 0ca9d1810c39d96ec0ebefc80df16dd68eb3387e Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 9 Nov 2022 12:10:08 -0800 Subject: [PATCH 062/184] interrfaces: more complete PID tests (#26422) * more complete PID tests * doesn't need to be fancy * less fancy --- selfdrive/car/tests/test_car_interfaces.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/selfdrive/car/tests/test_car_interfaces.py b/selfdrive/car/tests/test_car_interfaces.py index aabf652c8c..8d22173671 100755 --- a/selfdrive/car/tests/test_car_interfaces.py +++ b/selfdrive/car/tests/test_car_interfaces.py @@ -34,15 +34,18 @@ class TestCarInterfaces(unittest.TestCase): self.assertGreater(car_params.maxLateralAccel, 0) if car_params.steerControlType != car.CarParams.SteerControlType.angle: - tuning = car_params.lateralTuning.which() - if tuning == 'pid': - self.assertTrue(len(car_params.lateralTuning.pid.kpV)) - elif tuning == 'torque': - kf = car_params.lateralTuning.torque.kf - self.assertTrue(not math.isnan(kf) and kf > 0) - self.assertTrue(not math.isnan(car_params.lateralTuning.torque.friction)) - elif tuning == 'indi': - self.assertTrue(len(car_params.lateralTuning.indi.outerLoopGainV)) + tune = car_params.lateralTuning + if tune.which() == 'pid': + self.assertTrue(not math.isnan(tune.pid.kf) and tune.pid.kf > 0) + self.assertTrue(len(tune.pid.kpV) > 0 and len(tune.pid.kpV) == len(tune.pid.kpBP)) + self.assertTrue(len(tune.pid.kiV) > 0 and len(tune.pid.kiV) == len(tune.pid.kiBP)) + + elif tune.which() == 'torque': + self.assertTrue(not math.isnan(tune.torque.kf) and tune.torque.kf > 0) + self.assertTrue(not math.isnan(tune.torque.friction)) + + elif tune.which() == 'indi': + self.assertTrue(len(tune.indi.outerLoopGainV)) # Run car interface CC = car.CarControl.new_message() From 59bf2fc0085420b13b7854d1a106c1706d7df265 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Thu, 10 Nov 2022 06:19:11 +0800 Subject: [PATCH 063/184] Cabana: support deleting message (#26418) delete message --- tools/cabana/chartswidget.cc | 8 ++++-- tools/cabana/dbcmanager.cc | 33 ++++++++++++++++-------- tools/cabana/dbcmanager.h | 5 +++- tools/cabana/detailwidget.cc | 46 +++++++++++++++++++++------------- tools/cabana/detailwidget.h | 5 +++- tools/cabana/messageswidget.cc | 9 ++++--- 6 files changed, 71 insertions(+), 35 deletions(-) diff --git a/tools/cabana/chartswidget.cc b/tools/cabana/chartswidget.cc index 812a805810..3a170bccdc 100644 --- a/tools/cabana/chartswidget.cc +++ b/tools/cabana/chartswidget.cc @@ -45,9 +45,13 @@ ChartsWidget::ChartsWidget(QWidget *parent) : QWidget(parent) { QObject::connect(dbc(), &DBCManager::DBCFileChanged, [this]() { removeAll(nullptr); }); QObject::connect(dbc(), &DBCManager::signalRemoved, this, &ChartsWidget::removeAll); QObject::connect(dbc(), &DBCManager::signalUpdated, this, &ChartsWidget::signalUpdated); - QObject::connect(dbc(), &DBCManager::msgUpdated, [this](const QString &msg_id) { + QObject::connect(dbc(), &DBCManager::msgRemoved, [this](uint32_t address) { + for (auto c : charts.toVector()) + if (DBCManager::parseId(c->id).second == address) removeChart(c); + }); + QObject::connect(dbc(), &DBCManager::msgUpdated, [this](uint32_t address) { for (auto c : charts) { - if (c->id == msg_id) c->updateTitle(); + if (DBCManager::parseId(c->id).second == address) c->updateTitle(); } }); QObject::connect(can, &CANMessages::eventsMerged, this, &ChartsWidget::eventsMerged); diff --git a/tools/cabana/dbcmanager.cc b/tools/cabana/dbcmanager.cc index 3ddcf41788..184fab38eb 100644 --- a/tools/cabana/dbcmanager.cc +++ b/tools/cabana/dbcmanager.cc @@ -10,21 +10,21 @@ DBCManager::~DBCManager() {} void DBCManager::open(const QString &dbc_file_name) { dbc = const_cast(dbc_lookup(dbc_file_name.toStdString())); - msg_map.clear(); - for (auto &msg : dbc->msgs) { - msg_map[msg.address] = &msg; - } + updateMsgMap(); emit DBCFileChanged(); } void DBCManager::open(const QString &name, const QString &content) { std::istringstream stream(content.toStdString()); dbc = const_cast(dbc_parse_from_stream(name.toStdString(), stream)); + updateMsgMap(); + emit DBCFileChanged(); +} + +void DBCManager::updateMsgMap() { msg_map.clear(); - for (auto &msg : dbc->msgs) { + for (auto &msg : dbc->msgs) msg_map[msg.address] = &msg; - } - emit DBCFileChanged(); } QString DBCManager::generateDBC() { @@ -49,14 +49,25 @@ QString DBCManager::generateDBC() { } void DBCManager::updateMsg(const QString &id, const QString &name, uint32_t size) { - if (auto m = const_cast(msg(id))) { + auto [bus, address] = parseId(id); + if (auto m = const_cast(msg(address))) { m->name = name.toStdString(); m->size = size; } else { - m = &dbc->msgs.emplace_back(Msg{.address = parseId(id).second, .name = name.toStdString(), .size = size}); - msg_map[m->address] = m; + m = &dbc->msgs.emplace_back(Msg{.address = address, .name = name.toStdString(), .size = size}); + msg_map[address] = m; + } + emit msgUpdated(address); +} + +void DBCManager::removeMsg(const QString &id) { + uint32_t address = parseId(id).second; + auto it = std::find_if(dbc->msgs.begin(), dbc->msgs.end(), [address](auto &m) { return m.address == address; }); + if (it != dbc->msgs.end()) { + dbc->msgs.erase(it); + updateMsgMap(); + emit msgRemoved(address); } - emit msgUpdated(id); } void DBCManager::addSignal(const QString &id, const Signal &sig) { diff --git a/tools/cabana/dbcmanager.h b/tools/cabana/dbcmanager.h index cbe4531d2a..2b6aca41d7 100644 --- a/tools/cabana/dbcmanager.h +++ b/tools/cabana/dbcmanager.h @@ -23,6 +23,7 @@ public: inline QString name() const { return dbc ? dbc->name.c_str() : ""; } void updateMsg(const QString &id, const QString &name, uint32_t size); + void removeMsg(const QString &id); inline const DBC *getDBC() const { return dbc; } inline const Msg *msg(const QString &id) const { return msg(parseId(id).second); } inline const Msg *msg(uint32_t address) const { @@ -34,10 +35,12 @@ signals: void signalAdded(const Signal *sig); void signalRemoved(const Signal *sig); void signalUpdated(const Signal *sig); - void msgUpdated(const QString &id); + void msgUpdated(uint32_t address); + void msgRemoved(uint32_t address); void DBCFileChanged(); private: + void updateMsgMap(); DBC *dbc = nullptr; std::unordered_map msg_map; }; diff --git a/tools/cabana/detailwidget.cc b/tools/cabana/detailwidget.cc index 18510c86ea..287c75a617 100644 --- a/tools/cabana/detailwidget.cc +++ b/tools/cabana/detailwidget.cc @@ -33,20 +33,21 @@ DetailWidget::DetailWidget(ChartsWidget *charts, QWidget *parent) : charts(chart title_frame->setFrameShape(QFrame::StyledPanel); // message title - QHBoxLayout *title_layout = new QHBoxLayout(); - title_layout->addWidget(new QLabel("time:")); + toolbar = new QToolBar(this); + toolbar->addWidget(new QLabel("time:")); time_label = new QLabel(this); time_label->setStyleSheet("font-weight:bold"); - title_layout->addWidget(time_label); - title_layout->addStretch(); + toolbar->addWidget(time_label); name_label = new QLabel(this); name_label->setStyleSheet("font-weight:bold;"); - title_layout->addWidget(name_label); - title_layout->addStretch(); - edit_btn = new QPushButton(tr("Edit"), this); - edit_btn->setVisible(false); - title_layout->addWidget(edit_btn); - frame_layout->addLayout(title_layout); + name_label->setAlignment(Qt::AlignCenter); + name_label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); + toolbar->addWidget(name_label); + toolbar->addAction("🖍", this, &DetailWidget::editMsg)->setToolTip(tr("Edit Message")); + remove_msg_act = toolbar->addAction("X", this, &DetailWidget::removeMsg); + remove_msg_act->setToolTip(tr("Remove Message")); + toolbar->setVisible(false); + frame_layout->addWidget(toolbar); // warning warning_widget = new QWidget(this); @@ -85,7 +86,6 @@ DetailWidget::DetailWidget(ChartsWidget *charts, QWidget *parent) : charts(chart history_log = new HistoryLog(this); container_layout->addWidget(history_log); - QObject::connect(edit_btn, &QPushButton::clicked, this, &DetailWidget::editMsg); QObject::connect(binary_view, &BinaryView::resizeSignal, this, &DetailWidget::resizeSignal); QObject::connect(binary_view, &BinaryView::addSignal, this, &DetailWidget::addSignal); QObject::connect(can, &CANMessages::updated, this, &DetailWidget::updateState); @@ -171,7 +171,8 @@ void DetailWidget::dbcMsgChanged(int show_form_idx) { warnings.push_back(tr("Message size (%1) is incorrect.").arg(msg->size)); } - edit_btn->setVisible(true); + toolbar->setVisible(!msg_id.isEmpty()); + remove_msg_act->setEnabled(msg != nullptr); name_label->setText(msgName(msg_id)); binary_view->setMessage(msg_id); @@ -210,16 +211,27 @@ void DetailWidget::updateChartState(const QString &id, const Signal *sig, bool o } void DetailWidget::editMsg() { - auto msg = dbc()->msg(msg_id); - QString name = msgName(msg_id); - int size = msg ? msg->size : can->lastMessage(msg_id).dat.size(); - EditMessageDialog dlg(msg_id, name, size, this); + QString id = msg_id; + auto msg = dbc()->msg(id); + int size = msg ? msg->size : can->lastMessage(id).dat.size(); + EditMessageDialog dlg(id, msgName(id), size, this); if (dlg.exec()) { - dbc()->updateMsg(msg_id, dlg.name_edit->text(), dlg.size_spin->value()); + dbc()->updateMsg(id, dlg.name_edit->text(), dlg.size_spin->value()); dbcMsgChanged(); } } +void DetailWidget::removeMsg() { + QString id = msg_id; + if (auto msg = dbc()->msg(id)) { + QString text = tr("Are you sure you want to remove '%1'").arg(msg->name.c_str()); + if (QMessageBox::Yes == QMessageBox::question(this, tr("Remove Message"), text)) { + dbc()->removeMsg(id); + dbcMsgChanged(); + } + } +} + void DetailWidget::addSignal(int from, int to) { if (auto msg = dbc()->msg(msg_id)) { Signal sig = {}; diff --git a/tools/cabana/detailwidget.h b/tools/cabana/detailwidget.h index ac32d5952e..7cb3a505ee 100644 --- a/tools/cabana/detailwidget.h +++ b/tools/cabana/detailwidget.h @@ -2,6 +2,7 @@ #include #include +#include #include "tools/cabana/binaryview.h" #include "tools/cabana/chartswidget.h" @@ -34,15 +35,17 @@ private: void saveSignal(const Signal *sig, const Signal &new_sig); void removeSignal(const Signal *sig); void editMsg(); + void removeMsg(); void showForm(); void updateState(); QString msg_id; QLabel *name_label, *time_label, *warning_label; QWidget *warning_widget; - QPushButton *edit_btn; QWidget *signals_container; QTabBar *tabbar; + QToolBar *toolbar; + QAction *remove_msg_act; HistoryLog *history_log; BinaryView *binary_view; QScrollArea *scroll; diff --git a/tools/cabana/messageswidget.cc b/tools/cabana/messageswidget.cc index f24b6b0317..dbf87a3da2 100644 --- a/tools/cabana/messageswidget.cc +++ b/tools/cabana/messageswidget.cc @@ -38,15 +38,18 @@ MessagesWidget::MessagesWidget(QWidget *parent) : QWidget(parent) { QObject::connect(can, &CANMessages::msgsReceived, model, &MessageListModel::msgsReceived); QObject::connect(dbc(), &DBCManager::DBCFileChanged, model, &MessageListModel::sortMessages); QObject::connect(dbc(), &DBCManager::msgUpdated, model, &MessageListModel::sortMessages); + QObject::connect(dbc(), &DBCManager::msgRemoved, model, &MessageListModel::sortMessages); QObject::connect(table_widget->selectionModel(), &QItemSelectionModel::currentChanged, [=](const QModelIndex ¤t, const QModelIndex &previous) { if (current.isValid() && current.row() < model->msgs.size()) { - current_msg_id = model->msgs[current.row()]; - emit msgSelectionChanged(current_msg_id); + if (model->msgs[current.row()] != current_msg_id) { + current_msg_id = model->msgs[current.row()]; + emit msgSelectionChanged(current_msg_id); + } } }); QObject::connect(model, &MessageListModel::modelReset, [this]() { if (int row = model->msgs.indexOf(current_msg_id); row != -1) - table_widget->selectionModel()->select(model->index(row, 0), QItemSelectionModel::Rows | QItemSelectionModel::ClearAndSelect); + table_widget->selectionModel()->setCurrentIndex(model->index(row, 0), QItemSelectionModel::Rows | QItemSelectionModel::ClearAndSelect); }); } From f38fe7cfb1b3011ea48a34b0500f352338e05b25 Mon Sep 17 00:00:00 2001 From: Cameron Clough Date: Wed, 9 Nov 2022 14:53:41 -0800 Subject: [PATCH 064/184] ui: increase toggle confirmation font size (#26413) * ui: make toggle confirmation text larger * center title * reduce line breaks * slightly reduce font size --- selfdrive/ui/qt/widgets/controls.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/selfdrive/ui/qt/widgets/controls.h b/selfdrive/ui/qt/widgets/controls.h index 243c078f85..8679de57b0 100644 --- a/selfdrive/ui/qt/widgets/controls.h +++ b/selfdrive/ui/qt/widgets/controls.h @@ -142,8 +142,8 @@ public: ParamControl(const QString ¶m, const QString &title, const QString &desc, const QString &icon, const bool confirm, QWidget *parent = nullptr) : ToggleControl(title, desc, icon, false, parent) { key = param.toStdString(); QObject::connect(this, &ParamControl::toggleFlipped, [=](bool state) { - QString content("

" + title + "



" - "

" + getDescription() + "

"); + QString content("

" + title + "


" + "

" + getDescription() + "

"); ConfirmationDialog dialog(content, tr("Ok"), tr("Cancel"), true, this); if (!confirm || !state || dialog.exec()) { params.putBool(key, state); From 584842488f4cab62bb9d5e4d8fc2cc3090634fb7 Mon Sep 17 00:00:00 2001 From: AlexandreSato <66435071+AlexandreSato@users.noreply.github.com> Date: Wed, 9 Nov 2022 20:13:17 -0300 Subject: [PATCH 065/184] Multilang: update pt-BR (#26420) * update pt-BR translations * fix some cutoff texts * Update pt-BR translations --- selfdrive/ui/translations/main_pt-BR.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/selfdrive/ui/translations/main_pt-BR.ts b/selfdrive/ui/translations/main_pt-BR.ts index a5187af50f..c2ee98d340 100644 --- a/selfdrive/ui/translations/main_pt-BR.ts +++ b/selfdrive/ui/translations/main_pt-BR.ts @@ -240,11 +240,11 @@ Reset - + Resetar Review - + Revisar @@ -476,11 +476,11 @@ trabalho definido ParamControl Ok - OK + OK Cancel - Cancelar + Cancelar @@ -868,7 +868,7 @@ trabalho definido Uninstall - + Desinstalar @@ -1008,15 +1008,15 @@ trabalho definido Experimental mode - + Modo Experimental <b>WARNING: openpilot longitudinal control is experimental for this car and will disable AEB.</b><br> openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. - + <b>AVISO: o controle longitudinal openpilot é experimental para este carro e irá desabilitar AEB.</b><br> O padrão do openpilot é o ACC integrado do carro em vez do controle longitudinal do openpilot neste carro. Habilite isto para alternar para controle longitudinal do openpilot. openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. - + o padrão do openpilot é dirigir no <b>modo chill</b>. Modo experimental habilita <b>recursos de nível-alfa</b> que não estão prontos para o modo chill. Os recursos experimentais estão listados abaixo: <br> <h4>🌮 Controle Longitudinal de Ponta a Ponta 🌮</h4> Deixe o modelo de direção controlar o acelerador e os freios. openpilot irá conduzir como pensa que um ser humano faria, incluindo parar para sinais vermelhos e sinais de parada. @@ -1074,7 +1074,7 @@ trabalho definido Forget - + Esquecer From 048cce2149db34ea0e32df3673248fbbc8e804ad Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 9 Nov 2022 16:04:19 -0800 Subject: [PATCH 066/184] Hyundai: add missing Sonata 2022 FW versions (#26428) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added FW Versions for 2022 Elantra and 2022 Sonata. Added for CAR.ELANTRA_2021 : Ecu.transmission : b’\xf1\x87CXMQFM3421815JB2ww\x96y\xaa\x98x\x87\x88wtwTfuwWh\x9f\xff\x8a\xff\xff\xffE\xe3\xf1\x89HT6VA640A1\xf1\x82CCN0N20NS5\x00\x00\x00\x00\x00\x00' Ecu.engine : b'\xf1\x870\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf1\x82CNDWD0AMFCXCSG8A' Added for CAR.SONATA : Ecu.engine : b'\xf1\x870\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf1\x81HM6M1_0a0_J10' Ecu.transmission: b'\xf1\x00T02601BL T02832A1 VDN8T25XXX832NS8G\x0e\xfeE' b'\xf1\x87954A02N060\x00\x00\x00\x00\x00\xf1\x81T02832A1 \xf1\x00T02601BL T02832A1 VDN8T25XXX832NS8G\x0e\xfeE' b'\xf1\x87954A02N060\x00\x00\x00\x00\x00\xf1\x82VDN8T25XXX832NS8' * Update values.py * Removed FW Versions for Elantra_2021. * fix Co-authored-by: humza2000 <111622889+humza2000@users.noreply.github.com> --- selfdrive/car/hyundai/values.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/selfdrive/car/hyundai/values.py b/selfdrive/car/hyundai/values.py index e5ddc5cac7..b7e28825c3 100644 --- a/selfdrive/car/hyundai/values.py +++ b/selfdrive/car/hyundai/values.py @@ -468,6 +468,7 @@ FW_VERSIONS = { b'\xf1\x82DNBWN5TMDCXXXG2E', b'\xf1\x82DNCVN5GMCCXXXF0A', b'\xf1\x82DNCVN5GMCCXXXG2B', + b'\xf1\x870\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf1\x81HM6M1_0a0_J10', b'\xf1\x870\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf1\x82DNDWN5TMDCXXXJ1A', b'\xf1\x87391162M003', b'\xf1\x87391162M013', @@ -492,6 +493,7 @@ FW_VERSIONS = { b'\xf1\x8756310L0010\x00\xf1\x00DN8 MDPS C 1.00 1.01 56310L0010\x00 4DNAC101', b'\xf1\x8756310L0210\x00\xf1\x00DN8 MDPS C 1.00 1.01 56310L0210\x00 4DNAC101', b'\xf1\x8757700-L0000\xf1\x00DN8 MDPS R 1.00 1.00 57700-L0000 4DNAP100', + b'\xf1\x00DN8 MDPS R 1.00 1.00 57700-L0000 4DNAP101', ], (Ecu.fwdCamera, 0x7c4, None): [ b'\xf1\x00DN8 MFC AT KOR LHD 1.00 1.02 99211-L1000 190422', @@ -512,6 +514,7 @@ FW_VERSIONS = { b'\xf1\x00HT6WA250BLHT6WA910A1SDN8G25NB1\x00\x00\x00\x00\x00\x00\x96\xa1\xf1\x92', b'\xf1\x00HT6WA280BLHT6WAD10A1SDN8G25NB2\x00\x00\x00\x00\x00\x00\x08\xc9O:', b'\xf1\x00T02601BL T02730A1 VDN8T25XXX730NS5\xf7_\x92\xf5', + b'\xf1\x00T02601BL T02832A1 VDN8T25XXX832NS8G\x0e\xfeE', b'\xf1\x87954A02N060\x00\x00\x00\x00\x00\xf1\x81T02730A1 \xf1\x00T02601BL T02730A1 VDN8T25XXX730NS5\xf7_\x92\xf5', b'\xf1\x87SAKFBA2926554GJ2VefVww\x87xwwwww\x88\x87xww\x87wTo\xfb\xffvUo\xff\x8d\x16\xf1\x81U903\x00\x00\x00\x00\x00\x00\xf1\x00bcsh8p54 U903\x00\x00\x00\x00\x00\x00SDN8T16NB0z{\xd4v', b'\xf1\x87SAKFBA3030524GJ2UVugww\x97yx\x88\x87\x88vw\x87gww\x87wto\xf9\xfffUo\xff\xa2\x0c\xf1\x81U903\x00\x00\x00\x00\x00\x00\xf1\x00bcsh8p54 U903\x00\x00\x00\x00\x00\x00SDN8T16NB0z{\xd4v', From 52378c97ecde4c489e18e23d01021f27c3acf073 Mon Sep 17 00:00:00 2001 From: AlexandreSato <66435071+AlexandreSato@users.noreply.github.com> Date: Wed, 9 Nov 2022 21:06:36 -0300 Subject: [PATCH 067/184] Toyota: Add missing Corolla Cross FW verions (#26426) * add geraldo fingerprint * add to non-H * Update selfdrive/car/tests/routes.py * Update non-us cross model years * add test route * Update routes.py Co-authored-by: Shane Smiskol --- docs/CARS.md | 2 +- selfdrive/car/toyota/values.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/CARS.md b/docs/CARS.md index 04f7712016..07bcf44257 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -167,7 +167,7 @@ A supported vehicle is one that just works when you install a comma three. All s |Toyota|Camry Hybrid 2021-22|All|openpilot|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Toyota| |Toyota|Corolla 2017-19|All|openpilot available[2](#footnotes)|19 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Toyota| |Toyota|Corolla 2020-22|All|openpilot|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Toyota| -|Toyota|Corolla Cross (Non-US only) 2020-21|All|openpilot|17 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Toyota| +|Toyota|Corolla Cross (Non-US only) 2020-23|All|openpilot|17 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Toyota| |Toyota|Corolla Cross Hybrid (Non-US only) 2020-22|All|openpilot|17 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Toyota| |Toyota|Corolla Hatchback 2019-22|All|openpilot|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Toyota| |Toyota|Corolla Hybrid 2020-22|All|openpilot|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Toyota| diff --git a/selfdrive/car/toyota/values.py b/selfdrive/car/toyota/values.py index 9e96118085..2ce1cba92c 100644 --- a/selfdrive/car/toyota/values.py +++ b/selfdrive/car/toyota/values.py @@ -119,7 +119,7 @@ CAR_INFO: Dict[str, Union[ToyotaCarInfo, List[ToyotaCarInfo]]] = { CAR.COROLLA: ToyotaCarInfo("Toyota Corolla 2017-19"), CAR.COROLLA_TSS2: [ ToyotaCarInfo("Toyota Corolla 2020-22", video_link="https://www.youtube.com/watch?v=_66pXk0CBYA"), - ToyotaCarInfo("Toyota Corolla Cross (Non-US only) 2020-21", min_enable_speed=7.5), + ToyotaCarInfo("Toyota Corolla Cross (Non-US only) 2020-23", min_enable_speed=7.5), ToyotaCarInfo("Toyota Corolla Hatchback 2019-22", video_link="https://www.youtube.com/watch?v=_66pXk0CBYA"), ], CAR.COROLLAH_TSS2: [ @@ -713,6 +713,7 @@ FW_VERSIONS = { }, CAR.COROLLA_TSS2: { (Ecu.engine, 0x700, None): [ + b'\x01896630A22000\x00\x00\x00\x00', b'\x01896630ZG2000\x00\x00\x00\x00', b'\x01896630ZG5000\x00\x00\x00\x00', b'\x01896630ZG5100\x00\x00\x00\x00', @@ -792,6 +793,7 @@ FW_VERSIONS = { b'F152602191\x00\x00\x00\x00\x00\x00', b'\x01F152612862\x00\x00\x00\x00\x00\x00', b'\x01F152612B91\x00\x00\x00\x00\x00\x00', + b'\x01F15260A070\x00\x00\x00\x00\x00\x00', ], (Ecu.fwdRadar, 0x750, 0xf): [ b'\x018821F3301100\x00\x00\x00\x00', @@ -809,6 +811,7 @@ FW_VERSIONS = { b'\x028646F1202100\x00\x00\x00\x008646G2601400\x00\x00\x00\x00', b'\x028646F1202200\x00\x00\x00\x008646G2601500\x00\x00\x00\x00', b'\x028646F1601100\x00\x00\x00\x008646G2601400\x00\x00\x00\x00', + b'\x028646F1601300\x00\x00\x00\x008646G2601400\x00\x00\x00\x00', ], }, CAR.COROLLAH_TSS2: { From 26d66ac671a6b15be4611face27844bae90b185f Mon Sep 17 00:00:00 2001 From: Lee Jong Mun <43285072+crwusiz@users.noreply.github.com> Date: Thu, 10 Nov 2022 09:15:44 +0900 Subject: [PATCH 068/184] Multilang: Korean translation update (#26424) fix --- selfdrive/ui/translations/main_ko.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/selfdrive/ui/translations/main_ko.ts b/selfdrive/ui/translations/main_ko.ts index e9b4943650..ff09581e61 100644 --- a/selfdrive/ui/translations/main_ko.ts +++ b/selfdrive/ui/translations/main_ko.ts @@ -1004,15 +1004,15 @@ location set Experimental mode - + 실험 모드 <b>WARNING: openpilot longitudinal control is experimental for this car and will disable AEB.</b><br> openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. - + <b>경고: openpilot 롱컨트롤은 실험적인 기능으로 차량의 AEB를 비활성화합니다.</b><br> openpilot은 차량의 내장 ACC로 기본 설정됩니다. 롱컨트롤으로 전환하려면 이 옵션을 활성화하세요. openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. - + openpilot은 <b>chill 모드</b>로 기본 설정됩니다. 실험 모드는 chill 모드에 준비되지 않은 <b>알파 수준 기능</b>을 활성화 합니다. 실험 모드의 특징은 아래에 나열되어 있습니다 <br> <h4>🌮 E2E 롱컨트롤 🌮</h4> 주행모델이 가속과 감속을 제어하도록 합니다. openpilot은 신호등과 정지표지판을 보고 멈추는 것을 포함하여 운전자가 생각하는것처럼 주행합니다. From f540002e3fb6bcb15323add59d87269e7da6d00f Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 9 Nov 2022 16:49:17 -0800 Subject: [PATCH 069/184] translation badges: add number of unfinished translations (#26429) * some clean up and add missing translations * unfinished * set proper width * make this variable common --- selfdrive/ui/tests/test_translations.py | 3 ++- selfdrive/ui/translations/create_badges.py | 22 +++++++++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/selfdrive/ui/tests/test_translations.py b/selfdrive/ui/tests/test_translations.py index 11ecd30ae0..26d6c39349 100755 --- a/selfdrive/ui/tests/test_translations.py +++ b/selfdrive/ui/tests/test_translations.py @@ -9,6 +9,7 @@ import xml.etree.ElementTree as ET from selfdrive.ui.update_translations import TRANSLATIONS_DIR, LANGUAGES_FILE, update_translations TMP_TRANSLATIONS_DIR = os.path.join(TRANSLATIONS_DIR, "tmp") +UNFINISHED_TRANSLATION_TAG = "" not in cur_translations, + self.assertTrue(UNFINISHED_TRANSLATION_TAG not in cur_translations, f"{file} ({name}) translation file has unfinished translations. Finish translations or mark them as completed in Qt Linguist") def test_vanished_translations(self): diff --git a/selfdrive/ui/translations/create_badges.py b/selfdrive/ui/translations/create_badges.py index 32904f242a..e403972e36 100755 --- a/selfdrive/ui/translations/create_badges.py +++ b/selfdrive/ui/translations/create_badges.py @@ -2,19 +2,22 @@ import json import os import requests +import xml.etree.ElementTree as ET from common.basedir import BASEDIR +from selfdrive.ui.tests.test_translations import UNFINISHED_TRANSLATION_TAG from selfdrive.ui.update_translations import LANGUAGES_FILE, TRANSLATIONS_DIR TRANSLATION_TAG = "'] + badge_svg = [] + max_badge_width = 0 # keep track of max width to set parent element for idx, (name, file) in enumerate(translation_files.items()): with open(os.path.join(TRANSLATIONS_DIR, f"{file}.ts"), "r") as tr_f: tr_file = tr_f.read() @@ -28,19 +31,28 @@ if __name__ == "__main__": unfinished_translations += 1 percent_finished = int(100 - (unfinished_translations / total_translations * 100.)) - color = "green" if percent_finished == 100 else "orange" if percent_finished >= 70 else "red" + color = "green" if percent_finished == 100 else "orange" if percent_finished > 90 else "red" - r = requests.get(f"https://img.shields.io/badge/LANGUAGE {name}-{percent_finished}%25 complete-{color}", timeout=10) + # Download badge + badge_label = f"LANGUAGE {name}" + badge_message = f"{percent_finished}% complete" + if unfinished_translations != 0: + badge_message += f" ({unfinished_translations} unfinished translations)" + + r = requests.get(f"{SHIELDS_URL}/{badge_label}-{badge_message}-{color}", timeout=10) assert r.status_code == 200, "Error downloading badge" content_svg = r.content.decode("utf-8") - # make tag ids in each badge unique + max_badge_width = max(max_badge_width, int(ET.fromstring(content_svg).get("width"))) + + # Make tag ids in each badge unique to combine them into one svg for tag in ("r", "s"): content_svg = content_svg.replace(f'id="{tag}"', f'id="{tag}{idx}"') content_svg = content_svg.replace(f'"url(#{tag})"', f'"url(#{tag}{idx})"') badge_svg.extend([f'', content_svg, ""]) + badge_svg.insert(0, f'') badge_svg.append("") with open(os.path.join(BASEDIR, "translation_badge.svg"), "w") as badge_f: From d8327bd9bed9833eb3d58a51097215c2de803d1b Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 9 Nov 2022 16:58:02 -0800 Subject: [PATCH 070/184] multilang badges: no need to handle plurals --- selfdrive/ui/translations/create_badges.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfdrive/ui/translations/create_badges.py b/selfdrive/ui/translations/create_badges.py index e403972e36..893ac1b412 100755 --- a/selfdrive/ui/translations/create_badges.py +++ b/selfdrive/ui/translations/create_badges.py @@ -37,7 +37,7 @@ if __name__ == "__main__": badge_label = f"LANGUAGE {name}" badge_message = f"{percent_finished}% complete" if unfinished_translations != 0: - badge_message += f" ({unfinished_translations} unfinished translations)" + badge_message += f" ({unfinished_translations} unfinished)" r = requests.get(f"{SHIELDS_URL}/{badge_label}-{badge_message}-{color}", timeout=10) assert r.status_code == 200, "Error downloading badge" From bbc14656d937cadacbcb87ed88cb8800eb6b62fa Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 9 Nov 2022 17:30:33 -0800 Subject: [PATCH 071/184] Multilang badges: assert width exists in xml --- selfdrive/ui/translations/create_badges.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/selfdrive/ui/translations/create_badges.py b/selfdrive/ui/translations/create_badges.py index 893ac1b412..575584dd50 100755 --- a/selfdrive/ui/translations/create_badges.py +++ b/selfdrive/ui/translations/create_badges.py @@ -43,7 +43,9 @@ if __name__ == "__main__": assert r.status_code == 200, "Error downloading badge" content_svg = r.content.decode("utf-8") - max_badge_width = max(max_badge_width, int(ET.fromstring(content_svg).get("width"))) + xml = ET.fromstring(content_svg) + assert "width" in xml.attrib + max_badge_width = max(max_badge_width, int(xml.attrib["width"])) # Make tag ids in each badge unique to combine them into one svg for tag in ("r", "s"): From 6c03e093c6d1d9d45dc342cce2374656b80ecaa9 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 9 Nov 2022 17:31:58 -0800 Subject: [PATCH 072/184] Multilang: mark some translations finished (#26430) * mark finished translations * fix * cleanup * revert --- selfdrive/ui/translations/main_ja.ts | 4 ++-- selfdrive/ui/translations/main_zh-CHS.ts | 6 +++--- selfdrive/ui/translations/main_zh-CHT.ts | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/selfdrive/ui/translations/main_ja.ts b/selfdrive/ui/translations/main_ja.ts index 039ad7b2a4..3ddf71518c 100644 --- a/selfdrive/ui/translations/main_ja.ts +++ b/selfdrive/ui/translations/main_ja.ts @@ -475,11 +475,11 @@ location set ParamControl Ok - OK + OK Cancel - キャンセル + キャンセル diff --git a/selfdrive/ui/translations/main_zh-CHS.ts b/selfdrive/ui/translations/main_zh-CHS.ts index 44e707e49c..28ec6f750a 100644 --- a/selfdrive/ui/translations/main_zh-CHS.ts +++ b/selfdrive/ui/translations/main_zh-CHS.ts @@ -376,7 +376,7 @@ Get turn-by-turn directions displayed and more with a comma prime subscription. Sign up now: https://connect.comma.ai - 订阅comma prime以获取导航。 + 订阅comma prime以获取导航。 立即注册：https://connect.comma.ai @@ -473,11 +473,11 @@ location set ParamControl Ok - 好的 + 好的 Cancel - 取消 + 取消 diff --git a/selfdrive/ui/translations/main_zh-CHT.ts b/selfdrive/ui/translations/main_zh-CHT.ts index 274cff3a5a..c99b818cbf 100644 --- a/selfdrive/ui/translations/main_zh-CHT.ts +++ b/selfdrive/ui/translations/main_zh-CHT.ts @@ -475,11 +475,11 @@ location set ParamControl Ok - 確定 + 確定 Cancel - 取消 + 取消 From e1001a3036fb93d6d0340d139d4ae2a1f2419d52 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 9 Nov 2022 18:27:30 -0800 Subject: [PATCH 073/184] Toyota: factor on cluster speed to match dash (#26408) * add a minimum factort * Update ref_commit --- selfdrive/car/toyota/carstate.py | 1 + selfdrive/test/process_replay/ref_commit | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/selfdrive/car/toyota/carstate.py b/selfdrive/car/toyota/carstate.py index a959633281..8efb2c79e3 100644 --- a/selfdrive/car/toyota/carstate.py +++ b/selfdrive/car/toyota/carstate.py @@ -54,6 +54,7 @@ class CarState(CarStateBase): ) ret.vEgoRaw = mean([ret.wheelSpeeds.fl, ret.wheelSpeeds.fr, ret.wheelSpeeds.rl, ret.wheelSpeeds.rr]) ret.vEgo, ret.aEgo = self.update_speed_kf(ret.vEgoRaw) + ret.vEgoCluster = ret.vEgo * 1.015 # minimum of all the cars ret.standstill = ret.vEgoRaw == 0 diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index da954d76a6..cac678ca1f 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -372a67c524342bbf15e22f0caea08d2038973281 +a36f7e2fd922fcadca6f8a3d777f4db787cba016 From 1fda075c7306976099bcfbb6b0a6303e819036b4 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Wed, 9 Nov 2022 18:42:51 -0800 Subject: [PATCH 074/184] UI: add set speed clarification for e2e long --- selfdrive/ui/qt/offroad/settings.cc | 2 +- selfdrive/ui/translations/main_ja.ts | 2 +- selfdrive/ui/translations/main_ko.ts | 4 ++-- selfdrive/ui/translations/main_pt-BR.ts | 4 ++-- selfdrive/ui/translations/main_zh-CHS.ts | 2 +- selfdrive/ui/translations/main_zh-CHT.ts | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index 29069155b2..a30b66a2fd 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -125,7 +125,7 @@ void TogglesPanel::updateToggles() { Experimental features are listed below:\
\

🌮 End-to-End Longitudinal Control 🌮

\ - Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs."); + Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound."); auto cp_bytes = params.get("CarParamsPersistent"); if (!cp_bytes.empty()) { diff --git a/selfdrive/ui/translations/main_ja.ts b/selfdrive/ui/translations/main_ja.ts index 3ddf71518c..be3fbe104c 100644 --- a/selfdrive/ui/translations/main_ja.ts +++ b/selfdrive/ui/translations/main_ja.ts @@ -1011,7 +1011,7 @@ location set - openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. diff --git a/selfdrive/ui/translations/main_ko.ts b/selfdrive/ui/translations/main_ko.ts index ff09581e61..4e11e80332 100644 --- a/selfdrive/ui/translations/main_ko.ts +++ b/selfdrive/ui/translations/main_ko.ts @@ -1011,8 +1011,8 @@ location set <b>경고: openpilot 롱컨트롤은 실험적인 기능으로 차량의 AEB를 비활성화합니다.</b><br> openpilot은 차량의 내장 ACC로 기본 설정됩니다. 롱컨트롤으로 전환하려면 이 옵션을 활성화하세요. - openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. - openpilot은 <b>chill 모드</b>로 기본 설정됩니다. 실험 모드는 chill 모드에 준비되지 않은 <b>알파 수준 기능</b>을 활성화 합니다. 실험 모드의 특징은 아래에 나열되어 있습니다 <br> <h4>🌮 E2E 롱컨트롤 🌮</h4> 주행모델이 가속과 감속을 제어하도록 합니다. openpilot은 신호등과 정지표지판을 보고 멈추는 것을 포함하여 운전자가 생각하는것처럼 주행합니다. + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. + diff --git a/selfdrive/ui/translations/main_pt-BR.ts b/selfdrive/ui/translations/main_pt-BR.ts index c2ee98d340..fde669c919 100644 --- a/selfdrive/ui/translations/main_pt-BR.ts +++ b/selfdrive/ui/translations/main_pt-BR.ts @@ -1015,8 +1015,8 @@ trabalho definido <b>AVISO: o controle longitudinal openpilot é experimental para este carro e irá desabilitar AEB.</b><br> O padrão do openpilot é o ACC integrado do carro em vez do controle longitudinal do openpilot neste carro. Habilite isto para alternar para controle longitudinal do openpilot. - openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. - o padrão do openpilot é dirigir no <b>modo chill</b>. Modo experimental habilita <b>recursos de nível-alfa</b> que não estão prontos para o modo chill. Os recursos experimentais estão listados abaixo: <br> <h4>🌮 Controle Longitudinal de Ponta a Ponta 🌮</h4> Deixe o modelo de direção controlar o acelerador e os freios. openpilot irá conduzir como pensa que um ser humano faria, incluindo parar para sinais vermelhos e sinais de parada. + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. + diff --git a/selfdrive/ui/translations/main_zh-CHS.ts b/selfdrive/ui/translations/main_zh-CHS.ts index 28ec6f750a..230205a4a8 100644 --- a/selfdrive/ui/translations/main_zh-CHS.ts +++ b/selfdrive/ui/translations/main_zh-CHS.ts @@ -1009,7 +1009,7 @@ location set - openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. diff --git a/selfdrive/ui/translations/main_zh-CHT.ts b/selfdrive/ui/translations/main_zh-CHT.ts index c99b818cbf..4e8d733933 100644 --- a/selfdrive/ui/translations/main_zh-CHT.ts +++ b/selfdrive/ui/translations/main_zh-CHT.ts @@ -1011,7 +1011,7 @@ location set - openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. From 5a3c5e7a4b78853d6b350f551432a1bb6050eba9 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 9 Nov 2022 19:33:42 -0800 Subject: [PATCH 075/184] Multilang: clean up translation string (#26435) * update translations * do pt * do pt * do ko * do ko * Update selfdrive/ui/translations/main_pt-BR.ts --- selfdrive/ui/qt/offroad/settings.cc | 5 +++-- selfdrive/ui/translations/main_ja.ts | 8 ++++++-- selfdrive/ui/translations/main_ko.ts | 12 ++++++++---- selfdrive/ui/translations/main_pt-BR.ts | 12 ++++++++---- selfdrive/ui/translations/main_zh-CHS.ts | 8 ++++++-- selfdrive/ui/translations/main_zh-CHT.ts | 8 ++++++-- 6 files changed, 37 insertions(+), 16 deletions(-) diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index a30b66a2fd..bf886ae159 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -46,8 +46,9 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) { { "ExperimentalLongitudinalEnabled", tr("Experimental openpilot longitudinal control"), - tr("WARNING: openpilot longitudinal control is experimental for this car and will disable AEB.
\ - openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control."), + QString("%1
%2") + .arg(tr("WARNING: openpilot longitudinal control is experimental for this car and will disable AEB.")) + .arg(tr("openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control.")), "../assets/offroad/icon_speed_limit.png", true, }, diff --git a/selfdrive/ui/translations/main_ja.ts b/selfdrive/ui/translations/main_ja.ts index be3fbe104c..2e38295368 100644 --- a/selfdrive/ui/translations/main_ja.ts +++ b/selfdrive/ui/translations/main_ja.ts @@ -1007,11 +1007,15 @@ location set - <b>WARNING: openpilot longitudinal control is experimental for this car and will disable AEB.</b><br> openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. - openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. + WARNING: openpilot longitudinal control is experimental for this car and will disable AEB. + + + + openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. diff --git a/selfdrive/ui/translations/main_ko.ts b/selfdrive/ui/translations/main_ko.ts index 4e11e80332..42b73430f1 100644 --- a/selfdrive/ui/translations/main_ko.ts +++ b/selfdrive/ui/translations/main_ko.ts @@ -1006,14 +1006,18 @@ location set Experimental mode 실험 모드 - - <b>WARNING: openpilot longitudinal control is experimental for this car and will disable AEB.</b><br> openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. - <b>경고: openpilot 롱컨트롤은 실험적인 기능으로 차량의 AEB를 비활성화합니다.</b><br> openpilot은 차량의 내장 ACC로 기본 설정됩니다. 롱컨트롤으로 전환하려면 이 옵션을 활성화하세요. - openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. + + WARNING: openpilot longitudinal control is experimental for this car and will disable AEB. + 경고: openpilot 롱컨트롤은 실험적인 기능으로 차량의 AEB를 비활성화합니다. + + + openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. + openpilot은 차량의 내장 ACC로 기본 설정됩니다. 롱컨트롤으로 전환하려면 이 옵션을 활성화하세요. + Updater diff --git a/selfdrive/ui/translations/main_pt-BR.ts b/selfdrive/ui/translations/main_pt-BR.ts index fde669c919..394d73c86a 100644 --- a/selfdrive/ui/translations/main_pt-BR.ts +++ b/selfdrive/ui/translations/main_pt-BR.ts @@ -1010,14 +1010,18 @@ trabalho definido Experimental mode Modo Experimental - - <b>WARNING: openpilot longitudinal control is experimental for this car and will disable AEB.</b><br> openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. - <b>AVISO: o controle longitudinal openpilot é experimental para este carro e irá desabilitar AEB.</b><br> O padrão do openpilot é o ACC integrado do carro em vez do controle longitudinal do openpilot neste carro. Habilite isto para alternar para controle longitudinal do openpilot. - openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. + + WARNING: openpilot longitudinal control is experimental for this car and will disable AEB. + AVISO: o controle longitudinal openpilot é experimental para este carro e irá desabilitar AEB. + + + openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. + O padrão do openpilot é o ACC integrado do carro em vez do controle longitudinal do openpilot neste carro. Habilite isto para alternar para controle longitudinal do openpilot. + Updater diff --git a/selfdrive/ui/translations/main_zh-CHS.ts b/selfdrive/ui/translations/main_zh-CHS.ts index 230205a4a8..541ed20dee 100644 --- a/selfdrive/ui/translations/main_zh-CHS.ts +++ b/selfdrive/ui/translations/main_zh-CHS.ts @@ -1005,11 +1005,15 @@ location set - <b>WARNING: openpilot longitudinal control is experimental for this car and will disable AEB.</b><br> openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. - openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. + WARNING: openpilot longitudinal control is experimental for this car and will disable AEB. + + + + openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. diff --git a/selfdrive/ui/translations/main_zh-CHT.ts b/selfdrive/ui/translations/main_zh-CHT.ts index 4e8d733933..99c64a194b 100644 --- a/selfdrive/ui/translations/main_zh-CHT.ts +++ b/selfdrive/ui/translations/main_zh-CHT.ts @@ -1007,11 +1007,15 @@ location set - <b>WARNING: openpilot longitudinal control is experimental for this car and will disable AEB.</b><br> openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. - openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. + WARNING: openpilot longitudinal control is experimental for this car and will disable AEB. + + + + openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. From a3cd50c5bbb924eaf40ab18d76f603edfc2f5a2a Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 9 Nov 2022 19:38:17 -0800 Subject: [PATCH 076/184] ParamControl dialog: more explicit confirmation text (#26431) * Use enable * vanish * fill in missing translation * Update selfdrive/ui/translations/main_pt-BR.ts --- selfdrive/ui/qt/widgets/controls.h | 2 +- selfdrive/ui/translations/main_ja.ts | 8 ++++---- selfdrive/ui/translations/main_ko.ts | 8 ++++---- selfdrive/ui/translations/main_pt-BR.ts | 8 ++++---- selfdrive/ui/translations/main_zh-CHS.ts | 8 ++++---- selfdrive/ui/translations/main_zh-CHT.ts | 8 ++++---- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/selfdrive/ui/qt/widgets/controls.h b/selfdrive/ui/qt/widgets/controls.h index 8679de57b0..b67224b33d 100644 --- a/selfdrive/ui/qt/widgets/controls.h +++ b/selfdrive/ui/qt/widgets/controls.h @@ -144,7 +144,7 @@ public: QObject::connect(this, &ParamControl::toggleFlipped, [=](bool state) { QString content("

" + title + "


" "

" + getDescription() + "

"); - ConfirmationDialog dialog(content, tr("Ok"), tr("Cancel"), true, this); + ConfirmationDialog dialog(content, tr("Enable"), tr("Cancel"), true, this); if (!confirm || !state || dialog.exec()) { params.putBool(key, state); } else { diff --git a/selfdrive/ui/translations/main_ja.ts b/selfdrive/ui/translations/main_ja.ts index 2e38295368..14c3404ad1 100644 --- a/selfdrive/ui/translations/main_ja.ts +++ b/selfdrive/ui/translations/main_ja.ts @@ -473,14 +473,14 @@ location set ParamControl - - Ok - OK - Cancel キャンセル + + Enable + を有効化 + PrimeAdWidget diff --git a/selfdrive/ui/translations/main_ko.ts b/selfdrive/ui/translations/main_ko.ts index 42b73430f1..9ca28e9e2c 100644 --- a/selfdrive/ui/translations/main_ko.ts +++ b/selfdrive/ui/translations/main_ko.ts @@ -473,14 +473,14 @@ location set ParamControl - - Ok - 확인 - Cancel 취소 + + Enable + 사용 + PrimeAdWidget diff --git a/selfdrive/ui/translations/main_pt-BR.ts b/selfdrive/ui/translations/main_pt-BR.ts index 394d73c86a..3559d4b422 100644 --- a/selfdrive/ui/translations/main_pt-BR.ts +++ b/selfdrive/ui/translations/main_pt-BR.ts @@ -474,14 +474,14 @@ trabalho definido ParamControl - - Ok - OK - Cancel Cancelar + + Enable + Ativar + PrimeAdWidget diff --git a/selfdrive/ui/translations/main_zh-CHS.ts b/selfdrive/ui/translations/main_zh-CHS.ts index 541ed20dee..3dfd7794ec 100644 --- a/selfdrive/ui/translations/main_zh-CHS.ts +++ b/selfdrive/ui/translations/main_zh-CHS.ts @@ -471,14 +471,14 @@ location set ParamControl - - Ok - 好的 - Cancel 取消 + + Enable + 启用 + PrimeAdWidget diff --git a/selfdrive/ui/translations/main_zh-CHT.ts b/selfdrive/ui/translations/main_zh-CHT.ts index 99c64a194b..35fd944ddb 100644 --- a/selfdrive/ui/translations/main_zh-CHT.ts +++ b/selfdrive/ui/translations/main_zh-CHT.ts @@ -473,14 +473,14 @@ location set ParamControl - - Ok - 確定 - Cancel 取消 + + Enable + 啟用 + PrimeAdWidget From af84f1b3506082d644c2f52f88390fabcc9f7835 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 9 Nov 2022 19:42:34 -0800 Subject: [PATCH 077/184] experimental long toggle: adjust description (#26437) * Spell out AEB * vanish --- selfdrive/ui/qt/offroad/settings.cc | 2 +- selfdrive/ui/translations/main_ja.ts | 4 ++-- selfdrive/ui/translations/main_ko.ts | 8 ++++---- selfdrive/ui/translations/main_pt-BR.ts | 8 ++++---- selfdrive/ui/translations/main_zh-CHS.ts | 4 ++-- selfdrive/ui/translations/main_zh-CHT.ts | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index bf886ae159..2acbb4ed7d 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -47,7 +47,7 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) { "ExperimentalLongitudinalEnabled", tr("Experimental openpilot longitudinal control"), QString("%1
%2") - .arg(tr("WARNING: openpilot longitudinal control is experimental for this car and will disable AEB.")) + .arg(tr("WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB).")) .arg(tr("openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control.")), "../assets/offroad/icon_speed_limit.png", true, diff --git a/selfdrive/ui/translations/main_ja.ts b/selfdrive/ui/translations/main_ja.ts index 14c3404ad1..78434439dd 100644 --- a/selfdrive/ui/translations/main_ja.ts +++ b/selfdrive/ui/translations/main_ja.ts @@ -1011,11 +1011,11 @@ location set - WARNING: openpilot longitudinal control is experimental for this car and will disable AEB. + openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. - openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. + WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB). diff --git a/selfdrive/ui/translations/main_ko.ts b/selfdrive/ui/translations/main_ko.ts index 9ca28e9e2c..9409f82a1d 100644 --- a/selfdrive/ui/translations/main_ko.ts +++ b/selfdrive/ui/translations/main_ko.ts @@ -1010,14 +1010,14 @@ location set openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. - - WARNING: openpilot longitudinal control is experimental for this car and will disable AEB. - 경고: openpilot 롱컨트롤은 실험적인 기능으로 차량의 AEB를 비활성화합니다. - openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. openpilot은 차량의 내장 ACC로 기본 설정됩니다. 롱컨트롤으로 전환하려면 이 옵션을 활성화하세요. + + WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB). + + Updater diff --git a/selfdrive/ui/translations/main_pt-BR.ts b/selfdrive/ui/translations/main_pt-BR.ts index 3559d4b422..55ae75d20e 100644 --- a/selfdrive/ui/translations/main_pt-BR.ts +++ b/selfdrive/ui/translations/main_pt-BR.ts @@ -1014,14 +1014,14 @@ trabalho definido openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. - - WARNING: openpilot longitudinal control is experimental for this car and will disable AEB. - AVISO: o controle longitudinal openpilot é experimental para este carro e irá desabilitar AEB. - openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. O padrão do openpilot é o ACC integrado do carro em vez do controle longitudinal do openpilot neste carro. Habilite isto para alternar para controle longitudinal do openpilot. + + WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB). + + Updater diff --git a/selfdrive/ui/translations/main_zh-CHS.ts b/selfdrive/ui/translations/main_zh-CHS.ts index 3dfd7794ec..165aacfa5a 100644 --- a/selfdrive/ui/translations/main_zh-CHS.ts +++ b/selfdrive/ui/translations/main_zh-CHS.ts @@ -1009,11 +1009,11 @@ location set - WARNING: openpilot longitudinal control is experimental for this car and will disable AEB. + openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. - openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. + WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB). diff --git a/selfdrive/ui/translations/main_zh-CHT.ts b/selfdrive/ui/translations/main_zh-CHT.ts index 35fd944ddb..e3cd908d18 100644 --- a/selfdrive/ui/translations/main_zh-CHT.ts +++ b/selfdrive/ui/translations/main_zh-CHT.ts @@ -1011,11 +1011,11 @@ location set - WARNING: openpilot longitudinal control is experimental for this car and will disable AEB. + openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. - openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. + WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB). From d3122cc77e169d8eb87663741bacc165f7062d56 Mon Sep 17 00:00:00 2001 From: Nelson Chen Date: Wed, 9 Nov 2022 19:59:12 -0800 Subject: [PATCH 078/184] Toyota: add missing engine FW for RAV4H_TSS2 (#26432) "rav4 hybrid xse 2020" From Rogrhoa#2158 on Discord. Example Route: 64edc30d23cad8cb|2022-11-09--20-02-03 --- selfdrive/car/toyota/values.py | 1 + 1 file changed, 1 insertion(+) diff --git a/selfdrive/car/toyota/values.py b/selfdrive/car/toyota/values.py index 2ce1cba92c..ba26c7e03b 100644 --- a/selfdrive/car/toyota/values.py +++ b/selfdrive/car/toyota/values.py @@ -1392,6 +1392,7 @@ FW_VERSIONS = { b'\x02896634A14001\x00\x00\x00\x00897CF1203001\x00\x00\x00\x00', b'\x02896634A23000\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', b'\x02896634A23001\x00\x00\x00\x00897CF1203001\x00\x00\x00\x00', + b'\x02896634A23101\x00\x00\x00\x00897CF1203001\x00\x00\x00\x00', b'\x02896634A14001\x00\x00\x00\x00897CF4801001\x00\x00\x00\x00', b'\x02896634A14101\x00\x00\x00\x00897CF4801001\x00\x00\x00\x00', ], From 0941e40177eb0eb7a49bb08628e5aad2deb19c7f Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 9 Nov 2022 20:31:38 -0800 Subject: [PATCH 079/184] ui: static color non-e2e path (#26406) * remove orientation color changing * "just green" --- selfdrive/ui/qt/onroad.cc | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc index 37c1913743..23986726c8 100644 --- a/selfdrive/ui/qt/onroad.cc +++ b/selfdrive/ui/qt/onroad.cc @@ -478,21 +478,9 @@ void AnnotatedCameraWidget::drawLaneLines(QPainter &painter, const UIState *s) { bg.setColorAt(0.5, QColor::fromHslF(end_hue / 360., 1.0, 0.68, 0.35)); bg.setColorAt(1.0, QColor::fromHslF(end_hue / 360., 1.0, 0.68, 0.0)); } else { - const auto &orientation = (*s->sm)["modelV2"].getModelV2().getOrientation(); - float orientation_future = 0; - if (orientation.getZ().size() > 16) { - orientation_future = std::abs(orientation.getZ()[16]); // 2.5 seconds - } - start_hue = 148; - // straight: 112, in turns: 70 - end_hue = fmax(70, 112 - (orientation_future * 420)); - - // FIXME: painter.drawPolygon can be slow if hue is not rounded - end_hue = int(end_hue * 100 + 0.5) / 100; - - bg.setColorAt(0.0, QColor::fromHslF(start_hue / 360., 0.94, 0.51, 0.4)); - bg.setColorAt(0.5, QColor::fromHslF(end_hue / 360., 1.0, 0.68, 0.35)); - bg.setColorAt(1.0, QColor::fromHslF(end_hue / 360., 1.0, 0.68, 0.0)); + bg.setColorAt(0.0, QColor::fromHslF(148 / 360., 0.94, 0.51, 0.4)); + bg.setColorAt(0.5, QColor::fromHslF(112 / 360., 1.0, 0.68, 0.35)); + bg.setColorAt(1.0, QColor::fromHslF(112 / 360., 1.0, 0.68, 0.0)); } painter.setBrush(bg); From 4efb01ece2a9ef54152682c1dc3756d3e4161241 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 9 Nov 2022 20:33:01 -0800 Subject: [PATCH 080/184] Toggle titles: proper capitalization (#26438) * proper caps * update translations update translations update translations * Update selfdrive/ui/translations/main_pt-BR.ts --- selfdrive/ui/qt/offroad/settings.cc | 6 +++--- selfdrive/ui/translations/main_ar.ts | 4 ++-- selfdrive/ui/translations/main_ja.ts | 6 +++--- selfdrive/ui/translations/main_ko.ts | 6 +++--- selfdrive/ui/translations/main_nl.ts | 4 ++-- selfdrive/ui/translations/main_pl.ts | 4 ++-- selfdrive/ui/translations/main_pt-BR.ts | 6 +++--- selfdrive/ui/translations/main_th.ts | 4 ++-- selfdrive/ui/translations/main_zh-CHS.ts | 6 +++--- selfdrive/ui/translations/main_zh-CHT.ts | 6 +++--- 10 files changed, 26 insertions(+), 26 deletions(-) diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index 2acbb4ed7d..a03cf02010 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -38,14 +38,14 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) { }, { "ExperimentalMode", - tr("Experimental mode"), + tr("Experimental Mode"), "", "../assets/offroad/icon_road.png", false, }, { "ExperimentalLongitudinalEnabled", - tr("Experimental openpilot longitudinal control"), + tr("Experimental openpilot Longitudinal Control"), QString("%1
%2") .arg(tr("WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB).")) .arg(tr("openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control.")), @@ -75,7 +75,7 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) { }, { "DisengageOnAccelerator", - tr("Disengage On Accelerator Pedal"), + tr("Disengage on Accelerator Pedal"), tr("When enabled, pressing the accelerator pedal will disengage openpilot."), "../assets/offroad/icon_disengage_on_accelerator.svg", false, diff --git a/selfdrive/ui/translations/main_ar.ts b/selfdrive/ui/translations/main_ar.ts index 3c47e6e8e8..07a84fca08 100644 --- a/selfdrive/ui/translations/main_ar.ts +++ b/selfdrive/ui/translations/main_ar.ts @@ -1023,7 +1023,7 @@ location set قم بتحميل البيانات من الكاميرا المواجهة للسائق وساعد في تحسين خوارزمية مراقبة السائق. - Disengage On Accelerator Pedal + Disengage on Accelerator Pedal فك الارتباط على دواسة التسريع @@ -1059,7 +1059,7 @@ location set - Experimental openpilot longitudinal control + Experimental openpilot Longitudinal Control diff --git a/selfdrive/ui/translations/main_ja.ts b/selfdrive/ui/translations/main_ja.ts index 78434439dd..87c60516fc 100644 --- a/selfdrive/ui/translations/main_ja.ts +++ b/selfdrive/ui/translations/main_ja.ts @@ -967,7 +967,7 @@ location set 車内カメラの映像をアップロードし、ドライバー監視システムのアルゴリズムの向上に役立てます。 - Experimental openpilot longitudinal control + Experimental openpilot Longitudinal Control 実験段階のopenpilotによるアクセル制御 @@ -979,7 +979,7 @@ location set ここ機能を使う為には、「実験段階のopenpilotによるアクセル制御」を先に有効化してください。 - Disengage On Accelerator Pedal + Disengage on Accelerator Pedal ｱｸｾﾙを踏むと openpilot を中断 @@ -1003,7 +1003,7 @@ location set 分割画面表示の場合、ディスプレイの左側にマップを表示します。 - Experimental mode + Experimental Mode diff --git a/selfdrive/ui/translations/main_ko.ts b/selfdrive/ui/translations/main_ko.ts index 9409f82a1d..0bbae22517 100644 --- a/selfdrive/ui/translations/main_ko.ts +++ b/selfdrive/ui/translations/main_ko.ts @@ -967,7 +967,7 @@ location set 운전자 카메라에서 데이터를 업로드하고 운전자 모니터링 알고리즘을 개선합니다. - Experimental openpilot longitudinal control + Experimental openpilot Longitudinal Control openpilot 롱컨트롤 (실험적) @@ -979,7 +979,7 @@ location set openpilot 롱컨트롤을 활성화합니다. (실험적) - Disengage On Accelerator Pedal + Disengage on Accelerator Pedal 가속페달 조작시 해제 @@ -1003,7 +1003,7 @@ location set 분할 화면 보기에서 지도를 왼쪽에 표시합니다. - Experimental mode + Experimental Mode 실험 모드 diff --git a/selfdrive/ui/translations/main_nl.ts b/selfdrive/ui/translations/main_nl.ts index 24d2031f31..10651a4160 100644 --- a/selfdrive/ui/translations/main_nl.ts +++ b/selfdrive/ui/translations/main_nl.ts @@ -1007,7 +1007,7 @@ ingesteld Upload gegevens van de bestuurders camera en help het algoritme voor het monitoren van de bestuurder te verbeteren. - Disengage On Accelerator Pedal + Disengage on Accelerator Pedal Deactiveren Met Gaspedaal @@ -1043,7 +1043,7 @@ ingesteld - Experimental openpilot longitudinal control + Experimental openpilot Longitudinal Control diff --git a/selfdrive/ui/translations/main_pl.ts b/selfdrive/ui/translations/main_pl.ts index bdce181375..4f8b03ef50 100644 --- a/selfdrive/ui/translations/main_pl.ts +++ b/selfdrive/ui/translations/main_pl.ts @@ -1011,7 +1011,7 @@ nie zostało ustawione Prześlij dane z kamery skierowanej na kierowcę i pomóż poprawiać algorytm monitorowania kierowcy. - Disengage On Accelerator Pedal + Disengage on Accelerator Pedal Odłącz poprzez naciśnięcie gazu @@ -1047,7 +1047,7 @@ nie zostało ustawione - Experimental openpilot longitudinal control + Experimental openpilot Longitudinal Control diff --git a/selfdrive/ui/translations/main_pt-BR.ts b/selfdrive/ui/translations/main_pt-BR.ts index 55ae75d20e..702702a8be 100644 --- a/selfdrive/ui/translations/main_pt-BR.ts +++ b/selfdrive/ui/translations/main_pt-BR.ts @@ -971,7 +971,7 @@ trabalho definido Upload dados da câmera voltada para o motorista e ajude a melhorar o algoritmo de monitoramentor. - Experimental openpilot longitudinal control + Experimental openpilot Longitudinal Control Controle longitudinal experimental openpilot @@ -983,7 +983,7 @@ trabalho definido Habilite o controle longitudinal experimental para habilitar isso. - Disengage On Accelerator Pedal + Disengage on Accelerator Pedal Desacionar Com Pedal Do Acelerador @@ -1007,7 +1007,7 @@ trabalho definido Exibir mapa do lado esquerdo quando a tela for dividida. - Experimental mode + Experimental Mode Modo Experimental diff --git a/selfdrive/ui/translations/main_th.ts b/selfdrive/ui/translations/main_th.ts index 95880e69c9..0de0ba5f9a 100644 --- a/selfdrive/ui/translations/main_th.ts +++ b/selfdrive/ui/translations/main_th.ts @@ -951,7 +951,7 @@ location set อัปโหลดข้อมูลจากกล้องที่หันหน้าไปทางคนขับ และช่วยปรับปรุงอัลกอริธึมการตรวจสอบผู้ขับขี่ - Disengage On Accelerator Pedal + Disengage on Accelerator Pedal ยกเลิกระบบช่วยขับเมื่อเหยียบคันเร่ง @@ -979,7 +979,7 @@ location set 🌮 ควบคุมเร่ง/เบรคแบบ End-to-end (อยู่ขั้นพัฒนา) 🌮 - Experimental openpilot longitudinal control + Experimental openpilot Longitudinal Control ทดลองใช้ระบบควบคุมการเร่ง/เบรคโดย openpilot diff --git a/selfdrive/ui/translations/main_zh-CHS.ts b/selfdrive/ui/translations/main_zh-CHS.ts index 165aacfa5a..558a6cec4f 100644 --- a/selfdrive/ui/translations/main_zh-CHS.ts +++ b/selfdrive/ui/translations/main_zh-CHS.ts @@ -965,7 +965,7 @@ location set 上传驾驶员摄像头的数据，帮助改进驾驶员监控算法。 - Experimental openpilot longitudinal control + Experimental openpilot Longitudinal Control @@ -977,7 +977,7 @@ location set - Disengage On Accelerator Pedal + Disengage on Accelerator Pedal 踩油门时取消控制 @@ -1001,7 +1001,7 @@ location set 在分屏模式中，将地图置于屏幕左侧。 - Experimental mode + Experimental Mode diff --git a/selfdrive/ui/translations/main_zh-CHT.ts b/selfdrive/ui/translations/main_zh-CHT.ts index e3cd908d18..0f6bc981cf 100644 --- a/selfdrive/ui/translations/main_zh-CHT.ts +++ b/selfdrive/ui/translations/main_zh-CHT.ts @@ -967,7 +967,7 @@ location set 上傳駕駛監控的錄像來協助我們提升駕駛監控的準確率。 - Experimental openpilot longitudinal control + Experimental openpilot Longitudinal Control 使用 openpilot 縱向控制（實驗） @@ -979,7 +979,7 @@ location set 打開縱向控制（實驗）以啟用此功能。 - Disengage On Accelerator Pedal + Disengage on Accelerator Pedal 油門取消控車 @@ -1003,7 +1003,7 @@ location set 進入分割畫面後，地圖將會顯示在畫面的左側。 - Experimental mode + Experimental Mode From 5eaf525c18becad63205fd3add4bfe540f70b01a Mon Sep 17 00:00:00 2001 From: ZwX1616 Date: Wed, 9 Nov 2022 21:49:24 -0800 Subject: [PATCH 081/184] camerad: fix OX flicker (#26439) --- system/camerad/cameras/camera_qcom2.cc | 28 +++++++++++--------------- system/camerad/cameras/camera_qcom2.h | 3 ++- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/system/camerad/cameras/camera_qcom2.cc b/system/camerad/cameras/camera_qcom2.cc index 78848af5be..2ee06e372a 100644 --- a/system/camerad/cameras/camera_qcom2.cc +++ b/system/camerad/cameras/camera_qcom2.cc @@ -80,30 +80,26 @@ const float sensor_analog_gains_AR0231[] = { 7.0/2.0, 8.0/2.0, 8.0/1.0}; // 12, 13, 14, 15 = bypass const float sensor_analog_gains_OX03C10[] = { - 1.0, 1.125, 1.25, 1.3125, 1.5625, - 1.6875, 2.0, 2.25, 2.625, 3.125, - 3.625, 4.0, 4.5, 5.0, 5.5, - 6.0, 6.5, 7.0, 7.5, 8.0, - 8.5, 9.0, 9.5, 10.0, 10.5, - 11.0, 11.5, 12.0, 12.5, 13.0, - 13.5, 14.0, 14.5, 15.0, 15.5}; + 1.0, 1.0625, 1.125, 1.1875, 1.25, 1.3125, 1.375, 1.4375, 1.5, 1.5625, 1.6875, + 1.8125, 1.9375, 2.0, 2.125, 2.25, 2.375, 2.5, 2.625, 2.75, 2.875, 3.0, + 3.125, 3.375, 3.625, 3.875, 4.0, 4.25, 4.5, 4.75, 5.0, 5.25, 5.5, + 5.75, 6.0, 6.25, 6.5, 7.0, 7.5, 8.0, 8.5, 9.0, 9.5, 10.0, + 10.5, 11.0, 11.5, 12.0, 12.5, 13.0, 13.5, 14.0, 14.5, 15.0, 15.5}; const uint32_t ox03c10_analog_gains_reg[] = { - 0x100, 0x120, 0x140, 0x150, 0x190, - 0x1B0, 0x200, 0x240, 0x2A0, 0x320, - 0x3A0, 0x400, 0x480, 0x500, 0x580, - 0x600, 0x680, 0x700, 0x780, 0x800, - 0x880, 0x900, 0x980, 0xA00, 0xA80, - 0xB00, 0xB80, 0xC00, 0xC80, 0xD00, - 0xD80, 0xE00, 0xE80, 0xF00, 0xF80}; + 0x100, 0x110, 0x120, 0x130, 0x140, 0x150, 0x160, 0x170, 0x180, 0x190, 0x1B0, + 0x1D0, 0x1F0, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2A0, 0x2C0, 0x2E0, 0x300, + 0x320, 0x360, 0x3A0, 0x3E0, 0x400, 0x440, 0x480, 0x4C0, 0x500, 0x540, 0x580, + 0x5C0, 0x600, 0x640, 0x680, 0x700, 0x780, 0x800, 0x880, 0x900, 0x980, 0xA00, + 0xA80, 0xB00, 0xB80, 0xC00, 0xC80, 0xD00, 0xD80, 0xE00, 0xE80, 0xF00, 0xF80}; const int ANALOG_GAIN_MIN_IDX_AR0231 = 0x1; // 0.25x const int ANALOG_GAIN_REC_IDX_AR0231 = 0x6; // 0.8x const int ANALOG_GAIN_MAX_IDX_AR0231 = 0xD; // 4.0x const int ANALOG_GAIN_MIN_IDX_OX03C10 = 0x0; -const int ANALOG_GAIN_REC_IDX_OX03C10 = 0x6; // 2x -const int ANALOG_GAIN_MAX_IDX_OX03C10 = 0x22; +const int ANALOG_GAIN_REC_IDX_OX03C10 = 0x11; // 2.5x +const int ANALOG_GAIN_MAX_IDX_OX03C10 = 0x36; const int EXPOSURE_TIME_MIN_AR0231 = 2; // with HDR, fastest ss const int EXPOSURE_TIME_MAX_AR0231 = 0x0855; // with HDR, slowest ss, 40ms diff --git a/system/camerad/cameras/camera_qcom2.h b/system/camerad/cameras/camera_qcom2.h index 5023c82458..1e25e605c5 100644 --- a/system/camerad/cameras/camera_qcom2.h +++ b/system/camerad/cameras/camera_qcom2.h @@ -12,6 +12,7 @@ #include "common/util.h" #define FRAME_BUF_COUNT 4 +#define ANALOG_GAIN_MAX_CNT 55 class CameraState { public: @@ -36,7 +37,7 @@ public: float dc_gain_on_grey; float dc_gain_off_grey; - float sensor_analog_gains[35]; + float sensor_analog_gains[ANALOG_GAIN_MAX_CNT]; int analog_gain_min_idx; int analog_gain_max_idx; int analog_gain_rec_idx; From 737408066895452f31f08144c129551b94e64662 Mon Sep 17 00:00:00 2001 From: YassineYousfi Date: Wed, 9 Nov 2022 22:04:57 -0800 Subject: [PATCH 082/184] min lane change speed 20mph (#26434) --- selfdrive/controls/lib/desire_helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfdrive/controls/lib/desire_helper.py b/selfdrive/controls/lib/desire_helper.py index d41d6780e3..4790b8f0eb 100644 --- a/selfdrive/controls/lib/desire_helper.py +++ b/selfdrive/controls/lib/desire_helper.py @@ -5,7 +5,7 @@ from common.realtime import DT_MDL LaneChangeState = log.LateralPlan.LaneChangeState LaneChangeDirection = log.LateralPlan.LaneChangeDirection -LANE_CHANGE_SPEED_MIN = 15 * CV.MPH_TO_MS +LANE_CHANGE_SPEED_MIN = 20 * CV.MPH_TO_MS LANE_CHANGE_TIME_MAX = 10. DESIRES = { From b320ac6c237eb0d31ab54227066e8ea6ba0f4dec Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Thu, 10 Nov 2022 14:05:18 +0800 Subject: [PATCH 083/184] Cabana: improve the BinaryView & fix known issues (#26409) * fix flipping issue * dragging up to create little endian signal * transform between little & big endian * complete selection functions * scroll to top after msg updated * remove empty line * cleanup code * remove extra semicolon * fix indentation * minmax * dont select hex column * create msg if not existed --- tools/cabana/binaryview.cc | 153 +++++++++++++++++------------------ tools/cabana/binaryview.h | 14 ++-- tools/cabana/dbcmanager.cc | 6 +- tools/cabana/dbcmanager.h | 2 +- tools/cabana/detailwidget.cc | 42 ++++++---- tools/cabana/detailwidget.h | 2 +- tools/cabana/signaledit.cc | 14 +++- 7 files changed, 127 insertions(+), 106 deletions(-) diff --git a/tools/cabana/binaryview.cc b/tools/cabana/binaryview.cc index ba50b101fc..678fe5f876 100644 --- a/tools/cabana/binaryview.cc +++ b/tools/cabana/binaryview.cc @@ -13,6 +13,10 @@ const int CELL_HEIGHT = 26; +inline int get_bit_index(const QModelIndex &index, bool little_endian) { + return index.row() * 8 + (little_endian ? 7 - index.column() : index.column()); +} + BinaryView::BinaryView(QWidget *parent) : QTableView(parent) { model = new BinaryViewModel(this); setModel(model); @@ -37,31 +41,49 @@ void BinaryView::highlight(const Signal *sig) { } void BinaryView::setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags flags) { - QModelIndex tl = indexAt({qMin(rect.left(), rect.right()), qMin(rect.top(), rect.bottom())}); - QModelIndex br = indexAt({qMax(rect.left(), rect.right()), qMax(rect.top(), rect.bottom())}); - if (!tl.isValid() || !br.isValid()) + auto index = indexAt(viewport()->mapFromGlobal(QCursor::pos())); + if (!anchor_index.isValid() || !index.isValid()) return; - if (tl < anchor_index) { - br = anchor_index; - } else if (anchor_index < br) { - tl = anchor_index; - } QItemSelection selection; - for (int row = tl.row(); row <= br.row(); ++row) { - int left_col = (row == tl.row()) ? tl.column() : 0; - int right_col = (row == br.row()) ? br.column() : 7; - selection.merge({model->index(row, left_col), model->index(row, right_col)}, flags); + auto [tl, br] = std::minmax(anchor_index, index); + if ((resize_sig && resize_sig->is_little_endian) || (!resize_sig && index < anchor_index)) { + // little_endian selection + if (tl.row() == br.row()) { + selection.merge({model->index(tl.row(), tl.column()), model->index(tl.row(), br.column())}, flags); + } else { + for (int row = tl.row(); row <= br.row(); ++row) { + int left_col = (row == br.row()) ? br.column() : 0; + int right_col = (row == tl.row()) ? tl.column() : 7; + selection.merge({model->index(row, left_col), model->index(row, right_col)}, flags); + } + } + } else { + // big endian selection + for (int row = tl.row(); row <= br.row(); ++row) { + int left_col = (row == tl.row()) ? tl.column() : 0; + int right_col = (row == br.row()) ? br.column() : 7; + selection.merge({model->index(row, left_col), model->index(row, right_col)}, flags); + } } selectionModel()->select(selection, flags); } void BinaryView::mousePressEvent(QMouseEvent *event) { delegate->setSelectionColor(style()->standardPalette().color(QPalette::Active, QPalette::Highlight)); - anchor_index = indexAt(event->pos()); - if (getResizingSignal() != nullptr) { + if (auto index = indexAt(event->pos()); index.isValid() && index.column() != 8) { + anchor_index = index; auto item = (const BinaryViewModel::Item *)anchor_index.internalPointer(); - delegate->setSelectionColor(item->bg_color); + if (item && item->sigs.size() > 0) { + int bit_idx = get_bit_index(anchor_index, true); + for (auto s : item->sigs) { + if (bit_idx == s->lsb || bit_idx == s->msb) { + resize_sig = s; + delegate->setSelectionColor(item->bg_color); + break; + } + } + } } QTableView::mousePressEvent(event); } @@ -80,23 +102,35 @@ void BinaryView::mouseMoveEvent(QMouseEvent *event) { void BinaryView::mouseReleaseEvent(QMouseEvent *event) { QTableView::mouseReleaseEvent(event); - if (auto indexes = selectedIndexes(); !indexes.isEmpty()) { - int from = indexes.first().row() * 8 + indexes.first().column(); - int to = indexes.back().row() * 8 + indexes.back().column(); - if (auto sig = getResizingSignal()) { - auto [sig_from, sig_to] = getSignalRange(sig); - if (from >= sig_from && to <= sig_to) { // reduce size - emit(from == sig_from ? resizeSignal(sig, std::min(to + 1, sig_to), sig_to) - : resizeSignal(sig, sig_from, std::max(from - 1, sig_from))); - } else { // increase size - emit resizeSignal(sig, std::min(from, sig_from), std::max(to, sig_to)); + auto release_index = indexAt(event->pos()); + if (release_index.isValid() && anchor_index.isValid()) { + if (release_index.column() == 8) { + release_index = model->index(release_index.row(), 7); + } + bool little_endian = (resize_sig && resize_sig->is_little_endian) || (!resize_sig && release_index < anchor_index); + int release_bit_idx = get_bit_index(release_index, little_endian); + int archor_bit_idx = get_bit_index(anchor_index, little_endian); + if (resize_sig) { + auto [sig_from, sig_to] = getSignalRange(resize_sig); + int start_bit, end_bit; + if (archor_bit_idx == sig_from) { + std::tie(start_bit, end_bit) = std::minmax(release_bit_idx, sig_to); + if (start_bit >= sig_from && start_bit <= sig_to) + start_bit = std::min(start_bit + 1, sig_to); + } else { + std::tie(start_bit, end_bit) = std::minmax(release_bit_idx, sig_from); + if (end_bit >= sig_from && end_bit <= sig_to) + end_bit = std::max(end_bit - 1, sig_from); } + emit resizeSignal(resize_sig, start_bit, end_bit - start_bit + 1); } else { - emit addSignal(from, to); + auto [sart_bit, end_bit] = std::minmax(archor_bit_idx, release_bit_idx); + emit addSignal(sart_bit, end_bit - sart_bit + 1, little_endian); } - clearSelection(); } + clearSelection(); anchor_index = QModelIndex(); + resize_sig = nullptr; } void BinaryView::leaveEvent(QEvent *event) { @@ -107,34 +141,17 @@ void BinaryView::leaveEvent(QEvent *event) { void BinaryView::setMessage(const QString &message_id) { model->setMessage(message_id); clearSelection(); + anchor_index = QModelIndex(); + resize_sig = nullptr; + hovered_sig = nullptr; updateState(); } -const Signal *BinaryView::getResizingSignal() const { - if (anchor_index.isValid()) { - auto item = (const BinaryViewModel::Item *)anchor_index.internalPointer(); - if (item && item->sigs.size() > 0) { - int archor_pos = anchor_index.row() * 8 + anchor_index.column(); - for (auto s : item->sigs) { - auto [sig_from, sig_to] = getSignalRange(s); - if (archor_pos == sig_from || archor_pos == sig_to) - return s; - } - } - } - return nullptr; -} - QSet BinaryView::getOverlappingSignals() const { QSet overlapping; - for (int i = 0; i < model->rowCount(); ++i) { - for (int j = 0; j < model->columnCount() - 1; ++j) { - auto item = (const BinaryViewModel::Item *)model->index(i, j).internalPointer(); - if (item && item->sigs.size() > 1) { - for (auto s : item->sigs) - overlapping.insert(s); - } - } + for (auto &item : model->items) { + if (item.sigs.size() > 1) + for (auto s : item.sigs) overlapping += s; } return overlapping; } @@ -142,53 +159,37 @@ QSet BinaryView::getOverlappingSignals() const { // BinaryViewModel void BinaryViewModel::setMessage(const QString &message_id) { - msg_id = message_id; - beginResetModel(); + msg_id = message_id; items.clear(); - row_count = 0; - - dbc_msg = dbc()->msg(msg_id); - if (dbc_msg) { + if ((dbc_msg = dbc()->msg(msg_id))) { row_count = dbc_msg->size; items.resize(row_count * column_count); for (int i = 0; i < dbc_msg->sigs.size(); ++i) { const auto &sig = dbc_msg->sigs[i]; auto [start, end] = getSignalRange(&sig); for (int j = start; j <= end; ++j) { - int idx = column_count * (j / 8) + j % 8; + int bit_index = sig.is_little_endian ? bigEndianBitIndex(j) : j; + int idx = column_count * (bit_index / 8) + bit_index % 8; if (idx >= items.size()) { qWarning() << "signal " << sig.name.c_str() << "out of bounds.start_bit:" << sig.start_bit << "size:" << sig.size; break; } - if (j == start) { - sig.is_little_endian ? items[idx].is_lsb = true : items[idx].is_msb = true; - } else if (j == end) { - sig.is_little_endian ? items[idx].is_msb = true : items[idx].is_lsb = true; - } + if (j == start) sig.is_little_endian ? items[idx].is_lsb = true : items[idx].is_msb = true; + if (j == end) sig.is_little_endian ? items[idx].is_msb = true : items[idx].is_lsb = true; items[idx].bg_color = getColor(i); - items[idx].sigs.push_back(&dbc_msg->sigs[i]); + items[idx].sigs.push_back(&sig); } } } else { row_count = can->lastMessage(msg_id).dat.size(); items.resize(row_count * column_count); } - endResetModel(); } -QModelIndex BinaryViewModel::index(int row, int column, const QModelIndex &parent) const { - return createIndex(row, column, (void *)&items[row * column_count + column]); -} - -Qt::ItemFlags BinaryViewModel::flags(const QModelIndex &index) const { - return (index.column() == column_count - 1) ? Qt::ItemIsEnabled : Qt::ItemIsEnabled | Qt::ItemIsSelectable; -} - void BinaryViewModel::updateState() { auto prev_items = items; - const auto &binary = can->lastMessage(msg_id).dat; // data size may changed. if (!dbc_msg && binary.size() != row_count) { @@ -198,7 +199,6 @@ void BinaryViewModel::updateState() { items.resize(row_count * column_count); endResetModel(); } - char hex[3] = {'\0'}; for (int i = 0; i < std::min(binary.size(), row_count); ++i) { for (int j = 0; j < column_count - 1; ++j) { @@ -248,9 +248,8 @@ void BinaryItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op BinaryView *bin_view = (BinaryView *)parent(); painter->save(); - bool hover = std::find_if(item->sigs.begin(), item->sigs.end(), [=](auto s) { return s == bin_view->hoveredSignal(); }) != - item->sigs.end(); // background + bool hover = item->sigs.contains(bin_view->hoveredSignal()); QColor bg_color = hover ? hoverColor(item->bg_color) : item->bg_color; if (option.state & QStyle::State_Selected) { bg_color = selection_color; @@ -258,7 +257,7 @@ void BinaryItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op painter->fillRect(option.rect, bg_color); // text - if (index.column() == 8) { // hex column + if (index.column() == 8) { // hex column painter->setFont(hex_font); } else if (hover) { painter->setPen(Qt::white); diff --git a/tools/cabana/binaryview.h b/tools/cabana/binaryview.h index a907a673bf..05bfe7e79f 100644 --- a/tools/cabana/binaryview.h +++ b/tools/cabana/binaryview.h @@ -28,12 +28,16 @@ public: BinaryViewModel(QObject *parent) : QAbstractTableModel(parent) {} void setMessage(const QString &message_id); void updateState(); - Qt::ItemFlags flags(const QModelIndex &index) const; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const { return {}; } int rowCount(const QModelIndex &parent = QModelIndex()) const override { return row_count; } int columnCount(const QModelIndex &parent = QModelIndex()) const override { return column_count; } + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override { + return createIndex(row, column, (void *)&items[row * column_count + column]); + } + Qt::ItemFlags flags(const QModelIndex &index) const override { + return (index.column() == column_count - 1) ? Qt::ItemIsEnabled : Qt::ItemIsEnabled | Qt::ItemIsSelectable; + } struct Item { QColor bg_color = QColor(Qt::white); @@ -42,13 +46,13 @@ public: QString val = "0"; QList sigs; }; + std::vector items; private: QString msg_id; const Msg *dbc_msg; int row_count = 0; const int column_count = 9; - std::vector items; }; class BinaryView : public QTableView { @@ -64,7 +68,7 @@ public: signals: void signalHovered(const Signal *sig); - void addSignal(int from, int size); + void addSignal(int start_bit, int size, bool little_endian); void resizeSignal(const Signal *sig, int from, int size); private: @@ -73,10 +77,10 @@ private: void mouseMoveEvent(QMouseEvent *event) override; void mouseReleaseEvent(QMouseEvent *event) override; void leaveEvent(QEvent *event) override; - const Signal *getResizingSignal() const; QModelIndex anchor_index; BinaryViewModel *model; BinaryItemDelegate *delegate; + const Signal *resize_sig = nullptr; const Signal *hovered_sig = nullptr; }; diff --git a/tools/cabana/dbcmanager.cc b/tools/cabana/dbcmanager.cc index 184fab38eb..abdd9a08df 100644 --- a/tools/cabana/dbcmanager.cc +++ b/tools/cabana/dbcmanager.cc @@ -147,9 +147,9 @@ double get_raw_value(uint8_t *data, size_t data_size, const Signal &sig) { return value; } -void updateSigSizeParamsFromRange(Signal &s, int from, int to) { - s.start_bit = s.is_little_endian ? from : bigEndianBitIndex(from); - s.size = to - from + 1; +void updateSigSizeParamsFromRange(Signal &s, int start_bit, int size) { + s.start_bit = s.is_little_endian ? start_bit : bigEndianBitIndex(start_bit); + s.size = size; if (s.is_little_endian) { s.lsb = s.start_bit; s.msb = s.start_bit + s.size - 1; diff --git a/tools/cabana/dbcmanager.h b/tools/cabana/dbcmanager.h index 2b6aca41d7..81c723a20d 100644 --- a/tools/cabana/dbcmanager.h +++ b/tools/cabana/dbcmanager.h @@ -49,7 +49,7 @@ private: double get_raw_value(uint8_t *data, size_t data_size, const Signal &sig); int bigEndianStartBitsIndex(int start_bit); int bigEndianBitIndex(int index); -void updateSigSizeParamsFromRange(Signal &s, int from, int to); +void updateSigSizeParamsFromRange(Signal &s, int start_bit, int size); std::pair getSignalRange(const Signal *s); DBCManager *dbc(); inline QString msgName(const QString &id, const char *def = "untitled") { diff --git a/tools/cabana/detailwidget.cc b/tools/cabana/detailwidget.cc index 287c75a617..f96b60847b 100644 --- a/tools/cabana/detailwidget.cc +++ b/tools/cabana/detailwidget.cc @@ -130,15 +130,13 @@ void DetailWidget::setMessage(const QString &message_id) { break; } } + msg_id = message_id; if (index == -1) { index = tabbar->addTab(message_id); tabbar->setTabToolTip(index, msgName(message_id)); } tabbar->setCurrentIndex(index); - msg_id = message_id; dbcMsgChanged(); - - scroll->verticalScrollBar()->setValue(0); } void DetailWidget::dbcMsgChanged(int show_form_idx) { @@ -187,6 +185,7 @@ void DetailWidget::dbcMsgChanged(int show_form_idx) { warning_label->setText(warnings.join('\n')); warning_widget->setVisible(!warnings.isEmpty()); setUpdatesEnabled(true); + scroll->verticalScrollBar()->setValue(0); } void DetailWidget::updateState() { @@ -232,24 +231,34 @@ void DetailWidget::removeMsg() { } } -void DetailWidget::addSignal(int from, int to) { - if (auto msg = dbc()->msg(msg_id)) { - Signal sig = {}; +void DetailWidget::addSignal(int start_bit, int size, bool little_endian) { + auto msg = dbc()->msg(msg_id); + if (!msg) { for (int i = 1; /**/; ++i) { - sig.name = "NEW_SIGNAL_" + std::to_string(i); - auto it = std::find_if(msg->sigs.begin(), msg->sigs.end(), [&](auto &s) { return sig.name == s.name; }); - if (it == msg->sigs.end()) break; + std::string name = "NEW_MSG_" + std::to_string(i); + auto it = std::find_if(dbc()->getDBC()->msgs.begin(), dbc()->getDBC()->msgs.end(), [&](auto &m) { return m.name == name; }); + if (it == dbc()->getDBC()->msgs.end()) { + dbc()->updateMsg(msg_id, name.c_str(), can->lastMessage(msg_id).dat.size()); + msg = dbc()->msg(msg_id); + break; + } } - sig.is_little_endian = false, - updateSigSizeParamsFromRange(sig, from, to); - dbc()->addSignal(msg_id, sig); - dbcMsgChanged(msg->sigs.size() - 1); } + Signal sig = {}; + for (int i = 1; /**/; ++i) { + sig.name = "NEW_SIGNAL_" + std::to_string(i); + auto it = std::find_if(msg->sigs.begin(), msg->sigs.end(), [&](auto &s) { return sig.name == s.name; }); + if (it == msg->sigs.end()) break; + } + sig.is_little_endian = little_endian; + updateSigSizeParamsFromRange(sig, start_bit, size); + dbc()->addSignal(msg_id, sig); + dbcMsgChanged(msg->sigs.size() - 1); } -void DetailWidget::resizeSignal(const Signal *sig, int from, int to) { +void DetailWidget::resizeSignal(const Signal *sig, int start_bit, int size) { Signal s = *sig; - updateSigSizeParamsFromRange(s, from, to); + updateSigSizeParamsFromRange(s, start_bit, size); saveSignal(sig, s); } @@ -272,8 +281,7 @@ void DetailWidget::saveSignal(const Signal *sig, const Signal &new_sig) { } dbc()->updateSignal(msg_id, sig->name.c_str(), new_sig); - // update binary view and history log - updateState(); + dbcMsgChanged(); } void DetailWidget::removeSignal(const Signal *sig) { diff --git a/tools/cabana/detailwidget.h b/tools/cabana/detailwidget.h index 7cb3a505ee..915e0bde60 100644 --- a/tools/cabana/detailwidget.h +++ b/tools/cabana/detailwidget.h @@ -30,7 +30,7 @@ public: private: void updateChartState(const QString &id, const Signal *sig, bool opened); void showTabBarContextMenu(const QPoint &pt); - void addSignal(int start_bit, int to); + void addSignal(int start_bit, int size, bool little_endian); void resizeSignal(const Signal *sig, int from, int to); void saveSignal(const Signal *sig, const Signal &new_sig); void removeSignal(const Signal *sig); diff --git a/tools/cabana/signaledit.cc b/tools/cabana/signaledit.cc index ee91887d0a..99365294b8 100644 --- a/tools/cabana/signaledit.cc +++ b/tools/cabana/signaledit.cc @@ -28,7 +28,6 @@ SignalForm::SignalForm(QWidget *parent) : QWidget(parent) { endianness->addItems({"Little", "Big"}); form_layout->addRow(tr("Endianness"), endianness); - ; form_layout->addRow(tr("lsb"), lsb = new QLabel()); form_layout->addRow(tr("msb"), msb = new QLabel()); @@ -130,7 +129,18 @@ void SignalEdit::saveSignal() { s.offset = form->offset->text().toDouble(); s.factor = form->factor->text().toDouble(); s.is_signed = form->sign->currentIndex() == 0; - s.is_little_endian = form->endianness->currentIndex() == 0; + bool little_endian = form->endianness->currentIndex() == 0; + if (little_endian != s.is_little_endian) { + int start = std::floor(s.start_bit / 8); + if (little_endian) { + int end = std::floor((s.start_bit - s.size + 1) / 8); + s.start_bit = start == end ? s.start_bit - s.size + 1 : bigEndianStartBitsIndex(s.start_bit); + } else { + int end = std::floor((s.start_bit + s.size - 1) / 8); + s.start_bit = start == end ? s.start_bit + s.size - 1 : bigEndianBitIndex(s.start_bit); + } + s.is_little_endian = little_endian; + } if (s.is_little_endian) { s.lsb = s.start_bit; s.msb = s.start_bit + s.size - 1; From 7c922eafe9d9c8e07de80f8bafcd9b2dc2932c13 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Fri, 11 Nov 2022 02:37:38 +0800 Subject: [PATCH 084/184] Cabana: Added support for undo & redo (#26440) * undo/redo * display command list to rolling the state backwards or forward * update detailview after rolling states * add * to title bar to indicate dbc has changed * fix signal pointer address changed after removed * cleanup * fix id error * clear undo stack after dbc file changed * cleanup * use map * cleanup * typo --- tools/cabana/SConscript | 2 +- tools/cabana/binaryview.cc | 7 +-- tools/cabana/binaryview.h | 2 +- tools/cabana/chartswidget.cc | 2 +- tools/cabana/commands.cc | 75 +++++++++++++++++++++++++++++++ tools/cabana/commands.h | 63 ++++++++++++++++++++++++++ tools/cabana/dbcmanager.cc | 75 ++++++++++++++++--------------- tools/cabana/dbcmanager.h | 25 +++++++---- tools/cabana/detailwidget.cc | 60 +++++++++++-------------- tools/cabana/detailwidget.h | 2 + tools/cabana/historylog.cc | 8 +++- tools/cabana/historylog.h | 2 +- tools/cabana/mainwin.cc | 25 ++++++++++- tools/cabana/tests/test_cabana.cc | 39 ++++++++-------- 14 files changed, 277 insertions(+), 110 deletions(-) create mode 100644 tools/cabana/commands.cc create mode 100644 tools/cabana/commands.h diff --git a/tools/cabana/SConscript b/tools/cabana/SConscript index b7321e1f8d..3ff4862800 100644 --- a/tools/cabana/SConscript +++ b/tools/cabana/SConscript @@ -19,7 +19,7 @@ prev_moc_path = cabana_env['QT_MOCHPREFIX'] cabana_env['QT_MOCHPREFIX'] = os.path.dirname(prev_moc_path) + '/cabana/moc_' cabana_env.Execute('./generate_dbc_json.py --out car_fingerprint_to_dbc.json') cabana_lib = cabana_env.Library("cabana_lib", ['mainwin.cc', 'binaryview.cc', 'chartswidget.cc', 'historylog.cc', 'videowidget.cc', 'signaledit.cc', 'dbcmanager.cc', - 'canmessages.cc', 'messageswidget.cc', 'settings.cc', 'detailwidget.cc'], LIBS=cabana_libs, FRAMEWORKS=base_frameworks) + 'canmessages.cc', 'commands.cc', 'messageswidget.cc', 'settings.cc', 'detailwidget.cc'], LIBS=cabana_libs, FRAMEWORKS=base_frameworks) cabana_env.Program('_cabana', ['cabana.cc', cabana_lib], LIBS=cabana_libs, FRAMEWORKS=base_frameworks) if GetOption('test'): diff --git a/tools/cabana/binaryview.cc b/tools/cabana/binaryview.cc index 678fe5f876..bcd2b88a81 100644 --- a/tools/cabana/binaryview.cc +++ b/tools/cabana/binaryview.cc @@ -165,14 +165,14 @@ void BinaryViewModel::setMessage(const QString &message_id) { if ((dbc_msg = dbc()->msg(msg_id))) { row_count = dbc_msg->size; items.resize(row_count * column_count); - for (int i = 0; i < dbc_msg->sigs.size(); ++i) { - const auto &sig = dbc_msg->sigs[i]; + int i = 0; + for (auto &[name, sig] : dbc_msg->sigs) { auto [start, end] = getSignalRange(&sig); for (int j = start; j <= end; ++j) { int bit_index = sig.is_little_endian ? bigEndianBitIndex(j) : j; int idx = column_count * (bit_index / 8) + bit_index % 8; if (idx >= items.size()) { - qWarning() << "signal " << sig.name.c_str() << "out of bounds.start_bit:" << sig.start_bit << "size:" << sig.size; + qWarning() << "signal " << name << "out of bounds.start_bit:" << sig.start_bit << "size:" << sig.size; break; } if (j == start) sig.is_little_endian ? items[idx].is_lsb = true : items[idx].is_msb = true; @@ -180,6 +180,7 @@ void BinaryViewModel::setMessage(const QString &message_id) { items[idx].bg_color = getColor(i); items[idx].sigs.push_back(&sig); } + ++i; } } else { row_count = can->lastMessage(msg_id).dat.size(); diff --git a/tools/cabana/binaryview.h b/tools/cabana/binaryview.h index 05bfe7e79f..2d6fc5c18b 100644 --- a/tools/cabana/binaryview.h +++ b/tools/cabana/binaryview.h @@ -50,7 +50,7 @@ public: private: QString msg_id; - const Msg *dbc_msg; + const DBCMsg *dbc_msg; int row_count = 0; const int column_count = 9; }; diff --git a/tools/cabana/chartswidget.cc b/tools/cabana/chartswidget.cc index 3a170bccdc..875ed80ac5 100644 --- a/tools/cabana/chartswidget.cc +++ b/tools/cabana/chartswidget.cc @@ -240,7 +240,7 @@ void ChartView::resizeEvent(QResizeEvent *event) { void ChartView::updateTitle() { chart()->setTitle(signal->name.c_str()); - msg_title->setHtml(tr("%1 %2").arg(dbc()->msg(id)->name.c_str()).arg(id)); + msg_title->setHtml(tr("%1 %2").arg(dbc()->msg(id)->name).arg(id)); } void ChartView::updateFromSettings() { diff --git a/tools/cabana/commands.cc b/tools/cabana/commands.cc new file mode 100644 index 0000000000..b3f5cb1c66 --- /dev/null +++ b/tools/cabana/commands.cc @@ -0,0 +1,75 @@ +#include "tools/cabana/commands.h" + +// EditMsgCommand + +EditMsgCommand::EditMsgCommand(const QString &id, const QString &title, int size, QUndoCommand *parent) + : id(id), new_title(title), new_size(size), QUndoCommand(parent) { + if (auto msg = dbc()->msg(id)) { + old_title = msg->name; + old_size = msg->size; + } + setText(QObject::tr("Edit message %1:%2").arg(DBCManager::parseId(id).second).arg(title)); +} + +void EditMsgCommand::undo() { + if (old_title.isEmpty()) + dbc()->removeMsg(id); + else + dbc()->updateMsg(id, old_title, old_size); +} + +void EditMsgCommand::redo() { + dbc()->updateMsg(id, new_title, new_size); +} + +// RemoveMsgCommand + +RemoveMsgCommand::RemoveMsgCommand(const QString &id, QUndoCommand *parent) : id(id), QUndoCommand(parent) { + if (auto msg = dbc()->msg(id)) { + message = *msg; + setText(QObject::tr("Remove message %1:%2").arg(DBCManager::parseId(id).second).arg(message.name)); + } +} + +void RemoveMsgCommand::undo() { + if (!message.name.isEmpty()) { + dbc()->updateMsg(id, message.name, message.size); + for (auto &[name, s] : message.sigs) + dbc()->addSignal(id, s); + } +} + +void RemoveMsgCommand::redo() { + if (!message.name.isEmpty()) + dbc()->removeMsg(id); +} + +// AddSigCommand + +AddSigCommand::AddSigCommand(const QString &id, const Signal &sig, QUndoCommand *parent) + : id(id), signal(sig), QUndoCommand(parent) { + setText(QObject::tr("Add signal %1 to %2").arg(sig.name.c_str()).arg(DBCManager::parseId(id).second)); +} + +void AddSigCommand::undo() { dbc()->removeSignal(id, signal.name.c_str()); } +void AddSigCommand::redo() { dbc()->addSignal(id, signal); } + +// RemoveSigCommand + +RemoveSigCommand::RemoveSigCommand(const QString &id, const Signal *sig, QUndoCommand *parent) + : id(id), signal(*sig), QUndoCommand(parent) { + setText(QObject::tr("Remove signal %1 from %2").arg(signal.name.c_str()).arg(DBCManager::parseId(id).second)); +} + +void RemoveSigCommand::undo() { dbc()->addSignal(id, signal); } +void RemoveSigCommand::redo() { dbc()->removeSignal(id, signal.name.c_str()); } + +// EditSignalCommand + +EditSignalCommand::EditSignalCommand(const QString &id, const Signal *sig, const Signal &new_sig, QUndoCommand *parent) + : id(id), old_signal(*sig), new_signal(new_sig), QUndoCommand(parent) { + setText(QObject::tr("Edit signal %1").arg(old_signal.name.c_str())); +} + +void EditSignalCommand::undo() { dbc()->updateSignal(id, new_signal.name.c_str(), old_signal); } +void EditSignalCommand::redo() { dbc()->updateSignal(id, old_signal.name.c_str(), new_signal); } diff --git a/tools/cabana/commands.h b/tools/cabana/commands.h new file mode 100644 index 0000000000..7ea1f66653 --- /dev/null +++ b/tools/cabana/commands.h @@ -0,0 +1,63 @@ +#pragma once + +#include + +#include "tools/cabana/canmessages.h" +#include "tools/cabana/dbcmanager.h" + +class EditMsgCommand : public QUndoCommand { +public: + EditMsgCommand(const QString &id, const QString &title, int size, QUndoCommand *parent = nullptr); + void undo() override; + void redo() override; + +private: + const QString id; + QString old_title, new_title; + int old_size = 0, new_size = 0; +}; + +class RemoveMsgCommand : public QUndoCommand { +public: + RemoveMsgCommand(const QString &id, QUndoCommand *parent = nullptr); + void undo() override; + void redo() override; + +private: + const QString id; + DBCMsg message; +}; + +class AddSigCommand : public QUndoCommand { +public: + AddSigCommand(const QString &id, const Signal &sig, QUndoCommand *parent = nullptr); + void undo() override; + void redo() override; + +private: + const QString id; + Signal signal = {}; +}; + +class RemoveSigCommand : public QUndoCommand { +public: + RemoveSigCommand(const QString &id, const Signal *sig, QUndoCommand *parent = nullptr); + void undo() override; + void redo() override; + +private: + const QString id; + Signal signal = {}; +}; + +class EditSignalCommand : public QUndoCommand { +public: + EditSignalCommand(const QString &id, const Signal *sig, const Signal &new_sig, QUndoCommand *parent = nullptr); + void undo() override; + void redo() override; + +private: + const QString id; + Signal old_signal = {}; + Signal new_signal = {}; +}; diff --git a/tools/cabana/dbcmanager.cc b/tools/cabana/dbcmanager.cc index abdd9a08df..ebad2387cf 100644 --- a/tools/cabana/dbcmanager.cc +++ b/tools/cabana/dbcmanager.cc @@ -10,32 +10,36 @@ DBCManager::~DBCManager() {} void DBCManager::open(const QString &dbc_file_name) { dbc = const_cast(dbc_lookup(dbc_file_name.toStdString())); - updateMsgMap(); - emit DBCFileChanged(); + initMsgMap(); } void DBCManager::open(const QString &name, const QString &content) { std::istringstream stream(content.toStdString()); dbc = const_cast(dbc_parse_from_stream(name.toStdString(), stream)); - updateMsgMap(); - emit DBCFileChanged(); + initMsgMap(); } -void DBCManager::updateMsgMap() { - msg_map.clear(); - for (auto &msg : dbc->msgs) - msg_map[msg.address] = &msg; +void DBCManager::initMsgMap() { + msgs.clear(); + for (auto &msg : dbc->msgs) { + auto &m = msgs[msg.address]; + m.name = msg.name.c_str(); + m.size = msg.size; + for (auto &s : msg.sigs) + m.sigs[QString::fromStdString(s.name)] = s; + } + emit DBCFileChanged(); } QString DBCManager::generateDBC() { if (!dbc) return {}; QString dbc_string; - for (auto &m : dbc->msgs) { - dbc_string += QString("BO_ %1 %2: %3 XXX\n").arg(m.address).arg(m.name.c_str()).arg(m.size); - for (auto &sig : m.sigs) { + for (auto &[address, m] : msgs) { + dbc_string += QString("BO_ %1 %2: %3 XXX\n").arg(address).arg(m.name).arg(m.size); + for (auto &[name, sig] : m.sigs) { dbc_string += QString(" SG_ %1 : %2|%3@%4%5 (%6,%7) [0|0] \"\" XXX\n") - .arg(sig.name.c_str()) + .arg(name) .arg(sig.start_bit) .arg(sig.size) .arg(sig.is_little_endian ? '1' : '0') @@ -49,48 +53,45 @@ QString DBCManager::generateDBC() { } void DBCManager::updateMsg(const QString &id, const QString &name, uint32_t size) { - auto [bus, address] = parseId(id); - if (auto m = const_cast(msg(address))) { - m->name = name.toStdString(); - m->size = size; - } else { - m = &dbc->msgs.emplace_back(Msg{.address = address, .name = name.toStdString(), .size = size}); - msg_map[address] = m; - } + auto [_, address] = parseId(id); + auto &m = msgs[address]; + m.name = name; + m.size = size; emit msgUpdated(address); } void DBCManager::removeMsg(const QString &id) { uint32_t address = parseId(id).second; - auto it = std::find_if(dbc->msgs.begin(), dbc->msgs.end(), [address](auto &m) { return m.address == address; }); - if (it != dbc->msgs.end()) { - dbc->msgs.erase(it); - updateMsgMap(); - emit msgRemoved(address); - } + msgs.erase(address); + emit msgRemoved(address); } void DBCManager::addSignal(const QString &id, const Signal &sig) { - if (Msg *m = const_cast(msg(id))) { - emit signalAdded(&m->sigs.emplace_back(sig)); + if (auto m = const_cast(msg(id))) { + auto &s = m->sigs[sig.name.c_str()]; + s = sig; + emit signalAdded(&s); } } void DBCManager::updateSignal(const QString &id, const QString &sig_name, const Signal &sig) { - if (Msg *m = const_cast(msg(id))) { - auto it = std::find_if(m->sigs.begin(), m->sigs.end(), [=](auto &sig) { return sig_name == sig.name.c_str(); }); - if (it != m->sigs.end()) { - *it = sig; - emit signalUpdated(&(*it)); - } + if (auto m = const_cast(msg(id))) { + // change key name + QString new_name = QString::fromStdString(sig.name); + auto node = m->sigs.extract(sig_name); + node.key() = new_name; + auto it = m->sigs.insert(std::move(node)); + auto &s = m->sigs[new_name]; + s = sig; + emit signalUpdated(&s); } } void DBCManager::removeSignal(const QString &id, const QString &sig_name) { - if (Msg *m = const_cast(msg(id))) { - auto it = std::find_if(m->sigs.begin(), m->sigs.end(), [=](auto &sig) { return sig_name == sig.name.c_str(); }); + if (auto m = const_cast(msg(id))) { + auto it = m->sigs.find(sig_name); if (it != m->sigs.end()) { - emit signalRemoved(&(*it)); + emit signalRemoved(&(it->second)); m->sigs.erase(it); } } diff --git a/tools/cabana/dbcmanager.h b/tools/cabana/dbcmanager.h index 81c723a20d..d2262527d4 100644 --- a/tools/cabana/dbcmanager.h +++ b/tools/cabana/dbcmanager.h @@ -1,9 +1,16 @@ #pragma once +#include #include - +#include #include "opendbc/can/common_dbc.h" +struct DBCMsg { + QString name; + uint32_t size; + std::map sigs; +}; + class DBCManager : public QObject { Q_OBJECT @@ -24,11 +31,11 @@ public: void updateMsg(const QString &id, const QString &name, uint32_t size); void removeMsg(const QString &id); - inline const DBC *getDBC() const { return dbc; } - inline const Msg *msg(const QString &id) const { return msg(parseId(id).second); } - inline const Msg *msg(uint32_t address) const { - auto it = msg_map.find(address); - return it != msg_map.end() ? it->second : nullptr; + inline const std::map &messages() const { return msgs; } + inline const DBCMsg *msg(const QString &id) const { return msg(parseId(id).second); } + inline const DBCMsg *msg(uint32_t address) const { + auto it = msgs.find(address); + return it != msgs.end() ? &it->second : nullptr; } signals: @@ -40,9 +47,9 @@ signals: void DBCFileChanged(); private: - void updateMsgMap(); + void initMsgMap(); DBC *dbc = nullptr; - std::unordered_map msg_map; + std::map msgs; }; // TODO: Add helper function in dbc.h @@ -54,5 +61,5 @@ std::pair getSignalRange(const Signal *s); DBCManager *dbc(); inline QString msgName(const QString &id, const char *def = "untitled") { auto msg = dbc()->msg(id); - return msg ? msg->name.c_str() : def; + return msg ? msg->name : def; } diff --git a/tools/cabana/detailwidget.cc b/tools/cabana/detailwidget.cc index f96b60847b..6d07727303 100644 --- a/tools/cabana/detailwidget.cc +++ b/tools/cabana/detailwidget.cc @@ -10,16 +10,19 @@ #include "selfdrive/ui/qt/util.h" #include "tools/cabana/canmessages.h" +#include "tools/cabana/commands.h" #include "tools/cabana/dbcmanager.h" // DetailWidget DetailWidget::DetailWidget(ChartsWidget *charts, QWidget *parent) : charts(charts), QWidget(parent) { + undo_stack = new QUndoStack(this); + QVBoxLayout *main_layout = new QVBoxLayout(this); main_layout->setContentsMargins(0, 0, 0, 0); main_layout->setSpacing(0); - // tabbar + // tabbar tabbar = new QTabBar(this); tabbar->setTabsClosable(true); tabbar->setDrawBase(false); @@ -99,6 +102,7 @@ DetailWidget::DetailWidget(ChartsWidget *charts, QWidget *parent) : charts(chart QObject::connect(tabbar, &QTabBar::tabCloseRequested, tabbar, &QTabBar::removeTab); QObject::connect(charts, &ChartsWidget::chartOpened, [this](const QString &id, const Signal *sig) { updateChartState(id, sig, true); }); QObject::connect(charts, &ChartsWidget::chartClosed, [this](const QString &id, const Signal *sig) { updateChartState(id, sig, false); }); + QObject::connect(undo_stack, &QUndoStack::indexChanged, [this]() { dbcMsgChanged(); }); } void DetailWidget::showTabBarContextMenu(const QPoint &pt) { @@ -143,12 +147,17 @@ void DetailWidget::dbcMsgChanged(int show_form_idx) { if (msg_id.isEmpty()) return; setUpdatesEnabled(false); + + binary_view->setMessage(msg_id); + history_log->setMessage(msg_id); + QStringList warnings; for (auto f : signal_list) f->hide(); - const Msg *msg = dbc()->msg(msg_id); + const DBCMsg *msg = dbc()->msg(msg_id); if (msg) { - for (int i = 0; i < msg->sigs.size(); ++i) { + int i = 0; + for (auto &[name, sig] : msg->sigs) { SignalEdit *form = i < signal_list.size() ? signal_list[i] : nullptr; if (!form) { form = new SignalEdit(i); @@ -161,9 +170,10 @@ void DetailWidget::dbcMsgChanged(int show_form_idx) { signals_container->layout()->addWidget(form); signal_list.push_back(form); } - form->setSignal(msg_id, &(msg->sigs[i]), i == show_form_idx); - form->setChartOpened(charts->isChartOpened(msg_id, &(msg->sigs[i]))); + form->setSignal(msg_id, &sig, i == show_form_idx); + form->setChartOpened(charts->isChartOpened(msg_id, &sig)); form->show(); + ++i; } if (msg->size != can->lastMessage(msg_id).dat.size()) warnings.push_back(tr("Message size (%1) is incorrect.").arg(msg->size)); @@ -173,9 +183,6 @@ void DetailWidget::dbcMsgChanged(int show_form_idx) { remove_msg_act->setEnabled(msg != nullptr); name_label->setText(msgName(msg_id)); - binary_view->setMessage(msg_id); - history_log->setMessage(msg_id); - // Check overlapping bits if (auto overlapping = binary_view->getOverlappingSignals(); !overlapping.isEmpty()) { for (auto s : overlapping) @@ -215,19 +222,13 @@ void DetailWidget::editMsg() { int size = msg ? msg->size : can->lastMessage(id).dat.size(); EditMessageDialog dlg(id, msgName(id), size, this); if (dlg.exec()) { - dbc()->updateMsg(id, dlg.name_edit->text(), dlg.size_spin->value()); - dbcMsgChanged(); + undo_stack->push(new EditMsgCommand(msg_id, dlg.name_edit->text(), dlg.size_spin->value())); } } void DetailWidget::removeMsg() { - QString id = msg_id; - if (auto msg = dbc()->msg(id)) { - QString text = tr("Are you sure you want to remove '%1'").arg(msg->name.c_str()); - if (QMessageBox::Yes == QMessageBox::question(this, tr("Remove Message"), text)) { - dbc()->removeMsg(id); - dbcMsgChanged(); - } + if (auto msg = dbc()->msg(msg_id)) { + undo_stack->push(new RemoveMsgCommand(msg_id)); } } @@ -235,10 +236,10 @@ void DetailWidget::addSignal(int start_bit, int size, bool little_endian) { auto msg = dbc()->msg(msg_id); if (!msg) { for (int i = 1; /**/; ++i) { - std::string name = "NEW_MSG_" + std::to_string(i); - auto it = std::find_if(dbc()->getDBC()->msgs.begin(), dbc()->getDBC()->msgs.end(), [&](auto &m) { return m.name == name; }); - if (it == dbc()->getDBC()->msgs.end()) { - dbc()->updateMsg(msg_id, name.c_str(), can->lastMessage(msg_id).dat.size()); + QString name = QString("NEW_MSG_%1").arg(i); + auto it = std::find_if(dbc()->messages().begin(), dbc()->messages().end(), [&](auto &m) { return m.second.name == name; }); + if (it == dbc()->messages().end()) { + undo_stack->push(new EditMsgCommand(msg_id, name, can->lastMessage(msg_id).dat.size())); msg = dbc()->msg(msg_id); break; } @@ -247,13 +248,12 @@ void DetailWidget::addSignal(int start_bit, int size, bool little_endian) { Signal sig = {}; for (int i = 1; /**/; ++i) { sig.name = "NEW_SIGNAL_" + std::to_string(i); - auto it = std::find_if(msg->sigs.begin(), msg->sigs.end(), [&](auto &s) { return sig.name == s.name; }); + auto it = msg->sigs.find(sig.name.c_str()); if (it == msg->sigs.end()) break; } sig.is_little_endian = little_endian; updateSigSizeParamsFromRange(sig, start_bit, size); - dbc()->addSignal(msg_id, sig); - dbcMsgChanged(msg->sigs.size() - 1); + undo_stack->push(new AddSigCommand(msg_id, sig)); } void DetailWidget::resizeSignal(const Signal *sig, int start_bit, int size) { @@ -265,14 +265,13 @@ void DetailWidget::resizeSignal(const Signal *sig, int start_bit, int size) { void DetailWidget::saveSignal(const Signal *sig, const Signal &new_sig) { auto msg = dbc()->msg(msg_id); if (new_sig.name != sig->name) { - auto it = std::find_if(msg->sigs.begin(), msg->sigs.end(), [&](auto &s) { return s.name == new_sig.name; }); + auto it = msg->sigs.find(new_sig.name.c_str()); if (it != msg->sigs.end()) { QString warning_str = tr("There is already a signal with the same name '%1'").arg(new_sig.name.c_str()); QMessageBox::warning(this, tr("Failed to save signal"), warning_str); return; } } - auto [start, end] = getSignalRange(&new_sig); if (start < 0 || end >= msg->size * 8) { QString warning_str = tr("Signal size [%1] exceed limit").arg(new_sig.size); @@ -280,16 +279,11 @@ void DetailWidget::saveSignal(const Signal *sig, const Signal &new_sig) { return; } - dbc()->updateSignal(msg_id, sig->name.c_str(), new_sig); - dbcMsgChanged(); + undo_stack->push(new EditSignalCommand(msg_id, sig, new_sig)); } void DetailWidget::removeSignal(const Signal *sig) { - QString text = tr("Are you sure you want to remove signal '%1'").arg(sig->name.c_str()); - if (QMessageBox::Yes == QMessageBox::question(this, tr("Remove signal"), text)) { - dbc()->removeSignal(msg_id, sig->name.c_str()); - dbcMsgChanged(); - } + undo_stack->push(new RemoveSigCommand(msg_id, sig)); } // EditMessageDialog diff --git a/tools/cabana/detailwidget.h b/tools/cabana/detailwidget.h index 915e0bde60..dc40eae159 100644 --- a/tools/cabana/detailwidget.h +++ b/tools/cabana/detailwidget.h @@ -3,6 +3,7 @@ #include #include #include +#include #include "tools/cabana/binaryview.h" #include "tools/cabana/chartswidget.h" @@ -26,6 +27,7 @@ public: DetailWidget(ChartsWidget *charts, QWidget *parent); void setMessage(const QString &message_id); void dbcMsgChanged(int show_form_idx = -1); + QUndoStack *undo_stack = nullptr; private: void updateChartState(const QString &id, const Signal *sig, bool opened); diff --git a/tools/cabana/historylog.cc b/tools/cabana/historylog.cc index 4b1818cf68..28e344a46e 100644 --- a/tools/cabana/historylog.cc +++ b/tools/cabana/historylog.cc @@ -4,6 +4,10 @@ // HistoryLogModel +inline const Signal &get_signal(const DBCMsg *m, int index) { + return std::next(m->sigs.begin(), index)->second; +} + QVariant HistoryLogModel::data(const QModelIndex &index, int role) const { bool has_signal = dbc_msg && !dbc_msg->sigs.empty(); if (role == Qt::DisplayRole) { @@ -11,7 +15,7 @@ QVariant HistoryLogModel::data(const QModelIndex &index, int role) const { if (index.column() == 0) { return QString::number(m.ts, 'f', 2); } - return has_signal ? QString::number(get_raw_value((uint8_t *)m.dat.begin(), m.dat.size(), dbc_msg->sigs[index.column() - 1])) + return has_signal ? QString::number(get_raw_value((uint8_t *)m.dat.begin(), m.dat.size(), get_signal(dbc_msg, index.column() - 1))) : toHex(m.dat); } else if (role == Qt::FontRole && index.column() == 1 && !has_signal) { return QFontDatabase::systemFont(QFontDatabase::FixedFont); @@ -37,7 +41,7 @@ QVariant HistoryLogModel::headerData(int section, Qt::Orientation orientation, i if (section == 0) { return "Time"; } - return has_signal ? QString::fromStdString(dbc_msg->sigs[section - 1].name).replace('_', ' ') : "Data"; + return has_signal ? QString::fromStdString(get_signal(dbc_msg, section - 1).name).replace('_', ' ') : "Data"; } else if (role == Qt::BackgroundRole && section > 0 && has_signal) { return QBrush(QColor(getColor(section - 1))); } diff --git a/tools/cabana/historylog.h b/tools/cabana/historylog.h index e8b0f5a35b..21be8fc129 100644 --- a/tools/cabana/historylog.h +++ b/tools/cabana/historylog.h @@ -28,7 +28,7 @@ private: QString msg_id; int row_count = 0; int column_count = 2; - const Msg *dbc_msg = nullptr; + const DBCMsg *dbc_msg = nullptr; std::deque messages; }; diff --git a/tools/cabana/mainwin.cc b/tools/cabana/mainwin.cc index 9b85ba7e8d..b8913a3aa7 100644 --- a/tools/cabana/mainwin.cc +++ b/tools/cabana/mainwin.cc @@ -12,7 +12,9 @@ #include #include #include +#include #include +#include #include "tools/replay/util.h" @@ -41,9 +43,7 @@ MainWindow::MainWindow() : QMainWindow() { dbc_combo->addItem(QString::fromStdString(name)); } dbc_combo->model()->sort(0); - dbc_combo->setEditable(true); dbc_combo->setInsertPolicy(QComboBox::NoInsert); - dbc_combo->completer()->setCompletionMode(QCompleter::PopupCompletion); messages_layout->addWidget(dbc_combo); messages_widget = new MessagesWidget(this); @@ -102,9 +102,13 @@ MainWindow::MainWindow() : QMainWindow() { QObject::connect(charts_widget, &ChartsWidget::rangeChanged, video_widget, &VideoWidget::rangeChanged); QObject::connect(can, &CANMessages::streamStarted, this, &MainWindow::loadDBCFromFingerprint); QObject::connect(dbc(), &DBCManager::DBCFileChanged, [this]() { + detail_widget->undo_stack->clear(); dbc_combo->setCurrentText(QFileInfo(dbc()->name()).baseName()); setWindowTitle(tr("%1 - Cabana").arg(dbc()->name())); }); + QObject::connect(detail_widget->undo_stack, &QUndoStack::indexChanged, [this](int index) { + setWindowTitle(tr("%1%2 - Cabana").arg(index > 0 ? "* " : "").arg(dbc()->name())); + }); } void MainWindow::createActions() { @@ -116,6 +120,23 @@ void MainWindow::createActions() { file_menu->addAction(tr("Copy DBC To Clipboard"), this, &MainWindow::saveDBCToClipboard); file_menu->addSeparator(); file_menu->addAction(tr("Settings..."), this, &MainWindow::setOption); + + QMenu *edit_menu = menuBar()->addMenu(tr("&Edit")); + auto undo_act = detail_widget->undo_stack->createUndoAction(this, tr("&Undo")); + undo_act->setShortcuts(QKeySequence::Undo); + edit_menu->addAction(undo_act); + auto redo_act = detail_widget->undo_stack->createRedoAction(this, tr("&Rndo")); + redo_act->setShortcuts(QKeySequence::Redo); + edit_menu->addAction(redo_act); + edit_menu->addSeparator(); + + QMenu *commands_menu = edit_menu->addMenu(tr("Command &List")); + auto undo_view = new QUndoView(detail_widget->undo_stack); + undo_view->setWindowTitle(tr("Command List")); + QWidgetAction *commands_act = new QWidgetAction(this); + commands_act->setDefaultWidget(undo_view); + commands_menu->addAction(commands_act); + QMenu *help_menu = menuBar()->addMenu(tr("&Help")); help_menu->addAction(tr("About &Qt"), qApp, &QApplication::aboutQt); } diff --git a/tools/cabana/tests/test_cabana.cc b/tools/cabana/tests/test_cabana.cc index d0aa2cbb4f..d2d9dc1d2a 100644 --- a/tools/cabana/tests/test_cabana.cc +++ b/tools/cabana/tests/test_cabana.cc @@ -10,26 +10,25 @@ TEST_CASE("DBCManager::generateDBC") { DBCManager dbc_from_generated(nullptr); dbc_from_generated.open("", dbc_string); - auto dbc = dbc_origin.getDBC(); - auto new_dbc = dbc_from_generated.getDBC(); - REQUIRE(dbc->msgs.size() == new_dbc->msgs.size()); - for (int i = 0; i < dbc->msgs.size(); ++i) { - REQUIRE(dbc->msgs[i].name == new_dbc->msgs[i].name); - REQUIRE(dbc->msgs[i].address == new_dbc->msgs[i].address); - REQUIRE(dbc->msgs[i].size == new_dbc->msgs[i].size); - REQUIRE(dbc->msgs[i].sigs.size() == new_dbc->msgs[i].sigs.size()); - auto &sig = dbc->msgs[i].sigs; - auto &new_sig = new_dbc->msgs[i].sigs; - for (int j = 0; j < sig.size(); ++j) { - REQUIRE(sig[j].name == new_sig[j].name); - REQUIRE(sig[j].start_bit == new_sig[j].start_bit); - REQUIRE(sig[j].msb == new_sig[j].msb); - REQUIRE(sig[j].lsb == new_sig[j].lsb); - REQUIRE(sig[j].size == new_sig[j].size); - REQUIRE(sig[j].is_signed == new_sig[j].is_signed); - REQUIRE(sig[j].factor == new_sig[j].factor); - REQUIRE(sig[j].offset == new_sig[j].offset); - REQUIRE(sig[j].is_little_endian == new_sig[j].is_little_endian); + auto &msgs = dbc_origin.messages(); + auto &new_msgs = dbc_from_generated.messages(); + REQUIRE(msgs.size() == new_msgs.size()); + for (auto &[address, m] : msgs) { + auto new_m = new_msgs.at(address); + REQUIRE(m.name == new_m.name); + REQUIRE(m.size == new_m.size); + REQUIRE(m.sigs.size() == new_m.sigs.size()); + for (auto &[name, sig] : m.sigs) { + auto &new_sig = new_m.sigs[name]; + REQUIRE(sig.name == new_sig.name); + REQUIRE(sig.start_bit == new_sig.start_bit); + REQUIRE(sig.msb == new_sig.msb); + REQUIRE(sig.lsb == new_sig.lsb); + REQUIRE(sig.size == new_sig.size); + REQUIRE(sig.is_signed == new_sig.is_signed); + REQUIRE(sig.factor == new_sig.factor); + REQUIRE(sig.offset == new_sig.offset); + REQUIRE(sig.is_little_endian == new_sig.is_little_endian); } } } From 122c0ec135804ac6a106f1e06f4cb3467fb13b1a Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Fri, 11 Nov 2022 02:37:52 +0800 Subject: [PATCH 085/184] Cabana: remember last directory in open file dialog (#26449) * remember last directory in open file dialog * use QFileInfo --- tools/cabana/mainwin.cc | 8 ++++++-- tools/cabana/settings.cc | 5 ++++- tools/cabana/settings.h | 1 + 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/cabana/mainwin.cc b/tools/cabana/mainwin.cc index b8913a3aa7..7ae97379f6 100644 --- a/tools/cabana/mainwin.cc +++ b/tools/cabana/mainwin.cc @@ -156,8 +156,9 @@ void MainWindow::loadDBCFromName(const QString &name) { } void MainWindow::loadDBCFromFile() { - QString file_name = QFileDialog::getOpenFileName(this, tr("Open File"), QDir::homePath(), "DBC (*.dbc)"); + QString file_name = QFileDialog::getOpenFileName(this, tr("Open File"), settings.last_dir, "DBC (*.dbc)"); if (!file_name.isEmpty()) { + settings.last_dir = QFileInfo(file_name).absolutePath(); QFile file(file_name); if (file.open(QIODevice::ReadOnly)) { auto dbc_name = QFileInfo(file_name).baseName(); @@ -185,8 +186,9 @@ void MainWindow::loadDBCFromFingerprint() { void MainWindow::saveDBCToFile() { QString file_name = QFileDialog::getSaveFileName(this, tr("Save File"), - QDir::homePath() + "/untitled.dbc", tr("DBC (*.dbc)")); + QDir::cleanPath(settings.last_dir + "/untitled.dbc"), tr("DBC (*.dbc)")); if (!file_name.isEmpty()) { + settings.last_dir = QFileInfo(file_name).absolutePath(); QFile file(file_name); if (file.open(QIODevice::WriteOnly)) file.write(dbc()->generateDBC().toUtf8()); @@ -228,6 +230,8 @@ void MainWindow::closeEvent(QCloseEvent *event) { main_win = nullptr; if (floating_window) floating_window->deleteLater(); + + settings.save(); QWidget::closeEvent(event); } diff --git a/tools/cabana/settings.cc b/tools/cabana/settings.cc index b173b41df3..b3a4ed4872 100644 --- a/tools/cabana/settings.cc +++ b/tools/cabana/settings.cc @@ -1,6 +1,7 @@ #include "tools/cabana/settings.h" #include +#include #include #include @@ -19,7 +20,7 @@ void Settings::save() { s.setValue("chart_height", chart_height); s.setValue("chart_theme", chart_theme); s.setValue("max_chart_x_range", max_chart_x_range); - emit changed(); + s.setValue("last_dir", last_dir); } void Settings::load() { @@ -30,6 +31,7 @@ void Settings::load() { chart_height = s.value("chart_height", 200).toInt(); chart_theme = s.value("chart_theme", 0).toInt(); max_chart_x_range = s.value("max_chart_x_range", 3 * 60).toInt(); + last_dir = s.value("last_dir", QDir::homePath()).toString(); } // SettingsDlg @@ -90,4 +92,5 @@ void SettingsDlg::save() { settings.max_chart_x_range = max_chart_x_range->value() * 60; settings.save(); accept(); + emit settings.changed(); } diff --git a/tools/cabana/settings.h b/tools/cabana/settings.h index cb858de873..e08d0ae55e 100644 --- a/tools/cabana/settings.h +++ b/tools/cabana/settings.h @@ -18,6 +18,7 @@ public: int chart_height = 200; int chart_theme = 0; int max_chart_x_range = 3 * 60; // 3 minutes + QString last_dir; signals: void changed(); From 2961f8a7d8b891dd95912e0d21f54cf1f4afb696 Mon Sep 17 00:00:00 2001 From: AlexandreSato <66435071+AlexandreSato@users.noreply.github.com> Date: Thu, 10 Nov 2022 17:27:25 -0300 Subject: [PATCH 086/184] Multilang: Update pt-BR translations (#26444) * update pt-BR translations * fix some cutoff texts * Delete main_pt-BR.ts * Add files via upload * Delete main_pt-BR.ts * Add files via upload --- selfdrive/ui/translations/main_pt-BR.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/selfdrive/ui/translations/main_pt-BR.ts b/selfdrive/ui/translations/main_pt-BR.ts index 702702a8be..6a1d32f87a 100644 --- a/selfdrive/ui/translations/main_pt-BR.ts +++ b/selfdrive/ui/translations/main_pt-BR.ts @@ -1012,7 +1012,7 @@ trabalho definido openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. - + openpilot por padrão funciona em <b>modo chill</b>. modo Experimental ativa <b>recursos de nível-alfa</b> que não estão prontos para o modo chill. Recursos experimentais estão listados abaixo: <br> <h4>🌮 Controle Longitudinal de Ponta a Ponta 🌮</h4> Deixe o modelo de condução controlar o acelerador e os freios. Uma vez que o modelo de condução decide qual velocidade dirigir, a velocidade definida só funcionará como um limite superior. openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. @@ -1020,7 +1020,7 @@ trabalho definido WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB). - + ATENÇÃO: o controle longitudinal do openpilot é experimental para este carro e desativará a Frenagem Automática de Emergência (AEB). From e08896c45d84f4005de156317ae902d601e9b895 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Fri, 11 Nov 2022 04:57:52 +0800 Subject: [PATCH 087/184] Cabana: confirm exit without saving (#26452) * confirm exit without saving * typo --- tools/cabana/mainwin.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/cabana/mainwin.cc b/tools/cabana/mainwin.cc index 7ae97379f6..40a99a7a56 100644 --- a/tools/cabana/mainwin.cc +++ b/tools/cabana/mainwin.cc @@ -227,6 +227,16 @@ void MainWindow::dockCharts(bool dock) { } void MainWindow::closeEvent(QCloseEvent *event) { + if (detail_widget->undo_stack->index() > 0) { + auto ret = QMessageBox::question(this, tr("Unsaved Changes"), + tr("Are you sure you want to exit without saving?\nAny unsaved changes will be lost."), + QMessageBox::Yes | QMessageBox::No); + if (ret == QMessageBox::No) { + event->ignore(); + return; + } + } + main_win = nullptr; if (floating_window) floating_window->deleteLater(); From df145ae99f80d53667533f848b661768b7d5c269 Mon Sep 17 00:00:00 2001 From: Lee Jong Mun <43285072+crwusiz@users.noreply.github.com> Date: Fri, 11 Nov 2022 09:56:28 +0900 Subject: [PATCH 088/184] Multilang: kor translation update (#26445) * Multilang: kor translation update * fix --- selfdrive/ui/translations/main_ko.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/selfdrive/ui/translations/main_ko.ts b/selfdrive/ui/translations/main_ko.ts index 0bbae22517..31c910a910 100644 --- a/selfdrive/ui/translations/main_ko.ts +++ b/selfdrive/ui/translations/main_ko.ts @@ -1004,11 +1004,11 @@ location set Experimental Mode - 실험 모드 + 실험적 모드 openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. - + openpilot은 기본적으로 <b>안정적 모드</b>로 주행합니다. 실험적 모드는 안정적 모드에 준비되지 않은 <b>알파 수준 기능</b>을 활성화 합니다. 실험 모드의 특징은 아래에 나열되어 있습니다 <br> <h4>🌮 E2E 롱컨트롤 🌮</h4> 주행모델이 가속과 감속을 제어하도록 합니다. openpilot은 신호등과 정지표지판을 보고 멈추는 것을 포함하여 운전자가 생각하는것처럼 주행합니다. 주행 모델이 주행할 속도를 결정하므로 설정된 속도는 상한선으로만 작용합니다. openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. @@ -1016,7 +1016,7 @@ location set WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB). - + 경고: openpilot 롱컨트롤은 실험적인 기능으로 차량의 자동긴급제동(AEB)를 비활성화합니다. From f5bf3cd21bef0069e0f470ad79ccac3da361a295 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Thu, 10 Nov 2022 18:37:10 -0800 Subject: [PATCH 089/184] boardd: verify SPI checksum (#26454) * verify checksum * import from panda Co-authored-by: Comma Device --- selfdrive/boardd/panda_comms.h | 12 ++- selfdrive/boardd/spi.cc | 142 +++++++++++++++++---------------- 2 files changed, 81 insertions(+), 73 deletions(-) diff --git a/selfdrive/boardd/panda_comms.h b/selfdrive/boardd/panda_comms.h index 08d0c1a2af..aef7b41d07 100644 --- a/selfdrive/boardd/panda_comms.h +++ b/selfdrive/boardd/panda_comms.h @@ -5,11 +5,16 @@ #include #include +#include + #include + #define TIMEOUT 0 #define SPI_BUF_SIZE 1024 +const bool PANDA_NO_RETRY = getenv("PANDA_NO_RETRY"); + // comms base class class PandaCommsHandle { @@ -65,9 +70,10 @@ public: private: int spi_fd = -1; - int spi_transfer(uint8_t endpoint, uint8_t *tx_data, uint16_t tx_len, uint8_t *rx_data, uint16_t max_rx_len); - int wait_for_ack(); - uint8_t tx_buf[SPI_BUF_SIZE]; uint8_t rx_buf[SPI_BUF_SIZE]; + + int wait_for_ack(spi_ioc_transfer &transfer, uint8_t ack); + int spi_transfer(uint8_t endpoint, uint8_t *tx_data, uint16_t tx_len, uint8_t *rx_data, uint16_t max_rx_len); + int spi_transfer_retry(uint8_t endpoint, uint8_t *tx_data, uint16_t tx_len, uint8_t *rx_data, uint16_t max_rx_len); }; diff --git a/selfdrive/boardd/spi.cc b/selfdrive/boardd/spi.cc index 1ec5e89c71..3969b313f0 100644 --- a/selfdrive/boardd/spi.cc +++ b/selfdrive/boardd/spi.cc @@ -6,6 +6,7 @@ #include "common/util.h" #include "common/swaglog.h" +#include "panda/board/comms_definitions.h" #include "selfdrive/boardd/panda_comms.h" @@ -22,13 +23,6 @@ struct __attribute__((packed)) spi_header { uint16_t max_rx_len; }; -struct __attribute__((packed)) spi_control_packet { - uint16_t request; - uint16_t param1; - uint16_t param2; - uint16_t length; -}; - PandaSpiHandle::PandaSpiHandle(std::string serial) : PandaCommsHandle(serial) { LOGD("opening SPI panda: %s", serial.c_str()); @@ -40,7 +34,7 @@ PandaSpiHandle::PandaSpiHandle(std::string serial) : PandaCommsHandle(serial) { spi_fd = open(serial.c_str(), O_RDWR); if (spi_fd < 0) { - LOGE("failed setting SPI mode %d", err); + LOGE("failed opening SPI device %d", err); goto fail; } @@ -85,41 +79,23 @@ void PandaSpiHandle::cleanup() { int PandaSpiHandle::control_write(uint8_t request, uint16_t param1, uint16_t param2, unsigned int timeout) { - int err; - - std::lock_guard lk(hw_lock); - do { - spi_control_packet packet = { - .request = request, - .param1 = param1, - .param2 = param2, - .length = 0 - }; - - // TODO: handle error - err = spi_transfer(0, (uint8_t *) &packet, sizeof(packet), NULL, 0); - } while (err < 0 && connected); - - return err; + ControlPacket_t packet = { + .request = request, + .param1 = param1, + .param2 = param2, + .length = 0 + }; + return spi_transfer_retry(0, (uint8_t *) &packet, sizeof(packet), NULL, 0); } int PandaSpiHandle::control_read(uint8_t request, uint16_t param1, uint16_t param2, unsigned char *data, uint16_t length, unsigned int timeout) { - int err; - - std::lock_guard lk(hw_lock); - do { - spi_control_packet packet = { - .request = request, - .param1 = param1, - .param2 = param2, - .length = length - }; - - // TODO: handle error - err = spi_transfer(0, (uint8_t *) &packet, sizeof(packet), data, length); - } while (err < 0 && connected); - - return err; + ControlPacket_t packet = { + .request = request, + .param1 = param1, + .param2 = param2, + .length = length + }; + return spi_transfer_retry(0, (uint8_t *) &packet, sizeof(packet), data, length); } int PandaSpiHandle::bulk_write(unsigned char endpoint, unsigned char* data, int length, unsigned int timeout) { @@ -144,6 +120,46 @@ void add_checksum(uint8_t *data, int data_len) { } } +bool check_checksum(uint8_t *data, int data_len) { + uint8_t checksum = SPI_CHECKSUM_START; + for (uint16_t i = 0U; i < data_len; i++) { + checksum ^= data[i]; + } + return checksum == 0U; +} + + +int PandaSpiHandle::spi_transfer_retry(uint8_t endpoint, uint8_t *tx_data, uint16_t tx_len, uint8_t *rx_data, uint16_t max_rx_len) { + int err; + + std::lock_guard lk(hw_lock); + do { + // TODO: handle error + err = spi_transfer(endpoint, tx_data, tx_len, rx_data, max_rx_len); + } while (err < 0 && connected && !PANDA_NO_RETRY); + + return err; +} + +int PandaSpiHandle::wait_for_ack(spi_ioc_transfer &transfer, uint8_t ack) { + // TODO: add timeout? + while (true) { + int ret = util::safe_ioctl(spi_fd, SPI_IOC_MESSAGE(1), &transfer); + if (ret < 0) { + LOGE("SPI: failed to send ACK request"); + return ret; + } + + if (rx_buf[0] == ack) { + break; + } else if (rx_buf[0] == SPI_NACK) { + LOGW("SPI: got header NACK"); + return -1; + } + } + + return 0; +} int PandaSpiHandle::spi_transfer(uint8_t endpoint, uint8_t *tx_data, uint16_t tx_len, uint8_t *rx_data, uint16_t max_rx_len) { int ret; @@ -178,19 +194,9 @@ int PandaSpiHandle::spi_transfer(uint8_t endpoint, uint8_t *tx_data, uint16_t tx // Wait for (N)ACK tx_buf[0] = 0x12; transfer.len = 1; - while (true) { - ret = util::safe_ioctl(spi_fd, SPI_IOC_MESSAGE(1), &transfer); - if (ret < 0) { - LOGE("SPI: failed to send ACK request"); - goto transfer_fail; - } - - if (rx_buf[0] == SPI_HACK) { - break; - } else if (rx_buf[0] == SPI_NACK) { - LOGW("SPI: got header NACK"); - goto transfer_fail; - } + ret = wait_for_ack(transfer, SPI_HACK); + if (ret < 0) { + goto transfer_fail; } // Send data @@ -208,44 +214,40 @@ int PandaSpiHandle::spi_transfer(uint8_t endpoint, uint8_t *tx_data, uint16_t tx // Wait for (N)ACK tx_buf[0] = 0xab; transfer.len = 1; - while (true) { - ret = util::safe_ioctl(spi_fd, SPI_IOC_MESSAGE(1), &transfer); - if (ret < 0) { - LOGE("SPI: failed to send ACK request"); - goto transfer_fail; - } - - if (rx_buf[0] == SPI_DACK) { - break; - } else if (rx_buf[0] == SPI_NACK) { - LOGE("SPI: got data NACK"); - goto transfer_fail; - } + ret = wait_for_ack(transfer, SPI_DACK); + if (ret < 0) { + goto transfer_fail; } // Read data len transfer.len = 2; + transfer.rx_buf = (uint64_t)(rx_buf + 1); ret = util::safe_ioctl(spi_fd, SPI_IOC_MESSAGE(1), &transfer); if (ret < 0) { LOGE("SPI: failed to read rx data len"); goto transfer_fail; } - rx_data_len = *(uint16_t *)rx_buf; + rx_data_len = *(uint16_t *)(rx_buf+1); assert(rx_data_len < SPI_BUF_SIZE); // Read data transfer.len = rx_data_len + 1; + transfer.rx_buf = (uint64_t)(rx_buf + 2 + 1); ret = util::safe_ioctl(spi_fd, SPI_IOC_MESSAGE(1), &transfer); if (ret < 0) { LOGE("SPI: failed to read rx data"); goto transfer_fail; } - // TODO: check checksum + if (!check_checksum(rx_buf, rx_data_len + 4)) { + LOGE("SPI: bad checksum"); + goto transfer_fail; + } if (rx_data != NULL) { - memcpy(rx_data, rx_buf, rx_data_len); + memcpy(rx_data, rx_buf + 3, rx_data_len); } - ret = rx_data_len; + + return rx_data_len; transfer_fail: return ret; From 765761d7d0e813a3397728dcbe81a23a30051288 Mon Sep 17 00:00:00 2001 From: eFini Date: Fri, 11 Nov 2022 11:02:58 +0800 Subject: [PATCH 090/184] Multilang: add missing Chinese (Traditional) translations (#26433) * update cht translation * fix ellipsis -> spaces Co-authored-by: Shane Smiskol --- selfdrive/ui/translations/main_zh-CHT.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/selfdrive/ui/translations/main_zh-CHT.ts b/selfdrive/ui/translations/main_zh-CHT.ts index 0f6bc981cf..c9810597b5 100644 --- a/selfdrive/ui/translations/main_zh-CHT.ts +++ b/selfdrive/ui/translations/main_zh-CHT.ts @@ -60,11 +60,11 @@ Cellular Metered - + 行動網路 Prevent large data uploads when on a metered connection - + 防止使用行動網路上傳大量的數據 @@ -240,11 +240,11 @@ Reset - + 重設 Review - + 回顧 @@ -864,7 +864,7 @@ location set Uninstall - + 卸載 @@ -1004,19 +1004,19 @@ location set Experimental Mode - + 實驗模式 openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. - + openpilot 默認以 <b>輕鬆模式</b> 駕駛。 實驗模式啟用了尚未準備好進入輕鬆模式的 <b>alpha 級功能</b>。 實驗功能如下： <br> <h4>🌮端到端縱向控制🌮</h4> 讓駕駛模型控制油門和剎車。 openpilot 將像人類一樣駕駛，包括紅燈和停車標誌時停車，因為是由駕駛模型來決定車速，所以定速的設定值只會作為上限。 openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. - + openpilot 默認使用汽車內置的主動巡航控制 (ACC)，而不是使用 openpilot 縱向控制。啟用此選項可切換到 openpilot 縱向控制。 WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB). - + 警告：openpilot 縱向控制在這輛車上仍屬實驗性質，啟用後會喪失自動緊急煞車 (AEB) 功能。 @@ -1074,7 +1074,7 @@ location set Forget - + 清除 From 74b6e22a7dc8e0b1ec051f00037506d23a017ae8 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 10 Nov 2022 19:06:31 -0800 Subject: [PATCH 091/184] controls: disengage on regen paddle independently (#26453) * add regen braking field that's just used to add a pedalPressed * bump * bump * Update ref_commit * we want the standstill check we want the standstill check * see what diff is now * Update ref_commit --- cereal | 2 +- selfdrive/car/gm/carstate.py | 2 +- selfdrive/car/tests/test_models.py | 4 ++-- selfdrive/controls/controlsd.py | 3 ++- selfdrive/test/process_replay/ref_commit | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cereal b/cereal index cdba1aafec..afafa0a2a5 160000 --- a/cereal +++ b/cereal @@ -1 +1 @@ -Subproject commit cdba1aafec5e36505ef6ace675568e1f15003c47 +Subproject commit afafa0a2a537d775842ab2e1bf20cb9a33b34f9a diff --git a/selfdrive/car/gm/carstate.py b/selfdrive/car/gm/carstate.py index f4b3f88e99..df1b4b2866 100644 --- a/selfdrive/car/gm/carstate.py +++ b/selfdrive/car/gm/carstate.py @@ -63,7 +63,7 @@ class CarState(CarStateBase): # Regen braking is braking if self.CP.transmissionType == TransmissionType.direct: - ret.brakePressed = ret.brakePressed or pt_cp.vl["EBCMRegenPaddle"]["RegenPaddle"] != 0 + ret.regenBraking = pt_cp.vl["EBCMRegenPaddle"]["RegenPaddle"] != 0 ret.gas = pt_cp.vl["AcceleratorPedal2"]["AcceleratorPedal2"] / 254. ret.gasPressed = ret.gas > 1e-5 diff --git a/selfdrive/car/tests/test_models.py b/selfdrive/car/tests/test_models.py index ee25b8205f..56530dd738 100755 --- a/selfdrive/car/tests/test_models.py +++ b/selfdrive/car/tests/test_models.py @@ -251,8 +251,8 @@ class TestCarModelBase(unittest.TestCase): if CS.brakePressed and not self.safety.get_brake_pressed_prev(): if self.CP.carFingerprint in (HONDA.PILOT, HONDA.PASSPORT, HONDA.RIDGELINE) and CS.brake > 0.05: brake_pressed = False - safety_brake_pressed = self.safety.get_brake_pressed_prev() or self.safety.get_regen_braking_prev() - checks['brakePressed'] += brake_pressed != safety_brake_pressed + checks['brakePressed'] += brake_pressed != self.safety.get_brake_pressed_prev() + checks['regenBraking'] += CS.regenBraking != self.safety.get_regen_braking_prev() if self.CP.pcmCruise: # On most pcmCruise cars, openpilot's state is always tied to the PCM's cruise state. diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index 0bdaadf6ef..3b241045b1 100755 --- a/selfdrive/controls/controlsd.py +++ b/selfdrive/controls/controlsd.py @@ -250,7 +250,8 @@ class Controls: # Disable on rising edge of accelerator or brake. Also disable on brake when speed > 0 if (CS.gasPressed and not self.CS_prev.gasPressed and self.disengage_on_accelerator) or \ - (CS.brakePressed and (not self.CS_prev.brakePressed or not CS.standstill)): + (CS.brakePressed and (not self.CS_prev.brakePressed or not CS.standstill)) or \ + (CS.regenBraking and (not self.CS_prev.regenBraking or not CS.standstill)): self.events.add(EventName.pedalPressed) if CS.gasPressed: diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index cac678ca1f..e3c5390c3b 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -a36f7e2fd922fcadca6f8a3d777f4db787cba016 +9e37e8ee8013515cfd75cf352a1a2b9aa447c441 From b549e8174e4f8ccd2be3c324e47333e721db3914 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Thu, 10 Nov 2022 21:10:34 -0800 Subject: [PATCH 092/184] agnos 6.2 (#26441) * agnos 6.2 * staging manifest * production --- launch_env.sh | 2 +- system/hardware/tici/agnos.json | 12 ++++++------ system/hardware/tici/hardware.py | 3 --- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/launch_env.sh b/launch_env.sh index 88e1f2a9c5..3059ec268e 100755 --- a/launch_env.sh +++ b/launch_env.sh @@ -7,7 +7,7 @@ export OPENBLAS_NUM_THREADS=1 export VECLIB_MAXIMUM_THREADS=1 if [ -z "$AGNOS_VERSION" ]; then - export AGNOS_VERSION="6.1" + export AGNOS_VERSION="6.2" fi if [ -z "$PASSIVE" ]; then diff --git a/system/hardware/tici/agnos.json b/system/hardware/tici/agnos.json index 8534c8a978..7876b1af1f 100644 --- a/system/hardware/tici/agnos.json +++ b/system/hardware/tici/agnos.json @@ -1,9 +1,9 @@ [ { "name": "boot", - "url": "https://commadist.azureedge.net/agnosupdate/boot-57626d7737ab2fa1318e8707a202b1295b5da79ad2fa0a36377cc9481ad0d136.img.xz", - "hash": "57626d7737ab2fa1318e8707a202b1295b5da79ad2fa0a36377cc9481ad0d136", - "hash_raw": "57626d7737ab2fa1318e8707a202b1295b5da79ad2fa0a36377cc9481ad0d136", + "url": "https://commadist.azureedge.net/agnosupdate/boot-72662ec5d586c7a22659a1c8b140932d5472914176020fe76ba4204edbbb214a.img.xz", + "hash": "72662ec5d586c7a22659a1c8b140932d5472914176020fe76ba4204edbbb214a", + "hash_raw": "72662ec5d586c7a22659a1c8b140932d5472914176020fe76ba4204edbbb214a", "size": 14780416, "sparse": false, "full_check": true, @@ -41,9 +41,9 @@ }, { "name": "system", - "url": "https://commadist.azureedge.net/agnosupdate/system-b40b08912576bb972907acba7c201c1399395cbc0cba06ce6e5e3f70ab565cb5.img.xz", - "hash": "6e8fbcc21a265f7f58062abce7675dc05540e2b60cee2df56992a151ba64936f", - "hash_raw": "b40b08912576bb972907acba7c201c1399395cbc0cba06ce6e5e3f70ab565cb5", + "url": "https://commadist.azureedge.net/agnosupdate/system-9efdc9368f05e06008a7a1dbbee21b564e89988dc94d6ddee3a3a88e42268f0e.img.xz", + "hash": "48209ce7e8cc2fff4ec024f0cd82fc2e3e097b5c0629be2b292acf64e6701449", + "hash_raw": "9efdc9368f05e06008a7a1dbbee21b564e89988dc94d6ddee3a3a88e42268f0e", "size": 10737418240, "sparse": true, "full_check": false, diff --git a/system/hardware/tici/hardware.py b/system/hardware/tici/hardware.py index c5b931ddae..e2fd20c1be 100644 --- a/system/hardware/tici/hardware.py +++ b/system/hardware/tici/hardware.py @@ -431,9 +431,6 @@ class Tici(HardwareBase): def initialize_hardware(self): self.amplifier.initialize_configuration() - # TODO: this should go in AGNOS - os.system("sudo chmod 666 /dev/spidev0.0") - # Allow thermald to write engagement status to kmsg os.system("sudo chmod a+w /dev/kmsg") From f23296bc87a79c59d9ab011f2ba35ed1049beb72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Sch=C3=A4fer?= Date: Fri, 11 Nov 2022 10:46:03 -0500 Subject: [PATCH 093/184] Add force decel to e2e long (#26448) * add force decel to e2e * Update longitudinal_planner.py --- .../controls/lib/longitudinal_mpc_lib/long_mpc.py | 14 +++++++------- selfdrive/controls/lib/longitudinal_planner.py | 9 ++++++--- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/selfdrive/controls/lib/longitudinal_mpc_lib/long_mpc.py b/selfdrive/controls/lib/longitudinal_mpc_lib/long_mpc.py index 080782ad0f..6b79813117 100644 --- a/selfdrive/controls/lib/longitudinal_mpc_lib/long_mpc.py +++ b/selfdrive/controls/lib/longitudinal_mpc_lib/long_mpc.py @@ -301,8 +301,10 @@ class LongitudinalMpc: return lead_xv def set_accel_limits(self, min_a, max_a): + # TODO this sets a max accel limit, but the minimum limit is only for cruise decel + # needs refactor self.cruise_min_a = min_a - self.cruise_max_a = max_a + self.max_a = max_a def update(self, carstate, radarstate, v_cruise, x, v, a, j): v_ego = self.x0[1] @@ -317,16 +319,17 @@ class LongitudinalMpc: lead_0_obstacle = lead_xv_0[:,0] + get_stopped_equivalence_factor(lead_xv_0[:,1]) lead_1_obstacle = lead_xv_1[:,0] + get_stopped_equivalence_factor(lead_xv_1[:,1]) + self.params[:,0] = MIN_ACCEL + self.params[:,1] = self.max_a + # Update in ACC mode or ACC/e2e blend if self.mode == 'acc': - self.params[:,0] = MIN_ACCEL - self.params[:,1] = self.cruise_max_a self.params[:,5] = LEAD_DANGER_FACTOR # Fake an obstacle for cruise, this ensures smooth acceleration to set speed # when the leads are no factor. v_lower = v_ego + (T_IDXS * self.cruise_min_a * 1.05) - v_upper = v_ego + (T_IDXS * self.cruise_max_a * 1.05) + v_upper = v_ego + (T_IDXS * self.max_a * 1.05) v_cruise_clipped = np.clip(v_cruise * np.ones(N+1), v_lower, v_upper) @@ -338,9 +341,6 @@ class LongitudinalMpc: x[:], v[:], a[:], j[:] = 0.0, 0.0, 0.0, 0.0 elif self.mode == 'blended': - self.params[:,0] = MIN_ACCEL - self.params[:,1] = MAX_ACCEL - self.params[:,5] = 1.0 x_obstacles = np.column_stack([lead_0_obstacle, diff --git a/selfdrive/controls/lib/longitudinal_planner.py b/selfdrive/controls/lib/longitudinal_planner.py index 2fa13bfb15..cae378453c 100755 --- a/selfdrive/controls/lib/longitudinal_planner.py +++ b/selfdrive/controls/lib/longitudinal_planner.py @@ -10,7 +10,7 @@ from common.params import Params from common.realtime import DT_MDL from selfdrive.modeld.constants import T_IDXS from selfdrive.controls.lib.longcontrol import LongCtrlState -from selfdrive.controls.lib.longitudinal_mpc_lib.long_mpc import LongitudinalMpc +from selfdrive.controls.lib.longitudinal_mpc_lib.long_mpc import LongitudinalMpc, MIN_ACCEL, MAX_ACCEL from selfdrive.controls.lib.longitudinal_mpc_lib.long_mpc import T_IDXS as T_IDXS_MPC from selfdrive.controls.lib.drive_helpers import V_CRUISE_MAX, CONTROL_N from system.swaglog import cloudlog @@ -103,8 +103,11 @@ class LongitudinalPlanner: # No change cost when user is controlling the speed, or when standstill prev_accel_constraint = not (reset_state or sm['carState'].standstill) - accel_limits = [A_CRUISE_MIN, get_max_accel(v_ego)] - accel_limits_turns = limit_accel_in_turns(v_ego, sm['carState'].steeringAngleDeg, accel_limits, self.CP) + if self.mpc.mode == 'acc': + accel_limits = [A_CRUISE_MIN, get_max_accel(v_ego)] + accel_limits_turns = limit_accel_in_turns(v_ego, sm['carState'].steeringAngleDeg, accel_limits, self.CP) + else: + accel_limits_turns = [MIN_ACCEL, MAX_ACCEL] if reset_state: self.v_desired_filter.x = v_ego From 6cf9fff9193f3d61c81de65e88ba9ea908552062 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Sat, 12 Nov 2022 02:34:25 +0800 Subject: [PATCH 094/184] Cabana: fix segfault on exit (#26465) fix segfault on exit --- tools/cabana/detailwidget.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/cabana/detailwidget.cc b/tools/cabana/detailwidget.cc index 6d07727303..8549ed4641 100644 --- a/tools/cabana/detailwidget.cc +++ b/tools/cabana/detailwidget.cc @@ -102,7 +102,10 @@ DetailWidget::DetailWidget(ChartsWidget *charts, QWidget *parent) : charts(chart QObject::connect(tabbar, &QTabBar::tabCloseRequested, tabbar, &QTabBar::removeTab); QObject::connect(charts, &ChartsWidget::chartOpened, [this](const QString &id, const Signal *sig) { updateChartState(id, sig, true); }); QObject::connect(charts, &ChartsWidget::chartClosed, [this](const QString &id, const Signal *sig) { updateChartState(id, sig, false); }); - QObject::connect(undo_stack, &QUndoStack::indexChanged, [this]() { dbcMsgChanged(); }); + QObject::connect(undo_stack, &QUndoStack::indexChanged, [this]() { + if (undo_stack->count() > 0) + dbcMsgChanged(); + }); } void DetailWidget::showTabBarContextMenu(const QPoint &pt) { From 3c507e8ad7a4de1d03402b178389de2bee9c4363 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Sat, 12 Nov 2022 02:34:49 +0800 Subject: [PATCH 095/184] Cabana: auto update signal on field changes (#26464) * auto update signal on field changes * better icon --- tools/cabana/dbcmanager.cc | 8 +++ tools/cabana/dbcmanager.h | 2 + tools/cabana/detailwidget.cc | 69 ++++++-------------- tools/cabana/detailwidget.h | 5 +- tools/cabana/signaledit.cc | 105 +++++++++++++++--------------- tools/cabana/signaledit.h | 22 ++++--- tools/cabana/tests/test_cabana.cc | 18 +---- 7 files changed, 99 insertions(+), 130 deletions(-) diff --git a/tools/cabana/dbcmanager.cc b/tools/cabana/dbcmanager.cc index ebad2387cf..18f103d34c 100644 --- a/tools/cabana/dbcmanager.cc +++ b/tools/cabana/dbcmanager.cc @@ -165,3 +165,11 @@ std::pair getSignalRange(const Signal *s) { int to = from + s->size - 1; return {from, to}; } + +bool operator==(const Signal &l, const Signal &r) { + return l.name == r.name && l.size == r.size && + l.start_bit == r.start_bit && + l.msb == r.msb && l.lsb == r.lsb && + l.is_signed == r.is_signed && l.is_little_endian == r.is_little_endian && + l.factor == r.factor && l.offset == r.offset; +} diff --git a/tools/cabana/dbcmanager.h b/tools/cabana/dbcmanager.h index d2262527d4..b1d2082969 100644 --- a/tools/cabana/dbcmanager.h +++ b/tools/cabana/dbcmanager.h @@ -54,6 +54,8 @@ private: // TODO: Add helper function in dbc.h double get_raw_value(uint8_t *data, size_t data_size, const Signal &sig); +bool operator==(const Signal &l, const Signal &r); +inline bool operator!=(const Signal &l, const Signal &r) { return !(l == r); } int bigEndianStartBitsIndex(int start_bit); int bigEndianBitIndex(int index); void updateSigSizeParamsFromRange(Signal &s, int start_bit, int size); diff --git a/tools/cabana/detailwidget.cc b/tools/cabana/detailwidget.cc index 8549ed4641..25c3a528f9 100644 --- a/tools/cabana/detailwidget.cc +++ b/tools/cabana/detailwidget.cc @@ -6,7 +6,6 @@ #include #include #include -#include #include "selfdrive/ui/qt/util.h" #include "tools/cabana/canmessages.h" @@ -81,9 +80,8 @@ DetailWidget::DetailWidget(ChartsWidget *charts, QWidget *parent) : charts(chart container_layout->addWidget(binary_view); // signals - signals_container = new QWidget(this); - signals_container->setLayout(new QVBoxLayout); - container_layout->addWidget(signals_container); + signals_layout = new QVBoxLayout(); + container_layout->addLayout(signals_layout); // history log history_log = new HistoryLog(this); @@ -114,36 +112,25 @@ void DetailWidget::showTabBarContextMenu(const QPoint &pt) { QMenu menu(this); menu.addAction(tr("Close Other Tabs")); if (menu.exec(tabbar->mapToGlobal(pt))) { - tabbar->setCurrentIndex(index); - // remove all tabs before the one to keep - for (int i = 0; i < index; ++i) { - tabbar->removeTab(0); - } - // remove all tabs after the one to keep - while (tabbar->count() > 1) { + tabbar->moveTab(index, 0); + tabbar->setCurrentIndex(0); + while (tabbar->count() > 1) tabbar->removeTab(1); - } } } } void DetailWidget::setMessage(const QString &message_id) { - if (message_id.isEmpty()) return; - - int index = -1; - for (int i = 0; i < tabbar->count(); ++i) { - if (tabbar->tabText(i) == message_id) { - index = i; - break; - } - } msg_id = message_id; + int index = tabbar->count() - 1; + for (/**/; index >= 0 && tabbar->tabText(index) != msg_id; --index) { /**/ } if (index == -1) { index = tabbar->addTab(message_id); tabbar->setTabToolTip(index, msgName(message_id)); } tabbar->setCurrentIndex(index); dbcMsgChanged(); + scroll->verticalScrollBar()->setValue(0); } void DetailWidget::dbcMsgChanged(int show_form_idx) { @@ -154,48 +141,42 @@ void DetailWidget::dbcMsgChanged(int show_form_idx) { binary_view->setMessage(msg_id); history_log->setMessage(msg_id); + int i = 0; QStringList warnings; - for (auto f : signal_list) f->hide(); - const DBCMsg *msg = dbc()->msg(msg_id); if (msg) { - int i = 0; for (auto &[name, sig] : msg->sigs) { SignalEdit *form = i < signal_list.size() ? signal_list[i] : nullptr; if (!form) { form = new SignalEdit(i); - QObject::connect(form, &SignalEdit::showFormClicked, this, &DetailWidget::showForm); QObject::connect(form, &SignalEdit::remove, this, &DetailWidget::removeSignal); QObject::connect(form, &SignalEdit::save, this, &DetailWidget::saveSignal); QObject::connect(form, &SignalEdit::highlight, binary_view, &BinaryView::highlight); QObject::connect(binary_view, &BinaryView::signalHovered, form, &SignalEdit::signalHovered); QObject::connect(form, &SignalEdit::showChart, charts, &ChartsWidget::showChart); - signals_container->layout()->addWidget(form); + signals_layout->addWidget(form); signal_list.push_back(form); } - form->setSignal(msg_id, &sig, i == show_form_idx); + form->setSignal(msg_id, &sig); form->setChartOpened(charts->isChartOpened(msg_id, &sig)); - form->show(); ++i; } if (msg->size != can->lastMessage(msg_id).dat.size()) warnings.push_back(tr("Message size (%1) is incorrect.").arg(msg->size)); } + for (/**/; i < signal_list.size(); ++i) + signal_list[i]->hide(); toolbar->setVisible(!msg_id.isEmpty()); remove_msg_act->setEnabled(msg != nullptr); name_label->setText(msgName(msg_id)); - // Check overlapping bits - if (auto overlapping = binary_view->getOverlappingSignals(); !overlapping.isEmpty()) { - for (auto s : overlapping) - warnings.push_back(tr("%1 has overlapping bits.").arg(s->name.c_str())); - } + for (auto s : binary_view->getOverlappingSignals()) + warnings.push_back(tr("%1 has overlapping bits.").arg(s->name.c_str())); warning_label->setText(warnings.join('\n')); warning_widget->setVisible(!warnings.isEmpty()); - setUpdatesEnabled(true); - scroll->verticalScrollBar()->setValue(0); + QTimer::singleShot(1, [this]() { setUpdatesEnabled(true); }); } void DetailWidget::updateState() { @@ -206,14 +187,6 @@ void DetailWidget::updateState() { history_log->updateState(); } -void DetailWidget::showForm() { - SignalEdit *sender = qobject_cast(QObject::sender()); - setUpdatesEnabled(false); - for (auto f : signal_list) - f->setFormVisible(f == sender && !f->isFormVisible()); - QTimer::singleShot(1, [this]() { setUpdatesEnabled(true); }); -} - void DetailWidget::updateChartState(const QString &id, const Signal *sig, bool opened) { for (auto f : signal_list) if (f->msg_id == id && f->sig == sig) f->setChartOpened(opened); @@ -230,9 +203,7 @@ void DetailWidget::editMsg() { } void DetailWidget::removeMsg() { - if (auto msg = dbc()->msg(msg_id)) { - undo_stack->push(new RemoveMsgCommand(msg_id)); - } + undo_stack->push(new RemoveMsgCommand(msg_id)); } void DetailWidget::addSignal(int start_bit, int size, bool little_endian) { @@ -248,13 +219,11 @@ void DetailWidget::addSignal(int start_bit, int size, bool little_endian) { } } } - Signal sig = {}; + Signal sig = {.is_little_endian = little_endian}; for (int i = 1; /**/; ++i) { sig.name = "NEW_SIGNAL_" + std::to_string(i); - auto it = msg->sigs.find(sig.name.c_str()); - if (it == msg->sigs.end()) break; + if (msg->sigs.count(sig.name.c_str()) == 0) break; } - sig.is_little_endian = little_endian; updateSigSizeParamsFromRange(sig, start_bit, size); undo_stack->push(new AddSigCommand(msg_id, sig)); } diff --git a/tools/cabana/detailwidget.h b/tools/cabana/detailwidget.h index dc40eae159..815afa9bce 100644 --- a/tools/cabana/detailwidget.h +++ b/tools/cabana/detailwidget.h @@ -11,8 +11,6 @@ #include "tools/cabana/signaledit.h" class EditMessageDialog : public QDialog { - Q_OBJECT - public: EditMessageDialog(const QString &msg_id, const QString &title, int size, QWidget *parent); @@ -38,13 +36,12 @@ private: void removeSignal(const Signal *sig); void editMsg(); void removeMsg(); - void showForm(); void updateState(); QString msg_id; QLabel *name_label, *time_label, *warning_label; QWidget *warning_widget; - QWidget *signals_container; + QVBoxLayout *signals_layout; QTabBar *tabbar; QToolBar *toolbar; QAction *remove_msg_act; diff --git a/tools/cabana/signaledit.cc b/tools/cabana/signaledit.cc index 99365294b8..1cf9b8ae57 100644 --- a/tools/cabana/signaledit.cc +++ b/tools/cabana/signaledit.cc @@ -1,12 +1,11 @@ #include "tools/cabana/signaledit.h" -#include #include #include #include -#include -#include #include +#include +#include #include #include "selfdrive/ui/qt/util.h" @@ -15,7 +14,6 @@ SignalForm::SignalForm(QWidget *parent) : QWidget(parent) { QFormLayout *form_layout = new QFormLayout(this); - form_layout->setContentsMargins(0, 0, 0, 0); name = new QLineEdit(); form_layout->addRow(tr("Name"), name); @@ -58,6 +56,13 @@ SignalForm::SignalForm(QWidget *parent) : QWidget(parent) { form_layout->addRow(tr("Maximum value"), max_val); val_desc = new QLineEdit(); form_layout->addRow(tr("Value descriptions"), val_desc); + + QObject::connect(name, &QLineEdit::textEdited, this, &SignalForm::changed); + QObject::connect(factor, &QLineEdit::textEdited, this, &SignalForm::changed); + QObject::connect(offset, &QLineEdit::textEdited, this, &SignalForm::changed); + QObject::connect(sign, SIGNAL(activated(int)), SIGNAL(changed())); + QObject::connect(endianness, SIGNAL(activated(int)), SIGNAL(changed())); + QObject::connect(size, SIGNAL(valueChanged(int)), SIGNAL(changed())); } // SignalEdit @@ -67,36 +72,25 @@ SignalEdit::SignalEdit(int index, QWidget *parent) : form_idx(index), QWidget(pa main_layout->setContentsMargins(0, 0, 0, 0); // title bar - QHBoxLayout *title_layout = new QHBoxLayout(); + auto toolbar = new QToolBar(this); + toolbar->setStyleSheet("QToolButton {width:15px;height:15px;font-size:15px}"); icon = new QLabel(); - title_layout->addWidget(icon); + toolbar->addWidget(icon); title = new ElidedLabel(this); + title->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); title->setStyleSheet(QString("font-weight:bold; color:%1").arg(getColor(index))); - title_layout->addWidget(title, 1); - - QPushButton *seek_btn = new QPushButton("⌕"); - seek_btn->setStyleSheet("QPushButton{font-weight:bold;font-size:18px}"); + toolbar->addWidget(title); + plot_btn = toolbar->addAction("", [this]() { emit showChart(msg_id, sig, !chart_opened); }); + auto seek_btn = toolbar->addAction(QIcon::fromTheme("edit-find"), "", [this]() { SignalFindDlg(msg_id, sig, this).exec(); }); seek_btn->setToolTip(tr("Find signal values")); - seek_btn->setFixedSize(25, 25); - title_layout->addWidget(seek_btn); - - plot_btn = new QPushButton(this); - plot_btn->setStyleSheet("QPushButton {font-size:18px}"); - plot_btn->setFixedSize(25, 25); - title_layout->addWidget(plot_btn); - main_layout->addLayout(title_layout); + auto remove_btn = toolbar->addAction("x", [this]() { emit remove(sig); }); + remove_btn->setToolTip(tr("Remove signal")); + main_layout->addWidget(toolbar); // signal form - form_container = new QWidget(this); - QVBoxLayout *v_layout = new QVBoxLayout(form_container); - QHBoxLayout *h = new QHBoxLayout(); - QPushButton *remove_btn = new QPushButton(tr("Remove Signal")); - h->addWidget(remove_btn); - h->addStretch(); - QPushButton *save_btn = new QPushButton(tr("Save")); - h->addWidget(save_btn); - v_layout->addLayout(h); - main_layout->addWidget(form_container); + form = new SignalForm(this); + form->setVisible(false); + main_layout->addWidget(form); // bottom line QFrame *hline = new QFrame(); @@ -104,25 +98,22 @@ SignalEdit::SignalEdit(int index, QWidget *parent) : form_idx(index), QWidget(pa hline->setFrameShadow(QFrame::Sunken); main_layout->addWidget(hline); - QObject::connect(remove_btn, &QPushButton::clicked, [this]() { emit remove(this->sig); }); + QObject::connect(form, &SignalForm::changed, this, &SignalEdit::saveSignal); QObject::connect(title, &ElidedLabel::clicked, this, &SignalEdit::showFormClicked); - QObject::connect(save_btn, &QPushButton::clicked, this, &SignalEdit::saveSignal); - QObject::connect(plot_btn, &QPushButton::clicked, [this]() { emit showChart(msg_id, sig, !chart_opened); }); - QObject::connect(seek_btn, &QPushButton::clicked, [this]() { - SignalFindDlg dlg(msg_id, sig, this); - dlg.exec(); - }); setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); } -void SignalEdit::setSignal(const QString &message_id, const Signal *signal, bool show_form) { - msg_id = message_id; +void SignalEdit::setSignal(const QString &message_id, const Signal *signal) { sig = signal; + updateForm(msg_id == message_id && form->isVisible()); + msg_id = message_id; title->setText(QString("%1. %2").arg(form_idx + 1).arg(sig->name.c_str())); - setFormVisible(show_form); + show(); } void SignalEdit::saveSignal() { + if (!sig || !form->changed_by_user) return; + Signal s = *sig; s.name = form->name->text().toStdString(); s.size = form->size->text().toInt(); @@ -148,33 +139,38 @@ void SignalEdit::saveSignal() { s.lsb = bigEndianStartBitsIndex(bigEndianBitIndex(s.start_bit) + s.size - 1); s.msb = s.start_bit; } - title->setText(QString("%1. %2").arg(form_idx + 1).arg(form->name->text())); - emit save(this->sig, s); + if (s != *sig) + emit save(this->sig, s); } void SignalEdit::setChartOpened(bool opened) { plot_btn->setText(opened ? "☒" : "📈"); - plot_btn->setToolTip(opened ? tr("Close Plot") :tr("Show Plot")); + plot_btn->setToolTip(opened ? tr("Close Plot") : tr("Show Plot")); chart_opened = opened; } -void SignalEdit::setFormVisible(bool visible) { - if (visible) { - if (!form) { - form = new SignalForm(this); - ((QVBoxLayout *)form_container->layout())->insertWidget(0, form); - } +void SignalEdit::updateForm(bool visible) { + if (visible && sig) { + form->changed_by_user = false; form->name->setText(sig->name.c_str()); - form->size->setValue(sig->size); form->endianness->setCurrentIndex(sig->is_little_endian ? 0 : 1); form->sign->setCurrentIndex(sig->is_signed ? 0 : 1); form->factor->setText(QString::number(sig->factor)); form->offset->setText(QString::number(sig->offset)); form->msb->setText(QString::number(sig->msb)); form->lsb->setText(QString::number(sig->lsb)); + form->size->setValue(sig->size); + form->changed_by_user = true; } - form_container->setVisible(visible); - icon->setText(visible ? "▼" : ">"); + form->setVisible(visible); + icon->setText(visible ? "▼ " : "> "); +} + +void SignalEdit::showFormClicked() { + parentWidget()->setUpdatesEnabled(false); + for (auto &edit : parentWidget()->findChildren()) + edit->updateForm(edit == this && !form->isVisible()); + QTimer::singleShot(1, [this]() { parentWidget()->setUpdatesEnabled(true); }); } void SignalEdit::signalHovered(const Signal *s) { @@ -182,6 +178,13 @@ void SignalEdit::signalHovered(const Signal *s) { title->setStyleSheet(QString("font-weight:bold; color:%1").arg(color.name())); } +void SignalEdit::hideEvent(QHideEvent *event) { + msg_id = ""; + sig = nullptr; + updateForm(false); + QWidget::hideEvent(event); +} + void SignalEdit::enterEvent(QEvent *event) { emit highlight(sig); QWidget::enterEvent(event); @@ -204,7 +207,7 @@ SignalFindDlg::SignalFindDlg(const QString &id, const Signal *signal, QWidget *p comp_box->addItems({">", "=", "<"}); h->addWidget(comp_box); QLineEdit *value_edit = new QLineEdit("0", this); - value_edit->setValidator( new QDoubleValidator(-500000, 500000, 6, this) ); + value_edit->setValidator(new QDoubleValidator(-500000, 500000, 6, this)); h->addWidget(value_edit, 1); QPushButton *search_btn = new QPushButton(tr("Find"), this); h->addWidget(search_btn); diff --git a/tools/cabana/signaledit.h b/tools/cabana/signaledit.h index dce9d27479..46ea1bfbe0 100644 --- a/tools/cabana/signaledit.h +++ b/tools/cabana/signaledit.h @@ -1,11 +1,12 @@ #pragma once +#include #include #include #include #include -#include #include +#include #include "selfdrive/ui/qt/widgets/controls.h" @@ -13,13 +14,17 @@ #include "tools/cabana/dbcmanager.h" class SignalForm : public QWidget { + Q_OBJECT public: SignalForm(QWidget *parent); - QLineEdit *name, *unit, *comment, *val_desc, *offset, *factor, *min_val, *max_val; QLabel *lsb, *msb; QSpinBox *size; QComboBox *sign, *endianness; + bool changed_by_user = false; + + signals: + void changed(); }; class SignalEdit : public QWidget { @@ -27,38 +32,35 @@ class SignalEdit : public QWidget { public: SignalEdit(int index, QWidget *parent = nullptr); - void setSignal(const QString &msg_id, const Signal *sig, bool show_form); + void setSignal(const QString &msg_id, const Signal *sig); void setChartOpened(bool opened); - void setFormVisible(bool show); void signalHovered(const Signal *sig); - inline bool isFormVisible() const { return form_container->isVisible(); } const Signal *sig = nullptr; QString msg_id; signals: void highlight(const Signal *sig); void showChart(const QString &name, const Signal *sig, bool show); - void showFormClicked(); void remove(const Signal *sig); void save(const Signal *sig, const Signal &new_sig); protected: + void hideEvent(QHideEvent *event) override; void enterEvent(QEvent *event) override; void leaveEvent(QEvent *event) override; void saveSignal(); + void updateForm(bool show); + void showFormClicked(); SignalForm *form = nullptr; ElidedLabel *title; - QWidget *form_container; QLabel *icon; int form_idx = 0; bool chart_opened = false; - QPushButton *plot_btn; + QAction *plot_btn; }; class SignalFindDlg : public QDialog { - Q_OBJECT - public: SignalFindDlg(const QString &id, const Signal *signal, QWidget *parent); }; diff --git a/tools/cabana/tests/test_cabana.cc b/tools/cabana/tests/test_cabana.cc index d2d9dc1d2a..ee4a581529 100644 --- a/tools/cabana/tests/test_cabana.cc +++ b/tools/cabana/tests/test_cabana.cc @@ -5,10 +5,8 @@ TEST_CASE("DBCManager::generateDBC") { DBCManager dbc_origin(nullptr); dbc_origin.open("toyota_new_mc_pt_generated"); - QString dbc_string = dbc_origin.generateDBC(); - DBCManager dbc_from_generated(nullptr); - dbc_from_generated.open("", dbc_string); + dbc_from_generated.open("", dbc_origin.generateDBC()); auto &msgs = dbc_origin.messages(); auto &new_msgs = dbc_from_generated.messages(); @@ -18,17 +16,7 @@ TEST_CASE("DBCManager::generateDBC") { REQUIRE(m.name == new_m.name); REQUIRE(m.size == new_m.size); REQUIRE(m.sigs.size() == new_m.sigs.size()); - for (auto &[name, sig] : m.sigs) { - auto &new_sig = new_m.sigs[name]; - REQUIRE(sig.name == new_sig.name); - REQUIRE(sig.start_bit == new_sig.start_bit); - REQUIRE(sig.msb == new_sig.msb); - REQUIRE(sig.lsb == new_sig.lsb); - REQUIRE(sig.size == new_sig.size); - REQUIRE(sig.is_signed == new_sig.is_signed); - REQUIRE(sig.factor == new_sig.factor); - REQUIRE(sig.offset == new_sig.offset); - REQUIRE(sig.is_little_endian == new_sig.is_little_endian); - } + for (auto &[name, sig] : m.sigs) + REQUIRE(sig == new_m.sigs[name]); } } From c4f9f2d206b68d5c4032ab7d31eb85639ce064d1 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Fri, 11 Nov 2022 11:05:47 -0800 Subject: [PATCH 096/184] Update RELEASES.md --- RELEASES.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/RELEASES.md b/RELEASES.md index 18817bda4d..ad51b7af3f 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,19 +1,19 @@ -Version 0.8.17 (2022-11-XX) +Version 0.8.17 (2022-11-21) ======================== * New driving model - * Internal feature space information content increased tenfold during training (to ~700 bits), this makes the model dramatically more accurate + * Internal feature space information content increased tenfold during training (to ~700 bits), which makes the model dramatically more accurate * Less reliance on previous frames makes model more reactive and snappy * Trained in new reprojective simulator - * Model trained in openpilot was trained in 36hrs from scratch, compared to around 1 week of previous releases - * Model training now simulates lateral and longitudinal behavior, this allows openpilot to slow down for turns, stop at traffic lights, etc,... in experimental mode + * Trained in 36hrs from scratch, compared to one week for previous releases + * Training now simulates both lateral and longitudinal behavior, which allows openpilot to slow down for turns, stop at traffic lights, and more in experimental mode * New driver monitoring model * New end-to-end distracted trigger * Experimental driving mode * End-to-end longitudinal control - * Stops for red lights and stop signs + * Stops for traffic lights and stop signs + * Slows down for turns * openpilot defaults to chill mode, enable experimental in settings -* Self-tuning torque lateral controller parameters - * Parameters learned live for each car +* Self-tuning torque controller: learns parameters live for each car * Torque controller used on all Toyota, Lexus, Hyundai, Kia, and Genesis models * UI updates * Multi-language in navigation @@ -21,8 +21,10 @@ Version 0.8.17 (2022-11-XX) * Improved update experience * Border turns grey while overriding steering * Bookmark events while driving; view them in comma connect + * New onroad visualization for experimental mode * AGNOS 6 * tools: new and improved cabana thanks to deanlee! +* Experimental longitudinal support for Volkswagen, CAN-FD Hyundai, and new GM models * Genesis GV70 2022-23 support thanks to zunichky and sunnyhaibin! * Hyundai Santa Cruz 2021-22 support thanks to sunnyhaibin! * Kia Sportage 2023 support thanks to sunnyhaibin! From f6189b32351b21ad528486ee69c55666a1ef0d55 Mon Sep 17 00:00:00 2001 From: Jason Wen <47793918+sunnyhaibin@users.noreply.github.com> Date: Fri, 11 Nov 2022 14:40:21 -0500 Subject: [PATCH 097/184] HKG: Bump Kia Telluride support to 2022 (#26467) --- docs/CARS.md | 2 +- selfdrive/car/hyundai/values.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/CARS.md b/docs/CARS.md index 07bcf44257..32da6126bd 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -107,7 +107,7 @@ A supported vehicle is one that just works when you install a comma three. All s |Kia|Sportage 2023|Smart Cruise Control (SCC)|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai N| |Kia|Sportage Hybrid 2023|Smart Cruise Control (SCC)|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai N| |Kia|Stinger 2018-20|Smart Cruise Control (SCC)|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai C| -|Kia|Telluride 2020|All|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai H| +|Kia|Telluride 2020-22|All|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai H| |Lexus|CT Hybrid 2017-18|Lexus Safety System+|openpilot available[2](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Toyota| |Lexus|ES 2019-22|All|openpilot|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Toyota| |Lexus|ES Hybrid 2017-18|Lexus Safety System+|openpilot available[2](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Toyota| diff --git a/selfdrive/car/hyundai/values.py b/selfdrive/car/hyundai/values.py index b7e28825c3..1dba3a5442 100644 --- a/selfdrive/car/hyundai/values.py +++ b/selfdrive/car/hyundai/values.py @@ -142,7 +142,7 @@ CAR_INFO: Dict[str, Optional[Union[HyundaiCarInfo, List[HyundaiCarInfo]]]] = { ], CAR.PALISADE: [ HyundaiCarInfo("Hyundai Palisade 2020-22", "All", "https://youtu.be/TAnDqjF4fDY?t=456", harness=Harness.hyundai_h), - HyundaiCarInfo("Kia Telluride 2020", "All", harness=Harness.hyundai_h), + HyundaiCarInfo("Kia Telluride 2020-22", "All", harness=Harness.hyundai_h), ], CAR.VELOSTER: HyundaiCarInfo("Hyundai Veloster 2019-20", min_enable_speed=5. * CV.MPH_TO_MS, harness=Harness.hyundai_e), CAR.SONATA_HYBRID: HyundaiCarInfo("Hyundai Sonata Hybrid 2020-22", "All", harness=Harness.hyundai_a), From 4ab13300892e4d00d6ce7583c117a465c062adde Mon Sep 17 00:00:00 2001 From: ZwX1616 Date: Fri, 11 Nov 2022 12:48:41 -0800 Subject: [PATCH 098/184] Update RELEASES.md --- RELEASES.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/RELEASES.md b/RELEASES.md index ad51b7af3f..bf89b667fa 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -6,8 +6,9 @@ Version 0.8.17 (2022-11-21) * Trained in new reprojective simulator * Trained in 36hrs from scratch, compared to one week for previous releases * Training now simulates both lateral and longitudinal behavior, which allows openpilot to slow down for turns, stop at traffic lights, and more in experimental mode -* New driver monitoring model - * New end-to-end distracted trigger +* Driver monitoring updates + * New bigger model with added end-to-end distracted trigger + * Reduced false positives during driver calibration * Experimental driving mode * End-to-end longitudinal control * Stops for traffic lights and stop signs From 714ab491b0ff90170353df99f43f09bbae1ab00d Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Fri, 11 Nov 2022 12:51:14 -0800 Subject: [PATCH 099/184] boardd: SPI bulk read + write (#26462) * bulk read * write * write * fix write Co-authored-by: Comma Device --- selfdrive/boardd/panda_comms.h | 3 ++- selfdrive/boardd/spi.cc | 49 ++++++++++++++++++++++++++++------ 2 files changed, 43 insertions(+), 9 deletions(-) diff --git a/selfdrive/boardd/panda_comms.h b/selfdrive/boardd/panda_comms.h index aef7b41d07..f42eadc5b2 100644 --- a/selfdrive/boardd/panda_comms.h +++ b/selfdrive/boardd/panda_comms.h @@ -34,7 +34,7 @@ public: virtual int bulk_read(unsigned char endpoint, unsigned char* data, int length, unsigned int timeout=TIMEOUT) = 0; protected: - std::mutex hw_lock; + std::recursive_mutex hw_lock; }; class PandaUsbHandle : public PandaCommsHandle { @@ -74,6 +74,7 @@ private: uint8_t rx_buf[SPI_BUF_SIZE]; int wait_for_ack(spi_ioc_transfer &transfer, uint8_t ack); + int bulk_transfer(uint8_t endpoint, uint8_t *tx_data, uint16_t tx_len, uint8_t *rx_data, uint16_t rx_len); int spi_transfer(uint8_t endpoint, uint8_t *tx_data, uint16_t tx_len, uint8_t *rx_data, uint16_t max_rx_len); int spi_transfer_retry(uint8_t endpoint, uint8_t *tx_data, uint16_t tx_len, uint8_t *rx_data, uint16_t max_rx_len); }; diff --git a/selfdrive/boardd/spi.cc b/selfdrive/boardd/spi.cc index 3969b313f0..2803f58db0 100644 --- a/selfdrive/boardd/spi.cc +++ b/selfdrive/boardd/spi.cc @@ -2,6 +2,7 @@ #include #include +#include #include #include "common/util.h" @@ -99,13 +100,45 @@ int PandaSpiHandle::control_read(uint8_t request, uint16_t param1, uint16_t para } int PandaSpiHandle::bulk_write(unsigned char endpoint, unsigned char* data, int length, unsigned int timeout) { - return 0; + return bulk_transfer(endpoint, data, length, NULL, 0); } - int PandaSpiHandle::bulk_read(unsigned char endpoint, unsigned char* data, int length, unsigned int timeout) { - return 0; + return bulk_transfer(endpoint, NULL, 0, data, length); +} + +int PandaSpiHandle::bulk_transfer(uint8_t endpoint, uint8_t *tx_data, uint16_t tx_len, uint8_t *rx_data, uint16_t rx_len) { + std::lock_guard lk(hw_lock); + + const int xfer_size = 0x40; + + int ret = 0; + uint16_t length = (tx_data != NULL) ? tx_len : rx_len; + for (int i = 0; i < (int)std::ceil((float)length / xfer_size); i++) { + int d; + if (tx_data != NULL) { + int len = std::min(xfer_size, tx_len - (xfer_size * i)); + d = spi_transfer_retry(endpoint, tx_data + (xfer_size * i), len, NULL, 0); + } else { + d = spi_transfer_retry(endpoint, NULL, 0, rx_data + (xfer_size * i), xfer_size); + } + + if (d < 0) { + LOGE("SPI: bulk transfer failed with %d", d); + comms_healthy = false; + return -1; + } + + ret += d; + if ((rx_data != NULL) && d < xfer_size) { + break; + } + } + + return ret; } + + std::vector PandaSpiHandle::list() { // TODO: list all pandas available over SPI return {}; @@ -130,15 +163,15 @@ bool check_checksum(uint8_t *data, int data_len) { int PandaSpiHandle::spi_transfer_retry(uint8_t endpoint, uint8_t *tx_data, uint16_t tx_len, uint8_t *rx_data, uint16_t max_rx_len) { - int err; + int ret; std::lock_guard lk(hw_lock); do { // TODO: handle error - err = spi_transfer(endpoint, tx_data, tx_len, rx_data, max_rx_len); - } while (err < 0 && connected && !PANDA_NO_RETRY); + ret = spi_transfer(endpoint, tx_data, tx_len, rx_data, max_rx_len); + } while (ret < 0 && connected && !PANDA_NO_RETRY); - return err; + return ret; } int PandaSpiHandle::wait_for_ack(spi_ioc_transfer &transfer, uint8_t ack) { @@ -153,7 +186,7 @@ int PandaSpiHandle::wait_for_ack(spi_ioc_transfer &transfer, uint8_t ack) { if (rx_buf[0] == ack) { break; } else if (rx_buf[0] == SPI_NACK) { - LOGW("SPI: got header NACK"); + LOGW("SPI: got NACK"); return -1; } } From 98206fb92e6a071127f6d6e4fec456d0c437444f Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 11 Nov 2022 13:22:56 -0800 Subject: [PATCH 100/184] planner: fix undeclared variable (#26468) * undeclared variable * run first second disabled * revert test * rev --- selfdrive/controls/lib/longitudinal_planner.py | 1 + 1 file changed, 1 insertion(+) diff --git a/selfdrive/controls/lib/longitudinal_planner.py b/selfdrive/controls/lib/longitudinal_planner.py index cae378453c..c6621f606d 100755 --- a/selfdrive/controls/lib/longitudinal_planner.py +++ b/selfdrive/controls/lib/longitudinal_planner.py @@ -107,6 +107,7 @@ class LongitudinalPlanner: accel_limits = [A_CRUISE_MIN, get_max_accel(v_ego)] accel_limits_turns = limit_accel_in_turns(v_ego, sm['carState'].steeringAngleDeg, accel_limits, self.CP) else: + accel_limits = [MIN_ACCEL, MAX_ACCEL] accel_limits_turns = [MIN_ACCEL, MAX_ACCEL] if reset_state: From 9f80a97eee52d128559b7fef0593b8c328a6142d Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 11 Nov 2022 14:02:09 -0800 Subject: [PATCH 101/184] longitudinal tests: add disabled maneuver (#26470) * undeclared variable * run first second disabled * only test * test disabled as a new maneuver * bottom --- .../controls/lib/longitudinal_planner.py | 3 ++- .../test/longitudinal_maneuvers/maneuver.py | 12 +++++++----- .../test/longitudinal_maneuvers/plant.py | 19 ++++++++++--------- .../test_longitudinal.py | 9 ++++++++- 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/selfdrive/controls/lib/longitudinal_planner.py b/selfdrive/controls/lib/longitudinal_planner.py index c6621f606d..def0a1208a 100755 --- a/selfdrive/controls/lib/longitudinal_planner.py +++ b/selfdrive/controls/lib/longitudinal_planner.py @@ -69,7 +69,8 @@ class LongitudinalPlanner: e2e = self.params.get_bool('ExperimentalMode') and self.CP.openpilotLongitudinalControl self.mpc.mode = 'blended' if e2e else 'acc' - def parse_model(self, model_msg, model_error): + @staticmethod + def parse_model(model_msg, model_error): if (len(model_msg.position.x) == 33 and len(model_msg.velocity.x) == 33 and len(model_msg.acceleration.x) == 33): diff --git a/selfdrive/test/longitudinal_maneuvers/maneuver.py b/selfdrive/test/longitudinal_maneuvers/maneuver.py index dad5d89844..071eaada12 100644 --- a/selfdrive/test/longitudinal_maneuvers/maneuver.py +++ b/selfdrive/test/longitudinal_maneuvers/maneuver.py @@ -17,6 +17,7 @@ class Maneuver(): self.only_lead2 = kwargs.get("only_lead2", False) self.only_radar = kwargs.get("only_radar", False) self.ensure_start = kwargs.get("ensure_start", False) + self.enabled = kwargs.get("enabled", True) self.duration = duration self.title = title @@ -26,23 +27,24 @@ class Maneuver(): lead_relevancy=self.lead_relevancy, speed=self.speed, distance_lead=self.distance_lead, + enabled=self.enabled, only_lead2=self.only_lead2, only_radar=self.only_radar, ) valid = True logs = [] - while plant.current_time() < self.duration: - speed_lead = np.interp(plant.current_time(), self.breakpoints, self.speed_lead_values) - prob = np.interp(plant.current_time(), self.breakpoints, self.prob_lead_values) - cruise = np.interp(plant.current_time(), self.breakpoints, self.cruise_values) + while plant.current_time < self.duration: + speed_lead = np.interp(plant.current_time, self.breakpoints, self.speed_lead_values) + prob = np.interp(plant.current_time, self.breakpoints, self.prob_lead_values) + cruise = np.interp(plant.current_time, self.breakpoints, self.cruise_values) log = plant.step(speed_lead, prob, cruise) d_rel = log['distance_lead'] - log['distance'] if self.lead_relevancy else 200. v_rel = speed_lead - log['speed'] if self.lead_relevancy else 0. log['d_rel'] = d_rel log['v_rel'] = v_rel - logs.append(np.array([plant.current_time(), + logs.append(np.array([plant.current_time, log['distance'], log['distance_lead'], log['speed'], diff --git a/selfdrive/test/longitudinal_maneuvers/plant.py b/selfdrive/test/longitudinal_maneuvers/plant.py index e81510e9ba..c3af1eee03 100755 --- a/selfdrive/test/longitudinal_maneuvers/plant.py +++ b/selfdrive/test/longitudinal_maneuvers/plant.py @@ -10,11 +10,12 @@ from selfdrive.modeld.constants import T_IDXS from selfdrive.controls.lib.longitudinal_planner import LongitudinalPlanner from selfdrive.controls.lib.radar_helpers import _LEAD_ACCEL_TAU -class Plant(): + +class Plant: messaging_initialized = False def __init__(self, lead_relevancy=False, speed=0.0, distance_lead=2.0, - only_lead2=False, only_radar=False): + enabled=True, only_lead2=False, only_radar=False): self.rate = 1. / DT_MDL if not Plant.messaging_initialized: @@ -32,10 +33,11 @@ class Plant(): self.speeds = [] # lead car - self.distance_lead = distance_lead self.lead_relevancy = lead_relevancy - self.only_lead2=only_lead2 - self.only_radar=only_radar + self.distance_lead = distance_lead + self.enabled = enabled + self.only_lead2 = only_lead2 + self.only_radar = only_radar self.rk = Ratekeeper(self.rate, print_delay_threshold=100.0) self.ts = 1. / self.rate @@ -47,6 +49,7 @@ class Plant(): self.planner = LongitudinalPlanner(CarInterface.get_params(CAR.CIVIC), init_v=self.speed) + @property def current_time(self): return float(self.rk.frame) / self.rate @@ -104,9 +107,7 @@ class Plant(): acceleration.x = [float(x) for x in np.zeros_like(T_IDXS)] model.modelV2.acceleration = acceleration - - - control.controlsState.longControlState = LongCtrlState.pid + control.controlsState.longControlState = LongCtrlState.pid if self.enabled else LongCtrlState.off control.controlsState.vCruise = float(v_cruise * 3.6) car_state.carState.vEgo = float(self.speed) car_state.carState.standstill = self.speed < 0.01 @@ -141,7 +142,7 @@ class Plant(): # print at 5hz if (self.rk.frame % (self.rate // 5)) == 0: print("%2.2f sec %6.2f m %6.2f m/s %6.2f m/s2 lead_rel: %6.2f m %6.2f m/s" - % (self.current_time(), self.distance, self.speed, self.acceleration, d_rel, v_rel)) + % (self.current_time, self.distance, self.speed, self.acceleration, d_rel, v_rel)) # ******** update prevs ******** diff --git a/selfdrive/test/longitudinal_maneuvers/test_longitudinal.py b/selfdrive/test/longitudinal_maneuvers/test_longitudinal.py index 7cc95b104a..e859952445 100755 --- a/selfdrive/test/longitudinal_maneuvers/test_longitudinal.py +++ b/selfdrive/test/longitudinal_maneuvers/test_longitudinal.py @@ -10,7 +10,7 @@ from selfdrive.test.longitudinal_maneuvers.maneuver import Maneuver # TODO: make new FCW tests maneuvers = [ Maneuver( - 'approach stopped car at 20m/s, initial distance: 120m', + 'approach stopped car at 25m/s, initial distance: 120m', duration=20., initial_speed=25., lead_relevancy=True, @@ -118,6 +118,13 @@ maneuvers = [ breakpoints=[1., 10., 15.], ensure_start=True, ), + Maneuver( + 'cruising at 25 m/s while disabled', + duration=20., + initial_speed=25., + lead_relevancy=False, + enabled=False, + ), ] From 89b88fc7a23c393b1d74c5c74aacd5c4ee254d81 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 11 Nov 2022 14:49:38 -0800 Subject: [PATCH 102/184] Hyundai: fix button enable controls mismatch (#26471) * bump panda * buttonCancel needs to be a noEntry * bompo * Update ref_commit --- panda | 2 +- selfdrive/controls/lib/events.py | 1 + selfdrive/test/process_replay/ref_commit | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/panda b/panda index 281eb7731b..d573111268 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit 281eb7731b4338fef049977593fdf3315adf09e9 +Subproject commit d57311126860c9a87edf5b7b9f81a2a038866a26 diff --git a/selfdrive/controls/lib/events.py b/selfdrive/controls/lib/events.py index 44426620e9..a761cceecb 100644 --- a/selfdrive/controls/lib/events.py +++ b/selfdrive/controls/lib/events.py @@ -597,6 +597,7 @@ EVENTS: Dict[int, Dict[str, Union[Alert, AlertCallbackType]]] = { EventName.buttonCancel: { ET.USER_DISABLE: EngagementAlert(AudibleAlert.disengage), + ET.NO_ENTRY: NoEntryAlert("Cancel Pressed"), }, EventName.brakeHold: { diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index e3c5390c3b..2ff423a84a 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -9e37e8ee8013515cfd75cf352a1a2b9aa447c441 +b5c833a8f5b3e6202a52746fc16809c7b649d591 From 811c096e6454dc2bbdd1e15a08952979c3fb7be1 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 11 Nov 2022 18:53:48 -0800 Subject: [PATCH 103/184] controlsd: add cruise speed helper class (#26472) * fix runaway set speed for GM * fix runaway set speed for GM * Handle resuming to exit standstill generically * clean that up * ugh i want to fix all the formatting * class that manages v_cruise * better name * move around * add depressed_state * fine to update on pressed change, better name * revert gm stuff * revert standstill stuff * remove * revert that * we can put this in here now! * below update * actually only used here * one line --- selfdrive/controls/controlsd.py | 52 ++------- selfdrive/controls/lib/drive_helpers.py | 141 +++++++++++++++--------- 2 files changed, 102 insertions(+), 91 deletions(-) diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index 3b241045b1..f69e9e7fd1 100755 --- a/selfdrive/controls/controlsd.py +++ b/selfdrive/controls/controlsd.py @@ -16,8 +16,7 @@ from system.version import is_tested_branch, get_short_branch from selfdrive.boardd.boardd import can_list_to_can_capnp from selfdrive.car.car_helpers import get_car, get_startup_event, get_one_can from selfdrive.controls.lib.lateral_planner import CAMERA_OFFSET -from selfdrive.controls.lib.drive_helpers import V_CRUISE_INITIAL, update_v_cruise, initialize_v_cruise -from selfdrive.controls.lib.drive_helpers import get_lag_adjusted_curvature +from selfdrive.controls.lib.drive_helpers import VCruiseHelper, get_lag_adjusted_curvature from selfdrive.controls.lib.latcontrol import LatControl from selfdrive.controls.lib.longcontrol import LongControl from selfdrive.controls.lib.latcontrol_pid import LatControlPID @@ -49,7 +48,6 @@ Desire = log.LateralPlan.Desire LaneChangeState = log.LateralPlan.LaneChangeState LaneChangeDirection = log.LateralPlan.LaneChangeDirection EventName = car.CarEvent.EventName -ButtonEvent = car.CarState.ButtonEvent ButtonType = car.CarState.ButtonEvent.Type SafetyModel = car.CarParams.SafetyModel @@ -173,9 +171,6 @@ class Controls: self.active = False self.can_rcv_timeout = False self.soft_disable_timer = 0 - self.v_cruise_kph = V_CRUISE_INITIAL - self.v_cruise_cluster_kph = V_CRUISE_INITIAL - self.v_cruise_kph_last = 0 self.mismatch_counter = 0 self.cruise_mismatch_counter = 0 self.can_rcv_timeout_counter = 0 @@ -185,11 +180,11 @@ class Controls: self.events_prev = [] self.current_alert_types = [ET.PERMANENT] self.logged_comm_issue = None - self.button_timers = {ButtonEvent.Type.decelCruise: 0, ButtonEvent.Type.accelCruise: 0} self.last_actuators = car.CarControl.Actuators.new_message() self.steer_limited = False self.desired_curvature = 0.0 self.desired_curvature_rate = 0.0 + self.v_cruise_helper = VCruiseHelper(self.CP) # TODO: no longer necessary, aside from process replay self.sm['liveParameters'].valid = True @@ -219,7 +214,7 @@ class Controls: controls_state = Params().get("ReplayControlsState") if controls_state is not None: controls_state = log.ControlsState.from_bytes(controls_state) - self.v_cruise_kph = controls_state.vCruise + self.v_cruise_helper.v_cruise_kph = controls_state.vCruise if any(ps.controlsAllowed for ps in self.sm['pandaStates']): self.state = State.enabled @@ -245,7 +240,7 @@ class Controls: # Block resume if cruise never previously enabled resume_pressed = any(be.type in (ButtonType.accelCruise, ButtonType.resumeCruise) for be in CS.buttonEvents) - if not self.CP.pcmCruise and self.v_cruise_kph == V_CRUISE_INITIAL and resume_pressed: + if not self.CP.pcmCruise and not self.v_cruise_helper.v_cruise_initialized and resume_pressed: self.events.add(EventName.resumeBlocked) # Disable on rising edge of accelerator or brake. Also disable on brake when speed > 0 @@ -478,20 +473,7 @@ class Controls: def state_transition(self, CS): """Compute conditional state transitions and execute actions on state transitions""" - self.v_cruise_kph_last = self.v_cruise_kph - - if CS.cruiseState.available: - # if stock cruise is completely disabled, then we can use our own set speed logic - if not self.CP.pcmCruise: - self.v_cruise_kph = update_v_cruise(self.v_cruise_kph, CS.vEgo, CS.gasPressed, CS.buttonEvents, - self.button_timers, self.enabled, self.is_metric) - self.v_cruise_cluster_kph = self.v_cruise_kph - else: - self.v_cruise_kph = CS.cruiseState.speed * CV.MS_TO_KPH - self.v_cruise_cluster_kph = CS.cruiseState.speedCluster * CV.MS_TO_KPH - else: - self.v_cruise_kph = V_CRUISE_INITIAL - self.v_cruise_cluster_kph = V_CRUISE_INITIAL + self.v_cruise_helper.update_v_cruise(CS, self.enabled, self.is_metric) # decrement the soft disable timer at every step, as it's reset on # entrance in SOFT_DISABLING state @@ -569,9 +551,7 @@ class Controls: else: self.state = State.enabled self.current_alert_types.append(ET.ENABLE) - if not self.CP.pcmCruise: - self.v_cruise_kph = initialize_v_cruise(CS.vEgo, CS.buttonEvents, self.v_cruise_kph_last) - self.v_cruise_cluster_kph = self.v_cruise_kph + self.v_cruise_helper.initialize_v_cruise(CS) # Check if openpilot is engaged and actuators are enabled self.enabled = self.state in ENABLED_STATES @@ -619,7 +599,7 @@ class Controls: if not self.joystick_mode: # accel PID loop - pid_accel_limits = self.CI.get_pid_accel_limits(self.CP, CS.vEgo, self.v_cruise_kph * CV.KPH_TO_MS) + pid_accel_limits = self.CI.get_pid_accel_limits(self.CP, CS.vEgo, self.v_cruise_helper.v_cruise_kph * CV.KPH_TO_MS) t_since_plan = (self.sm.frame - self.sm.rcv_frame['longitudinalPlan']) * DT_CTRL actuators.accel = self.LoC.update(CC.longActive, CS, long_plan, pid_accel_limits, t_since_plan) @@ -683,16 +663,6 @@ class Controls: return CC, lac_log - def update_button_timers(self, buttonEvents): - # increment timer for buttons still pressed - for k in self.button_timers: - if self.button_timers[k] > 0: - self.button_timers[k] += 1 - - for b in buttonEvents: - if b.type.raw in self.button_timers: - self.button_timers[b.type.raw] = 1 if b.pressed else 0 - def publish_logs(self, CS, start_time, CC, lac_log): """Send actuators and hud commands to the car, send controlsstate and MPC logging""" @@ -715,7 +685,7 @@ class Controls: CC.cruiseControl.resume = self.enabled and CS.cruiseState.standstill and speeds[-1] > 0.1 hudControl = CC.hudControl - hudControl.setSpeed = float(self.v_cruise_cluster_kph * CV.KPH_TO_MS) + hudControl.setSpeed = float(self.v_cruise_helper.v_cruise_cluster_kph * CV.KPH_TO_MS) hudControl.speedVisible = self.enabled hudControl.lanesVisible = self.enabled hudControl.leadVisible = self.sm['longitudinalPlan'].hasLead @@ -798,8 +768,8 @@ class Controls: controlsState.engageable = not self.events.any(ET.NO_ENTRY) controlsState.longControlState = self.LoC.long_control_state controlsState.vPid = float(self.LoC.v_pid) - controlsState.vCruise = float(self.v_cruise_kph) - controlsState.vCruiseCluster = float(self.v_cruise_cluster_kph) + controlsState.vCruise = float(self.v_cruise_helper.v_cruise_kph) + controlsState.vCruiseCluster = float(self.v_cruise_helper.v_cruise_cluster_kph) controlsState.upAccelCmd = float(self.LoC.pid.p) controlsState.uiAccelCmd = float(self.LoC.pid.i) controlsState.ufAccelCmd = float(self.LoC.pid.f) @@ -880,7 +850,6 @@ class Controls: self.publish_logs(CS, start_time, CC, lac_log) self.prof.checkpoint("Sent") - self.update_button_timers(CS.buttonEvents) self.CS_prev = CS def controlsd_thread(self): @@ -889,6 +858,7 @@ class Controls: self.rk.monitor_time() self.prof.display() + def main(sm=None, pm=None, logcan=None): controls = Controls(sm, pm, logcan) controls.controlsd_thread() diff --git a/selfdrive/controls/lib/drive_helpers.py b/selfdrive/controls/lib/drive_helpers.py index e74be7199e..27e53d1dd3 100644 --- a/selfdrive/controls/lib/drive_helpers.py +++ b/selfdrive/controls/lib/drive_helpers.py @@ -22,6 +22,7 @@ CAR_ROTATION_RADIUS = 0.0 # EU guidelines MAX_LATERAL_JERK = 5.0 +ButtonEvent = car.CarState.ButtonEvent ButtonType = car.CarState.ButtonEvent.Type CRUISE_LONG_PRESS = 50 CRUISE_NEAREST_FUNC = { @@ -34,6 +35,96 @@ CRUISE_INTERVAL_SIGN = { } +class VCruiseHelper: + def __init__(self, CP): + self.CP = CP + self.v_cruise_kph = V_CRUISE_INITIAL + self.v_cruise_cluster_kph = V_CRUISE_INITIAL + self.v_cruise_kph_last = 0 + self.button_timers = {ButtonType.decelCruise: 0, ButtonType.accelCruise: 0} + + @property + def v_cruise_initialized(self): + return self.v_cruise_kph != V_CRUISE_INITIAL + + def update_v_cruise(self, CS, enabled, is_metric): + self.v_cruise_kph_last = self.v_cruise_kph + + if CS.cruiseState.available: + if not self.CP.pcmCruise: + # if stock cruise is completely disabled, then we can use our own set speed logic + self._update_v_cruise_non_pcm(CS, enabled, is_metric) + self.v_cruise_cluster_kph = self.v_cruise_kph + self.update_button_timers(CS) + else: + self.v_cruise_kph = CS.cruiseState.speed * CV.MS_TO_KPH + self.v_cruise_cluster_kph = CS.cruiseState.speedCluster * CV.MS_TO_KPH + else: + self.v_cruise_kph = V_CRUISE_INITIAL + self.v_cruise_cluster_kph = V_CRUISE_INITIAL + + def _update_v_cruise_non_pcm(self, CS, enabled, is_metric): + # handle button presses. TODO: this should be in state_control, but a decelCruise press + # would have the effect of both enabling and changing speed is checked after the state transition + if not enabled: + return + + long_press = False + button_type = None + + # should be CV.MPH_TO_KPH, but this causes rounding errors + v_cruise_delta = 1. if is_metric else 1.6 + + for b in CS.buttonEvents: + if b.type.raw in self.button_timers and not b.pressed: + if self.button_timers[b.type.raw] > CRUISE_LONG_PRESS: + return # end long press + button_type = b.type.raw + break + else: + for k in self.button_timers.keys(): + if self.button_timers[k] and self.button_timers[k] % CRUISE_LONG_PRESS == 0: + button_type = k + long_press = True + break + + if button_type: + v_cruise_delta = v_cruise_delta * (5 if long_press else 1) + if long_press and self.v_cruise_kph % v_cruise_delta != 0: # partial interval + self.v_cruise_kph = CRUISE_NEAREST_FUNC[button_type](self.v_cruise_kph / v_cruise_delta) * v_cruise_delta + else: + self.v_cruise_kph += v_cruise_delta * CRUISE_INTERVAL_SIGN[button_type] + + # If set is pressed while overriding, clip cruise speed to minimum of vEgo + if CS.gasPressed and button_type in (ButtonType.decelCruise, ButtonType.setCruise): + self.v_cruise_kph = max(self.v_cruise_kph, CS.vEgo * CV.MS_TO_KPH) + + self.v_cruise_kph = clip(round(self.v_cruise_kph, 1), V_CRUISE_MIN, V_CRUISE_MAX) + + def update_button_timers(self, CS): + # increment timer for buttons still pressed + for k in self.button_timers: + if self.button_timers[k] > 0: + self.button_timers[k] += 1 + + for b in CS.buttonEvents: + if b.type.raw in self.button_timers: + self.button_timers[b.type.raw] = 1 if b.pressed else 0 + + def initialize_v_cruise(self, CS): + # initializing is handled by the PCM + if self.CP.pcmCruise: + return + + # 250kph or above probably means we never had a set speed + if any(b.type in (ButtonType.accelCruise, ButtonType.resumeCruise) for b in CS.buttonEvents) and self.v_cruise_kph_last < 250: + self.v_cruise_kph = self.v_cruise_kph_last + else: + self.v_cruise_kph = int(round(clip(CS.vEgo * CV.MS_TO_KPH, V_CRUISE_ENABLE_MIN, V_CRUISE_MAX))) + + self.v_cruise_cluster_kph = self.v_cruise_kph + + def apply_deadzone(error, deadzone): if error > deadzone: error -= deadzone @@ -48,56 +139,6 @@ def rate_limit(new_value, last_value, dw_step, up_step): return clip(new_value, last_value + dw_step, last_value + up_step) -def update_v_cruise(v_cruise_kph, v_ego, gas_pressed, buttonEvents, button_timers, enabled, metric): - # handle button presses. TODO: this should be in state_control, but a decelCruise press - # would have the effect of both enabling and changing speed is checked after the state transition - if not enabled: - return v_cruise_kph - - long_press = False - button_type = None - - # should be CV.MPH_TO_KPH, but this causes rounding errors - v_cruise_delta = 1. if metric else 1.6 - - for b in buttonEvents: - if b.type.raw in button_timers and not b.pressed: - if button_timers[b.type.raw] > CRUISE_LONG_PRESS: - return v_cruise_kph # end long press - button_type = b.type.raw - break - else: - for k in button_timers.keys(): - if button_timers[k] and button_timers[k] % CRUISE_LONG_PRESS == 0: - button_type = k - long_press = True - break - - if button_type: - v_cruise_delta = v_cruise_delta * (5 if long_press else 1) - if long_press and v_cruise_kph % v_cruise_delta != 0: # partial interval - v_cruise_kph = CRUISE_NEAREST_FUNC[button_type](v_cruise_kph / v_cruise_delta) * v_cruise_delta - else: - v_cruise_kph += v_cruise_delta * CRUISE_INTERVAL_SIGN[button_type] - - # If set is pressed while overriding, clip cruise speed to minimum of vEgo - if gas_pressed and button_type in (ButtonType.decelCruise, ButtonType.setCruise): - v_cruise_kph = max(v_cruise_kph, v_ego * CV.MS_TO_KPH) - - v_cruise_kph = clip(round(v_cruise_kph, 1), V_CRUISE_MIN, V_CRUISE_MAX) - - return v_cruise_kph - - -def initialize_v_cruise(v_ego, buttonEvents, v_cruise_last): - for b in buttonEvents: - # 250kph or above probably means we never had a set speed - if b.type in (ButtonType.accelCruise, ButtonType.resumeCruise) and v_cruise_last < 250: - return v_cruise_last - - return int(round(clip(v_ego * CV.MS_TO_KPH, V_CRUISE_ENABLE_MIN, V_CRUISE_MAX))) - - def get_lag_adjusted_curvature(CP, v_ego, psis, curvatures, curvature_rates): if len(psis) != CONTROL_N: psis = [0.0]*CONTROL_N From 76ac3d4c99df24f068aee3baedb796f65dfcca66 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 11 Nov 2022 19:43:30 -0800 Subject: [PATCH 104/184] controlsd: resume does not increment speed while cruise standstill (#25470) * fix runaway set speed for GM * fix runaway set speed for GM * Handle resuming to exit standstill generically * clean that up * ugh i want to fix all the formatting * class that manages v_cruise * better name * move around * add depressed_state * fine to update on pressed change, better name * cmt * we need to check CS. button_change_state only works if we exit standstill on rising edge not falling edge * no defaultdict --- selfdrive/car/gm/interface.py | 8 +------- selfdrive/controls/lib/drive_helpers.py | 8 ++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/selfdrive/car/gm/interface.py b/selfdrive/car/gm/interface.py index 2420098b4a..49cae998e8 100755 --- a/selfdrive/car/gm/interface.py +++ b/selfdrive/car/gm/interface.py @@ -211,13 +211,7 @@ class CarInterface(CarInterfaceBase): ret = self.CS.update(self.cp, self.cp_cam, self.cp_loopback) if self.CS.cruise_buttons != self.CS.prev_cruise_buttons and self.CS.prev_cruise_buttons != CruiseButtons.INIT: - be = create_button_event(self.CS.cruise_buttons, self.CS.prev_cruise_buttons, BUTTONS_DICT, CruiseButtons.UNPRESS) - - # Suppress resume button if we're resuming from stop so we don't adjust speed. - if be.type == ButtonType.accelCruise and (ret.cruiseState.enabled and ret.standstill): - be.type = ButtonType.unknown - - ret.buttonEvents = [be] + ret.buttonEvents = [create_button_event(self.CS.cruise_buttons, self.CS.prev_cruise_buttons, BUTTONS_DICT, CruiseButtons.UNPRESS)] events = self.create_common_events(ret, extra_gears=[GearShifter.sport, GearShifter.low, GearShifter.eco, GearShifter.manumatic], diff --git a/selfdrive/controls/lib/drive_helpers.py b/selfdrive/controls/lib/drive_helpers.py index 27e53d1dd3..5ca5319ba5 100644 --- a/selfdrive/controls/lib/drive_helpers.py +++ b/selfdrive/controls/lib/drive_helpers.py @@ -42,6 +42,7 @@ class VCruiseHelper: self.v_cruise_cluster_kph = V_CRUISE_INITIAL self.v_cruise_kph_last = 0 self.button_timers = {ButtonType.decelCruise: 0, ButtonType.accelCruise: 0} + self.button_change_state = {btn: {"standstill": False} for btn in self.button_timers} @property def v_cruise_initialized(self): @@ -88,6 +89,11 @@ class VCruiseHelper: long_press = True break + # Don't adjust speed when pressing resume to exit standstill + cruise_standstill = self.button_change_state[button_type]["standstill"] or CS.cruiseState.standstill + if button_type == ButtonType.accelCruise and cruise_standstill: + button_type = None + if button_type: v_cruise_delta = v_cruise_delta * (5 if long_press else 1) if long_press and self.v_cruise_kph % v_cruise_delta != 0: # partial interval @@ -109,7 +115,9 @@ class VCruiseHelper: for b in CS.buttonEvents: if b.type.raw in self.button_timers: + # Start/end timer and store current state on change of button pressed self.button_timers[b.type.raw] = 1 if b.pressed else 0 + self.button_change_state[b.type.raw].update({"standstill": CS.cruiseState.standstill}) def initialize_v_cruise(self, CS): # initializing is handled by the PCM From d3f971b365613329a35a3140b9418977baebd856 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 11 Nov 2022 20:10:12 -0800 Subject: [PATCH 105/184] controlsd v_cruise: fix unknown buttons (#26474) Fix button being None --- selfdrive/controls/lib/drive_helpers.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/selfdrive/controls/lib/drive_helpers.py b/selfdrive/controls/lib/drive_helpers.py index 5ca5319ba5..e9d74c54a9 100644 --- a/selfdrive/controls/lib/drive_helpers.py +++ b/selfdrive/controls/lib/drive_helpers.py @@ -90,8 +90,7 @@ class VCruiseHelper: break # Don't adjust speed when pressing resume to exit standstill - cruise_standstill = self.button_change_state[button_type]["standstill"] or CS.cruiseState.standstill - if button_type == ButtonType.accelCruise and cruise_standstill: + if button_type == ButtonType.accelCruise and (self.button_change_state[button_type]["standstill"] or CS.cruiseState.standstill): button_type = None if button_type: From 5f094b836851c392b89429cc654082c659f7caec Mon Sep 17 00:00:00 2001 From: Kurt Nistelberger Date: Sat, 12 Nov 2022 06:50:09 +0100 Subject: [PATCH 106/184] CI: regroup devices (#26436) * regroup ci devices * cleanup looopback test * split loopback devices Co-authored-by: Kurt Nistelberger --- Jenkinsfile | 27 +++++++++++++++++++------- release/files_common | 1 + selfdrive/manager/test/test_manager.py | 6 ++++++ 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0d624954ea..696446c65f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -111,7 +111,7 @@ pipeline { R3_PUSH = "${env.BRANCH_NAME == 'master' ? '1' : ' '}" } steps { - phone_steps("tici", [ + phone_steps("tici-needs-can", [ ["build master-ci", "cd $SOURCE_DIR/release && TARGET_DIR=$TEST_DIR EXTRA_FILES='tools/' ./build_devel.sh"], ["build openpilot", "cd selfdrive/manager && ./build.py"], ["check dirty", "release/check-dirty.sh"], @@ -122,16 +122,24 @@ pipeline { } } + stage('loopback-tests') { + agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } + steps { + phone_steps("tici-loopback", [ + ["build openpilot", "cd selfdrive/manager && ./build.py"], + ["test boardd loopback", "python selfdrive/boardd/tests/test_boardd_loopback.py"], + ]) + } + } + stage('HW + Unit Tests') { agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } steps { - phone_steps("tici2", [ + phone_steps("tici-common", [ ["build", "cd selfdrive/manager && ./build.py"], ["test power draw", "python system/hardware/tici/test_power_draw.py"], - ["test boardd loopback", "python selfdrive/boardd/tests/test_boardd_loopback.py"], ["test loggerd", "python selfdrive/loggerd/tests/test_loggerd.py"], ["test encoder", "LD_LIBRARY_PATH=/usr/local/lib python selfdrive/loggerd/tests/test_encoder.py"], - ["test sensord", "python selfdrive/sensord/tests/test_sensord.py"], ["test pigeond", "python selfdrive/sensord/tests/test_pigeond.py"], ]) } @@ -159,27 +167,32 @@ pipeline { } } - stage('sensord (LSM-C)') { + stage('sensord') { agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } steps { phone_steps("tici-lsmc", [ ["build", "cd selfdrive/manager && ./build.py"], ["test sensord", "cd selfdrive/sensord/tests && python -m unittest test_sensord.py"], ]) + phone_steps("tici-bmx-lsm", [ + ["build", "cd selfdrive/manager && ./build.py"], + ["test sensord", "cd selfdrive/sensord/tests && python -m unittest test_sensord.py"], + ]) } } stage('replay') { agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } steps { - phone_steps("tici3", [ + phone_steps("tici-common", [ ["build", "cd selfdrive/manager && ./build.py"], ["model replay", "cd selfdrive/test/process_replay && ./model_replay.py"], ]) } } - } + } } + } } diff --git a/release/files_common b/release/files_common index 26662f1ef1..a294e1e5b5 100644 --- a/release/files_common +++ b/release/files_common @@ -95,6 +95,7 @@ selfdrive/boardd/panda_comms.h selfdrive/boardd/panda_comms.cc selfdrive/boardd/set_time.py selfdrive/boardd/pandad.py +selfdrive/boardd/tests/test_boardd_loopback.py selfdrive/car/__init__.py selfdrive/car/docs_definitions.py diff --git a/selfdrive/manager/test/test_manager.py b/selfdrive/manager/test/test_manager.py index 7ac2c5f506..6d4df0423a 100755 --- a/selfdrive/manager/test/test_manager.py +++ b/selfdrive/manager/test/test_manager.py @@ -4,6 +4,7 @@ import signal import time import unittest +from common.params import Params import selfdrive.manager.manager as manager from selfdrive.manager.process import DaemonProcess from selfdrive.manager.process_config import managed_processes @@ -20,6 +21,10 @@ class TestManager(unittest.TestCase): os.environ['PASSIVE'] = '0' HARDWARE.set_power_save(False) + # ensure clean CarParams + params = Params() + params.clear_all() + def tearDown(self): manager.manager_cleanup() @@ -40,6 +45,7 @@ class TestManager(unittest.TestCase): Ensure all processes exit cleanly when stopped. """ HARDWARE.set_power_save(False) + manager.manager_init() manager.manager_prepare() for p in ALL_PROCESSES: managed_processes[p].start() From a638afb98e2b9d7844c04b1ec55c79d3274bc9b1 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 11 Nov 2022 23:11:49 -0800 Subject: [PATCH 107/184] controlsd: add tests around cruise speed (#26478) * start to add some tests * test !pcmCruise * test !pcmCruise * better test * fix pylint * new test for making sure we adjust on falling edge of buttons --- selfdrive/controls/tests/test_cruise_speed.py | 64 ++++++++++++++++++- 1 file changed, 61 insertions(+), 3 deletions(-) mode change 100644 => 100755 selfdrive/controls/tests/test_cruise_speed.py diff --git a/selfdrive/controls/tests/test_cruise_speed.py b/selfdrive/controls/tests/test_cruise_speed.py old mode 100644 new mode 100755 index ca070f1c3f..72b7dddc20 --- a/selfdrive/controls/tests/test_cruise_speed.py +++ b/selfdrive/controls/tests/test_cruise_speed.py @@ -1,10 +1,16 @@ #!/usr/bin/env python3 -import unittest import numpy as np +from parameterized import parameterized_class +import unittest + +from selfdrive.controls.lib.drive_helpers import VCruiseHelper, V_CRUISE_MAX, V_CRUISE_ENABLE_MIN +from cereal import car from common.params import Params +from selfdrive.test.longitudinal_maneuvers.maneuver import Maneuver +ButtonEvent = car.CarState.ButtonEvent +ButtonType = car.CarState.ButtonEvent.Type -from selfdrive.test.longitudinal_maneuvers.maneuver import Maneuver def run_cruise_simulation(cruise, t_end=20.): man = Maneuver( @@ -19,7 +25,7 @@ def run_cruise_simulation(cruise, t_end=20.): ) valid, output = man.evaluate() assert valid - return output[-1,3] + return output[-1, 3] class TestCruiseSpeed(unittest.TestCase): @@ -35,5 +41,57 @@ class TestCruiseSpeed(unittest.TestCase): self.assertAlmostEqual(simulation_steady_state, cruise_speed, delta=.01, msg=f'Did not reach {speed} m/s') +# TODO: test pcmCruise +@parameterized_class(('pcm_cruise',), [(False,)]) +class TestVCruiseHelper(unittest.TestCase): + def setUp(self): + self.CP = car.CarParams(pcmCruise=self.pcm_cruise) # pylint: disable=E1101 + self.v_cruise_helper = VCruiseHelper(self.CP) + + def test_adjust_speed(self): + """ + Asserts speed changes on falling edges of buttons. + """ + + self.v_cruise_helper.initialize_v_cruise(car.CarState()) + + for btn in (ButtonType.accelCruise, ButtonType.decelCruise): + initial_v_cruise = self.v_cruise_helper.v_cruise_kph + for pressed in (True, False): + CS = car.CarState(cruiseState={"available": True}) + CS.buttonEvents = [ButtonEvent(type=btn, pressed=pressed)] + + self.v_cruise_helper.update_v_cruise(CS, enabled=True, is_metric=False) + self.assertEqual(pressed, (initial_v_cruise == self.v_cruise_helper.v_cruise_kph)) + + def test_resume_in_standstill(self): + """ + Asserts we don't increment set speed if user presses resume/accel to exit cruise standstill. + """ + + self.v_cruise_helper.initialize_v_cruise(car.CarState()) + initial_v_cruise = self.v_cruise_helper.v_cruise_kph + + for standstill in (True, False): + for pressed in (True, False): + CS = car.CarState(cruiseState={"available": True, "standstill": standstill}) + CS.buttonEvents = [ButtonEvent(type=ButtonType.accelCruise, pressed=pressed)] + + self.v_cruise_helper.update_v_cruise(CS, enabled=True, is_metric=False) + # speed should only update if not at standstill and button falling edge + should_equal = standstill or pressed + self.assertEqual(should_equal, (initial_v_cruise == self.v_cruise_helper.v_cruise_kph)) + + def test_initialize_v_cruise(self): + """ + Asserts allowed cruise speeds on enabling with SET + """ + + for v_ego in np.linspace(0, 100, 101): + self.v_cruise_helper.initialize_v_cruise(car.CarState(vEgo=float(v_ego))) + self.assertTrue(V_CRUISE_ENABLE_MIN <= self.v_cruise_helper.v_cruise_kph <= V_CRUISE_MAX) + self.assertTrue(self.v_cruise_helper.v_cruise_initialized) + + if __name__ == "__main__": unittest.main() From 870b79818566ab91159d23f1197183f3e6567608 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 11 Nov 2022 23:56:35 -0800 Subject: [PATCH 108/184] controlsd: clean up v_cruise updating (#26479) * clean up * clean up * clean up --- selfdrive/controls/lib/drive_helpers.py | 31 ++++++++++++++----------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/selfdrive/controls/lib/drive_helpers.py b/selfdrive/controls/lib/drive_helpers.py index e9d74c54a9..37dacf5fb2 100644 --- a/selfdrive/controls/lib/drive_helpers.py +++ b/selfdrive/controls/lib/drive_helpers.py @@ -42,7 +42,7 @@ class VCruiseHelper: self.v_cruise_cluster_kph = V_CRUISE_INITIAL self.v_cruise_kph_last = 0 self.button_timers = {ButtonType.decelCruise: 0, ButtonType.accelCruise: 0} - self.button_change_state = {btn: {"standstill": False} for btn in self.button_timers} + self.button_change_states = {btn: {"standstill": False} for btn in self.button_timers} @property def v_cruise_initialized(self): @@ -89,22 +89,25 @@ class VCruiseHelper: long_press = True break + if button_type is None: + return + # Don't adjust speed when pressing resume to exit standstill - if button_type == ButtonType.accelCruise and (self.button_change_state[button_type]["standstill"] or CS.cruiseState.standstill): - button_type = None + cruise_standstill = self.button_change_states[button_type]["standstill"] or CS.cruiseState.standstill + if button_type == ButtonType.accelCruise and cruise_standstill: + return - if button_type: - v_cruise_delta = v_cruise_delta * (5 if long_press else 1) - if long_press and self.v_cruise_kph % v_cruise_delta != 0: # partial interval - self.v_cruise_kph = CRUISE_NEAREST_FUNC[button_type](self.v_cruise_kph / v_cruise_delta) * v_cruise_delta - else: - self.v_cruise_kph += v_cruise_delta * CRUISE_INTERVAL_SIGN[button_type] + v_cruise_delta = v_cruise_delta * (5 if long_press else 1) + if long_press and self.v_cruise_kph % v_cruise_delta != 0: # partial interval + self.v_cruise_kph = CRUISE_NEAREST_FUNC[button_type](self.v_cruise_kph / v_cruise_delta) * v_cruise_delta + else: + self.v_cruise_kph += v_cruise_delta * CRUISE_INTERVAL_SIGN[button_type] - # If set is pressed while overriding, clip cruise speed to minimum of vEgo - if CS.gasPressed and button_type in (ButtonType.decelCruise, ButtonType.setCruise): - self.v_cruise_kph = max(self.v_cruise_kph, CS.vEgo * CV.MS_TO_KPH) + # If set is pressed while overriding, clip cruise speed to minimum of vEgo + if CS.gasPressed and button_type in (ButtonType.decelCruise, ButtonType.setCruise): + self.v_cruise_kph = max(self.v_cruise_kph, CS.vEgo * CV.MS_TO_KPH) - self.v_cruise_kph = clip(round(self.v_cruise_kph, 1), V_CRUISE_MIN, V_CRUISE_MAX) + self.v_cruise_kph = clip(round(self.v_cruise_kph, 1), V_CRUISE_MIN, V_CRUISE_MAX) def update_button_timers(self, CS): # increment timer for buttons still pressed @@ -116,7 +119,7 @@ class VCruiseHelper: if b.type.raw in self.button_timers: # Start/end timer and store current state on change of button pressed self.button_timers[b.type.raw] = 1 if b.pressed else 0 - self.button_change_state[b.type.raw].update({"standstill": CS.cruiseState.standstill}) + self.button_change_states[b.type.raw] = {"standstill": CS.cruiseState.standstill} def initialize_v_cruise(self, CS): # initializing is handled by the PCM From 65f494d845bbfa47293ad3158a68bc38c1b4dcff Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Sat, 12 Nov 2022 02:02:30 -0800 Subject: [PATCH 109/184] GM: handle run-away set speed (#26480) * GM: Handle run-away set speed * bumpo * This is a test of both PRs combined * tempbump * Revert "tempbump" This reverts commit b73e04fca25e6a1bac889e44afac6430d5ad7c30. * Revert "This is a test of both PRs combined" This reverts commit 22cc0e6900e0f0470f14ed55e7846e4b1d570826. * fix * bump * fix that * Bump to master * fix fix --- panda | 2 +- selfdrive/car/gm/interface.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/panda b/panda index d573111268..0096d0c4fc 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit d57311126860c9a87edf5b7b9f81a2a038866a26 +Subproject commit 0096d0c4fc50d199ca46c6fe40479e1547408aed diff --git a/selfdrive/car/gm/interface.py b/selfdrive/car/gm/interface.py index 49cae998e8..c41aac0ae0 100755 --- a/selfdrive/car/gm/interface.py +++ b/selfdrive/car/gm/interface.py @@ -211,7 +211,12 @@ class CarInterface(CarInterfaceBase): ret = self.CS.update(self.cp, self.cp_cam, self.cp_loopback) if self.CS.cruise_buttons != self.CS.prev_cruise_buttons and self.CS.prev_cruise_buttons != CruiseButtons.INIT: - ret.buttonEvents = [create_button_event(self.CS.cruise_buttons, self.CS.prev_cruise_buttons, BUTTONS_DICT, CruiseButtons.UNPRESS)] + buttonEvents = [create_button_event(self.CS.cruise_buttons, self.CS.prev_cruise_buttons, BUTTONS_DICT, CruiseButtons.UNPRESS)] + # Handle ACCButtons changing buttons mid-press + if self.CS.cruise_buttons != CruiseButtons.UNPRESS and self.CS.prev_cruise_buttons != CruiseButtons.UNPRESS: + buttonEvents.append(create_button_event(CruiseButtons.UNPRESS, self.CS.prev_cruise_buttons, BUTTONS_DICT, CruiseButtons.UNPRESS)) + + ret.buttonEvents = buttonEvents events = self.create_common_events(ret, extra_gears=[GearShifter.sport, GearShifter.low, GearShifter.eco, GearShifter.manumatic], From 7b0f7312e577754958468ff6a176077976f1d6e2 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Mon, 14 Nov 2022 04:55:46 +0800 Subject: [PATCH 110/184] Cabana: miscellaneous fixes (#26477) * update pos after adjusted margins * ts >=0 * output debug message to console * fix freq&count incorrect after replay auto loop restart replay * fix different height of play/pause * delay posting CAN message if UI thread is busy * >= * clear undo stack after saving * no space allowed in names * const referer --- tools/cabana/canmessages.cc | 11 +++++++---- tools/cabana/canmessages.h | 1 + tools/cabana/chartswidget.cc | 5 ++++- tools/cabana/detailwidget.cc | 1 + tools/cabana/mainwin.cc | 3 +++ tools/cabana/signaledit.cc | 1 + tools/cabana/videowidget.cc | 2 +- 7 files changed, 18 insertions(+), 6 deletions(-) diff --git a/tools/cabana/canmessages.cc b/tools/cabana/canmessages.cc index e670ee8c94..ce0b458c96 100644 --- a/tools/cabana/canmessages.cc +++ b/tools/cabana/canmessages.cc @@ -44,7 +44,7 @@ QList CANMessages::findSignalValues(const QString &id, const Signal *si for (auto &evt : *evts) { if (evt->which != cereal::Event::Which::CAN) continue; - for (auto c : evt->event.getCan()) { + for (const auto &c : evt->event.getCan()) { if (bus == c.getSrc() && address == c.getAddress()) { double val = get_raw_value((uint8_t *)c.getDat().begin(), c.getDat().size(), *signal); if ((flag == EQ && val == value) || (flag == LT && val < value) || (flag == GT && val > value)) { @@ -65,6 +65,7 @@ void CANMessages::process(QHash *messages) { emit updated(); emit msgsReceived(messages); delete messages; + processing = false; } bool CANMessages::eventFilter(const Event *event) { @@ -78,7 +79,7 @@ bool CANMessages::eventFilter(const Event *event) { } double current_sec = replay->currentSeconds(); - if (counters_begin_sec == 0) { + if (counters_begin_sec == 0 || counters_begin_sec >= current_sec) { counters.clear(); counters_begin_sec = current_sec; } @@ -105,7 +106,9 @@ bool CANMessages::eventFilter(const Event *event) { } double ts = millis_since_boot(); - if ((ts - prev_update_ts) > (1000.0 / settings.fps)) { + if ((ts - prev_update_ts) > (1000.0 / settings.fps) && !processing) { + // delay posting CAN message if UI thread is busy + processing = true; prev_update_ts = ts; // use pointer to avoid data copy in queued connection. emit received(new_msgs.release()); @@ -120,7 +123,7 @@ const std::deque CANMessages::messages(const QString &id) { } void CANMessages::seekTo(double ts) { - replay->seekTo(ts, false); + replay->seekTo(std::max(double(0), ts), false); counters_begin_sec = 0; } diff --git a/tools/cabana/canmessages.h b/tools/cabana/canmessages.h index 5ee33bce0d..c52ffdee04 100644 --- a/tools/cabana/canmessages.h +++ b/tools/cabana/canmessages.h @@ -63,6 +63,7 @@ protected: Replay *replay = nullptr; std::mutex lock; std::atomic counters_begin_sec = 0; + std::atomic processing = false; QHash counters; QHash> received_msgs; }; diff --git a/tools/cabana/chartswidget.cc b/tools/cabana/chartswidget.cc index 875ed80ac5..220685a86b 100644 --- a/tools/cabana/chartswidget.cc +++ b/tools/cabana/chartswidget.cc @@ -192,6 +192,8 @@ ChartView::ChartView(const QString &id, const Signal *sig, QWidget *parent) chart->createDefaultAxes(); chart->legend()->hide(); chart->layout()->setContentsMargins(0, 0, 0, 0); + // top margin for title + chart->setMargins({0, 11, 0, 0}); line_marker = new QGraphicsLineItem(chart); line_marker->setZValue(chart->zValue() + 10); @@ -265,6 +267,7 @@ void ChartView::adjustChartMargins() { if (chart()->plotArea().left() != aligned_pos) { const float left_margin = chart()->margins().left() + aligned_pos - chart()->plotArea().left(); chart()->setMargins(QMargins(left_margin, 11, 0, 0)); + updateLineMarker(can->currentSec()); } } @@ -290,7 +293,7 @@ void ChartView::updateSeries(const std::pair range) { double end_ns = (route_start_time + range.second) * 1e9; for (auto it = begin; it != events->end() && (*it)->mono_time <= end_ns; ++it) { if ((*it)->which == cereal::Event::Which::CAN) { - for (auto c : (*it)->event.getCan()) { + for (const auto &c : (*it)->event.getCan()) { if (bus == c.getSrc() && address == c.getAddress()) { auto dat = c.getDat(); double value = get_raw_value((uint8_t *)dat.begin(), dat.size(), *signal); diff --git a/tools/cabana/detailwidget.cc b/tools/cabana/detailwidget.cc index 25c3a528f9..00145395fd 100644 --- a/tools/cabana/detailwidget.cc +++ b/tools/cabana/detailwidget.cc @@ -266,6 +266,7 @@ EditMessageDialog::EditMessageDialog(const QString &msg_id, const QString &title form_layout->addRow("ID", new QLabel(msg_id)); name_edit = new QLineEdit(title, this); + name_edit->setValidator(new QRegExpValidator(QRegExp("^(\\w+)"), name_edit)); form_layout->addRow(tr("Name"), name_edit); size_spin = new QSpinBox(this); diff --git a/tools/cabana/mainwin.cc b/tools/cabana/mainwin.cc index 40a99a7a56..97d62cb4f4 100644 --- a/tools/cabana/mainwin.cc +++ b/tools/cabana/mainwin.cc @@ -1,5 +1,6 @@ #include "tools/cabana/mainwin.h" +#include #include #include #include @@ -20,6 +21,7 @@ static MainWindow *main_win = nullptr; void qLogMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) { + if (type == QtDebugMsg) std::cout << msg.toStdString() << std::endl; if (main_win) emit main_win->showMessage(msg, 0); } @@ -192,6 +194,7 @@ void MainWindow::saveDBCToFile() { QFile file(file_name); if (file.open(QIODevice::WriteOnly)) file.write(dbc()->generateDBC().toUtf8()); + detail_widget->undo_stack->clear(); } } diff --git a/tools/cabana/signaledit.cc b/tools/cabana/signaledit.cc index 1cf9b8ae57..d96587e406 100644 --- a/tools/cabana/signaledit.cc +++ b/tools/cabana/signaledit.cc @@ -16,6 +16,7 @@ SignalForm::SignalForm(QWidget *parent) : QWidget(parent) { QFormLayout *form_layout = new QFormLayout(this); name = new QLineEdit(); + name->setValidator(new QRegExpValidator(QRegExp("^(\\w+)"), name)); form_layout->addRow(tr("Name"), name); size = new QSpinBox(); diff --git a/tools/cabana/videowidget.cc b/tools/cabana/videowidget.cc index d5e640b5f7..d85b23b7e6 100644 --- a/tools/cabana/videowidget.cc +++ b/tools/cabana/videowidget.cc @@ -37,7 +37,7 @@ VideoWidget::VideoWidget(QWidget *parent) : QWidget(parent) { // btn controls QHBoxLayout *control_layout = new QHBoxLayout(); play_btn = new QPushButton("⏸"); - play_btn->setStyleSheet("font-weight:bold"); + play_btn->setStyleSheet("font-weight:bold; height:16px"); control_layout->addWidget(play_btn); QButtonGroup *group = new QButtonGroup(this); From f924e797b745bf3a93201de85f807a0d101eaa0e Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Mon, 14 Nov 2022 04:56:05 +0800 Subject: [PATCH 111/184] Cabana: remove bus time from can message (#26475) remove bustime --- tools/cabana/canmessages.cc | 1 - tools/cabana/canmessages.h | 1 - 2 files changed, 2 deletions(-) diff --git a/tools/cabana/canmessages.cc b/tools/cabana/canmessages.cc index ce0b458c96..3bcaae4bbd 100644 --- a/tools/cabana/canmessages.cc +++ b/tools/cabana/canmessages.cc @@ -95,7 +95,6 @@ bool CANMessages::eventFilter(const Event *event) { } CanData &data = list.emplace_front(); data.ts = current_sec; - data.bus_time = c.getBusTime(); data.dat.append((char *)c.getDat().begin(), c.getDat().size()); data.count = ++counters[id]; diff --git a/tools/cabana/canmessages.h b/tools/cabana/canmessages.h index c52ffdee04..ff41edad54 100644 --- a/tools/cabana/canmessages.h +++ b/tools/cabana/canmessages.h @@ -16,7 +16,6 @@ struct CanData { double ts = 0.; uint32_t count = 0; uint32_t freq = 0; - uint16_t bus_time = 0; QByteArray dat; }; From 3d208567f34bac3f7f910c8f0343d9472b67bf6c Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Mon, 14 Nov 2022 04:56:26 +0800 Subject: [PATCH 112/184] Cabana: added color labels to signal list (#26485) add color label --- tools/cabana/signaledit.cc | 55 +++++++++++++++++++++++++++----------- tools/cabana/signaledit.h | 5 ++-- 2 files changed, 41 insertions(+), 19 deletions(-) diff --git a/tools/cabana/signaledit.cc b/tools/cabana/signaledit.cc index d96587e406..8737154c16 100644 --- a/tools/cabana/signaledit.cc +++ b/tools/cabana/signaledit.cc @@ -71,22 +71,40 @@ SignalForm::SignalForm(QWidget *parent) : QWidget(parent) { SignalEdit::SignalEdit(int index, QWidget *parent) : form_idx(index), QWidget(parent) { QVBoxLayout *main_layout = new QVBoxLayout(this); main_layout->setContentsMargins(0, 0, 0, 0); + main_layout->setSpacing(0); // title bar - auto toolbar = new QToolBar(this); - toolbar->setStyleSheet("QToolButton {width:15px;height:15px;font-size:15px}"); - icon = new QLabel(); - toolbar->addWidget(icon); + auto title_bar = new QWidget(this); + title_bar->setFixedHeight(32); + QHBoxLayout *title_layout = new QHBoxLayout(title_bar); + title_layout->setContentsMargins(0, 0, 0, 0); + title_bar->setStyleSheet("QToolButton {width:15px;height:15px;font-size:15px}"); + color_label = new QLabel(this); + color_label->setFixedWidth(25); + color_label->setContentsMargins(5, 0, 0, 0); + title_layout->addWidget(color_label); + icon = new QLabel(this); + title_layout->addWidget(icon); title = new ElidedLabel(this); title->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); - title->setStyleSheet(QString("font-weight:bold; color:%1").arg(getColor(index))); - toolbar->addWidget(title); - plot_btn = toolbar->addAction("", [this]() { emit showChart(msg_id, sig, !chart_opened); }); - auto seek_btn = toolbar->addAction(QIcon::fromTheme("edit-find"), "", [this]() { SignalFindDlg(msg_id, sig, this).exec(); }); + title_layout->addWidget(title); + + plot_btn = new QToolButton(this); + plot_btn->setText("📈"); + plot_btn->setCheckable(true); + plot_btn->setAutoRaise(true); + title_layout->addWidget(plot_btn); + auto seek_btn = new QToolButton(this); + seek_btn->setIcon(QIcon::fromTheme("edit-find")); + seek_btn->setAutoRaise(true); seek_btn->setToolTip(tr("Find signal values")); - auto remove_btn = toolbar->addAction("x", [this]() { emit remove(sig); }); + title_layout->addWidget(seek_btn); + auto remove_btn = new QToolButton(this); + remove_btn->setAutoRaise(true); + remove_btn->setText("x"); remove_btn->setToolTip(tr("Remove signal")); - main_layout->addWidget(toolbar); + title_layout->addWidget(remove_btn); + main_layout->addWidget(title_bar); // signal form form = new SignalForm(this); @@ -99,8 +117,11 @@ SignalEdit::SignalEdit(int index, QWidget *parent) : form_idx(index), QWidget(pa hline->setFrameShadow(QFrame::Sunken); main_layout->addWidget(hline); - QObject::connect(form, &SignalForm::changed, this, &SignalEdit::saveSignal); QObject::connect(title, &ElidedLabel::clicked, this, &SignalEdit::showFormClicked); + QObject::connect(plot_btn, &QToolButton::clicked, [this](bool checked) { emit showChart(msg_id, sig, checked); }); + QObject::connect(seek_btn, &QToolButton::clicked, [this]() { SignalFindDlg(msg_id, sig, this).exec(); }); + QObject::connect(remove_btn, &QToolButton::clicked, [this]() { emit remove(sig); }); + QObject::connect(form, &SignalForm::changed, this, &SignalEdit::saveSignal); setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); } @@ -108,7 +129,9 @@ void SignalEdit::setSignal(const QString &message_id, const Signal *signal) { sig = signal; updateForm(msg_id == message_id && form->isVisible()); msg_id = message_id; - title->setText(QString("%1. %2").arg(form_idx + 1).arg(sig->name.c_str())); + color_label->setText(QString::number(form_idx + 1)); + color_label->setStyleSheet(QString("background-color:%1").arg(getColor(form_idx))); + title->setText(sig->name.c_str()); show(); } @@ -145,9 +168,8 @@ void SignalEdit::saveSignal() { } void SignalEdit::setChartOpened(bool opened) { - plot_btn->setText(opened ? "☒" : "📈"); plot_btn->setToolTip(opened ? tr("Close Plot") : tr("Show Plot")); - chart_opened = opened; + plot_btn->setChecked(opened); } void SignalEdit::updateForm(bool visible) { @@ -175,8 +197,9 @@ void SignalEdit::showFormClicked() { } void SignalEdit::signalHovered(const Signal *s) { - auto color = sig == s ? hoverColor(getColor(form_idx)) : QColor(getColor(form_idx)); - title->setStyleSheet(QString("font-weight:bold; color:%1").arg(color.name())); + auto bg_color = sig == s ? hoverColor(getColor(form_idx)) : QColor(getColor(form_idx)); + auto color = sig == s ? "white" : "black"; + color_label->setStyleSheet(QString("color:%1; background-color:%2").arg(color).arg(bg_color.name())); } void SignalEdit::hideEvent(QHideEvent *event) { diff --git a/tools/cabana/signaledit.h b/tools/cabana/signaledit.h index 46ea1bfbe0..335e49a869 100644 --- a/tools/cabana/signaledit.h +++ b/tools/cabana/signaledit.h @@ -1,6 +1,5 @@ #pragma once -#include #include #include #include @@ -54,10 +53,10 @@ protected: SignalForm *form = nullptr; ElidedLabel *title; + QLabel *color_label; QLabel *icon; int form_idx = 0; - bool chart_opened = false; - QAction *plot_btn; + QToolButton *plot_btn; }; class SignalFindDlg : public QDialog { From 4ef941e954198a6ed77b4d1cf9389cd621da6aac Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Mon, 14 Nov 2022 04:56:48 +0800 Subject: [PATCH 113/184] Cabana: update detail view on change (#26476) update on changed --- tools/cabana/detailwidget.cc | 7 ++++--- tools/cabana/detailwidget.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/cabana/detailwidget.cc b/tools/cabana/detailwidget.cc index 00145395fd..260c9dfec7 100644 --- a/tools/cabana/detailwidget.cc +++ b/tools/cabana/detailwidget.cc @@ -89,7 +89,7 @@ DetailWidget::DetailWidget(ChartsWidget *charts, QWidget *parent) : charts(chart QObject::connect(binary_view, &BinaryView::resizeSignal, this, &DetailWidget::resizeSignal); QObject::connect(binary_view, &BinaryView::addSignal, this, &DetailWidget::addSignal); - QObject::connect(can, &CANMessages::updated, this, &DetailWidget::updateState); + QObject::connect(can, &CANMessages::msgsReceived, this, &DetailWidget::updateState); QObject::connect(dbc(), &DBCManager::DBCFileChanged, [this]() { dbcMsgChanged(); }); QObject::connect(tabbar, &QTabBar::customContextMenuRequested, this, &DetailWidget::showTabBarContextMenu); QObject::connect(tabbar, &QTabBar::currentChanged, [this](int index) { @@ -179,9 +179,10 @@ void DetailWidget::dbcMsgChanged(int show_form_idx) { QTimer::singleShot(1, [this]() { setUpdatesEnabled(true); }); } -void DetailWidget::updateState() { +void DetailWidget::updateState(const QHash * msgs) { time_label->setText(QString::number(can->currentSec(), 'f', 3)); - if (msg_id.isEmpty()) return; + if (!msgs->contains(msg_id)) + return; binary_view->updateState(); history_log->updateState(); diff --git a/tools/cabana/detailwidget.h b/tools/cabana/detailwidget.h index 815afa9bce..5fc6d122fe 100644 --- a/tools/cabana/detailwidget.h +++ b/tools/cabana/detailwidget.h @@ -36,7 +36,7 @@ private: void removeSignal(const Signal *sig); void editMsg(); void removeMsg(); - void updateState(); + void updateState(const QHash * msgs); QString msg_id; QLabel *name_label, *time_label, *warning_label; From 3524cc7f0bbb94ccb4d6b7b0504692d23288a05f Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Sun, 13 Nov 2022 16:15:17 -0800 Subject: [PATCH 114/184] cruise speed tests: match controlsd initialization of cruise speed (#26491) * helper functions and fix resetting/enabling * comment (resume not yet tested) * make it clear how this resets * this is fine to enable once * same here --- selfdrive/controls/tests/test_cruise_speed.py | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/selfdrive/controls/tests/test_cruise_speed.py b/selfdrive/controls/tests/test_cruise_speed.py index 72b7dddc20..396ff2b46f 100755 --- a/selfdrive/controls/tests/test_cruise_speed.py +++ b/selfdrive/controls/tests/test_cruise_speed.py @@ -5,6 +5,7 @@ import unittest from selfdrive.controls.lib.drive_helpers import VCruiseHelper, V_CRUISE_MAX, V_CRUISE_ENABLE_MIN from cereal import car +from common.conversions import Conversions as CV from common.params import Params from selfdrive.test.longitudinal_maneuvers.maneuver import Maneuver @@ -47,40 +48,48 @@ class TestVCruiseHelper(unittest.TestCase): def setUp(self): self.CP = car.CarParams(pcmCruise=self.pcm_cruise) # pylint: disable=E1101 self.v_cruise_helper = VCruiseHelper(self.CP) + self.reset_cruise_speed_state() + + def reset_cruise_speed_state(self): + # Two resets previous cruise speed + for _ in range(2): + self.v_cruise_helper.update_v_cruise(car.CarState(cruiseState={"available": False}), enabled=False, is_metric=False) + + def enable(self, v_ego): + # Simulates user pressing set with a current speed + self.v_cruise_helper.initialize_v_cruise(car.CarState(vEgo=v_ego)) def test_adjust_speed(self): """ Asserts speed changes on falling edges of buttons. """ - self.v_cruise_helper.initialize_v_cruise(car.CarState()) + self.enable(V_CRUISE_ENABLE_MIN * CV.KPH_TO_MS) for btn in (ButtonType.accelCruise, ButtonType.decelCruise): - initial_v_cruise = self.v_cruise_helper.v_cruise_kph for pressed in (True, False): CS = car.CarState(cruiseState={"available": True}) CS.buttonEvents = [ButtonEvent(type=btn, pressed=pressed)] self.v_cruise_helper.update_v_cruise(CS, enabled=True, is_metric=False) - self.assertEqual(pressed, (initial_v_cruise == self.v_cruise_helper.v_cruise_kph)) + self.assertEqual(pressed, self.v_cruise_helper.v_cruise_kph == self.v_cruise_helper.v_cruise_kph_last) def test_resume_in_standstill(self): """ Asserts we don't increment set speed if user presses resume/accel to exit cruise standstill. """ - self.v_cruise_helper.initialize_v_cruise(car.CarState()) - initial_v_cruise = self.v_cruise_helper.v_cruise_kph + self.enable(0) for standstill in (True, False): for pressed in (True, False): CS = car.CarState(cruiseState={"available": True, "standstill": standstill}) CS.buttonEvents = [ButtonEvent(type=ButtonType.accelCruise, pressed=pressed)] - self.v_cruise_helper.update_v_cruise(CS, enabled=True, is_metric=False) + # speed should only update if not at standstill and button falling edge should_equal = standstill or pressed - self.assertEqual(should_equal, (initial_v_cruise == self.v_cruise_helper.v_cruise_kph)) + self.assertEqual(should_equal, self.v_cruise_helper.v_cruise_kph == self.v_cruise_helper.v_cruise_kph_last) def test_initialize_v_cruise(self): """ @@ -88,7 +97,10 @@ class TestVCruiseHelper(unittest.TestCase): """ for v_ego in np.linspace(0, 100, 101): - self.v_cruise_helper.initialize_v_cruise(car.CarState(vEgo=float(v_ego))) + self.reset_cruise_speed_state() + self.assertFalse(self.v_cruise_helper.v_cruise_initialized) + + self.enable(float(v_ego)) self.assertTrue(V_CRUISE_ENABLE_MIN <= self.v_cruise_helper.v_cruise_kph <= V_CRUISE_MAX) self.assertTrue(self.v_cruise_helper.v_cruise_initialized) From e46063086f079eff6292a32ae9aeeafa3aa523a3 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Sun, 13 Nov 2022 16:34:26 -0800 Subject: [PATCH 115/184] controlsd: no speed increment if enabled on button rising edge (#26490) * don't increment speed if we enabled on rising edge * more realistic test --- selfdrive/controls/lib/drive_helpers.py | 10 ++++++--- selfdrive/controls/tests/test_cruise_speed.py | 21 ++++++++++++++++++- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/selfdrive/controls/lib/drive_helpers.py b/selfdrive/controls/lib/drive_helpers.py index 37dacf5fb2..09550de7bb 100644 --- a/selfdrive/controls/lib/drive_helpers.py +++ b/selfdrive/controls/lib/drive_helpers.py @@ -56,7 +56,7 @@ class VCruiseHelper: # if stock cruise is completely disabled, then we can use our own set speed logic self._update_v_cruise_non_pcm(CS, enabled, is_metric) self.v_cruise_cluster_kph = self.v_cruise_kph - self.update_button_timers(CS) + self.update_button_timers(CS, enabled) else: self.v_cruise_kph = CS.cruiseState.speed * CV.MS_TO_KPH self.v_cruise_cluster_kph = CS.cruiseState.speedCluster * CV.MS_TO_KPH @@ -97,6 +97,10 @@ class VCruiseHelper: if button_type == ButtonType.accelCruise and cruise_standstill: return + # Don't adjust speed if we've enabled since the button was depressed (some ports enable on rising edge) + if not self.button_change_states[button_type]["enabled"]: + return + v_cruise_delta = v_cruise_delta * (5 if long_press else 1) if long_press and self.v_cruise_kph % v_cruise_delta != 0: # partial interval self.v_cruise_kph = CRUISE_NEAREST_FUNC[button_type](self.v_cruise_kph / v_cruise_delta) * v_cruise_delta @@ -109,7 +113,7 @@ class VCruiseHelper: self.v_cruise_kph = clip(round(self.v_cruise_kph, 1), V_CRUISE_MIN, V_CRUISE_MAX) - def update_button_timers(self, CS): + def update_button_timers(self, CS, enabled): # increment timer for buttons still pressed for k in self.button_timers: if self.button_timers[k] > 0: @@ -119,7 +123,7 @@ class VCruiseHelper: if b.type.raw in self.button_timers: # Start/end timer and store current state on change of button pressed self.button_timers[b.type.raw] = 1 if b.pressed else 0 - self.button_change_states[b.type.raw] = {"standstill": CS.cruiseState.standstill} + self.button_change_states[b.type.raw] = {"standstill": CS.cruiseState.standstill, "enabled": enabled} def initialize_v_cruise(self, CS): # initializing is handled by the PCM diff --git a/selfdrive/controls/tests/test_cruise_speed.py b/selfdrive/controls/tests/test_cruise_speed.py index 396ff2b46f..3d6f55931e 100755 --- a/selfdrive/controls/tests/test_cruise_speed.py +++ b/selfdrive/controls/tests/test_cruise_speed.py @@ -74,6 +74,25 @@ class TestVCruiseHelper(unittest.TestCase): self.v_cruise_helper.update_v_cruise(CS, enabled=True, is_metric=False) self.assertEqual(pressed, self.v_cruise_helper.v_cruise_kph == self.v_cruise_helper.v_cruise_kph_last) + def test_rising_edge_enable(self): + """ + Some car interfaces may enable on rising edge of a button, + ensure we don't adjust speed if enabled changes mid-press. + """ + + # NOTE: enabled is always one frame behind the result from button press in controlsd + for enabled, pressed in ((False, False), + (False, True), + (True, False)): + CS = car.CarState(cruiseState={"available": True}) + CS.buttonEvents = [ButtonEvent(type=ButtonType.decelCruise, pressed=pressed)] + self.v_cruise_helper.update_v_cruise(CS, enabled=enabled, is_metric=False) + if pressed: + self.enable(V_CRUISE_ENABLE_MIN * CV.KPH_TO_MS) + + # Expected diff on enabling. Speed should not change on falling edge of pressed + self.assertEqual(not pressed, self.v_cruise_helper.v_cruise_kph == self.v_cruise_helper.v_cruise_kph_last) + def test_resume_in_standstill(self): """ Asserts we don't increment set speed if user presses resume/accel to exit cruise standstill. @@ -93,7 +112,7 @@ class TestVCruiseHelper(unittest.TestCase): def test_initialize_v_cruise(self): """ - Asserts allowed cruise speeds on enabling with SET + Asserts allowed cruise speeds on enabling with SET. """ for v_ego in np.linspace(0, 100, 101): From ca37d0c8cc43a88189c2a96b02aed0edfe5aa32e Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Sun, 13 Nov 2022 20:50:28 -0800 Subject: [PATCH 116/184] interfaces: disable on falling edge of cancel button (#26493) * both * Update ref_commit --- selfdrive/car/interfaces.py | 4 ++-- selfdrive/test/process_replay/ref_commit | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/selfdrive/car/interfaces.py b/selfdrive/car/interfaces.py index 982ba40b17..8e8872a539 100644 --- a/selfdrive/car/interfaces.py +++ b/selfdrive/car/interfaces.py @@ -250,8 +250,8 @@ class CarInterfaceBase(ABC): # Enable OP long on falling edge of enable buttons (defaults to accelCruise and decelCruise, overridable per-port) if not self.CP.pcmCruise and (b.type in enable_buttons and not b.pressed): events.add(EventName.buttonEnable) - # Disable on rising edge of cancel for both stock and OP long - if b.type == ButtonType.cancel and b.pressed: + # Disable on rising and falling edge of cancel for both stock and OP long + if b.type == ButtonType.cancel: events.add(EventName.buttonCancel) # Handle permanent and temporary steering faults diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index 2ff423a84a..55788155b5 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -b5c833a8f5b3e6202a52746fc16809c7b649d591 +2ac5ecc79218aad0319e02218b050319a180e957 From 15383d30161de7646edf770153b0f81d15338c54 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Sun, 13 Nov 2022 21:13:46 -0800 Subject: [PATCH 117/184] GM: match stock enabling behavior (#26442) * add first draft enable button timeout * use allow_enable * it doesn't count if brakePressed * enable on rising edge of resume (matches stock) * not today * add comment describing the fault this avoids * cleaner * handle incrementing speed * rename * add test for not changing speed if enabled changes mid-press * spacey * ugh * bumpo * need this to fix a fault (draft) * already have * this should be cancel * fine to do for all * fine to do for all * bump * bumpo * bump to master * Update selfdrive/car/gm/interface.py * Update selfdrive/car/gm/interface.py * Update ref_commit --- panda | 2 +- selfdrive/car/gm/interface.py | 6 +++++- selfdrive/test/process_replay/ref_commit | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/panda b/panda index 0096d0c4fc..c0632cd32b 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit 0096d0c4fc50d199ca46c6fe40479e1547408aed +Subproject commit c0632cd32b78279dfbb3ce28c7a10ded8090d40f diff --git a/selfdrive/car/gm/interface.py b/selfdrive/car/gm/interface.py index c41aac0ae0..eb5ab7329a 100755 --- a/selfdrive/car/gm/interface.py +++ b/selfdrive/car/gm/interface.py @@ -218,9 +218,13 @@ class CarInterface(CarInterfaceBase): ret.buttonEvents = buttonEvents + # The ECM allows enabling on falling edge of set, but only rising edge of resume events = self.create_common_events(ret, extra_gears=[GearShifter.sport, GearShifter.low, GearShifter.eco, GearShifter.manumatic], - pcm_enable=self.CP.pcmCruise) + pcm_enable=self.CP.pcmCruise, enable_buttons=(ButtonType.decelCruise,)) + if not self.CP.pcmCruise: + if any(b.type == ButtonType.accelCruise and b.pressed for b in ret.buttonEvents): + events.add(EventName.buttonEnable) # Enabling at a standstill with brake is allowed # TODO: verify 17 Volt can enable for the first time at a stop and allow for all GMs diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index 55788155b5..f35e23d45f 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -2ac5ecc79218aad0319e02218b050319a180e957 +aa2d370836588fd80b648dbed8d156765ec804d5 From 102669a232824c309dae269cfbdf763af5214da8 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sun, 13 Nov 2022 22:28:27 -0800 Subject: [PATCH 118/184] compressed vipc: fix client connect --- tools/camerastream/compressed_vipc.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/camerastream/compressed_vipc.py b/tools/camerastream/compressed_vipc.py index 42a416985e..cab11493f2 100755 --- a/tools/camerastream/compressed_vipc.py +++ b/tools/camerastream/compressed_vipc.py @@ -91,9 +91,14 @@ def main(addr, cams, nvidia=False): vipc_server.create_buffers(vst, 4, False, W, H) vipc_server.start_listener() + procs = [] for k, v in cams.items(): - multiprocessing.Process(target=decoder, args=(addr, k, vipc_server, v, nvidia)).start() + p = multiprocessing.Process(target=decoder, args=(addr, k, vipc_server, v, nvidia)) + p.start() + procs.append(p) + for p in procs: + p.join() if __name__ == "__main__": parser = argparse.ArgumentParser(description="Decode video streams and broadcast on VisionIPC") From 29f24c7491d74ff2d2f7ca12e9a085dbe91c93fb Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Tue, 15 Nov 2022 02:04:14 +0800 Subject: [PATCH 119/184] Cabana: Fix title overlapping on chart with long names (#26494) fix title overlapping --- tools/cabana/chartswidget.cc | 6 +----- tools/cabana/chartswidget.h | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/cabana/chartswidget.cc b/tools/cabana/chartswidget.cc index 220685a86b..06387b3585 100644 --- a/tools/cabana/chartswidget.cc +++ b/tools/cabana/chartswidget.cc @@ -207,7 +207,6 @@ ChartView::ChartView(const QString &id, const Signal *sig, QWidget *parent) item_group->setZValue(chart->zValue() + 10); // title - msg_title = new QGraphicsTextItem(chart); QToolButton *remove_btn = new QToolButton(); remove_btn->setText("X"); remove_btn->setAutoRaise(true); @@ -236,13 +235,11 @@ ChartView::ChartView(const QString &id, const Signal *sig, QWidget *parent) void ChartView::resizeEvent(QResizeEvent *event) { QChartView::resizeEvent(event); - msg_title->setPos(11, 6); close_btn_proxy->setPos(event->size().width() - close_btn_proxy->size().width() - 11, 8); } void ChartView::updateTitle() { - chart()->setTitle(signal->name.c_str()); - msg_title->setHtml(tr("%1 %2").arg(dbc()->msg(id)->name).arg(id)); + chart()->setTitle(tr("%1 %2 %3").arg(dbc()->msg(id)->name).arg(id).arg(signal->name.c_str())); } void ChartView::updateFromSettings() { @@ -250,7 +247,6 @@ void ChartView::updateFromSettings() { chart()->setTheme(settings.chart_theme == 0 ? QChart::ChartThemeLight : QChart::QChart::ChartThemeDark); auto color = chart()->titleBrush().color(); line_marker->setPen(QPen(color, 2)); - msg_title->setDefaultTextColor(color); } void ChartView::setRange(double min, double max, bool force_update) { diff --git a/tools/cabana/chartswidget.h b/tools/cabana/chartswidget.h index e32a6697ce..20c673a757 100644 --- a/tools/cabana/chartswidget.h +++ b/tools/cabana/chartswidget.h @@ -44,7 +44,7 @@ private: QGraphicsItemGroup *item_group; QGraphicsLineItem *line_marker, *track_line; QGraphicsEllipseItem *track_ellipse; - QGraphicsTextItem *value_text, *msg_title; + QGraphicsTextItem *value_text; QGraphicsProxyWidget *close_btn_proxy; QVector vals; }; From ae40774425872b9d680448a41e2835c017c48e6c Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Tue, 15 Nov 2022 02:13:16 +0800 Subject: [PATCH 120/184] Cabana: add test case for parsing can messages (#26495) * add test case for parsing can messages * require size equal * cleanup --- tools/cabana/tests/test_cabana.cc | 45 +++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/tools/cabana/tests/test_cabana.cc b/tools/cabana/tests/test_cabana.cc index ee4a581529..586422ffc8 100644 --- a/tools/cabana/tests/test_cabana.cc +++ b/tools/cabana/tests/test_cabana.cc @@ -1,6 +1,12 @@ +#include "opendbc/can/common.h" +#undef INFO #include "catch2/catch.hpp" #include "tools/cabana/dbcmanager.h" +#include "tools/replay/logreader.h" + +// demo route, first segment +const std::string TEST_RLOG_URL = "https://commadata2.blob.core.windows.net/commadata2/4cf7a6ad03080c90/2021-09-29--13-46-36/0/rlog.bz2"; TEST_CASE("DBCManager::generateDBC") { DBCManager dbc_origin(nullptr); @@ -20,3 +26,42 @@ TEST_CASE("DBCManager::generateDBC") { REQUIRE(sig == new_m.sigs[name]); } } + +TEST_CASE("Parse can messages") { + DBCManager dbc(nullptr); + dbc.open("toyota_new_mc_pt_generated"); + CANParser can_parser(0, "toyota_new_mc_pt_generated", {}, {}); + + LogReader log; + REQUIRE(log.load(TEST_RLOG_URL, nullptr, {}, true)); + REQUIRE(log.events.size() > 0); + for (auto e : log.events) { + if (e->which == cereal::Event::Which::CAN) { + std::map, std::vector> values_1; + for (const auto &c : e->event.getCan()) { + const auto msg = dbc.msg(c.getAddress()); + if (c.getSrc() == 0 && msg) { + for (auto &[name, sig] : msg->sigs) { + double val = get_raw_value((uint8_t *)c.getDat().begin(), c.getDat().size(), sig); + values_1[{c.getAddress(), name.toStdString()}].push_back(val); + } + } + } + + can_parser.UpdateCans(e->mono_time, e->event.getCan()); + auto values_2 = can_parser.query_latest(); + for (auto &[key, v1] : values_1) { + bool found = false; + for (auto &v2 : values_2) { + if (v2.address == key.first && v2.name == key.second) { + REQUIRE(v2.all_values.size() == v1.size()); + REQUIRE(v2.all_values == v1); + found = true; + break; + } + } + REQUIRE(found); + } + } + } +} From f15d169289c0d806a49af123678bd49b8b3ba4f1 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 14 Nov 2022 11:01:01 -0800 Subject: [PATCH 121/184] controlsd cruise speed: fix missing initial value --- selfdrive/controls/lib/drive_helpers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfdrive/controls/lib/drive_helpers.py b/selfdrive/controls/lib/drive_helpers.py index 09550de7bb..bdbdb7023a 100644 --- a/selfdrive/controls/lib/drive_helpers.py +++ b/selfdrive/controls/lib/drive_helpers.py @@ -42,7 +42,7 @@ class VCruiseHelper: self.v_cruise_cluster_kph = V_CRUISE_INITIAL self.v_cruise_kph_last = 0 self.button_timers = {ButtonType.decelCruise: 0, ButtonType.accelCruise: 0} - self.button_change_states = {btn: {"standstill": False} for btn in self.button_timers} + self.button_change_states = {btn: {"standstill": False, "enabled": False} for btn in self.button_timers} @property def v_cruise_initialized(self): From 41e5c79948216af2d416dcea2bceb1ba53855022 Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Mon, 14 Nov 2022 15:04:59 -0500 Subject: [PATCH 122/184] =?UTF-8?q?VW=20MQB:=20Add=20missing=20FW=20for=20?= =?UTF-8?q?2016=20=C5=A0koda=20Superb=20(#26484)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * VW MQB: Add missing FW for 2016 Škoda Superb * regen CARS.md --- docs/CARS.md | 2 +- selfdrive/car/volkswagen/values.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/CARS.md b/docs/CARS.md index 32da6126bd..b8a313386d 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -150,7 +150,7 @@ A supported vehicle is one that just works when you install a comma three. All s |Škoda|Octavia 2015, 2018-19|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| |Škoda|Octavia RS 2016|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| |Škoda|Scala 2020|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533[9](#footnotes)| -|Škoda|Superb 2015-18|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| +|Škoda|Superb 2015-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| |Toyota|Alphard 2019-20|All|openpilot|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Toyota| |Toyota|Alphard Hybrid 2021|All|openpilot|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Toyota| |Toyota|Avalon 2016|Toyota Safety Sense P|openpilot available[2](#footnotes)|19 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Toyota| diff --git a/selfdrive/car/volkswagen/values.py b/selfdrive/car/volkswagen/values.py index babaffbcbe..cb2343e08f 100755 --- a/selfdrive/car/volkswagen/values.py +++ b/selfdrive/car/volkswagen/values.py @@ -233,7 +233,7 @@ CAR_INFO: Dict[str, Union[VWCarInfo, List[VWCarInfo]]] = { CAR.SKODA_KAROQ_MK1: VWCarInfo("Škoda Karoq 2019-21"), CAR.SKODA_KODIAQ_MK1: VWCarInfo("Škoda Kodiaq 2018-19"), CAR.SKODA_SCALA_MK1: VWCarInfo("Škoda Scala 2020", footnotes=[Footnote.VW_EXP_LONG, Footnote.VW_MQB_A0]), - CAR.SKODA_SUPERB_MK3: VWCarInfo("Škoda Superb 2015-18"), + CAR.SKODA_SUPERB_MK3: VWCarInfo("Škoda Superb 2015-22"), CAR.SKODA_OCTAVIA_MK3: [ VWCarInfo("Škoda Octavia 2015, 2018-19"), VWCarInfo("Škoda Octavia RS 2016"), @@ -1064,6 +1064,7 @@ FW_VERSIONS = { }, CAR.SKODA_SUPERB_MK3: { (Ecu.engine, 0x7e0, None): [ + b'\xf1\x8704L906026ET\xf1\x891343', b'\xf1\x8704L906026FP\xf1\x891196', b'\xf1\x8704L906026KB\xf1\x894071', b'\xf1\x8704L906026KD\xf1\x894798', @@ -1074,9 +1075,11 @@ FW_VERSIONS = { b'\xf1\x870CW300042H \xf1\x891601', b'\xf1\x870D9300011T \xf1\x894801', b'\xf1\x870D9300012 \xf1\x894940', + b'\xf1\x870D9300041H \xf1\x894905', b'\xf1\x870GC300043 \xf1\x892301', ], (Ecu.srs, 0x715, None): [ + b'\xf1\x875Q0959655AE\xf1\x890130\xf1\x82\x12111200111121001121110012211292221111', b'\xf1\x875Q0959655AE\xf1\x890130\xf1\x82\022111200111121001121118112231292221111', b'\xf1\x875Q0959655AK\xf1\x890130\xf1\x82\022111200111121001121110012211292221111', b'\xf1\x875Q0959655BH\xf1\x890336\xf1\x82\02331310031313100313131013141319331413100', From fbf2f3816b18321ed921cf03042327134be68edb Mon Sep 17 00:00:00 2001 From: Vivek Aithal Date: Mon, 14 Nov 2022 15:02:26 -0800 Subject: [PATCH 123/184] [locationd] Add input checks (#26460) * add input checks with same decay as reset_tracker * add observation timings check * typo * bugfix * improve offline locationd visibility * sbugfix offline lld Co-authored-by: Adeeb Shihadeh --- selfdrive/locationd/liblocationd.cc | 12 +++++ selfdrive/locationd/locationd.cc | 75 ++++++++++++++++++++++++++--- selfdrive/locationd/locationd.h | 9 +++- 3 files changed, 89 insertions(+), 7 deletions(-) diff --git a/selfdrive/locationd/liblocationd.cc b/selfdrive/locationd/liblocationd.cc index 49404668a4..da57fb7ff4 100755 --- a/selfdrive/locationd/liblocationd.cc +++ b/selfdrive/locationd/liblocationd.cc @@ -26,4 +26,16 @@ extern "C" { memcpy(std_buff, stdev.data(), sizeof(double) * stdev.size()); } + bool is_gps_ok(Localizer *localizer){ + return localizer->is_gps_ok(); + } + + bool are_inputs_ok(Localizer *localizer){ + return localizer->are_inputs_ok(); + } + + void observation_timings_invalid_reset(Localizer *localizer){ + localizer->observation_timings_invalid_reset(); + } + } diff --git a/selfdrive/locationd/locationd.cc b/selfdrive/locationd/locationd.cc index 8d9e247655..4325900c0e 100755 --- a/selfdrive/locationd/locationd.cc +++ b/selfdrive/locationd/locationd.cc @@ -19,6 +19,9 @@ const double VALID_TIME_SINCE_RESET = 1.0; // s const double VALID_POS_STD = 50.0; // m const double MAX_RESET_TRACKER = 5.0; const double SANE_GPS_UNCERTAINTY = 1500.0; // m +const double INPUT_INVALID_THRESHOLD = 5.0; // same as reset tracker +const double DECAY = 0.99995; // same as reset tracker +const double MAX_FILTER_REWIND_TIME = 0.8; // s // TODO: GPS sensor time offsets are empirically calculated // They should be replaced with synced time from a real clock @@ -200,6 +203,14 @@ VectorXd Localizer::get_stdev() { return this->kf->get_P().diagonal().array().sqrt(); } +bool Localizer::are_inputs_ok() { + return this->critical_services_valid(this->observation_values_invalid) && !this->observation_timings_invalid; +} + +void Localizer::observation_timings_invalid_reset(){ + this->observation_timings_invalid = false; +} + void Localizer::handle_sensor(double current_time, const cereal::SensorEventData::Reader& log) { // TODO does not yet account for double sensor readings in the log @@ -209,10 +220,15 @@ void Localizer::handle_sensor(double current_time, const cereal::SensorEventData } double sensor_time = 1e-9 * log.getTimestamp(); - + // sensor time and log time should be close if (std::abs(current_time - sensor_time) > 0.1) { LOGE("Sensor reading ignored, sensor timestamp more than 100ms off from log time"); + this->observation_timings_invalid = true; + return; + } + else if (!this->is_timestamp_valid(sensor_time)) { + this->observation_timings_invalid = true; return; } @@ -227,6 +243,10 @@ void Localizer::handle_sensor(double current_time, const cereal::SensorEventData auto meas = Vector3d(-v[2], -v[1], -v[0]); if (meas.norm() < ROTATION_SANITY_CHECK) { this->kf->predict_and_observe(sensor_time, OBSERVATION_PHONE_GYRO, { meas }); + this->observation_values_invalid["gyroscope"] *= DECAY; + } + else{ + this->observation_values_invalid["gyroscope"] += 1.0; } } @@ -242,6 +262,10 @@ void Localizer::handle_sensor(double current_time, const cereal::SensorEventData auto meas = Vector3d(-v[2], -v[1], -v[0]); if (meas.norm() < ACCEL_SANITY_CHECK) { this->kf->predict_and_observe(sensor_time, OBSERVATION_PHONE_ACCEL, { meas }); + this->observation_values_invalid["accelerometer"] *= DECAY; + } + else{ + this->observation_values_invalid["accelerometer"] += 1.0; } } } @@ -335,8 +359,14 @@ void Localizer::handle_car_state(double current_time, const cereal::CarState::Re void Localizer::handle_cam_odo(double current_time, const cereal::CameraOdometry::Reader& log) { VectorXd rot_device = this->device_from_calib * floatlist2vector(log.getRot()); VectorXd trans_device = this->device_from_calib * floatlist2vector(log.getTrans()); + + if (!this->is_timestamp_valid(current_time)) { + this->observation_timings_invalid = true; + return; + } if ((rot_device.norm() > ROTATION_SANITY_CHECK) || (trans_device.norm() > TRANS_SANITY_CHECK)) { + this->observation_values_invalid["cameraOdometry"] += 1.0; return; } @@ -344,10 +374,12 @@ void Localizer::handle_cam_odo(double current_time, const cereal::CameraOdometry VectorXd trans_calib_std = floatlist2vector(log.getTransStd()); if ((rot_calib_std.minCoeff() <= MIN_STD_SANITY_CHECK) || (trans_calib_std.minCoeff() <= MIN_STD_SANITY_CHECK)) { + this->observation_values_invalid["cameraOdometry"] += 1.0; return; } if ((rot_calib_std.norm() > 10 * ROTATION_SANITY_CHECK) || (trans_calib_std.norm() > 10 * TRANS_SANITY_CHECK)) { + this->observation_values_invalid["cameraOdometry"] += 1.0; return; } @@ -363,12 +395,19 @@ void Localizer::handle_cam_odo(double current_time, const cereal::CameraOdometry { rot_device }, { rot_device_cov }); this->kf->predict_and_observe(current_time, OBSERVATION_CAMERA_ODO_TRANSLATION, { trans_device }, { trans_device_cov }); + this->observation_values_invalid["cameraOdometry"] *= DECAY; } void Localizer::handle_live_calib(double current_time, const cereal::LiveCalibrationData::Reader& log) { + if (!this->is_timestamp_valid(current_time)) { + this->observation_timings_invalid = true; + return; + } + if (log.getRpyCalib().size() > 0) { auto live_calib = floatlist2vector(log.getRpyCalib()); if ((live_calib.minCoeff() < -CALIB_RPY_SANITY_CHECK) || (live_calib.maxCoeff() > CALIB_RPY_SANITY_CHECK)) { + this->observation_values_invalid["liveCalibration"] += 1.0; return; } @@ -376,6 +415,7 @@ void Localizer::handle_live_calib(double current_time, const cereal::LiveCalibra this->device_from_calib = euler2rot(this->calib); this->calib_from_device = this->device_from_calib.transpose(); this->calibrated = log.getCalStatus() == 1; + this->observation_values_invalid["liveCalibration"] *= DECAY; } } @@ -407,8 +447,8 @@ void Localizer::time_check(double current_time) { void Localizer::update_reset_tracker() { // reset tracker is tuned to trigger when over 1reset/10s over 2min period - if (this->isGpsOK()) { - this->reset_tracker *= .99995; + if (this->is_gps_ok()) { + this->reset_tracker *= DECAY; } else { this->reset_tracker = 0.0; } @@ -483,10 +523,28 @@ kj::ArrayPtr Localizer::get_message_bytes(MessageBuilder& msg_build return msg_builder.toBytes(); } -bool Localizer::isGpsOK() { +bool Localizer::is_gps_ok() { return this->gps_valid; } +bool Localizer::critical_services_valid(std::map critical_services) { + for (auto &kv : critical_services){ + if (kv.second >= INPUT_INVALID_THRESHOLD){ + return false; + } + } + return true; +} + +bool Localizer::is_timestamp_valid(double current_time) { + double filter_time = this->kf->get_filter_time(); + if (!std::isnan(filter_time) && ((filter_time - current_time) > MAX_FILTER_REWIND_TIME)) { + LOGE("Observation timestamp is older than the max rewind threshold of the filter"); + return false; + } + return true; +} + void Localizer::determine_gps_mode(double current_time) { // 1. If the pos_std is greater than what's not acceptable and localizer is in gps-mode, reset to no-gps-mode // 2. If the pos_std is greater than what's not acceptable and localizer is in no-gps-mode, fake obs @@ -521,10 +579,15 @@ int Localizer::locationd_thread() { uint64_t cnt = 0; bool filterInitialized = false; + const std::vector critical_input_services = {"cameraOdometry", "liveCalibration", "accelerometer", "gyroscope"}; + for (std::string service : critical_input_services) { + this->observation_values_invalid.insert({service, 0.0}); + } while (!do_exit) { sm.update(); if (filterInitialized){ + this->observation_timings_invalid_reset(); for (const char* service : service_list) { if (sm.updated(service) && sm.valid(service)){ const cereal::Event::Reader log = sm[service]; @@ -538,8 +601,8 @@ int Localizer::locationd_thread() { // 100Hz publish for notcars, 20Hz for cars const char* trigger_msg = sm["carParams"].getCarParams().getNotCar() ? "accelerometer" : "cameraOdometry"; if (sm.updated(trigger_msg)) { - bool inputsOK = sm.allAliveAndValid(); - bool gpsOK = this->isGpsOK(); + bool inputsOK = sm.allAliveAndValid() && this->are_inputs_ok(); + bool gpsOK = this->is_gps_ok(); bool sensorsOK = sm.allAliveAndValid({"accelerometer", "gyroscope"}); MessageBuilder msg_builder; diff --git a/selfdrive/locationd/locationd.h b/selfdrive/locationd/locationd.h index d6bb5347c5..f0872d9f56 100755 --- a/selfdrive/locationd/locationd.h +++ b/selfdrive/locationd/locationd.h @@ -3,6 +3,7 @@ #include #include #include +#include #include #include "cereal/messaging/messaging.h" @@ -32,8 +33,12 @@ public: void finite_check(double current_time = NAN); void time_check(double current_time = NAN); void update_reset_tracker(); - bool isGpsOK(); + bool is_gps_ok(); + bool critical_services_valid(std::map critical_services); + bool is_timestamp_valid(double current_time); void determine_gps_mode(double current_time); + bool are_inputs_ok(); + void observation_timings_invalid_reset(); kj::ArrayPtr get_message_bytes(MessageBuilder& msg_builder, bool inputsOK, bool sensorsOK, bool gpsOK, bool msgValid); @@ -73,4 +78,6 @@ private: bool gps_mode = false; bool gps_valid = false; bool ublox_available = true; + bool observation_timings_invalid = false; + std::map observation_values_invalid; }; From 8e91ce1eb4f91c976570056fd8979a4afcf43a53 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Tue, 15 Nov 2022 11:09:19 +0800 Subject: [PATCH 124/184] Cabana: Move history logs to a tabbed widget (#26481) * tabwidget * cleanup * update state before show * cleanup * remove spacing * fix right panel stretch issue * fix missing } --- tools/cabana/detailwidget.cc | 55 +++++++++++++++++++++++------------- tools/cabana/detailwidget.h | 6 ++-- tools/cabana/historylog.cc | 4 +-- tools/cabana/mainwin.cc | 7 +++-- tools/cabana/signaledit.cc | 15 ---------- tools/cabana/signaledit.h | 6 ++-- 6 files changed, 47 insertions(+), 46 deletions(-) diff --git a/tools/cabana/detailwidget.cc b/tools/cabana/detailwidget.cc index 260c9dfec7..192d1fd66c 100644 --- a/tools/cabana/detailwidget.cc +++ b/tools/cabana/detailwidget.cc @@ -64,31 +64,35 @@ DetailWidget::DetailWidget(ChartsWidget *charts, QWidget *parent) : charts(chart frame_layout->addWidget(warning_widget); main_layout->addWidget(title_frame); - QWidget *container = new QWidget(this); - QVBoxLayout *container_layout = new QVBoxLayout(container); - container_layout->setSpacing(0); - container_layout->setContentsMargins(0, 0, 0, 0); - - scroll = new QScrollArea(this); - scroll->setWidget(container); - scroll->setWidgetResizable(true); - scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - main_layout->addWidget(scroll); - + // msg widget + QWidget *msg_widget = new QWidget(this); + QVBoxLayout *msg_layout = new QVBoxLayout(msg_widget); + msg_layout->setContentsMargins(0, 0, 0, 0); // binary view binary_view = new BinaryView(this); - container_layout->addWidget(binary_view); - + msg_layout->addWidget(binary_view); // signals signals_layout = new QVBoxLayout(); - container_layout->addLayout(signals_layout); + signals_layout->setSpacing(0); + msg_layout->addLayout(signals_layout); + msg_layout->addStretch(0); + + scroll = new QScrollArea(this); + scroll->setFrameShape(QFrame::NoFrame); + scroll->setWidget(msg_widget); + scroll->setWidgetResizable(true); + scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - // history log + tab_widget = new QTabWidget(this); + tab_widget->setTabPosition(QTabWidget::South); + tab_widget->addTab(scroll, "Msg"); history_log = new HistoryLog(this); - container_layout->addWidget(history_log); + tab_widget->addTab(history_log, "Logs"); + main_layout->addWidget(tab_widget); QObject::connect(binary_view, &BinaryView::resizeSignal, this, &DetailWidget::resizeSignal); QObject::connect(binary_view, &BinaryView::addSignal, this, &DetailWidget::addSignal); + QObject::connect(tab_widget, &QTabWidget::currentChanged, [this]() { updateState(); }); QObject::connect(can, &CANMessages::msgsReceived, this, &DetailWidget::updateState); QObject::connect(dbc(), &DBCManager::DBCFileChanged, [this]() { dbcMsgChanged(); }); QObject::connect(tabbar, &QTabBar::customContextMenuRequested, this, &DetailWidget::showTabBarContextMenu); @@ -151,6 +155,7 @@ void DetailWidget::dbcMsgChanged(int show_form_idx) { form = new SignalEdit(i); QObject::connect(form, &SignalEdit::remove, this, &DetailWidget::removeSignal); QObject::connect(form, &SignalEdit::save, this, &DetailWidget::saveSignal); + QObject::connect(form, &SignalEdit::showFormClicked, this, &DetailWidget::showFormClicked); QObject::connect(form, &SignalEdit::highlight, binary_view, &BinaryView::highlight); QObject::connect(binary_view, &BinaryView::signalHovered, form, &SignalEdit::signalHovered); QObject::connect(form, &SignalEdit::showChart, charts, &ChartsWidget::showChart); @@ -176,16 +181,26 @@ void DetailWidget::dbcMsgChanged(int show_form_idx) { warning_label->setText(warnings.join('\n')); warning_widget->setVisible(!warnings.isEmpty()); - QTimer::singleShot(1, [this]() { setUpdatesEnabled(true); }); + setUpdatesEnabled(true); } void DetailWidget::updateState(const QHash * msgs) { time_label->setText(QString::number(can->currentSec(), 'f', 3)); - if (!msgs->contains(msg_id)) + if (msg_id.isEmpty() || (msgs && !msgs->contains(msg_id))) return; - binary_view->updateState(); - history_log->updateState(); + if (tab_widget->currentIndex() == 0) + binary_view->updateState(); + else + history_log->updateState(); +} + +void DetailWidget::showFormClicked() { + auto s = qobject_cast(sender()); + setUpdatesEnabled(false); + for (auto f : signal_list) + f->updateForm(f == s && !f->isFormVisible()); + setUpdatesEnabled(true); } void DetailWidget::updateChartState(const QString &id, const Signal *sig, bool opened) { diff --git a/tools/cabana/detailwidget.h b/tools/cabana/detailwidget.h index 5fc6d122fe..4346d1c5d5 100644 --- a/tools/cabana/detailwidget.h +++ b/tools/cabana/detailwidget.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include @@ -28,6 +28,7 @@ public: QUndoStack *undo_stack = nullptr; private: + void showFormClicked(); void updateChartState(const QString &id, const Signal *sig, bool opened); void showTabBarContextMenu(const QPoint &pt); void addSignal(int start_bit, int size, bool little_endian); @@ -36,13 +37,14 @@ private: void removeSignal(const Signal *sig); void editMsg(); void removeMsg(); - void updateState(const QHash * msgs); + void updateState(const QHash * msgs = nullptr); QString msg_id; QLabel *name_label, *time_label, *warning_label; QWidget *warning_widget; QVBoxLayout *signals_layout; QTabBar *tabbar; + QTabWidget *tab_widget; QToolBar *toolbar; QAction *remove_msg_act; HistoryLog *history_log; diff --git a/tools/cabana/historylog.cc b/tools/cabana/historylog.cc index 28e344a46e..1b0898afbd 100644 --- a/tools/cabana/historylog.cc +++ b/tools/cabana/historylog.cc @@ -86,10 +86,8 @@ HistoryLog::HistoryLog(QWidget *parent) : QTableView(parent) { horizontalHeader()->setDefaultAlignment(Qt::AlignLeft | (Qt::Alignment)Qt::TextWordWrap); horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents); verticalHeader()->setVisible(false); - setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents); setFrameShape(QFrame::NoFrame); - setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); + setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); setStyleSheet("QTableView::item { border:0px; padding-left:5px; padding-right:5px; }"); } diff --git a/tools/cabana/mainwin.cc b/tools/cabana/mainwin.cc index 97d62cb4f4..f0419a2fb3 100644 --- a/tools/cabana/mainwin.cc +++ b/tools/cabana/mainwin.cc @@ -72,7 +72,7 @@ MainWindow::MainWindow() : QMainWindow() { video_widget = new VideoWidget(this); r_layout->addWidget(video_widget, 0, Qt::AlignTop); - r_layout->addWidget(charts_widget); + r_layout->addWidget(charts_widget, 1); main_layout->addWidget(right_container); setCentralWidget(central_widget); @@ -192,9 +192,10 @@ void MainWindow::saveDBCToFile() { if (!file_name.isEmpty()) { settings.last_dir = QFileInfo(file_name).absolutePath(); QFile file(file_name); - if (file.open(QIODevice::WriteOnly)) + if (file.open(QIODevice::WriteOnly)) { file.write(dbc()->generateDBC().toUtf8()); detail_widget->undo_stack->clear(); + } } } @@ -216,7 +217,7 @@ void MainWindow::updateDownloadProgress(uint64_t cur, uint64_t total, bool succe void MainWindow::dockCharts(bool dock) { if (dock && floating_window) { floating_window->removeEventFilter(charts_widget); - r_layout->addWidget(charts_widget); + r_layout->addWidget(charts_widget, 1); floating_window->deleteLater(); floating_window = nullptr; } else if (!dock && !floating_window) { diff --git a/tools/cabana/signaledit.cc b/tools/cabana/signaledit.cc index 8737154c16..eb22b78d5a 100644 --- a/tools/cabana/signaledit.cc +++ b/tools/cabana/signaledit.cc @@ -4,7 +4,6 @@ #include #include #include -#include #include #include @@ -189,26 +188,12 @@ void SignalEdit::updateForm(bool visible) { icon->setText(visible ? "▼ " : "> "); } -void SignalEdit::showFormClicked() { - parentWidget()->setUpdatesEnabled(false); - for (auto &edit : parentWidget()->findChildren()) - edit->updateForm(edit == this && !form->isVisible()); - QTimer::singleShot(1, [this]() { parentWidget()->setUpdatesEnabled(true); }); -} - void SignalEdit::signalHovered(const Signal *s) { auto bg_color = sig == s ? hoverColor(getColor(form_idx)) : QColor(getColor(form_idx)); auto color = sig == s ? "white" : "black"; color_label->setStyleSheet(QString("color:%1; background-color:%2").arg(color).arg(bg_color.name())); } -void SignalEdit::hideEvent(QHideEvent *event) { - msg_id = ""; - sig = nullptr; - updateForm(false); - QWidget::hideEvent(event); -} - void SignalEdit::enterEvent(QEvent *event) { emit highlight(sig); QWidget::enterEvent(event); diff --git a/tools/cabana/signaledit.h b/tools/cabana/signaledit.h index 335e49a869..da0b9758c7 100644 --- a/tools/cabana/signaledit.h +++ b/tools/cabana/signaledit.h @@ -34,6 +34,8 @@ public: void setSignal(const QString &msg_id, const Signal *sig); void setChartOpened(bool opened); void signalHovered(const Signal *sig); + void updateForm(bool show); + inline bool isFormVisible() const { return form->isVisible(); } const Signal *sig = nullptr; QString msg_id; @@ -42,14 +44,12 @@ signals: void showChart(const QString &name, const Signal *sig, bool show); void remove(const Signal *sig); void save(const Signal *sig, const Signal &new_sig); + void showFormClicked(); protected: - void hideEvent(QHideEvent *event) override; void enterEvent(QEvent *event) override; void leaveEvent(QEvent *event) override; void saveSignal(); - void updateForm(bool show); - void showFormClicked(); SignalForm *form = nullptr; ElidedLabel *title; From 2d766fee14e94011e261c8c557098a7223c87014 Mon Sep 17 00:00:00 2001 From: Jason Wen <47793918+sunnyhaibin@users.noreply.github.com> Date: Mon, 14 Nov 2022 22:46:29 -0500 Subject: [PATCH 125/184] HKG: Car Port for 2022 Kia Stinger (#26397) * HKG: Car Port for 2022 Kia Stinger * Substitute KIA STINGER GT2 2018 torque params * bump panda * Add test route * Update CARS.md * Not this checksum * Update test route * Update CARS.md * Harness C -> Harness K Co-authored-by: Adeeb Shihadeh --- RELEASES.md | 1 + docs/CARS.md | 3 ++- selfdrive/car/hyundai/carcontroller.py | 2 +- selfdrive/car/hyundai/hyundaican.py | 3 ++- selfdrive/car/hyundai/interface.py | 2 +- selfdrive/car/hyundai/values.py | 22 +++++++++++++++++++++- selfdrive/car/tests/routes.py | 1 + selfdrive/car/torque_data/substitute.yaml | 1 + 8 files changed, 30 insertions(+), 5 deletions(-) diff --git a/RELEASES.md b/RELEASES.md index bf89b667fa..d00ece4b73 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -30,6 +30,7 @@ Version 0.8.17 (2022-11-21) * Hyundai Santa Cruz 2021-22 support thanks to sunnyhaibin! * Kia Sportage 2023 support thanks to sunnyhaibin! * Kia Sportage Hybrid 2023 support thanks to sunnyhaibin! +* Kia Stinger 2022 support thanks to sunnyhaibin! Version 0.8.16 (2022-08-26) ======================== diff --git a/docs/CARS.md b/docs/CARS.md index b8a313386d..ca3a224586 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -4,7 +4,7 @@ A supported vehicle is one that just works when you install a comma three. All supported cars provide a better experience than any stock system. -# 214 Supported Cars +# 215 Supported Cars |Make|Model|Supported Package|ACC|No ACC accel below|No ALC below|Steering Torque|Resume from stop|Harness| |---|---|---|:---:|:---:|:---:|:---:|:---:|:---:| @@ -107,6 +107,7 @@ A supported vehicle is one that just works when you install a comma three. All s |Kia|Sportage 2023|Smart Cruise Control (SCC)|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai N| |Kia|Sportage Hybrid 2023|Smart Cruise Control (SCC)|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai N| |Kia|Stinger 2018-20|Smart Cruise Control (SCC)|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai C| +|Kia|Stinger 2022|All|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai K| |Kia|Telluride 2020-22|All|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai H| |Lexus|CT Hybrid 2017-18|Lexus Safety System+|openpilot available[2](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|Toyota| |Lexus|ES 2019-22|All|openpilot|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Toyota| diff --git a/selfdrive/car/hyundai/carcontroller.py b/selfdrive/car/hyundai/carcontroller.py index 2f944edc0f..1ab90878b8 100644 --- a/selfdrive/car/hyundai/carcontroller.py +++ b/selfdrive/car/hyundai/carcontroller.py @@ -175,7 +175,7 @@ class CarController: if self.frame % 5 == 0 and self.car_fingerprint in (CAR.SONATA, CAR.PALISADE, CAR.IONIQ, CAR.KIA_NIRO_EV, CAR.KIA_NIRO_HEV_2021, CAR.IONIQ_EV_2020, CAR.IONIQ_PHEV, CAR.KIA_CEED, CAR.KIA_SELTOS, CAR.KONA_EV, CAR.KONA_EV_2022, CAR.ELANTRA_2021, CAR.ELANTRA_HEV_2021, CAR.SONATA_HYBRID, CAR.KONA_HEV, CAR.SANTA_FE_2022, - CAR.KIA_K5_2021, CAR.IONIQ_HEV_2022, CAR.SANTA_FE_HEV_2022, CAR.GENESIS_G70_2020, CAR.SANTA_FE_PHEV_2022): + CAR.KIA_K5_2021, CAR.IONIQ_HEV_2022, CAR.SANTA_FE_HEV_2022, CAR.GENESIS_G70_2020, CAR.SANTA_FE_PHEV_2022, CAR.KIA_STINGER_2022): can_sends.append(hyundaican.create_lfahda_mfc(self.packer, CC.enabled)) # 5 Hz ACC options diff --git a/selfdrive/car/hyundai/hyundaican.py b/selfdrive/car/hyundai/hyundaican.py index dcb8430976..c2ffffbf22 100644 --- a/selfdrive/car/hyundai/hyundaican.py +++ b/selfdrive/car/hyundai/hyundaican.py @@ -20,7 +20,8 @@ def create_lkas11(packer, frame, car_fingerprint, apply_steer, steer_req, if car_fingerprint in (CAR.SONATA, CAR.PALISADE, CAR.KIA_NIRO_EV, CAR.KIA_NIRO_HEV_2021, CAR.SANTA_FE, CAR.IONIQ_EV_2020, CAR.IONIQ_PHEV, CAR.KIA_SELTOS, CAR.ELANTRA_2021, CAR.GENESIS_G70_2020, CAR.ELANTRA_HEV_2021, CAR.SONATA_HYBRID, CAR.KONA_EV, CAR.KONA_HEV, CAR.KONA_EV_2022, - CAR.SANTA_FE_2022, CAR.KIA_K5_2021, CAR.IONIQ_HEV_2022, CAR.SANTA_FE_HEV_2022, CAR.SANTA_FE_PHEV_2022): + CAR.SANTA_FE_2022, CAR.KIA_K5_2021, CAR.IONIQ_HEV_2022, CAR.SANTA_FE_HEV_2022, + CAR.SANTA_FE_PHEV_2022, CAR.KIA_STINGER_2022): values["CF_Lkas_LdwsActivemode"] = int(left_lane) + (int(right_lane) << 1) values["CF_Lkas_LdwsOpt_USM"] = 2 diff --git a/selfdrive/car/hyundai/interface.py b/selfdrive/car/hyundai/interface.py index 0306f7e104..0b5fd3bb39 100644 --- a/selfdrive/car/hyundai/interface.py +++ b/selfdrive/car/hyundai/interface.py @@ -158,7 +158,7 @@ class CarInterface(CarInterfaceBase): tire_stiffness_factor = 0.5 if candidate == CAR.KIA_OPTIMA_G4: ret.minSteerSpeed = 32 * CV.MPH_TO_MS - elif candidate == CAR.KIA_STINGER: + elif candidate in (CAR.KIA_STINGER, CAR.KIA_STINGER_2022): ret.mass = 1825. + STD_CARGO_KG ret.wheelbase = 2.78 ret.steerRatio = 14.4 * 1.15 # 15% higher at the center seems reasonable diff --git a/selfdrive/car/hyundai/values.py b/selfdrive/car/hyundai/values.py index 1dba3a5442..ecba7b7494 100644 --- a/selfdrive/car/hyundai/values.py +++ b/selfdrive/car/hyundai/values.py @@ -95,6 +95,7 @@ class CAR: KIA_SORENTO = "KIA SORENTO GT LINE 2018" KIA_SPORTAGE_HYBRID_5TH_GEN = "KIA SPORTAGE HYBRID 5TH GEN" KIA_STINGER = "KIA STINGER GT2 2018" + KIA_STINGER_2022 = "KIA STINGER 2022" KIA_CEED = "KIA CEED INTRO ED 2019" KIA_EV6 = "KIA EV6 2022" @@ -181,6 +182,7 @@ CAR_INFO: Dict[str, Optional[Union[HyundaiCarInfo, List[HyundaiCarInfo]]]] = { ], CAR.KIA_SPORTAGE_HYBRID_5TH_GEN: HyundaiCarInfo("Kia Sportage Hybrid 2023", harness=Harness.hyundai_n), CAR.KIA_STINGER: HyundaiCarInfo("Kia Stinger 2018-20", video_link="https://www.youtube.com/watch?v=MJ94qoofYw0", harness=Harness.hyundai_c), + CAR.KIA_STINGER_2022: HyundaiCarInfo("Kia Stinger 2022", "All", harness=Harness.hyundai_k), CAR.KIA_CEED: HyundaiCarInfo("Kia Ceed 2019", harness=Harness.hyundai_e), CAR.KIA_EV6: [ HyundaiCarInfo("Kia EV6 (without HDA II) 2022", "Highway Driving Assist", harness=Harness.hyundai_l), @@ -790,6 +792,23 @@ FW_VERSIONS = { b'\xf1\x00bcsh8p54 E21\x00\x00\x00\x00\x00\x00\x00SCK0T33NB0\x88\xa2\xe6\xf0', ], }, + CAR.KIA_STINGER_2022: { + (Ecu.fwdRadar, 0x7d0, None): [ + b'\xf1\x00CK__ SCC F-CUP 1.00 1.00 99110-J5500 ', + ], + (Ecu.engine, 0x7e0, None): [ + b'\xf1\x81640R0051\x00\x00\x00\x00\x00\x00\x00\x00', + ], + (Ecu.eps, 0x7d4, None): [ + b'\xf1\x00CK MDPS R 1.00 5.03 57700-J5380 4C2VR503', + ], + (Ecu.fwdCamera, 0x7c4, None): [ + b'\xf1\x00CK MFC AT AUS RHD 1.00 1.00 99211-J5500 210622', + ], + (Ecu.transmission, 0x7e1, None): [ + b'\xf1\x87VCNLF11383972DK1vffV\x99\x99\x89\x98\x86eUU\x88wg\x89vfff\x97fff\x99\x87o\xff"\xc1\xf1\x81E30\x00\x00\x00\x00\x00\x00\x00\xf1\x00bcsh8p54 E30\x00\x00\x00\x00\x00\x00\x00SCK0T33GH0\xbe`\xfb\xc6', + ], + }, CAR.PALISADE: { (Ecu.fwdRadar, 0x7d0, None): [ b'\xf1\x00LX2_ SCC F-CUP 1.00 1.04 99110-S8100 ', @@ -1451,7 +1470,7 @@ FEATURES = { "use_elect_gears": {CAR.KIA_NIRO_EV, CAR.KIA_NIRO_PHEV, CAR.KIA_NIRO_HEV_2021, CAR.KIA_OPTIMA_H, CAR.IONIQ_EV_LTD, CAR.KONA_EV, CAR.IONIQ, CAR.IONIQ_EV_2020, CAR.IONIQ_PHEV, CAR.ELANTRA_HEV_2021, CAR.SONATA_HYBRID, CAR.KONA_HEV, CAR.IONIQ_HEV_2022, CAR.SANTA_FE_HEV_2022, CAR.SANTA_FE_PHEV_2022, CAR.IONIQ_PHEV_2019, CAR.KONA_EV_2022}, # these cars use the FCA11 message for the AEB and FCW signals, all others use SCC12 - "use_fca": {CAR.SONATA, CAR.SONATA_HYBRID, CAR.ELANTRA, CAR.ELANTRA_2021, CAR.ELANTRA_HEV_2021, CAR.KIA_STINGER, CAR.IONIQ_EV_2020, CAR.IONIQ_PHEV, CAR.KONA_EV, CAR.KIA_FORTE, CAR.KIA_NIRO_EV, CAR.PALISADE, CAR.GENESIS_G70, CAR.GENESIS_G70_2020, CAR.KONA, CAR.SANTA_FE, CAR.KIA_SELTOS, CAR.KONA_HEV, CAR.SANTA_FE_2022, CAR.KIA_K5_2021, CAR.IONIQ_HEV_2022, CAR.SANTA_FE_HEV_2022, CAR.SANTA_FE_PHEV_2022, CAR.TUCSON, CAR.KONA_EV_2022}, + "use_fca": {CAR.SONATA, CAR.SONATA_HYBRID, CAR.ELANTRA, CAR.ELANTRA_2021, CAR.ELANTRA_HEV_2021, CAR.KIA_STINGER, CAR.IONIQ_EV_2020, CAR.IONIQ_PHEV, CAR.KONA_EV, CAR.KIA_FORTE, CAR.KIA_NIRO_EV, CAR.PALISADE, CAR.GENESIS_G70, CAR.GENESIS_G70_2020, CAR.KONA, CAR.SANTA_FE, CAR.KIA_SELTOS, CAR.KONA_HEV, CAR.SANTA_FE_2022, CAR.KIA_K5_2021, CAR.IONIQ_HEV_2022, CAR.SANTA_FE_HEV_2022, CAR.SANTA_FE_PHEV_2022, CAR.TUCSON, CAR.KONA_EV_2022, CAR.KIA_STINGER_2022}, } CANFD_CAR = {CAR.KIA_EV6, CAR.IONIQ_5, CAR.TUCSON_HYBRID_4TH_GEN, CAR.KIA_SPORTAGE_HYBRID_5TH_GEN, CAR.SANTA_CRUZ_1ST_GEN, CAR.KIA_SPORTAGE_5TH_GEN, CAR.GENESIS_GV70_1ST_GEN} @@ -1496,6 +1515,7 @@ DBC = { CAR.KIA_SELTOS: dbc_dict('hyundai_kia_generic', None), CAR.KIA_SORENTO: dbc_dict('hyundai_kia_generic', None), # Has 0x5XX messages, but different format CAR.KIA_STINGER: dbc_dict('hyundai_kia_generic', None), + CAR.KIA_STINGER_2022: dbc_dict('hyundai_kia_generic', None), CAR.KONA: dbc_dict('hyundai_kia_generic', None), CAR.KONA_EV: dbc_dict('hyundai_kia_generic', None), CAR.KONA_EV_2022: dbc_dict('hyundai_kia_generic', None), diff --git a/selfdrive/car/tests/routes.py b/selfdrive/car/tests/routes.py index d0051454a6..cd61528439 100644 --- a/selfdrive/car/tests/routes.py +++ b/selfdrive/car/tests/routes.py @@ -111,6 +111,7 @@ routes = [ CarTestRoute("ff973b941a69366f|2022-07-28--22-01-19", HYUNDAI.KONA_EV_2022, segment=11), CarTestRoute("49f3c13141b6bc87|2021-07-28--08-05-13", HYUNDAI.KONA_HEV), CarTestRoute("5dddcbca6eb66c62|2020-07-26--13-24-19", HYUNDAI.KIA_STINGER), + CarTestRoute("5b50b883a4259afb|2022-11-09--15-00-42", HYUNDAI.KIA_STINGER_2022), CarTestRoute("d624b3d19adce635|2020-08-01--14-59-12", HYUNDAI.VELOSTER), CarTestRoute("d545129f3ca90f28|2022-10-19--09-22-54", HYUNDAI.KIA_EV6), # HDA2 CarTestRoute("68d6a96e703c00c9|2022-09-10--16-09-39", HYUNDAI.KIA_EV6), # HDA1 diff --git a/selfdrive/car/torque_data/substitute.yaml b/selfdrive/car/torque_data/substitute.yaml index c043c9d455..77236e393e 100644 --- a/selfdrive/car/torque_data/substitute.yaml +++ b/selfdrive/car/torque_data/substitute.yaml @@ -37,6 +37,7 @@ HYUNDAI ELANTRA 2017: HYUNDAI SONATA 2019 HYUNDAI ELANTRA HYBRID 2021: HYUNDAI SONATA 2020 HYUNDAI TUCSON 2019: HYUNDAI SANTA FE 2019 HYUNDAI SANTA FE 2022: HYUNDAI SANTA FE HYBRID 2022 +KIA STINGER 2022: KIA STINGER GT2 2018 GENESIS G90 2017: GENESIS G70 2018 GENESIS G80 2017: GENESIS G70 2018 GENESIS G70 2020: HYUNDAI SONATA 2020 From 7fcafa402239c30d8344c46608ade6a8fd4831f4 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 14 Nov 2022 23:28:43 -0800 Subject: [PATCH 126/184] ui: stretch abstract control title (#26499) stretch toggle title so it's easier to expand --- selfdrive/ui/qt/widgets/controls.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfdrive/ui/qt/widgets/controls.cc b/selfdrive/ui/qt/widgets/controls.cc index d3b77935df..619fd3cb4c 100644 --- a/selfdrive/ui/qt/widgets/controls.cc +++ b/selfdrive/ui/qt/widgets/controls.cc @@ -38,7 +38,7 @@ AbstractControl::AbstractControl(const QString &title, const QString &desc, cons title_label = new QPushButton(title); title_label->setFixedHeight(120); title_label->setStyleSheet("font-size: 50px; font-weight: 400; text-align: left"); - hlayout->addWidget(title_label); + hlayout->addWidget(title_label, 1); // value next to control button value = new ElidedLabel(); From ffa32df062fe3cf241e887e7afbc582118bd1e36 Mon Sep 17 00:00:00 2001 From: ambientocclusion <1399123+ambientocclusion@users.noreply.github.com> Date: Tue, 15 Nov 2022 00:04:20 -0800 Subject: [PATCH 127/184] Multilang: add missing Japanese translations (#26482) Add new Japanese translations --- selfdrive/ui/translations/main_ja.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/selfdrive/ui/translations/main_ja.ts b/selfdrive/ui/translations/main_ja.ts index 87c60516fc..339826796b 100644 --- a/selfdrive/ui/translations/main_ja.ts +++ b/selfdrive/ui/translations/main_ja.ts @@ -60,11 +60,11 @@ Cellular Metered - + 従量制通信設定 Prevent large data uploads when on a metered connection - + 大量のデータのアップロードを防止します。 @@ -240,11 +240,11 @@ Reset - + リセット Review - + 確認 @@ -864,7 +864,7 @@ location set Uninstall - + アンインストール @@ -1004,19 +1004,19 @@ location set Experimental Mode - + 実験モード openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. - + openpilotは標準ではゆっくりとくつろげる運転を提供します。この実験モードを有効にすると、以下のくつろげる段階ではない開発中の機能を利用する事ができます。 <br> <h4>🌮 エンドツーエンドアクセル制御 🌮</h4> エンジンとブレーキの制御を全てopenpilotの運転モデルに委ねます。openpilotは人間が運転するのと同じように考え、赤信号や停止サインで車を停止します。openpilotが運転速度も決めるので、あなたが設定する速度は上限速度になります。 openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. - + openpilotは、この車に搭載されているアクセル制御(ACC)を標準で利用します。openpilotによるアクセル制御を利用したい場合は、この設定を有効にしてください。 WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB). - + 警告: この車種でのopenpilotによるアクセル制御は実験段階であり、衝突被害軽減ブレーキ(AEB)を無効化します。 @@ -1074,7 +1074,7 @@ location set Forget - + 削除 From d7f943e27524744f20b008a55ad3358fc9272034 Mon Sep 17 00:00:00 2001 From: Oxygen Date: Tue, 15 Nov 2022 16:23:37 +0800 Subject: [PATCH 128/184] Update missing items in main_zh-CHS.ts (#26492) Update missing iterms in main_zh-CHS.ts Co-authored-by: Shane Smiskol --- selfdrive/ui/translations/main_zh-CHS.ts | 50 ++++++++++++------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/selfdrive/ui/translations/main_zh-CHS.ts b/selfdrive/ui/translations/main_zh-CHS.ts index 558a6cec4f..64b32c80d5 100644 --- a/selfdrive/ui/translations/main_zh-CHS.ts +++ b/selfdrive/ui/translations/main_zh-CHS.ts @@ -60,11 +60,11 @@ Cellular Metered - + 按流量计费的手机移动网络 Prevent large data uploads when on a metered connection - + 当使用按流量计费的连接时，避免上传大流量数据 @@ -140,7 +140,7 @@ Preview the driver facing camera to ensure that driver monitoring has good visibility. (vehicle must be off) - 打开并预览驾驶员摄像头，以确保驾驶员监控具有良好视野。仅熄火时可用。 + 打开并预览驾驶员摄像头，以确保驾驶员监控具有良好视野。（仅熄火时可用） Reset Calibration @@ -204,7 +204,7 @@ Your device is pointed %1° %2 and %3° %4. - 您的设备校准为%1° %2、%3° %4。 + 您的设备校准为%1° %2、%3° %4。 down @@ -240,11 +240,11 @@ Reset - + 重置 Review - + 预览 @@ -814,35 +814,35 @@ location set SoftwarePanel Updates are only downloaded while the car is off. - + 车辆熄火时才能下载升级文件。 Current Version - + 当前版本 Download - + 下载 Install Update - + 安装更新 INSTALL - + 安装 Target Branch - + 目标分支 SELECT - + 选择 Select a branch - + 选择分支 UNINSTALL @@ -862,7 +862,7 @@ location set Uninstall - + 卸载 @@ -966,15 +966,15 @@ location set Experimental openpilot Longitudinal Control - + 试验性的openpilot纵向控制 openpilot longitudinal control is not currently available for this car. - + 目前此车辆无法使用openpilot纵向控制功能。 Enable experimental longitudinal control to enable this. - + 启用试验性的纵向控制功能。 Disengage on Accelerator Pedal @@ -1002,19 +1002,19 @@ location set Experimental Mode - + 测试模式 openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. - + openpilot 默认 <b>轻松模式</b>驾驶车辆。 试验模式启用一些轻松模式之外的 <b>试验性功能</b>。 试验性功能包括： <br> <h4>🌮 端到端（End-to-End） 纵向控制 🌮</h4> 允许智能驾驶模型控制加速和制动。 openpilot 将模仿人类驾驶行为, 包括在遇到红灯和停车让行标识时停车。 鉴于智能驾驶模型判断实际行驶车速，设定速度仅为车速上限。 openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. - + openpilot默认使用此车辆自带ACC，而非openpilot纵向控制功能。启用此按钮将切换到openpilot纵向控制功能。 WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB). - + 警告： 此车辆的openpilot纵向控制是试验性功能，且将禁用AEB自动刹车功能。 @@ -1064,15 +1064,15 @@ location set FORGET - 忘记 + 忽略 Forget Wi-Fi Network "%1"? - 忘记WiFi网络 "%1"? + 忽略WiFi网络 "%1"? Forget - + 忽略 From e58f6fbc11424e8059d6a86a4f0990f604c3a22f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Sch=C3=A4fer?= Date: Tue, 15 Nov 2022 00:46:47 -0800 Subject: [PATCH 129/184] Rate limit honda steer (#26500) * Rate limit honda steer * Update ref_commit --- selfdrive/car/honda/carcontroller.py | 14 +++++++++++++- selfdrive/test/process_replay/ref_commit | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/selfdrive/car/honda/carcontroller.py b/selfdrive/car/honda/carcontroller.py index 5fa475fe08..ba1f13fb4e 100644 --- a/selfdrive/car/honda/carcontroller.py +++ b/selfdrive/car/honda/carcontroller.py @@ -99,6 +99,12 @@ HUDData = namedtuple("HUDData", "lanes_visible", "fcw", "acc_alert", "steer_required"]) +def rate_limit_steer(new_steer, last_steer): + # TODO just hardcoded ramp to min/max in 0.2s for all Honda + MAX_DELTA = 5 * DT_CTRL + return clip(new_steer, last_steer - MAX_DELTA, last_steer + MAX_DELTA) + + class CarController: def __init__(self, dbc_name, CP, VM): self.CP = CP @@ -116,6 +122,7 @@ class CarController: self.speed = 0.0 self.gas = 0.0 self.brake = 0.0 + self.last_steer = 0.0 def update(self, CC, CS): actuators = CC.actuators @@ -130,6 +137,10 @@ class CarController: accel = 0.0 gas, brake = 0.0, 0.0 + # *** rate limit steer *** + limited_steer = rate_limit_steer(actuators.steer, self.last_steer) + self.last_steer = limited_steer + # *** apply brake hysteresis *** pre_limit_brake, self.braking, self.brake_steady = actuator_hysteresis(brake, self.braking, self.brake_steady, CS.out.vEgo, self.CP.carFingerprint) @@ -143,7 +154,7 @@ class CarController: # **** process the car messages **** # steer torque is converted back to CAN reference (positive when steering right) - apply_steer = int(interp(-actuators.steer * self.params.STEER_MAX, + apply_steer = int(interp(-limited_steer * self.params.STEER_MAX, self.params.STEER_LOOKUP_BP, self.params.STEER_LOOKUP_V)) # Send CAN commands @@ -250,6 +261,7 @@ class CarController: new_actuators.accel = self.accel new_actuators.gas = self.gas new_actuators.brake = self.brake + new_actuators.steer = self.last_steer self.frame += 1 return new_actuators, can_sends diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index f35e23d45f..a8053936d7 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -aa2d370836588fd80b648dbed8d156765ec804d5 +324408a87f49413da864616cb409537ce7d8beb2 From 844f7692d48c5b2b2b6f8bc90070d9fc83ef7171 Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Tue, 15 Nov 2022 19:44:25 +0100 Subject: [PATCH 130/184] loggerd: add missing utility include (#26502) --- selfdrive/loggerd/loggerd.h | 1 + selfdrive/loggerd/tests/test_logger.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/selfdrive/loggerd/loggerd.h b/selfdrive/loggerd/loggerd.h index 6eafbe08d0..1fa6349828 100644 --- a/selfdrive/loggerd/loggerd.h +++ b/selfdrive/loggerd/loggerd.h @@ -10,6 +10,7 @@ #include #include #include +#include #include "cereal/messaging/messaging.h" #include "cereal/services.h" diff --git a/selfdrive/loggerd/tests/test_logger.cc b/selfdrive/loggerd/tests/test_logger.cc index 18a0e57df7..ba7835d632 100644 --- a/selfdrive/loggerd/tests/test_logger.cc +++ b/selfdrive/loggerd/tests/test_logger.cc @@ -4,6 +4,7 @@ #include #include #include +#include #include "catch2/catch.hpp" #include "cereal/messaging/messaging.h" From bdc432d21824cc83627bb5d1abd5e99b4bc62fc3 Mon Sep 17 00:00:00 2001 From: Tim Wilson Date: Tue, 15 Nov 2022 11:55:43 -0700 Subject: [PATCH 131/184] Add video link for Volt (#26504) --- selfdrive/car/gm/values.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfdrive/car/gm/values.py b/selfdrive/car/gm/values.py index eace6b6aca..03392ba0f9 100644 --- a/selfdrive/car/gm/values.py +++ b/selfdrive/car/gm/values.py @@ -90,7 +90,7 @@ class GMCarInfo(CarInfo): CAR_INFO: Dict[str, Union[GMCarInfo, List[GMCarInfo]]] = { CAR.HOLDEN_ASTRA: GMCarInfo("Holden Astra 2017"), - CAR.VOLT: GMCarInfo("Chevrolet Volt 2017-18", min_enable_speed=0), + CAR.VOLT: GMCarInfo("Chevrolet Volt 2017-18", min_enable_speed=0, video_link="https://youtu.be/QeMCN_4TFfQ"), CAR.CADILLAC_ATS: GMCarInfo("Cadillac ATS Premium Performance 2018"), CAR.MALIBU: GMCarInfo("Chevrolet Malibu Premier 2017"), CAR.ACADIA: GMCarInfo("GMC Acadia 2018", video_link="https://www.youtube.com/watch?v=0ZN6DdsBUZo"), From a662af57c7de750df4f1650ee4079c56665b817e Mon Sep 17 00:00:00 2001 From: Cameron Clough Date: Tue, 15 Nov 2022 13:07:46 -0800 Subject: [PATCH 132/184] CI: use github.head_ref to group PR action runs (#26505) * CI: use github.head_ref to group PR action runs for push triggers, github.ref is set to the "branch or tag ref that was pushed" for pull_request triggers, it is set to the "pull request merge branch" (master?) github.head_ref is only set when the trigger is pull_request https://docs.github.com/en/actions/learn-github-actions/contexts#github-context * only check github.ref for push event --- .github/workflows/selfdrive_tests.yaml | 2 +- .github/workflows/tools_tests.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml index 598f2c592b..f2cc51285d 100644 --- a/.github/workflows/selfdrive_tests.yaml +++ b/.github/workflows/selfdrive_tests.yaml @@ -7,7 +7,7 @@ on: pull_request: concurrency: - group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/master' && github.ref || github.run_id }}-${{ github.event_name }} + group: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && github.run_id || github.head_ref || github.ref }}-${{ github.workflow }}-${{ github.event_name }} cancel-in-progress: true env: diff --git a/.github/workflows/tools_tests.yaml b/.github/workflows/tools_tests.yaml index 549a2f4195..94cc3c2580 100644 --- a/.github/workflows/tools_tests.yaml +++ b/.github/workflows/tools_tests.yaml @@ -7,7 +7,7 @@ on: pull_request: concurrency: - group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/master' && github.ref || github.run_id }}-${{ github.event_name }} + group: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && github.run_id || github.head_ref || github.ref }}-${{ github.workflow }}-${{ github.event_name }} cancel-in-progress: true env: From fbf3ef0895182ffab90ddda83fa485b02d5a76d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Sch=C3=A4fer?= Date: Tue, 15 Nov 2022 14:21:00 -0800 Subject: [PATCH 133/184] More Honda rate limit (#26509) * More Honda rate limit * Update ref_commit --- selfdrive/car/honda/carcontroller.py | 4 ++-- selfdrive/test/process_replay/ref_commit | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/selfdrive/car/honda/carcontroller.py b/selfdrive/car/honda/carcontroller.py index ba1f13fb4e..790dce1810 100644 --- a/selfdrive/car/honda/carcontroller.py +++ b/selfdrive/car/honda/carcontroller.py @@ -100,8 +100,8 @@ HUDData = namedtuple("HUDData", def rate_limit_steer(new_steer, last_steer): - # TODO just hardcoded ramp to min/max in 0.2s for all Honda - MAX_DELTA = 5 * DT_CTRL + # TODO just hardcoded ramp to min/max in 0.33s for all Honda + MAX_DELTA = 3 * DT_CTRL return clip(new_steer, last_steer - MAX_DELTA, last_steer + MAX_DELTA) diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index a8053936d7..4aa9d60ab5 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -324408a87f49413da864616cb409537ce7d8beb2 +959e63af52d9efdb62156cab4b773f88b154fd75 From 9c5df76a6c8784af3bec64827a2dbab464d8ce39 Mon Sep 17 00:00:00 2001 From: hoomoose <94947902+hoomoose@users.noreply.github.com> Date: Tue, 15 Nov 2022 17:19:30 -0700 Subject: [PATCH 134/184] Hyundai: longitudinal support for all CAN-FD EV and Hybrids (#26345) * Update values.py * Update interface.py * Update interface.py * Update carcontroller.py * Update interface.py * Update interface.py * Update values.py * Update values.py * Update interface.py * Update values.py * Update interface.py * Update carcontroller.py * cleanup * update docs * bump panda Co-authored-by: Adeeb Shihadeh --- docs/CARS.md | 12 ++++++------ panda | 2 +- selfdrive/car/hyundai/carcontroller.py | 5 +++-- selfdrive/car/hyundai/interface.py | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/docs/CARS.md b/docs/CARS.md index ca3a224586..59b8145556 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -60,8 +60,8 @@ A supported vehicle is one that just works when you install a comma three. All s |Hyundai|Elantra Hybrid 2021-23|Smart Cruise Control (SCC)|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai K| |Hyundai|Genesis 2015-16|Smart Cruise Control (SCC)|Stock|19 mph|37 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai J| |Hyundai|i30 2019|Smart Cruise Control (SCC)|Stock|0 mph|32 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai E| -|Hyundai|Ioniq 5 (with HDA II) 2022-23|Highway Driving Assist II|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai Q| -|Hyundai|Ioniq 5 (without HDA II) 2022-23|Highway Driving Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai K| +|Hyundai|Ioniq 5 (with HDA II) 2022-23|Highway Driving Assist II|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai Q| +|Hyundai|Ioniq 5 (without HDA II) 2022-23|Highway Driving Assist|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai K| |Hyundai|Ioniq Electric 2019|Smart Cruise Control (SCC)|Stock|0 mph|32 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai C| |Hyundai|Ioniq Electric 2020|All|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai H| |Hyundai|Ioniq Hybrid 2017-19|Smart Cruise Control (SCC)|Stock|0 mph|32 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai C| @@ -83,13 +83,13 @@ A supported vehicle is one that just works when you install a comma three. All s |Hyundai|Sonata Hybrid 2020-22|All|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai A| |Hyundai|Tucson 2021|Smart Cruise Control (SCC)|openpilot available[1](#footnotes)|19 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai L| |Hyundai|Tucson Diesel 2019|Smart Cruise Control (SCC)|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai L| -|Hyundai|Tucson Hybrid 2022|All|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai N| +|Hyundai|Tucson Hybrid 2022|All|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai N| |Hyundai|Veloster 2019-20|Smart Cruise Control (SCC)|Stock|5 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai E| |Jeep|Grand Cherokee 2016-18|Adaptive Cruise Control (ACC)|Stock|0 mph|9 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|FCA| |Jeep|Grand Cherokee 2019-21|Adaptive Cruise Control (ACC)|Stock|0 mph|39 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|FCA| |Kia|Ceed 2019|Smart Cruise Control (SCC)|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai E| -|Kia|EV6 (with HDA II) 2022|Highway Driving Assist II|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai P| -|Kia|EV6 (without HDA II) 2022|Highway Driving Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai L| +|Kia|EV6 (with HDA II) 2022|Highway Driving Assist II|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai P| +|Kia|EV6 (without HDA II) 2022|Highway Driving Assist|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai L| |Kia|Forte 2019-21|Smart Cruise Control (SCC)|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai G| |Kia|K5 2021-22|Smart Cruise Control (SCC)|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai A| |Kia|Niro EV 2019|All|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai H| @@ -105,7 +105,7 @@ A supported vehicle is one that just works when you install a comma three. All s |Kia|Sorento 2018|Advanced Smart Cruise Control|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai C| |Kia|Sorento 2019|Smart Cruise Control (SCC)|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai E| |Kia|Sportage 2023|Smart Cruise Control (SCC)|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai N| -|Kia|Sportage Hybrid 2023|Smart Cruise Control (SCC)|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai N| +|Kia|Sportage Hybrid 2023|Smart Cruise Control (SCC)|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai N| |Kia|Stinger 2018-20|Smart Cruise Control (SCC)|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai C| |Kia|Stinger 2022|All|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai K| |Kia|Telluride 2020-22|All|openpilot available[1](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|Hyundai H| diff --git a/panda b/panda index c0632cd32b..5dc5cd8e20 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit c0632cd32b78279dfbb3ce28c7a10ded8090d40f +Subproject commit 5dc5cd8e20668dfb15d35b175fccbfd3f7b63b09 diff --git a/selfdrive/car/hyundai/carcontroller.py b/selfdrive/car/hyundai/carcontroller.py index 1ab90878b8..e5fdbfd57a 100644 --- a/selfdrive/car/hyundai/carcontroller.py +++ b/selfdrive/car/hyundai/carcontroller.py @@ -85,7 +85,7 @@ class CarController: # *** common hyundai stuff *** # tester present - w/ no response (keeps relevant ECU disabled) - if self.frame % 100 == 0 and self.CP.openpilotLongitudinalControl: + if self.frame % 100 == 0 and not (self.CP.flags & HyundaiFlags.CANFD_CAMERA_SCC.value) and self.CP.openpilotLongitudinalControl: addr, bus = 0x7d0, 0 if self.CP.flags & HyundaiFlags.CANFD_HDA2.value: addr, bus = 0x730, 5 @@ -122,7 +122,8 @@ class CarController: can_sends.append(hyundaicanfd.create_lfahda_cluster(self.packer, self.CP, CC.enabled)) if self.CP.openpilotLongitudinalControl: - can_sends.extend(hyundaicanfd.create_adrv_messages(self.packer, self.frame)) + if hda2: + can_sends.extend(hyundaicanfd.create_adrv_messages(self.packer, self.frame)) if self.frame % 2 == 0: can_sends.append(hyundaicanfd.create_acc_control(self.packer, self.CP, CC.enabled, self.accel_last, accel, stopping, CC.cruiseControl.override, set_speed_in_units)) diff --git a/selfdrive/car/hyundai/interface.py b/selfdrive/car/hyundai/interface.py index 0b5fd3bb39..8738aabd17 100644 --- a/selfdrive/car/hyundai/interface.py +++ b/selfdrive/car/hyundai/interface.py @@ -219,7 +219,7 @@ class CarInterface(CarInterfaceBase): if candidate in CANFD_CAR: ret.longitudinalTuning.kpV = [0.1] ret.longitudinalTuning.kiV = [0.0] - ret.experimentalLongitudinalAvailable = bool(ret.flags & HyundaiFlags.CANFD_HDA2) + ret.experimentalLongitudinalAvailable = candidate in (HYBRID_CAR | EV_CAR) and candidate not in CANFD_RADAR_SCC_CAR else: ret.longitudinalTuning.kpV = [0.5] ret.longitudinalTuning.kiV = [0.0] @@ -283,7 +283,7 @@ class CarInterface(CarInterfaceBase): @staticmethod def init(CP, logcan, sendcan): - if CP.openpilotLongitudinalControl: + if CP.openpilotLongitudinalControl and not (CP.flags & HyundaiFlags.CANFD_CAMERA_SCC.value): addr, bus = 0x7d0, 0 if CP.flags & HyundaiFlags.CANFD_HDA2.value: addr, bus = 0x730, 5 From 4eda53cef2adb949709166c2e5d204565376ce2e Mon Sep 17 00:00:00 2001 From: Kurt Nistelberger Date: Tue, 15 Nov 2022 16:41:27 -0800 Subject: [PATCH 135/184] add laikad comment --- selfdrive/locationd/laikad.py | 1 + 1 file changed, 1 insertion(+) diff --git a/selfdrive/locationd/laikad.py b/selfdrive/locationd/laikad.py index 2769f394c5..6936d88acc 100755 --- a/selfdrive/locationd/laikad.py +++ b/selfdrive/locationd/laikad.py @@ -187,6 +187,7 @@ class Laikad: "gpsTimeOfWeek": tow, "positionECEF": measurement_msg(value=ecef_pos.tolist(), std=pos_std.tolist(), valid=kf_valid), "velocityECEF": measurement_msg(value=ecef_vel.tolist(), std=vel_std.tolist(), valid=kf_valid), + # TODO std is incorrectly the dimension of the measurements and not 3D "positionFixECEF": measurement_msg(value=self.last_pos_fix, std=self.last_pos_residual, valid=self.last_pos_fix_t == t), "ubloxMonoTime": gnss_mono_time, "correctedMeasurements": meas_msgs From 2ad9a4f95a82bf922c86b373026c0e96f9971a80 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 15 Nov 2022 16:44:03 -0800 Subject: [PATCH 136/184] offroad ui: support storing confirmation of a toggle (#26510) * show confirmation toggle on first toggle of experimental mode * don't store confirmation if users toggle off *after* this PR * refactor * cleaner * not true * try here --- common/params.cc | 1 + selfdrive/ui/qt/offroad/settings.cc | 20 ++++++++------------ selfdrive/ui/qt/widgets/controls.h | 10 ++++++++-- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/common/params.cc b/common/params.cc index e17d1f1b13..9e3e32d584 100644 --- a/common/params.cc +++ b/common/params.cc @@ -103,6 +103,7 @@ std::unordered_map keys = { {"DisableLogging", CLEAR_ON_MANAGER_START | CLEAR_ON_IGNITION_ON}, {"DisablePowerDown", PERSISTENT}, {"ExperimentalMode", PERSISTENT}, + {"ExperimentalModeConfirmed", PERSISTENT}, {"ExperimentalLongitudinalEnabled", PERSISTENT}, // WARNING: THIS MAY DISABLE AEB {"DisableUpdates", PERSISTENT}, {"DisengageOnAccelerator", PERSISTENT}, diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index a03cf02010..ced0744692 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -28,20 +28,18 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) { // param, title, desc, icon, confirm - std::vector> toggle_defs{ + std::vector> toggle_defs{ { "OpenpilotEnabledToggle", tr("Enable openpilot"), tr("Use the openpilot system for adaptive cruise control and lane keep driver assistance. Your attention is required at all times to use this feature. Changing this setting takes effect when the car is powered off."), "../assets/offroad/icon_openpilot.png", - false, }, { "ExperimentalMode", tr("Experimental Mode"), "", "../assets/offroad/icon_road.png", - false, }, { "ExperimentalLongitudinalEnabled", @@ -50,35 +48,30 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) { .arg(tr("WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB).")) .arg(tr("openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control.")), "../assets/offroad/icon_speed_limit.png", - true, }, { "IsLdwEnabled", tr("Enable Lane Departure Warnings"), tr("Receive alerts to steer back into the lane when your vehicle drifts over a detected lane line without a turn signal activated while driving over 31 mph (50 km/h)."), "../assets/offroad/icon_warning.png", - false, }, { "IsMetric", tr("Use Metric System"), tr("Display speed in km/h instead of mph."), "../assets/offroad/icon_metric.png", - false, }, { "RecordFront", tr("Record and Upload Driver Camera"), tr("Upload data from the driver facing camera and help improve the driver monitoring algorithm."), "../assets/offroad/icon_monitoring.png", - false, }, { "DisengageOnAccelerator", tr("Disengage on Accelerator Pedal"), tr("When enabled, pressing the accelerator pedal will disengage openpilot."), "../assets/offroad/icon_disengage_on_accelerator.svg", - false, }, #ifdef ENABLE_MAPS { @@ -86,20 +79,18 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) { tr("Show ETA in 24h Format"), tr("Use 24h format instead of am/pm"), "../assets/offroad/icon_metric.png", - false, }, { "NavSettingLeftSide", tr("Show Map on Left Side of UI"), tr("Show map on left side when in split screen view."), "../assets/offroad/icon_road.png", - false, }, #endif }; - for (auto &[param, title, desc, icon, confirm] : toggle_defs) { - auto toggle = new ParamControl(param, title, desc, icon, confirm, this); + for (auto &[param, title, desc, icon] : toggle_defs) { + auto toggle = new ParamControl(param, title, desc, icon, false, this); bool locked = params.getBool((param + "Lock").toStdString()); toggle->setEnabled(!locked); @@ -108,6 +99,11 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) { toggles[param.toStdString()] = toggle; } + // Toggles with confirmation dialogs + toggles["ExperimentalMode"]->confirm = true; + toggles["ExperimentalMode"]->store_confirm = true; + toggles["ExperimentalLongitudinalEnabled"]->confirm = true; + connect(toggles["ExperimentalLongitudinalEnabled"], &ToggleControl::toggleFlipped, [=]() { updateToggles(); }); diff --git a/selfdrive/ui/qt/widgets/controls.h b/selfdrive/ui/qt/widgets/controls.h index b67224b33d..c639b7f481 100644 --- a/selfdrive/ui/qt/widgets/controls.h +++ b/selfdrive/ui/qt/widgets/controls.h @@ -139,13 +139,16 @@ class ParamControl : public ToggleControl { Q_OBJECT public: - ParamControl(const QString ¶m, const QString &title, const QString &desc, const QString &icon, const bool confirm, QWidget *parent = nullptr) : ToggleControl(title, desc, icon, false, parent) { + ParamControl(const QString ¶m, const QString &title, const QString &desc, const QString &icon, const bool _confirm, QWidget *parent = nullptr) : confirm(_confirm), ToggleControl(title, desc, icon, false, parent) { key = param.toStdString(); QObject::connect(this, &ParamControl::toggleFlipped, [=](bool state) { QString content("

" + title + "


" "

" + getDescription() + "

"); ConfirmationDialog dialog(content, tr("Enable"), tr("Cancel"), true, this); - if (!confirm || !state || dialog.exec()) { + + bool confirmed = store_confirm && params.getBool(key + "Confirmed"); + if (!confirm || confirmed || !state || dialog.exec()) { + if (store_confirm && state) params.putBool(key + "Confirmed", true); params.putBool(key, state); } else { toggle.togglePosition(); @@ -153,6 +156,9 @@ public: }); } + bool confirm = false; + bool store_confirm = false; + void refresh() { if (params.getBool(key) != toggle.on) { toggle.togglePosition(); From 9c96b21367af3dda9b193a821fe2e175a63f4176 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 15 Nov 2022 17:18:13 -0800 Subject: [PATCH 137/184] publish experimental mode state (#26512) * publish experimental mode state * remove that --- cereal | 2 +- selfdrive/controls/controlsd.py | 1 + selfdrive/ui/qt/onroad.cc | 8 +++++--- selfdrive/ui/ui.cc | 1 - selfdrive/ui/ui.h | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cereal b/cereal index afafa0a2a5..3bae09cf65 160000 --- a/cereal +++ b/cereal @@ -1 +1 @@ -Subproject commit afafa0a2a537d775842ab2e1bf20cb9a33b34f9a +Subproject commit 3bae09cf6527674d7eda3a9956242aad94a8f3d2 diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index f69e9e7fd1..a18bec83a8 100755 --- a/selfdrive/controls/controlsd.py +++ b/selfdrive/controls/controlsd.py @@ -777,6 +777,7 @@ class Controls: controlsState.startMonoTime = int(start_time * 1e9) controlsState.forceDecel = bool(force_decel) controlsState.canErrorCounter = self.can_rcv_timeout_counter + controlsState.experimentalMode = self.params.get_bool("ExperimentalMode") and self.CP.openpilotLongitudinalControl lat_tuning = self.CP.lateralTuning.which() if self.joystick_mode: diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc index 23986726c8..fcf29181e7 100644 --- a/selfdrive/ui/qt/onroad.cc +++ b/selfdrive/ui/qt/onroad.cc @@ -446,6 +446,8 @@ void AnnotatedCameraWidget::drawLaneLines(QPainter &painter, const UIState *s) { painter.save(); const UIScene &scene = s->scene; + SubMaster &sm = *(s->sm); + // lanelines for (int i = 0; i < std::size(scene.lane_line_vertices); ++i) { painter.setBrush(QColor::fromRgbF(1.0, 1.0, 1.0, std::clamp(scene.lane_line_probs[i], 0.0, 0.7))); @@ -461,8 +463,8 @@ void AnnotatedCameraWidget::drawLaneLines(QPainter &painter, const UIState *s) { // paint path QLinearGradient bg(0, height(), 0, height() / 4); float start_hue, end_hue; - if (scene.experimental_mode) { - const auto &acceleration = (*s->sm)["modelV2"].getModelV2().getAcceleration(); + if (sm["controlsState"].getControlsState().getExperimentalMode()) { + const auto &acceleration = sm["modelV2"].getModelV2().getAcceleration(); float acceleration_future = 0; if (acceleration.getZ().size() > 16) { acceleration_future = acceleration.getX()[16]; // 2.5 seconds @@ -555,7 +557,7 @@ void AnnotatedCameraWidget::paintGL() { } else if (v_ego > 15) { wide_cam_requested = false; } - wide_cam_requested = wide_cam_requested && s->scene.experimental_mode; + wide_cam_requested = wide_cam_requested && sm["controlsState"].getControlsState().getExperimentalMode(); // TODO: also detect when ecam vision stream isn't available // for replay of old routes, never go to widecam wide_cam_requested = wide_cam_requested && s->scene.calibration_wide_valid; diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index 970448359e..2d4533afe1 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -174,7 +174,6 @@ void ui_update_params(UIState *s) { auto params = Params(); s->scene.is_metric = params.getBool("IsMetric"); s->scene.map_on_left = params.getBool("NavSettingLeftSide"); - s->scene.experimental_mode = params.getBool("ExperimentalMode"); } void UIState::updateStatus() { diff --git a/selfdrive/ui/ui.h b/selfdrive/ui/ui.h index 38e2ffe3ce..d6f5c3e2e0 100644 --- a/selfdrive/ui/ui.h +++ b/selfdrive/ui/ui.h @@ -104,7 +104,7 @@ typedef struct UIScene { QPointF lead_vertices[2]; float light_sensor; - bool started, ignition, is_metric, map_on_left, longitudinal_control, experimental_mode; + bool started, ignition, is_metric, map_on_left, longitudinal_control; uint64_t started_frame; } UIScene; From d4fd0c3c8798317e4af87642af30ddbcd39fc4d6 Mon Sep 17 00:00:00 2001 From: Vivek Aithal Date: Tue, 15 Nov 2022 18:41:43 -0800 Subject: [PATCH 138/184] [torqued] Make torqued work on Hyundai Tucson (#26511) * changes to get offline values * set tucon values * move to params.yaml --- selfdrive/car/torque_data/override.yaml | 1 - selfdrive/car/torque_data/params.yaml | 1 + selfdrive/locationd/torqued.py | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/selfdrive/car/torque_data/override.yaml b/selfdrive/car/torque_data/override.yaml index 2ef5a1cd0f..c0b8592ee0 100644 --- a/selfdrive/car/torque_data/override.yaml +++ b/selfdrive/car/torque_data/override.yaml @@ -30,7 +30,6 @@ CHEVROLET SILVERADO 1500 2020: [1.9, 1.9, 0.112] CHEVROLET EQUINOX 2019: [2.0, 2.0, 0.05] VOLKSWAGEN PASSAT NMS: [2.5, 2.5, 0.1] VOLKSWAGEN SHARAN 2ND GEN: [2.5, 2.5, 0.1] -HYUNDAI TUCSON HYBRID 4TH GEN: [2.5, 2.5, 0.0] HYUNDAI SANTA CRUZ 1ST GEN: [2.7, 2.7, 0.0] KIA SPORTAGE 5TH GEN: [2.7, 2.7, 0.0] KIA SPORTAGE HYBRID 5TH GEN: [2.5, 2.5, 0.0] diff --git a/selfdrive/car/torque_data/params.yaml b/selfdrive/car/torque_data/params.yaml index c2ebadfc7a..a9023b4edc 100644 --- a/selfdrive/car/torque_data/params.yaml +++ b/selfdrive/car/torque_data/params.yaml @@ -38,6 +38,7 @@ HYUNDAI SANTA FE PlUG-IN HYBRID 2022: [1.6953050513611045, 1.5837614296206861, 0 HYUNDAI SONATA 2019: [2.2200457811703953, 1.2967330275895228, 0.14039920986586393] HYUNDAI SONATA 2020: [2.9638737459977467, 2.1259108157250735, 0.07813665616927593] HYUNDAI SONATA HYBRID 2021: [2.8990264092395734, 2.061410192222139, 0.0899805488717382] +HYUNDAI TUCSON HYBRID 4TH GEN: [2.035545, 2.035545, 0.110272] JEEP GRAND CHEROKEE 2019: [1.7321233388827006, 1.289689569171081, 0.15046331002097185] JEEP GRAND CHEROKEE V6 2018: [1.8776598027756923, 1.4057367824262523, 0.11725947414922003] KIA EV6 2022: [3.2, 3.0, 0.05] diff --git a/selfdrive/locationd/torqued.py b/selfdrive/locationd/torqued.py index 42dff60087..588bca1578 100755 --- a/selfdrive/locationd/torqued.py +++ b/selfdrive/locationd/torqued.py @@ -16,9 +16,9 @@ from selfdrive.controls.lib.vehicle_model import ACCELERATION_DUE_TO_GRAVITY HISTORY = 5 # secs POINTS_PER_BUCKET = 1500 MIN_POINTS_TOTAL = 4000 -MIN_POINTS_TOTAL_QLOG = 800 +MIN_POINTS_TOTAL_QLOG = 600 FIT_POINTS_TOTAL = 2000 -FIT_POINTS_TOTAL_QLOG = 800 +FIT_POINTS_TOTAL_QLOG = 600 MIN_VEL = 15 # m/s FRICTION_FACTOR = 1.5 # ~85% of data coverage FACTOR_SANITY = 0.3 From f3efc8998cee2750e65a99f96a6e9c787c17a19f Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 15 Nov 2022 18:25:16 -0800 Subject: [PATCH 139/184] taco time --- RELEASES.md | 17 ++++++++--------- common/version.h | 2 +- selfdrive/ui/qt/offroad/settings.cc | 11 ++++++++--- selfdrive/ui/translations/main_ja.ts | 12 ++++++------ selfdrive/ui/translations/main_ko.ts | 12 ++++++------ selfdrive/ui/translations/main_pt-BR.ts | 12 ++++++------ selfdrive/ui/translations/main_zh-CHS.ts | 12 ++++++------ selfdrive/ui/translations/main_zh-CHT.ts | 12 ++++++------ 8 files changed, 47 insertions(+), 43 deletions(-) diff --git a/RELEASES.md b/RELEASES.md index d00ece4b73..e15286c5f0 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,29 +1,28 @@ -Version 0.8.17 (2022-11-21) +Version 0.9.0 (2022-11-21) ======================== * New driving model - * Internal feature space information content increased tenfold during training (to ~700 bits), which makes the model dramatically more accurate + * Internal feature space information content increased tenfold during training to ~700 bits, which makes the model dramatically more accurate * Less reliance on previous frames makes model more reactive and snappy * Trained in new reprojective simulator - * Trained in 36hrs from scratch, compared to one week for previous releases + * Trained in 36 hours from scratch, compared to one week for previous releases * Training now simulates both lateral and longitudinal behavior, which allows openpilot to slow down for turns, stop at traffic lights, and more in experimental mode -* Driver monitoring updates - * New bigger model with added end-to-end distracted trigger - * Reduced false positives during driver calibration * Experimental driving mode * End-to-end longitudinal control * Stops for traffic lights and stop signs * Slows down for turns - * openpilot defaults to chill mode, enable experimental in settings + * openpilot defaults to chill mode, enable experimental mode in settings +* Driver monitoring updates + * New bigger model with added end-to-end distracted trigger + * Reduced false positives during driver calibration * Self-tuning torque controller: learns parameters live for each car * Torque controller used on all Toyota, Lexus, Hyundai, Kia, and Genesis models * UI updates - * Multi-language in navigation * Matched speeds shown on car's dash + * Multi-language in navigation * Improved update experience * Border turns grey while overriding steering * Bookmark events while driving; view them in comma connect * New onroad visualization for experimental mode -* AGNOS 6 * tools: new and improved cabana thanks to deanlee! * Experimental longitudinal support for Volkswagen, CAN-FD Hyundai, and new GM models * Genesis GV70 2022-23 support thanks to zunichky and sunnyhaibin! diff --git a/common/version.h b/common/version.h index 0a109c1faa..74a56a7c1b 100644 --- a/common/version.h +++ b/common/version.h @@ -1 +1 @@ -#define COMMA_VERSION "0.8.17" +#define COMMA_VERSION "0.9.0" diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index ced0744692..cf6f589b65 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -46,7 +46,7 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) { tr("Experimental openpilot Longitudinal Control"), QString("%1
%2") .arg(tr("WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB).")) - .arg(tr("openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control.")), + .arg(tr("On this car, openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control. Enable this to switch to openpilot longitudinal control. Enabling Experimental mode is recommended when using experimental openpilot longitudinal control.")), "../assets/offroad/icon_speed_limit.png", }, { @@ -119,10 +119,15 @@ void TogglesPanel::updateToggles() { const QString e2e_description = tr("\ openpilot defaults to driving in chill mode.\ Experimental mode enables alpha-level features that aren't ready for chill mode. \ - Experimental features are listed below:\ + Experimental features are listed below: \
\

🌮 End-to-End Longitudinal Control 🌮

\ - Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound."); + Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. \ + Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. \ +
\ +

New Driving Visualization

\ + The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner.\ + "); auto cp_bytes = params.get("CarParamsPersistent"); if (!cp_bytes.empty()) { diff --git a/selfdrive/ui/translations/main_ja.ts b/selfdrive/ui/translations/main_ja.ts index 339826796b..f7329811a6 100644 --- a/selfdrive/ui/translations/main_ja.ts +++ b/selfdrive/ui/translations/main_ja.ts @@ -1007,16 +1007,16 @@ location set 実験モード - openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. - openpilotは標準ではゆっくりとくつろげる運転を提供します。この実験モードを有効にすると、以下のくつろげる段階ではない開発中の機能を利用する事ができます。 <br> <h4>🌮 エンドツーエンドアクセル制御 🌮</h4> エンジンとブレーキの制御を全てopenpilotの運転モデルに委ねます。openpilotは人間が運転するのと同じように考え、赤信号や停止サインで車を停止します。openpilotが運転速度も決めるので、あなたが設定する速度は上限速度になります。 + WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB). + 警告: この車種でのopenpilotによるアクセル制御は実験段階であり、衝突被害軽減ブレーキ(AEB)を無効化します。 - openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. - openpilotは、この車に搭載されているアクセル制御(ACC)を標準で利用します。openpilotによるアクセル制御を利用したい場合は、この設定を有効にしてください。 + On this car, openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control. Enable this to switch to openpilot longitudinal control. Enabling Experimental mode is recommended when using experimental openpilot longitudinal control. + - WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB). - 警告: この車種でのopenpilotによるアクセル制御は実験段階であり、衝突被害軽減ブレーキ(AEB)を無効化します。 + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. <br> <h4>New Driving Visualization</h4> The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. + diff --git a/selfdrive/ui/translations/main_ko.ts b/selfdrive/ui/translations/main_ko.ts index 31c910a910..56d7dfd965 100644 --- a/selfdrive/ui/translations/main_ko.ts +++ b/selfdrive/ui/translations/main_ko.ts @@ -1007,16 +1007,16 @@ location set 실험적 모드 - openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. - openpilot은 기본적으로 <b>안정적 모드</b>로 주행합니다. 실험적 모드는 안정적 모드에 준비되지 않은 <b>알파 수준 기능</b>을 활성화 합니다. 실험 모드의 특징은 아래에 나열되어 있습니다 <br> <h4>🌮 E2E 롱컨트롤 🌮</h4> 주행모델이 가속과 감속을 제어하도록 합니다. openpilot은 신호등과 정지표지판을 보고 멈추는 것을 포함하여 운전자가 생각하는것처럼 주행합니다. 주행 모델이 주행할 속도를 결정하므로 설정된 속도는 상한선으로만 작용합니다. + WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB). + 경고: openpilot 롱컨트롤은 실험적인 기능으로 차량의 자동긴급제동(AEB)를 비활성화합니다. - openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. - openpilot은 차량의 내장 ACC로 기본 설정됩니다. 롱컨트롤으로 전환하려면 이 옵션을 활성화하세요. + On this car, openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control. Enable this to switch to openpilot longitudinal control. Enabling Experimental mode is recommended when using experimental openpilot longitudinal control. + - WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB). - 경고: openpilot 롱컨트롤은 실험적인 기능으로 차량의 자동긴급제동(AEB)를 비활성화합니다. + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. <br> <h4>New Driving Visualization</h4> The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. + diff --git a/selfdrive/ui/translations/main_pt-BR.ts b/selfdrive/ui/translations/main_pt-BR.ts index 6a1d32f87a..f68400a3c7 100644 --- a/selfdrive/ui/translations/main_pt-BR.ts +++ b/selfdrive/ui/translations/main_pt-BR.ts @@ -1011,16 +1011,16 @@ trabalho definido Modo Experimental - openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. - openpilot por padrão funciona em <b>modo chill</b>. modo Experimental ativa <b>recursos de nível-alfa</b> que não estão prontos para o modo chill. Recursos experimentais estão listados abaixo: <br> <h4>🌮 Controle Longitudinal de Ponta a Ponta 🌮</h4> Deixe o modelo de condução controlar o acelerador e os freios. Uma vez que o modelo de condução decide qual velocidade dirigir, a velocidade definida só funcionará como um limite superior. + WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB). + ATENÇÃO: o controle longitudinal do openpilot é experimental para este carro e desativará a Frenagem Automática de Emergência (AEB). - openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. - O padrão do openpilot é o ACC integrado do carro em vez do controle longitudinal do openpilot neste carro. Habilite isto para alternar para controle longitudinal do openpilot. + On this car, openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control. Enable this to switch to openpilot longitudinal control. Enabling Experimental mode is recommended when using experimental openpilot longitudinal control. + - WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB). - ATENÇÃO: o controle longitudinal do openpilot é experimental para este carro e desativará a Frenagem Automática de Emergência (AEB). + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. <br> <h4>New Driving Visualization</h4> The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. + diff --git a/selfdrive/ui/translations/main_zh-CHS.ts b/selfdrive/ui/translations/main_zh-CHS.ts index 64b32c80d5..174f40696b 100644 --- a/selfdrive/ui/translations/main_zh-CHS.ts +++ b/selfdrive/ui/translations/main_zh-CHS.ts @@ -1005,16 +1005,16 @@ location set 测试模式 - openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. - openpilot 默认 <b>轻松模式</b>驾驶车辆。 试验模式启用一些轻松模式之外的 <b>试验性功能</b>。 试验性功能包括： <br> <h4>🌮 端到端（End-to-End） 纵向控制 🌮</h4> 允许智能驾驶模型控制加速和制动。 openpilot 将模仿人类驾驶行为, 包括在遇到红灯和停车让行标识时停车。 鉴于智能驾驶模型判断实际行驶车速，设定速度仅为车速上限。 + WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB). + 警告： 此车辆的openpilot纵向控制是试验性功能，且将禁用AEB自动刹车功能。 - openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. - openpilot默认使用此车辆自带ACC，而非openpilot纵向控制功能。启用此按钮将切换到openpilot纵向控制功能。 + On this car, openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control. Enable this to switch to openpilot longitudinal control. Enabling Experimental mode is recommended when using experimental openpilot longitudinal control. + - WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB). - 警告： 此车辆的openpilot纵向控制是试验性功能，且将禁用AEB自动刹车功能。 + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. <br> <h4>New Driving Visualization</h4> The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. + diff --git a/selfdrive/ui/translations/main_zh-CHT.ts b/selfdrive/ui/translations/main_zh-CHT.ts index c9810597b5..d1683a9562 100644 --- a/selfdrive/ui/translations/main_zh-CHT.ts +++ b/selfdrive/ui/translations/main_zh-CHT.ts @@ -1007,16 +1007,16 @@ location set 實驗模式 - openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides which speed to drive, the set speed will only act as an upper bound. - openpilot 默認以 <b>輕鬆模式</b> 駕駛。 實驗模式啟用了尚未準備好進入輕鬆模式的 <b>alpha 級功能</b>。 實驗功能如下： <br> <h4>🌮端到端縱向控制🌮</h4> 讓駕駛模型控制油門和剎車。 openpilot 將像人類一樣駕駛，包括紅燈和停車標誌時停車，因為是由駕駛模型來決定車速，所以定速的設定值只會作為上限。 + WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB). + 警告：openpilot 縱向控制在這輛車上仍屬實驗性質，啟用後會喪失自動緊急煞車 (AEB) 功能。 - openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control on this car. Enable this to switch to openpilot longitudinal control. - openpilot 默認使用汽車內置的主動巡航控制 (ACC)，而不是使用 openpilot 縱向控制。啟用此選項可切換到 openpilot 縱向控制。 + On this car, openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control. Enable this to switch to openpilot longitudinal control. Enabling Experimental mode is recommended when using experimental openpilot longitudinal control. + - WARNING: openpilot longitudinal control is experimental for this car and will disable Automatic Emergency Braking (AEB). - 警告：openpilot 縱向控制在這輛車上仍屬實驗性質，啟用後會喪失自動緊急煞車 (AEB) 功能。 + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. <br> <h4>New Driving Visualization</h4> The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. + From 97a205c94df412d40db1a94bbc4bb735b5afea27 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Wed, 16 Nov 2022 11:07:50 +0800 Subject: [PATCH 140/184] UI: fix CameraView crash on deleting. (#26390) * fix crash on delete * TODO? * after makeCurrent --- selfdrive/ui/qt/offroad/driverview.cc | 1 + selfdrive/ui/qt/widgets/cameraview.cc | 10 ++++++++++ selfdrive/ui/qt/widgets/cameraview.h | 1 + 3 files changed, 12 insertions(+) diff --git a/selfdrive/ui/qt/offroad/driverview.cc b/selfdrive/ui/qt/offroad/driverview.cc index 0ff786fb91..1377bb3b23 100644 --- a/selfdrive/ui/qt/offroad/driverview.cc +++ b/selfdrive/ui/qt/offroad/driverview.cc @@ -35,6 +35,7 @@ void DriverViewScene::showEvent(QShowEvent* event) { } void DriverViewScene::hideEvent(QHideEvent* event) { + // TODO: stop vipc thread ? params.putBool("IsDriverViewEnabled", false); } diff --git a/selfdrive/ui/qt/widgets/cameraview.cc b/selfdrive/ui/qt/widgets/cameraview.cc index a606d6893e..347cdb1dca 100644 --- a/selfdrive/ui/qt/widgets/cameraview.cc +++ b/selfdrive/ui/qt/widgets/cameraview.cc @@ -102,6 +102,7 @@ CameraWidget::CameraWidget(std::string stream_name, VisionStreamType type, bool CameraWidget::~CameraWidget() { makeCurrent(); + stopVipcThread(); if (isValid()) { glDeleteVertexArrays(1, &frame_vao); glDeleteBuffers(1, &frame_vbo); @@ -171,6 +172,15 @@ void CameraWidget::showEvent(QShowEvent *event) { } } +void CameraWidget::stopVipcThread() { + if (vipc_thread) { + vipc_thread->requestInterruption(); + vipc_thread->quit(); + vipc_thread->wait(); + vipc_thread = nullptr; + } +} + void CameraWidget::updateFrameMat() { int w = width(), h = height(); diff --git a/selfdrive/ui/qt/widgets/cameraview.h b/selfdrive/ui/qt/widgets/cameraview.h index 0698d1fb9a..7cc3847f99 100644 --- a/selfdrive/ui/qt/widgets/cameraview.h +++ b/selfdrive/ui/qt/widgets/cameraview.h @@ -51,6 +51,7 @@ protected: void updateCalibration(const mat3 &calib); void vipcThread(); void clearFrames(); + void stopVipcThread(); bool zoomed_view; GLuint frame_vao, frame_vbo, frame_ibo; From c6e3d566e9b23b2046f933f3dd9e189708230a56 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 15 Nov 2022 19:24:12 -0800 Subject: [PATCH 141/184] update experimental mode disabled description --- selfdrive/ui/qt/offroad/settings.cc | 4 ++-- selfdrive/ui/translations/main_ja.ts | 16 ++++++++-------- selfdrive/ui/translations/main_ko.ts | 16 ++++++++-------- selfdrive/ui/translations/main_pt-BR.ts | 16 ++++++++-------- selfdrive/ui/translations/main_zh-CHS.ts | 16 ++++++++-------- selfdrive/ui/translations/main_zh-CHT.ts | 16 ++++++++-------- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index cf6f589b65..997e344221 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -151,8 +151,8 @@ void TogglesPanel::updateToggles() { e2e_toggle->setEnabled(false); params.remove("ExperimentalMode"); - const QString no_long = tr("openpilot longitudinal control is not currently available for this car."); - const QString exp_long = tr("Enable experimental longitudinal control to enable this."); + const QString no_long = tr("Experimental mode is currently unavailable on this car, since the car's stock ACC is used for longitudinal control."); + const QString exp_long = tr("Enable experimental longitudinal control to allow experimental mode."); e2e_toggle->setDescription("" + (CP.getExperimentalLongitudinalAvailable() ? exp_long : no_long) + "

" + e2e_description); } diff --git a/selfdrive/ui/translations/main_ja.ts b/selfdrive/ui/translations/main_ja.ts index f7329811a6..21fdc48fef 100644 --- a/selfdrive/ui/translations/main_ja.ts +++ b/selfdrive/ui/translations/main_ja.ts @@ -970,14 +970,6 @@ location set Experimental openpilot Longitudinal Control 実験段階のopenpilotによるアクセル制御 - - openpilot longitudinal control is not currently available for this car. - openpilotによるアクセル制御は、この車では現在利用できません。 - - - Enable experimental longitudinal control to enable this. - ここ機能を使う為には、「実験段階のopenpilotによるアクセル制御」を先に有効化してください。 - Disengage on Accelerator Pedal ｱｸｾﾙを踏むと openpilot を中断 @@ -1018,6 +1010,14 @@ location set openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. <br> <h4>New Driving Visualization</h4> The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. + + Experimental mode is currently unavailable on this car, since the car's stock ACC is used for longitudinal control. + + + + Enable experimental longitudinal control to allow experimental mode. + + Updater diff --git a/selfdrive/ui/translations/main_ko.ts b/selfdrive/ui/translations/main_ko.ts index 56d7dfd965..57c688ffe6 100644 --- a/selfdrive/ui/translations/main_ko.ts +++ b/selfdrive/ui/translations/main_ko.ts @@ -970,14 +970,6 @@ location set Experimental openpilot Longitudinal Control openpilot 롱컨트롤 (실험적) - - openpilot longitudinal control is not currently available for this car. - 현재 이 차량에는 openpilot 롱컨트롤을 사용할 수 없습니다. - - - Enable experimental longitudinal control to enable this. - openpilot 롱컨트롤을 활성화합니다. (실험적) - Disengage on Accelerator Pedal 가속페달 조작시 해제 @@ -1018,6 +1010,14 @@ location set openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. <br> <h4>New Driving Visualization</h4> The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. + + Experimental mode is currently unavailable on this car, since the car's stock ACC is used for longitudinal control. + + + + Enable experimental longitudinal control to allow experimental mode. + + Updater diff --git a/selfdrive/ui/translations/main_pt-BR.ts b/selfdrive/ui/translations/main_pt-BR.ts index f68400a3c7..2d7195e0d2 100644 --- a/selfdrive/ui/translations/main_pt-BR.ts +++ b/selfdrive/ui/translations/main_pt-BR.ts @@ -974,14 +974,6 @@ trabalho definido Experimental openpilot Longitudinal Control Controle longitudinal experimental openpilot - - openpilot longitudinal control is not currently available for this car. - controle longitudinal openpilot não está disponível para este carro. - - - Enable experimental longitudinal control to enable this. - Habilite o controle longitudinal experimental para habilitar isso. - Disengage on Accelerator Pedal Desacionar Com Pedal Do Acelerador @@ -1022,6 +1014,14 @@ trabalho definido openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. <br> <h4>New Driving Visualization</h4> The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. + + Experimental mode is currently unavailable on this car, since the car's stock ACC is used for longitudinal control. + + + + Enable experimental longitudinal control to allow experimental mode. + + Updater diff --git a/selfdrive/ui/translations/main_zh-CHS.ts b/selfdrive/ui/translations/main_zh-CHS.ts index 174f40696b..fb9b6dd6f5 100644 --- a/selfdrive/ui/translations/main_zh-CHS.ts +++ b/selfdrive/ui/translations/main_zh-CHS.ts @@ -968,14 +968,6 @@ location set Experimental openpilot Longitudinal Control 试验性的openpilot纵向控制 - - openpilot longitudinal control is not currently available for this car. - 目前此车辆无法使用openpilot纵向控制功能。 - - - Enable experimental longitudinal control to enable this. - 启用试验性的纵向控制功能。 - Disengage on Accelerator Pedal 踩油门时取消控制 @@ -1016,6 +1008,14 @@ location set openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. <br> <h4>New Driving Visualization</h4> The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. + + Experimental mode is currently unavailable on this car, since the car's stock ACC is used for longitudinal control. + + + + Enable experimental longitudinal control to allow experimental mode. + + Updater diff --git a/selfdrive/ui/translations/main_zh-CHT.ts b/selfdrive/ui/translations/main_zh-CHT.ts index d1683a9562..86d5482355 100644 --- a/selfdrive/ui/translations/main_zh-CHT.ts +++ b/selfdrive/ui/translations/main_zh-CHT.ts @@ -970,14 +970,6 @@ location set Experimental openpilot Longitudinal Control 使用 openpilot 縱向控制（實驗） - - openpilot longitudinal control is not currently available for this car. - openpilot 縱向控制目前不適用於這輛車。 - - - Enable experimental longitudinal control to enable this. - 打開縱向控制（實驗）以啟用此功能。 - Disengage on Accelerator Pedal 油門取消控車 @@ -1018,6 +1010,14 @@ location set openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. <br> <h4>New Driving Visualization</h4> The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. + + Experimental mode is currently unavailable on this car, since the car's stock ACC is used for longitudinal control. + + + + Enable experimental longitudinal control to allow experimental mode. + + Updater From 3b71a9780dab0eed22dc277ce26a4d95c97f07df Mon Sep 17 00:00:00 2001 From: Vivek Aithal Date: Tue, 15 Nov 2022 19:45:15 -0800 Subject: [PATCH 142/184] [torqued] Non-zero offline friction (#26513) add non zero friction values --- selfdrive/car/torque_data/override.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/selfdrive/car/torque_data/override.yaml b/selfdrive/car/torque_data/override.yaml index c0b8592ee0..6ec782444c 100644 --- a/selfdrive/car/torque_data/override.yaml +++ b/selfdrive/car/torque_data/override.yaml @@ -30,10 +30,10 @@ CHEVROLET SILVERADO 1500 2020: [1.9, 1.9, 0.112] CHEVROLET EQUINOX 2019: [2.0, 2.0, 0.05] VOLKSWAGEN PASSAT NMS: [2.5, 2.5, 0.1] VOLKSWAGEN SHARAN 2ND GEN: [2.5, 2.5, 0.1] -HYUNDAI SANTA CRUZ 1ST GEN: [2.7, 2.7, 0.0] -KIA SPORTAGE 5TH GEN: [2.7, 2.7, 0.0] -KIA SPORTAGE HYBRID 5TH GEN: [2.5, 2.5, 0.0] -GENESIS GV70 1ST GEN: [2.42, 2.42, 0.01] +HYUNDAI SANTA CRUZ 1ST GEN: [2.7, 2.7, 0.1] +KIA SPORTAGE 5TH GEN: [2.7, 2.7, 0.1] +KIA SPORTAGE HYBRID 5TH GEN: [2.5, 2.5, 0.1] +GENESIS GV70 1ST GEN: [2.42, 2.42, 0.1] # Dashcam or fallback configured as ideal car mock: [10.0, 10, 0.0] From f2d97da9b46d81454ec227152e280f1261ae9883 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 15 Nov 2022 20:14:35 -0800 Subject: [PATCH 143/184] jenkins: use tici-needs-can to build release --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 696446c65f..c34d253585 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,7 +59,7 @@ pipeline { branch 'devel-staging' } steps { - phone_steps("tici", [ + phone_steps("tici-needs-can", [ ["build release3-staging & dashcam3-staging", "PUSH=1 $SOURCE_DIR/release/build_release.sh"], ]) } From b3f75b0c5b151cbcb048a31bb33c8f49b2a818b1 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 15 Nov 2022 20:46:42 -0800 Subject: [PATCH 144/184] ui: function for setting toggle confirmation settings (#26516) function for setting confirmation settings --- selfdrive/ui/qt/offroad/settings.cc | 7 +++---- selfdrive/ui/qt/widgets/controls.h | 10 +++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index 997e344221..85b09dc183 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -90,7 +90,7 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) { }; for (auto &[param, title, desc, icon] : toggle_defs) { - auto toggle = new ParamControl(param, title, desc, icon, false, this); + auto toggle = new ParamControl(param, title, desc, icon, this); bool locked = params.getBool((param + "Lock").toStdString()); toggle->setEnabled(!locked); @@ -100,9 +100,8 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) { } // Toggles with confirmation dialogs - toggles["ExperimentalMode"]->confirm = true; - toggles["ExperimentalMode"]->store_confirm = true; - toggles["ExperimentalLongitudinalEnabled"]->confirm = true; + toggles["ExperimentalMode"]->setConfirmation(true, true); + toggles["ExperimentalLongitudinalEnabled"]->setConfirmation(true, false); connect(toggles["ExperimentalLongitudinalEnabled"], &ToggleControl::toggleFlipped, [=]() { updateToggles(); diff --git a/selfdrive/ui/qt/widgets/controls.h b/selfdrive/ui/qt/widgets/controls.h index c639b7f481..e2fd9d1b9d 100644 --- a/selfdrive/ui/qt/widgets/controls.h +++ b/selfdrive/ui/qt/widgets/controls.h @@ -139,7 +139,7 @@ class ParamControl : public ToggleControl { Q_OBJECT public: - ParamControl(const QString ¶m, const QString &title, const QString &desc, const QString &icon, const bool _confirm, QWidget *parent = nullptr) : confirm(_confirm), ToggleControl(title, desc, icon, false, parent) { + ParamControl(const QString ¶m, const QString &title, const QString &desc, const QString &icon, QWidget *parent = nullptr) : ToggleControl(title, desc, icon, false, parent) { key = param.toStdString(); QObject::connect(this, &ParamControl::toggleFlipped, [=](bool state) { QString content("

" + title + "


" @@ -156,8 +156,10 @@ public: }); } - bool confirm = false; - bool store_confirm = false; + void setConfirmation(bool _confirm, bool _store_confirm) { + confirm = _confirm; + store_confirm = _store_confirm; + }; void refresh() { if (params.getBool(key) != toggle.on) { @@ -172,6 +174,8 @@ public: private: std::string key; Params params; + bool confirm = false; + bool store_confirm = false; }; class ListWidget : public QWidget { From 62024176c6e0386401374873e73512ab76f4204a Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 15 Nov 2022 20:52:31 -0800 Subject: [PATCH 145/184] ui: toggle control supports active icons (#26514) * support active icons * function * fix crash if not setting icon but active icon * revert * clean up --- selfdrive/ui/qt/widgets/controls.cc | 6 +++--- selfdrive/ui/qt/widgets/controls.h | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/selfdrive/ui/qt/widgets/controls.cc b/selfdrive/ui/qt/widgets/controls.cc index 619fd3cb4c..456cf748f4 100644 --- a/selfdrive/ui/qt/widgets/controls.cc +++ b/selfdrive/ui/qt/widgets/controls.cc @@ -26,10 +26,10 @@ AbstractControl::AbstractControl(const QString &title, const QString &desc, cons hlayout->setSpacing(20); // left icon + icon_label = new QLabel(); if (!icon.isEmpty()) { - QPixmap pix(icon); - QLabel *icon_label = new QLabel(); - icon_label->setPixmap(pix.scaledToWidth(80, Qt::SmoothTransformation)); + icon_pixmap = QPixmap(icon).scaledToWidth(80, Qt::SmoothTransformation); + icon_label->setPixmap(icon_pixmap); icon_label->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); hlayout->addWidget(icon_label); } diff --git a/selfdrive/ui/qt/widgets/controls.h b/selfdrive/ui/qt/widgets/controls.h index e2fd9d1b9d..0540088a78 100644 --- a/selfdrive/ui/qt/widgets/controls.h +++ b/selfdrive/ui/qt/widgets/controls.h @@ -54,6 +54,9 @@ public: return description->text(); } + QLabel *icon_label; + QPixmap icon_pixmap; + public slots: void showDescription() { description->setVisible(true); @@ -153,6 +156,12 @@ public: } else { toggle.togglePosition(); } + + if (state && !active_icon_pixmap.isNull()) { + icon_label->setPixmap(active_icon_pixmap); + } else if (!icon_pixmap.isNull()) { + icon_label->setPixmap(icon_pixmap); + } }); } @@ -161,6 +170,10 @@ public: store_confirm = _store_confirm; }; + void setActiveIcon(const QString &icon) { + active_icon_pixmap = QPixmap(icon).scaledToWidth(80, Qt::SmoothTransformation); + } + void refresh() { if (params.getBool(key) != toggle.on) { toggle.togglePosition(); @@ -174,6 +187,7 @@ public: private: std::string key; Params params; + QPixmap active_icon_pixmap; bool confirm = false; bool store_confirm = false; }; From 797c626984080e1ff17206b99e67a11bba87992f Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 15 Nov 2022 21:07:11 -0800 Subject: [PATCH 146/184] ui: handle two dynamic toggle icon cases (#26517) handles two cases --- selfdrive/ui/qt/widgets/controls.h | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/selfdrive/ui/qt/widgets/controls.h b/selfdrive/ui/qt/widgets/controls.h index 0540088a78..770b9b92dd 100644 --- a/selfdrive/ui/qt/widgets/controls.h +++ b/selfdrive/ui/qt/widgets/controls.h @@ -153,15 +153,10 @@ public: if (!confirm || confirmed || !state || dialog.exec()) { if (store_confirm && state) params.putBool(key + "Confirmed", true); params.putBool(key, state); + setIcon(state); } else { toggle.togglePosition(); } - - if (state && !active_icon_pixmap.isNull()) { - icon_label->setPixmap(active_icon_pixmap); - } else if (!icon_pixmap.isNull()) { - icon_label->setPixmap(icon_pixmap); - } }); } @@ -175,8 +170,10 @@ public: } void refresh() { - if (params.getBool(key) != toggle.on) { + bool state = params.getBool(key); + if (state != toggle.on) { toggle.togglePosition(); + setIcon(state); } }; @@ -185,6 +182,14 @@ public: }; private: + void setIcon(bool state) { + if (state && !active_icon_pixmap.isNull()) { + icon_label->setPixmap(active_icon_pixmap); + } else if (!icon_pixmap.isNull()) { + icon_label->setPixmap(icon_pixmap); + } + }; + std::string key; Params params; QPixmap active_icon_pixmap; From 73ec91f3bc20409e672480428f125dd6c8b9f2a1 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Wed, 16 Nov 2022 13:10:05 +0800 Subject: [PATCH 147/184] Cabana: fix right panel layout after undocking charts (#26497) * fix stretch * set window title --- tools/cabana/mainwin.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/cabana/mainwin.cc b/tools/cabana/mainwin.cc index f0419a2fb3..7781ab3b75 100644 --- a/tools/cabana/mainwin.cc +++ b/tools/cabana/mainwin.cc @@ -73,6 +73,7 @@ MainWindow::MainWindow() : QMainWindow() { video_widget = new VideoWidget(this); r_layout->addWidget(video_widget, 0, Qt::AlignTop); r_layout->addWidget(charts_widget, 1); + r_layout->addStretch(0); main_layout->addWidget(right_container); setCentralWidget(central_widget); @@ -217,11 +218,12 @@ void MainWindow::updateDownloadProgress(uint64_t cur, uint64_t total, bool succe void MainWindow::dockCharts(bool dock) { if (dock && floating_window) { floating_window->removeEventFilter(charts_widget); - r_layout->addWidget(charts_widget, 1); + r_layout->insertWidget(2, charts_widget, 1); floating_window->deleteLater(); floating_window = nullptr; } else if (!dock && !floating_window) { floating_window = new QWidget(nullptr); + floating_window->setWindowTitle("Charts - Cabana"); floating_window->setLayout(new QVBoxLayout()); floating_window->layout()->addWidget(charts_widget); floating_window->installEventFilter(charts_widget); From 58b84fb401a804967aa0dd5ee66fafa90194fd30 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 15 Nov 2022 22:18:26 -0800 Subject: [PATCH 148/184] ui: offroad experimental mode button (#26498) * draft * draft * before qpushbutton * icon, clean up button, clicked goes to toggles * fix icon * add imgs * img * make square * works with layouts! * fix gradient * this looks good * clean up * clean up * remove padding around couch * use scene's experimental_model, new onroad design * rename widget * def want 3 * update translations * add img * add 25px of padding! * make 300px (no change) * clean up old images * 5 px smaller * add white img * fix from merge * no style sheets * see how this looks on device * aliased vertical line (clean up) * clean up * imgs * couch * delete * bye bye * expand toggle support * clean up * fix dynamic icon * make exp icon dynamic * order * move to offroad --- .../assets/fonts/JetBrainsMono-Medium.ttf | Bin 0 -> 204140 bytes selfdrive/assets/img_couch.svg | 3 + selfdrive/assets/img_experimental.svg | 10 +++ selfdrive/assets/img_experimental_grey.svg | 4 + selfdrive/assets/img_experimental_white.svg | 4 + selfdrive/ui/SConscript | 2 +- selfdrive/ui/qt/home.cc | 19 ++++- selfdrive/ui/qt/home.h | 5 +- selfdrive/ui/qt/offroad/experimental_mode.cc | 75 ++++++++++++++++++ selfdrive/ui/qt/offroad/experimental_mode.h | 31 ++++++++ selfdrive/ui/qt/offroad/settings.cc | 23 +++++- selfdrive/ui/qt/offroad/settings.h | 5 ++ selfdrive/ui/qt/onroad.cc | 6 +- selfdrive/ui/qt/onroad.h | 1 + selfdrive/ui/qt/sidebar.h | 2 +- selfdrive/ui/qt/window.cc | 4 +- selfdrive/ui/qt/window.h | 2 +- selfdrive/ui/translations/main_ja.ts | 11 +++ selfdrive/ui/translations/main_ko.ts | 11 +++ selfdrive/ui/translations/main_pt-BR.ts | 11 +++ selfdrive/ui/translations/main_zh-CHS.ts | 11 +++ selfdrive/ui/translations/main_zh-CHT.ts | 11 +++ 22 files changed, 238 insertions(+), 13 deletions(-) create mode 100644 selfdrive/assets/fonts/JetBrainsMono-Medium.ttf create mode 100644 selfdrive/assets/img_couch.svg create mode 100644 selfdrive/assets/img_experimental.svg create mode 100644 selfdrive/assets/img_experimental_grey.svg create mode 100644 selfdrive/assets/img_experimental_white.svg create mode 100644 selfdrive/ui/qt/offroad/experimental_mode.cc create mode 100644 selfdrive/ui/qt/offroad/experimental_mode.h diff --git a/selfdrive/assets/fonts/JetBrainsMono-Medium.ttf b/selfdrive/assets/fonts/JetBrainsMono-Medium.ttf new file mode 100644 index 0000000000000000000000000000000000000000..a6ba5529af2486ea7d2b92b7b8bd598bbee46e29 GIT binary patch literal 204140 zcmd443w+M?|Ns9wUDpm~cHV4rxehzA17>Dp=CY&nIc}(Fm*aKJsIil$?f=3N#hCDBEHrD(__ET5!B1Rfth760zAML; zPMhH0Iiw%bqfE>?u5|41$8*q#_(_w0?f=VMm+26R7or!oRX=CWsGJ30|9-pjiCiK6$O? zAZ{-DE35WJ@u88EzGnP3^`aP4FTRD1V~godu}EHGPb03x-;YULRicPrWG3WMDNs7r zO)DS5Qn?ecjQQvcS1M5(#QwU97}Scft~vO%gR$CLT?ToLCs`T)`}g1At~gPJt5#-4 zo&!P3|3e~?H&G1w-+>~;`vQ-aBK&_P$DPL@=$)QR@l-B)HtF#HAhr&eC;tn-4Y7#x z)Z;(tt#;~&`~F|yK;8t|t?rW9hKUjk{j;eX@P|C4*jo=tB9#V7wapt9e}dc_>e1E> z*=8u9GEh7{m&!zSqcF7@>WIxJ-u2Eg+o}PfNk^Si!m78p81)jDdB~a$tC+hJ! z!qWlN$eZr*l#zUl%1O_lc5wo_M$e-B$*!LAlJ*5uk8nU`p)f(Vqde#y@*A=*h3iAt zJQf}+A|b~ zwOwN{4dHjdBtY#<{^+@P9KwqM+2uKRyyqI_y$swBo^nHdin+tof2q6_M>Zrq0X_uL zZk~k_zJP3VK@`=biK44Vz$*w37Dd;uA-wvA)-*zVC$I^??`mL&n*E~a8p7AcA`Dy9 zpe<|m;q`7nX$|`n@Yx;s z8R<}uzp`#zzY2R^KZp1ikWWMCN@y@Zd9VI~XQLk1&`#G+qTUaKa)2~OJCN_+3(#&x zTa!(10;_L&O?|izXb$qg01yP|S~Q^cOafMr1CU>BE%bT!Yw9~!L6lp`@2D+NF2i4- zjLJtoLViy9!Y0P}K=&mA()z&O#=RkkFK~zHIrMzW&!ZIX=Z5n3gekrWZ~`jJa6q=9 zH1*SY(o;Ih6VEb~`mN3V+_nf4^n8NKPfBr-fb2y!Bzx4a1BH{_z&DNc$V$9UuLqR{ z_B85*^47w~*hFx}t(3=5H}qUezX?!T;R6O#SBfJgs9aQcO5Xv%4-8x4HR-Jw{RZV@ z34oNKa?@+5Q6?%s%2pq;r*X}#M!uAWot*<@T>Xh>FK)&e-lj1dv ztH#)h*PgKFHKp~$-6?FOrSTPb(t6bJt6SoYxNbUq{d?+%jXWE>(~xhH|KIWq&+Gd4 z)en2ha66?k7|(F4Cymh`>3Q|y>xYeds9f$eM!7uUdiC^NugkYyexA5HX?;6;(s=6X zdF@dnzFyw-%UVC5`gXY~4VAqO7zlD;lS@$a9iv}&gwl8%4;p|9&>W-zy4D$Z#vAlK zdS2b!=^2-3+{M^xjK4HSP@f?CMSw>@y8AW7-O6K#qvzksqlhEuekv2qCDiAs3{L}3 z-cXO7NEzlY+1)=b|x}y2^b2 zSN0NPH8xNQ^1)M}4c30cpg8w5XbCL_t=v4w*!9y0PenSMl^XXBg5u1yW)c{J>&Wl= z9)v^j3~GOxGyVon0`ec&!(bkC1E8`HupQg%&g(Yi`Y+2wWu+q&>9bvA3du+&GFhp@-5e>pA7`}f>iXK!%*hIy>=r}K!O+@ zZaB?2v!&OP`7(yrs$qW|1XpmzyjTVEW-VAIdxW>*kMIS2Az#K{;x4|A@8<{jL4JrI z=2iR%|B?T~|KPPEO0*VjMX}f_wuyg=PsLGjLHsF|^plNbkc^TJnIJRd19GOUluyY8 z@+JA2bjeTU7xEkBry`X@wNtsOml~{ws^`=)^|IQa-c|3bZ`IGfr!8|VD=dFmxwU~c zz#3wWv|6loYm7C{+R~b4ZD;LhEwE0oK4_h8eZu;Nb-nci>xZ^rTbM1Bd#pXto@vjr=i2k_UF_ZL z{q1+#huMeQC)ualXV~Z2=i8sPzhHmSzRbSL{)&BzeYbs|eZT!Thsn{v5#fk+jB-qN zyy>WkvBkv1E{gqo>`Sq)$Nn>RPwd{MwiHm^BrZcZ$!URC{eO>OPslaIrpw7_f!Sz*`SMx$vRo%O$UX9F#g)H`QZcH% z%2R#R5Vb%pRjbr`wOMUdht*GLfeN(1N_PtcTO+K|R;#-OQmvWRY-=7`U@}^u!uon$ z3xw8dflAu~cMH5?w7{3PAMFe+;B9YU_eTpvxLY9Jp6+geLU#)cwU^t+87(l&Xo2V4 zEwH+-1_(#n_Qf7V3;gJAft7VFFb*wnD*g|& zz~k-~SXu45(E`G3v;%(eezg;IxHhr2TkW*k8MRYur_?^+xlUU1Ma@F=z2>5mXo@?Q z@)szU|HM!6WBeQRnNRtI+JQ(n4cuKb0KYK`>YwXlFuu+9yt-Nc9M9PCpBX!G_{0|{ z9yl>UUpJAUt~{;>L0XwT}(YDaafPI3I6niGN4FjQ z$IFvSB0qv6{(-#`3=tvP(dmLV~CaFlto|B>6BF&?=a~&_Z5tQDuu%ITV<#mRiFkV zg!Wa-)kgJ++N1WX1L~lvQb*J=RgHM!C%T7zObbnmO-tS3C3wBmv|PWc|Jwu$dwxuF zP4hfqkD4%>nC6=nnBX%eNXw3dED*J(v)wP~HnRrhMW>451l z-r6%PhM~M2UGXaMT)$bp@UEj*@0;U1uhfHTj+(1RtNYYg)g9w<5A~FqAdafX)GSq| zMyOG0q#CZKs(EURDpB{U$JIDBUfr)M)RW>nF;pxRqr?fBp?Znu#QkET7%s!aAn~Xe zDDD%3#XYi#jFi!$RQ1GrhmkCb*;p*gz?|b`xvUrK!}_seHjtID>1+mjm_5p#VDquM zSjAptYcaz=AjXI(GDgfbDfSNA$G%`+vv1iM_A9%{{^Ta^%^UC_9?T@@GPFk zyYNyzjF04_`2Av%DiV{WLzRmoqC`}SAH{L;vnp17OhWbLQ^eEKE@r8ICO>tTw2B_0 zr^zH+s@|f^)KGNiQ^kC7w-|uEEuQINlWwV-d{4Qdt~phS{?#%VPzsklEQ# zb{{KcWo#O|S4OZYY!Q2gJ=Nt5{$M@1V%@o5 z`Roeo!6oa=F0~0>wig+L!#6#FUJe&>YVLX%#;Sp>y zZ^4G~Xf}zbum^b>o5?d-1#ge_L_0Q%cVKh4lg;KG*<(DLJ;e*zle~ac@_fv7CG2nf z9=3pYV}IvE*>XOZt-w3TtMUH%IzF1c&NlLiY!jc%-sY2dE}O^F*;t;y7V`mkcliUB z#m=(_IL(@8S!4D&o61w!T;7R2%{#NV_;~fR`qAWLk|tl1zo~)Atj?%k)p>PM{h@wW zzo^sdlDeSIs^3hhrZmCCH-ZZxq%aAyh!tMKTO^7kkt`e{LBxo7(G2fSHy1vlg=i^K zFkY?UGx!SrH@*^UrBzrlE$1)uxmZ2Dz^CyC`E>pepNZAfqkI;BjL+tC__LVR7xCx# z^L#OX5%a|o{&&8bzk+qv2ELKM%{TLR`FngTf1hvTA7J*_!}s#fumae}zr-qRKjxGp z{3zdo*<}-Em#?uV`xdLRudqJ*j&J9m@Gtno{2l%(|DLbq)%-PnoUh|2`0M-!{suqE z-{k+|>oGUI#eZaL_z3ngFJrIp;Vh7S%!1iJvHJLsHDn(#f3}k~V*g-%c#mGOEqL#L zEAwLSV}-a4@AkjPTCsnz*6c^tmYrtJ*)f*Hs#!8S&QjP3mdL(m-8g4mSS=gPW7!xU z&&qjIHiFyONN#7NxPuMnRyK||V-t8HyC0vMn8=gac;1{n$NRD8`CaSp{j22_XU1Ee7 zDN@xvs!}~6hs&X|RF=t+a+Dk)OXM(FF7Fn<$`;}pR;>QAuWTs(l1bv6OqSuYoA^bh z$d0muxG1hlUunaNHd{uCD>6_vl@_dR8_8f9AeFc-`^f$>M21SI>?9k=9Q85JylRgL7&DnOoA4P=!( zDF3B=^Ho$|0}I zi^?pkm6tp&cVk8Rz1%N9mdCI=*rn1{y!=$PQE~DU%+#6kbJa;@$i4EY+$aB`(p0Sc zr*f*c@-xL`EmpEZnUqpeHN=`AP`I=H^W@`lu6$a)D3{7*a*ljUzAfLEA7Y=fNp6!nBvjQDdRB0tE^)HF}+a8VdE+s2eT7gOV)O*HC$D6Qpys(@leO{gcKR*m=$YSRd^iCrVGqQcB)AgKIU@e$$# zG*%-spm7@23mUHx&p{JFGo+_7G}j2KZ=yz0U6V8d=M)(248)^QtSJdG5ZXc`?t``j znTSt^(weM2!dP`;#xjsp?+zMCw#n8=*ab7RfhdJKHCQz<%+?wX%>lW9?#**!gXX)T zdKZ8~Ky~lz#tH4>hVJj`hHTQ!O&@4?H~paGbM$=Ly-+%$1kg&7m=5TkzF-ERdx%E? zb_NDdK<{!hA4JK=z8`XI#!c?be;6a3`tked8 zQ+^L=1m#EV0TkKzVU3`?XKJJa`iMr6JyvSO5h%3{5GBx68c_{>StEXguGWa-&{s6# zXXqM@^0X`3R*{da)tChIHH{*_S*PJtzt=V5Y3LgoX@|b45woD{HH!S~Esee8sY zpyWe9TA>@k+o%iq@+OUm+U^~VYzf`0QRLI_Y6SVp7LBPP^gWH}4&AEZXb-H93tXV9&&`htW)dQlBIifhsr8K)(azr_X|;Zpf#OxuJgWy$1U( z#;V*K#&h&k7+<_AM7&? zsGni~X+UcW8c&Te^;4)>Lu&=>M-9mDXq+|1+NMw+4fz^&s|L&pZJ;5)!w%Mf)*2jr zm>{3Uj@E$I4%p!ukPl*)Yd~uV>~;;vA88yn#_}|1u!hpKw~xJFXUT>e|3UV-2nL%_TL7yCcr*ULv7ex zLu&`@?KITpNg7(4V6SID{)Mvw16p6;{6Ir~LG}W)W+A^cd=q|(a|HuhbI{yrKz;%L zGkmZwv@OU0Vq51<_zu^2sLw-@Hq4f>UEi~jiUEG91(GQKjI0V|w4fzq- z8qj)y`lkWelG+B)dWZLNLw-cI1GLuQecVtxknMo6p6G`#LG~uw0a`C$Z>}M`lI;Mi zfRbGZvMbpF(3%2!cn#TppoYzYl3fV0H`N)iIZ(0-;RIAqz-B{-x}kO`(Xhv$rEapJ zR8PR3f|j`$w1)i+dY>CA>lh7N03GXw z+Gm`G{T({q4b@|UhAoHQ?}ltJQNvb1sci_d0ktcjbryfX4b^FihSp8A{xG02PSemD zia)5KwGW@}hMx0~hSouRh8ud$!x~yA@tJO@9FMpmzkWu8lQ?Fa*Q4GzlVg0LM*Iu9 z%uPcm*%8oMn7`yE0s58(e_O)1%MJXAf3Bgw9pU>lw1(pQH8dCT18$l?54xd#aL7$x z=wUbH`&DjwLyx#2-#?|HJsHl#3~0XPr!~f!`xk_Xmf)g>_H+CX4b9d3nuhkf{JMtL zO}s{9tk-K1CQ`8mjnJ^UP~1b%I3gl7^j9__N<-s;pnCwVb4645<(g8%x|zsNbO|AE8h$>8(*{ABpl2 z>Jk)XA{3q}Q4T_(U8J8z{RVBMQ7DTH(x}T&*qKm&K^+=(1sV(Br|K#+9b_Pk_LJx* z68%t}grbiSWG^{eV?sO0IT}+Mbgl+fW%6;2_y#%;RN`LPLO!JtsJ|o|J%e}?bb&@t zS)K*df6zwqW$+rpROWTyb)+Xdy#dxEoCt-l5Q6ID(g@T?ZUCPmo@};9BVwSRX+%79 zuSPV3!jB0N2i>O;&7ogt1lmA;4bb;Q3ns9+oZJQTK2us44Znxx@NpvfBk zcPQBcw&AOxEkSF9(IyK1q1qt4844d$?GSzs+8*R0{2??C!?#0+X!s}4p&I@Lbb*HEA4PTt{2k~*4Sy9%b_e`> z=u!<|3tgt+)zDQM{u-401MuU}^%}ko`j&>DfKnR({yKDnhW`Mi_5l11=(`$z61r8x z--N!e;s1hC{Q;-ve5;|kg~n5Y<~kaS37ThoPitt*wxDkiYz-8?NYL8EGD|~eEtbbL zw63wt*3emtWsZi{HI@|`_BeE@$`-T%LFW?|*qxv=W(#ah&{>5A_9f`N*#esqbZ%jR9SJ(8w!n4-+X02W2&SO0 z5kY4y7PJY$%uuuoL1!(NjT+_!eOp84E*AJGL1*L^_zgj4Fc!2SLFelhv?D?1Hx_yZ zz&lyYLazbs?=AEUfOof;h4KZox3^GU0PlD)%Lf|T(_7%v1f3aM$Xcm9M;fztL0k_w?eBlY#j7E4ec*2M>KS9YQY+Vp#7zVYz^oP z)k1awwAZv$YuH36*%#2h(?T`{bQWv*K|_01%SjD;4oZFiX#Zn5rD4xQf7H+($nukh zy#W1LL;D}gX$^Z3`iqA4K$bHawiNoShW102vl_MxdQL<8BFlLVTLS$}LwhRA?;7?d z^n!-=9F~h3IxDsOp`m?=<&uWZN-ckCXkTKvtf8|~%U>GWmssIL1g-n54K%dovj%9y z9B42IL7K;)5uh=`PeLO#;&Es+XoC1Bpcajo2SpnbG*4J<8k!%h@D)P9->fkjaW6DZ zBZfd*YGfuf6|_b^1E6Ud@hp_CwL?D7K(jRhK5y-)5wMjtPb1Kd)_hQa^zdgZ)gOp% z(8=IIgnL1!Yb5fuRshsVbb`JPU~d6GvckTEfL~ZKJ`e)FWBpJg;FmVoji9;F7OJ5& zy)8_m?tw;XXpL`!JqVh6ZLkR;+CWn@G?&_(8rct8sZpe84?>}=wgnnF910r|awv46 zMwUXK)5tRDBJe!YpfB4NYb5MrgRc{^1PZ?-n;ZKX!u2Yp#1;ghyk zz^k|yZDE5S6B2E0`&1**2DUH3LB!t=MZdGbuC(TcISeHFnw@LJuTY_pEuc~(u0c&2 z83*;&2=oKHk4E}K8)#%-sGmkQgwi!2{(?5r$RuchMx28NYGg7rNF&3cXkUW%Kz8&I zLUw~T)`(xAXlp{EJ?$2ajD;TQsh>OrnjkpTU z(#Y=6T#Yyl&DV&t&_WIEqwJkE5`EO(MMHZjJJkV5^gBEJk`QO0)E+=~g~GQ8iT-DY zuMo7qvX^Sa6)60MkYqpj4I!IChifF+W1NQeYWDFO+QZr5AA}5s!aoQ}Z8A|qdr12v zjkpe-u95AbGc=OyF-s%+Kp)dcs?%&R2YH4-=Yq!(c0%WAXm4qsuc3XZ{aKCd1w}uy zFGBhrQ1l@}4uPT{*d{D(DNEu1f_d`xWw@1oEioDIna*?g?4hlri7dd#r=eO z1d2XIh=-u)Q-pXJ3Lhc_?CpTP2r&~Hp-~S&V>N0rbd*NrL+ROwQ}9y<>_f;j=yLEk zgj1m_G_o!9?_ee3+dyB^NGdz*>3A9O91439vNQA*um<4*=&KqeXO6WRQ44)dBWj@Q zGy*nrysnW{&NnnN5BjD?Qkk!UYbZbb&H?{(AP)tb#NZhOeGViBWr~5V)f^}u9-|N* z4K-=#b09Hh4ejA#;AaHwnPOmXg7$JTus5OL`!TRLp{77#Z$do<_0y;c(1sdS3ia2h z$Drs}gqj5n(9q{YVgfbv`H&d&Lqd&$25ZzvXoyA)hlXnC^C2-|8Z{3Zu2Ey4@Bu=V zKpSi5^C2;j8ud6d3PdB#IA{}%x*uxMs0wIPjd~Jl)u`D}n?{vGVQ@lCtNR#;ab6G$ z`xEjM6zxDLlqD8zLC6bGrBSGJEZT*TXP{^og3c6T(I$la6^b??=SOp=c9= z&LLvaCWJf>;-&^V214vp8yub>GU)gIbR zBfo`GI-puYsSZH?0j2T*MQug40P-?4MWd)5Ej02QDBTa_mr$|`P*e{pH;`AMWM3eE zfTn5aoGG@AM*am&*C?`0TaBXUWN7GIDK=B1$TsaX@*0%t2IM&?*%2sepAH&%1xhvo zitJ780Tf+#YUu1Lwv$F4g63!xJttQqYoK`=IuDD@*T_Gi1sX+dUZ{~rpq({}?AJx3 zs6D%Ct9!!A$aOnLSWr9xBDBKV`NuwlmvPLz8KA=${&?y=f z2%V}?-q2|p`6Ki}jXVpTu93e$AJWJZ&>0%#4}DmpLZLG?@+asc8u=TvLPKZsv5$gz z=sT3h6B;^qkFC_mC!ucWTt1er0ZD0}*3g-K?0gNK<;Omwp)>y21sX|dp9Rn1-WQ>Z zG;$8~dGL3{Qywe9O9-!lt^=ETFMJZx=!hU+yMPRBk4KYHIm}!c|d*yrM!To^3rP{sVqA+lI|lP z1(M=+X(W~FV~wP;>;~{t`7(5mM!o{wtC3`IW#E5r@200X`NQtWlkzp&B|{j}O<-`FcFY2!hVp zHx4LelB zex?E_{HYp#XF}a;YBk~*KIU^>qaMXu038gNXa((Rz(kshC0SkUuA=;6tF_w}=HI8A z%iM2Zkt;3Al~7zV!diJ(kxRsuzUR%nSy`E5Sd`7?V#O|&>&V;4ILj@`Np|rhm$hU> zvP&d6Yz|wpOD0*%-_Us+u(>3T~_xubWH71pRMwYq$J7nLB!O4ocTlun`alBkm6;^HV+%jK6_ z=3;$|T&x=QXZqgY{sG8Ehum|J44EU~%*VYXyfP*S)4MH^IkUU7`8;c&;a zWLI!fw?0MP`sv6h8{&hF_>iOxEGYM`q76Yoxh`Is;|ffqE(h1j+0cl71>l#9hoLQG zZ118C)DK~+AOxQ9xW-F2gm@>q zo=l9g!@a{$$I!%NS9sC}P8tDwlQvG;AW0*WHYn1lqzxw0=%fv1(k4k8yhtrc8@x%I zCT;K`O-zC{wEbP?5?I<{O>yyisJA4$lImRytGjr=zL;F^VqD$DiTa{7iMbjj-m#vj z)H}MWRL}bLv!Q-gl*^9#kvdR6(iqf_G#2$EjYIuN<554-1k{hT8R|#c9Q7kjNwQ`c z9jQfS^K){^or0I9IFY8%#VjzX*dOwPNdf=DAavv?OaAqvUOno6aZy--ii|KDR9`#j`N1 zk?@n3?a0`W#zU#D>97YXaNB!I&{;||l3i_+Qo^&6T^avXQaE-Ql4qicSXitz#ac*1 z0!-Vbva--oh#{y56CXxh%t#rWhlaqy?J#zQxx$f5VK|L7l5Ox~Ij#n|iNh;X99C;q zCGu>4b24j+&d+6b!L$}K5J=fk9m!A|9tMj>2MjPc>tdrDC>jQ@^;(u^nvo=|{#LX4*%zuPY92Dzmq$gz}WD=LJ4BavxcQ@G5rc+~}$>eep05&zxuN*wOi z!pNWO>gaizVSRUVmCyp`)+&3N*opBYg{)ZM3ePR-9fdj7npK>#p(PJNzwLC>)xJ@^ zZ@QXu(^b#C_4B*+j@%?yyTtklJU4kBn3v>gpI8a^BOj|oPrp;y(4Z-B8GN*#E|h$=)=MWjQjUZ1w!b zR_rckAqL=fi5{zT#;f*;Hfl4ni@P>;Cg=hagz9dO)d_ldaEdD(y}auk;=3U`9un+o zi!|MnT$zv_WW{`#+ggB0*ki4pN#xM39x!vSB<#Kl5a^8nr$C>ijogUoi+~Z+kJ1$4 zQh!QAfx9RT1qM(W3f!H9l|IWws0bmR?J|gzlkqMra77 zGeSe@nfXXoLeHc?DLs<{!|0h5D5Er;5h$lL6c|ovC@_N3P++7{t~`WB8ReqTy+*kx zG}Mps8ReqTc-T0rt^p?)uUt-CxL*f5AvlqYPRU$3cr^)g zErOJ0vJO(32aGgyfznLD%^m7;ooc)??wF>7bjO1_NXe%opAI_9hjfq<%+Ntf@G#P5 z*X1|UcxB}Ghz?Tn3LT{6kK)d3o!=}Sqy&%YASIZMv>og6n`68(@|&xJl>BiWq~!B( zXGfji6FNu}v*-WfCy>R;V#8+~pd&hZ4c$s|NQGG>Mk!?;fH#HeiemUEN zcLeTexWi|M*~v_-0g?sgY-i58|0wP~CNZaPh~e}4V7D-@h+dcHZAhTkTfCW$V0pz+ z8{#Qyt9J$C$~mvBzmXCb=*Q{TTXYr~<^*%3$>iUB3$LByQcq(d&wJZcZf1FTv~c(z z{FJdW{N=#iq6$0lIP9Lgi<9^Ux0bb+YrEshjcZl)uAUSr|LMAH;J&{LKI@aia(MgN zg*?A@9$p!*Wj23acIHo_l&Neqo5E(X`D_JS$2PN_Y#*y)r`RPfxIexvBaWx?Y<$1O z0DNb_CcXpTg5Za5>{un%i>)#Tf73otF2rAopTgg555_luOjZ^6`|~Agt=gn^sJ-~M zpp*DMg=;2nQ;2D>X_RTQX@%*u>5^HP{mqf)ICH9buz9(8t@(iYnEAB%l9%xE_loq2 z^Gfx~_L}82-)pzm0dL{$@15kG;oa4HfcGfxCEis&em)UCF+MGQCi=|u+2OO-=djO7 zpYy)V*UvY?H^#T6ZTdz z*>HQqJq-^vJmH_^-`T&v|5^Vljm(YuHd@taSEEY-BA|0X|A5&63j&r0tPR){up?k^ zz~R8iz_`HF!0f=Tfdc}E1&#~c9=Ip)P>=}f88k3xM9{>bnL*ov&IDZ!R>1+m(ZLD9 zX~E9m?!nW7X9q6`ULFz_Vh>3PX&2HpWI)KUkZ~c?L*|Ao3|SSjK4fdi?vMi^$3jkr zTnZJTt3zF(+rlP>%?vvgo)X?JydZpk_>u6RB6>$`ZJgHF6{#WvBBLV{BGV$Bk-Z}a zM~;e|99a?hROFJ#)se2qZBcPisZkYC8>3^QTSjL^caH8KT@pPedQJ5D=pE5}qkoUC zY2w=?tckrzN|Sa?x;7cmWLT4NO@3-}(ZVcAmJG{i%M{B@%R0+u%f+VVra?_(nhtKd z)hew1n5dJi8P-MCmDXzO8S7=6vIW?pZArEaTb`}AZLn>WZL+PxcGh;qZpOE0S?ta6 z-Ay_6RSvTw$YF78kBN&}5OX;;FSd8=;Mh^IJMcYNhvO#3&5WyzI~K3vv*Ih__aww5 zv`i>T7?Ut9VRpiTgyjhv6Fx~emT<8dYv$K1qS=UM6PwL!R@rQEvsKO3H{06W+&rkc zrFqxpOPa54?rOfR`6r3y#Pr0R#GZ)*6GtRYOq`imnYcJ{XX3uZs>D-?XOqSxxstXd zT}--`9G#qyJS2HV@|xt0$(K?Fr_4`TnzAZoeai1CS6YY`zAchkq_xOuk=J5ki&8@Gbbxxa-=1Mz} zcDhYmoANf3+w4jYN{>vRn7%XpMEcpbF>TA+j%hos?dA+iM(>Ql8I>7}GpaJJnVmCx zXHLwVo;fRXb>=+Z}2j)V_23S?zaaywT9CCo>ulDQ4(1L) z9R_yToo&t@oL!l{Bl~>z<&J3`CwH9PaZ$$;9Zz@sz2g;Uk~7Vj<;-&~axQnScJ6f^ zbROvx*2&T-u2V{In%HT2r&*nL_% z_vXdr&ClDPADurse{ueb{JjO1g1CYi1+xqG7e*HjD_mcAr0`_t=AGMhp3-@5=fj;( zc0S+vS{LswAziFplDe$vva!qduHIb(x=!r6w(C#b26U_H9@2e6_odyddNl7bu*asJ z=AL;yH}z7zdiN^nHKA8UuLZqU_Hy;w(QALN>R#u2r}iG)dqp4CC#6qCpFMrO`%dh; zt?%J}z58wMU((;z|6u=XceT4~)?J4N_z&njVB_8CcNg3}=I#UdV(p}&nMHGp))eh1 zI#L`_TvR-&cv|uD;_U;&296%MVBqF~hX!6Aqy_~HN*&aH(3C+-25ld-XV9rZX9xQZ zjvJgZxaZ&jgXa(4I{4J!OZS-XX?M@Kdlufa>7HHpoE_pnBz?%}AxnqsAF77-A3AI3 zu9D^@3rcpD94yT)?OHmpbWG{A(#q1srE5!fmhKyNsH}6@z_KxA)5;F zS~cnH>s5AT}UedfVOf*zS!;aAbKV%wtukB)eB z<)dpK-8Cy{R`#qJvzE@2sc%vu)1Vxsh}G z&Yd^+V@ve`Ldwj~{vmT#6FK*sXPXs*C^@+umta3r+lFI5Q2dqw7Jz@2{)f-puU48Kt_Db_t`o1#bmG!Uee&x_BKfQ8gjde}NnxZum*UVZo zf6baT8`tbvb7algSH-JwuV%eE@YM;gZhZBpwU)JA*H*6GzV`RmB3_&D+UD1;tczRM zd)@SPE7$E@clPyw*Rx(9^ZLTqH@#l{hIk|8jUjI=dSk~MXWk5XGyBb=H)p=N^39!Z z9((i3dh7Zj>({K`x&Go?DQ|UtYusB4-rD%q!MD!3qFs5eF|L)ay{^j}nr|4ep<;t; z!^w>S8?!c!+PHY*-i>G8_Io?+?ICYZdwa#(JKjF=cFm^9P0md-H|^eZ;+>FpdcHI2 zoyvDy?;LpN;%5KN*_%gfp1*nL=CkiczT5rXY45Ij_rMnOmeehSx6IwLdCQUayx(j7 z-hlU}y|?zgeeYe_8ojmi*3ny6Y~8c<()+3Jm%qQ{{oU`M-4?d3VB5HDi?<#A!1sf! z5Ar@(_`&KA&TkLep0GV{d&%}0+gEJg{9(a|`#!AMG4G?0kCuFNZKreRke!t~SMA)l z^U6Q^{$u{G=v~uyE#I|$*P&gPKaTu3>*FCGSA4wc<6R#g`M74cb$8D0^4)WHuh_kL z_rBey{u%VoynkN#BDEur?uprxwP(|wy?ajXx%QdmGv{Z+ zKAZj7qR&=;w(YZnpB>qo@p;(ir@!$1V$Byv_DAfWv48#kt@~@fO!@MuFOMBaIWY0S z_OIAiGrrn=(0*|A!NXsde|_NVnnM|f79BeOP4{n>eslP+-{Jm;M;xAZc;(^Wzg6Gn zeY@b>mERt!@~d)IO{;QM?W{WdUDxmS92s_G^^uE5`yO3$EaBL;@15UQet)LgQe9HL z@p#zr>Bn~-|NVH)iR=@VCzk#&_=ig;H~(wVzxJGpI5qRfik~8XTJiJZpQ}zso*sRA z?&+~m+rqz`DM{B8-J<(<=Pqhna*dXpV|Iv3cUw8a^?QGoH zQD^6!-Ff!Xxv+ET=LVcBIXC*;yIB2){~z7|sQlyNrTLe3T)O;c(Vu58r(7O)`S4%a ze@*yn?G^7Ui?1BM+VbkstDCP@UA=P6LjPfTJ`g*~8mx^aKJD+rS~*jEu%!^ZJC?2j zUyC#npWx#7z$d;eX{bVo_rk~gz04-0mw_g8cw*~7TVO257k~y1ZOqCFGzxq5tWR~7SO0W8VctRYwQH?xWfe0|U;JSd}w36JENyeDHm-bm&Z z7#L{wX`I+PxOK22-r*J8IzBEg-fZ?t`QWi_!&45Whz-8Md4;N7>n^w(ItDVt)1neL^TeAv-XY$3hxkr6#os7z*d5~OyLdh29WSrdJs00Md`o$al%DH%EN`yoKGZp> zUVeG?;+xlt$M+c5J-@kp+mpWu-|u|m`GWRQ+U{0QJhgwl_6QPa=sLT9U6(%Uru5I( z#Ya*+`B81ED1;w{Gb_t~U?<(%atZWZ}Zvq)ForeKT_%&2IHK5t$Sm8l98gEV^xz z4{q;!C+o^i-?M$At~YGf*j=YcR4fa1YJ|5|Iy$qc2HrxB#GA8bpooc)rm#5jXk@dUr9(6^?TGd#vrvVbJaWrIEMq#I#B%8@CUNe z+80b6QE`8U)7f_7)D8s&9j1z^;YIEH`Ueax95RltY2P}n{q=*LGTPx|0i5;6{=I=X z$)Z?$X9k8Tj2@;6luMe_Od6?5aW_oIPCt3rR|;0 z_BHQiIh|RghEZ-Cj=XJrn79Ymsr;!%`IFf~r>_t9GR1N3CAxQWh4wCT zwq{b9l{8l{vq_mvGa1KtNPnL0gYVq%E<>$EDH8(qGnu?fnU_~bubxrPwAb8+T{>IJ_)^n)A!Tu;`4|5#8^;#aP39qB7%i zGxlYMHw=n&HX76a-%S@OLSv#Ft!`((P_k2YUA+W*5Rd@OWSM^BS=xtgSN*&hCYOevz}0XaX@5jbU_7In{^@TE4D_L?EYQ)$=nMZ=2I{ayJ$v3;tNa=6Dcv{VCQB=e#%I?xvC`LC3} zR`VW@sX4+i_7{IU;ICrx4I^*E2C;?>g2fcWXKsxT7h`T4A9jcM(0cKY8FQb`KgSb~ zHGyy4bK^}`ibosNzb~WSeYu|dU<+rx_`G`YzV+hsZ;Ge+LO(y?rg-WTIzG@7PvtV^ zUL9|g>o#@@a<7H7ooMdW>7zXPP@74bdv$yy#Zy~i%))AmMYDF!wsmc3W?p8mvRj(e z$J;YUA$2rOyYxe2OZ{eb+&Tr&FkiwUlqBa;b zFwXwlbTt3B+s#LJ6|WyQv2NU?^<*Z>d1L*1W1iCSp7rmo@t*bPt?{1qXaCv&n!oDu zw~N8IjMqBI*(BU!<}LjnVawzG zQC0IfZ+$(E_o%^}V0ujMi9Ca`KEW!0HV_TWh^A557h4ox?~w}MCY;g3&qsK9WqP4$ z!?6NE`e15aIy%@-if;>2>KB39Y;IN430Kfy9Krm9sd0DeE###4-|0& z2VSqj?hMZ|@-&{6dsBPf8t-Y(TjM?LrsJt^=zKiub{$V+ijFthjh8p8}_|n7ri#;tXb_PqkMrZ)!Bm4w*_-ifz<~75J)M^`9iQ#lc!(% zH}q@ZjfEQv;D1VOXC{$ocLE-uqg^GoY~#Ck&=ykyUZNgsKLa+lYEi?FSZT=0Uhk8G2rzY z{ASOZ7y0n6Ylhe0V|ysW0F*(Z41p}hY4ekCL*89K8kO}tI*iFGojk~Bi_9L#T%i*wd{s4hR3vL078qfp z*;j8wj1psDbk~5E@4q`+x4(q4-=pi%W{7jspmwR^E?s)m=*OrY{bG2#>us}&jQxc! zGxcv>7th|C<~M~kL__Q^(6erA9Ze`7E2SYDd&frpoP~w>M>UGV-mxKX=;_?3lqALjAEWRCW2&dKIfBV{C!CpC4naKlOc{Ga<@Pp9$%B&zX>ZKAk=3 zc+Z)Tjwc)Ic+cEoJl|L==y=Z@qSMnFMaO&Q5FJl*h>kbr5cDpJkCe@^<8#nz%Lk)i z0LO*`ClXxD!FcRmY?-kKs~eTW!#J}4gJt~p*-}ajemH08(Lm@8C$a3HDaIi zus*G#Zf(do@5bGFb%<=0bEo!l|uRD{|^&&gy^g#ljZ*aFu zq$E4&_$c?8nNCl3*71$&#fR0kvzIA^+PTiZXztba^qi&983g&h6{n@JC-$_8#xb0i zNLEJsT7AfX*+yHoBkyUqVM>g*rPx!NHVJIx>&>j(>RG*FI7838aiW4=;Z?W5mpAv1 zsTsL37U65w-6T1|+O%qXl*|raS`y~8$fom=l#CgP>Eu%h1tPO% zKcAWGtP!YiRL%TYqb-fP8f`oUWxIJ@ujGxs=NaGPYyT8Zv~d%b$nD)+;V^=41DxSE z=J+T6xV6ayeQU}9XOT8Kht5txg(vU;RF>2X$`!E+0074e1$O{;x8Y_oEe^^ z%*V%*(ilPYP3*=kJsNOt@0;$A#Qo_v-H(L@PPC--9H-p*ZXA%g%V<3K-*5C9ibJtX z_d~HCpfQ|2R@Ahqg|oOAOJdW+2-*tJ0cs=vh8P!`@Fsp(v4z*UZ&-M1T8`6(0N^Oq zU)(%A>?rKpx6qLiDNVfLTZFbav&sq$ZqyLT{NgYx z8Y`_-<0#dPGt|06)S_PtMr34+%&)9$mzUSBQdFgv=H`^9*L=$#DQwri5YM~2Ze0{c zGckPKq&Rk|coznvD9$VKNE$nh^Q*9s0G!{lhOsuRBkAl4dn5f+haYxtyjNQn6I;5v(l<%Ny_HBELP)ZeLK)zGi3pe0LkfpbhAZyS1~W4;M5B!XkK2 zfzI~aErD&l`*hoVvh5!jj*b<+QC3Rc(ek zyN(X6`3G-R^96q*FC#M#V>3o*5o7e{hi~f7x5j(cShP+@c`=q7>Fd^5d6*kRVCQDW zdAKrhG;Ia^2`)4f)sUs=Sm<4}rl~s*ZxTf(;yzv`#hUSE?rAX&XWzyVcv@UM-f_bl zBlS+lL&CzbfW>KqnYSn$-L9-#c2+@B+{hkxO(`#%Qszu=o0FU{x=a7e5x%K|vePsyP@%n6&BYmn-$M)_s zbD4J2nYjrcc{5>~fI}F8?}WVN%-n2NrSLmrgz>6(W`4W7>YbV2?lyg9-k!CKwg)BJ zLvC|s{@*g8!*hbZSD&Ew9&%@U7Kocq(?|9CkJfb`tl!4Qp0#2g{0RO6KQe4z=SMU~ zG(~@~Qg4m)_QFn=)&%%BUL;IgH!{JIcqy#y?i5IFwa3^JV)T|XEj=A?tLe9UFh+Ua zO>nenYrMsBcY2BQ$5p+Cv@OfQ+c~+p?NVNzmEKYKcDyI8mK=)yo6*CYyU(%ez3b;g@A?_< zEO^e39D!Ho&!@cS&*zT5yurYMHGlN2IclsQjB*-%?g>28^S%L|jlMP4{0TWo zfP{7sM^FFXH}l>WSx$0yPFB*+dvD&%H#6US-|s7vm*pq};9yR)^QI7trCEm}gYW0P zO(|$C>+^^Da|-;8d7|s3!U)98MC(KwF*nf`%uU|L$lMfjK+|~%B+~E~O-W-?Y6>4> zpf3g;QEk)=deD4SCw4Jga(!)ya+1YFJ-QyW4SE>#V7)vd|F5n`*Mmek$^W7rp$9?t$6A4TBAgPU`pzb(G*La{&ef6+VXf3SXK9oIuli6Xo``wn0{a4*EE?39TkQ6uxPjLD}{!9-IqMNv1Uwf9EjX~1jJd&B4$(grRiGp~5RW+|9 zll#SI4(>~|8Vs3<`}aTd;swVOGx4|OIL=I5d@<8wv3N3HRPR-xs|4qoX4 zkK{3#)IsqCzIQ z9EIK@Z*ERjW?E{p#bl7|%x=-NSBNr=LaZ^lI%SgGAse`i9H8`(u#=VjkBRVN=o9Tt zwOyvUgtndSvj^vxX{xeg^xmq*4ohfgB-B*rD|giOmxZ^e*Y0lW7!K48)|FQ`V61qb zl?>405u#nf?@4c5qx?_grx7VXso!sCj+B>S{PcRf*b8w#>O0qS{>XEnx$>DveJye2 zpNy2Z#+B>uF(tfpj`BBS$}d+w5UHmvQoeS3W1p*wd9FS3+~4GSCEBizm~vV9ROCH@ zxbh^uJmGhda=c%ziBX2OhjSr2y2 z^AAo4F-s##^Zp2J{~SwmB{fq17fy3Ua)Eyk%^Rf-oU`+pparQ=5^5pz$M}H}y$(rc zAgSg<7RFMT(aelXNnnP;WYRsHmJH*zG@qENa}-~M%6QCZHl2K5&xL~C&H$5oy8|0K zH?+0*nyMOz8(n?2Ra727(V?(aWN|$=7vUJH=)K=)g z^u~JNwC4Qg`x@Vx=ktCNV_?D_lO;K&^B%P*ILlOL;)R&V&@eRcq#IB%hmGN3AUL;U z)ph85t=df*#1aYuWMoodfz6riOiSTT(^)J_1I)cHZtXWULR$u#h7?W!qo$IQ3Od#~ zW@7VUSvHRaHZSZt;_vG6`#L)Hb5F?z{PTtS*0x{6~2E8+iNwFMg5e-~YxhGVZbW_KQ3heRNdk zhnipHWKL&T)|%5?=h5dh z0JGI|TDuPI=-uYD2A)UfG^Q_2=A1?^cg)b`4gs^!oHlP>SlHY#YLVseJhP1EV?O&Z zuPvC$Gv^1IF1vTxv!}UZTTjO=9X;J0w+6bgH}$Oi9e&8KK%T9VhJphCEeW@WyiEI% zvJqGGZ)FW_vtH54q$&ja=)Ig0Z<`5rQR zBwG@44Y_!|0=My;O6F@cF(B;kHGIoEEb7gJq0nH)$*ETiP*7^!ELozRNL=OTNx6-EALh?e1>9mvRvmI&Bu6i`jB9lZRWC=GZia;_H zh?5KfAS`hSU}MW!5=8kq?psrCAW_-vDn$J1Dq|1CWs(~VaUBLy1t^63e?{cwn0Y%s zJF_`30#}mz?+;H+&C8}?yRW0e=WlDX9GIP-IUjv)8Q!{ec=@@d<^bmJL_6m11fRde z>rCLudDvrsuHg_KY%>bH)g`Pk%=(NBDackF%&o|RGUmxso zxz>-f#e#ya-rfj5F>zk~lE$mCM{0Z~w){_;U77bQ=KiSWNT4hM@+ei%hsYi5LZt8QuOb4=O}+YQjT_UnOoe? z+qDKg-q7stf*vGui~BL#qx9o4wcj60T+byK}K^kH>rX&x10P%vYLrC%_mD^ z1MT23$W>(09B%3DH71gwEPPab`1nFv*x2B)mDpjGSO4&42mS%gYHUt8GJEUHks~wn z^;fR13|cdVODKSbB=v z;Fc=vHL>`;%V~1O%TE#Xe&|>@HEcON5k7Jx+|l+%8_@f?hAY;s8$U90D~Im$^8ww1 z-Lzpa^1zoe$pZ+UbpTJXaZr4VW{QqN-I)?V1_!LJI@FCtN45@^)5clH&+ff<+s6Cu z3;g02?6#@xJtLu(=_z#|AL}9bzmi;5E}j2qmQf~zUGTmVbeZ-pwggTf&k^*4L55G% z3~gfYi7E(UL(p$gl=fkMpO_0Vw}pbXLb&LaI_>3!<#e$UtM??FD|AFIp%ByU}_{H=48zZqA40p^yd|L<|-w5~<@ z>r@Vkk_}bHxZ1?H!d|2~0BVqLcdVNpTsd4;x9+BA)1`89)8hg#oF|!V8tNLK4|g;* zcgm+vE%`h4OsY4tT`gU`9qI#kCHjhg^iJ7GCvUB+to(((E2q#l`~_dfH`zMXZq*5NEGbK;}^l@HNf5QPK z!-_a6_&RZeuIAC~T6bG}_d9In_^wma!8Z2UspYrl4&!!=73!5ch#zS0ds7zgqd1H@ ztjlDwUxCNP_%h=`NW8M#9vc;KmOrzf{F$LXPltDZy1hR{x>C^4448 z-P5ok;vIOm83iU`LqwazyFFN+-#|HZbF_v0n^VZ{q4yn4fF#D{?^X&N1jY&*C^>$T zUD1JI6rIlo=VvDdrygg;?vj6=9ALkkT7J&qrS-<^C5)LR(fbj9+{oW2>^Hv#PXeZ$ zfmlR@EDGObZ1YHLjPApKS2wGJDcQ0)_-~EsCU7)?t^%8#Qu6})#0RRE3hul1Kb9^_ zPDw~ix>zns7~9fwsDIOz-sLZ|?T(hTv=)c@ARiBE6ZgBOHl4%ox)5~Z{?(%0pxZwF zY$Be$6m&v=-oUf)yMCLk_Pf?;$@^v_$7`9;!?RI)P!~Q%4sV7v0o#+`=SPf-gZ!>Z zoTbeaLd(KYQ1zo91zjH+occ{@=&w`iTf0KLUIck32R_Vc*@`w5V^4KT+X%TKPX)1~ zW*a$F!>w2C!)B8~;V&!*=Hod`E$+|=B17bkTnq)%anUI`T~?>nU5bD`GOI%&(9}aA zWYBg%n3uLK*fLtT8jTI5j=Cg+vC&=MHPvD-8YwPlkv)B`%8F7~likJ#zBLJ2ay%ZRO6x_#^|k#g8}k_Dm^1INo0X%&-(ERN z8yM#L>SuL~oqUxzX06q!`-4w`FMtDJjm$if!OhpA?{=&|WsXcb=qr5Ki31tnu4FI- z3}D42=szw%N+w4hh)An%2?bN}M4@Ca&9J)RomHT7Ds2a+*czQUZvUFdCEc~ozs_roTl zl}Gh9DyMx*^e?Knk$zSaDUa%B@%@PEXH*W^L92)BXOIzyeiUDlBe|u6k7Tka1nhvf zB90B9{RpUvw)oxB|=lnVL7_%G@k=GjSZSJ z##&%7pAG99&93nhyJOXyu)79F9ks~~{qa+S<}B|Up95vu+`ww(`o&_a~Q(#{!k z{~L0jc0XvuX(#UgTSVuja#|Cj{4X)(*)enP4-s7$V?c76HU_J8;bO$110#Xz!Trvl zhsF4!3%rsK1C(D!36sh^CDo4VB71r&P`#K)N^;qV)qPjHqQ{`@hgy1zJSMa7M6azV zwEUQ#Sc#oiLHJs(xYI+u$n!kx<@K9X~}KP!iO zm)pp_+}Gq)vYn%aM-~QsRWn;0M;1n#%NpdTi>lkYFKO#mo+~ao*su;Tv!m;1+sHYYaUWRnb&%Dgd2ho37W=*N5C9SS-s%9#{s zZ}HdHmN!>4J0K?K=i0I|(y+M7SXl~WwVVk4ah83GkPzKI6>oU)>(;7My(1&NWexd= zlE`Z;ebCt{WRT!xXU6ySF%Nw={JJhxfckOal6z6ws z6yL`x+{>jE6{XAW3U!430C~ZCLf8w<92ap)dmhb*w?7dQB18e=IUN4!;vU+N$SGKX z3k7iuC;lD;D`eZSBXau_i3yNvc(6irBjj@lHag%(amJ?*q4R<9h4AK%F@W_){GFZt z=FZMj^65oi$N4iKn>|0^yX@mk62>P&>qURItZd`{R%B1x_h=^kM!7w$9y5X3%k60~ zd^Enj)TeWGM>t|Dz_M5O$sOsFuC(i&%J9eaX-im9Okj9MU;~XY z9<5;?lV!_j$L6^?vZ%26pXx}>$1n2*&Y%6*%=sO@MMMuuG1e54J(n=?3NYua(o~%6 znNM*5n1Lr_Wl&5!1jQEwiy{|SiK5~LA&J6ce+^00=Hl$uma#;zdDqt63xW2-T)H~2 zqpYO8=W_Lve2?Mn;=HE?6e2n1*qY^UX*!7m@+JBKo+R#nN7L!HU_VcRJoawB@LYTp zzVMLE5F$pt@YX~M-YsWky5}GHaZ{oY?h8*Gm<+X)DTX`JXuj|+mOpX+E`L=;6Py$V zA6(es*|uj_eTAo{ZhUZR%dQ3U*t%jzxzp(}C*@x~G&bCoSLAlKr6i{gZy27Sy_mO` z_q#*uw~*gfmvcD{<43qL_3!`U2ao<^F_0g8kH{VK{`}zM9*g+FS2Sd{HJr;2{=Mm^ zTTFjK7So2D!R_xt%oGdvAQo9=I!z;8=O(RP%Pzy`&}v%hvMuE?04*_x1nqSlWdds? z2ma<|l_X?a-G4CtjRxx@X#JwboY(oCG#kg0S z&55%J^=eHdAgVwr$jt@>Fa9MXfrB5WyNLOYaQGM;Ve=*Y^`HA38gN(t<~KHdh??-B zO7GVgblVulo#BlQO%?;5150mmDzM&_*qb~OymKnDpl01;q?nY9Swl0h{) ziwBT#QY7RUa-s%RNNS1zisI>UG_-SmK1vgL-$y^Xd|Nza_*h_#(^$Br!Qcj@eKHj> z21hL9%}BUf0;UCrz>^YEUBK-zOspX6&3&KvSQFL~+KjaX8iIenBj1MK z!e3nmzQ|+M$w?h_)D>g+K)w&Z{mQu`;ef9hfn4z0XWP{WJG#3&=r_-GLbfG=T@3K| z>iX~Ma$WyjU9RiDtIKsBA<9Yr6!q)+rzroMR_=wb9&{^UB=r7Qf$=Ns;a7Ex|6KRd zyWj7!^x2B z?3nfvjt!^qAQ>D2;|nX=92jL60XGG-DkwgCjjN$xqRX1;asj=vS5o!`Ohs(Ch@%s_ zu#1dTPS3V*dy}tY%(bbu;mGXlq3^OC>H`#r!*)RRt?{eBojWA#8Pw(-d@se)<}w5T zH_T0ny+E7M7g7GUyhSUIzyA$+Fs7XPF7E%EENoVye$smLEa|@Fe6u+}`9Ae8>Tf=uR0y~`>GODZHFO;s&lJfSEH+^bf!;%^z>=l`MSL!L zjHqA{l91z%2}xiNkNw-elXycyn(4wl>KmtiA{*4NBmX24cd&I7WkR&$^>f za-DXfoMv#3Y+&EVyHeTs6vJ|pd<`7X-!`A%{n z1AW$tN#NVsd&MM7uv&y<->H6|bNQP*aFA`A9^HLi&3Zn(~brni1_a%j6RQ5K!k!M8AH)P1*5d7 zAQ<)CHW=aN4e8_T$Ke01JqGavPlbX7g?5Unvbzi26j`N(D{EJI|Kkt*EPb%5N_zcNXPU zX6I7hA7$TU_scJHTppH2^bhXm$`Vj{Tn$CQc>us?Ve?w+&W+9cy1RY!A^fM%>15w* zuN$gs=Rc}k_945|i61U8=f!%aF~LGYyQc7i@~TqYKebEGr>aTs`Q)CfK;TrA0tM?$ z3;s_+7DDaOMzP|Qj^69C6Jvu*sbh59# zoy0NB>5zCY+Cdl|7a-wZpyzgqyqy+0Pc;HLm~uOrDB}R$nQ@YRPJImZE}sq zh7?G^N_qG)vPBVD;Nheg3p zW918ThcBDkS2@b6_OT0DSp7O%$3GuauV>rThv*9RfJJ{gkB334pF`* zBiYTM=duKavLA4Opjb%j6oOPj(t1fzL4Iy_W_nr*cgU(@Rf#6^ahA^_Q_U>*8wsZ{y4pb|A3*XIJb*=)q}t5FBxj59Z5zfSBD-x_LN%`7Vqve+QrASAl*ekp&#( zkcxP|G;ldS?)*ECDZ_WZ7HF?$l6B<_&#j&&4G%s{Y!@mb@~A^T#xh48bKJ;_<;KP2 z$Q87nE{hlsX97^q6nw?h&43Sv(WGU@qIrvCg$jUdYgUC@HnS7qubJd66Nc@Blk8=r z^E#kL3WRI_J{P%q)lG7A9CF%V0)VCj(i_`}lfwZ)MgKb~-pe;3c7tcS=K16L7 z;|RT^VdXX1gTTuiNOfMRHy9*ua(Mzv6Z;?h{+7&15EtQ{XOfmc24vsHWy5GLHW&mW zmE(td8wl4NpmmY@ z#qQ1=@w^be)YX>~W`)MY$Cyq1{hZmzc8fUSDezlA-jyUFw6(~JlOlzY# z)DumGvF)XH+t_c_&D+l3cwk!tZ}l6+o1vo8tHh1mY(_~5O;|8v>S+!y{u_!F01h7MjKU%u?QOp_sEa|glV zMj2JnZ}1g3uFjHp!bfX|IIU=G+nL3i3Vm&g+m-G%jZ)|_Ah&qs%ovC~rC?c}s%WOl+lv^cQQ zi}aKvG?COq)6q>Z1Fb_>V9GnSv}c+rQ|hHK1U5H#sr$PpeUrP0nQdulXliId6IR|{ zIU}z}J8~q4v{!KR5)6e&l1&t?pi3NRlrl$x2#Ie6Fo3Ro3uW{ufHjYNT*&F!X#khc zl;HNCPlpv`XSi{q28k#p+Df^IqBUP*`OzL2t$9UoKX5f|oSxoz!*K%}4zjtX(#p!x zCd1awW;t8^>BNSE0~7KMYTJ%|TdPVha95&L@JQqRvBGBtvJ<8y+5uzq5@9%?tI3ow zn`nfImWxh>1=%8XE;2$Pm9vRbeQ5th+m+#ukhO8!2e&m1g+fC&eDK#z?urU`6Uh2A zR;K=J8&0g+#^%*~$0|IB&=T5@wERWjX;<*IOSnlQHn~qFfL?(Zp^B;3?6m6uOG@_0FLn#U(l#NnNXc=Q;+NdQD;)piprx2iM z>Qau5GSR-SU;Ltrw{HOsLcm0+Sr<(miRPxEG#y0OU09%$zt<@BM!$3U6yLdg3dsfc zX?bpO-zcX)e#nKG>)8_W^4b8Ez>JHfNCzzN>7h+_7(euFC0ojNS_y16^Qpm;(b)VX z_;GJJIO>}+_U~uwkELzgx?v)`x!GTV)js*B^if2aKgT>r+pASFM95Mr=-L3fQl7`d z!Zpl+A;;++NRCF)Py}`7YmxD=o=Xzs(t==lE@GCeh7 z$3SvOix6cIqzZus(_7O3L3;8L(0#$7m0mp*LQ1)j$>FgbJI2Z@E6d9&DlEGv?pD8y zY5tvSCwA?cP;Z>ry}7x89Ve!uUf0l!zCq^Udo}SsnjZiSY%_L*vWymS-iA%PAe9LW&6#WX&BKRMZ4f6Bd`rR75GX@kkL3 zv$Yi5i8f1G@#GbW@deSKM7i`~C%K22`x@J6u)~qD*Zu6Qe8{7d;3e*82U{#A0qLbF zYsX{c!(ql~Ea0h!AP%A__@_@gO*=+p?aBFh(pT@fhxJad;M8v>)Nf$T4nZauMBVAM zkDwmmdu&uFhm=Crm9Sub@Lko#j&vy2yoWzHHrerD zG_CS~zIqcSRtB~3&MkN+^(RfL3s&R%yS^=66p64{dKt*O1qsO;COY+0=$GR)NJozK zTLPLR&k*!3S5Ohgv=~%RA#0k; zcj@J^=|)bR2tPR-pK)aP$tQVV1L!McdaPZ{?z3f4;@k;_u#kYF!^o9g5=vS{U|Ki1N;Cx>Km+pahK_?|D7R9a;S)&Yj{}{*BA@0)7&*eP-y?@uaZC&nn8i7A zi0ORd-ExSPFC1f=f_{H6d~9Li*s%qF@DD*S>wh~!Vbic!%&A|UKQ!6XcF{#`J(zv8 z=h1$W!n2&=bR+N!sE4upT-5h4u4NP?2&X4FsGGHRMKcpCx;K-R1RfC`wd>%)T}Wzn z`i+jZwhkm9eIsBwgv8z9g9iZ}%pYc-JrL;b4yc_yffFYJJ+wb)xlS;@9>F+MTm|jV zlrPLnXBMS#r%8Q-0N2p>2WTC_%Ys;RK4F3R-U4q{W-_o29@MDQk@O{uGwDd0k1iy& zc)u)Gv+G#!*!ayi4^7LaOn*VL5%)9p2ljWtMoGZbv-gr#9)pnnVN_QI~E zo~-nED!~&@f~aX|pUATg1x~c(U9h+hsXvxI(<(L;8Xx{V$B(~^0#x3;AQ#{CO2*tE%TjA!x#^}?*u~!(nnhPZ11-)LbM&R?ck&yKjrRmi;OH+?hO&3T z;_UB<#UVW`yvg-Q6mVx#`mqB$cGi#8&QI?@IumXfYY4M^mi!j}ssFA1zccuUcXzJ* z1O6t}z~9D$qnLRDc{5|&DyR@Vb7@Un`aOAR7#VR$yg+p+( zBS$ef7Zw!<*GUwMPFt3;^#aRcLTjb3wyB~11D93Sglfv04U3ljTWY3uceVGgJFvqv z)RSLSUFxpcT;}XAvGIr0f>z>zwisbahh#E27|-&d4Cw(dyqyBO{&k>8~fpOrO zweUP#(Zs0thv#9^yK=KCOEK#&3x731**t05-n*5xf+*kr^<}VgqaDC}u-ADcyM!|c zvaM&IL0}i*BLX$U89X_31_2-+bUx+`0$)?7OotE@DK=aG75zy_5SO0RONeNK9G=?+ z;a-tF|LW*WPw#a8X!-O+<@rYz-8lbbg9Cd-EsRaEbKtDAUE)R{7Tw?@z$4&Xw#o3X z!r@=Zo?rfQ`SkC9FV->nh}WR|!cL*ju{bP}Pq1@ik(2DxR4I{6ZNhkJezvF+3{&G3 z$ddwI@k8E+X3*0GddBDPj4(mm6N`6pDL3QHGwk=zupdlLstvqOVN0agGT0394qq0TTw|1xGDCeYC&B1a04_Q7B%GK^$pNs`N1 zXwNFhDu7onTrFWBuyM%I;M3fkIpD}44x6$HZe(os!1*)VW)B>g-Q3dIc^y72r%vtP zdCQJ{r%vtLam&vAr+^&Z(A{=RdrwdMElAkF`@nHi*jbHGy=bfvqQ?FKI$24sOka&P z0+FHSN3lkCupVCKbYb)B?jXGE3jaUZ%Q@n9(+XWjh;CQ1)tzuS^>@mir)S2;XF}DL71bCTyo-L&yH?vrF&_wP z#0%rF#wft4*++pjp7qY_uYY4dy>$ORdg(s)LMZmFI>t!-Bh7pj#)vn@VT?(LpCp7c zDK!ZIj_9n0G3qZS#f<}W0%5ES?b#Dr0l-+<(AwGn$AxESHjVEj{xs55Qv=6K>bC-X zaUJ?i_~J(gANFE*DM4`@zKFR5DIf-46gVWod8_V2mHKT2kLiCCBw4n`-MB*_l6Wo( zNUn`YiU44oG^zutP)*4Q6-6W!YhG~z%WD}3g*JTffWn4**tQmDdAYO2FxAn>=AYiW zzNT+0`?31R>HS;Eoz>2AG^rg#p#HCkM`8@#2Of!h7GmrP<|TzWibuAGt{rWq_FRAM zPg|W{uM_S?&ph+Y*8a+MTUmzs$FXupm7{|Aw&p($o(HQ0zK=oIp%{&R_U|NlJRt=^ zBdh?u{C(knnhY1gD9?%iaS4vAYVd01_+P{`0{CAA5^sf-&gRyhFMqkG)z^hD$L4lj zbdhCoTb(c1Ub?lQy}P+~+inCa@tnq+LDOiQy_Q=5eOg_v$LpUfMjRc6$>cPUV(6vV zk&wLtKnV`!QeZ8nBLpDI8sS0$Sb@Tsgu$jzDnvYh8`uKy;-bn7bO@sZKtT`GzyJw^ z6MsyGKl#bn3=3f-Uqe2f5fQHXeOAt+GJh$zP*bE9juFukP+&Hj#XDGCD^T5#b^bp1TUDI@{~F#t)L8Lf6^;A{ z^{b11U=0ukaBh4MTtLGI(^BEoke-^ImW@Y%g?TtWNbbGl?M$I zF@uqrJm90yVB#FSkQ0lzYc~9i`Dj!8EjcY{nF1nX9Pv1g&H${_x4rG%JPvniD*V6$ z$mvhPxX354y{nCx^-+(R3vciQ156^Bt%%cV&Acu4bK-#!!sW_cP{dKH$KgQHSGMr3a zHBA5hF4!R7@E~*I_Bd=1;SNfa(8HxGFFQI5C- zGmi0wTP;%@BENUdH?DeIeR-al=aVxN44GsoWv{FI*)4S;q!kx!n!`I{eWT!UP5GSB z#xLn@jQXJ9HJT3!=vyG{5>f&Tl0d8@hQ1mQ7-Bzi0!UJ=G-9`tC8m#0|dJ3G)gTis1ftQA z0}vo14ACGX`6SoZ8Ii#QWZZROdS+(&g`9-H>)o-VN3{w12_2v67d|_hzZ1Ss;Rc2L zEQr4N%LF|p5Nv}Xn$AO07Gc&92qK1)j*KV!a=Br|Y{u-A%t>Zgyb??ah~43Xn~1@+ zf*&&NGr}HM=h;bo9+xklo>rg50TN%I1|k9)#Q6!~J6b~i513as^6NyCh|dpb0(}vj zhx|nlQ-oQCd?28S44-0|qM;+LqzIM-*qzGB;}Lf!WoBd<%rJHNtO~JetKzV2eB~AP zbM+(t@7HY4B%F}aCnnXus;}UUXa}@eU%v?6| z?wJlWPc{dp;pFoWe0tbU_5O}N_`f*&I_PhB_GmtN^lmS3f3Gw%_;3kH{n&C1aNaqD zjg}j@Ylg`xrOaZt;Uq$!EWgE&fQ5aIdqhGLujI91OZJv&?QQhYF_0n)5%-28dCW%* z*EVVB=C+0p=li`EFD_o}_2=L6Z=Sk!t*z_oJRyVPTIXY_^T&?OtAFzKLF5me?DH`z zdGD#e_w}6wofY&2d<9${4TgQWaRrn{9xRLs=LH_}UZQgKvwAr{7uYLGFn+;EIqcR_ zw4B?oS3V25kIt;4a#)LT|17`%V*HKq=H(yd<)7x|cni@MTz^G-FP=g>cVXWCS@|;V zPbZlk_3-+o5~?Sz9QB|tlh{N1P=5~LH759mk~tiQ)hfo5xN1_6cepm`w}! zAX9}c3rv+C!37T*Iy8~u`!tp+_ALUxNw(C|%8RK(zS`!^GqdA3F;AXHsP9ODo*|P5 zBU942(?|-6 z5s$kp_XiN?-gQd;4gxQ0wzPC^OHZ5GfXK^JELp@}`g}O(jM^QQqs}_Np^`f+@)nZS z9>EgSGGDCdWIGcpG@UvXFEO1${UTo~on1nCNg$0UBReWIFECHMn=;)lfgD}ELB#NiGf8@%k&hJQL2`!Ez|+R4-xg`)6^Rz8g?N) zwQzpWtcMiJ2yl@SRj;qxxo=~4VExim{pP)vMMGm*ePw-J#o)lYGw#$m=bQVFyF0$dHD;m9m7P+vObb z6iXe^ss4=Y2BSG2t`SXW8*j0nPNV>?PtYd^P1slJkB9dy&fKVehu#0^$mZ6jO9%T- zT~)txbnu_2ub!TJZ1e_SWqnuwHE09z9y(_tOWJ~XefarlxuVFGSenBgDpm3Zfa~ye zL9WD9Mhk}Aqw3?X#^;PeGf8{U(;`Lm@ky-T)j6YAv(kO3HGyCGb0bpl$%!kml8=!Ux%X7mx##+TRs8ew^~LFfI?2 zVHb+a>&8hU^179i9W5rW8=B$3P{rhR`^4b%Gpx*Aat-pjRZgjwI6Rcs4N?$g9Dsa4 zcA==u$9*Jn_x6ttF*|N%k2^tL56l!VLE)iSDb-o4F>X!xTi}R?F9}5R`nGyXUL>D2q zaDI;YO36S%;nrqfAUr20_}bd)(HA8CK-6td529{46Yun$_&DvOB=b@n7NsyIdW^4( z;7o(lh?{Q@wj}Y%ikSlA9(+?ZuK=tYM9_-~f^G%4IuV^%z?X+@eS@Wf% zt#$4iK&vP62dtSk_OAump@UZscDMChxbTf{Hg|P3f9%e#jUzofyNCbfitK_T^BZPT zQ;jP*i+OFm8Lfi9s+jD@w)_~qt2`5~TuYMjE|9JEW$W0p& z>{6UZ6$A_8uE{d!O*c@0Ja`y#u`=K?t77E!xlX{OFd^{{$+;st9-JMQv**g3xrVt- z%&FG1A5KiDr^_m~V;`V=X$sbV238sOsu9@;;8=lX*JE_GbzX~g&KZC;6aJgInZ?#( za`wgclD*JyGm-2C z8#hn(LT3#O$xgJZhmGQdlTZ}04sl_jl9NZA1`X*Z zdK?2n_RSKK37f>AXde6Iye2lq)xIa?-E+-wiDqdJHnum<_0U-i$caN4wXa7;?McPB zuK6T9?cmLGeS3Fr>-F&Hq4hv^Ci3e@CA|W>huAtWo5nf%bpxpNbE1*HXo84>Uflq)N=0~!$GfSNKxs|&)ZII)9PBUH70p{~{gn|AJ- zF}8Nqlsm|L$fng#w)e1~g$5tv7Q~+R$I8iO??zi15m{lP7=@J~;fb{}#E}%Di?D$b z76j~$FQrOh(wisUo?2-#RdbCCvNPJ3!P`jghB0l7C|oYAw%PrmVB1hzFtmR*(y$=e z=Ys9jNVJaL>%%;8Va`_2oGl|Qbf~D%Y=Tb?JTPT`gdPZG5b`pe6-;PBlFRzU-! z<&*N;u$9{obd41x%$c;3ygo5?h=&@Dr`r2Qdh-k0>?I>5_O@dCy0N~F`Yw~H%Q89m z{FVbryA3TBFN~IZo_x|%KKg>U*|*4c<{A0A3ZaubEl%pPAZZzoi#OE1|*28Ja z+vybbXWj16p(Wm(wCu(1L!UoXc>$oYIVfb}sw^1*jbRC;T`dKNXm;Od&tO?GH%V zNg>(6XOlWgHc#qzH3vxG&;fliBRhk3OHwDbz&1L|QCBEQ6Y?vXe@*4gw98r1R2lDP zqq;S{QggNuZPok}z*oMD0$EDMn%Rgp=E7@fAh{4jijgm0ty)KkjHP<+9wQn5D!w!q|nwo&F-L3St0O8Wxkc^pMxq?Y>?1A}rXUTD5k?91vaFjT1jV2d3c^647& z^&0ig8XUDu^uoKem_MFLCrKoAqtV3Nr1Q3sL2Lr!DbK))12h9Iq^S!0KMf8YCL=#p znq0gwt}X?nfhC!_rmi@n$kkW8jg8IPqyDM~c;Ra*{?yYbisc-d%gDs&JLxW+!SKCqUI^^r@*xTPR)9$M)KUm`{F7O4Ks`l6U8FQET zyFV8g8fdRtpW)Bh*&3W_t{(NZ4|LSKgBkw3rS87P)|zp4fBi^SbM}OIW749@06GTdpI)t6cwhYF{#v9SXNY)V@tEA+W{s)#L*9Mh`}M_ z0eU|d{YebuhxQ&nzPNbYztBe^V)U^)9Ck$5TaJeHv)v(_Z5?Q1ooxdHZR(S41HW<6 z4R(sa2ag58=uB%1#Vi7lz{#dui*M0TRoZ#@nfJKEg1B&g%qIXYoCZX?apD*rQBJ) z7z@INilp8kP8rL2}E z3`q-UAAbB1?MotQoY)*4zJP530jYaHel#hbHsrsRnaLBm;LSeP$hcjT-K0LolJ={= zdoBFYJJ~<0edS+Nw^RMXR(D!*NW;O6I0XtvZxSm50jT$In?3=fh=QO%0uW=VKn@t3 z3if==F7RDCH3f{r!EjavHycG9FgQ+Va>38Vp*t+le5}}hBr$9V_&Nd|9qyLoc>}vv z{h6Xz);CWs9JTD+R8bvl?{5#fi`lJHue-_)%=gbzFqSL@FlK}$+0bg}aTcr{P89f9 zChX-z5e%5r0yL3Alpv!!avX@XH%kakiVPJnFu=z-5u}qVE4;Y`!d7qC*WoI8Xy11d zti2T-Qw<&GZ4f6<4O?(jRqgH;R;hkou{&B8diu|6pV-vfGd|wayNQn*zzg_Zora}< z{1JfM9CM(s)?6{W4^c-5a*Uj8UJ%R^m&C-6yCz)6k*o}xC|^`Kla-hadyE;?KZV)P zRwVg~V?Uhc$s80OV~{7m3aqVM@{Cd%A+H3&G$*Yp|+c%&)s$D(G!9$pCtEw0ii$%`&0Fj1w>CFTmK5*lY@MuUk0n_$x;?e+?X}*Z zdUKDjVx2WTBXfOOa}TIScc>u4B%g10@T zrbIFxLbISv2?A`Sa|)#e)kpuSXA-PEV$}OF4@yfuWzYtnjVtyN|3Yv7-j4RY>+5#6 zs6Sx~<6`i~Y15C|Uv1DJ(ZYiK^t5-QKh4nW!koe^>?9O?5;bit0c*!~%wBPw#a_Py*TwU2(O%>FHK_kzSO=bm;J3#0oALY?_;pBX zYh1q;&p*Q7Kep!e5ApU>`>@8u^KtFJ3-y1CKaXKpqyF1gPOzu>b$D$p|C#!)d}aC1 zk^WQrp6B%0qCX$4AM@^Jb|d?)vH_ApTz>j-4i|~Vw0VvE^zWGiXJGT@fq^Ys2E0{O zUVPY%W9x2PH#&+RV?EWL+dNfO_`!WTnRGY1o&7-RJZldgi`j!Wan(lKgOl=LlaB1c zcVBh!TzHY)-pfiS#{1Q~X?v0GK%LaDciDr-qx;MzZi&-XD+0WSRq2p;)Ipo6CGcw#=I*>n&7El|m0d4<9=|V=G!;jgr()cz! z_;4aPCi245ZhUCfW;_<%j6w8*p!*z~cKm&zAjEc35>jE0!)}$&@=ec)4MtE_ih@1}9{`sQvd7>4Y}%z^$r3%s*?ozk=lVWPoX^CyNE@+4+M)})HW>#D<;AY@3Rk6dJ+nNK z-_hE)ncdj!&nv1ZEv+d0bMG~k8#;Ty5M=2?e0_8RD=nmb8JXMT_vNt|3=vJTW-`h! zP-rboNiv(H43?n}1-4}nqfu)GiL^RbX4U-@Ihp5;US_s8xAbh?Kx@NYUCnMB=`QZK z-~WVjAkaP1jg}#1zqA5$y9;CTEzm7?AI@51A0FfJTUa@3?8A|3ar-bWEGxxyLg;_- zGauQ&ydT56c6VL5S>y;(q}xD`r?IXGwP~b%pgJ!TlP+c-Cf1?v!=Q-Q1Ej3c+vq5U z>o<&zMr~?>9s<4Rqax;I{2rXMY7bsNUR&v{9O>yDsqmE7j8Es}+VaXAC7yz+(#rgt z;^OSQN_Jycv!gRJtF@@Uy}iDuB`dSj+1!QGsS^_&S@}i9`I*iiIqbI5#FUgomyMtQ z%X#4K?0NKw#`xTOuV9IrWQ;M-B7rd`1ijQ{O3DRxlHr z->@ymx;GJn>-J!PZx=&5(p}hZfAA+XxHQOuckmo;khK&kFNnP!$T9$*;5JFe2Xej0il%{sYExWipeB-GScjtIs*;e_4O9n2nSES zzZ9#U32i5?zfdk&UN(*qjrJFst=?alV)np8nfi%d8_Y(0i|Mb`3fQH{T2yF9C>?wr zP(2iobNAPV4m+akF1ClWH=u{C?+Yh3Ub{btZvEP%bt{qOE_>E({`}X|x4lSx!APS+ z)R%npr9%1%AH5W@ak!nbC5etrAbGoY)$Wl9?wpu(k`l;}TLg@0DNF*+wuFSqrlbk% zt7enMyhln(GR>qVrz)l-(`W&58L!d^|2Nfyg5|}<1qH~-Sy5b3Ugq_bx*R11MFpT- z{EkFtgVRK@Vv(FW4pG3dNq3*#Qtj`*j8FCmF>h|G%_%I*%_(XN zG_`aa{S|d>>IJkEB2<;70q9j}@(qxZol--vwm3Bj&dN~8v6={6RzUXZ_mKUp`jZytUywHQn7cO^rKtA+6#5Gshxp-eicmZwoP||+Ybmi|t)<#qR$E)0e&n7DjDOFs{ z>ZT1Jk&J+HaCmSEPPMaUB*Z&Pu+W}LUFHhS9dVP_yug6Ox#xNq!txpn}tg@x*V?T>%fep`z3`|?Uk z^7`_N*ZK?11l@j#d~z3oe;8n;#tCvbJ5RV!azI6lS&uvdml-KF$!IlY;zmQJ5gUnH zfoQ0h#9(REVP@MQTVsLCg|+N(75toCdFiFC zKv+|)8R_R72p`;DZOlFGPSHzS*9( z>1JiuPa=dw7Pggb?8kB?=;)B{)A|Ic9)k5DtWSecG3+JR0lxl_M-~Uc!fBT$+$|V< zm`+de(%s-S7mlR?1LoZVuX$~=Vgo0`7TVF(c z(!lMiF(=|`#m0)*K)+aq=@wI2!-$*v z`kL|iGyjRd@E~T-cDY%em+EPy6c^>CCt2Vg&xWeY%U~lIz#S5sh^f7>Fk8XND}FEZ zLcf>JgZERYG|8}J7?fWpi>&bPr{ger&igt1DY694{F!*<8|}Ye=;2 z%rYnB_B%G?`=-K#oK9=ga1*8Tf{ePod7!X0(OJ?|bLRo&b0PIxA@viWu5=6PzM0nzI)Pyb0YiZyK^(`fQ3)P9$azHu zu?%iQF<^zjjfH>M&HuOq^{NL#Y&OKYg^hw32>Ak$H$QAputg|oaQ{ZFdr}i+mTZx6 zGO7d{9G&!@o+2kDwI%_9fiu4y&lKe2RBM80`5XBUoM6!C#~b+viWVtbIJSU3E@(~FugdeF zg(7*lYz9xdReLIK(>GKSb`i=}at41sCkQh*Ox(0RAB%Y?2O>~E zo8P0}i$Qp2%lmr9fM?ie)O+`^dGQc$>l?5g?_2pB?1nw!WLqnw9?+L3+T~dX1B5VS zQYqvh*Z}mxP!OVXauPr8CXJ=isix%FKth`X+z-jnTz3rb2-kR7y0<30WBAmLVNY$X zXP6c-xtu5#VvJLKn=Gj9*4XTSKLRRybM9ZK*Q(LS^T$ zS8x8r!1X)3wl_3v?>b)k!tJN#K7Jr~CT-ItL#GBW+LT80mky(z2eo>VsGb~Or%a9@ z@B}HMij0T5klb^7*UsxV-gkUHZPP`Ar-m-sls1!l;Nx?rZhwL5*od`v2J@vB-5j_`LG^H859mkG!cnxW$#ZY5yb)AxCXlZP0F{CMV)wKsgWA`;w zhiV$`9}R^n%I20vOvYYh~!BJs03 zB?B22O3`FD;%g&^a#9n)SR-xLo2a$fwX-I^VKt4DqUjf2D4ITbfSTtYPE71;q2`4~ z?{BCHRX5x>#@C_FFHKSzAU3pI@Jq6ZVj=KY6IeuXK}+jE#~R0QNaBynMy<~}e-w40 zB5+3Z5*h``+Pp4lbzK^3yoK{b`Rx!EI<-PNfFEQRGe||j0#eeszi14bAbCwOLh&cj z)%xeFuYTw1tJ!(%eDzlKRy=$ zeL@PNY2byoqWno-emq)^cj~k>NTopsUd`NZBmLP?qk&x_=GpJ`uW$`4Kp^APlV1fVdjY zLlp9XAT!)+yKmpL>Gs{BzLAmR8T%gCeQNgu`!e47hWvc#O*>9)zX5Lq%@3lkZ=kMz z`SLiL-^7a8_t}M5QCfvsD4eVWdT{=nk_9C37I zR5w_8?f+ieufh)tA6#f0n5xmT4LMS^;fFj z)YW658OqW+_9HowpABV_DuUiMD_)~krq^0`<;0kJ)0LBB>_=3krf{MksMq>`s5jEu z*m^PkzhW=4$6*amlc#as&EgY!jO!xpj=26U-2V}Uk|9q^Me;$hcghDf`CBH>4q%IB ztmY&MKBN}pzQ*p(gZ)+8W0Dd35UqZpW_lr%Vr=|b?Cd_ zEqn9LKm3V4d>sGJ?;*6t|Fj;CCYf&k&i4*J`)nEY8??7z%ttZi z-h^$^k5MaruYeaz#)NI~>?Awg7tmJP8zuV;nVaQmHi-i}MM+7#hK z|D*X&T!}nLs@cci*~30g?131Ba^~kT^(7G!4`(>OR_QlZvDtu-IygYE(Q^f>VvzLO z8}WuT_KmmG**9h&0rHp7Yb18&ladRu-Up>*v1+;d378P=I_w%Qs7{ceI!h-AjAcNW zqLb(WQ7A5dGx@%Fyr+)*=C#9LH6^}XX889+i+oUhNqy;e7E{Os)QzdzS3b*j$bW$N zfV_IS(9g4oX+jEKByS=CO$eh5={wlw#KjodBQCEV7eDY?Y&LH%&&&6Qx3a?_cHukU zz`K^;(fX45zWU;d>x<}&-W$cFymO^;Sprls-k;Z%#Dq|S1p+3<`pkoo_vDjLS)Mh8 zdrHx)iFRQRzCwONCT4U~8BK#IoR*&k5P>4yvNBwBb}3h&iHK04>D&s^r?tN?`6}9Q zCY10gwBZp@`0=l16&Q{79Qxa(H|I5?_3L>>2?-86|C`#!>A?PmF||m@c?N3+`CP>| zjUr59Bs(%B3%?V$7mWd5GUep3E1p{Jl%IV1$k*zc9(A1wz5RN7_iLi>THTq{_w;1* z8hyvu#`c}k03~H6Wg^YEco+5EAAJ{zaP-cRr{2j^UVHk;SL=O`eDl@c#J!q%nU^;K zb1F^x8GDO84hz*0VFW0Xuo8?oI~nO!6iTmx`2___*9!>J2Brf@o01>XqA|e#@xAWl zp(%MeS=RJaiy7W<$lJ&Y>G(#!lbR06rLmz?A?OD-Lb6|`Dl>CsYO9>$F3$J5D%&d8 zPfWRs3%sQjZ9iKdGCNC)sw#^%^>lU=yNfET$VVM~qZ@k70M`@Bq_N;|4m{FGyD4S> za=Fh7sW=2+L{*##(i>(HO`yC%8g;vwMkb zalr*09@%2pHF?p|syfA@_#1J2ghi>VI{F1jb}<@HdHMY<8xj)-xW>cPbM)mD`Z9#R zP?SCPL=Hlu;b?tCozRzq*{sLcYl;Ow%9o#>gKSA?k$Q??& zsF}4h6rO7ENttsI6UXQ!f<#d#wBEnkE23l+!Xu;Vc znifNA=Pa-V3?5Vj;G%vTkdn%dpM|-Y)!W$MAOSDxGa=|e>JMYkm+zc91$jh$5%^1k zbRYUXwfr__4se)LCAM-r0}q{qk1Hs}!#Ei0fzW#BX2% z%P{Jb?5Li=J=bFIqh~3K+bGZ7OXXA2C*dFYN0cute|qIVfh*_ZDn}7k{!_?F>JO-0 zuupj9?aP1X&u-`KdKP%guSEG7k}&8x)oqfuugu~%wXIvK20pS#*Up>=Pd2)zR`N5G zlD|S8;_2{Tdf1N_eMuI-(WZyBwtA?IR2$DJXLyJ5vOkPIWJx9Pi<`^mT%bnJmU31c097Y9g*8xQ!CQ1}QoZ{@`ms>d6QvG|mBph9$^s zHqE6brYHzp8I~-T$QML+i-vS-^_WkhYpbyN_gPUe@ILFXSQ6(_k!`3)v?~QcLR}`p zvfZ75x>~10lGgPEHg*p9n`%4i+RHtT8fUc*?x$gccdrHR8+>lQJ-K}bn+7V!0pC1e z7l>H=HPy)4I{NzqS6$J+)LJ*u%I;$I-W-cF6M5FZ{Pwfl?j@94Q``tA)ZhU?#d*1ne^l$c0 zRUY_8csx~!p^*ChYVw4EvqUc!-Durn{oIH3<5BD%l^CssPh%B<7mC#));8|BNUSls zinWF8!i^TqY3+LD9enMYc z6L=jYT=GvNyuBU#qyG0^^-lIcc=>I)>p=JbJD`TbvSs=4y`K!-6?*6){P-kVz|K6l z@(iLyeu#1ZijWT~Q(-}oQVt^H8XWQA7O)4Si&Q>n%wiH_7(O@&V5p5PMt!wb&?70= zysszFL8HNV^}9ZSc45|$K7qHvJb<-G%ycdIK8+3_j&xs0WI74x_wv^Ump?AwzI8cU zDcbtZKPjIYni!Plm-lX!Uw`LUTb0A_ga+F$-Et%TyHxvyaY7zA>F0c$=9a&P7lZ$= zOyM_;;Xi?Qj)`lKt!NCl|A6yjDJgSi_zjC&C- zmWUg;`L2HUJSo>_MSrdZVLsQ?Vb}9MC|1g_{^NrEbH=_Qc(WIr5;P@HX-O|BV zMwKncE){Ux0yy5zZOWEk(GCSqbGzhel&SBtIZ6Pwghn=pc&nc7E@`N95_dlb*&E4N z=a}7C2YLN0jdeus6ZBr2SUeb*6C%^y1;u+)Om`RH6KT3zuy_GXcMfN9fIq++k%-J0 z5mbIo+csgyOLJF@R_KPjOD=&SPxaQO;Ul+OaroQwx3z5}L*9~tts6e>^e8%=KXGE} zC%UZ&Z~`B4k7`rS1GFR`a*qIzI`vcCRuM%;jYhU8K2%tsIEJH;dxqRj#h&4TcY@uv z9ULDrHWN2Z#K+-i7s+hlO4is=UsnsS9cfH6NRdC2_98^GurQp#c$Q*R3#XVu!qJvk z*a}vU|M&h|Gqq2alRa%X#m>f?{GYo_8cU`w;iH^uhqbrC_+46j@V!Z%?`QkIRFpKK z@XBwf3Yb8eCs}L53+%LAcZB#phEq{tVy#f2p0(cq_tN z=Jv&V=X7^=#9CXL8Y(LyVXBI#8!Uylswwmzj&j+CiDnjnry6V!f^JxBAVW)=j=ls> zj%=|wwYrmd?cp;1X{UATNOOHnqw2Esc6Ilt$ZuU!KedK`-(FR3|k6+e|FYrFdK_QG>O(n*q)PeM;h}u(mdM;1N{Vd zV4yEEiGffA@Qn0~@f1u1u{smEBjlY0M7nhb?qdQO4{O)Y1cYA5B2%B>yR>i0sq!w< zOnD<2b@=-a(abDUKgHqoKG5?#NK@6|Fec+$$wuvkjT+=@JIe_2bbm(rWTtMchTrct z=Fj3jx8H}5NwQi8bgOl34Q$q|xv?fz8>_~4i-hx|1<@Ig!I0nrQa7C0if!hi#I7^> zIZPc**>*|uw(^S3UQLx@+bN&W|C(m;{;I)ued>_*ZG-KiH3lqjwtWP!u(B{Cuiw`e z-s8og)L#E_IFIiSr=Em$`$Y;sS?8r2jzxZj}kXVhD9Al9D5Ij4r9qGk!%3(}zBIHvr z25Kodmd%5~xj|Z|hK_c|;yvy2JLZuOG3MIbB+jZDY@hPdVxgCyGE?FwXQn+fN5MLf zgO(kND&1*|5{MvJ&*TuIZzo-%o3?>I&FAc1uyA+JF4er8P#WS3u!zV2?XmCxLNP52?ikx#4k-DscKN6aXUWLu$bhPbU}FFVZ4qfP zsAvjK8-Vf_%mk?!)HmcWWBAO3fZ0T8w2;YRX1MIniG#jmqv25VXF+otafp2XFX2D) z04@x`nCL7n0T22CZLuBus1A!RalQ|-g={JNNc<*L=L1A+YP2j8F3PkCn3R{66c>7J zJRiUb_$c!n+m@aN$XE$76$OA^(B}7d_yL=xOBOF$I6SmqaA5vCc^>z4vo6-v+0kwW z+v#CeIRnfLm6!2urUa3gaYV^?q6{Gjbp%7>{n#TZu;fl1n2C#3o03q~{-Gab`h|cm zcZIco@FoIv^3n|KRDjc8I?yHH9dCE*a3^@Lgo%4Sj6UO_6ZgmOK}k6QeTUlISYKOR z84WlD{F@r;YN{&AgAPs$L95_EKnL3fB&Aib(<-#kdSN9Tp-@K%>#%L>mWlDrW1BW^ zIQN|O>qbY`u35cm<%;FYXnnBO)0gP%*QfOi*5^#t$ym3U*2`G8w|Atjn_piU?kihZ zek)$wH^a8jUM(LkzZEaK5Ztl$*W^y&fw1;h-h<=d2i#kty~?{jTXO3UxGzkX({>Oo zBmL;EYVr^9+qAf1fd&5pU4-5MPasq!p8GNG8M%^($ajeUZv4e5Ju8!OO4e#W4%Z; z#wO-?pLSB1Sgkbv;PKs9O#W^Dps`N6OW}7%N56VVn-YpFMaVUUSf2v$R7>NFh!dhj zoy1CIfR#!kc})d~JYJseN!Qi%kb6Z05HT%yawhe>5BtID7xX(tY%^#SG;u`Df7+Sq z0!bnpXil~A_VKmAy4}PYCp{wnuo`?Z@q)^+3&HRIMx76Ra}yhluc_r8zOW3{h=$K@ z26UdIjk*~O45yvJG>5#9n9=bIXPJ>@Tkp{D^&5N7ZQ6D2(Rnk>t>V^=-;@q~E8e^C zo9Ew}Ehh^Z{58m)ZNlzy9_f1Em%IfqxJqg%u7VH_ea0t~_Z&lnFX=UK?^TI=GfAUC z_ui|>ci8egfZ?Ceu3O|rgJ$en;h9SrSBNd%4o$fQyNv=XNsCC%PiBu@IDAsF8B!0b zng`yZSE91@;tu66$N#n+h9m7>COmcJze~>*&#Ix0(CV{OIRb zm`^5)#EUcBl&lP1CexkQs8l9Jtzr0f1lJ@qEnM@X?LMVjTLJ}2snb>J)5SlX&q|q@%y$<{TKcgF1k9brJe402FCDd zi7&?v3tSL*1Kr|z*F&5GaPWAE^8RsU|L)bQ{rKCf(JA!MF99c|U)5>+!_Y`@>Lp9NaH!(!iW47# z?`u7?k$*kBOJPxl6`cTS_$k|%%})-9Ruv%|(CohF`0=gUE4=VR{)x-@$F*9m5o^IF z(0>)+fVh8#*r7DU*(oqc>7GLDTIsy9&u+&8dhDpfj5}?98@00Z3I3njuFEv&-Ozp=+W)&~|4CE(h_S=x58`vO|Dx&@gYi(ffLi4e;tfuq zl*fUbKq<$SZu_N7PNwTir;7bzi_aPlFk*Rj>{70`2WFLyh@skw|$$TXZb4BNti5jou3 z5c(*S0YWxJ9v}>tAvYnox4N1NoSQ`jXf5AcDE5cPS%7h4!0;}jmlU!Rq84%j8X+<$ z=`I35BloXc*FDfPuq58rGd!}mXQ1_h_INzD_YxA2F1hI@<(UtC=tH+;ZdlN>!jryX zXxU`?NAY1(S943()Kh)!oeMB8%Hensa)jT9qdP+TyV!>~KF*4A{jhB)$n5~2!+mEz z2q^x;kP3)TbHIh!Ar#1=R3lc(5e$D!1g&8Fl-P-KQc+r9dr;LARdMgg_U$7*tG1|{ z)%uExdc18}^_iyX>ZY5ncAmffW9!d%UVXJ=%ZjR2yLOqqwQ9u{$JKmI%Nz&4&M~K% z_Mw6p&I^!v?!DwU$9BYvsTLL75c9IqzuA8bdfT;#EQjIS(N+ zMM%S;GPx*_h2e$z+Sz+lV{zi&popZ0sp&&tBa>9E%Op3phu$I|AxftV|WS0%YE*$n|G}zif);IWfiR z5;8zB6^kT74H#mN@zk~0j4A~`L|7z{A21dsia>);yf)70*(E8 zx-IVAxKkN#Z^~Y>YRl@LHCy;N)H{n-?Ob;YG~0Ez)VDO(^P8@A>{wghX@A=u+O=@S zq~n^a9g{1n+wFfz3+-OKa+mXJ<^JlP^k3UrG-mIptB$*2IHM7+Iq@~B6^!+(!e08! z136GFJB>uUbqU)ZEI9}z=FUkEcff=(%3SH(?Q)OX;c3A{g4lKomau-t2VfaPuF*;3 z8Dub&Prz~=k5*R~7I0QwS6x?IQx++xDy))GFH%c|yedd|kOA#6S)Tze=rKagQG_9j z&55X<8M3h3LGrm{#iorio9muEpl?<6mpqy)n9J_ng-Ei5g3qWwNbj z&D^g1uDS7^{GRx;D_7Ey;6pS_Sm-b|#m`0DI0{BspgV_M(UZ0x>kVTgxLMd66j%T~ z4xxLkSn6$c1Fd^=e*Cvm;ZKm=sM+&eF&S3$8XuFAbj|N7oj*1Z z>7L)!dhU6c6V*48`MhCmLWHYLl5)zfNafEkavWF)y|deUME21w`gtWcSg16L~V2O zuNCz%U_lI1#0Nl#L6E%`0|7q;`|&o=XNez+-LT|zI6$PS2r(W(h3@h&k?1rhiU=6+ z0udJb28ka9pb|v+yrua0Eh3kZI_>h`|Nip!zP|R$Ke>AO8a~*3?wsCpo0qTtB>#9{ zd#sQ4f~?g+dHAc?+;}gBL!5ygKW^o8xMP5bHA^Jcv)dgToyHLHR8^K2`OV6`A(t2) zVqsdM02LhLQ&yDXYXCIb>NYUA3$vRdmK{SGg~3ZECN5UC@pwx|Pj)2Z(5*^YTMpm5 z%iA2w$quf`sgISf+O}<7LuY$axUs%)jn`j2*yJI1PmH|=aIFQdirRf>TBHmSIdwr& zGvUie<;vh+N=%qYnIRLtiQ+=yz-VqoS_AQtsYGHydyrnozlNV93jf8|@pDi8^7>79 z9T^$Sg!jkx@Y?7tZOQ~im2%8Qpq8OSKbqQovZ2H+3|U11L49SS5f+yijv=H=3g zVrgkvi>h&8(ZZT*1rYYrE7IEi$RnS5VA~C88Hl9wT(|Xs&wTg0-yOer*@C6~O6`T* zDyOq5mltbSEnTqe;)`iq3Y!aGr;yTvGqs3ax9}b}>Gbh2&X&C>3WI!U@Gb-eLmo(k z)G~N7s5`LJ?Y6b>8n9z^?Ka9I&_s`b@4>FeGu*1~KkY-K@hpj7n<9Ay!J75M@+wffjz7gOSkS#7FB;8j8C=jcBrhHx z9R<(!GcR&nFyhkB4Byr;OfL_=bTOl(swwV za4&%c9;n!5prUwqW>lQ*Y2*hkMzlF&#gSsDil*VF=QOxUlGH5tsnq~SpIy+kAU9f( z+cG%RIV3IyzO!o8Z&$4%`XuvVQ$9q**dk5^5+K>@;qkgwc)p9sU6vZTi}8^7p#KY& z#m5hi#}BPnn~(pDUI>Wc?3nfx-=H1`Co^NbDda6b8aOttJ!P#p3hxVg2Ju9Q@u-5Q zh(Deg$V56&E7fUY`+^+zbBcka#TQYGA=HOfy626z?rI&IyX4{lt9|g2CHyCjvD+s{ zMka3`b8K>qe01Z+kB)#X663+I4WNUwkB6pnY+Pis!43rj51T#eHo=#Z=+#Z^i->!A z6>!q4;ej-Paw8Zr;cE+=f#W$jrr~bTalm9g)x9nlfk6T(B0_y?8CvR&b@(*8#(TSJa^IgJw4|y;sx4^3)ih%$P3=4 ztnzQa8ia4ptMj{e4sRab*)x33;?0ZC8M?K*wWhUuC?{AP%o#$Z*tb}YvRSzra0-FB z?u*ZX%P__!qHvLe6+{4(4b+0-MlDE>0B^wMIY@f~d8!~gk`pm!^l(liWE2W)5H<64 zZ@8i&TpW%5T)bCQ{45-ehKnmI_}?mu@rKu5Pr4wSAUJmc&Uq{bFDXD73NQkytO{X8 z1d4S1#suK_P3c+a_!dA#Qb(do(|}4wKKuhC0U&c%-{hP*lYP8Vd!oE2!oQ^rMS9A4 zJJ4ecTO7qs_mG+cD-Ns&GIsD>x5pF3cXM!7C)Dtk|wK~9xr@fyNaGb$+ ziod`$jC!`cjjYt(OZj%LX~+b?R)N-9l$E$5O+`H31LGSU(1fSDUKq}lDF8<~G6l>Q zWkZAm^p0pAy;kviv}N+ePY9wW=o&T#+or5Ty&vh1YT%*VvFH<40qmz~cqlzfPxdJ# zJT$|TIyU23k<@2@YQI+F6{41kxt^3ueNW`VEC9u=GlqV5mRKc!@yC}UmI0`!( zUU-iWd={Lvz-=mfN%1RAIZzX1v%sN^6bqEVMBR)HtK!(M)CWcBo#i>f5Z}+R`@V;$zQ=bE~^tjQ&6V}va=G(*Al0*)C(Ww`?R5*rr;t&z-ieu_c z8Qd}Troaz6JO2Q^o{N>H#5L0z@iFwvDRdp7J>iH2an0yUm-)QMHo?(qRC`K&6uwg{ z;P9Vl?`+Rvg5}$QrHn^LpJx&meGGBYmL11l(`6r;$J>~P5f{x*9iI(`03z!#?X%ib zmK~$VUc=ZG)_39r_%w;jsN4hf6?ja-Wr>NnhMB@ZTN}1D5O*d_EGug*Lsl(HIuL@U zS8)0>V4`A$CEz~o35kv%-Q7UOSbeoX#-5V)`YJ-kr*}NP;TC5aOl8hnv==jahJty) zoM2Ysg3dvBm2Tz-^m7pB3;6(I`B1EoLZyxTO~@T{rl%jJYcfth^YyH!pUpV*roR(h z1MJVr5`Gtg<8n!Bh6T35NfS|@khDONwjo^+N&t-FO^DSNWqD=>V_AWW+{|2xs4Fe; zQkHhmVv+9`JUCJiMrGPW+S7ro0Kd}S9I0$;tBf?;&&@6>%EpVgR)s6uDl1}@;S%uy zJ{0RbfI*>JE4(I)SbsbYSlNJbnAW#%2 zB1tuX@`aghTMt`jZ`wZIHopDIOE0as^ir^X zuMRI?KCJkrULD)EZS2DLl)nf6X%7)!(*(Ze^Wgr9;O_!G1Rw?#38Wn(*F3lz%mEN1 zY6F%5)Fxc)1=)y}6<3F=b3&O#-XfnJk$yWs}Of9Ka*!WyMU(&1*(J zw0!x8Mn-R1zWk=q;eGSw?HiWAvx|$f@oGwZi5r^|-{PLf#rL=e<1NGZP+Jtc2lNpT z7MmK7q+|yoK9QTVMNkfY5Jw9AEF0$wh% z)s7A(A#IRiGb==nN&>~B!iS42pph7FwYSZ^zW!VPS(z6OXV>Des%ed6&g(B*H{9)U zhrjzwJ?a%a+uk4J8I_fN2oJa<&{)^E04!t3@d;NNNNjoD3ZGCpdu)Y?T?@__Ky1btPf3nI^l6vEfFm|7 z&Vshqk~`Xe{f`dq2yaZ!sOxW@v$S_IzO%N!mbX@fn=k)t`{MHM()nxeSaZjSa@9w( zcMjg%JJJ6B_w&i}xc6gg?tsK*hDSatg?9PoxT^xY6nbf!0gnbCG2?sExWn$a4usYv z&Qt_JS=>NUsvDkEWddrX$*jjC{Ms{rLO`PmDRB#hg)}T+;jJKO$i#4_T`H$fVt>?* zpm%Y?;D`yuBA2xEEP{x-4G{Rim)f77YPXQI>h;#OeWGIlgx0d+rc1g%o_*c`39S3~ zj{q=hm8XB%cF+x3x*Uh ztg%*Pp=iZIsiB}9OB9RRWhDN}>wACn;_Cj52Tm;R?|q^%IwIJx-VJjPjg9SjQ+sWA z$CbbN=Kq8)s1o5SdfybIkp^u;G20pU7UrTfFf85V(V9jKyHr#b3Fu;5tCkC}9+V*o zZ)6<@#|ZOy9u5YAKW%(ku#;|(B`SqhKA3}2NO^)9LNkwvSb=dg5qT>36O-B6b;l2@ z|A%{e`-gV^#{!%Mzb@-9{gW-2CuX(&-lZEhU3Kx;H4i`2x?|(7*YDoVpI3T4a%LPg z4<3fh{99o9Ph{Hm79pLD*5Zx1QCm`h+s;yW z!BNuQX1PDl?opgKVuz-=)2=(y{!SHTXF6SB$q*;1Op!-tNF=uEvbwK4R{J`4*Y($J zzM}Tv4{G1g-l*=cri1f?t8ThUyj^q6bbLeQ9N-(uK~tqdu+|7H)bY*m8$tD|Ao-1i zkVhnjZecvZaz*X_P>cvxR@T0;YhGU7-+$R1v0wdtB(EqO7wa>?bLQ^Y`^W$2-mv8M z$+1hP_+=UA773pJB)r=d_Z8;mP)%c!v@NRVe+Th$s0Noryl88gX(l@28S`1Wb>Y1{ zT-{&Tw{_s|!+kp9buMgpuSC4xj_mmGRqKj3G(EX;Z1ZD;c=wimq}!O9;6o(64@q7e z!GvHP5XMEG4jiTNz?IV`A=M3q6(*BB62d^aQILo27-|%pgVUCOGC?92vXY2h4M>jR zlDPxR!7!}q?eG2cgFB$lIO25nwyoOM5+CS(IJj#m@e23dN4&y){N{-qUMctl|raIbLp?$kBc& zhKe!7*#;#?X@fktc;P+8*ppd+DRjtC%)rEIwJKDgri(Jg=7D3gDr=Kp;|rk+Qmn|E zoDS?WJLJVoGR?8?d}s4R4{i9~=p&Deeh)hA={dKyu&enSiWkq@?zd51KzL}tM+5#D zNEv#2*Nr!J-T2|o4}Gxv#;dz-{9xCOAL{-PKEe4v!J7Erp&5NwbZOJ#vq>GEqLVaK zl%ubBexF=0gtA)8{0*GtWzVk-8ImkYNvYf=^i^ zeIWB;ZU*Cq4F|Qq+J$l&aI)A$P8JCC%GaauOf*WR5#T6-cnAgx!0ZBim!f*iBWj}8O-%V>H15VA;cw^lTF5(#G{-^Ii2OKz z{Kr>~K8tqdvbU5F|0(#4?UYwmdfn#{bEMne4Nc2tUAZQ;!ouhdx;5SC4grhuBCAq^ zEXfs^bzx(t9GjGx7NMy#+SzBaVV*eIzK#iD+>7}t)ckt}cp4S?aPv{I)j0W8Bybd| zZJ|Dp6BpV4kwq&)nUQhm+ZW%v;T!ADb9fYs$GMxYLhhT(js?ox?y|r!YF}kxcDoYe zZv!q=^9wa%T8l$Y*b7AVerTdBP?ouDPMm)M#2ib<|63|DS?pTnZ#%?=#=tS8oQC=IqQqv3l{ZmFI6oC z&1GGQ%iPimuTmJSDJ(DN+4xl`|Gs@;&rr|8@vPcnc@eBDj+a(Cmo-PjLu4JpFYzbM z6}l}3-PSYU-bbq3F^@Gm^}pE5z{+jRDP-s&J9+E2?G%mNs=km$i6q z&!SbWJy3R44u{(vB?WI(H+7H2p6VWJFDv?6?WI+h4?`DLe9o0sS1y9a%jaFqw>PdV z+LN%>3#8trzI6PTWuJ z{#dq({EKPA=T_Iz@j3wKldrLw7*K#wJU0&~Q8xZfCmFnGz$Hv#G=6aE3Xc57I@tSyenLr7*Ka zg?ta>ftp};$m@VymdUpe|8~q*(&vpoa!74nzh3$s$aO)x`J!Fu+!6N!O0Wp56qo{K zA>DvxVQNe81~BEwbi3%r=MB(QLangRfI;Ob3K-)a?Qi_QK`+y^H~9I7*703@7wViN z=dDQQ0h=&ZX%YI%V95POpog6VACW^E0$vqL>MKfZDk78u$3-9jMI%-wtb#G{BcQ$+ z35O}qr+WFW`!_kD;o^4Zts9==KOfPq3Ad)DwT6`j(z+_5t~%A$B$@;bbQ<_a(kv*H zZ4Np*vk%o=Pkt9SuXzhs%8BR6Qq7Z`HV4V_eF0>FSqUu4C><|$`WxTy( zYv(MqD~(InRejV_H>aoaqVe|b?)LVsF4u)ymW=OdZ_01pv?3l*3)`1W^n8EfqLI0C zmh|@F*POZJzdnjJVW|FXQ-W9mg?$3+@EGPnJX=Y;NMf+=m_MCO19w3hXnOHY<;ekO4h&x&1+C;)`@3G=%Ec9t*CpO-F6pNP_n zDO(>6S<=rD}+ z#ba#-6bI(Thx&%PJKK6=y^Zx%6@X`JLF>uz44ej@Nmz%ZVNUQC#PlR#OG;!3{ma_t z&TWs)o%=AqrAOO21jK!tikH zc!LG!2_zs{rh{%Lqd9761^iyb`yl5UY&@;RZ#AbY(5#2}LFd>VliUAo%(=`aSwKRP4!85>$II&L z%gP!Ww9nudT^KK(uYbeWBKaEKL`m4hyLOv#WxQjlEYfdC%@a0Z#1XTD3-2j~=A?^~ z@`;)|#3Klo89l$B4SD?#0Z5sykg3P+Ky(puT2VPU*T!`2a=M`C?be^R?Z;}K?c>OB zRa#nHjOEh z>s#i`X+h=2tSrAj82q(#Xi~y!3qqlSuI{FWj>v^z8;ErX+`M}AZ}c4GdYvqstLFe- zupi=AmvRt(gE^EdmSzWT6rwEzS2#(S%drqXSeK&iEz8QuLVBR2ub{)QO$(l#6m>!t zfkT@>OZUKJCvM(Rskao@4`btVNlCYEes4wZ{B=KE4;N63rvSfV`gl6x zZAp0RJ_aVup)nq~7>My;4gs*1BtO7?S!YN{HD{>hXfOr5AwD=5Cu`39$u6klv?mnz z5A{LlLy}|RC+=Yjm9Ow;Wv;3K!pK=oIM+`ZNO^TJ42uX)6D;SoE~j0!+N@+P#do7b zo@|?OAGfW*q#9Xc)Eo7MQ2f|OZU#`GHHRqn1z}ytDQv!kP8-Ap;X=X;mAG7X+ig3p zxE_`odyZ%Ajw`Z_t6Oi~vDTIA^i+7WuQ0BzzhdFx!?&x7)0UID%XmM0c(*49E}-h| z#yjy7d*QDm_ySs7yPqV4P&l*NGlrs~KrP7@`J1-lFu*~kI z)5)8;YNo31PhJz7H!nsn*!c7CdRTWh{7by0B~GtcSX3p;4{OKd&Q#bT_9VZPKPtxE z7_T$N3?E(qXB2O65W(>P2a%Hs(a6oGGenXVm)`Egh_}p}*V5YG-x{f{jo|g9{HtYN zh4>R6VZC&H4){vQ;^?^(T^1@i05;BC@|~hI;}A-OiyH?kCC4P2=IF9%k_M5dC+&HRL5f_o=Tl2U$vuB^W@6g&dS+tU zB3F)pPYK%xnz;`2raE2$cB$Z~I z=J!i-5_$ZdL>%{}5=OLN!VI5ds+V;JzMly63YU5VVKV&)QV8J;giyE&nF(SEZ-nhy z8{*$8?JkEOWn+A@7sl=RYZGq9Bc0=LJf3LBycHHp$jM&v|MI3gfEzZFmZ2|{Ds(75 zNlwNavX=|h4|Z*4h9?b6OTw}YBlgo)3HxEvDWfd){@Br@5SS0)_abeeZ)&RV_@O3# z3qR0Qr)}1D*3}^&?Ps*D0`>)feN4cf^bCp9n2fLZ-lS)chXD!aGam*g9R&MQ4*|fP zCN1d_?E^4|DGr=M1Wlz$B0QS>5g|7mFnEAz zug{1ZaoAjT$6h~o+np}=UY4Gg=}F%k;9gHgrgw(8Cg!r+TtZw+vpaV{b(HBz%bZ01 zjSSBy^LR2gvkXrL98=Dtekj~YbR=R-(38#K+Aq4YyPf-~ue9{c{h~88upbl0)-Xp= zomp?lVA9@BF)8gU+gC1IvT$f%K7ug2@?-h2mZo|HxFU422w*^FDLWa-^120cq8)UVz5Wb8b_WCsep@nO0M7XHR7 zKMEEmzI$GLi5k0fSGKsF&;;?eOsRr?!VVhu?0m}9Ys!;In~Icav_ z94Set4M+-04^me(t5IkYaPG$|u zPXe#r^|%Q$-%f7MhUcjHTFKP|CA7ck0RY+?;vyP7Wds261q3MUC!7U{k5NWUXTgYm z7SNmm%4TIhbYn#jzHoZ?&gp2VuEJrxcxXY`0{;e5E9+jAa4|rlMo8Y`kfa)uYz*dF z9FpWi**_OCo8@QgLy1C(fdAQ4Oq|uzGJ8o_FQwRC+>w%xwF7_4e5@slOY~BTfm!`A z%iHRao7Ik*g2B>!ZE_2`6H-- zhJp7%u!I7Cq8WToi-qrLv5-&B8g3xzvqEAGkIz26UrBj1bxPK+>3a_UW85&dr`-#>SEJ!nwQFR21{jjS(tUHa)d9#?2D8wy&SMUaIeGq zEJ1vDka%2j1cF?^7h%Apn>Cqaf-IO9Ad^fpbhNPu%z&+B)}SbsigoawfI8h(`)wZK z;eXG{Lwybv*?em~8PU&A{^PC5&-?Rjp4u#tuwC@INT~)+WRZ=;2SAbi2fD49tgvvP zRf%_ra-v2g5F+skA{oUW_W50WEWHqEGi!1lj%R7SVZYmEct=3G)r<7<5R?jbFafqu_Hg7k9TXgd5R%5vl_u5I|9uS-3y|F%}6A!hggKdogKf z8IcPI3MCj+6n2ulANJuEMK*Y6ifWHjciR3`l}@omitR zQLlk^6SON@o`ozV3PA?Rg!yb-Gr< zOLV#>as6Nt*Y}-F=WaBRKdC#bW$$?)MuB7E6|QAaYD9d2NTgIK+HkrHv_%alh!GGau$4*SMq0L5 zR0I;HD-k;|c@b&SathNf_7{b#3Ja^kMgDzhMLBDC(C2Q?l9I~&ykIadzp`YB$GsK` zwq3p4s-(CX#?C`yfO?nu*v? zLM>{VK~fhQwhIL)A2LRq)O%{*GOIh2YEBv(d=MFY5Ib2e)#l4cPjd@8?=kNYn2v#S z5O+5U^A8<3xhxmyorJv|b|iV~)3G0e12FI>LdSk{aN@JrA(n!yjX(a;CVB9Gb_GuZ z{@V+D%O>x-YjU}-fX;sH@3dmc{g6vJRmi6#m~IC@9ylW~VMqif;mR8&y=QWrO;8Fh zTfv{70YoJW`OPOQf+3GhocIgiQx17-7wB)fNggXV{6$Mt!0Q~$i}*4u6afKI#x{nuu75cWDZLzFFr43Kuz!G>{ytDv_=SxfSs6S2Zx z;0!dQKprpO_2y%Lcakb*9zK4Fdc(tguO0`GOy`n^?R+53itSIQFw1`NBD6b`L^kKY@B>lEQ9r}SAOZqys$i0YtVNM-0MpXaE@x1Se$^{ZbU{2{+v zyU^qFdH9F;p!Uj-f2@u2F9QvLU%v-mdJA&pP~XrYQQtrXq}S!c9t>>=5Sy-QCiUV{ zZ&q1Y9P_PUIfQ3KxRqOD(I9v=zF0dXdRv6vUVZE_?bCdlOCON-;$3&$6+c2a2%Z8w zF<%4BwcQUgi5k!-Ayy{1U9fWn;BntRN?DZx$knj~IRfGJ7q86s+M#&WS!axmVzm>R zSd2_v+EH53Bz(%q%L`O13K=#=VQWas3HL>kXk#&wZc54nl?6Y`&JXR%$P0u@g3mr1 z3`37+cb=D3ko~iQNs2`UuEQJf71S#o8b?qWxH>1TPtY~{R+JHe#lZn#(AfF zuE8)&<8#0K#Lu@~N0b9>?h9J6w^~%k-6O>&)Zvc;XiPzORDFK)n4=JArEqcF2(v?*Ss6DlaUgC0Vyyd+Li{6u2y&V}*Ebwp=4#7^{>Km?I&z z(B9MgVvn84Gp}i0(=#0Dk5Ai=a?8|C(=&?a44zRtj{nH~%zbC_%=5=fOwW)#>a=6C zTz%{c^E0Q)zhuBInSY7#?aByj#i#2Bw$+GiAx=@}a6 zY1Wcs-|(8`j5sxL+GlVEdW==k_Zk{G-M$gSF>pqX?Uc_X$0jk2SkCQdv_2`gsn5sC z3gYn7m5Le?r=^EB7&}A1*%JZZh0Jo9!I#0}rASm$lC(33#a*J{cWm)62R;OKK z^Vq5NcL)cuh&o`Wz9M=C3M7D`(`n$fT%XzJVqPC(CMZF}x=&>4b0Keo3~*W@NTISC zm{H%xT-(K5Yveq3KD&@z!rsf?$F61{U>{^3VIOCoWS?cXu`jSMv#+vmu>0A!*mu|? zI7xoQe#)L;|H*#Io&^w*axjdS@J!U-kq__x6Q3#h-BT}h8$bV-m+JS7Uc0+5{Xf0L zfw?;c$N%qe>9_1f_A>i3dyV~#{evB2ClF6%M`Di*?uV*4j~Brh5#`mq9zN4C-o<-) zKOf`^`BJ`;ujT9cMn2BB@$>lk{6c;Se=mO@znXu5e~^EKf1H1kf0p0IzrerDzskSC z@8{o=mh)v&OqIKI3m{)A)?qG+ss@bf0nWOrIIgn&(EJ8Dphq>3Syk&Gf9f z52Fo&i_wlTZ|urL`aixsdHDh^wR6PZugeSZ*QMRO#`xyaZtW>?13tpFycr+i{-?0X z4$*FZ-MAU|XvN+9PWqd^6*p1G_~Lc^jmNv?wfI`}B08W4pQ8U5o%l+$i$Bo%A$ssB zbS`ceZCz?~h`(q$`mhqWP(v>mpNeN`5V$zhZKe`v`2P<-#Lq)4*3bPO*2m^UeXtlF z6|31OJC}_iUH>H8#V%kMv-hwo*!y9Rx`BO&eH3vvpJtz9cd#$AyV%#*z3iLp+w5WX zAM6M0$Lwe97wo^-ui0-H^R^~ZcDDixPx(qc^?;{d6%W`=FRSUAJ~#i3IHL%?=rejZ zo-^*D&w%{m^Xc~*e;eOVf7bY$zBk&V&rXdZIB639fr}^o0kp^W_^o|PyvdvCPWg@T zuHTVp>*SW?SJ*#^UVzZ2{5kq7%SHMPw2A2FUws#{A^aJPTxRf_1Y4||N;z^PQg$+R z1{;2gojxVo80k_I?G=%p4J|^~^{#n#q;zdgewH$fl%!`VV=7?C8wh_Hg!2n02R%p* zY^^eiz)iR|km*vo8HM0ml39Rag#r+X46oDuPQqRUt-|LMKDpBpvuVdgUbd5l#w{`_ z8y3I}ub{|T0DUv6QtyX>j9oK5wH;@aFvfCC_`^OYh_(*kn#-s(*YXR-_y~K+I!ViCE>hWm`5_)R=>jMb+y13l&s9cpI4?m zro@`+7{;zHADrLUTMES`vQd&o&`yc0U}$NJg>3e+SQb98w&0q8M%OajHwI|it>W7< zai=|o%(+c;87XSlUd?Jnx~&u4(A|)?$(^)%9@Dgay3}+)8JB?MZbF!J=(JgU+46EFVV24EIWB`*+O)J&?joDvOwKj;DB@nI%k9Sf+D~42y8t3@N&k(d zh3kk+AON3EQFE%9YEGd*Q?wcO*;uQv9a0*BAe>76bnm@4+^%bRDOM`~!E6PX{vH-yNXj*5t*nP0Ei=~FMBn^^6NH|>b zP9sm39erF7t5)IHE>sBbAsltMBA57SZFlKBb z3S*9P#Fk^f;jXFA15cQK#w*y9*d|Q?2v;^YDLb{F;5%c_-h%dA5H#67FQx1+<6+u| z%1-bb;+{s}JN0SoYs_F|>hsFxMo705D?)qP7?+jovNU1xCo?S0!kP#Khy4x%B~Aqc zEeoq+tO!;4;frFxP5cpjpB%Fl^udb54fFxyww9G)R!8{vw78hSi!Z*Y_f32e&B4lu zGlIHIL?V!VknyEHMD8Mo3g+b3r=|VmMXeLhXc^R>pj&c&)F0RlL649P#cP$*Y(j?w zR54I=Dd75~vKjl&1XruF8Jpt(z9w5OL(MmQKd63d+TJjpOPQP1nA?Z7z0}B>HEX7~ z^KDZ*`u<0*(An@H=Jy{saNtSaM(Ye~6w!;vxyG+kzw`ZW#^U&gA5q<;TNsbUJ%@>= zz`pz)Ea?%$zKq!4BhtQ%dv20+hkro*4yp7Q`yT$`$B9fh4=T49c4$d!#Q4q-A28r( za};C#%iU|luq*DP?Wm6%S0;GHyjGkQ2Qaxe?z_(b7u_qyFYcWk57e+d76FI}%6A{; zZO@2)^m*z1=r~ZT*jw%VQ98jY?t4-Ujr@xLg2?rqn48L+&|c1u&vn_6PzD(Y0Z{A= zWU2spq7WQnQ&o7ifYVxvB236Rgwi6doXC zBUe#{%AzhcydsF?;29{;9oQ4-5M9X*`3CL7{AtmhwnuH5IKEwWMQfnX*W8zd?93ui z8*!@W##DNA=Dz$QGz?K{nBoC+^x+Ab-5&K*#>@zdFfaC;4%@TL3#P-6BF_N3sr|}+ zg4*E;I3S5NqjoKu1iUg>e>@H-fnflZcUlobg_SZV_jHLs#I!V;iYy9ZbK3;HmcVlh z;K8$iR8jCR5Fxf3CJs*RKRBViL0u~kO?_oz0_0;J4MEI{KdSeS^}>O#!UTZ4%kVct zUQrNlJ+hBZHf5Ieiej~p)md~I;Cm;us)G~HO{m4kFF!20qO~&36a9d8T5v=n>m+=u z&<`Czlr~zyDMUxx%xeYDSFBSRem4gXOz^$h8xsegQ?EJx!o*=QFNqUkKE%VFK`szZ zE#k#DOlVI{XnU-$AI+o}*2W_DlMWk_Zcrl_>jLpM!=0{DDpstO$C`#!VhXCmfq%0h zT_*TAy`GfMCs)cB@{u6uPxGdEDXU}Znq^|mQ~^3#vF6m>c5q^1;$X^#qoos*P1$%7 zmuT-{ymJ3T0;3ZO?v$t;3os*hAri*g6r?-1A%g%FzOrsaMgi;TNC3fzivg;F1Q4vS zz!M+<5@6VsG%5^85CIyC+?(dH;G|XcvDh#c6=Ok)78K3EFl0&t%F2DZvG_3-dKq9k zkc5v|J7hH>1lM5$9zoDVekZ8WS>y%soALr3IH+Lr05w47K;o1mAak-^oJn_r(!yUK zxh%0c;G>Lh2#eW9Kwdh@BgY@5pP&R0qE(S==)gh#wB96*lv<>-ThKFen;dN>nFfJ- zKu8)V`3>%%3p_(pnu`qj5ZVj3ofQL6g&uA)TqICLT;k{@u zeWFP;39S1HHH)4P;{%$fF}76D;RX_8%wr?C9p-mpiUMMZHh{BoY_!oaw&@9c>0~@< z5olbZ!6uv@qDi3PJUS84Zi0^JRdq3E>D!nxXF>O=;Y7j`3V{?GPH&s$Em{XACYv|f z=TD!_8smHohP_AWOwir{=sth=@YH5~tb7C7GT@ks)&!;LaKy5p9S~z`<@jgxy>YXE zBP1Bp8sp(p?+0(9c#;?! z&Ke#6Kq#3Idd1#V#4Jjz0B7mU2bCw84uTfmPzO__0mJ4O z0HMmR;A;R3D$tEHO<3&sB?q)Q2YC8n`~c4scKF2kpiz@Xdo)pGogiE}rJn|!ODYj4 z{6MDpoHjo71%8_dEE0IfiFVHJ3q_9~1{qUZ1W9{m`x-=&=$cNu^<9k#=(IbzcTT&n ziQMY6TWo6pLDJY{8)vZp5;Rt9KN<(tYNuGM)A)C(mxozrNDashxV!s)dQYi-I2kjz*?Ezm!3vV>`9scE7K+X)rb(v@Bv&&Z~a$XO@} zvHyT=;sW^Qw!5rOFo$&Dq@~HKW0F&MxEqtqFv1{desH_anH78(**b9*+2LPmZz|Vn_EGT{e=$)cso3V2R#J+ju)Eie0 zUunP#5ITIK46r(=!;11P(+(EuExCg!(>M|dcuepC?ccQ( zdt5j(=UODfYK$!%n$P6XOvXchr5jBe_MumtY(? zsGGzweT3#D_+r2T`x|qT<3J-b1~Zy?M4HZFnvFP4Q^s*RSW4+bpFi;i==YtRzc5k@ zs1o4>V2SG`#zQ}Sb=oP`38#zTXP`b!P5415Kmbkwk!Y5h)Eg9HC2kaSG|?Wxh}5yC z$!X*_hA0MTeLcY&B>78^s5?nKwVk6V3h~r%*N3(Rs{tW9mA4kr9weGLkf`3^GeLyJ z@j)E62@Xxf$?E-J@0$4nQY*n$0KBJUJhL+Ig5Q)3j-;vrBu2YB&WLsa4&j4{;45lY zkTnp%WDJ&xD+8qlR3xn?-dGT8EZjVz*GagzSxdZ8teYNFL_8C@Kf|U03Di93ROXvF z8PUGvXG9MMatQAJWS9_7L!1(wGDzP_X+e0yR0^Sl2g*q-3-bCTWhM9(j1}lsr;5sw>oFNC$s+wh#I}zIhjlM|^ zO-;>+mcymOf{faU<%p3-j0x<|M>{7ML?T-ctOT)pVQ6R9#Hvqk(~2=wL%vA1Yw$Ot z^z9gK5OosG?TWx_$~cX7SAKF!Br>?8liJ<(=~WY5JBMVup!0FQ0sCEymzp6TTLsQG zcpDSrr&N+2mKG2eZV1gH z1%H9RP@%2mcU5S`T5$!xOG9F&WM5W_<)9eX>1I5t4j+7Vwoyre;Z`WFG$MWC@uv6I46YEi{`U;~x zLanorAC96O{viK>)&=?DM;ffl5;wvBo=$!^3O&_y`QfZ|KY~uv&eQb*Lgyvc2xv|H zi*wzy=cKxeMwr51_=N`F&SWAl8HAhdAU11BUOW{Gh`NyY?vLhYkM=@`Hp3%&#l7uWOThiFThh z!Ix{_5c^v{BTmip9-T1B55z~FF~2TY0xwCjw3kSIsOw{CKM7tmdd4z{WQqbp9f^G+ zbdiZYhPEW{pE&0z`JMueIN6VInc)2;_a>U5Mo20mxl)ctwt){$FF!!O1ZPHo0gE8o zAXtkA6lnglt++5@~`^9wI41=T*eIkxW8xIzt&k zXwh^|7E**%Qk!`<$d0UKT$l2LHS5aIgNP(izQf3ovGDz z;l$P&!j#^RNrpHJei^U;zpU#PrB>HqnbGb$=a-G;lTZdGC0OQngJ(8c*T-$h5GV1? zCYXp+<7XyUMF0_9WV=%r*o07p#hDHheLtR=T%`-dLeZdW8c3*0;>kOfsemLxIx)!* zLfAITQ^0E}Ly($Amm%Pd2gd0^9nIy2+A!T=0ijvO1wVEWk3+MWa@nof-|Hqs}G^*M`kQ0mc)V=!f}QYAY&bN)rU zqe&|!;U{%{XQRJN;T;khOhH%lHU5|F!g7?bMCxM{=dOg~+3+MZI8uz7*OkItdy?>bc5dE zYv8canL>?EFSSTYQG+nk8B6~T927*~a0nrSDu}A?av|)rg8owkacjIu_Do)IGbxN` zTn%%#vOAD!B3!y>lJ55=ct5=l0-NY#1|{;0eQC{apL~_5MB|j`zMAxZHpkU=Ne}fLo_6Q(n$PWwd$y-*ckWK(-vnCjLK?>x?748(|B_Qa{1R3>dO@+;x zU?h1>P+a}|f?zkBGlH2{Gj}Z@Cb}fPM|716H`xc_jjj_vnF`IU6BqUYIW3(I(R8qt zh!kNa@J&W|hEgHwmH99)g{?!bFcrC+yvQwpx+>|gM)F1EnNIFrC@80yeP3O;Pz4A8B`g%Uz-PhOs@$R|8A6wLWQ0^7= zL>aeR{)8+$UxF7kR~|g^CE-PFc4gYKT%iLf_sr8Dv>n$$~kv`E&lbdiQk*&eC_M; zuiY(vqmO(xqI4^l&ivfD@h6V-9r?NVJ=%-wUmS`59G~F1C}J5J;M<<;FBV0$#~vTtpfOf?0Akzcr!yQWV0)>q8t`$&SH3_vM~fsp)dly=?VG*Q`=49kua!^WwD~@Gf7q zbY%17IRn{gJ9=i}x*BUKLqpTRw8ZR_*T1dzSIq@$*O5 z?OPArQCJIdsDYRqbfY|*=z zY7H5G5Ud~>&2T#@Ypfmm%~YL`9Z%oGd+!!@De8=6q4XTmU}(N zf5a#l6QX*np-7Z+r6cV$5tx@(ZR~7wc5hiRvTajyO+|fH;0yg*_FOdCHMAkz9k{up z-nD+&#qEnde8qwVqZ^i0HPn>lbmsm3J%?{!an72m(jR-`7gyE@c=VoF#HWyV*#)X1 zG+NlRB;B?zMtXnPntGHaZa3_a>28E6;4W90*NzIrA+NrAl2Mylvwi!TRclut;(yw( zXxZX(kMC7Ke0(p#d%=mVN+#gl$x!<+J}*FteHXzhj=(nCez40{8^01JG*ICyfpZ}K zh=R9TRYaqzbF52HeYdeZ5-u*xbJ{?kJ9&pgB2%=POlcsxEl~vVQO3GfRDIMF+C|9h z2uh3?RmAmC&gNjDLbTeSCCbxA%f)xRVD-iBZO-n>!dTbla~7-_?#Sz^Ja1Fsit}CD z>}}D)##lq``r%bWJq5ird$xFLV%3qs>R4sTXI2dqmDiTf3k1?fx;mCw?YyA3W#P!O zxp^g3rA4*QK*rjh&L!Ng6!$ePUC-Az=e9&z>>18@Q+XTW2UO(5-Hm+PFX23i04*j( z-Qx|+W_Q|cDExtl45tGyNexV84itD)92P{V0t=NIAsONzV=tZ>>z>F#CA#~4dBw$ft#O=NDR5~(bmzE$%t$r2frhz}eb=TSymLQ+ z223WZCID6zl*M$wgWX}HQ_wKN$|U!trJQxdnj1?SN*n6yYHJX&TNnyTn54}LlQOc> zk|8(&mynkZ`vC31h%Atct%;B!6Ew6x8?YdVj9%E**FCqttGOkourQ}(8Zcf51d{ML z$~Sa2%*#FS!4G~fKPQJuts!=QuhJ^&mXtG8tS-rcq?FF>C{PQw6~m^1=edKKNWt-8sgMwB5qr1R@o7Eu~SXAlPP5V{9Laf{jo- zEMdmpac-Tsc6r!_00xJ(cxgK-45V8MT8h;Sn=7lDo2x3DF$_TD4*m=NUX|jrPG!4vhN@vhSMOMM<5jp{ zk4;9&s9z|4@vM*-2*RiJaYaiUErqEXaObicuF}4nXj5+&^=DC!ZG$=oW12A^BANi! zd5?|nR_{K(3b0Jxf0l7jG%d75esssi$H%cGmuuG`XcE5(HcP>~xiF5il($dPT$FnM|j%6ZK*&9TxB(CCMAW)ltb`+$LEx zS;K7U6bkzT`uA`&wkM$kMee;Yq zFKb|NVd*(*3;0J+c=qAYf`tW<^`ix_9d7Xkj%Nmgna2Z^%u_*LxVKOP{3T@nj<7}X zp~5_z0GSZlKnLNThCCp26u@cKM(G8R;PW zxjdJIAHj`cw)#OB_R4e>C?Kl_!>9mBC{;7KtGj#G;Lv&9+BIoIv97T|bLPDD-{aY7 z3)*8tuD*SX|FGoZzP^i=zDJu1*7P*i4MdgwzxhqD27DEG{~Y$FvWWiy9Di^rN;$KUFDeSi87@Hr?Z_Dw4vsS0qCeJ*1JU00-96uZ?-iHvy@w9%*@N%( zxz81I4=2XGGBNJ5(olZe!l8<7hvlHm*i4kl%=PDNEqO=*hSsaRTd@4;)@5?@z4b4T&}Qa_fd#v%8XK8}A^=1&{Py2Lmx zpS=w^p2S@Gr?v6^L>qatw;{(P+IW9Lo^MaAfk~cEg(TMC{aCZ-#N3njx1VCoXunH+ z0r=;W^#v!jzaQ@Jrb*?{bJ*O)I$aoJtV z8yn~dJ!k#Mnib2IE*=`3*B_tL*&b_c*x0zSuBM{AxG=XguQce-$jQv{`bxtg#G>+` z5L)Skp`>O=qhd(;JfaI)E#=l$DZS!Wz1B2t#rdo&9q|kuTqMvU%i8~A?mgh+ERO%- zXUlV^JM}xAdarJhPj@<<xHHtr200~ROgY|EAhxw*&ochus6^pnOs5y;A&Cko2VJzFJgI6*OL4!9;xx0~X0buzlm#TZ{F z>2O<|PbB6#o36~F;2HSDdr{|$s*HG@n@&W_7+Yd~RdaNr&THf2**3>mb?RrFzln4F zps4}eBabrxhPVk96DBMm5IwMO96Qj3EJ7pDZZNtbJq?!|m8XT%!%)LQ?9$ia3ALE$ zMRA)I?!Q6j!qa?CwgZ((TG{lKMlOMwU5zu!* zTcZ^exc&!27dmI`;)n>hImU*nN}S;`pogfhsxKS=E7S+pp!U_oS&MuJ2FEN65}Ftd{gQUF&!nQ4z z4Y)lK%LfX@IF*WV93|?4e%vXQ;Z9@2>>6VDYik;2H&j=a78l|2E?<_S=49C&H4JT2@t4@@PTfBPFXs;J%@yOAE`&3d_8n zw9L#j53Ynso-E{JUt=%wHz-m&A`(| z8SAH&@$br@qKxI!%1H3}Q8A^tKU%V|}jL#J_ti`6!6~LdkVb@1rBuyxMqhDp?`(3QS3tLq1ep94cu%! z8`A`VN5w-}k7JRJAsbJO6e_VaOm6II@#11K*g(=!TuBbGNgo%>C_S~{vK8e%pHNK7 zJK|su5?3#h;o|E2+|1%-!8umo$*cljMPYGW2seV36_?aC0L2r(fKE&34Qh=rDZjgf zKtm5@iVwgy8VN16^fFrz6yq z1qDofaCnhik^3iwYMys(3Bjy_|o;gn3Fui_VXGaU{bVy^D=?dQ!wY1385X*-V7E$GR4|g7PtHT z_=I-9iHnc>MAjwjfwb*i?SeB|3}f?c_ClN8&@uktzC?Cka+bp@2tin1TlbF*?CFW9ZXCO4|3!O72Sy{idv zd+U}>8`rOGJE#4e6L)Lg|D;>rrPr(CeVyp_MCkV8I@z-Oj`tn+N%lXvcjows%M?M- zj;YU+7>-XwASa5C8=5V`v7T68#4<3>lR!U}Mx7BbZfeQGz~l2^Z7L?Nq`4J@IbB?9 zz~SCb8`yE6I!Smf1FLg6lUz{uf{4^+1R=4xF$;;FE&!)~_bkF=ShG-;8xhQQ$~-?G zQtkY}{6M{bb`3zQ%*-kG%q>rG70$(g)EgFN8m~EC?5}d>z;p;nPuS?imd-5;SE5tG z0kRl&`dtxar@#3c>WP(HHWJ%jH@kdM)`!F7e)8K5X99Y z&4t0f^<1IEAhFL+-VSGSe}bN5xtdtAFi}gl8Ze16;ljyiV!%Ki63^^&qpKwaiS&Va z7p_!>Wk~D}i+#SAerBR)3u}*E*%iCSAmcwbDrg$^!g6e3w|C zux@b|pK{LRF+8~I6;~O;J_L7hzA|~atG<7?%s2k?UbBNc&AUfmer4o7=43~|SwYtx z!ZDNoldhJ0?Uy7qDRqkD z7#D1*a}_L5^hCxZO3r*cu??*tgVQ>_fX_A3c{i zQ?t0~OC`y+J`!hAcd0%qvHD0*xA4;^N!paV`HUtLfLCD{z)7Sy877Cll@QTJVgz)x zWT#-5D-Sq8e6sL3ktqfN8X$H}s{has-E)cFo9y~{*HPJfAcAAR039_*{JOvg*0;Dl zu%p4e7sqb8^z@`QA1KuN1d}+Mna%#qK+v-jC}e7E7NT zB@=81)?*FEA_HfK7X|98DvNTmy&0}#T*EalFBhBYpzRks1IVQSTO71fZVqsNcwrXD zjx!T>*_t4>bP2ERLTtv8Fgu4}rmfOr5Z{F#cPtd0J|+@69A2r3si}!QbIt(mZ3^bC z-5foAQTrOYIkt^dddrerWu91CWiYRL&8C5E*VWFQQ+M6`hF~4N`r@SBTjwuu{>z!O zch$!Jq)RSIs);?e`^m_M-6@PDW5MC|us2h32G?xb>$;fUId^f|ZyXIV!`WOnx5b?b zlwqzeF}9NzXe0Db+g9CCibY_)IQt+DKEOD=QyhzMO22V*A(n|PrQ*zj6HdWxX%I!7 z-6AD*qARc!dFp8iY&fWr_q-^NYGSj2IGGrG`u_WS$Q3;gJkS$6Z~KE?-@(7G2OoS8 zb9xLg-42)vj6DjbVy6iyD#e`y@1=k$Ej5|BTyO^q{zwyj6p{&Y$xThcoX>>L5$9#GbrF*n2pqe?a9|eu3)P8P`*5}}CV;52s0TOe`eHwL zS)9J9! zLnjlQo4YC|n5EAUWq~!bds=B%={KbAU z@iguePn-IB&AjUB+S=;sd9JS5NNsghZEaO`ZM!g&8IJKAq0mXvZS$gS6-JHmG1a~~ zph$Gb*39G#=E9D}t?nf1OvjcLM>Ne$Whq!{CE7U;iA5}0%iyOsNo5jpyUvm_rMAu`kdnT8s!AN}xE2Jti4VX+IpladI4Zc^cf%1z95#y7da9 zuO(u&(t%cjk7c;hnKRkp+?f(*t!s?rWOpQ!xZQ2;wK>^P*`~SO4u@eB7i3ppiQ)5L zr(RlS8oU&{Q{8X}?r=G@V{VTJY`02SHJQ~sv9=J+6t)16fVKd}?(hx!URRBq_^oQw zv2PVrR1_2!l~ok{jvT(=g4jjh6pi_d__?jTu%NuWpg@=lFuvX~ZlOu!&!EhIe}5Sf zz~FD<9iB1%7SA9bm35$8Hh#0w3hm7%S#Gk?(y|x?2A7Toh$IIL0;k8_~ z;t7k(+v9V!y2Aag9Y?P+e-NLj7n=LU^j&ed%bKOTB6E%PMd<3UkB?^Ef2Go>$CyS)p8Og60L> z5AZ@Mot)x=ny4z~2YDrS_aU_&`&WaMPz;Cv8VG2y0r1vc)sN5>1;v1#9# zlM`fK`Rt93-^zUp7mmNq&y0?K)8BBPV(&Z5>q`4eg^TU|AMH(0zU{E{@mj5K2)4C%p(?I5aeDZEm zPalwTMAF?EX;|ywJ|ih<2q9L88YEQZgLLt{2WLOZJ+V@8I}7dkXyhh`0~d!n95;7A zyC>Fm&NEoI&^Vq_VToyPY01m>f={0M>LNEMJq@s=3KI3m)rFS@bISDc!WmAmteo*9 zuf94K<=5&Z#<|hk_$T8-Z0Dj1QcY$Zx6W7%+f{6qv4s4FZZWDEHh<%MQQ^d|V1dH< zHFEFdq(qErhoGw@P!?>(sctX@booh@4=xw1WN9v}=#ec64M-AnCL18A8UZgm_AH?O zKKs)#&qJ|u5Pa!n2`Gq6z$;coAXtq@QGY5%3&y)A9eWu70oc@xYr?53>a;Y&Nb{!Q z%uXDaf=yYVcf*Qm`NF?ZN$Nqm?*ReyoF7sDMYfP6TQP&nT#i{EePoZ5Y2K0-# zXw8(g09K2OQm~;HvimNfiINABuoOkZutpY3WT{_-Pde zCI^mA92p-MEjudkC)*_Sn5lx7!t`VD8Js!A3Y-fEpu(vK#B&^a<%A0qTH{4B8c~Ba zUUFo+9yU*VSXB0dqxU={ad`BoptErpPGx;^UP%>v%~qe%$IhrYJ-)gyW{!%QGF=`2 zz(b=iy)^dy@!@!NPsg4T)nV*i7UxMtF&ud~o+nLCjz5Ytw@bcNG=3i1S3}RjU1VY6 zU`4kI9+%)>{9kR5bGejr#ZBB*Mo&vO&dG_5`&hL=mOqq?g-sIfNjZcKd9dMNCg8i= zHfh)8N{XbCq@=c_wRzYwCM4a`qTH&y%B-9$tlS)4hgYm-T;jSK(~}mLa7{_A7O_@A z#?zv_mT`}r0U3AV3PD$3f6v4!c@n>y-p0Ruw12vwd!HoiBxe^W@0D@L^Uq9`ci%9U z&<=XYs5h1f>RW*Q870Me8Od%p$YAx7V4!yPEaJokt%3jrX&4bGZHTdwLc zWD%$$YH;!tLkn6!Wu$iIAU>QU2Axw3Ij2Yild99i4B*498zR=cZcS&_(i~Q_vGm;1 zbIX?Jm`PdPSuQiTvuwC@xO77i&t06ge9iK#vLvV|ys_`c){-N!$Gw;>DlCoeLWq zQ(V`f^C6cX0l$7*w||wfpe20T$`uJDqzWXgTGp~uBO>|4h^YGS5D{13$OZVSHOoDV z^A%c#OP52a@NUma;Mx*TtqMWB-8-ivK_ti|e1n4lJRI zmFo7XfQ|M}yfF@p1dWRG?=I zRs4)_pAdF7{t{%rhnTpvF9TU_}SB}bh(1FMCW_2Q)djdPovZ_KDzowrmfR@wNspih1SI0%DxcN)uDT0566S~$OM zR%LlvQ9f{hb7mewu~h?i^r3%*YB1sU&yItz5e5o`ob;|Jn4)MtAu?j$JRp!EShZ9j zl80w^g>u(!?mK;P`MN6F9b03m7AKA^3RbV)ER@c3=F~#z+)xXp^9-2D-n)9^uB1yZ z<$0diPk=V9h9qWj(#-njc}uWA5&tlcLxvRdcmb@Svy6Ghg)Qe7k&JW@GHwXwY3xuA z$%FzkGx-qq+A}Y9XQX45o<-7geKdolXYBIezSa~s#TjC?`fXa1ol29Fo0Heho?Qsp zboM+Lr{}=TT2)wCSP4yCX-V;nI^aC$fXl)#x5~euGl<18)UWcdB3$9Dk`k7$ET;-7 zq;BVPRh!Q#+rGPcRrL+{Q{mI9Zm5nek|N%jv0EP^hi@pmfqaNJ{G{`)&Y$3)dMI(M zYy7Rdz9jW_bm9%@j;kU2Xx%Y(KS3pg-M#;T?l`Qq?NWDaA2Ux$)p4wE>WpM5k7t^H zYcc;Sn5qnnW1tU!VTE6u1?^ZB)aa=x!cg{~Dz@#wO`T+KdE<@9n{URpPX%@AX=gpYUA6 z&2u3g3d7?rY)Y7N|6xH3bga`I+#HumnH`T`2Vj*elqqT*u*2McbXoHP^Zuh(?ND%b zty3W4J>!g}8=)#;wXJNeVaJ;BA3jZqHal3P9$^8NyJO$+6hf=&sd{VoTW{@t{}POfg%#b_=^K=Io?2nzS3AjkIo0Mka$s2!lH$vJt22 z(7%Z)L+NKsT+9;m8D&LZCy?;q``e=x7AIxnxfD$o9GsF~foBEPCCfBIi; z?5TJ!Nxd7*L?0|Ru5C$%9-KNCK_@H@=8HbSRzY!~#)Qq@98M-~hx;;EpMhRj@pmJ& z!$G@5CP$Ch+~C0GcpR+KIj|)iN|blaf}K|&iN(g^rpC%jiR&6qipDgn&pstAQ>W7U zy_j2CSPqm1v0dJqRa{shQCd)#1s^vHtAWx&A7TZf0~JL@S=pr}vx<+%F%^53dP+*O z^J}W}^Q&v}#j~+y_QI9<)gnUu<&>5<|Df~=OTqWHVA{kPSxNqyf;GbRfhC?u#mp2@2?r5C ztnq^gHo~4t&=b?dzNxa*u|q&_ei0D8auKMzpeQS=u%OH@C>r6qZ7Ua62Py>m3-inB zm)b?eDH2ye;JRVfoP{gwJrP1rtgw1P>pBJB*kRn+lI$UFo({8gibbhyIPMT`jYT(R0pO z+fLuSey!jfOP4HK(AeOwn}hXQaba#YoM5FIJID@U&94H&Ym`nz>2>W)DK}O@-D0k|uTvNyUSKvw%3e2X>HQWE4vsQdk&~EQKNo zlFGRgzroV;XPy$Lv&2KbPjYv~K07!}GR3wf07+9^&(c4_n+)n2{~PMM8+8>K@cLDl zD^(r3N=w&~sItf?l2w}1s&v{`#Z_eD&+{gp5^LW~0YD~s7yvAx3$V|rr^wsn0r-v?RpRR`*g^zf04YkYAiSaAFcD7g!6S%tN-o@e zaASk?#s&`+Qw|=TAZ=F*TqD8@N^W)*OmuE+DS_7+;a;ppj(WJm(&vvb?BQnyGPuLh zJ!iq3%9?_bs%=|4=Ptme@cfc0?B@<ME=ZB()fh6laRVdFZ4C8BTYK^91FzEVmf# ziHic&Xpl})5)LHQtU8St-~^jiZED9x$>y-XZgx#Yc}Y=@FBAGqbi+!rGGlr-h;v|~ zAA~C)gmGH>U3>^)vpy8^xZ^s0T&XwE5tuzYzqoqa?9SS`i)-fwE1OoiPwZT<6Q`T< zSCAj!2-DjIH8llQ1q&C$x4Z~0tWQ6g!$Ei?{9$p~h5AernRrXD&7>T$sEL|bi@~@R zmm{#*2bUr`;KNhM5yX9&5E!tF&0*{o_p}oer>mjn?SXh<5-CSmIdE=H$Pw?BB`!xS zTmWgU+>4(oAxDJ6HbG1ZX3B^$U4RSc2s7(lM~Y`b4#+Ahsu03fWg!GF>>;YJTC{Ro zEv7VtFp(kF3+Wskki1nx({Z#lqP&AxoMNPske{aJUL(ttGK8 z<3(}@x!VXD7yloL2*j`igMvIbZNS!V&|;7Tg@~Y7f}JB+lhIT`;H;`ZSwWGvZrh4Q zkVYX~Wffsg$7F+8%=9W2^S_9F@s#HC>on~|jDNNypG}h7=Md_W&Y^@1+GJ$7GcGlf z-0*}q>>=>=cUf8r#U5X1Vq9)82(g5$WFEwRO{mHLI3)v@R7Anjlc|PcAFM-kRxa zhAHneldO$|X;^G^xa$qCnE6F#lou3dWfd2IiXrP37Rd!hu&OFpRa7G4(P0Z$cGU?X zP0GtMwzv{0#L@&Qur$%7_=*dw3T_q@PO39=D=KoPFDR_{70t728Z1HJxMx*``xlb% zX)J8qLOx61feGJZz{4-Bs@D8(z*Y+ZT3n!;*f0mifGt$%>4uT+Nr$yUn*MROBvjgP zK_^Zn3G*W)DyPt@#=<||_A&C+SizVZ&P`I?=aUlh68R|UiT$(dS#Pn^S?qlln*-68 z#^pHQ_jBlu)8Kte-l!pV9i(GZE!28q5d&GChI&o=2euGRJiGjvG32C53g+PdkR`T>5J!VEUT(214*F% zR{Z2h-F1o3`w5vuY=tez%~4hv3{R-}As}T_00hmWZSS}?e6aoAJZ}z%*OhQ69CG3> z=#zgwr!S1Zijes8BCd7+{{3@rm^*}jc+9U2?|K&s?$bg9jIMEx2`I*TS!T zV&hHkC%#)Z+$!KB#!cjtXNhtj+7fSm>|?jZ6Q8&2dIlBo@_(gRMJEqs4TWo1cmW#y!SpJKew%PYjAq`1O* ziZ;ZqLjA?E{u)`kI68vLMF(hOKh&gh$2G$oAW>zjCH6%5tXbvwOO%c>JLsj8r7RPD zQ6kI40v^M~lHDz9p)9K=m=n8ibZ{@d^y;f6JXa&{Ij5Ev_LJDv{d@N5yfhX<-fzpi z{}~OSK(S*n_U2&kNbI$}eIue|1=nN`t)Bcb#^TBSXTpaELkXX8pPfak@45@PC;&{? z049f_@e5hT;$~oFYB{6)$>D&9#EEhM5-WKBnOFC(Un^h`s;8OCf~Fm1p+MVV5tQZ0 z6o*AD{E8NRL6o%T{U~eA8ii*+eedLXfGgFgmwi+Xa+`XIC$=3)ca+I+vx8;LG*V${nX?E@Em5GB7Y%beyb;)^i%8CBmY6r-U7A&^VeF@$E)s0fw+_- zh{k|+M2vH}sR#Qj;RCgxC0l%<_M465hpra*z7}(8S!JB8;B>S>og9TrU}x-$fwYqK z{WbNT8hYsxZ>o3MtctR1;dmBnKfo}e$7GeHw0yp z{_P{Zq}}M0Xtt|&WiBe>n}OX_Pzc(KEe0Ak32v5 zMfk6GPr-#m!al&MZ^Xs&0w}=pA{$@iDXgg<6fPiXdde(Z;8=oo%~A1samB{P0rGrj z#j166VOekNs>xZC#gkvg7&uk_s*f~CjvnW)PbHW(jr%D1?|cf|>wyQVxDz&vtG2dq zxV^ne_~OYgD;p2j)?t-Y8x9s^=jFlsPXYR(Z!%*tIC;~l(vAYgzhxDU6t>eM*J=Pv0Gc&79>{JkBVv2*z0%(-0Je$Wx zmS-0>1u7Q$3Yupv3;(n^C)Ja`eKGY_7F6KU1QOehI_H4`GK@M|X9XlUbg~!@^4{We zm|%J9iIJY_bQl=~BxyNgk*Dp%E>hv3F6fK>rm20le@%KxQBmIFpEk}eUR08jKhNtc zY(qU0SCL}qQFfm?Zp65qxQbp!idRE~n|NgMg~{jW+60}8aX91rX+q^S@d&x6JGP>j z4(Pi}V!p`_Pkscn{_gXy$RG2Oh3&D22N^vU1I{|2lIhW0CIdvKBl;txv-x}i96ZJwqV|9?vj-X!nqLu9GM6#LQ zCOVaGu)4}(ApjOvqO1-!2Xfgxpod5Kj{lb4P`UQ)i|vHK3ajkO)?$1x(oq41!Fu3@ItfW7~x z@$+eN(lJX;YJ%J(&c9i5603!rbSFkf^#8=q)v3!z47#-$(a zA5D{k*}fnuQ>qN7O`Vu-e@TlvK0hGv1${`dPs;U(vq=+eDzT4B_r^SfYU+v zI$21soBSGE0Y0@z;nX9U)jkX}P%V-)QJnhCL?n^t+O0SxQ6(F0uau~SGzE2u@N`!3 zVsVCdL1uF2vxIFc4{Ln7n%q&Nhp{&cLY?fo3GEaxcL+z0E-Phc4sm;dH zf#-zm^e%KeO=cR6%SS=Lq65<8hy6b0GKJgE&t-?nT7iE91QJxNF!P$UP!mRy=M5>0Xj?z8T`O z<8fE8O2|DTZ%#b!>+~4po);098;`q^)k5wOFz4CgIuLg~;__7-M%~XKZ`}+z>LfBD zv~@zThEIFv&k|}Caln~4P&whO|4@X1rb-$G`F2_GNIIY6?D zr<>`>#xh;Dwg@kDmX`p#hHP@})~)NOYsr{-@x>Qeqt$u}-k8vroZ`F>dOhL1KTS_E ziyoRhgo_*)&eJc1JwvoypoNL{bF5IXok{wQq&;vk%;`qa=JYi9t8ns6Q}ii=wi^e- z(FcMz*~ZBABhiDUYr0oA%$wJ+x|>d1eDQ@V7KuhLT7k}kT>C$(8xqsBy6-v|9a;MB zb$Q`W{ug{<%0Q((?e(}&cE#wvk0UrxT$5#gt^;fkt8_RWH58jnU>ZR{+MS@ z+|`l;y8s+>z|if@D9S7n=atJUT~b`M=`tMYbSnNnU+XSd&^fQcom5_7Ys$jZ)SQ;t zrD^%e{%QF1(@P*9-U1n_#`uA9nK=vlpO^AN)b4(@6xY_kFKK9QX?2ba46ZzLMF5u&tvHj-_2zqv^Rs6Mv+}$} z1=(`~Us$=Yq^hc9AuK60R*3C5Mox5*ET>^T@4x$3O8f;v#^Cr>{}EHxGJ<$cs{|w zLG1LR`*7}n^GgKjYPGu%w$QEBQ`7N_W=@DL9MbgVOZSPRI!aNO1j1%hg;EXh*X!J+ zjZ5mno{HFo7TAl^+_^1tDspn`HM&%vV7+xK=(yB)6#iqeQy1_H@|=w|7<{%kaRC>c z_grG5X>^Ttg$pyN*rc}VjxuC`??UYd_e2@R_BQE57w7rq=C<&3lAc;;g083K1UVPw zgPikA^Fhvq1yhMxSg}t;%o;t%Q*rERg(g-9OIk^8)|`Mh*IS(Dn;ra;MO$-N%H%~- zZuXu!|IUDQ9sJvCdeEBV`L|ZCSH!OCj}9$pTeGsdG*ni-a%~&C^uU3Gor}fjS=_03 z`2Vba8xN1ye@}1k_A^hd{xs}X0w2#5L^6#xTYMaDeomc_ADTyP;z=xW%TL5`;5kY*p)lmu54Cc`AomX{bSxIrh zoWj|{&oh$Y0w&?T2$~^j6t=cl(fG>8VyqVM&&~E%W~XK>tDjRkyEs1+A^%5OR-IN+ z)LdM-a&-&)SawcEn!_=x4ldI(Qk~A4y7wvGsZc3d*q1j%zzuPM zjClwFENLbw0dSVjR>~sdojs5)GYtP-icHK-=yLa!(m1y3!7<9et5wr}Wucam(8VGUZ z9z#!bolt~B9)MXuhyy&I=X(k=g_c8I@dvMXa>qqQI7eIt1J9=L+P&?(^X653D6eSn zw%Z10mEMq72!DXvC&njg$%XT}3I;s2-rH`w?XId-xg*|&qS&>7p?|WC{F$8(d=?8o z8M0ynJKF^qJH?!bYptEwg@UoZ6;qd^8?&KC#{ToAVG+!Nl2kxa`a9U;oTs&VFBt&xD(>q*Z4fO387!&1CXH@>(pi zYT^hUzb#yz<8Lh>-dHxNLbzZ&_K03C5EOzacK4n zHIY2W1SSOt;hoK4z||C9))Aw2ZWVY`VFB(dPQg7J`6N$VQz8~l;+_q0*N)h4h|34% zu0yD1h;?U=*ShFIT{Sx>?%#0xHv~f)>fG`!j%R-quB{D+yFAt6S>;)eTRM*9RlE{h zGiToFz$>_uWo=#so%=G<)J~jxqjOfdxXH47mJ>Rqr*K!^85kp6=&P{^5E7eZ@XO2) z7kGGajVEyj0(5Qc33JxOfWQR=DV+~}*HVDZLdX-R9Jzg1cwAsu|7Q}|KL~jtR=E#9 z#mM$y`q7C2dpU<>{m|42J=nBjAl1lXTr`+T*G?RvYXd0aI(pqvaq#BffCB|cFp9|w z`(l*!W1>@<3aReqA;p|fTsIT$lW@e zVHENf9nQp_*t3jwW60Qt+cSnSOYSsw!B=`I=+rO&N{!8ki6Z7S{EixJNEJc4L1P4Q zYmjpgf2GEH#1CN+6E%8e{#IiQ&s~TcmMLe+az|0m2yieT|LsI6BE^`|10UPHNVylW z$Ja7boK^4a8PeOKS_63cP|q03-iYu{ga!crFxn>kdN<&2Awot^E0^=f86yZJizW+GtIADnX>Lf*tfQ2P7^8ovRcA{$2^+2!8tzKL%I@)`k%lbSu(s!YSg_c&U9>w@7Jr18E zXpI=(`|w@#si4XMJjM9jiE+0MC9M7ra~)3?i4kERIYMn9|4l|Q?j#ph@7Av=>=>2C zk1;LaxD_^&3uj|V#t$*KyGb%hA*tYpX~tJbI>{iJXwg@V4-yYN096|k#-!0lyd(>{ zomb)5A{*lY@ zI8lhKCF{s~+;FbOB$pLa6IY`bo_K^3G3&@4!BJy5i0EgFhllPIsTurVa*BT?_1LT9ox#UCS!{j66I&wY6$!WMx>0jhy zZ$_UuyLXBb&TCVVQ$+(en5Umeq@|Zer&vC93zjAM~y4V zW5!nU6Y^8?IQf}zhH(-0!2ZHGWV{czS3N;~MV=(THr|VyseVJACcnk)m(Sov%jd}R zR;_$#{kQnY?9u+V~9l z3;8Sg8~Ho=2Tm0Ile|OzMUIkja*Rxn7@35z5GFdTZaMs~IpAbD37gp6G?}K*RGhI% zrx`f^>A{^$S-7_;8~c%SX&!E;DZuSQMerG0LQ82GEvFT<68=`JX$_r4XVW=!E}chf zX&s$U{j{D2XplDGKKDi%#=TC>bOBvR7tzIZ30+ECXe(`_?Q|J@QFYSgbOr9GJdLiR ztLYlthPjTeryJ--x`}S4Tj=R@D{h7AqTA@1^elQd-A=pdIW$6hXfN%fQM!Zfq`PQ8 z-A(u4M#8;xkPgv(^jtbjN9ZUWqxx<-%qcm*U)R}2j~ashm0E_7-B~ay`FxQevE#ceu93I-atP^KTSVFKTB_< zH_^}0&(oXfE%a9U1^Pw$C3+jZoqm~q1)d19paIOr?%rJJ((+*oDWqSeU!!->uhS#+ zPI?!;o8CjeLGPva(QnfG=>zmz^xO11^g;Sv`aQ^Ze>eVNyiLCk%Ye|57aO-j8veXd zZhX%8zHzycN*|&RH-l5v~yZR0!iDJ)vt^f&Zr`dj)t z`V4)RK1ZLYzo#$IKhPKHOY~*>3jHH}mA*z_r*F_V>7VGI>09(K^sn@9^zZZ^^lkc2 z`VRdUJxa&vF*-qGbP`G~Vew%&_i8fSj?I$banH??Sqe*KX)K*(z=@EDd07_ov22#Z za#0D`VxX!nnlv77o8wvMS?NRt-1lHO5ETEH<0XVRP9$R?F(x zeCB8MEWm=SfrVHj3$rHH%oebPY!O?`mawI)g|)Ia*3Oo(4%W$*vlVP5JB_VktJxa1 zmaSv!*#@?eZGv3=XX7p7Ud(nMFv{Qu`g-F!<0HlwjGHkFwi+L1o7on2I@`+5Fg|5` z()fgNi}7*R#kR3C*;(vtww-mebD;bG0gJF6*30@>lzRbSDzRJGF?qFYMN7$Y0E_OG&hkb+H%kE>}WcRZN*tgiX*>~83?7QrH z?ECB?_AvVa`yu-g`!RcjJ!;&?9%DaYKV^@zpRu2_U$9@YC)lsplkC^*DfS!oH2W?4 z9eaj7%bsJ;v){89*dN%7>?QUxdxiaxy~=>I64xg~pB5;lh#~tt`4u9crdgp>2AepD|RG!Auc?Qqq9`5B?+{d$d z4$tLzPz@CDLSDp+c?mD&WxSkM@Je3At9cEd#b@(5d@i5IYk3`?&;7if2Y8S-@DOk0 zVcvv`AtN9wfmapUM`3Am`Z{nNz z7JfS4%Fp0kd>cQLpT*DS+j%!Xhevo1@8x|w%6IUcd>8NMyZIhI!1wY&KE(I&bNMhI z!Rp;*Twz>hyx+LWxZ1dwkMc2WzxbnZnC~~f#}DxH_(6U?e-FQaU&t@w@8yU1`}kpg zF~5Xg$}i)W^DFq3{3`x_el@>_U&}whKgd7CKg>VEujAMAkMfW4kMmFPPx2f1r}(G& zXZUCNjr=D5IsSQmGrxu3%D=$B$iKvI8^1N4F@9q_Z9Ho{ zZx)(GX0cgfmYQW|xmjUWnpI}CS!2#JXPa}(x#m2x)~qw#=X4q^p zo6QC0LUWP1*j!>RHCxP9v(0Qbmzf=Ar@7o*VXib!Ggq0b%{As)bDg=~++c1rH<_Ew zE#~RwR`U$A%iLz3>1gd4j_!{-#|HcBJ6b!`v#n7-{rVZu&j#`I*S9ZI@2&D3`P%in z&ez(c-&^%lm(v<>w(gDe4i61FTZeYy!m>Ti){aQ;*l0Aly|;h3cWm#Df#`Ye_P(Lf zNN;a+aMZD^H-gl73=c&{9UT%@M~945MYm~?+jZ6Lx~g^!a(jcjBVL@&qM>VRb#`cI zIy5x0bDm~cfSS_*RSRHS%zdqQ;SEEkHTJ>qI?NdXDbqwxwtg}_S zOgCnkZuByZmu0%^mRWeyUD)1XuG=*knQ`hYp8{8Qg9@{$* z85?!3(@m4u>1a(}H!=_z*`*-es2?_fLyeA2GB$bBw8jVOHNefXDt~=bC*KVGIyT#~ zH%hSlf%;a*7F(M;blW-_%`J(xbm#&*HAXtDw&^x?bfj*X(v~f{En8GKnOlbYf!r;! zvm9F$*jp1|ySDcAM~9;${UeU8JBK6tqsd)~j|!cjq%QeMze?Qu13``5&L+n;S*&|o zoTwZTTf08_MQzDam{dEIFy#t#! zu2OKcYqYdCJNq>p{d%bO%ifoD;HI+V-H9?)y}@wGo}I(d=-@zPu&=+@F(9$0zBRWw z2I2_9IBw?y0MRk15Ih*!H#9OjJhX3D)G=sF*3ihJAiE(u#MWrkC|#!UwoIdTneO&w z7V35Pw|AODiSe*Zx3a^^rBf}_9oJExIy7ZG3~5}bvE7zDWE(H0l$&@Jx>n`4QV zc4+)`YJ7EAE!QpX=u91(($X=jrF!I#$&o*%M*acSr~`>cxemlf{sA@e4<zJ_yQU(zm?8{ z+iI^>kA~N;%lGU0{JI{$E+=5Yr|a`;_?xY#E+3+d7zYhXWb!w(>2@p83GX_crq~8G z`}iAzI$coXNAZ5dYy5<){O&~P+pxEeG(4H}-1RlcsjLBrRe;nF<4A!NaA zwb!ag!yD4&hje`*T~A1t(_q1;>kC=^X5m$*!&ImGPp50s?Nw7N`cJ1*yw%^((QLL3 z?AsOLZPC$)xjeFWZ$uUlY;JIN>>KF^KjYi*iFM%f=3NN!m5^f1Rgr!BA`s*D_Vh*Q znlZX|jGoaCF{xij!E}8;+qi4U+|<8wZ-i}*j5)WcqS*Rf{j42->qq)kHLcBVS^wzJ z;Lu2lu2H@up+*^Si3-(sUA}tJWy%-#y1mhzI*~|jF|Kr-$a+_mV#0{XM)#mS=1$RQ zvoDGZe4SC<3Si~6jKkT2=_#Y&zv?Oo;2AjucEtW5=F!&MU9 zSoxBK#>#+#Urn+8pqg^=Y;=s(FAD`FwFc@H*Tu6{Mk}HZ)CU?|=SPQ!>co#IC*W_A z!wyeLhImS{#Z!_go^lxADTf7~av0z#hXI~)7~m;~TfiSy!`R=ZhM&Jp4Fi9hE-$Rh zgOdhXe^{3n*5!qDd0~~mRSC-hzZ&j%Hl~UDriVr$=|m%a(P34L;wAxqu+!Z;gdu^6 zYb08*FFM>m)F;++kdOPMtkvGSS$@l&`I{^)tQrvrH_9;`2!|DN!i{pw27-!r<0*Lt zo~rRd#mfWD8ad4hIexzqg9CmwhXTq5&#r@zw+6e_qi&#oXC!Y*l>JNo)GrY8B507z zl&(KPoRRNd{ccZFFg32*{w+g)8;FjK$O3$}i0*i7wvLTJqEeEmOzi1__!S+9?ilU1 z0LT(id!nOLB7OGAc%g+lcDR4%uF>wnvAsRfVT{Q^RkZ4#ZuO8+c~he7Uvj2?iPw;& zT0b!7D1vB-do$&e(|tq4aX$+ktDC_0hdt5Q#?q+n{?RGh1Ci2^(- z!rm|GDk|QR+>t0an4s+Lcu2xt9)C@INQ7h(PxQQAFvV{5P&lxn;yB2$$8;xP%d(nf z$G0~gDM6A&X2;{KfQ&A&-nx$q$nS}w5_OhDMnK>FBYV1!3&=dac(fg5-gvBB9>|n= z399Pe7a0~jW5?)mU*c3OzZBT=*yvW(Z2M+wx-Hg*>9ctPN zs}&yNrPPLJ*cBPXliDTgS$ATURdIykgV(R;4Jx%;2Z(8$}hJ z9i3`&@wavIKCDrB$Cx!oEA>ObuSEVpK#9ZwtY#%}fsmS0F~7Kak#l$q6Q25_C!Aob zny3P*+CV@pico@@g#${64+NCbE)c+i6;0S1FQ-FIgaLm?GCHq+e`Fv!*c(-K1e=qi z=k;U64vzLm22>mlDu~%VsPsK}s#!hQs%H71TErmUN~b2+Kv+p1fewX>K%2@JXj1jJ z`jxcOsuokggeotfrI3IU`U3%fyIb`_q6vEL4(Pc&pj3E)fS%(6VZRGmM#g$Zq8fQk zp`_^EeWM2v;T{;;*^jj_R>dwI92!pP7jnf&v{y_mCfW<_GJgI3HjP!a#0&(R<(~3N)*p3t$x@dOFaod$7GR zWgm1&fIwn0X=JQ-*XXW@LTP=2Kh64T12Ul0`RL9z7Yf^t%oZUjooOJT!3=2B1)3Yv zgr);DIyNxczi;56hN9W6qW2AqjW{F2!$Swg_Q_B6&0)8Em(qrgYI4b_zM%uM=P;m} zRg9P>becvL(=#->ONGYv_36|ar}etu>UBTXYpSl-K-X*B)@$moZ*NwhK*KV&FI9oi zGavy=vEBqs@fT6K0;fZfK)vQiLBB$OSd&<|Q;}Y{Q}d@zl|H1!`;ZpzLlE!#2791< z+#|~kY4JX!#rsfG*wkP5*;47w4mByl4e4PSYFg$T*kMc8q=+ljqzE~L#li5X?R&F= zGSsY~3^i*go7Hd+H7mvzYS#I6uZMIiLwX>EG~z=TNCTtL_V-0i`RnZ4qn?5^L+u(` z%~V3l0uczQr4zoZ;T3A{aD#9Md&UL^Gz$nR;|`L9T|4>_-Pbd8o4!(v zb6|&pN2v_}sYY#^B8-scpdn?h!gs}CLz+j0)H)62Ya}Txc_7rNyGD)3X}Fa71RjDkUK%x0m0lI)S@|@4N}VD+3aN6HdMXf7YQ;cEspSG8zvBEMrRKv_ zr^^p$c$GR5=`}ol4UbX-BE2T9MhkwcevO9)oxVYr7uKY!)M9`~!>81MfJfJ_*Quef zhEFd6LwX4q(!4w5*Yzp2AK0meQ>n#JzOFB9wMWCN)Tw}9e^=^8v{S>Q*TbQJhF_`a z0+s>*?gcbn^$^k;fRL6QLVDT@HR}9&dJO5MZ%EJJAw469^t2gj(EX~^U1*PnH=yIS z#1T^JTi{FgyI%K)!aAK^LWlGcI;8agABQnX)} zuhhKwZo#YRS*cl(PQPo#K}e}Z5wH74OA;ZaZUp^m)}+*$pj#`QZl9K*LQ0K{dNtma zni}uAKBb;SJr>@qbhH=uus-luS=}2Z*+-O`(Efe`jUI10|Pow zYHtLxr}gH84M*_P=*H;i*zllEqhR+3eSMM9$m;&VJsl&xk$qOJsZb?GN3FNqzUcn` z-e|i5v2$o_SQnBr<-@u`D?{Ft_|3aub(=BA<^w}I-V+_{Teo9Pw6A|`ua3%)QJbUZ zjp~S86)_wc9NF7HG6G>ze<(WcLz|el_1CoMAO!N^gZec!YHw&3CavhEC|15u9a_yw z-!U}2w=){;(^-5whlj@YO;1$-D^~ycz)56aa|BajL1e<*tx zr408?2S0f@x(_B$xr9j@+10;ebfpD-x_n(XW+6VsPLRHl(a7-Vx*aQ^TZGYF1Le`N zw(iOl^6hBEUuZa(dkW7-5NRn8Ur;8P`()h_lIf?fv ziY%{)m&y|vaC<~DI?>sSRZY)952iImZ+xCikkM6WoAgs z*b2(AMc5IMWse8Z$=td2NL{@A;In@aVHuk)V-q-0Wy<$N=M>9Cnr^gy-UgpXeztU? zve^77QB%4oRerL-&9vU)YJCN#7(@Ec2EB-}w@IN&jU$;%wSI16#1p$Yw|LWE)j z_7-L*^4SN0#}*w?3iljal)Z#}TYMrYfhbSB+gd!O9jbn{>BYtr<)quF*EWr6ZR6Ln zES^%f_6ORebb+Uof&Bq&yOOi5wq0s7pFijiyW|#{-l4rcF1cGqgk)Nn{E|hUpufG& z+A0&&TQ?A=(@5DLX>isK0wZQQQ^*)VYut@V}UVG9u z`%A$7(r$lgw7;~%H5=7H`P}6B6=&;@v_S?eEws25~VXcm* z7hx;C2wUkzIGCYGN|rA{u|@c&M>J252-+iLozo+xlp$-MoGoEBYzdwRo5M zkPg4vE`_I#SNjw29^`ActX|DFt#8M zh;cstBgO?d%Rr1PaiWl5hy82#eFJBji19Y=d?F-`xMn>^_9zhA@ zd~yMP--}a%gj|f%fCOg%ufp%uIQK_z>hHt&{WSSBes3h7!|xZ!?fAU|5D|G+kBD=6 z2;Wb>joG6> zf5Puu1^BS8>k1owwr`Cr$9%%_I2j<+!FCaxOx3LYUC+V`z)tikpta%4<+6;c`aH2G+bz4WN(SYqE;&-F? zUDdh`ziZa5#_z^;Yw){Se#LfPgrzrWaYh#~?TrlYG1B(#*}Dg)=A^tk z^3TF)HxZwNzZ9H$Gs%~6$A^RyZ8T&Xb0wT`GKKS4f(i{ug&|3WXGtpDFRAc=q{73J z3LlqL_;_k5GP$hh2&g8 zg*e>`D#Qs_P$6=F3US62REQjRlDlxe6;z0vphBE!1r?Gj1r?%@_9jjz2KKk}fUKk{8c zf8=|hzt!aX;v^G!2=q5dejw~Xr3IxEiG5D&#`%XV9F0zRDs7bK{Xy|`yVhc2)}iFSDV;&D?- z$%gY4tCb?8a>zLNH}QQ&ggiILL$_HWU*c;#&U1(L)hfjoON0~-kis7K25RKKzasW@ zE98L}6%{vQ=pOr5&(k8W=X>$EAH_pIwL-ogE97~?3i(j4&ilL-=Rq&(dJ|A3Lh(|p z79llyA-hFjNK%OkiT*udNaXMUV$jQBE1gx|6ugL1RwrFib^a!IQ^!Si>mOT#G zKn`!673Xb;hZb0&Y*qICMJrax7O>S?RDPDZDqr$suELxjA$ zMIRx&D;^p>KJ@>!c0TY`9oL<|Gw(?VAqgQpJ%o^j5JG<+`iBrg7D5Ptv5+w)1hWdk zgb+$?N(d&DrK}edN~ud+m%1)XScekIQkPIdh~rR72_=L&j_bHAC6u_-Wm(rtU6#6p zP*>USIdkuQPaxCo=TjatZ{{~M=bSk+b7tl8P$SvR@ zE5MB^snBjXE1;v$O#E`eenzD)Osxn~`P+k33@raOsh7m^pASm&Ukp-G&!-or@^`0V zK9#)zmVY2j9ST!NgH#;({1%)O9Oe8oVe0iDCH4H$w}Mn`Rgj9$7wyQuf+OyGz$nNb z+9`Pcg)ntFNX3(-A(sDcSUQUoYbIVNJpB0#4?iXQk(=X#q+)AROWn+lZ3wW~Ghu3L zkcwj+9lewkd|lguj-a%lJ52QisT3W|3o&1M^pZh1FFGi&K`Q^f`=&k!OFs-!$yt|w zM|gnu7o3n(!8xQ9>Zdi89;UMHmy))w#lTc7PpK3JrLmGQRUV|0En+nx#=h@*8EXhr zEkP=f9(mD=Z`Z<^6I%ctrEY($JxnDrQn4;Aoh|((H#gbB%?;76%u{DYWxctSV6mlA zDyt_2dqc5RAvQl=CZiv(D>xFSUcFx`wl=j?W=Xs*wjsb`&xEP1K`I^(Q*d)F3OWL; zpgTy#UIFIg|pM(iLpDx@^2 z-PkE~cwDg9;V^Y9OiAfkDNVKzd*C!)peyvQ(gB#85wVL5xW|u-VakZ!qlxGB|HKv5MYc}z&9h%m9B2pny&a9>2EI>>6uc%V%1(aoHcmIOYdnte12|lGqo9Wdyp;NGfu#>QBPTTDwa|@*sc*;{(?)6 z7j0$a=NDWdzW+!w=5BlgZKR%Z9j4kP`8P3ahEim`P6lH)Nj<X|M+vWmlD?=Ec7yHJQh3B)OQ9lswT0F@N$yNasoWc1%o}KoY4qcx zq<eeb85E>~V;WDLFydPc$mc6yL8^AV@wNgR|Vl6ty1S9 z;!i2w;Kx$GTGNwwZ>gj~yst-iGq7owyMyKzw6xvDN*Owig0 ztF$kZReOK0y(<)5dH<^E#Zt%n6mQiKsf1diQut-<(W4sA(|#qiUyo>=GNF$qrGBMy zFVj|4O7khjJ0u=XF9p^??@r3;@6rNDz@rXPnNoZ{R^p6D5o-RXdu6ep}lbMH;ncLba68`cJ85T2$svoe7UC(x^y6(SCo| zsp(3W)>+33Ly_}`8h=rFJ?_gO`e~PO#0RI;>CyO0iX{4Pg3MLT{EPPMAGNeo>3`c# zpP)`cxpXR$P&pGn$GbJU63SoGwmlku+SQRe$ILXDGYu|wxKd8|X&J$i(i0|tXLOGuryrZ_@ zgOpO-ftmixKX1}B^Qr#_G7I~E;v+n_q|TI3R->|(5qFr6d-}x-MtCOn0k1Z>!IQBx zeKMAVzpt5iW2{G-%YMLm;z`lvvBV)Bln?g(F7+h5MY!On1MJ`W9*o}I*!^jk{&!>^ z^}nw1KAA@#62GqTdBx9@o`8qZ#rOnX>5122`E2wy^IUg_x6|8&kII+vhWH9TX3y*A zRglx(IsDq5$D`U6KG%5KcGJ6!U)Lxea@{8r@49hQEF&T_zW)dEuknv% zFCo2IWA*^jSp1)l5i8mMQ;ly60)7B|l-B=H7^z=!6db&-Yp6=79rziF4=_P%7dP|<3^7Jc}T66$4DUnqr z&w7PVdJ3nz%ZA*iEaN_9L+?|Td7rXj_bJP|Pg!fv+oUvDqVpe=vw?-H{fM?626h!y-xh9 z&Q!nMkK#Faf%iBbdq0Io*3aO^GArr7c>mSg!fM*C9v`1)cYV=& z2~VP5VO{+mE9(GWS-;NeI*OOpSH17Bx=vwf&a%RO;QfX7HmmHfSZ9~l_i?Fc@uhvM0KxXHt7bs>JLOUzg^j_2G}rq)cr?{pK-y(i;e z`ayh3cbYD|NI!%J={e>RyhT5TkLXY09r{0+PvH&v2|Pi6mgnKWfcNL8@c8_Bo`FA& zhv#1wJsCL}MDX*x3GdFBOqbHMF<;gin>GG5ji1$ci^khD{#A{?r14f_%aidJH1``C zKd12yjdz;gj#Nc6)0d_1T*$U(UV0VHT5?2j?NjqnRw^u+r@ds>x;J+-=4Prfy@UsHRn9=d`VSF zTgmxp`%B&(Gk@CtY5T`49dlvKd!=oqy`{Iu=8fGm_HbEo*Y&cxvUBZA$}WxT8MkuW z#VJ|iZkBH@-#I>KeDV02@sy0eRI#*uNyWy>j>>tJ@3b$eyk51teM$S0s)N;a?MtdV ztM^yGT9Z*zRGbKdF_qbwYBdO-$+Cg>*{jrauZt;*AllUtemiI!Y%S8 zbw@<{y3_TuntJOO)xT1IrlF;&w_$d}apE@`8yb5W4>z7`>Y!F%)BDXiO}8hmY|fdu zu^FxLDQ;ffe5ZL+^L64olQJf)nzXH@yJbnsk(Spd7q?bSu9^J&QF z(L;}(omVoib>5zNuRfOZSk+^jAKU%d&G}jLx6eQDiOf%wf8x|9PAyol;FSfhe6sG7 z7sJo>PhMY`v#@tz-@?^=HZ44|@cQG;k1u?D!y-A0$*z!r1zYVki!XMp&6jx*NO2@ zx=4A7kJrIHysCfKkMZo7VFJ=okuSli`T+BN)cX%qH!J7<*x`0{@h z+xfb8fpgaf*vLB^0W(ZFe)n6DZ9SgcFPN+R;^rpr=j*i7?HteIo1FIq;-CBx;%+;a zc&2@nc$S?<{E&T&c($ES{ILB5agSZ#Mb#ttH`C^NL-9d=0H5H;>`8p=ek1xPU=i^E zuHQ%OpYolK=kPyJKj5dxS@Bu!rQs3$`}SN^kTg7u;|<*YnWm59(fiHlC9V0#_AK>J zXj&;pUy2?fmo2`^@%p<9AHLsGpS^#IXWqYzURDa<6K~+r-;`F-vw}q0)C=&RlOBZ+ z^Mm*<7w_cX#=E%q6aOI|gujBn;J`!h*YODaDn5RHh*#ggrA--L(ZwhFD|kHrj{O0? zhIiv%*m)QJn(t5ekJN|oxA7eOT|5PUA0NTu9r#E11O99L0AGPhmikoxDt^?zj`!gc zco%*P&%ytbl61RAeFy(I`Zwfk^e4m-@oda@CjQv*!j5O-D z79Kb2NE zh50!7{d43#81;MM*z+Q3;hXMS^zbXho-IBSuJDRm=x09~5Ux>9PbHj7I)z4OzYBBZ z9+&d${J^twy5@9g-ptv9OiiSPR)$~W4KVtrNXP?ySe-qbH0`$NAiU+ z?>w33t-zWHogEq?Jv-z>eeFZf1~1yP!F?2q^vseEb(bqmk8?jWsi&a_4fHTiB~T*o zfHXZtgjPyhi3QE~sg}{NGWjSPOOY?isWO!I;am3Fz2n}F7A5d54qwU#Z+n&?SJ!ZT zct2(3q=io0aeVLsxjY|X7Ta~2c6*47KDz~owdoOXmZp{Fx)#w(s}%WBJVydHYZGgChDd5KMf>x}JSXp*%1 zt#3HW@Zz`C@Os+U*j-kvi*@7&pIg@%&vu<54)VvyADcB#^M)RquKmK3Q0lmM?F1u$ zjMZ3Ieb)xAlm=P#UCXGw44TV`10M6dNY_01C}L-wpCxkfEKuolia7@;jKRb_Y|u={i5uglt;<$tm$;^yPu=&7SbYbJrqezdl!sxS0vPwVNTlb`@3!i zR1d&?NXNRL_7X@rDWCr|-m%w_C!Y{m3&Lw$rmYQ; zrCwy}2U9<&-lK?}adifBa_VJrB2S~xp79pQITyg1eAzi;Og%RBm|riHo_h?|p7W(2 zM6XjfLW$6ET{)VL%jBOVFFfH^ok6~j{2Q7_j;THL>qN(iFyBW0&{W^z&1j;oNG}pJ zJK3fdf}w9kl9FZWh#v>HoY$TjZ0@xq4Z*fwCieB%&bvd~Uzd*}w(C^aDQd~HFQMHc zQgE_j%f1AeMS=7gmeZzK(Y}1#+4875rU>Scm~9thQ@dUKe~h+Ad&y zFA%Gqy4ol|OIqm2n-xj5F&Yv`KbWN7w%h#1V0~@dO6{%C+)5nqV1~48C(?T>$IwdACA|3uvu3Erolr*^!dVv90&^wKC=z2_1W(r#-2Zwev#9 z3z|36IUjUvCM_~dcQqAXn&XOyzX+dWjSidA3)&~A-&JS*n&ZZR1_+0#-iSp_zVU@O{*10FSAq@qSX zirCJzoolI8NKUBEf{*E30uprr>>eR2j{G> zfmqweIYQc~R>rs64^=L)0#(eD`J9ZN;eI4M+SX}^Ontd|R`V=caE@)?J&isy*CJD& zYi??8QWRQkJsx*jxR1j}vB!X3(meXe>ZEjSqrTNPz-U;@se>%Erbf+AF$`Q{_IWke~ zy6Sfd??IjN^29Y0-7aoBUhH@gd6rNv^f_JVOg2+CfcAu#$g>O%8P1CVc6;(}Xb@V%U3cX1?jwY2JjJF>PSBFjc221atzzu(Ys9{mCUafecChWB=1se-uwBBF z(C4_fybs2DS0v<~kJNg9X%NfO@~USDwrxJK&!=TSJ4a{Be!c~<5AJ>tEwt<;Cp7gs z`$4$06@fkzVwAQ#38i#msrPA(b>`=DYGfUr)PBo3sDizA7NfU<6WVssWlLQcRJZlm z#+DKdnr|y6ouk2*a#Fu%C-oBt`47l{pjR(?-O>yndZ>?O}yeoCLC>E)Vv59%;DAxt!P2_ zC!zY3$k2M)GZPq9_NM@Y-^2r+ov@*qxu^9)8GM`Z$G**YHeAQ|*tm(ypu*VK9F~vr z7rJx3Xw7c-Q7qEhB_Ge!Y$Gpxen}-wv|l&dt$jFcJjW-j6}8UJ3{pf z(r)teAaA<>Ci6n1;6zb$2|uES%BuZtpIx%tV5A7pk|@#!=zguX=-g zLZk?~E1Jae2ygcPYT3zz{yNvD@iv(2JLeEB!`8SvMp4Gsvyle|ze`a|Pb6@aqSPA? zk$=WBRkt+{m)g~yt$MHOJy+hs?q79LIe2RDVTe zn6#66ShGeOV$yOplx8=4pxCAq8R#Wicu8d#)aEz7MC&ZiG#pi)rurjBgV3KUnajr%i{~OjetabG#FnZM|C|~CC&F_+)Pg;8LjMG^4Zm>=t3H3F0 zmCCy7<7I6~r=1J_Y^}fL+4@_=LH-)~YZJpWSv}Wy^%treoGcR;V}s9X(Aidhg!HQ# zG~e7p`hYL%W+!Vs<0Jv}*-)>hexq@6-em>r*+mGpemQX<(|j*dKVLqI*okjVe2ZG0 z*%WK<`jvHFAyVBBet(t1X(zK~ez{c4hX-ACptZdNg;%5*i)=RON`>aM!b{zYj=$!lsAC2+aV4OL#JU@luuDXb z`g_5E6I&5gy<0d3?+r z;R!d{KL|~-Qqe$7KY8X{({nDLz*0|mo4nJAsa{JSo8)W6OgKdTDEU5Dzp<74KJq=9 zN6HC1(NLRe1^P{Sgc{03%HMF(PhgMW9PN-$dcChL&->&`ZhfR!M=W^uIsI!D-wyuBJ@1EwX&s z=dl26nU91rj^zXt{eiFHU@p%JPO^zoFOn#2sB4hZ41G`JXt0T#26rAdjZvs(`ka1K z>NMQMwsHclzpcCkLylV3VeN%_W+%B9G}c*EdJ6vMeg2{wd5$CZ=GO8Q9BQ?DG+2J6 z@QTX7`2uN7EhnJ*UG=*Z6Z+g^tlui15Me#kudQEO>z{ub`Wl!C^-C!i8Fs3yvp{-X z0Q+rUR%Uj6YkjLKPS+9eb46m!|Hf7a6;^?k3-Y*!rIO9@gm<;Yavgl?MAab|dH;Ax3E(vvceUVyU-F zV;wu0-&Rh8GQYR^lDPTZ!g;li=lh$4>ICZtIm5s?Ve3{gkC-PDE+`VIezo>S9ix-D z0(M3*GvNq%u?oI?oT?&;wenHKPUxE;8eU3HWcjLan85r`^tu4H*U4SG07|V1 zH~-~%maj+NYA$DqqoE$lxd$6wmn5h~u(id+B7?0dN^C_gt_W*0i37PVamKk-d#U!4 ztCcvNI8Ci{h4zWhFXq{S()8XpO@ z9_K2N-n|me5~uZWb=9yB_(3>DDxR#`Uz-EAL4#nn>V=v+Kg@O(GTHfB5p1f)PLtYAmbE)THyA=mOXuf>Bz%LatzlrQV^W?A1Ny`N3y%HS3IEt45nOF#bg{1OKUA&* zPIHy?T0;3wrAhrtuFcE0l)JfasGQjMOL)`KN7KfWD^#I&+|k$h>*nwuC+TyZc`TeUDJKDTVDa*132sgZE!p>; z)Q@nrm7SHHpo@Gye*$JIS^xS(rkigM8FU@-8!1a@Q0z}N*4}Y$o1cGOCv zm0bjlD<8o`;tI~0XU4Mb$bCO4ft(KIY-nEri||{z&qUlcM{ut9&#L3DBL7vSxmqqg zQ<~%6_9ElnF7GbyR>Y1^jAsUvi|rFGf3DIL(vF!|&S}HPC>^&8O1sK46=Usaiwx$8 z?#lKch^%%uLONTGxjZK2`h z9Nq1o^WFW|l;3;A7ea3#^cIfsEnvxQkZzFfF>9dYWNw0b)0ib=mMCJ!T^@HCxq8V7 zx3{Qe#+{>G7HDgTQCe`@vjw-uFz=}Mqoh=vVr+DeFVz4mQgDV=gpwP|OK5OSUvj17 zissF@rIfuzS}6XdlaIgrHYF#0L~!l7j9K)n?nECcPPw*_U%dGDt@xXGLx>bC9C>-< zWm;-~3%WqM3c5zhIgYU?yIywPGb3MB${zkD>95S>f?`lkSm1(*tjv{yjFF5cxeFR6 zM`4%WUzx!vGQ=23LL~O~*cZpXNIRtz!%D?Y#!imitcWdJS+>$MV^@0l0=(ZAAl@^FO^KlVVM zmYcDcs4G@QWch1fVn#pCNGKw4auj~sje>nPWfW4l=W{xiP#W&a`KLTvx~2F!RFr!@ zPf|1(OZoLf-Ua@0M)py6 zub`cK1&jH69l5V)ilNCov;|$G-=jvviD2GW0*l$9BnKbZY5VqOz$?4WowaTJQqFk4@e zk0N%=@iE7txmBnW{+IM<4E8^^#s#oze#_^ev^d6yYCVZ{-sGHTwtmN-tvn=9O@IPvy!1K?4%N{@%%j z&nBCHhFGxoHP#W#KgjtYkkaJuwm(!I4X|OOKk$qnd^tw*bDdEBnd4<@zz86BLSDw?^82e`wx-MwtwX({qe@XI zz3jNU}uEu@7$Poy>V8W`3?5sAazMR$hw{n3zn%6Zj;8sWZI z4WlzhV>8362CN3$Zh>_Bfj@@z}Bo?+~L%gG?S-sgd>75X4@HNyC(>VR`He>W^6Jm_pXO=}l|*>n_+M@PBw zFhyCE%UB5gsN*>51uz0gTFA?cTF=QT;A}>%wC7ag?p&E-p9@cUhF}ZIiG`<)UmArj z3lD?k5&Lo!?#71q7w+a;YmM46Y74ctlM~KEXlX{R#;#+V3t4eK##iA|_Kh>df?=z) zMR-z=x+~+Sd~MuiJ!3H_#yp#Sjo6nYhNiR6$1L9}N#X6n+w2K9d`U7zlESN=$vzBv zS-A=Z^L(zcvUd}UB+0)gu^D-K@8iVa8p=nv1UvF&V&z!yT45R3GhjQ2eYx_vz8$$C z|4F``TuY_T`Tq5-$yT{~Ifu>%mD!4jzFf@IksWew0n3q?fQB--%H*ERTPl~FJlwDE zhTB<%?oRU8iG%Vj#bSVCLjG#6v_p>h)piE}tTX0#ED z#>S^ez{!SLA$OZCzqVA%LYloG=M~!&&XrQ`@cDlWnL`~38A}7Ha^&m2rOBplP3ETn42?|Nmk^DsszIKMNhYUGK z9OPdk|62BSUyfDOJxE$KQ0?Rxg7uUDf>qNpdOl>6ar@0(Ba+R?5$uo^*>0z$SvIzL z$b#(c*|OVW&+^jqu*2EweLe}1bOaV=NFC@hkY7OFSzwd(K6&PT)>@SfHtEft&03bVO!H<$A7%5EFOPJc zROxwOohlO&hcc<{u)D+gka99idxygfS7urK3;3kH;YEhsk&hxa_eL)J(6IM>Uf4EP z^<|LrE+Crx9SmP-tgKC*SZoD3uN?_3I@y z0Rc;`Eq7PW`@&P&bA!RSVM358fz12a@Ml;Hh{h> zJdI$|5}TgAeCV4#c9%5Km$AxDn$)|VsnRT^ob$82Hgt#b7MgR>@%f<}hi-JzWZ%xd z4d0c%H0>fy_EoMt4udXG&Vorxb|kxdXs3_KRnH6fK799W|TsE zxn1tpOG@bGzuYP1mz}=F68o95b8u2K5^O~vhuIG`dDD(>vCWI*(=*yMZ?c%PCK$=- zj=y0n4H`tE=@Jvrk69x-hut&SIx|OTafCWYhFlH#aJDrs4|#it-~X(6S@eI%DW&I` z8PfkO`fup_5Lwd>)k^@?a&T8gQ#ZiMmE$aleU4~6`i{;B`P&7zM-1SF?+l~Co#3P$Pd&I! zZuWU$|G9@QxMw)=YHBMvET$rIjr^>n3BC09+;BLUsms0uSKWLlgP39Wb+j^gG zZ<6oO<-&z~G{U!hAV>9-AsmY+k#pi*r-3xA9>JRSv~c~Was6v*(l(~~>woC&p|`0O ztbeQna$IEwL_yv97Yq@i=g`xQv`&>LweN1_%ipSs{eCz6b^Cykj&6qnfxlJqS5kBX z^!D=6Sv8dY^BX(Sr)TE*92b(qS|~C=*Xmxj%d&j=v0l!e!3mr$xNzB)^XdM}Xo=3%pi_Eh4{d66v3VJQNjub`;HE+ZYMP%ob-YrV% z+TQXJnb&bi6Oy|A8ad%OsIINp{dUo{Jr;1aHKJ>~&+b#i4k;Z{O08f)b(PYqs(bHuNMnfg5PuX z%_FnybNACVXMcYUiLT8db4c?hJwb2wC_T?CN$OhOa0inm#KwMZAV>D3?|=x$L3Pbj zUqi6?GMXK7J&CTxzme<$oWjzMrLkw4z)mj(GiiH4G6}iD&j=>{+=^~)aj(~5#H6I} zPS=0!>-wp|bsem0c8rw%vtu04yh)?~__-6Bo>`XcKU^Imb1ix9byxf1^+@{v)crL6 zal3_{S%ckTc?!ou<+z;K@Hghdw^$HDILGY|$O&Jk_W>(7x)}>apvQhsqnsZYZGT^k zc2O4Sdxhhx`;prhS5Ru~)5HTgo&d4@&EnJd?oZe#BO%E#(x1vPBJ&{N$hC=3j$8(F z9A)(w`$gh`9RCDFIDYY7j*&f3kWdu#F~T)mBr}q!c@ts2+B-_m<0S7mJ_+V5C8@i3 z$uEn9*B1ui)c_wtO7A!&CiTg0JCeOy<#^eCFxR_Pqzung25_|EM@u+<2HO$rzA0x( zi?%hmF+(r*5Vgy#Xib+V$Vq)zpak{ax+X*vJYJ**rt(UH$!@a$jk;-P>Q= z2`xghzqVmOe=TLfXs+>j$>_WOt|4XY6T~nMW~}-Zlm0&8_jkaIHE$v*A<5C4Oy$TG zTax2i#}QiJ<$MHhQwcxT7=LtTJfnSrz>XnUE?h$a5>GoFfWv<4ceW2L`v7^2BqoA z6$AF!Kh>!=oV8NiIyq!L2NH0Kw|o7OSV_6ebs76oe#PL=Q~m-1kH^x+Y=ob*>m>q{fH(Vs>C1p@ynZxq#hiZ5i5)u01{&~VgLdb7?)euXx2emO?z2J=VW zG4q}s>Rq>ub`p26X+sdbEy6#|ZIk{V?19ii`=@+Rpgb>AKh73E&Ud^a(T}42ULO7h zv%G?|rnDxn6rX}qy|Jn<*=ve@%^XC+a*@>h7wNB#K(K3ZUF?a>#T@2K(n`JTw6e5v zFE_0+tI<>}htzo<deNiu1w_JWD!n9x`%z*P0n^ymtXb(~XkCb9-p6O?6o zva8{x**=b~c*?d}PWODb!YOJweG5j~+R0XYmV4U9^-fl5o>KG7Z%Q44{5ILmPv#>j zDFJs9Xq}}d)qKt+#o_vu^INJ=T1${<9epXLl%q|djF*9YSIq3ag^mY@F* ipV1lowsbKaUSrwa{$1-fkjbE_OeCb=NU3`8y#EK5nIdZd literal 0 HcmV?d00001 diff --git a/selfdrive/assets/img_couch.svg b/selfdrive/assets/img_couch.svg new file mode 100644 index 0000000000..5b3c048318 --- /dev/null +++ b/selfdrive/assets/img_couch.svg @@ -0,0 +1,3 @@ + + + diff --git a/selfdrive/assets/img_experimental.svg b/selfdrive/assets/img_experimental.svg new file mode 100644 index 0000000000..0eaec3b3cd --- /dev/null +++ b/selfdrive/assets/img_experimental.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/selfdrive/assets/img_experimental_grey.svg b/selfdrive/assets/img_experimental_grey.svg new file mode 100644 index 0000000000..dc87105ac5 --- /dev/null +++ b/selfdrive/assets/img_experimental_grey.svg @@ -0,0 +1,4 @@ + + + + diff --git a/selfdrive/assets/img_experimental_white.svg b/selfdrive/assets/img_experimental_white.svg new file mode 100644 index 0000000000..ae4f18fde2 --- /dev/null +++ b/selfdrive/assets/img_experimental_white.svg @@ -0,0 +1,4 @@ + + + + diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript index 84e055752a..669c214746 100644 --- a/selfdrive/ui/SConscript +++ b/selfdrive/ui/SConscript @@ -58,7 +58,7 @@ qt_env.Program("qt/spinner", ["qt/spinner.cc"], LIBS=qt_libs) qt_src = ["main.cc", "qt/sidebar.cc", "qt/onroad.cc", "qt/body.cc", "qt/window.cc", "qt/home.cc", "qt/offroad/settings.cc", "qt/offroad/software_settings.cc", "qt/offroad/onboarding.cc", - "qt/offroad/driverview.cc"] + "qt/offroad/driverview.cc", "qt/offroad/experimental_mode.cc"] qt_env.Program("_ui", qt_src + [asset_obj], LIBS=qt_libs) if GetOption('test'): qt_src.remove("main.cc") # replaced by test_runner diff --git a/selfdrive/ui/qt/home.cc b/selfdrive/ui/qt/home.cc index 3fe00e6ed9..3f3c9a5885 100644 --- a/selfdrive/ui/qt/home.cc +++ b/selfdrive/ui/qt/home.cc @@ -4,6 +4,7 @@ #include #include +#include "selfdrive/ui/qt/offroad/experimental_mode.h" #include "selfdrive/ui/qt/util.h" #include "selfdrive/ui/qt/widgets/drive_stats.h" #include "selfdrive/ui/qt/widgets/prime.h" @@ -22,7 +23,8 @@ HomeWindow::HomeWindow(QWidget* parent) : QWidget(parent) { slayout = new QStackedLayout(); main_layout->addLayout(slayout); - home = new OffroadHome(); + home = new OffroadHome(this); + QObject::connect(home, &OffroadHome::openSettings, this, &HomeWindow::openSettings); slayout->addWidget(home); onroad = new OnroadWindow(this); @@ -128,11 +130,24 @@ OffroadHome::OffroadHome(QWidget* parent) : QFrame(parent) { main_layout->addSpacing(25); center_layout = new QStackedLayout(); + // Vertical experimental button and drive stats layout + QWidget* statsAndExperimentalModeButtonWidget = new QWidget(this); + QVBoxLayout* statsAndExperimentalModeButton = new QVBoxLayout(statsAndExperimentalModeButtonWidget); + statsAndExperimentalModeButton->setSpacing(30); + statsAndExperimentalModeButton->setMargin(0); + + ExperimentalModeButton *experimental_mode = new ExperimentalModeButton(this); + QObject::connect(experimental_mode, &ExperimentalModeButton::openSettings, this, &OffroadHome::openSettings); + + statsAndExperimentalModeButton->addWidget(experimental_mode, 1); + statsAndExperimentalModeButton->addWidget(new DriveStats, 1); + + // Horizontal experimental + drive stats and setup widget QWidget* statsAndSetupWidget = new QWidget(this); QHBoxLayout* statsAndSetup = new QHBoxLayout(statsAndSetupWidget); statsAndSetup->setMargin(0); statsAndSetup->setSpacing(30); - statsAndSetup->addWidget(new DriveStats, 1); + statsAndSetup->addWidget(statsAndExperimentalModeButtonWidget, 1); statsAndSetup->addWidget(new SetupWidget); center_layout->addWidget(statsAndSetupWidget); diff --git a/selfdrive/ui/qt/home.h b/selfdrive/ui/qt/home.h index 6636da56ec..ed1c215467 100644 --- a/selfdrive/ui/qt/home.h +++ b/selfdrive/ui/qt/home.h @@ -22,6 +22,9 @@ class OffroadHome : public QFrame { public: explicit OffroadHome(QWidget* parent = 0); +signals: + void openSettings(int index = 0, const QString ¶m = ""); + private: void showEvent(QShowEvent *event) override; void hideEvent(QHideEvent *event) override; @@ -45,7 +48,7 @@ public: explicit HomeWindow(QWidget* parent = 0); signals: - void openSettings(); + void openSettings(int index = 0, const QString ¶m = ""); void closeSettings(); public slots: diff --git a/selfdrive/ui/qt/offroad/experimental_mode.cc b/selfdrive/ui/qt/offroad/experimental_mode.cc new file mode 100644 index 0000000000..f73149cdf2 --- /dev/null +++ b/selfdrive/ui/qt/offroad/experimental_mode.cc @@ -0,0 +1,75 @@ +#include "selfdrive/ui/qt/offroad/experimental_mode.h" + +#include +#include +#include +#include + +#include "selfdrive/ui/ui.h" + +ExperimentalModeButton::ExperimentalModeButton(QWidget *parent) : QPushButton(parent) { + chill_pixmap = QPixmap("../assets/img_couch.svg").scaledToWidth(img_width, Qt::SmoothTransformation); + experimental_pixmap = QPixmap("../assets/img_experimental_grey.svg").scaledToWidth(img_width, Qt::SmoothTransformation); + + // go to toggles and expand experimental mode description + connect(this, &QPushButton::clicked, [=]() { emit openSettings(2, "ExperimentalMode"); }); + + setFixedHeight(125); + QHBoxLayout *main_layout = new QHBoxLayout; + main_layout->setContentsMargins(horizontal_padding, 0, horizontal_padding, 0); + + mode_label = new QLabel; + mode_icon = new QLabel; + mode_icon->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); + + main_layout->addWidget(mode_label, 1, Qt::AlignLeft); + main_layout->addWidget(mode_icon, 0, Qt::AlignRight); + + setLayout(main_layout); + + setStyleSheet(R"( + QPushButton { + border: none; + } + + QLabel { + font-size: 45px; + font-weight: 300; + text-align: left; + font-family: JetBrainsMono; + color: #000000; + } + )"); +} + +void ExperimentalModeButton::paintEvent(QPaintEvent *event) { + QPainter p(this); + p.setPen(Qt::NoPen); + p.setRenderHint(QPainter::Antialiasing); + + QPainterPath path; + path.addRoundedRect(rect(), 10, 10); + + // gradient + bool pressed = isDown(); + QLinearGradient gradient(rect().left(), 0, rect().right(), 0); + if (experimental_mode) { + gradient.setColorAt(0, QColor(255, 155, 63, pressed ? 0xcc : 0xff)); + gradient.setColorAt(1, QColor(219, 56, 34, pressed ? 0xcc : 0xff)); + } else { + gradient.setColorAt(0, QColor(20, 255, 171, pressed ? 0xcc : 0xff)); + gradient.setColorAt(1, QColor(35, 149, 255, pressed ? 0xcc : 0xff)); + } + p.fillPath(path, gradient); + + // vertical line + p.setPen(QPen(QColor(0, 0, 0, 0x4d), 3, Qt::SolidLine)); + int line_x = rect().right() - img_width - (2 * horizontal_padding); + p.drawLine(line_x, rect().bottom(), line_x, rect().top()); +} + +void ExperimentalModeButton::showEvent(QShowEvent *event) { + experimental_mode = params.getBool("ExperimentalMode"); + mode_icon->setPixmap(experimental_mode ? experimental_pixmap : chill_pixmap); + mode_label->setText(experimental_mode ? tr("EXPERIMENTAL MODE ON") : tr("CHILL MODE ON")); +} diff --git a/selfdrive/ui/qt/offroad/experimental_mode.h b/selfdrive/ui/qt/offroad/experimental_mode.h new file mode 100644 index 0000000000..bfb7638bbe --- /dev/null +++ b/selfdrive/ui/qt/offroad/experimental_mode.h @@ -0,0 +1,31 @@ +#pragma once + +#include +#include + +#include "common/params.h" + +class ExperimentalModeButton : public QPushButton { + Q_OBJECT + +public: + explicit ExperimentalModeButton(QWidget* parent = 0); + +signals: + void openSettings(int index = 0, const QString &toggle = ""); + +private: + void showEvent(QShowEvent *event) override; + + Params params; + bool experimental_mode; + int img_width = 100; + int horizontal_padding = 30; + QPixmap experimental_pixmap; + QPixmap chill_pixmap; + QLabel *mode_label; + QLabel *mode_icon; + +protected: + void paintEvent(QPaintEvent *event) override; +}; diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index 85b09dc183..01cb0ea720 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -39,7 +39,7 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) { "ExperimentalMode", tr("Experimental Mode"), "", - "../assets/offroad/icon_road.png", + "../assets/img_experimental_white.svg", }, { "ExperimentalLongitudinalEnabled", @@ -100,6 +100,7 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) { } // Toggles with confirmation dialogs + toggles["ExperimentalMode"]->setActiveIcon("../assets/img_experimental.svg"); toggles["ExperimentalMode"]->setConfirmation(true, true); toggles["ExperimentalLongitudinalEnabled"]->setConfirmation(true, false); @@ -108,6 +109,10 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) { }); } +void TogglesPanel::expandToggleDescription(const QString ¶m) { + toggles[param.toStdString()]->showDescription(); +} + void TogglesPanel::showEvent(QShowEvent *event) { updateToggles(); } @@ -299,8 +304,15 @@ void DevicePanel::poweroff() { } void SettingsWindow::showEvent(QShowEvent *event) { - panel_widget->setCurrentIndex(0); - nav_btns->buttons()[0]->setChecked(true); + setCurrentPanel(0); +} + +void SettingsWindow::setCurrentPanel(int index, const QString ¶m) { + panel_widget->setCurrentIndex(index); + nav_btns->buttons()[index]->setChecked(true); + if (!param.isEmpty()) { + emit expandToggleDescription(param); + } } SettingsWindow::SettingsWindow(QWidget *parent) : QFrame(parent) { @@ -341,10 +353,13 @@ SettingsWindow::SettingsWindow(QWidget *parent) : QFrame(parent) { QObject::connect(device, &DevicePanel::reviewTrainingGuide, this, &SettingsWindow::reviewTrainingGuide); QObject::connect(device, &DevicePanel::showDriverView, this, &SettingsWindow::showDriverView); + TogglesPanel *toggles = new TogglesPanel(this); + QObject::connect(this, &SettingsWindow::expandToggleDescription, toggles, &TogglesPanel::expandToggleDescription); + QList> panels = { {tr("Device"), device}, {tr("Network"), new Networking(this)}, - {tr("Toggles"), new TogglesPanel(this)}, + {tr("Toggles"), toggles}, {tr("Software"), new SoftwarePanel(this)}, }; diff --git a/selfdrive/ui/qt/offroad/settings.h b/selfdrive/ui/qt/offroad/settings.h index 4177f28cf4..c63be4e138 100644 --- a/selfdrive/ui/qt/offroad/settings.h +++ b/selfdrive/ui/qt/offroad/settings.h @@ -17,6 +17,7 @@ class SettingsWindow : public QFrame { public: explicit SettingsWindow(QWidget *parent = 0); + void setCurrentPanel(int index, const QString ¶m = ""); protected: void showEvent(QShowEvent *event) override; @@ -25,6 +26,7 @@ signals: void closeSettings(); void reviewTrainingGuide(); void showDriverView(); + void expandToggleDescription(const QString ¶m); private: QPushButton *sidebar_alert_widget; @@ -56,6 +58,9 @@ public: explicit TogglesPanel(SettingsWindow *parent); void showEvent(QShowEvent *event) override; +public slots: + void expandToggleDescription(const QString ¶m); + private: Params params; std::map toggles; diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc index fcf29181e7..50f891dd56 100644 --- a/selfdrive/ui/qt/onroad.cc +++ b/selfdrive/ui/qt/onroad.cc @@ -174,6 +174,7 @@ AnnotatedCameraWidget::AnnotatedCameraWidget(VisionStreamType type, QWidget* par pm = std::make_unique>({"uiDebug"}); engage_img = loadPixmap("../assets/img_chffr_wheel.png", {img_size, img_size}); + experimental_img = loadPixmap("../assets/img_experimental.svg", {img_size - 5, img_size - 5}); dm_img = loadPixmap("../assets/img_driver_face.png", {img_size, img_size}); } @@ -378,8 +379,9 @@ void AnnotatedCameraWidget::drawHud(QPainter &p) { // engage-ability icon if (engageable) { + SubMaster &sm = *(uiState()->sm); drawIcon(p, rect().right() - radius / 2 - bdr_s * 2, radius / 2 + int(bdr_s * 1.5), - engage_img, bg_colors[status], 1.0); + sm["controlsState"].getControlsState().getExperimentalMode() ? experimental_img : engage_img, blackColor(166), 1.0); } // dm icon @@ -409,7 +411,7 @@ void AnnotatedCameraWidget::drawIcon(QPainter &p, int x, int y, QPixmap &img, QB p.setBrush(bg); p.drawEllipse(x - radius / 2, y - radius / 2, radius, radius); p.setOpacity(opacity); - p.drawPixmap(x - img_size / 2, y - img_size / 2, img); + p.drawPixmap(x - img.size().width() / 2, y - img.size().height() / 2, img); } diff --git a/selfdrive/ui/qt/onroad.h b/selfdrive/ui/qt/onroad.h index 7edca6b3d5..9e18355970 100644 --- a/selfdrive/ui/qt/onroad.h +++ b/selfdrive/ui/qt/onroad.h @@ -51,6 +51,7 @@ private: void drawText(QPainter &p, int x, int y, const QString &text, int alpha = 255); QPixmap engage_img; + QPixmap experimental_img; QPixmap dm_img; const int radius = 192; const int img_size = (radius / 2) * 1.5; diff --git a/selfdrive/ui/qt/sidebar.h b/selfdrive/ui/qt/sidebar.h index 53ad7467ac..fb96e1d540 100644 --- a/selfdrive/ui/qt/sidebar.h +++ b/selfdrive/ui/qt/sidebar.h @@ -20,7 +20,7 @@ public: explicit Sidebar(QWidget* parent = 0); signals: - void openSettings(); + void openSettings(int index = 0, const QString ¶m = ""); void valueChanged(); public slots: diff --git a/selfdrive/ui/qt/window.cc b/selfdrive/ui/qt/window.cc index 04ce15ef23..198b1edbf6 100644 --- a/selfdrive/ui/qt/window.cc +++ b/selfdrive/ui/qt/window.cc @@ -53,6 +53,7 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent) { QFontDatabase::addApplicationFont("../assets/fonts/Inter-Regular.ttf"); QFontDatabase::addApplicationFont("../assets/fonts/Inter-SemiBold.ttf"); QFontDatabase::addApplicationFont("../assets/fonts/Inter-Thin.ttf"); + QFontDatabase::addApplicationFont("../assets/fonts/JetBrainsMono-Medium.ttf"); // no outline to prevent the focus rectangle setStyleSheet(R"( @@ -64,8 +65,9 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent) { setAttribute(Qt::WA_NoSystemBackground); } -void MainWindow::openSettings() { +void MainWindow::openSettings(int index, const QString ¶m) { main_layout->setCurrentWidget(settingsWindow); + settingsWindow->setCurrentPanel(index, param); } void MainWindow::closeSettings() { diff --git a/selfdrive/ui/qt/window.h b/selfdrive/ui/qt/window.h index 0bd328aa8a..71fc466c20 100644 --- a/selfdrive/ui/qt/window.h +++ b/selfdrive/ui/qt/window.h @@ -15,7 +15,7 @@ public: private: bool eventFilter(QObject *obj, QEvent *event) override; - void openSettings(); + void openSettings(int index = 0, const QString ¶m = ""); void closeSettings(); Device device; diff --git a/selfdrive/ui/translations/main_ja.ts b/selfdrive/ui/translations/main_ja.ts index 21fdc48fef..963eeadd81 100644 --- a/selfdrive/ui/translations/main_ja.ts +++ b/selfdrive/ui/translations/main_ja.ts @@ -281,6 +281,17 @@ ｶﾒﾗを起動しています + + ExperimentalModeButton + + EXPERIMENTAL MODE ON + + + + CHILL MODE ON + + + InputDialog diff --git a/selfdrive/ui/translations/main_ko.ts b/selfdrive/ui/translations/main_ko.ts index 57c688ffe6..9defc2c36f 100644 --- a/selfdrive/ui/translations/main_ko.ts +++ b/selfdrive/ui/translations/main_ko.ts @@ -281,6 +281,17 @@ 카메라 시작중 + + ExperimentalModeButton + + EXPERIMENTAL MODE ON + + + + CHILL MODE ON + + + InputDialog diff --git a/selfdrive/ui/translations/main_pt-BR.ts b/selfdrive/ui/translations/main_pt-BR.ts index 2d7195e0d2..a1c966da45 100644 --- a/selfdrive/ui/translations/main_pt-BR.ts +++ b/selfdrive/ui/translations/main_pt-BR.ts @@ -281,6 +281,17 @@ câmera iniciando + + ExperimentalModeButton + + EXPERIMENTAL MODE ON + + + + CHILL MODE ON + + + InputDialog diff --git a/selfdrive/ui/translations/main_zh-CHS.ts b/selfdrive/ui/translations/main_zh-CHS.ts index fb9b6dd6f5..e77b3ef63d 100644 --- a/selfdrive/ui/translations/main_zh-CHS.ts +++ b/selfdrive/ui/translations/main_zh-CHS.ts @@ -281,6 +281,17 @@ 正在启动相机 + + ExperimentalModeButton + + EXPERIMENTAL MODE ON + + + + CHILL MODE ON + + + InputDialog diff --git a/selfdrive/ui/translations/main_zh-CHT.ts b/selfdrive/ui/translations/main_zh-CHT.ts index 86d5482355..f667fdc978 100644 --- a/selfdrive/ui/translations/main_zh-CHT.ts +++ b/selfdrive/ui/translations/main_zh-CHT.ts @@ -281,6 +281,17 @@ 開啟相機中 + + ExperimentalModeButton + + EXPERIMENTAL MODE ON + + + + CHILL MODE ON + + + InputDialog From 1899d439f4aaf8f218ad7d40d8d70bec0d6f151a Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 15 Nov 2022 23:11:53 -0800 Subject: [PATCH 149/184] Multilang: refactor experimental description (#26518) * refactor e2e description * forgot to update --- selfdrive/ui/qt/offroad/settings.cc | 23 +++++++++++------------ selfdrive/ui/translations/main_ja.ts | 22 +++++++++++++++++++--- selfdrive/ui/translations/main_ko.ts | 22 +++++++++++++++++++--- selfdrive/ui/translations/main_pt-BR.ts | 22 +++++++++++++++++++--- selfdrive/ui/translations/main_zh-CHS.ts | 22 +++++++++++++++++++--- selfdrive/ui/translations/main_zh-CHT.ts | 22 +++++++++++++++++++--- 6 files changed, 106 insertions(+), 27 deletions(-) diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index 01cb0ea720..330f636e2b 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -120,18 +120,17 @@ void TogglesPanel::showEvent(QShowEvent *event) { void TogglesPanel::updateToggles() { auto e2e_toggle = toggles["ExperimentalMode"]; auto op_long_toggle = toggles["ExperimentalLongitudinalEnabled"]; - const QString e2e_description = tr("\ - openpilot defaults to driving in chill mode.\ - Experimental mode enables alpha-level features that aren't ready for chill mode. \ - Experimental features are listed below: \ -
\ -

🌮 End-to-End Longitudinal Control 🌮

\ - Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. \ - Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. \ -
\ -

New Driving Visualization

\ - The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner.\ - "); + const QString e2e_description = QString("%1
" + "

%2


" + "%3
" + "

%4


" + "%5") + .arg(tr("openpilot defaults to driving in chill mode. Experimental mode enables alpha-level features that aren't ready for chill mode. Experimental features are listed below:")) + .arg(tr("🌮 End-to-End Longitudinal Control 🌮")) + .arg(tr("Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. " + "Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected.")) + .arg(tr("New Driving Visualization")) + .arg(tr("The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner.");) auto cp_bytes = params.get("CarParamsPersistent"); if (!cp_bytes.empty()) { diff --git a/selfdrive/ui/translations/main_ja.ts b/selfdrive/ui/translations/main_ja.ts index 963eeadd81..2e01ce0dd1 100644 --- a/selfdrive/ui/translations/main_ja.ts +++ b/selfdrive/ui/translations/main_ja.ts @@ -1018,15 +1018,31 @@ location set - openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. <br> <h4>New Driving Visualization</h4> The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. + Experimental mode is currently unavailable on this car, since the car's stock ACC is used for longitudinal control. - Experimental mode is currently unavailable on this car, since the car's stock ACC is used for longitudinal control. + Enable experimental longitudinal control to allow experimental mode. - Enable experimental longitudinal control to allow experimental mode. + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: + + + + 🌮 End-to-End Longitudinal Control 🌮 + + + + Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. + + + + New Driving Visualization + + + + The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. diff --git a/selfdrive/ui/translations/main_ko.ts b/selfdrive/ui/translations/main_ko.ts index 9defc2c36f..8ce618edff 100644 --- a/selfdrive/ui/translations/main_ko.ts +++ b/selfdrive/ui/translations/main_ko.ts @@ -1018,15 +1018,31 @@ location set - openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. <br> <h4>New Driving Visualization</h4> The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. + Experimental mode is currently unavailable on this car, since the car's stock ACC is used for longitudinal control. - Experimental mode is currently unavailable on this car, since the car's stock ACC is used for longitudinal control. + Enable experimental longitudinal control to allow experimental mode. - Enable experimental longitudinal control to allow experimental mode. + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: + + + + 🌮 End-to-End Longitudinal Control 🌮 + + + + Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. + + + + New Driving Visualization + + + + The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. diff --git a/selfdrive/ui/translations/main_pt-BR.ts b/selfdrive/ui/translations/main_pt-BR.ts index a1c966da45..2dc1538017 100644 --- a/selfdrive/ui/translations/main_pt-BR.ts +++ b/selfdrive/ui/translations/main_pt-BR.ts @@ -1022,15 +1022,31 @@ trabalho definido - openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. <br> <h4>New Driving Visualization</h4> The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. + Experimental mode is currently unavailable on this car, since the car's stock ACC is used for longitudinal control. - Experimental mode is currently unavailable on this car, since the car's stock ACC is used for longitudinal control. + Enable experimental longitudinal control to allow experimental mode. - Enable experimental longitudinal control to allow experimental mode. + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: + + + + 🌮 End-to-End Longitudinal Control 🌮 + + + + Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. + + + + New Driving Visualization + + + + The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. diff --git a/selfdrive/ui/translations/main_zh-CHS.ts b/selfdrive/ui/translations/main_zh-CHS.ts index e77b3ef63d..fe569e1fb0 100644 --- a/selfdrive/ui/translations/main_zh-CHS.ts +++ b/selfdrive/ui/translations/main_zh-CHS.ts @@ -1016,15 +1016,31 @@ location set - openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. <br> <h4>New Driving Visualization</h4> The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. + Experimental mode is currently unavailable on this car, since the car's stock ACC is used for longitudinal control. - Experimental mode is currently unavailable on this car, since the car's stock ACC is used for longitudinal control. + Enable experimental longitudinal control to allow experimental mode. - Enable experimental longitudinal control to allow experimental mode. + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: + + + + 🌮 End-to-End Longitudinal Control 🌮 + + + + Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. + + + + New Driving Visualization + + + + The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. diff --git a/selfdrive/ui/translations/main_zh-CHT.ts b/selfdrive/ui/translations/main_zh-CHT.ts index f667fdc978..3ec67f3961 100644 --- a/selfdrive/ui/translations/main_zh-CHT.ts +++ b/selfdrive/ui/translations/main_zh-CHT.ts @@ -1018,15 +1018,31 @@ location set - openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: <br> <h4>🌮 End-to-End Longitudinal Control 🌮</h4> Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. <br> <h4>New Driving Visualization</h4> The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. + Experimental mode is currently unavailable on this car, since the car's stock ACC is used for longitudinal control. - Experimental mode is currently unavailable on this car, since the car's stock ACC is used for longitudinal control. + Enable experimental longitudinal control to allow experimental mode. - Enable experimental longitudinal control to allow experimental mode. + openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: + + + + 🌮 End-to-End Longitudinal Control 🌮 + + + + Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. + + + + New Driving Visualization + + + + The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. From d8bc69c788c581485ac9e65e8f6d06e4c368935c Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 15 Nov 2022 23:52:47 -0800 Subject: [PATCH 150/184] Multilang: add missing translations (#26519) * add back missing japanese translations that haven't been changed * other languages * fix --- selfdrive/ui/qt/offroad/settings.cc | 2 +- selfdrive/ui/translations/main_ja.ts | 4 ++-- selfdrive/ui/translations/main_ko.ts | 4 ++-- selfdrive/ui/translations/main_pt-BR.ts | 4 ++-- selfdrive/ui/translations/main_zh-CHS.ts | 4 ++-- selfdrive/ui/translations/main_zh-CHT.ts | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index 330f636e2b..bde8628dc4 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -130,7 +130,7 @@ void TogglesPanel::updateToggles() { .arg(tr("Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. " "Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected.")) .arg(tr("New Driving Visualization")) - .arg(tr("The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner.");) + .arg(tr("The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner.")); auto cp_bytes = params.get("CarParamsPersistent"); if (!cp_bytes.empty()) { diff --git a/selfdrive/ui/translations/main_ja.ts b/selfdrive/ui/translations/main_ja.ts index 2e01ce0dd1..ebf40cc5c5 100644 --- a/selfdrive/ui/translations/main_ja.ts +++ b/selfdrive/ui/translations/main_ja.ts @@ -1027,11 +1027,11 @@ location set openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: - + openpilotは標準ではゆっくりとくつろげる運転を提供します。この実験モードを有効にすると、以下のくつろげる段階ではない開発中の機能を利用する事ができます。 🌮 End-to-End Longitudinal Control 🌮 - + 🌮 エンドツーエンドアクセル制御 🌮 Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. diff --git a/selfdrive/ui/translations/main_ko.ts b/selfdrive/ui/translations/main_ko.ts index 8ce618edff..98d46149dd 100644 --- a/selfdrive/ui/translations/main_ko.ts +++ b/selfdrive/ui/translations/main_ko.ts @@ -1027,11 +1027,11 @@ location set openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: - + openpilot은 기본적으로 <b>안정적 모드</b>로 주행합니다. 실험적 모드는 안정적 모드에 준비되지 않은 <b>알파 수준 기능</b>을 활성화 합니다. 실험 모드의 특징은 아래에 나열되어 있습니다 🌮 End-to-End Longitudinal Control 🌮 - + 🌮 E2E 롱컨트롤 🌮 Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. diff --git a/selfdrive/ui/translations/main_pt-BR.ts b/selfdrive/ui/translations/main_pt-BR.ts index 2dc1538017..4a698947f1 100644 --- a/selfdrive/ui/translations/main_pt-BR.ts +++ b/selfdrive/ui/translations/main_pt-BR.ts @@ -1031,11 +1031,11 @@ trabalho definido openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: - + openpilot por padrão funciona em <b>modo chill</b>. modo Experimental ativa <b>recursos de nível-alfa</b> que não estão prontos para o modo chill. Recursos experimentais estão listados abaixo: 🌮 End-to-End Longitudinal Control 🌮 - + 🌮 Controle Longitudinal de Ponta a Ponta 🌮 Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. diff --git a/selfdrive/ui/translations/main_zh-CHS.ts b/selfdrive/ui/translations/main_zh-CHS.ts index fe569e1fb0..dc94fbc953 100644 --- a/selfdrive/ui/translations/main_zh-CHS.ts +++ b/selfdrive/ui/translations/main_zh-CHS.ts @@ -1025,11 +1025,11 @@ location set openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: - + openpilot 默认 <b>轻松模式</b>驾驶车辆。试验模式启用一些轻松模式之外的 <b>试验性功能</b>。试验性功能包括： 🌮 End-to-End Longitudinal Control 🌮 - + 🌮 端到端（End-to-End） 纵向控制 🌮 Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. diff --git a/selfdrive/ui/translations/main_zh-CHT.ts b/selfdrive/ui/translations/main_zh-CHT.ts index 3ec67f3961..46fb5578a3 100644 --- a/selfdrive/ui/translations/main_zh-CHT.ts +++ b/selfdrive/ui/translations/main_zh-CHT.ts @@ -1027,11 +1027,11 @@ location set openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: - + openpilot 默認以 <b>輕鬆模式</b> 駕駛。 實驗模式啟用了尚未準備好進入輕鬆模式的 <b>alpha 級功能</b>。實驗功能如下： 🌮 End-to-End Longitudinal Control 🌮 - + 🌮端到端縱向控制🌮 Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. From fe2368c9eb14ee49eb59af6d892becdb4d449443 Mon Sep 17 00:00:00 2001 From: Oxygen Date: Wed, 16 Nov 2022 19:11:45 +0800 Subject: [PATCH 151/184] Updated main_zh-CHS.ts (#26524) --- selfdrive/ui/translations/main_zh-CHS.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/selfdrive/ui/translations/main_zh-CHS.ts b/selfdrive/ui/translations/main_zh-CHS.ts index dc94fbc953..31202e45f2 100644 --- a/selfdrive/ui/translations/main_zh-CHS.ts +++ b/selfdrive/ui/translations/main_zh-CHS.ts @@ -285,11 +285,11 @@ ExperimentalModeButton EXPERIMENTAL MODE ON - + 试验模式运行 CHILL MODE ON - + 轻松模式运行 @@ -1013,15 +1013,15 @@ location set On this car, openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control. Enable this to switch to openpilot longitudinal control. Enabling Experimental mode is recommended when using experimental openpilot longitudinal control. - + 针对此车辆，openpilot默认使用车辆自带的ACC，而非openpilot的纵向控制。启用此选项将切换到openpilot纵向控制。当使用试验性的openpilot纵向控制时，建议同时启用试验模式。 Experimental mode is currently unavailable on this car, since the car's stock ACC is used for longitudinal control. - + 由于此车辆使用自带的ACC纵向控制，当前无法使用试验模式。 Enable experimental longitudinal control to allow experimental mode. - + 启用试验性的纵向控制，以便允许使用试验模式。 openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: @@ -1033,15 +1033,15 @@ location set Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. - + 允许驾驶模型控制加速和制动，openpilot将模仿人类驾驶车辆，包括在红灯和停车让行标识前停车。鉴于驾驶模型确定行驶车速，所设定的车速仅作为上限。此功能尚处于早期测试状态，有可能会出现操作错误。 New Driving Visualization - + 新驾驶视角 The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. - + 当低速行驶时，驾驶视角将切换到前向广角摄像头，便于更完整地显示转向路径。右上角将显示试验模式图标。 From e099e42147af23a700bf4b64e08540574aa1d285 Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Wed, 16 Nov 2022 18:12:31 +0100 Subject: [PATCH 152/184] cabana: default factor to 1 (#26521) --- tools/cabana/detailwidget.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cabana/detailwidget.cc b/tools/cabana/detailwidget.cc index 192d1fd66c..8a221ed9db 100644 --- a/tools/cabana/detailwidget.cc +++ b/tools/cabana/detailwidget.cc @@ -235,7 +235,7 @@ void DetailWidget::addSignal(int start_bit, int size, bool little_endian) { } } } - Signal sig = {.is_little_endian = little_endian}; + Signal sig = {.is_little_endian = little_endian, .factor = 1}; for (int i = 1; /**/; ++i) { sig.name = "NEW_SIGNAL_" + std::to_string(i); if (msg->sigs.count(sig.name.c_str()) == 0) break; From e79a384a9bdc0f7421e2a914abf88a302a7e32a2 Mon Sep 17 00:00:00 2001 From: Lee Jong Mun <43285072+crwusiz@users.noreply.github.com> Date: Thu, 17 Nov 2022 02:13:41 +0900 Subject: [PATCH 153/184] Multilang: kor translation update (#26522) --- selfdrive/ui/translations/main_ko.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/selfdrive/ui/translations/main_ko.ts b/selfdrive/ui/translations/main_ko.ts index 98d46149dd..bda64c53ab 100644 --- a/selfdrive/ui/translations/main_ko.ts +++ b/selfdrive/ui/translations/main_ko.ts @@ -285,11 +285,11 @@ ExperimentalModeButton EXPERIMENTAL MODE ON - + 실험적 모드 사용 CHILL MODE ON - + 안정적 모드 사용 @@ -875,7 +875,7 @@ location set Uninstall - 삭제 + 제거 @@ -1015,15 +1015,15 @@ location set On this car, openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control. Enable this to switch to openpilot longitudinal control. Enabling Experimental mode is recommended when using experimental openpilot longitudinal control. - + 이 차량은 openpilot 롱컨트롤 대신 차량의 내장 ACC로 기본 설정됩니다. openpilot 롱컨트롤을 사용하려면 이 옵션을 활성화하세요. 실험적 openpilot 롱컨트롤을 사용하는 경우 실험적 모드를 활성화 하세요. Experimental mode is currently unavailable on this car, since the car's stock ACC is used for longitudinal control. - + 차량의 기본 ACC가 롱컨트롤에 사용되기 때문에 현재 이 차량에서는 실험적 모드를 사용할수 없습니다. Enable experimental longitudinal control to allow experimental mode. - + 실험적 롱컨트롤을 사용하려면 실험적 모드를 활성화 하세요. openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: @@ -1035,15 +1035,15 @@ location set Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. - + 주행모델이 가속과 감속을 제어하도록 합니다. openpilot은 신호등과 정지표지판을 보고 멈추는 것을 포함하여 운전자가 생각하는것처럼 주행합니다. 주행 모델이 주행할 속도를 결정하므로 설정된 속도는 상한선으로만 작용합니다. 이것은 알파 기능이므로 사용에 주의해야 합니다. New Driving Visualization - + 새로운 주행 시각화 The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. - + 주행 시각화는 저속에서 도로를 향하는 광각 카메라로 전환되어 일부 회전을 더 잘 보여줍니다. 실험적 모드 로고도 우측상단에 표시됩니다. From 8f9f015567a9f2dad66d31c25c514c436d1ba862 Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Wed, 16 Nov 2022 18:25:36 +0100 Subject: [PATCH 154/184] add missing include (#26520) --- selfdrive/ui/qt/offroad/experimental_mode.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/selfdrive/ui/qt/offroad/experimental_mode.cc b/selfdrive/ui/qt/offroad/experimental_mode.cc index f73149cdf2..b99220c1d1 100644 --- a/selfdrive/ui/qt/offroad/experimental_mode.cc +++ b/selfdrive/ui/qt/offroad/experimental_mode.cc @@ -3,6 +3,7 @@ #include #include #include +#include #include #include "selfdrive/ui/ui.h" From c3e2d35963a95bfeaf99048decbd6066c52113d8 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 16 Nov 2022 14:20:00 -0800 Subject: [PATCH 155/184] offroad ui: update chill mode icon (#26523) * Add files via upload * Add files via upload * Delete thick couch.svg * Rename img_couch.svg to img_couch_old.svg * Rename thickerer couch.svg to img_couch.svg * Add files via upload * Rename img_couch.svg to img_couch_alt.svg * Rename best couch.svg to img_couch.svg * delete old files --- selfdrive/assets/img_couch.svg | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/selfdrive/assets/img_couch.svg b/selfdrive/assets/img_couch.svg index 5b3c048318..2e86012809 100644 --- a/selfdrive/assets/img_couch.svg +++ b/selfdrive/assets/img_couch.svg @@ -1,3 +1,4 @@ - - + + + From e3c913bfa1d8c534f351d6ead5c2156ee4ee4ffa Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Thu, 17 Nov 2022 07:43:49 +0800 Subject: [PATCH 156/184] Cabana: sort signal by start bit and keep cursor position after save (#26529) sort signals by start bit and keep cursor position after save --- tools/cabana/binaryview.cc | 14 +++++++------- tools/cabana/dbcmanager.cc | 9 +++++++++ tools/cabana/dbcmanager.h | 1 + tools/cabana/detailwidget.cc | 6 +++--- tools/cabana/signaledit.cc | 11 +++++++++-- tools/cabana/signaledit.h | 2 ++ 6 files changed, 31 insertions(+), 12 deletions(-) diff --git a/tools/cabana/binaryview.cc b/tools/cabana/binaryview.cc index bcd2b88a81..7707316877 100644 --- a/tools/cabana/binaryview.cc +++ b/tools/cabana/binaryview.cc @@ -166,19 +166,19 @@ void BinaryViewModel::setMessage(const QString &message_id) { row_count = dbc_msg->size; items.resize(row_count * column_count); int i = 0; - for (auto &[name, sig] : dbc_msg->sigs) { - auto [start, end] = getSignalRange(&sig); + for (auto sig : dbc_msg->getSignals()) { + auto [start, end] = getSignalRange(sig); for (int j = start; j <= end; ++j) { - int bit_index = sig.is_little_endian ? bigEndianBitIndex(j) : j; + int bit_index = sig->is_little_endian ? bigEndianBitIndex(j) : j; int idx = column_count * (bit_index / 8) + bit_index % 8; if (idx >= items.size()) { - qWarning() << "signal " << name << "out of bounds.start_bit:" << sig.start_bit << "size:" << sig.size; + qWarning() << "signal " << sig->name.c_str() << "out of bounds.start_bit:" << sig->start_bit << "size:" << sig->size; break; } - if (j == start) sig.is_little_endian ? items[idx].is_lsb = true : items[idx].is_msb = true; - if (j == end) sig.is_little_endian ? items[idx].is_msb = true : items[idx].is_lsb = true; + if (j == start) sig->is_little_endian ? items[idx].is_lsb = true : items[idx].is_msb = true; + if (j == end) sig->is_little_endian ? items[idx].is_msb = true : items[idx].is_lsb = true; items[idx].bg_color = getColor(i); - items[idx].sigs.push_back(&sig); + items[idx].sigs.push_back(sig); } ++i; } diff --git a/tools/cabana/dbcmanager.cc b/tools/cabana/dbcmanager.cc index 18f103d34c..e7d3ead9c6 100644 --- a/tools/cabana/dbcmanager.cc +++ b/tools/cabana/dbcmanager.cc @@ -107,6 +107,15 @@ DBCManager *dbc() { return &dbc_manager; } +// DBCMsg + +std::vector DBCMsg::getSignals() const { + std::vector ret; + for (auto &[name, sig] : sigs) ret.push_back(&sig); + std::sort(ret.begin(), ret.end(), [](auto l, auto r) { return l->start_bit < r->start_bit; }); + return ret; +} + // helper functions static QVector BIG_ENDIAN_START_BITS = []() { diff --git a/tools/cabana/dbcmanager.h b/tools/cabana/dbcmanager.h index b1d2082969..4e0bc91069 100644 --- a/tools/cabana/dbcmanager.h +++ b/tools/cabana/dbcmanager.h @@ -9,6 +9,7 @@ struct DBCMsg { QString name; uint32_t size; std::map sigs; + std::vector getSignals() const; }; class DBCManager : public QObject { diff --git a/tools/cabana/detailwidget.cc b/tools/cabana/detailwidget.cc index 8a221ed9db..99cf45f5fa 100644 --- a/tools/cabana/detailwidget.cc +++ b/tools/cabana/detailwidget.cc @@ -149,7 +149,7 @@ void DetailWidget::dbcMsgChanged(int show_form_idx) { QStringList warnings; const DBCMsg *msg = dbc()->msg(msg_id); if (msg) { - for (auto &[name, sig] : msg->sigs) { + for (auto sig : msg->getSignals()) { SignalEdit *form = i < signal_list.size() ? signal_list[i] : nullptr; if (!form) { form = new SignalEdit(i); @@ -162,8 +162,8 @@ void DetailWidget::dbcMsgChanged(int show_form_idx) { signals_layout->addWidget(form); signal_list.push_back(form); } - form->setSignal(msg_id, &sig); - form->setChartOpened(charts->isChartOpened(msg_id, &sig)); + form->setSignal(msg_id, sig); + form->setChartOpened(charts->isChartOpened(msg_id, sig)); ++i; } if (msg->size != can->lastMessage(msg_id).dat.size()) diff --git a/tools/cabana/signaledit.cc b/tools/cabana/signaledit.cc index eb22b78d5a..6e4cf2a83a 100644 --- a/tools/cabana/signaledit.cc +++ b/tools/cabana/signaledit.cc @@ -116,11 +116,16 @@ SignalEdit::SignalEdit(int index, QWidget *parent) : form_idx(index), QWidget(pa hline->setFrameShadow(QFrame::Sunken); main_layout->addWidget(hline); + save_timer = new QTimer(this); + save_timer->setInterval(300); + save_timer->setSingleShot(true); + save_timer->callOnTimeout(this, &SignalEdit::saveSignal); + QObject::connect(title, &ElidedLabel::clicked, this, &SignalEdit::showFormClicked); QObject::connect(plot_btn, &QToolButton::clicked, [this](bool checked) { emit showChart(msg_id, sig, checked); }); QObject::connect(seek_btn, &QToolButton::clicked, [this]() { SignalFindDlg(msg_id, sig, this).exec(); }); QObject::connect(remove_btn, &QToolButton::clicked, [this]() { emit remove(sig); }); - QObject::connect(form, &SignalForm::changed, this, &SignalEdit::saveSignal); + QObject::connect(form, &SignalForm::changed, [this]() { save_timer->start(); }); setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); } @@ -174,7 +179,9 @@ void SignalEdit::setChartOpened(bool opened) { void SignalEdit::updateForm(bool visible) { if (visible && sig) { form->changed_by_user = false; - form->name->setText(sig->name.c_str()); + if (form->name->text() != sig->name.c_str()) { + form->name->setText(sig->name.c_str()); + } form->endianness->setCurrentIndex(sig->is_little_endian ? 0 : 1); form->sign->setCurrentIndex(sig->is_signed ? 0 : 1); form->factor->setText(QString::number(sig->factor)); diff --git a/tools/cabana/signaledit.h b/tools/cabana/signaledit.h index da0b9758c7..f889a9c096 100644 --- a/tools/cabana/signaledit.h +++ b/tools/cabana/signaledit.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include "selfdrive/ui/qt/widgets/controls.h" @@ -57,6 +58,7 @@ protected: QLabel *icon; int form_idx = 0; QToolButton *plot_btn; + QTimer *save_timer; }; class SignalFindDlg : public QDialog { From b6de850dd7b9935ded59895a84b3edf5c767dae0 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Thu, 17 Nov 2022 07:45:08 +0800 Subject: [PATCH 157/184] Cabana: save & restore splitter state (#26526) save & restore splitter state --- tools/cabana/mainwin.cc | 4 ++++ tools/cabana/settings.cc | 2 ++ tools/cabana/settings.h | 2 ++ 3 files changed, 8 insertions(+) diff --git a/tools/cabana/mainwin.cc b/tools/cabana/mainwin.cc index 7781ab3b75..324323ac44 100644 --- a/tools/cabana/mainwin.cc +++ b/tools/cabana/mainwin.cc @@ -55,6 +55,9 @@ MainWindow::MainWindow() : QMainWindow() { charts_widget = new ChartsWidget(this); detail_widget = new DetailWidget(charts_widget, this); splitter->addWidget(detail_widget); + if (!settings.splitter_state.isEmpty()) { + splitter->restoreState(settings.splitter_state); + } main_layout->addWidget(splitter); // right widgets @@ -247,6 +250,7 @@ void MainWindow::closeEvent(QCloseEvent *event) { if (floating_window) floating_window->deleteLater(); + settings.splitter_state = splitter->saveState(); settings.save(); QWidget::closeEvent(event); } diff --git a/tools/cabana/settings.cc b/tools/cabana/settings.cc index b3a4ed4872..be806aa705 100644 --- a/tools/cabana/settings.cc +++ b/tools/cabana/settings.cc @@ -21,6 +21,7 @@ void Settings::save() { s.setValue("chart_theme", chart_theme); s.setValue("max_chart_x_range", max_chart_x_range); s.setValue("last_dir", last_dir); + s.setValue("splitter_state", splitter_state); } void Settings::load() { @@ -32,6 +33,7 @@ void Settings::load() { chart_theme = s.value("chart_theme", 0).toInt(); max_chart_x_range = s.value("max_chart_x_range", 3 * 60).toInt(); last_dir = s.value("last_dir", QDir::homePath()).toString(); + splitter_state = s.value("splitter_state").toByteArray(); } // SettingsDlg diff --git a/tools/cabana/settings.h b/tools/cabana/settings.h index e08d0ae55e..624a1ce33d 100644 --- a/tools/cabana/settings.h +++ b/tools/cabana/settings.h @@ -1,5 +1,6 @@ #pragma once +#include #include #include #include @@ -19,6 +20,7 @@ public: int chart_theme = 0; int max_chart_x_range = 3 * 60; // 3 minutes QString last_dir; + QByteArray splitter_state; signals: void changed(); From 2cd1571f4ae9f8aa1aa5879aa8c9107028d7f937 Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Thu, 17 Nov 2022 00:45:28 +0100 Subject: [PATCH 158/184] Discover Qt paths using qmake (#26501) * discover qt paths using qmake * fix device build * use subprocess.check_output --- SConstruct | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index 74680c0598..033e10a1f0 100644 --- a/SConstruct +++ b/SConstruct @@ -298,12 +298,15 @@ if arch == "Darwin": qt_env["FRAMEWORKS"] += [f"Qt{m}" for m in qt_modules] + ["OpenGL"] qt_env.AppendENVPath('PATH', os.path.join(qt_env['QTDIR'], "bin")) else: - qt_env['QTDIR'] = "/usr" + qt_install_prefix = subprocess.check_output(['qmake', '-query', 'QT_INSTALL_PREFIX'], encoding='utf8').strip() + qt_install_headers = subprocess.check_output(['qmake', '-query', 'QT_INSTALL_HEADERS'], encoding='utf8').strip() + + qt_env['QTDIR'] = qt_install_prefix qt_dirs = [ - f"/usr/include/{real_arch}-linux-gnu/qt5", - f"/usr/include/{real_arch}-linux-gnu/qt5/QtGui/5.12.8/QtGui", + f"{qt_install_headers}", + f"{qt_install_headers}/QtGui/5.12.8/QtGui", ] - qt_dirs += [f"/usr/include/{real_arch}-linux-gnu/qt5/Qt{m}" for m in qt_modules] + qt_dirs += [f"{qt_install_headers}/Qt{m}" for m in qt_modules] qt_libs = [f"Qt5{m}" for m in qt_modules] if arch == "larch64": From 66edb15b8f558ce81b5a57af4e60fc24e1fc489c Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Thu, 17 Nov 2022 07:51:05 +0800 Subject: [PATCH 159/184] Cabana: improve binary view (#26525) * improve * set minimum width * click signal to open&hide form * disable vertical header's click --- tools/cabana/binaryview.cc | 94 +++++++++++++++--------------------- tools/cabana/binaryview.h | 5 +- tools/cabana/canmessages.h | 6 --- tools/cabana/detailwidget.cc | 12 ++++- tools/cabana/detailwidget.h | 1 + tools/cabana/signaledit.cc | 3 +- 6 files changed, 54 insertions(+), 67 deletions(-) diff --git a/tools/cabana/binaryview.cc b/tools/cabana/binaryview.cc index 7707316877..dae4591976 100644 --- a/tools/cabana/binaryview.cc +++ b/tools/cabana/binaryview.cc @@ -23,11 +23,13 @@ BinaryView::BinaryView(QWidget *parent) : QTableView(parent) { delegate = new BinaryItemDelegate(this); setItemDelegate(delegate); horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch); + verticalHeader()->setSectionsClickable(false); horizontalHeader()->hide(); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents); setFrameShape(QFrame::NoFrame); + setShowGrid(false); setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); setMouseTracking(true); } @@ -46,46 +48,30 @@ void BinaryView::setSelection(const QRect &rect, QItemSelectionModel::SelectionF return; QItemSelection selection; - auto [tl, br] = std::minmax(anchor_index, index); - if ((resize_sig && resize_sig->is_little_endian) || (!resize_sig && index < anchor_index)) { - // little_endian selection - if (tl.row() == br.row()) { - selection.merge({model->index(tl.row(), tl.column()), model->index(tl.row(), br.column())}, flags); - } else { - for (int row = tl.row(); row <= br.row(); ++row) { - int left_col = (row == br.row()) ? br.column() : 0; - int right_col = (row == tl.row()) ? tl.column() : 7; - selection.merge({model->index(row, left_col), model->index(row, right_col)}, flags); - } - } - } else { - // big endian selection - for (int row = tl.row(); row <= br.row(); ++row) { - int left_col = (row == tl.row()) ? tl.column() : 0; - int right_col = (row == br.row()) ? br.column() : 7; - selection.merge({model->index(row, left_col), model->index(row, right_col)}, flags); - } + auto [start, size, is_lb] = getSelection(index); + for (int i = start; i < start + size; ++i) { + auto idx = model->bitIndex(i, is_lb); + selection.merge({idx, idx}, flags); } selectionModel()->select(selection, flags); } void BinaryView::mousePressEvent(QMouseEvent *event) { delegate->setSelectionColor(style()->standardPalette().color(QPalette::Active, QPalette::Highlight)); - if (auto index = indexAt(event->pos()); index.isValid() && index.column() != 8) { + if (auto index = indexAt(event->pos()); index.isValid() && index.column() != 8) { anchor_index = index; auto item = (const BinaryViewModel::Item *)anchor_index.internalPointer(); - if (item && item->sigs.size() > 0) { - int bit_idx = get_bit_index(anchor_index, true); - for (auto s : item->sigs) { - if (bit_idx == s->lsb || bit_idx == s->msb) { - resize_sig = s; - delegate->setSelectionColor(item->bg_color); - break; - } + int bit_idx = get_bit_index(anchor_index, true); + for (auto s : item->sigs) { + if (bit_idx == s->lsb || bit_idx == s->msb) { + anchor_index = model->bitIndex(bit_idx == s->lsb ? s->msb : s->lsb, true); + resize_sig = s; + delegate->setSelectionColor(item->bg_color); + break; } } } - QTableView::mousePressEvent(event); + event->accept(); } void BinaryView::mouseMoveEvent(QMouseEvent *event) { @@ -104,28 +90,14 @@ void BinaryView::mouseReleaseEvent(QMouseEvent *event) { auto release_index = indexAt(event->pos()); if (release_index.isValid() && anchor_index.isValid()) { - if (release_index.column() == 8) { - release_index = model->index(release_index.row(), 7); - } - bool little_endian = (resize_sig && resize_sig->is_little_endian) || (!resize_sig && release_index < anchor_index); - int release_bit_idx = get_bit_index(release_index, little_endian); - int archor_bit_idx = get_bit_index(anchor_index, little_endian); - if (resize_sig) { - auto [sig_from, sig_to] = getSignalRange(resize_sig); - int start_bit, end_bit; - if (archor_bit_idx == sig_from) { - std::tie(start_bit, end_bit) = std::minmax(release_bit_idx, sig_to); - if (start_bit >= sig_from && start_bit <= sig_to) - start_bit = std::min(start_bit + 1, sig_to); - } else { - std::tie(start_bit, end_bit) = std::minmax(release_bit_idx, sig_from); - if (end_bit >= sig_from && end_bit <= sig_to) - end_bit = std::max(end_bit - 1, sig_from); - } - emit resizeSignal(resize_sig, start_bit, end_bit - start_bit + 1); + if (selectionModel()->hasSelection()) { + auto [start_bit, size, is_lb] = getSelection(release_index); + resize_sig ? emit resizeSignal(resize_sig, start_bit, size) + : emit addSignal(start_bit, size, is_lb); } else { - auto [sart_bit, end_bit] = std::minmax(archor_bit_idx, release_bit_idx); - emit addSignal(sart_bit, end_bit - sart_bit + 1, little_endian); + auto item = (const BinaryViewModel::Item *)anchor_index.internalPointer(); + if (item && item->sigs.size() > 0) + emit signalClicked(item->sigs.back()); } } clearSelection(); @@ -156,6 +128,17 @@ QSet BinaryView::getOverlappingSignals() const { return overlapping; } +std::tuple BinaryView::getSelection(QModelIndex index) { + if (index.column() == 8) { + index = model->index(index.row(), 7); + } + bool is_lb = (resize_sig && resize_sig->is_little_endian) || (!resize_sig && index < anchor_index); + int cur_bit_idx = get_bit_index(index, is_lb); + int anchor_bit_idx = get_bit_index(anchor_index, is_lb); + auto [start_bit, end_bit] = std::minmax(cur_bit_idx, anchor_bit_idx); + return {start_bit, end_bit - start_bit + 1, is_lb}; +} + // BinaryViewModel void BinaryViewModel::setMessage(const QString &message_id) { @@ -203,7 +186,7 @@ void BinaryViewModel::updateState() { char hex[3] = {'\0'}; for (int i = 0; i < std::min(binary.size(), row_count); ++i) { for (int j = 0; j < column_count - 1; ++j) { - items[i * column_count + j].val = QChar((binary[i] >> (7 - j)) & 1 ? '1' : '0'); + items[i * column_count + j].val = ((binary[i] >> (7 - j)) & 1) != 0 ? '1' : '0'; } hex[0] = toHex(binary[i] >> 4); hex[1] = toHex(binary[i] & 0xf); @@ -250,17 +233,16 @@ void BinaryItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op painter->save(); // background - bool hover = item->sigs.contains(bin_view->hoveredSignal()); - QColor bg_color = hover ? hoverColor(item->bg_color) : item->bg_color; if (option.state & QStyle::State_Selected) { - bg_color = selection_color; + painter->fillRect(option.rect, selection_color); + } else if (!bin_view->selectionModel()->hasSelection() || !item->sigs.contains(bin_view->resize_sig)) { + painter->fillRect(option.rect, item->bg_color); } - painter->fillRect(option.rect, bg_color); // text if (index.column() == 8) { // hex column painter->setFont(hex_font); - } else if (hover) { + } else if (option.state & QStyle::State_Selected || (!bin_view->resize_sig && item->sigs.contains(bin_view->hovered_sig))) { painter->setPen(Qt::white); } painter->drawText(option.rect, Qt::AlignCenter, item->val); diff --git a/tools/cabana/binaryview.h b/tools/cabana/binaryview.h index 2d6fc5c18b..0ea111d917 100644 --- a/tools/cabana/binaryview.h +++ b/tools/cabana/binaryview.h @@ -32,6 +32,7 @@ public: QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const { return {}; } int rowCount(const QModelIndex &parent = QModelIndex()) const override { return row_count; } int columnCount(const QModelIndex &parent = QModelIndex()) const override { return column_count; } + inline QModelIndex bitIndex(int bit, bool is_lb) const { return index(bit / 8, is_lb ? (7 - bit % 8) : bit % 8); } QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override { return createIndex(row, column, (void *)&items[row * column_count + column]); } @@ -63,15 +64,16 @@ public: void setMessage(const QString &message_id); void highlight(const Signal *sig); QSet getOverlappingSignals() const; - inline const Signal *hoveredSignal() const { return hovered_sig; } inline void updateState() { model->updateState(); } signals: + void signalClicked(const Signal *sig); void signalHovered(const Signal *sig); void addSignal(int start_bit, int size, bool little_endian); void resizeSignal(const Signal *sig, int from, int size); private: + std::tuple getSelection(QModelIndex index); void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags flags) override; void mousePressEvent(QMouseEvent *event) override; void mouseMoveEvent(QMouseEvent *event) override; @@ -83,4 +85,5 @@ private: BinaryItemDelegate *delegate; const Signal *resize_sig = nullptr; const Signal *hovered_sig = nullptr; + friend class BinaryItemDelegate; }; diff --git a/tools/cabana/canmessages.h b/tools/cabana/canmessages.h index ff41edad54..4cb0f403a0 100644 --- a/tools/cabana/canmessages.h +++ b/tools/cabana/canmessages.h @@ -80,11 +80,5 @@ inline const QString &getColor(int i) { return SIGNAL_COLORS[i % std::size(SIGNAL_COLORS)]; } -inline QColor hoverColor(const QColor &color) { - QColor c = color.convertTo(QColor::Hsv); - c.setHsv(color.hue(), 180, 180); - return c; -} - // A global pointer referring to the unique CANMessages object extern CANMessages *can; diff --git a/tools/cabana/detailwidget.cc b/tools/cabana/detailwidget.cc index 99cf45f5fa..52ae530a56 100644 --- a/tools/cabana/detailwidget.cc +++ b/tools/cabana/detailwidget.cc @@ -17,6 +17,7 @@ DetailWidget::DetailWidget(ChartsWidget *charts, QWidget *parent) : charts(charts), QWidget(parent) { undo_stack = new QUndoStack(this); + setMinimumWidth(500); QVBoxLayout *main_layout = new QVBoxLayout(this); main_layout->setContentsMargins(0, 0, 0, 0); main_layout->setSpacing(0); @@ -90,6 +91,7 @@ DetailWidget::DetailWidget(ChartsWidget *charts, QWidget *parent) : charts(chart tab_widget->addTab(history_log, "Logs"); main_layout->addWidget(tab_widget); + QObject::connect(binary_view, &BinaryView::signalClicked, this, &DetailWidget::showForm); QObject::connect(binary_view, &BinaryView::resizeSignal, this, &DetailWidget::resizeSignal); QObject::connect(binary_view, &BinaryView::addSignal, this, &DetailWidget::addSignal); QObject::connect(tab_widget, &QTabWidget::currentChanged, [this]() { updateState(); }); @@ -197,9 +199,15 @@ void DetailWidget::updateState(const QHash * msgs) { void DetailWidget::showFormClicked() { auto s = qobject_cast(sender()); + showForm(s->sig); +} + +void DetailWidget::showForm(const Signal *sig) { setUpdatesEnabled(false); - for (auto f : signal_list) - f->updateForm(f == s && !f->isFormVisible()); + for (auto f : signal_list) { + f->updateForm(f->sig == sig && !f->isFormVisible()); + if (f->sig == sig) scroll->ensureWidgetVisible(f); + } setUpdatesEnabled(true); } diff --git a/tools/cabana/detailwidget.h b/tools/cabana/detailwidget.h index 4346d1c5d5..41fa0edd41 100644 --- a/tools/cabana/detailwidget.h +++ b/tools/cabana/detailwidget.h @@ -28,6 +28,7 @@ public: QUndoStack *undo_stack = nullptr; private: + void showForm(const Signal *sig); void showFormClicked(); void updateChartState(const QString &id, const Signal *sig, bool opened); void showTabBarContextMenu(const QPoint &pt); diff --git a/tools/cabana/signaledit.cc b/tools/cabana/signaledit.cc index 6e4cf2a83a..a0660901cf 100644 --- a/tools/cabana/signaledit.cc +++ b/tools/cabana/signaledit.cc @@ -196,9 +196,8 @@ void SignalEdit::updateForm(bool visible) { } void SignalEdit::signalHovered(const Signal *s) { - auto bg_color = sig == s ? hoverColor(getColor(form_idx)) : QColor(getColor(form_idx)); auto color = sig == s ? "white" : "black"; - color_label->setStyleSheet(QString("color:%1; background-color:%2").arg(color).arg(bg_color.name())); + color_label->setStyleSheet(QString("color:%1; background-color:%2").arg(color).arg(getColor(form_idx))); } void SignalEdit::enterEvent(QEvent *event) { From 187f8c177a1a4d507a4ca145463f852cee3ce7aa Mon Sep 17 00:00:00 2001 From: Tim Wilson Date: Thu, 17 Nov 2022 03:03:13 -0700 Subject: [PATCH 160/184] Add video_link for GMC Sierra (#26506) * Add video_link for GMS Sierra * fix precommit Co-authored-by: Shane Smiskol --- selfdrive/car/gm/values.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfdrive/car/gm/values.py b/selfdrive/car/gm/values.py index 03392ba0f9..35f87307d6 100644 --- a/selfdrive/car/gm/values.py +++ b/selfdrive/car/gm/values.py @@ -100,7 +100,7 @@ CAR_INFO: Dict[str, Union[GMCarInfo, List[GMCarInfo]]] = { CAR.BOLT_EUV: GMCarInfo("Chevrolet Bolt EUV 2022-23", "Premier or Premier Redline Trim without Super Cruise Package", "https://youtu.be/xvwzGMUA210", footnotes=[], harness=Harness.gm), CAR.SILVERADO: [ GMCarInfo("Chevrolet Silverado 1500 2020-21", "Safety Package II", footnotes=[], harness=Harness.gm), - GMCarInfo("GMC Sierra 1500 2020-21", "Driver Alert Package II", footnotes=[], harness=Harness.gm), + GMCarInfo("GMC Sierra 1500 2020-21", "Driver Alert Package II", "https://youtu.be/5HbNoBLzRwE", footnotes=[], harness=Harness.gm), ], CAR.EQUINOX: GMCarInfo("Chevrolet Equinox 2019-22", footnotes=[], harness=Harness.gm), } From 37ad8f4f3fe0e730c46ba60f60e9c8db20c4c20e Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Fri, 18 Nov 2022 02:52:04 +0800 Subject: [PATCH 161/184] Cabana: support for multiple series in chart (#26538) * customize axis x & y * new function chartView::addSignal * support multiple series in chartView * more * show legend * update changed signals only * fix z value * cleanup * limit trake line in plot area * display signal name in value_text *   * fix axis y * add spaces * cache min max value for axis y * cleanup * better values text * remove force_update --- tools/cabana/chartswidget.cc | 316 +++++++++++++++++++++++------------ tools/cabana/chartswidget.h | 52 ++++-- tools/cabana/signaledit.cc | 7 +- tools/cabana/signaledit.h | 2 +- 4 files changed, 253 insertions(+), 124 deletions(-) diff --git a/tools/cabana/chartswidget.cc b/tools/cabana/chartswidget.cc index 06387b3585..4bd398a93b 100644 --- a/tools/cabana/chartswidget.cc +++ b/tools/cabana/chartswidget.cc @@ -4,11 +4,9 @@ #include #include #include +#include #include -#include -#include #include -#include // ChartsWidget @@ -19,7 +17,7 @@ ChartsWidget::ChartsWidget(QWidget *parent) : QWidget(parent) { // toolbar QToolBar *toolbar = new QToolBar(tr("Charts"), this); title_label = new QLabel(); - title_label->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred); + title_label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); toolbar->addWidget(title_label); toolbar->addWidget(range_label = new QLabel()); reset_zoom_btn = toolbar->addAction("⟲"); @@ -42,21 +40,10 @@ ChartsWidget::ChartsWidget(QWidget *parent) : QWidget(parent) { main_layout->addWidget(charts_scroll); - QObject::connect(dbc(), &DBCManager::DBCFileChanged, [this]() { removeAll(nullptr); }); - QObject::connect(dbc(), &DBCManager::signalRemoved, this, &ChartsWidget::removeAll); - QObject::connect(dbc(), &DBCManager::signalUpdated, this, &ChartsWidget::signalUpdated); - QObject::connect(dbc(), &DBCManager::msgRemoved, [this](uint32_t address) { - for (auto c : charts.toVector()) - if (DBCManager::parseId(c->id).second == address) removeChart(c); - }); - QObject::connect(dbc(), &DBCManager::msgUpdated, [this](uint32_t address) { - for (auto c : charts) { - if (DBCManager::parseId(c->id).second == address) c->updateTitle(); - } - }); + QObject::connect(dbc(), &DBCManager::DBCFileChanged, this, &ChartsWidget::removeAll); QObject::connect(can, &CANMessages::eventsMerged, this, &ChartsWidget::eventsMerged); QObject::connect(can, &CANMessages::updated, this, &ChartsWidget::updateState); - QObject::connect(remove_all_btn, &QAction::triggered, [this]() { removeAll(); }); + QObject::connect(remove_all_btn, &QAction::triggered, this, &ChartsWidget::removeAll); QObject::connect(reset_zoom_btn, &QAction::triggered, this, &ChartsWidget::zoomReset); QObject::connect(dock_btn, &QAction::triggered, [this]() { emit dock(!docking); @@ -81,8 +68,8 @@ void ChartsWidget::zoomIn(double min, double max) { zoomed_range = {min, max}; is_zoomed = zoomed_range != display_range; updateToolBar(); - emit rangeChanged(min, max, is_zoomed); updateState(); + emit rangeChanged(min, max, is_zoomed); } void ChartsWidget::zoomReset() { @@ -108,13 +95,13 @@ void ChartsWidget::updateState() { if (prev_range != display_range) { QFutureSynchronizer future_synchronizer; for (auto c : charts) - future_synchronizer.addFuture(QtConcurrent::run(c, &ChartView::updateSeries, display_range)); + future_synchronizer.addFuture(QtConcurrent::run(c, &ChartView::setEventsRange, display_range)); } } const auto &range = is_zoomed ? zoomed_range : display_range; for (auto c : charts) { - c->setRange(range.first, range.second); + c->setDisplayRange(range.first, range.second); c->updateLineMarker(current_sec); } } @@ -128,49 +115,45 @@ void ChartsWidget::updateToolBar() { dock_btn->setToolTip(docking ? tr("Undock charts") : tr("Dock charts")); } -void ChartsWidget::showChart(const QString &id, const Signal *sig, bool show) { - auto it = std::find_if(charts.begin(), charts.end(), [=](auto c) { return c->id == id && c->signal == sig; }); - if (it != charts.end()) { - if (!show) removeChart((*it)); - } else if (show) { - auto chart = new ChartView(id, sig, this); - chart->updateSeries(display_range); - QObject::connect(chart, &ChartView::remove, [=]() { removeChart(chart); }); - QObject::connect(chart, &ChartView::zoomIn, this, &ChartsWidget::zoomIn); - QObject::connect(chart, &ChartView::zoomReset, this, &ChartsWidget::zoomReset); - charts_layout->insertWidget(0, chart); - charts.push_back(chart); - emit chartOpened(chart->id, chart->signal); +ChartView *ChartsWidget::findChart(const QString &id, const Signal *sig) { + for (auto c : charts) + if (c->hasSeries(id, sig)) return c; + return nullptr; +} + +void ChartsWidget::showChart(const QString &id, const Signal *sig, bool show, bool merge) { + if (!show) { + if (ChartView *chart = findChart(id, sig)) { + chart->removeSeries(id, sig); + } + } else { + ChartView *chart = merge && charts.size() > 0 ? charts.back() : nullptr; + if (!chart) { + chart = new ChartView(this); + chart->setEventsRange(display_range); + QObject::connect(chart, &ChartView::remove, [=]() { removeChart(chart); }); + QObject::connect(chart, &ChartView::zoomIn, this, &ChartsWidget::zoomIn); + QObject::connect(chart, &ChartView::zoomReset, this, &ChartsWidget::zoomReset); + QObject::connect(chart, &ChartView::seriesRemoved, this, &ChartsWidget::chartClosed); + charts_layout->insertWidget(0, chart); + charts.push_back(chart); + } + chart->addSeries(id, sig); + emit chartOpened(id, sig); updateState(); } updateToolBar(); } -bool ChartsWidget::isChartOpened(const QString &id, const Signal *sig) { - auto it = std::find_if(charts.begin(), charts.end(), [=](auto c) { return c->id == id && c->signal == sig; }); - return it != charts.end(); -} - void ChartsWidget::removeChart(ChartView *chart) { charts.removeOne(chart); chart->deleteLater(); updateToolBar(); - emit chartClosed(chart->id, chart->signal); } -void ChartsWidget::removeAll(const Signal *sig) { +void ChartsWidget::removeAll() { for (auto c : charts.toVector()) - if (!sig || c->signal == sig) removeChart(c); -} - -void ChartsWidget::signalUpdated(const Signal *sig) { - for (auto c : charts) { - if (c->signal == sig) { - c->updateTitle(); - c->updateSeries(display_range); - c->setRange(display_range.first, display_range.second, true); - } - } + removeChart(c); } bool ChartsWidget::eventFilter(QObject *obj, QEvent *event) { @@ -183,14 +166,14 @@ bool ChartsWidget::eventFilter(QObject *obj, QEvent *event) { // ChartView -ChartView::ChartView(const QString &id, const Signal *sig, QWidget *parent) - : id(id), signal(sig), QChartView(nullptr, parent) { - QLineSeries *series = new QLineSeries(); +ChartView::ChartView(QWidget *parent) : QChartView(nullptr, parent) { QChart *chart = new QChart(); chart->setBackgroundRoundness(0); - chart->addSeries(series); - chart->createDefaultAxes(); - chart->legend()->hide(); + axis_x = new QValueAxis(this); + axis_y = new QValueAxis(this); + chart->addAxis(axis_x, Qt::AlignBottom); + chart->addAxis(axis_y, Qt::AlignLeft); + chart->legend()->setShowToolTips(true); chart->layout()->setContentsMargins(0, 0, 0, 0); // top margin for title chart->setMargins({0, 11, 0, 0}); @@ -213,33 +196,108 @@ ChartView::ChartView(const QString &id, const Signal *sig, QWidget *parent) remove_btn->setToolTip(tr("Remove Chart")); close_btn_proxy = new QGraphicsProxyWidget(chart); close_btn_proxy->setWidget(remove_btn); + close_btn_proxy->setZValue(chart->zValue() + 11); setChart(chart); setRenderHint(QPainter::Antialiasing); setRubberBand(QChartView::HorizontalRubberBand); updateFromSettings(); - updateTitle(); QTimer *timer = new QTimer(this); timer->setInterval(100); timer->setSingleShot(true); timer->callOnTimeout(this, &ChartView::adjustChartMargins); + QObject::connect(dbc(), &DBCManager::signalRemoved, this, &ChartView::signalRemoved); + QObject::connect(dbc(), &DBCManager::signalUpdated, this, &ChartView::signalUpdated); + QObject::connect(dbc(), &DBCManager::msgRemoved, this, &ChartView::msgRemoved); + QObject::connect(dbc(), &DBCManager::msgUpdated, this, &ChartView::msgUpdated); QObject::connect(&settings, &Settings::changed, this, &ChartView::updateFromSettings); - QObject::connect(remove_btn, &QToolButton::clicked, [=]() { emit remove(id, sig); }); + QObject::connect(remove_btn, &QToolButton::clicked, this, &ChartView::remove); QObject::connect(chart, &QChart::plotAreaChanged, [=](const QRectF &plotArea) { // use a singleshot timer to avoid recursion call. timer->start(); }); } +ChartView::~ChartView() { + for (auto &s : sigs) + emit seriesRemoved(s.msg_id, s.sig); +} + +void ChartView::addSeries(const QString &msg_id, const Signal *sig) { + QLineSeries *series = new QLineSeries(this); + chart()->addSeries(series); + series->attachAxis(axis_x); + series->attachAxis(axis_y); + auto [source, address] = DBCManager::parseId(msg_id); + sigs.push_back({.msg_id = msg_id, .address = address, .source = source, .sig = sig, .series = series}); + updateTitle(); + updateSeries(sig); +} + +void ChartView::removeSeries(const QString &msg_id, const Signal *sig) { + auto it = std::find_if(sigs.begin(), sigs.end(), [&](auto &s) { return s.msg_id == msg_id && s.sig == sig; }); + if (it != sigs.end()) { + it = removeSeries(it); + } +} + +bool ChartView::hasSeries(const QString &msg_id, const Signal *sig) const { + auto it = std::find_if(sigs.begin(), sigs.end(), [&](auto &s) { return s.msg_id == msg_id && s.sig == sig; }); + return it != sigs.end(); +} + +QList::iterator ChartView::removeSeries(const QList::iterator &it) { + chart()->removeSeries(it->series); + it->series->deleteLater(); + emit seriesRemoved(it->msg_id, it->sig); + + auto ret = sigs.erase(it); + if (!sigs.isEmpty()) { + updateAxisY(); + } else { + emit remove(); + } + return ret; +} + +void ChartView::signalUpdated(const Signal *sig) { + auto it = std::find_if(sigs.begin(), sigs.end(), [=](auto &s) { return s.sig == sig; }); + if (it != sigs.end()) { + updateTitle(); + // TODO: don't update series if only name changed. + updateSeries(sig); + } +} + +void ChartView::signalRemoved(const Signal *sig) { + for (auto it = sigs.begin(); it != sigs.end(); /**/) { + it = (it->sig == sig) ? removeSeries(it) : ++it; + } +} + +void ChartView::msgUpdated(uint32_t address) { + auto it = std::find_if(sigs.begin(), sigs.end(), [=](auto &s) { return s.address == address; }); + if (it != sigs.end()) + updateTitle(); +} + +void ChartView::msgRemoved(uint32_t address) { + for (auto it = sigs.begin(); it != sigs.end(); /**/) { + it = (it->address == address) ? removeSeries(it) : ++it; + } +} + void ChartView::resizeEvent(QResizeEvent *event) { QChartView::resizeEvent(event); close_btn_proxy->setPos(event->size().width() - close_btn_proxy->size().width() - 11, 8); } void ChartView::updateTitle() { - chart()->setTitle(tr("%1 %2 %3").arg(dbc()->msg(id)->name).arg(id).arg(signal->name.c_str())); + for (auto &s : sigs) { + s.series->setName(QString("%1 %2 %3").arg(s.sig->name.c_str()).arg(msgName(s.msg_id)).arg(s.msg_id)); + } } void ChartView::updateFromSettings() { @@ -249,9 +307,15 @@ void ChartView::updateFromSettings() { line_marker->setPen(QPen(color, 2)); } -void ChartView::setRange(double min, double max, bool force_update) { - auto axis_x = dynamic_cast(chart()->axisX()); - if (force_update || (min != axis_x->min() || max != axis_x->max())) { +void ChartView::setEventsRange(const std::pair &range) { + if (range != events_range) { + events_range = range; + updateSeries(); + } +} + +void ChartView::setDisplayRange(double min, double max) { + if (min != axis_x->min() || max != axis_x->max()) { axis_x->setRange(min, max); updateAxisY(); } @@ -268,7 +332,6 @@ void ChartView::adjustChartMargins() { } void ChartView::updateLineMarker(double current_sec) { - auto axis_x = dynamic_cast(chart()->axisX()); int x = chart()->plotArea().left() + chart()->plotArea().width() * (current_sec - axis_x->min()) / (axis_x->max() - axis_x->min()); if (int(line_marker->line().x1()) != x) { @@ -276,48 +339,72 @@ void ChartView::updateLineMarker(double current_sec) { } } -void ChartView::updateSeries(const std::pair range) { +void ChartView::updateSeries(const Signal *sig) { auto events = can->events(); if (!events) return; - vals.clear(); - vals.reserve((range.second - range.first) * 1000); // [n]seconds * 1000hz - auto [bus, address] = DBCManager::parseId(id); - double route_start_time = can->routeStartTime(); - Event begin_event(cereal::Event::Which::INIT_DATA, (route_start_time + range.first) * 1e9); - auto begin = std::lower_bound(events->begin(), events->end(), &begin_event, Event::lessThan()); - double end_ns = (route_start_time + range.second) * 1e9; - for (auto it = begin; it != events->end() && (*it)->mono_time <= end_ns; ++it) { - if ((*it)->which == cereal::Event::Which::CAN) { - for (const auto &c : (*it)->event.getCan()) { - if (bus == c.getSrc() && address == c.getAddress()) { - auto dat = c.getDat(); - double value = get_raw_value((uint8_t *)dat.begin(), dat.size(), *signal); - double ts = ((*it)->mono_time / (double)1e9) - route_start_time; // seconds - vals.push_back({ts, value}); + for (int i = 0; i < sigs.size(); ++i) { + if (auto &s = sigs[i]; !sig || s.sig == sig) { + s.vals.clear(); + s.vals.reserve((events_range.second - events_range.first) * 1000); // [n]seconds * 1000hz + s.min_y = std::numeric_limits::max(); + s.max_y = std::numeric_limits::lowest(); + + double route_start_time = can->routeStartTime(); + Event begin_event(cereal::Event::Which::INIT_DATA, (route_start_time + events_range.first) * 1e9); + auto begin = std::lower_bound(events->begin(), events->end(), &begin_event, Event::lessThan()); + double end_ns = (route_start_time + events_range.second) * 1e9; + + for (auto it = begin; it != events->end() && (*it)->mono_time <= end_ns; ++it) { + if ((*it)->which == cereal::Event::Which::CAN) { + for (const auto &c : (*it)->event.getCan()) { + if (s.source == c.getSrc() && s.address == c.getAddress()) { + auto dat = c.getDat(); + double value = get_raw_value((uint8_t *)dat.begin(), dat.size(), *s.sig); + double ts = ((*it)->mono_time / (double)1e9) - route_start_time; // seconds + s.vals.push_back({ts, value}); + + if (value < s.min_y) s.min_y = value; + if (value > s.max_y) s.max_y = value; + } + } } } + + QLineSeries *series = (QLineSeries *)chart()->series()[i]; + series->replace(s.vals); } } - QLineSeries *series = (QLineSeries *)chart()->series()[0]; - series->replace(vals); + updateAxisY(); } // auto zoom on yaxis void ChartView::updateAxisY() { - const auto axis_x = dynamic_cast(chart()->axisX()); - const auto axis_y = dynamic_cast(chart()->axisY()); - auto begin = std::lower_bound(vals.begin(), vals.end(), axis_x->min(), [](auto &p, double x) { return p.x() < x; }); - if (begin == vals.end()) - return; - - auto end = std::upper_bound(vals.begin(), vals.end(), axis_x->max(), [](double x, auto &p) { return x < p.x(); }); - const auto [min, max] = std::minmax_element(begin, end, [](auto &p1, auto &p2) { return p1.y() < p2.y(); }); - if (max->y() == min->y()) { - axis_y->setRange(min->y() - 1, max->y() + 1); + double min_y = std::numeric_limits::max(); + double max_y = std::numeric_limits::lowest(); + if (events_range == std::pair{axis_x->min(), axis_x->max()}) { + for (auto &s : sigs) { + if (s.min_y < min_y) min_y = s.min_y; + if (s.max_y > max_y) max_y = s.max_y; + } } else { - double range = max->y() - min->y(); - axis_y->setRange(min->y() - range * 0.05, max->y() + range * 0.05); + for (auto &s : sigs) { + auto begin = std::lower_bound(s.vals.begin(), s.vals.end(), axis_x->min(), [](auto &p, double x) { return p.x() < x; }); + if (begin == s.vals.end()) + return; + + auto end = std::upper_bound(s.vals.begin(), s.vals.end(), axis_x->max(), [](double x, auto &p) { return x < p.x(); }); + const auto [min, max] = std::minmax_element(begin, end, [](auto &p1, auto &p2) { return p1.y() < p2.y(); }); + if (min->y() < min_y) min_y = min->y(); + if (max->y() > max_y) max_y = max->y(); + } + } + + if (max_y == min_y) { + axis_y->setRange(min_y - 1, max_y + 1); + } else { + double range = max_y - min_y; + axis_y->setRange(min_y - range * 0.05, max_y + range * 0.05); axis_y->applyNiceNumbers(); } } @@ -333,7 +420,6 @@ void ChartView::mouseReleaseEvent(QMouseEvent *event) { rubber->hide(); QRectF rect = rubber->geometry().normalized(); rect.translate(-chart()->plotArea().topLeft()); - const auto axis_x = dynamic_cast(chart()->axisX()); double min = axis_x->min() + (rect.left() / chart()->plotArea().width()) * (axis_x->max() - axis_x->min()); double max = axis_x->min() + (rect.right() / chart()->plotArea().width()) * (axis_x->max() - axis_x->min()); if (rubber->width() <= 0) { @@ -357,26 +443,40 @@ void ChartView::mouseReleaseEvent(QMouseEvent *event) { void ChartView::mouseMoveEvent(QMouseEvent *ev) { auto rubber = findChild(); bool is_zooming = rubber && rubber->isVisible(); - if (!is_zooming) { - const auto plot_area = chart()->plotArea(); - auto axis_x = dynamic_cast(chart()->axisX()); + const auto plot_area = chart()->plotArea(); + + if (!is_zooming && plot_area.contains(ev->pos())) { double x = std::clamp((double)ev->pos().x(), plot_area.left(), plot_area.right() - 1); double sec = axis_x->min() + (axis_x->max() - axis_x->min()) * (x - plot_area.left()) / plot_area.width(); - auto value = std::upper_bound(vals.begin(), vals.end(), sec, [](double x, auto &p) { return x < p.x(); }); - if (value != vals.end()) { - QPointF pos = chart()->mapToPosition((*value)); + QStringList text_list; + QPointF pos = plot_area.bottomRight(); + double tm = 0.0; + + for (auto &s : sigs) { + auto value = std::upper_bound(s.vals.begin(), s.vals.end(), sec, [](double x, auto &p) { return x < p.x(); }); + if (value != s.vals.end()) { + text_list.push_back(QString(" %1 : %2 ").arg(sigs.size() > 1 ? s.sig->name.c_str() : "Value").arg(value->y())); + tm = value->x(); + auto y_pos = chart()->mapToPosition(*value); + if (y_pos.y() < pos.y()) pos = y_pos; + } + } + + if (!text_list.isEmpty()) { + value_text->setHtml("
 Time: " + + QString::number(tm, 'f', 3) + " 
" + text_list.join("
") + "
"); track_line->setLine(pos.x(), plot_area.top(), pos.x(), plot_area.bottom()); - track_ellipse->setRect(pos.x() - 5, pos.y() - 5, 10, 10); - value_text->setHtml(tr("
%1, %2)
") - .arg(value->x(), 0, 'f', 3).arg(value->y())); int text_x = pos.x() + 8; - if ((text_x + value_text->boundingRect().width()) > plot_area.right()) { - text_x = pos.x() - value_text->boundingRect().width() - 8; + QRectF text_rect = value_text->boundingRect(); + if ((text_x + text_rect.width()) > plot_area.right()) { + text_x = pos.x() - text_rect.width() - 8; } - value_text->setPos(text_x, pos.y() - 10); + value_text->setPos(text_x, pos.y() - text_rect.height() / 2); + track_ellipse->setRect(pos.x() - 5, pos.y() - 5, 10, 10); } - item_group->setVisible(value != vals.end()); + item_group->setVisible(!text_list.isEmpty()); } else { + item_group->setVisible(false); setViewportUpdateMode(QGraphicsView::FullViewportUpdate); } QChartView::mouseMoveEvent(ev); diff --git a/tools/cabana/chartswidget.h b/tools/cabana/chartswidget.h index 20c673a757..e32072a831 100644 --- a/tools/cabana/chartswidget.h +++ b/tools/cabana/chartswidget.h @@ -8,6 +8,8 @@ #include #include #include +#include +#include #include "tools/cabana/canmessages.h" #include "tools/cabana/dbcmanager.h" @@ -18,35 +20,59 @@ class ChartView : public QChartView { Q_OBJECT public: - ChartView(const QString &id, const Signal *sig, QWidget *parent = nullptr); - void updateSeries(const std::pair range); - void setRange(double min, double max, bool force_update = false); + ChartView(QWidget *parent = nullptr); + ~ChartView(); + void addSeries(const QString &msg_id, const Signal *sig); + void removeSeries(const QString &msg_id, const Signal *sig); + bool hasSeries(const QString &msg_id, const Signal *sig) const; + void updateSeries(const Signal *sig = nullptr); + void setEventsRange(const std::pair &range); + void setDisplayRange(double min, double max); void updateLineMarker(double current_sec); - void updateFromSettings(); - void updateTitle(); - QString id; - const Signal *signal; + struct SigItem { + QString msg_id; + uint8_t source = 0; + uint32_t address = 0; + const Signal *sig = nullptr; + QLineSeries *series = nullptr; + double min_y = 0; + double max_y = 0; + QVector vals; + }; signals: + void seriesRemoved(const QString &id, const Signal *sig); void zoomIn(double min, double max); void zoomReset(); - void remove(const QString &msg_id, const Signal *sig); + void remove(); + +private slots: + void msgRemoved(uint32_t address); + void msgUpdated(uint32_t address); + void signalUpdated(const Signal *sig); + void signalRemoved(const Signal *sig); private: + QList::iterator removeSeries(const QList::iterator &it); void mouseReleaseEvent(QMouseEvent *event) override; void mouseMoveEvent(QMouseEvent *ev) override; void leaveEvent(QEvent *event) override; void resizeEvent(QResizeEvent *event) override; void adjustChartMargins(); void updateAxisY(); + void updateTitle(); + void updateFromSettings(); + QValueAxis *axis_x; + QValueAxis *axis_y; QGraphicsItemGroup *item_group; QGraphicsLineItem *line_marker, *track_line; QGraphicsEllipseItem *track_ellipse; QGraphicsTextItem *value_text; QGraphicsProxyWidget *close_btn_proxy; - QVector vals; + std::pair events_range = {0, 0}; + QList sigs; }; class ChartsWidget : public QWidget { @@ -54,9 +80,9 @@ class ChartsWidget : public QWidget { public: ChartsWidget(QWidget *parent = nullptr); - void showChart(const QString &id, const Signal *sig, bool show); + void showChart(const QString &id, const Signal *sig, bool show, bool merge); void removeChart(ChartView *chart); - bool isChartOpened(const QString &id, const Signal *sig); + inline bool isChartOpened(const QString &id, const Signal *sig) { return findChart(id, sig) != nullptr; } signals: void dock(bool floating); @@ -69,10 +95,10 @@ private: void updateState(); void zoomIn(double min, double max); void zoomReset(); - void signalUpdated(const Signal *sig); void updateToolBar(); - void removeAll(const Signal *sig = nullptr); + void removeAll(); bool eventFilter(QObject *obj, QEvent *event) override; + ChartView *findChart(const QString &id, const Signal *sig); QLabel *title_label; QLabel *range_label; diff --git a/tools/cabana/signaledit.cc b/tools/cabana/signaledit.cc index a0660901cf..93b7aa88f7 100644 --- a/tools/cabana/signaledit.cc +++ b/tools/cabana/signaledit.cc @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -122,7 +123,9 @@ SignalEdit::SignalEdit(int index, QWidget *parent) : form_idx(index), QWidget(pa save_timer->callOnTimeout(this, &SignalEdit::saveSignal); QObject::connect(title, &ElidedLabel::clicked, this, &SignalEdit::showFormClicked); - QObject::connect(plot_btn, &QToolButton::clicked, [this](bool checked) { emit showChart(msg_id, sig, checked); }); + QObject::connect(plot_btn, &QToolButton::clicked, [this](bool checked) { + emit showChart(msg_id, sig, checked, QGuiApplication::keyboardModifiers() & Qt::ShiftModifier); + }); QObject::connect(seek_btn, &QToolButton::clicked, [this]() { SignalFindDlg(msg_id, sig, this).exec(); }); QObject::connect(remove_btn, &QToolButton::clicked, [this]() { emit remove(sig); }); QObject::connect(form, &SignalForm::changed, [this]() { save_timer->start(); }); @@ -172,7 +175,7 @@ void SignalEdit::saveSignal() { } void SignalEdit::setChartOpened(bool opened) { - plot_btn->setToolTip(opened ? tr("Close Plot") : tr("Show Plot")); + plot_btn->setToolTip(opened ? tr("Close Plot") : tr("Show Plot\nSHIFT click to add to previous opened chart")); plot_btn->setChecked(opened); } diff --git a/tools/cabana/signaledit.h b/tools/cabana/signaledit.h index f889a9c096..f035797e72 100644 --- a/tools/cabana/signaledit.h +++ b/tools/cabana/signaledit.h @@ -42,7 +42,7 @@ public: signals: void highlight(const Signal *sig); - void showChart(const QString &name, const Signal *sig, bool show); + void showChart(const QString &name, const Signal *sig, bool show, bool merge); void remove(const Signal *sig); void save(const Signal *sig, const Signal &new_sig); void showFormClicked(); From 9c815c2081fb61dfe84a79b617f17280c0396773 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Sat, 19 Nov 2022 02:25:11 +0800 Subject: [PATCH 162/184] Cabana: draw line marker in drawForegound (#26542) draw line marker in drawForegound --- tools/cabana/chartswidget.cc | 25 ++++++++----------------- tools/cabana/chartswidget.h | 4 ++-- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/tools/cabana/chartswidget.cc b/tools/cabana/chartswidget.cc index 4bd398a93b..5a129b5f61 100644 --- a/tools/cabana/chartswidget.cc +++ b/tools/cabana/chartswidget.cc @@ -102,7 +102,7 @@ void ChartsWidget::updateState() { const auto &range = is_zoomed ? zoomed_range : display_range; for (auto c : charts) { c->setDisplayRange(range.first, range.second); - c->updateLineMarker(current_sec); + c->scene()->invalidate({}, QGraphicsScene::ForegroundLayer); } } @@ -178,9 +178,6 @@ ChartView::ChartView(QWidget *parent) : QChartView(nullptr, parent) { // top margin for title chart->setMargins({0, 11, 0, 0}); - line_marker = new QGraphicsLineItem(chart); - line_marker->setZValue(chart->zValue() + 10); - track_line = new QGraphicsLineItem(chart); track_line->setPen(QPen(Qt::darkGray, 1, Qt::DashLine)); track_ellipse = new QGraphicsEllipseItem(chart); @@ -304,7 +301,6 @@ void ChartView::updateFromSettings() { setFixedHeight(settings.chart_height); chart()->setTheme(settings.chart_theme == 0 ? QChart::ChartThemeLight : QChart::QChart::ChartThemeDark); auto color = chart()->titleBrush().color(); - line_marker->setPen(QPen(color, 2)); } void ChartView::setEventsRange(const std::pair &range) { @@ -327,15 +323,6 @@ void ChartView::adjustChartMargins() { if (chart()->plotArea().left() != aligned_pos) { const float left_margin = chart()->margins().left() + aligned_pos - chart()->plotArea().left(); chart()->setMargins(QMargins(left_margin, 11, 0, 0)); - updateLineMarker(can->currentSec()); - } -} - -void ChartView::updateLineMarker(double current_sec) { - int x = chart()->plotArea().left() + - chart()->plotArea().width() * (current_sec - axis_x->min()) / (axis_x->max() - axis_x->min()); - if (int(line_marker->line().x1()) != x) { - line_marker->setLine(x, chart()->plotArea().top() - chart()->margins().top() + 3, x, height()); } } @@ -429,7 +416,6 @@ void ChartView::mouseReleaseEvent(QMouseEvent *event) { // zoom in if selected range is greater than 0.5s emit zoomIn(min, max); } - viewport()->update(); event->accept(); } else if (event->button() == Qt::RightButton) { emit zoomReset(); @@ -437,7 +423,6 @@ void ChartView::mouseReleaseEvent(QMouseEvent *event) { } else { QGraphicsView::mouseReleaseEvent(event); } - setViewportUpdateMode(QGraphicsView::MinimalViewportUpdate); } void ChartView::mouseMoveEvent(QMouseEvent *ev) { @@ -477,7 +462,13 @@ void ChartView::mouseMoveEvent(QMouseEvent *ev) { item_group->setVisible(!text_list.isEmpty()); } else { item_group->setVisible(false); - setViewportUpdateMode(QGraphicsView::FullViewportUpdate); } QChartView::mouseMoveEvent(ev); } + +void ChartView::drawForeground(QPainter *painter, const QRectF &rect) { + qreal x = chart()->plotArea().left() + + chart()->plotArea().width() * (can->currentSec() - axis_x->min()) / (axis_x->max() - axis_x->min()); + painter->setPen(QPen(chart()->titleBrush().color(), 2)); + painter->drawLine(QPointF{x, chart()->plotArea().top() - 2}, QPointF{x, chart()->plotArea().bottom() + 2}); +} diff --git a/tools/cabana/chartswidget.h b/tools/cabana/chartswidget.h index e32072a831..8f0af95b1a 100644 --- a/tools/cabana/chartswidget.h +++ b/tools/cabana/chartswidget.h @@ -28,7 +28,6 @@ public: void updateSeries(const Signal *sig = nullptr); void setEventsRange(const std::pair &range); void setDisplayRange(double min, double max); - void updateLineMarker(double current_sec); struct SigItem { QString msg_id; @@ -63,11 +62,12 @@ private: void updateAxisY(); void updateTitle(); void updateFromSettings(); + void drawForeground(QPainter *painter, const QRectF &rect) override; QValueAxis *axis_x; QValueAxis *axis_y; QGraphicsItemGroup *item_group; - QGraphicsLineItem *line_marker, *track_line; + QGraphicsLineItem *track_line; QGraphicsEllipseItem *track_ellipse; QGraphicsTextItem *value_text; QGraphicsProxyWidget *close_btn_proxy; From 34c80a6fbdf8780ad0b75f497c226cf1d9de0ddb Mon Sep 17 00:00:00 2001 From: YassineYousfi Date: Fri, 18 Nov 2022 17:50:24 -0800 Subject: [PATCH 163/184] Albert Einstein Model (#26456) * d0bc247d-9529-4e50-a5dd-95a8a5733874/440 38fb1ce9-18d7-4292-9ffd-678f8483ebf4/700 * update model replay ref commit --- selfdrive/modeld/models/supercombo.onnx | 2 +- selfdrive/test/process_replay/model_replay_ref_commit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/selfdrive/modeld/models/supercombo.onnx b/selfdrive/modeld/models/supercombo.onnx index 8805b3dce8..c0db988cf6 100644 --- a/selfdrive/modeld/models/supercombo.onnx +++ b/selfdrive/modeld/models/supercombo.onnx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db746e3753de84367595fedd089c2bd41b06bd401ea28e085663533d0e63d74b +oid sha256:c73998c9f428380dd2282b451de6011469b717498ae83578cbf7aa95948910f7 size 45962473 diff --git a/selfdrive/test/process_replay/model_replay_ref_commit b/selfdrive/test/process_replay/model_replay_ref_commit index f541b6a6d5..cdd6ed7a6b 100644 --- a/selfdrive/test/process_replay/model_replay_ref_commit +++ b/selfdrive/test/process_replay/model_replay_ref_commit @@ -1 +1 @@ -30efb4238327d723e17a3bda7e7c19c18f8a3b18 +ca02aa240e629920ad88a6510213cb0a153af92b From 0b79ba8acb99f6c1dc3957a985229e3d5a15892b Mon Sep 17 00:00:00 2001 From: AlexandreSato <66435071+AlexandreSato@users.noreply.github.com> Date: Sat, 19 Nov 2022 19:20:41 -0300 Subject: [PATCH 164/184] Multilang: Update pt-BR translations (#26549) * update pt-BR translations * fix some cutoff texts * update pt-BR translation --- selfdrive/ui/translations/main_pt-BR.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/selfdrive/ui/translations/main_pt-BR.ts b/selfdrive/ui/translations/main_pt-BR.ts index 4a698947f1..105d6f77f0 100644 --- a/selfdrive/ui/translations/main_pt-BR.ts +++ b/selfdrive/ui/translations/main_pt-BR.ts @@ -285,11 +285,11 @@ ExperimentalModeButton EXPERIMENTAL MODE ON - + MODO EXPERIMENTAL ATIVADO CHILL MODE ON - + MODO CHILL ATIVADO @@ -1019,15 +1019,15 @@ trabalho definido On this car, openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control. Enable this to switch to openpilot longitudinal control. Enabling Experimental mode is recommended when using experimental openpilot longitudinal control. - + Neste carro o penpilot por padrão utiliza o ACC nativo do veículo ao invés de controlar longitudinalmente. Ative isto para mudar para o controle longitudinal do openpilot. Ativar o Modo Experimental é recomendado quando em uso do controle longitudinal experimental do openpilot. Experimental mode is currently unavailable on this car, since the car's stock ACC is used for longitudinal control. - + O Modo Experimental está atualmente indisponível para este carro, já que o ACC original do carro é usado para controle longitudinal. Enable experimental longitudinal control to allow experimental mode. - + Ative o controle longitudinal experimental para permitir o modo experimental. openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: @@ -1039,15 +1039,15 @@ trabalho definido Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. - + Deixe o modelo de IA controlar o acelerador e os freios. O openpilot irá dirigir como pensa que um humano faria, incluindo parar em sinais vermelhos e sinais de parada. Uma vez que o modelo de condução decide a velocidade a conduzir, a velocidade definida apenas funcionará como um limite superior. Este é um recurso de qualidade alfa; erros devem ser esperados. New Driving Visualization - + Nova Visualização de Condução The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. - + A visualização da direção fará a transição para a câmera grande angular voltada para a estrada em baixas velocidades para mostrar melhor algumas curvas. O logotipo do modo Experimental também será exibido no canto superior direito. From c3822bdddadab3c24e9275ea5037cff96456f2fb Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sat, 19 Nov 2022 14:43:20 -0800 Subject: [PATCH 165/184] bump to 0.9.1 --- RELEASES.md | 5 +++++ common/version.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/RELEASES.md b/RELEASES.md index e15286c5f0..97c92dfa47 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,3 +1,8 @@ +Version 0.9.1 (2022-12-XX) +======================== +* New driving model + + Version 0.9.0 (2022-11-21) ======================== * New driving model diff --git a/common/version.h b/common/version.h index 74a56a7c1b..7b5764785a 100644 --- a/common/version.h +++ b/common/version.h @@ -1 +1 @@ -#define COMMA_VERSION "0.9.0" +#define COMMA_VERSION "0.9.1" From 649663e06d43a6d1b05fe83120391f3bd2401b8f Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sat, 19 Nov 2022 14:45:34 -0800 Subject: [PATCH 166/184] body: add can fingerprint (#26548) --- selfdrive/car/body/values.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/selfdrive/car/body/values.py b/selfdrive/car/body/values.py index 66f1b947a8..418835a3e9 100644 --- a/selfdrive/car/body/values.py +++ b/selfdrive/car/body/values.py @@ -26,6 +26,12 @@ CAR_INFO: Dict[str, CarInfo] = { CAR.BODY: CarInfo("comma body", package="All"), } +FINGERPRINTS = { + CAR.BODY: [{ + 513: 8, 516: 8, 514: 3, 515: 4, + }], +} + FW_QUERY_CONFIG = FwQueryConfig( requests=[ Request( From 5b8aed2ebf80ba0875ed21b8130a6ab7451e5740 Mon Sep 17 00:00:00 2001 From: Igor Biletskyy Date: Sun, 20 Nov 2022 11:44:04 -0800 Subject: [PATCH 167/184] body: fix UDS reqests (#26552) * bump body * add new fw version --- body | 2 +- selfdrive/car/body/values.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/body b/body index 04aeb30ce0..dc780f858c 160000 --- a/body +++ b/body @@ -1 +1 @@ -Subproject commit 04aeb30ce0bb14759989cd374158233877e1e151 +Subproject commit dc780f858c1ef641471d09b72569e199e3e10acb diff --git a/selfdrive/car/body/values.py b/selfdrive/car/body/values.py index 418835a3e9..548039bc70 100644 --- a/selfdrive/car/body/values.py +++ b/selfdrive/car/body/values.py @@ -46,10 +46,13 @@ FW_VERSIONS = { CAR.BODY: { (Ecu.engine, 0x720, None): [ b'0.0.01', - b'02/27/2022' + b'02/27/2022', + b'0.3.00a', ], + # git hash of the firmware used (Ecu.debug, 0x721, None): [ - b'166bd860' # git hash of the firmware used + b'166bd860', + b'dc780f85', ], }, } From 17b1839e0a358302e049f37f5c843532fb9c7f26 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Mon, 21 Nov 2022 05:23:59 +0800 Subject: [PATCH 168/184] Cabana: faster align charts, visual glitches removed. (#26543) * faster adjust chart margins * delay adjust * update foreground after set margins * set display range on create * fix init display_range * common function updateDisplayRange * set min max to 0 if no values * fix axis y * use mapToValue * cleanup * get minmax from series * cleanup * cleanup eventsMerged * cleanup include --- tools/cabana/chartswidget.cc | 119 ++++++++++++++++------------------- tools/cabana/chartswidget.h | 2 +- 2 files changed, 54 insertions(+), 67 deletions(-) diff --git a/tools/cabana/chartswidget.cc b/tools/cabana/chartswidget.cc index 5a129b5f61..bc1f1e2a38 100644 --- a/tools/cabana/chartswidget.cc +++ b/tools/cabana/chartswidget.cc @@ -54,13 +54,25 @@ ChartsWidget::ChartsWidget(QWidget *parent) : QWidget(parent) { void ChartsWidget::eventsMerged() { if (auto events = can->events(); events && !events->empty()) { - auto it = std::find_if(events->begin(), events->end(), [=](const Event *e) { return e->which == cereal::Event::Which::CAN; }); - event_range.first = it == events->end() ? 0 : (*it)->mono_time / (double)1e9 - can->routeStartTime(); - event_range.second = it == events->end() ? 0 : events->back()->mono_time / (double)1e9 - can->routeStartTime(); - if (display_range.first == 0 && event_range.second == 0) { - display_range.first = event_range.first; - display_range.second = std::min(event_range.first + settings.max_chart_x_range, event_range.second); - } + event_range.first = (events->front()->mono_time / (double)1e9) - can->routeStartTime(); + event_range.second = (events->back()->mono_time / (double)1e9) - can->routeStartTime(); + updateDisplayRange(); + } +} + +void ChartsWidget::updateDisplayRange() { + auto prev_range = display_range; + double current_sec = can->currentSec(); + if (current_sec < display_range.first || current_sec >= (display_range.second - 5)) { + // reached the end, or seeked to a timestamp out of range. + display_range.first = current_sec - 5; + } + display_range.first = std::max(display_range.first, event_range.first); + display_range.second = std::min(display_range.first + settings.max_chart_x_range, event_range.second); + if (prev_range != display_range) { + QFutureSynchronizer future_synchronizer; + for (auto c : charts) + future_synchronizer.addFuture(QtConcurrent::run(c, &ChartView::setEventsRange, display_range)); } } @@ -79,24 +91,10 @@ void ChartsWidget::zoomReset() { void ChartsWidget::updateState() { if (charts.isEmpty()) return; - const double current_sec = can->currentSec(); - if (is_zoomed) { - if (current_sec < zoomed_range.first || current_sec >= zoomed_range.second) { - can->seekTo(zoomed_range.first); - } - } else { - auto prev_range = display_range; - if (current_sec < display_range.first || current_sec >= (display_range.second - 5)) { - // line marker reached the end, or seeked to a timestamp out of range. - display_range.first = current_sec - 5; - } - display_range.first = std::max(display_range.first, event_range.first); - display_range.second = std::min(display_range.first + settings.max_chart_x_range, event_range.second); - if (prev_range != display_range) { - QFutureSynchronizer future_synchronizer; - for (auto c : charts) - future_synchronizer.addFuture(QtConcurrent::run(c, &ChartView::setEventsRange, display_range)); - } + if (!is_zoomed) { + updateDisplayRange(); + } else if (can->currentSec() < zoomed_range.first || can->currentSec() >= zoomed_range.second) { + can->seekTo(zoomed_range.first); } const auto &range = is_zoomed ? zoomed_range : display_range; @@ -122,15 +120,14 @@ ChartView *ChartsWidget::findChart(const QString &id, const Signal *sig) { } void ChartsWidget::showChart(const QString &id, const Signal *sig, bool show, bool merge) { - if (!show) { - if (ChartView *chart = findChart(id, sig)) { - chart->removeSeries(id, sig); - } - } else { + setUpdatesEnabled(false); + if (show) { ChartView *chart = merge && charts.size() > 0 ? charts.back() : nullptr; if (!chart) { chart = new ChartView(this); chart->setEventsRange(display_range); + auto range = is_zoomed ? zoomed_range : display_range; + chart->setDisplayRange(range.first, range.second); QObject::connect(chart, &ChartView::remove, [=]() { removeChart(chart); }); QObject::connect(chart, &ChartView::zoomIn, this, &ChartsWidget::zoomIn); QObject::connect(chart, &ChartView::zoomReset, this, &ChartsWidget::zoomReset); @@ -140,9 +137,11 @@ void ChartsWidget::showChart(const QString &id, const Signal *sig, bool show, bo } chart->addSeries(id, sig); emit chartOpened(id, sig); - updateState(); + } else if (ChartView *chart = findChart(id, sig)) { + chart->removeSeries(id, sig); } updateToolBar(); + setUpdatesEnabled(true); } void ChartsWidget::removeChart(ChartView *chart) { @@ -175,8 +174,7 @@ ChartView::ChartView(QWidget *parent) : QChartView(nullptr, parent) { chart->addAxis(axis_y, Qt::AlignLeft); chart->legend()->setShowToolTips(true); chart->layout()->setContentsMargins(0, 0, 0, 0); - // top margin for title - chart->setMargins({0, 11, 0, 0}); + chart->setMargins(QMargins(20, 11, 11, 11)); track_line = new QGraphicsLineItem(chart); track_line->setPen(QPen(Qt::darkGray, 1, Qt::DashLine)); @@ -200,21 +198,12 @@ ChartView::ChartView(QWidget *parent) : QChartView(nullptr, parent) { setRubberBand(QChartView::HorizontalRubberBand); updateFromSettings(); - QTimer *timer = new QTimer(this); - timer->setInterval(100); - timer->setSingleShot(true); - timer->callOnTimeout(this, &ChartView::adjustChartMargins); - QObject::connect(dbc(), &DBCManager::signalRemoved, this, &ChartView::signalRemoved); QObject::connect(dbc(), &DBCManager::signalUpdated, this, &ChartView::signalUpdated); QObject::connect(dbc(), &DBCManager::msgRemoved, this, &ChartView::msgRemoved); QObject::connect(dbc(), &DBCManager::msgUpdated, this, &ChartView::msgUpdated); QObject::connect(&settings, &Settings::changed, this, &ChartView::updateFromSettings); QObject::connect(remove_btn, &QToolButton::clicked, this, &ChartView::remove); - QObject::connect(chart, &QChart::plotAreaChanged, [=](const QRectF &plotArea) { - // use a singleshot timer to avoid recursion call. - timer->start(); - }); } ChartView::~ChartView() { @@ -300,7 +289,6 @@ void ChartView::updateTitle() { void ChartView::updateFromSettings() { setFixedHeight(settings.chart_height); chart()->setTheme(settings.chart_theme == 0 ? QChart::ChartThemeLight : QChart::QChart::ChartThemeDark); - auto color = chart()->titleBrush().color(); } void ChartView::setEventsRange(const std::pair &range) { @@ -320,18 +308,19 @@ void ChartView::setDisplayRange(double min, double max) { void ChartView::adjustChartMargins() { // TODO: Remove hardcoded aligned_pos const int aligned_pos = 60; - if (chart()->plotArea().left() != aligned_pos) { + if ((int)chart()->plotArea().left() != aligned_pos) { const float left_margin = chart()->margins().left() + aligned_pos - chart()->plotArea().left(); - chart()->setMargins(QMargins(left_margin, 11, 0, 0)); + chart()->setMargins(QMargins(left_margin, 11, 11, 11)); + scene()->invalidate({}, QGraphicsScene::ForegroundLayer); } } void ChartView::updateSeries(const Signal *sig) { auto events = can->events(); - if (!events) return; + if (!events || sigs.isEmpty()) return; - for (int i = 0; i < sigs.size(); ++i) { - if (auto &s = sigs[i]; !sig || s.sig == sig) { + for (auto &s : sigs) { + if (!sig || s.sig == sig) { s.vals.clear(); s.vals.reserve((events_range.second - events_range.first) * 1000); // [n]seconds * 1000hz s.min_y = std::numeric_limits::max(); @@ -357,9 +346,7 @@ void ChartView::updateSeries(const Signal *sig) { } } } - - QLineSeries *series = (QLineSeries *)chart()->series()[i]; - series->replace(s.vals); + s.series->replace(s.vals); } } updateAxisY(); @@ -367,6 +354,8 @@ void ChartView::updateSeries(const Signal *sig) { // auto zoom on yaxis void ChartView::updateAxisY() { + if (sigs.isEmpty()) return; + double min_y = std::numeric_limits::max(); double max_y = std::numeric_limits::lowest(); if (events_range == std::pair{axis_x->min(), axis_x->max()}) { @@ -376,17 +365,16 @@ void ChartView::updateAxisY() { } } else { for (auto &s : sigs) { - auto begin = std::lower_bound(s.vals.begin(), s.vals.end(), axis_x->min(), [](auto &p, double x) { return p.x() < x; }); - if (begin == s.vals.end()) - return; - - auto end = std::upper_bound(s.vals.begin(), s.vals.end(), axis_x->max(), [](double x, auto &p) { return x < p.x(); }); - const auto [min, max] = std::minmax_element(begin, end, [](auto &p1, auto &p2) { return p1.y() < p2.y(); }); - if (min->y() < min_y) min_y = min->y(); - if (max->y() > max_y) max_y = max->y(); + for (int i = 0; i < s.series->count(); ++i) { + double y = s.series->at(i).y(); + if (y < min_y) min_y = y; + if (y > max_y) max_y = y; + } } } + if (min_y == std::numeric_limits::max()) min_y = 0; + if (max_y == std::numeric_limits::lowest()) max_y = 0; if (max_y == min_y) { axis_y->setRange(min_y - 1, max_y + 1); } else { @@ -394,6 +382,8 @@ void ChartView::updateAxisY() { axis_y->setRange(min_y - range * 0.05, max_y + range * 0.05); axis_y->applyNiceNumbers(); } + + QTimer::singleShot(0, this, &ChartView::adjustChartMargins); } void ChartView::leaveEvent(QEvent *event) { @@ -406,9 +396,8 @@ void ChartView::mouseReleaseEvent(QMouseEvent *event) { if (event->button() == Qt::LeftButton && rubber && rubber->isVisible()) { rubber->hide(); QRectF rect = rubber->geometry().normalized(); - rect.translate(-chart()->plotArea().topLeft()); - double min = axis_x->min() + (rect.left() / chart()->plotArea().width()) * (axis_x->max() - axis_x->min()); - double max = axis_x->min() + (rect.right() / chart()->plotArea().width()) * (axis_x->max() - axis_x->min()); + double min = chart()->mapToValue(rect.topLeft()).x(); + double max = chart()->mapToValue(rect.bottomRight()).x(); if (rubber->width() <= 0) { // no rubber dragged, seek to mouse position can->seekTo(min); @@ -431,8 +420,7 @@ void ChartView::mouseMoveEvent(QMouseEvent *ev) { const auto plot_area = chart()->plotArea(); if (!is_zooming && plot_area.contains(ev->pos())) { - double x = std::clamp((double)ev->pos().x(), plot_area.left(), plot_area.right() - 1); - double sec = axis_x->min() + (axis_x->max() - axis_x->min()) * (x - plot_area.left()) / plot_area.width(); + double sec = chart()->mapToValue(ev->pos()).x(); QStringList text_list; QPointF pos = plot_area.bottomRight(); double tm = 0.0; @@ -467,8 +455,7 @@ void ChartView::mouseMoveEvent(QMouseEvent *ev) { } void ChartView::drawForeground(QPainter *painter, const QRectF &rect) { - qreal x = chart()->plotArea().left() + - chart()->plotArea().width() * (can->currentSec() - axis_x->min()) / (axis_x->max() - axis_x->min()); + qreal x = chart()->mapToPosition(QPointF{can->currentSec(), 0}).x(); painter->setPen(QPen(chart()->titleBrush().color(), 2)); painter->drawLine(QPointF{x, chart()->plotArea().top() - 2}, QPointF{x, chart()->plotArea().bottom() + 2}); } diff --git a/tools/cabana/chartswidget.h b/tools/cabana/chartswidget.h index 8f0af95b1a..c8e5a1040c 100644 --- a/tools/cabana/chartswidget.h +++ b/tools/cabana/chartswidget.h @@ -5,7 +5,6 @@ #include #include #include -#include #include #include #include @@ -93,6 +92,7 @@ signals: private: void eventsMerged(); void updateState(); + void updateDisplayRange(); void zoomIn(double min, double max); void zoomReset(); void updateToolBar(); From de443d30b37aa5d8b15c94749399d836155bcf60 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Tue, 22 Nov 2022 02:47:36 +0800 Subject: [PATCH 169/184] Cabana: 'edit-find' icon is not avaible on some platforms (#26561) Fixed edit-find icon is not avaible on some platforms --- tools/cabana/signaledit.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cabana/signaledit.cc b/tools/cabana/signaledit.cc index 93b7aa88f7..5d627a49da 100644 --- a/tools/cabana/signaledit.cc +++ b/tools/cabana/signaledit.cc @@ -95,7 +95,7 @@ SignalEdit::SignalEdit(int index, QWidget *parent) : form_idx(index), QWidget(pa plot_btn->setAutoRaise(true); title_layout->addWidget(plot_btn); auto seek_btn = new QToolButton(this); - seek_btn->setIcon(QIcon::fromTheme("edit-find")); + seek_btn->setText("🔍"); seek_btn->setAutoRaise(true); seek_btn->setToolTip(tr("Find signal values")); title_layout->addWidget(seek_btn); From 89eeb72dbdb82258fdd26d7260f0c6455a371bf1 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Tue, 22 Nov 2022 02:47:47 +0800 Subject: [PATCH 170/184] Cabana: update chart and video position (after a click) in pause mode (#26560) update chart and video position (after a click) in pause mode --- tools/cabana/canmessages.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/cabana/canmessages.cc b/tools/cabana/canmessages.cc index 3bcaae4bbd..a8e881c5fe 100644 --- a/tools/cabana/canmessages.cc +++ b/tools/cabana/canmessages.cc @@ -124,6 +124,7 @@ const std::deque CANMessages::messages(const QString &id) { void CANMessages::seekTo(double ts) { replay->seekTo(std::max(double(0), ts), false); counters_begin_sec = 0; + emit updated(); } void CANMessages::settingChanged() { From 2b4b0cc67f59c896caf32fd937ad6ebf0f7ae640 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Tue, 22 Nov 2022 02:47:58 +0800 Subject: [PATCH 171/184] Replay: fixed the freq of video and events are unstable after changing the replay speed (#26559) fix freq is unstable after changing the replay speed --- tools/replay/replay.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/replay/replay.cc b/tools/replay/replay.cc index 1337a4ef2c..1464a6cf57 100644 --- a/tools/replay/replay.cc +++ b/tools/replay/replay.cc @@ -358,6 +358,7 @@ void Replay::publishFrame(const Event *e) { void Replay::stream() { cereal::Event::Which cur_which = cereal::Event::Which::INIT_DATA; + double prev_replay_speed = 1.0; std::unique_lock lk(stream_lock_); while (true) { @@ -397,10 +398,11 @@ void Replay::stream() { long rtime = nanos_since_boot() - loop_start_ts; long behind_ns = etime - rtime; // if behind_ns is greater than 1 second, it means that an invalid segemnt is skipped by seeking/replaying - if (behind_ns >= 1 * 1e9) { - // reset start times + if (behind_ns >= 1 * 1e9 || speed_ != prev_replay_speed) { + // reset event start times evt_start_ts = cur_mono_time_; loop_start_ts = nanos_since_boot(); + prev_replay_speed = speed_; } else if (behind_ns > 0 && !hasFlag(REPLAY_FLAG_FULL_SPEED)) { precise_nano_sleep(behind_ns); } From 7b46928fc9cda9e5200d72c15253f60981eedc74 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Tue, 22 Nov 2022 02:48:08 +0800 Subject: [PATCH 172/184] Cabana: fix auto zoom y-axis for multiple line series (#26558) auto zoom y-axis for multiple series --- tools/cabana/chartswidget.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/cabana/chartswidget.cc b/tools/cabana/chartswidget.cc index bc1f1e2a38..3029d9db89 100644 --- a/tools/cabana/chartswidget.cc +++ b/tools/cabana/chartswidget.cc @@ -365,10 +365,10 @@ void ChartView::updateAxisY() { } } else { for (auto &s : sigs) { - for (int i = 0; i < s.series->count(); ++i) { - double y = s.series->at(i).y(); - if (y < min_y) min_y = y; - if (y > max_y) max_y = y; + auto begin = std::lower_bound(s.vals.begin(), s.vals.end(), axis_x->min(), [](auto &p, double x) { return p.x() < x; }); + for (auto it = begin; it != s.vals.end() && it->x() <= axis_x->max(); ++it) { + if (it->y() < min_y) min_y = it->y(); + if (it->y() > max_y) max_y = it->y(); } } } From efbfbc062280063b1cde744a97ecde5abb711784 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Tue, 22 Nov 2022 02:48:19 +0800 Subject: [PATCH 173/184] Cabana: display dashes if no value available (#26557) show dot if no value --- tools/cabana/chartswidget.cc | 45 ++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/tools/cabana/chartswidget.cc b/tools/cabana/chartswidget.cc index 3029d9db89..5d530a8c8a 100644 --- a/tools/cabana/chartswidget.cc +++ b/tools/cabana/chartswidget.cc @@ -420,34 +420,35 @@ void ChartView::mouseMoveEvent(QMouseEvent *ev) { const auto plot_area = chart()->plotArea(); if (!is_zooming && plot_area.contains(ev->pos())) { - double sec = chart()->mapToValue(ev->pos()).x(); QStringList text_list; - QPointF pos = plot_area.bottomRight(); - double tm = 0.0; - + QPointF pos = {}; + const double sec = chart()->mapToValue(ev->pos()).x(); for (auto &s : sigs) { - auto value = std::upper_bound(s.vals.begin(), s.vals.end(), sec, [](double x, auto &p) { return x < p.x(); }); - if (value != s.vals.end()) { - text_list.push_back(QString(" %1 : %2 ").arg(sigs.size() > 1 ? s.sig->name.c_str() : "Value").arg(value->y())); - tm = value->x(); - auto y_pos = chart()->mapToPosition(*value); - if (y_pos.y() < pos.y()) pos = y_pos; + QString value = "--"; + // use reverse iterator to find last item <= sec. + auto it = std::lower_bound(s.vals.rbegin(), s.vals.rend(), sec, [](auto &p, double x) { return p.x() > x; }); + if (it != s.vals.rend() && it->x() >= axis_x->min()) { + value = QString::number(it->y()); + auto value_pos = chart()->mapToPosition(*it); + if (value_pos.x() > pos.x()) pos = value_pos; } + text_list.push_back(QString(" %1 : %2 ").arg(sigs.size() > 1 ? s.sig->name.c_str() : "Value").arg(value)); } + if (pos.x() == 0) pos = ev->pos(); - if (!text_list.isEmpty()) { - value_text->setHtml("
 Time: " + - QString::number(tm, 'f', 3) + " 
" + text_list.join("
") + "
"); - track_line->setLine(pos.x(), plot_area.top(), pos.x(), plot_area.bottom()); - int text_x = pos.x() + 8; - QRectF text_rect = value_text->boundingRect(); - if ((text_x + text_rect.width()) > plot_area.right()) { - text_x = pos.x() - text_rect.width() - 8; - } - value_text->setPos(text_x, pos.y() - text_rect.height() / 2); - track_ellipse->setRect(pos.x() - 5, pos.y() - 5, 10, 10); + QString time = QString::number(chart()->mapToValue(pos).x(), 'f', 3); + value_text->setHtml(QString("
 Time: %1  
%2
") + .arg(time).arg(text_list.join("
"))); + + QRectF text_rect = value_text->boundingRect(); + int text_x = pos.x() + 8; + if ((text_x + text_rect.width()) > plot_area.right()) { + text_x = pos.x() - text_rect.width() - 8; } - item_group->setVisible(!text_list.isEmpty()); + value_text->setPos(text_x, pos.y() - text_rect.height() / 2); + track_line->setLine(pos.x(), plot_area.top(), pos.x(), plot_area.bottom()); + track_ellipse->setRect(pos.x() - 5, pos.y() - 5, 10, 10); + item_group->setVisible(true); } else { item_group->setVisible(false); } From 96c9b8c50e0413ba92e7729e1820884d88598989 Mon Sep 17 00:00:00 2001 From: protonchang <2095341+protonchang@users.noreply.github.com> Date: Tue, 22 Nov 2022 02:48:30 +0800 Subject: [PATCH 174/184] Update CHT translations (#26537) * Add missing translations * Fix some CHS -> CHT wording --- selfdrive/ui/translations/main_zh-CHT.ts | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/selfdrive/ui/translations/main_zh-CHT.ts b/selfdrive/ui/translations/main_zh-CHT.ts index 46fb5578a3..0379e926c4 100644 --- a/selfdrive/ui/translations/main_zh-CHT.ts +++ b/selfdrive/ui/translations/main_zh-CHT.ts @@ -113,7 +113,7 @@ Decline, uninstall %1 - 拒絕並卸載 %1 + 拒絕並解除安裝 %1 @@ -132,7 +132,7 @@ Driver Camera - 駕駛員攝像頭 + 駕駛員監控鏡頭 PREVIEW @@ -285,11 +285,11 @@ ExperimentalModeButton EXPERIMENTAL MODE ON - + 實驗模式 ON CHILL MODE ON - + 輕鬆模式 ON @@ -859,15 +859,15 @@ location set UNINSTALL - 卸載 + 解除安裝 Uninstall %1 - 卸載 %1 + 解除安裝 %1 Are you sure you want to uninstall? - 您確定您要卸載嗎？ + 您確定您要解除安裝嗎？ CHECK @@ -875,7 +875,7 @@ location set Uninstall - 卸載 + 解除安裝 @@ -1015,19 +1015,19 @@ location set On this car, openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control. Enable this to switch to openpilot longitudinal control. Enabling Experimental mode is recommended when using experimental openpilot longitudinal control. - + 在本車輛中，openpilot預設將使用原車內建的ACC系統，而非openpilot縱向控制。開啟此開關來啟用openpilot縱向控制，使用此選項時建議一併啟用實驗模式。 Experimental mode is currently unavailable on this car, since the car's stock ACC is used for longitudinal control. - + 因車輛使用內建ACC系統，無法在本車輛上啟動實驗模式。 Enable experimental longitudinal control to allow experimental mode. - + 啟用實驗性縱向控制以使用實驗模式。 openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: - openpilot 默認以 <b>輕鬆模式</b> 駕駛。 實驗模式啟用了尚未準備好進入輕鬆模式的 <b>alpha 級功能</b>。實驗功能如下： + openpilot 預設以 <b>輕鬆模式</b> 駕駛。 實驗模式啟用了尚未準備好進入輕鬆模式的 <b>alpha 級功能</b>。實驗功能如下： 🌮 End-to-End Longitudinal Control 🌮 @@ -1035,15 +1035,15 @@ location set Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. - + 讓駕駛模型來控制油門及煞車。openpilot將會模擬人類的駕駛行為，包含在看見紅燈及停止標示時停車。由於車速將由駕駛模型決定，因此您設定的時速將成為速度上限。本功能仍在早期實驗階段，請預期模型有犯錯的可能性。 New Driving Visualization - + 新的駕駛視覺介面 The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. - + 低速行駛時，將會切換成路側廣角鏡頭，以完整顯示轉彎路徑，右上角將出現實驗模式圖案。 From 5b8f0db3e5dea3b7fcc90250ee7aefb8fa00555b Mon Sep 17 00:00:00 2001 From: ambientocclusion <1399123+ambientocclusion@users.noreply.github.com> Date: Mon, 21 Nov 2022 15:23:02 -0800 Subject: [PATCH 175/184] Multilang: add missing Japanese translations (#26556) * Add missing Japanese translations * Update some words --- selfdrive/ui/translations/main_ja.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/selfdrive/ui/translations/main_ja.ts b/selfdrive/ui/translations/main_ja.ts index ebf40cc5c5..8226dd59f9 100644 --- a/selfdrive/ui/translations/main_ja.ts +++ b/selfdrive/ui/translations/main_ja.ts @@ -285,11 +285,11 @@ ExperimentalModeButton EXPERIMENTAL MODE ON - + 実験モード CHILL MODE ON - + チルモード @@ -1015,15 +1015,15 @@ location set On this car, openpilot defaults to the car's built-in ACC instead of openpilot's longitudinal control. Enable this to switch to openpilot longitudinal control. Enabling Experimental mode is recommended when using experimental openpilot longitudinal control. - + openpilotはこの車の場合、車に内蔵されているACCを標準で利用します。この機能を有効にすることで実験段階のopenpilotによるアクセル制御を利用できます。実験モードと合わせて利用することをお勧めします。 Experimental mode is currently unavailable on this car, since the car's stock ACC is used for longitudinal control. - + この車のACCがアクセル制御を行うため、実験モードを利用することができません。 Enable experimental longitudinal control to allow experimental mode. - + 実験段階のopenpilotによるアクセル制御を有効にしてください。 openpilot defaults to driving in <b>chill mode</b>. Experimental mode enables <b>alpha-level features</b> that aren't ready for chill mode. Experimental features are listed below: @@ -1035,15 +1035,15 @@ location set Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would, including stopping for red lights and stop signs. Since the driving model decides the speed to drive, the set speed will only act as an upper bound. This is an alpha quality feature; mistakes should be expected. - + openpilotにアクセルとブレーキを任せます。openpilotは赤信号や一時停止サインでの停止を含み、人間と同じように考えて運転を行います。openpilotが運転速度を決定するため、あなたが設定する速度は上限速度になります。この機能は実験段階のため、openpilotの運転ミスに常に備えて注意してください。 New Driving Visualization - + 新しい運転画面 The driving visualization will transition to the road-facing wide-angle camera at low speeds to better show some turns. The Experimental mode logo will also be shown in the top right corner. - + 新しい運転画面では、低速時に広角カメラの映像を表示することで、曲がる際の道路の視覚を向上します。実験段階を表すマークが右上に表示されます。 From ded66e6307825d9327c12145e1bc6acd2e835346 Mon Sep 17 00:00:00 2001 From: YassineYousfi Date: Mon, 21 Nov 2022 15:25:23 -0800 Subject: [PATCH 176/184] long_mpc: fix e2e source condition (#26546) * fix long_mpc source param * rm print * add back space for formatting --- selfdrive/controls/lib/longitudinal_mpc_lib/long_mpc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfdrive/controls/lib/longitudinal_mpc_lib/long_mpc.py b/selfdrive/controls/lib/longitudinal_mpc_lib/long_mpc.py index 6b79813117..79a9ec4f0c 100644 --- a/selfdrive/controls/lib/longitudinal_mpc_lib/long_mpc.py +++ b/selfdrive/controls/lib/longitudinal_mpc_lib/long_mpc.py @@ -352,7 +352,7 @@ class LongitudinalMpc: x_and_cruise = np.column_stack([x, cruise_target]) x = np.min(x_and_cruise, axis=1) - self.source = 'e2e' if x_and_cruise[0,0] < x_and_cruise[0,1] else 'cruise' + self.source = 'e2e' if x_and_cruise[1,0] < x_and_cruise[1,1] else 'cruise' else: raise NotImplementedError(f'Planner mode {self.mode} not recognized in planner update') From 5402e02785ce2dffa404acf888fcc36d3df133fa Mon Sep 17 00:00:00 2001 From: AlexandreSato <66435071+AlexandreSato@users.noreply.github.com> Date: Mon, 21 Nov 2022 20:28:34 -0300 Subject: [PATCH 177/184] Lexus UX Hybrid 2020 Fingerprint (#26551) Lexus UX 2020 Fingerprint alex.takeda@gmail.com --- selfdrive/car/toyota/values.py | 1 + 1 file changed, 1 insertion(+) diff --git a/selfdrive/car/toyota/values.py b/selfdrive/car/toyota/values.py index ba26c7e03b..b4b3ac4131 100644 --- a/selfdrive/car/toyota/values.py +++ b/selfdrive/car/toyota/values.py @@ -821,6 +821,7 @@ FW_VERSIONS = { b'\x01896637621000\x00\x00\x00\x00', b'\x01896637624000\x00\x00\x00\x00', b'\x01896637626000\x00\x00\x00\x00', + b'\x01896637639000\x00\x00\x00\x00', b'\x01896637648000\x00\x00\x00\x00', b'\x01896637643000\x00\x00\x00\x00', b'\x02896630A07000\x00\x00\x00\x008966A4703000\x00\x00\x00\x00', From 62ad278829bbe7e6756f4bb3c44386e9c85d731c Mon Sep 17 00:00:00 2001 From: martinl Date: Tue, 22 Nov 2022 01:34:20 +0200 Subject: [PATCH 178/184] Add FPv2: 2022 Subaru Outback Wilderness (#26540) Add FPv2: 2022 Outback Wilderness / @valtou --- selfdrive/car/subaru/values.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/selfdrive/car/subaru/values.py b/selfdrive/car/subaru/values.py index 7a1e9a8a3d..9975e495dd 100644 --- a/selfdrive/car/subaru/values.py +++ b/selfdrive/car/subaru/values.py @@ -461,6 +461,7 @@ FW_VERSIONS = { b'\xa1 \x08\x02', b'\xa1 \x06\x02', b'\xa1 \x08\x00', + b'\xa1 "\t\x00', ], (Ecu.eps, 0x746, None): [ b'\x9b\xc0\x10\x00', @@ -482,6 +483,7 @@ FW_VERSIONS = { b'\xe2"`p\x07', b'\xf1\x82\xe2,\xa0@\x07', b'\xbc"`q\x07', + b'\xe3,\xa0@\x07', ], (Ecu.transmission, 0x7e1, None): [ b'\xa5\xfe\xf7@\x00', From 548888d6341a4f44ea2e4154fb8c820c3fc38e4e Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 21 Nov 2022 15:59:42 -0800 Subject: [PATCH 179/184] docs: update Toyota DSU footnote (#26568) --- docs/CARS.md | 4 ++-- selfdrive/car/docs_definitions.py | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docs/CARS.md b/docs/CARS.md index 59b8145556..a0d22a3d27 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -225,8 +225,8 @@ A supported vehicle is one that just works when you install a comma three. All s |Volkswagen|Touran 2017|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[1,8](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|J533| -1Experimental openpilot longitudinal control is available behind a toggle; the toggle is only available in non-release branches such as `master-ci`. Using openpilot longitudinal may disable Automatic Emergency Braking (AEB).
-2When the Driver Support Unit (DSU) is disconnected, openpilot Adaptive Cruise Control (ACC) will replace stock Adaptive Cruise Control (ACC). NOTE: disconnecting the DSU disables Automatic Emergency Braking (AEB).
+1Experimental openpilot longitudinal control is available behind a toggle; the toggle is only available in non-release branches such as `devel` or `master-ci`.
+2By default, this car will use the stock Adaptive Cruise Control (ACC) for longitudinal control. If the Driver Support Unit (DSU) is disconnected, openpilot ACC will replace stock ACC. NOTE: disconnecting the DSU disables Automatic Emergency Braking (AEB).
3Requires a community built ASCM harness. NOTE: disconnecting the ASCM disables Automatic Emergency Braking (AEB).
42019 Honda Civic 1.6L Diesel Sedan does not have ALC below 12mph.
5openpilot operates above 28mph for Camry 4CYL L, 4CYL LE and 4CYL SE which don't have Full-Speed Range Dynamic Radar Cruise Control.
diff --git a/selfdrive/car/docs_definitions.py b/selfdrive/car/docs_definitions.py index 8e057a1563..6ec9ac5c40 100644 --- a/selfdrive/car/docs_definitions.py +++ b/selfdrive/car/docs_definitions.py @@ -73,12 +73,11 @@ CarFootnote = namedtuple("CarFootnote", ["text", "column", "docs_only"], default class CommonFootnote(Enum): EXP_LONG_AVAIL = CarFootnote( - "Experimental openpilot longitudinal control is available behind a toggle; the toggle is only available in non-release branches such as `master-ci`. " + - "Using openpilot longitudinal may disable Automatic Emergency Braking (AEB).", + "Experimental openpilot longitudinal control is available behind a toggle; the toggle is only available in non-release branches such as `devel` or `master-ci`. ", Column.LONGITUDINAL, docs_only=True) EXP_LONG_DSU = CarFootnote( - "When the Driver Support Unit (DSU) is disconnected, openpilot Adaptive Cruise Control (ACC) will replace " + - "stock Adaptive Cruise Control (ACC). NOTE: disconnecting the DSU disables Automatic Emergency Braking (AEB).", + "By default, this car will use the stock Adaptive Cruise Control (ACC) for longitudinal control. If the Driver Support Unit (DSU) is disconnected, openpilot ACC will replace " + + "stock ACC. NOTE: disconnecting the DSU disables Automatic Emergency Braking (AEB).", Column.LONGITUDINAL) From 94aa39bdd406400ab48765d8b50f08e03ecf9eb8 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 21 Nov 2022 16:18:51 -0800 Subject: [PATCH 180/184] enable experimental longitudinal control on devel (#26544) --- selfdrive/controls/controlsd.py | 4 ++-- system/version.py | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index a18bec83a8..a395f85580 100755 --- a/selfdrive/controls/controlsd.py +++ b/selfdrive/controls/controlsd.py @@ -12,7 +12,7 @@ import cereal.messaging as messaging from common.conversions import Conversions as CV from panda import ALTERNATIVE_EXPERIENCE from system.swaglog import cloudlog -from system.version import is_tested_branch, get_short_branch +from system.version import is_release_branch, get_short_branch from selfdrive.boardd.boardd import can_list_to_can_capnp from selfdrive.car.car_helpers import get_car, get_startup_event, get_one_can from selfdrive.controls.lib.lateral_planner import CAMERA_OFFSET @@ -132,7 +132,7 @@ class Controls: safety_config.safetyModel = car.CarParams.SafetyModel.noOutput self.CP.safetyConfigs = [safety_config] - if is_tested_branch(): + if is_release_branch(): self.CP.experimentalLongitudinalAvailable = False # Write CarParams for radard diff --git a/system/version.py b/system/version.py index f0817b3a9f..6031531556 100644 --- a/system/version.py +++ b/system/version.py @@ -7,7 +7,8 @@ from functools import lru_cache from common.basedir import BASEDIR from system.swaglog import cloudlog -TESTED_BRANCHES = ['devel', 'release3-staging', 'dashcam3-staging', 'release3', 'dashcam3'] +RELEASE_BRANCHES = ['release3-staging', 'dashcam3-staging', 'release3', 'dashcam3'] +TESTED_BRANCHES = RELEASE_BRANCHES + ['devel', 'devel-staging'] training_version: bytes = b"0.2.0" terms_version: bytes = b"2" @@ -96,6 +97,9 @@ def is_comma_remote() -> bool: def is_tested_branch() -> bool: return get_short_branch() in TESTED_BRANCHES +@cache +def is_release_branch() -> bool: + return get_short_branch() in RELEASE_BRANCHES @cache def is_dirty() -> bool: From be3d6527adb3f58500e7c9f2d689b4821c233791 Mon Sep 17 00:00:00 2001 From: Erich Moraga <33645296+ErichMoraga@users.noreply.github.com> Date: Mon, 21 Nov 2022 18:22:01 -0600 Subject: [PATCH 181/184] Add missing HIGHLANDERH_TSS2 ABS & engine f/w (#26534) `@shakir07#1323` 2020 Highlander Hybrid DongleID/route ce56baaf82559131|2022-11-16--23-54-01 --- selfdrive/car/toyota/values.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/selfdrive/car/toyota/values.py b/selfdrive/car/toyota/values.py index b4b3ac4131..cf37a3c2f2 100644 --- a/selfdrive/car/toyota/values.py +++ b/selfdrive/car/toyota/values.py @@ -1015,6 +1015,7 @@ FW_VERSIONS = { b'\x01F15264873500\x00\x00\x00\x00', b'\x01F152648C6300\x00\x00\x00\x00', b'\x01F152648J4000\x00\x00\x00\x00', + b'\x01F152648J5000\x00\x00\x00\x00', b'\x01F152648J6000\x00\x00\x00\x00', ], (Ecu.engine, 0x700, None): [ @@ -1022,6 +1023,7 @@ FW_VERSIONS = { b'\x01896630EA1000\x00\x00\x00\x00', b'\x01896630EE4000\x00\x00\x00\x00', b'\x01896630EE4100\x00\x00\x00\x00', + b'\x01896630EE5000\x00\x00\x00\x00', b'\x01896630EE6000\x00\x00\x00\x00', b'\x02896630E66000\x00\x00\x00\x00897CF4801001\x00\x00\x00\x00', b'\x02896630E66100\x00\x00\x00\x00897CF4801001\x00\x00\x00\x00', From 23a7a987f6ab75ebee4dd856ba0a0c179b2f90b0 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 21 Nov 2022 17:05:13 -0800 Subject: [PATCH 182/184] controlsd: add test around cruise speed gas pressed behavior (#26486) * test * test * debug * test * test * test * clean up * clean up * add test * stash * clean up * clean up * clean up * assert equal --- selfdrive/controls/lib/drive_helpers.py | 4 +-- selfdrive/controls/tests/test_cruise_speed.py | 26 ++++++++++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/selfdrive/controls/lib/drive_helpers.py b/selfdrive/controls/lib/drive_helpers.py index bdbdb7023a..f0dc2e9467 100644 --- a/selfdrive/controls/lib/drive_helpers.py +++ b/selfdrive/controls/lib/drive_helpers.py @@ -12,6 +12,7 @@ V_CRUISE_MAX = 145 # kph V_CRUISE_MIN = 8 # kph V_CRUISE_ENABLE_MIN = 40 # kph V_CRUISE_INITIAL = 255 # kph +IMPERIAL_INCREMENT = 1.6 # should be CV.MPH_TO_KPH, but this causes rounding errors MIN_SPEED = 1.0 LAT_MPC_N = 16 @@ -73,8 +74,7 @@ class VCruiseHelper: long_press = False button_type = None - # should be CV.MPH_TO_KPH, but this causes rounding errors - v_cruise_delta = 1. if is_metric else 1.6 + v_cruise_delta = 1. if is_metric else IMPERIAL_INCREMENT for b in CS.buttonEvents: if b.type.raw in self.button_timers and not b.pressed: diff --git a/selfdrive/controls/tests/test_cruise_speed.py b/selfdrive/controls/tests/test_cruise_speed.py index 3d6f55931e..a635198ceb 100755 --- a/selfdrive/controls/tests/test_cruise_speed.py +++ b/selfdrive/controls/tests/test_cruise_speed.py @@ -3,7 +3,7 @@ import numpy as np from parameterized import parameterized_class import unittest -from selfdrive.controls.lib.drive_helpers import VCruiseHelper, V_CRUISE_MAX, V_CRUISE_ENABLE_MIN +from selfdrive.controls.lib.drive_helpers import VCruiseHelper, V_CRUISE_MIN, V_CRUISE_MAX, V_CRUISE_ENABLE_MIN, IMPERIAL_INCREMENT from cereal import car from common.conversions import Conversions as CV from common.params import Params @@ -110,6 +110,30 @@ class TestVCruiseHelper(unittest.TestCase): should_equal = standstill or pressed self.assertEqual(should_equal, self.v_cruise_helper.v_cruise_kph == self.v_cruise_helper.v_cruise_kph_last) + def test_set_gas_pressed(self): + """ + Asserts pressing set while enabled with gas pressed sets + the speed to the maximum of vEgo and current cruise speed. + """ + + for v_ego in np.linspace(0, 100, 101): + self.reset_cruise_speed_state() + self.enable(V_CRUISE_ENABLE_MIN * CV.KPH_TO_MS) + + # first decrement speed, then perform gas pressed logic + expected_v_cruise_kph = self.v_cruise_helper.v_cruise_kph - IMPERIAL_INCREMENT + expected_v_cruise_kph = max(expected_v_cruise_kph, v_ego * CV.MS_TO_KPH) # clip to min of vEgo + expected_v_cruise_kph = float(np.clip(round(expected_v_cruise_kph, 1), V_CRUISE_MIN, V_CRUISE_MAX)) + + CS = car.CarState(vEgo=float(v_ego), gasPressed=True, cruiseState={"available": True}) + CS.buttonEvents = [ButtonEvent(type=ButtonType.decelCruise, pressed=False)] + self.v_cruise_helper.update_v_cruise(CS, enabled=True, is_metric=False) + + # TODO: fix skipping first run due to enabled on rising edge exception + if v_ego == 0.0: + continue + self.assertEqual(expected_v_cruise_kph, self.v_cruise_helper.v_cruise_kph) + def test_initialize_v_cruise(self): """ Asserts allowed cruise speeds on enabling with SET. From 4478241bea02cb673983aa6b97428702a54dd1c2 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 21 Nov 2022 17:17:36 -0800 Subject: [PATCH 183/184] spi goes on boardd core --- panda | 2 +- system/hardware/tici/hardware.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/panda b/panda index 5dc5cd8e20..2e90b6f308 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit 5dc5cd8e20668dfb15d35b175fccbfd3f7b63b09 +Subproject commit 2e90b6f308dc09bf1734f6cb5cc990cb8149486d diff --git a/system/hardware/tici/hardware.py b/system/hardware/tici/hardware.py index e2fd20c1be..b5f5e00410 100644 --- a/system/hardware/tici/hardware.py +++ b/system/hardware/tici/hardware.py @@ -416,6 +416,7 @@ class Tici(HardwareBase): # *** IRQ config *** affine_irq(5, 565) # kgsl-3d0 + affine_irq(4, 126) # SPI goes on boardd core affine_irq(4, 740) # xhci-hcd:usb1 goes on the boardd core affine_irq(4, 1069) # xhci-hcd:usb3 goes on the boardd core for irq in range(237, 246): From 1367f84425b5fbdb3ecf8452b134b641998e404a Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 21 Nov 2022 18:01:08 -0800 Subject: [PATCH 184/184] Car docs: add a make-specific init function (#26565) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add a hook function for makes to implement custom docs logic * don't need this * use the pre-defined list for honda's harnesses * one line 😎 * Update selfdrive/car/docs_definitions.py * i didn't know you didn't need a pass! * don't change docs order --- selfdrive/car/docs.py | 1 + selfdrive/car/docs_definitions.py | 3 ++ selfdrive/car/gm/values.py | 21 +++++++----- selfdrive/car/honda/values.py | 52 +++++++++++++++++------------- selfdrive/car/volkswagen/values.py | 20 ++++++------ 5 files changed, 57 insertions(+), 40 deletions(-) diff --git a/selfdrive/car/docs.py b/selfdrive/car/docs.py index 58afed27eb..03313e2ff6 100755 --- a/selfdrive/car/docs.py +++ b/selfdrive/car/docs.py @@ -40,6 +40,7 @@ def get_all_car_info() -> List[CarInfo]: for _car_info in car_info: if not hasattr(_car_info, "row"): + _car_info.init_make(CP) _car_info.init(CP, footnotes) all_car_info.append(_car_info) diff --git a/selfdrive/car/docs_definitions.py b/selfdrive/car/docs_definitions.py index 6ec9ac5c40..7cf44514d6 100644 --- a/selfdrive/car/docs_definitions.py +++ b/selfdrive/car/docs_definitions.py @@ -172,6 +172,9 @@ class CarInfo: return self + def init_make(self, CP: car.CarParams): + """CarInfo subclasses can add make-specific logic for harness selection, footnotes, etc.""" + def get_detail_sentence(self, CP): if not CP.notCar: sentence_builder = "openpilot upgrades your {car_model} with automated lane centering{alc} and adaptive cruise control{acc}." diff --git a/selfdrive/car/gm/values.py b/selfdrive/car/gm/values.py index 35f87307d6..0a8cdc6dbb 100644 --- a/selfdrive/car/gm/values.py +++ b/selfdrive/car/gm/values.py @@ -1,5 +1,5 @@ from collections import defaultdict -from dataclasses import dataclass, field +from dataclasses import dataclass from enum import Enum from typing import Dict, List, Union @@ -84,8 +84,13 @@ class Footnote(Enum): @dataclass class GMCarInfo(CarInfo): package: str = "Adaptive Cruise Control (ACC)" - harness: Enum = Harness.obd_ii - footnotes: List[Enum] = field(default_factory=lambda: [Footnote.OBD_II]) + + def init_make(self, CP: car.CarParams): + if CP.networkLocation == car.CarParams.NetworkLocation.fwdCamera: + self.harness = Harness.gm + else: + self.harness = Harness.obd_ii + self.footnotes.append(Footnote.OBD_II) CAR_INFO: Dict[str, Union[GMCarInfo, List[GMCarInfo]]] = { @@ -96,13 +101,13 @@ CAR_INFO: Dict[str, Union[GMCarInfo, List[GMCarInfo]]] = { CAR.ACADIA: GMCarInfo("GMC Acadia 2018", video_link="https://www.youtube.com/watch?v=0ZN6DdsBUZo"), CAR.BUICK_REGAL: GMCarInfo("Buick Regal Essence 2018"), CAR.ESCALADE_ESV: GMCarInfo("Cadillac Escalade ESV 2016", "Adaptive Cruise Control (ACC) & LKAS"), - CAR.BOLT_EV: GMCarInfo("Chevrolet Bolt EV 2022-23", footnotes=[], harness=Harness.gm), - CAR.BOLT_EUV: GMCarInfo("Chevrolet Bolt EUV 2022-23", "Premier or Premier Redline Trim without Super Cruise Package", "https://youtu.be/xvwzGMUA210", footnotes=[], harness=Harness.gm), + CAR.BOLT_EV: GMCarInfo("Chevrolet Bolt EV 2022-23"), + CAR.BOLT_EUV: GMCarInfo("Chevrolet Bolt EUV 2022-23", "Premier or Premier Redline Trim without Super Cruise Package", "https://youtu.be/xvwzGMUA210"), CAR.SILVERADO: [ - GMCarInfo("Chevrolet Silverado 1500 2020-21", "Safety Package II", footnotes=[], harness=Harness.gm), - GMCarInfo("GMC Sierra 1500 2020-21", "Driver Alert Package II", "https://youtu.be/5HbNoBLzRwE", footnotes=[], harness=Harness.gm), + GMCarInfo("Chevrolet Silverado 1500 2020-21", "Safety Package II"), + GMCarInfo("GMC Sierra 1500 2020-21", "Driver Alert Package II", "https://youtu.be/5HbNoBLzRwE"), ], - CAR.EQUINOX: GMCarInfo("Chevrolet Equinox 2019-22", footnotes=[], harness=Harness.gm), + CAR.EQUINOX: GMCarInfo("Chevrolet Equinox 2019-22"), } diff --git a/selfdrive/car/honda/values.py b/selfdrive/car/honda/values.py index 2510f2e1ff..151c2140f5 100644 --- a/selfdrive/car/honda/values.py +++ b/selfdrive/car/honda/values.py @@ -106,40 +106,46 @@ class Footnote(Enum): class HondaCarInfo(CarInfo): package: str = "Honda Sensing" + def init_make(self, CP: car.CarParams): + if CP.carFingerprint in HONDA_BOSCH: + self.harness = Harness.bosch_b if CP.carFingerprint in HONDA_BOSCH_RADARLESS else Harness.bosch_a + else: + self.harness = Harness.nidec + CAR_INFO: Dict[str, Optional[Union[HondaCarInfo, List[HondaCarInfo]]]] = { CAR.ACCORD: [ - HondaCarInfo("Honda Accord 2018-22", "All", "https://www.youtube.com/watch?v=mrUwlj3Mi58", min_steer_speed=3. * CV.MPH_TO_MS, harness=Harness.bosch_a), - HondaCarInfo("Honda Inspire 2018", "All", min_steer_speed=3. * CV.MPH_TO_MS, harness=Harness.bosch_a), + HondaCarInfo("Honda Accord 2018-22", "All", "https://www.youtube.com/watch?v=mrUwlj3Mi58", min_steer_speed=3. * CV.MPH_TO_MS), + HondaCarInfo("Honda Inspire 2018", "All", min_steer_speed=3. * CV.MPH_TO_MS), ], - CAR.ACCORDH: HondaCarInfo("Honda Accord Hybrid 2018-22", "All", min_steer_speed=3. * CV.MPH_TO_MS, harness=Harness.bosch_a), - CAR.CIVIC: HondaCarInfo("Honda Civic 2016-18", min_steer_speed=12. * CV.MPH_TO_MS, harness=Harness.nidec, video_link="https://youtu.be/-IkImTe1NYE"), + CAR.ACCORDH: HondaCarInfo("Honda Accord Hybrid 2018-22", "All", min_steer_speed=3. * CV.MPH_TO_MS), + CAR.CIVIC: HondaCarInfo("Honda Civic 2016-18", min_steer_speed=12. * CV.MPH_TO_MS, video_link="https://youtu.be/-IkImTe1NYE"), CAR.CIVIC_BOSCH: [ - HondaCarInfo("Honda Civic 2019-21", "All", "https://www.youtube.com/watch?v=4Iz1Mz5LGF8", [Footnote.CIVIC_DIESEL], 2. * CV.MPH_TO_MS, harness=Harness.bosch_a), - HondaCarInfo("Honda Civic Hatchback 2017-21", min_steer_speed=12. * CV.MPH_TO_MS, harness=Harness.bosch_a), + HondaCarInfo("Honda Civic 2019-21", "All", "https://www.youtube.com/watch?v=4Iz1Mz5LGF8", [Footnote.CIVIC_DIESEL], 2. * CV.MPH_TO_MS), + HondaCarInfo("Honda Civic Hatchback 2017-21", min_steer_speed=12. * CV.MPH_TO_MS), ], CAR.CIVIC_BOSCH_DIESEL: None, # same platform CAR.CIVIC_2022: [ - HondaCarInfo("Honda Civic 2022", "All", harness=Harness.bosch_b), - HondaCarInfo("Honda Civic Hatchback 2022", "All", harness=Harness.bosch_b), + HondaCarInfo("Honda Civic 2022", "All"), + HondaCarInfo("Honda Civic Hatchback 2022", "All"), ], - CAR.ACURA_ILX: HondaCarInfo("Acura ILX 2016-19", "AcuraWatch Plus", min_steer_speed=25. * CV.MPH_TO_MS, harness=Harness.nidec), - CAR.CRV: HondaCarInfo("Honda CR-V 2015-16", "Touring Trim", min_steer_speed=12. * CV.MPH_TO_MS, harness=Harness.nidec), - CAR.CRV_5G: HondaCarInfo("Honda CR-V 2017-22", min_steer_speed=12. * CV.MPH_TO_MS, harness=Harness.bosch_a), + CAR.ACURA_ILX: HondaCarInfo("Acura ILX 2016-19", "AcuraWatch Plus", min_steer_speed=25. * CV.MPH_TO_MS), + CAR.CRV: HondaCarInfo("Honda CR-V 2015-16", "Touring Trim", min_steer_speed=12. * CV.MPH_TO_MS), + CAR.CRV_5G: HondaCarInfo("Honda CR-V 2017-22", min_steer_speed=12. * CV.MPH_TO_MS), CAR.CRV_EU: None, # HondaCarInfo("Honda CR-V EU", "Touring"), # Euro version of CRV Touring - CAR.CRV_HYBRID: HondaCarInfo("Honda CR-V Hybrid 2017-19", min_steer_speed=12. * CV.MPH_TO_MS, harness=Harness.bosch_a), - CAR.FIT: HondaCarInfo("Honda Fit 2018-20", min_steer_speed=12. * CV.MPH_TO_MS, harness=Harness.nidec), - CAR.FREED: HondaCarInfo("Honda Freed 2020", min_steer_speed=12. * CV.MPH_TO_MS, harness=Harness.nidec), - CAR.HRV: HondaCarInfo("Honda HR-V 2019-22", min_steer_speed=12. * CV.MPH_TO_MS, harness=Harness.nidec), - CAR.ODYSSEY: HondaCarInfo("Honda Odyssey 2018-20", harness=Harness.nidec), + CAR.CRV_HYBRID: HondaCarInfo("Honda CR-V Hybrid 2017-19", min_steer_speed=12. * CV.MPH_TO_MS), + CAR.FIT: HondaCarInfo("Honda Fit 2018-20", min_steer_speed=12. * CV.MPH_TO_MS), + CAR.FREED: HondaCarInfo("Honda Freed 2020", min_steer_speed=12. * CV.MPH_TO_MS), + CAR.HRV: HondaCarInfo("Honda HR-V 2019-22", min_steer_speed=12. * CV.MPH_TO_MS), + CAR.ODYSSEY: HondaCarInfo("Honda Odyssey 2018-20"), CAR.ODYSSEY_CHN: None, # Chinese version of Odyssey - CAR.ACURA_RDX: HondaCarInfo("Acura RDX 2016-18", "AcuraWatch Plus", min_steer_speed=12. * CV.MPH_TO_MS, harness=Harness.nidec), - CAR.ACURA_RDX_3G: HondaCarInfo("Acura RDX 2019-22", "All", min_steer_speed=3. * CV.MPH_TO_MS, harness=Harness.bosch_a), - CAR.PILOT: HondaCarInfo("Honda Pilot 2016-22", min_steer_speed=12. * CV.MPH_TO_MS, harness=Harness.nidec), - CAR.PASSPORT: HondaCarInfo("Honda Passport 2019-21", "All", min_steer_speed=12. * CV.MPH_TO_MS, harness=Harness.nidec), - CAR.RIDGELINE: HondaCarInfo("Honda Ridgeline 2017-22", min_steer_speed=12. * CV.MPH_TO_MS, harness=Harness.nidec), - CAR.INSIGHT: HondaCarInfo("Honda Insight 2019-22", "All", min_steer_speed=3. * CV.MPH_TO_MS, harness=Harness.bosch_a), - CAR.HONDA_E: HondaCarInfo("Honda e 2020", "All", min_steer_speed=3. * CV.MPH_TO_MS, harness=Harness.bosch_a), + CAR.ACURA_RDX: HondaCarInfo("Acura RDX 2016-18", "AcuraWatch Plus", min_steer_speed=12. * CV.MPH_TO_MS), + CAR.ACURA_RDX_3G: HondaCarInfo("Acura RDX 2019-22", "All", min_steer_speed=3. * CV.MPH_TO_MS), + CAR.PILOT: HondaCarInfo("Honda Pilot 2016-22", min_steer_speed=12. * CV.MPH_TO_MS), + CAR.PASSPORT: HondaCarInfo("Honda Passport 2019-21", "All", min_steer_speed=12. * CV.MPH_TO_MS), + CAR.RIDGELINE: HondaCarInfo("Honda Ridgeline 2017-22", min_steer_speed=12. * CV.MPH_TO_MS), + CAR.INSIGHT: HondaCarInfo("Honda Insight 2019-22", "All", min_steer_speed=3. * CV.MPH_TO_MS), + CAR.HONDA_E: HondaCarInfo("Honda e 2020", "All", min_steer_speed=3. * CV.MPH_TO_MS), } FW_QUERY_CONFIG = FwQueryConfig( diff --git a/selfdrive/car/volkswagen/values.py b/selfdrive/car/volkswagen/values.py index cb2343e08f..f24448adbc 100755 --- a/selfdrive/car/volkswagen/values.py +++ b/selfdrive/car/volkswagen/values.py @@ -1,5 +1,5 @@ from collections import defaultdict, namedtuple -from dataclasses import dataclass, field +from dataclasses import dataclass from enum import Enum from typing import Dict, List, Union @@ -165,7 +165,9 @@ class Footnote(Enum): class VWCarInfo(CarInfo): package: str = "Adaptive Cruise Control (ACC) & Lane Assist" harness: Enum = Harness.j533 - footnotes: List[Enum] = field(default_factory=lambda: [Footnote.VW_EXP_LONG]) + + def init_make(self, CP: car.CarParams): + self.footnotes.insert(0, Footnote.VW_EXP_LONG) CAR_INFO: Dict[str, Union[VWCarInfo, List[VWCarInfo]]] = { @@ -197,28 +199,28 @@ CAR_INFO: Dict[str, Union[VWCarInfo, List[VWCarInfo]]] = { VWCarInfo("Volkswagen Jetta GLI 2021-22"), ], CAR.PASSAT_MK8: [ - VWCarInfo("Volkswagen Passat 2015-22", footnotes=[Footnote.VW_EXP_LONG, Footnote.PASSAT]), + VWCarInfo("Volkswagen Passat 2015-22", footnotes=[Footnote.PASSAT]), VWCarInfo("Volkswagen Passat Alltrack 2015-22"), VWCarInfo("Volkswagen Passat GTE 2015-22"), ], CAR.PASSAT_NMS: VWCarInfo("Volkswagen Passat NMS 2017-22"), CAR.POLO_MK6: [ - VWCarInfo("Volkswagen Polo 2020-22", footnotes=[Footnote.VW_EXP_LONG, Footnote.VW_MQB_A0]), - VWCarInfo("Volkswagen Polo GTI 2020-22", footnotes=[Footnote.VW_EXP_LONG, Footnote.VW_MQB_A0]), + VWCarInfo("Volkswagen Polo 2020-22", footnotes=[Footnote.VW_MQB_A0]), + VWCarInfo("Volkswagen Polo GTI 2020-22", footnotes=[Footnote.VW_MQB_A0]), ], CAR.SHARAN_MK2: [ VWCarInfo("Volkswagen Sharan 2018-22"), VWCarInfo("SEAT Alhambra 2018-20"), ], CAR.TAOS_MK1: VWCarInfo("Volkswagen Taos 2022"), - CAR.TCROSS_MK1: VWCarInfo("Volkswagen T-Cross 2021", footnotes=[Footnote.VW_EXP_LONG, Footnote.VW_MQB_A0]), + CAR.TCROSS_MK1: VWCarInfo("Volkswagen T-Cross 2021", footnotes=[Footnote.VW_MQB_A0]), CAR.TIGUAN_MK2: VWCarInfo("Volkswagen Tiguan 2019-22"), CAR.TOURAN_MK2: VWCarInfo("Volkswagen Touran 2017"), CAR.TRANSPORTER_T61: [ VWCarInfo("Volkswagen Caravelle 2020"), VWCarInfo("Volkswagen California 2021"), ], - CAR.TROC_MK1: VWCarInfo("Volkswagen T-Roc 2021", footnotes=[Footnote.VW_EXP_LONG, Footnote.VW_MQB_A0]), + CAR.TROC_MK1: VWCarInfo("Volkswagen T-Roc 2021", footnotes=[Footnote.VW_MQB_A0]), CAR.AUDI_A3_MK3: [ VWCarInfo("Audi A3 2014-19"), VWCarInfo("Audi A3 Sportback e-tron 2017-18"), @@ -229,10 +231,10 @@ CAR_INFO: Dict[str, Union[VWCarInfo, List[VWCarInfo]]] = { CAR.AUDI_Q3_MK2: VWCarInfo("Audi Q3 2019-23"), CAR.SEAT_ATECA_MK1: VWCarInfo("SEAT Ateca 2018"), CAR.SEAT_LEON_MK3: VWCarInfo("SEAT Leon 2014-20"), - CAR.SKODA_KAMIQ_MK1: VWCarInfo("Škoda Kamiq 2021", footnotes=[Footnote.VW_EXP_LONG, Footnote.VW_MQB_A0, Footnote.KAMIQ]), + CAR.SKODA_KAMIQ_MK1: VWCarInfo("Škoda Kamiq 2021", footnotes=[Footnote.VW_MQB_A0, Footnote.KAMIQ]), CAR.SKODA_KAROQ_MK1: VWCarInfo("Škoda Karoq 2019-21"), CAR.SKODA_KODIAQ_MK1: VWCarInfo("Škoda Kodiaq 2018-19"), - CAR.SKODA_SCALA_MK1: VWCarInfo("Škoda Scala 2020", footnotes=[Footnote.VW_EXP_LONG, Footnote.VW_MQB_A0]), + CAR.SKODA_SCALA_MK1: VWCarInfo("Škoda Scala 2020", footnotes=[Footnote.VW_MQB_A0]), CAR.SKODA_SUPERB_MK3: VWCarInfo("Škoda Superb 2015-22"), CAR.SKODA_OCTAVIA_MK3: [ VWCarInfo("Škoda Octavia 2015, 2018-19"),