Merge remote-tracking branch 'upstream/master' into ui_accel_gradient

panda

@@ -1 +1 @@
-Subproject commit 1923b1418933e464ff7460a3e0a05d63aad0d53b
+Subproject commit e0e754de2c7fdbf943dd02db203b7bb40bf3e9b5

selfdrive/car/volkswagen/values.py

@@ -1147,6 +1147,7 @@ FW_VERSIONS = {
       b'\xf1\x8704L906026FP\xf1\x891196',
       b'\xf1\x8704L906026KB\xf1\x894071',
       b'\xf1\x8704L906026KD\xf1\x894798',
+      b'\xf1\x873G0906259  \xf1\x890004',
       b'\xf1\x873G0906259B \xf1\x890002',
       b'\xf1\x873G0906264A \xf1\x890002',
     ],
@@ -1156,12 +1157,14 @@ FW_VERSIONS = {
       b'\xf1\x870D9300012  \xf1\x894940',
       b'\xf1\x870D9300041H \xf1\x894905',
       b'\xf1\x870GC300043  \xf1\x892301',
+      b'\xf1\x870D9300043F \xf1\x895202',
     ],
     (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',
+      b'\xf1\x875Q0959655CA\xf1\x890403\xf1\x82\x1331310031313100313151013141319331423100',
     ],
     (Ecu.eps, 0x712, None): [
       b'\xf1\x875Q0909143K \xf1\x892033\xf1\x820514UZ070203',

selfdrive/ui/qt/onroad.cc

@@ -594,7 +594,10 @@ void AnnotatedCameraWidget::drawDriverState(QPainter &painter, const UIState *s)
   const int arc_l = 133;
   const float arc_t_default = 6.7;
   const float arc_t_extend = 12.0;
-  QColor arc_color = QColor::fromRgbF(0.09, 0.945, 0.26, 0.4*(1.0-dm_fade_state)*(s->engaged()));
+  QColor arc_color = QColor::fromRgbF(0.545 - 0.445 * s->engaged(),
+                                      0.545 + 0.4 * s->engaged(),
+                                      0.545 - 0.285 * s->engaged(),
+                                      0.4 * (1.0 - dm_fade_state));
   float delta_x = -scene.driver_pose_sins[1] * arc_l / 2;
   float delta_y = -scene.driver_pose_sins[0] * arc_l / 2;
   painter.setPen(QPen(arc_color, arc_t_default+arc_t_extend*fmin(1.0, scene.driver_pose_diff[1] * 5.0), Qt::SolidLine, Qt::RoundCap));

tools/cabana/chartswidget.cc

@@ -562,6 +562,9 @@ void ChartView::updateSeries(const Signal *sig, const std::vector<Event *> *even
       if (events->size()) {
         s.last_value_mono_time = events->back()->mono_time;
       }
+      if (!can->liveStreaming()) {
+        s.segment_tree.build(s.vals);
+      }
       s.series->replace(series_type == SeriesType::StepLine ? s.step_vals : s.vals);
     }
   }
@@ -586,10 +589,16 @@ void ChartView::updateAxisY() {
 
     auto first = std::lower_bound(s.vals.begin(), s.vals.end(), axis_x->min(), [](auto &p, double x) { return p.x() < x; });
     auto last = std::lower_bound(first, s.vals.end(), axis_x->max(), [](auto &p, double x) { return p.x() < x; });
+    if (can->liveStreaming()) {
       for (auto it = first; it != last; ++it) {
         if (it->y() < min) min = it->y();
         if (it->y() > max) max = it->y();
       }
+    } else {
+      auto [min_y, max_y] = s.segment_tree.minmax(std::distance(s.vals.begin(), first), std::distance(s.vals.begin(), last));
+      min = std::min(min, min_y);
+      max = std::max(max, max_y);
+    }
   }
   if (min == std::numeric_limits<double>::max()) min = 0;
   if (max == std::numeric_limits<double>::lowest()) max = 0;

tools/cabana/chartswidget.h

@@ -46,6 +46,7 @@ public:
     QVector<QPointF> step_vals;
     uint64_t last_value_mono_time = 0;
     QPointF track_pt{};
+    SegmentTree segment_tree;
   };
 
 signals:

tools/cabana/streams/livestream.cc

@@ -89,10 +89,11 @@ void LiveStream::removeExpiredEvents() {
 }
 
 const std::vector<Event *> *LiveStream::events() const {
-  events_vector.clear();
   std::lock_guard lk(lock);
-  events_vector.reserve(can_events.size());
+  if (events_vector.capacity() <= can_events.size()) {
-  std::copy(can_events.begin(), can_events.end(), std::back_inserter(events_vector));
+    events_vector.reserve(can_events.size() * 2);
+  }
+  events_vector.assign(can_events.begin(), can_events.end());
   return &events_vector;
 }
 

tools/cabana/util.cc

@@ -67,6 +67,40 @@ void ChangeTracker::clear() {
   colors.clear();
 }
 
+
+// SegmentTree
+
+void SegmentTree::build(const QVector<QPointF> &arr) {
+  size = arr.size();
+  tree.resize(4 * size);  // size of the tree is 4 times the size of the array
+  if (size > 0) {
+    build_tree(arr, 1, 0, size - 1);
+  }
+}
+
+void SegmentTree::build_tree(const QVector<QPointF> &arr, int n, int left, int right) {
+  if (left == right) {
+    const double y = arr[left].y();
+    tree[n] = {y, y};
+  } else {
+    const int mid = (left + right) >> 1;
+    build_tree(arr, 2 * n, left, mid);
+    build_tree(arr, 2 * n + 1, mid + 1, right);
+    tree[n] = {std::min(tree[2 * n].first, tree[2 * n + 1].first), std::max(tree[2 * n].second, tree[2 * n + 1].second)};
+  }
+}
+
+std::pair<double, double> SegmentTree::get_minmax(int n, int left, int right, int range_left, int range_right) const {
+  if (range_left > right || range_right < left)
+    return {std::numeric_limits<double>::max(), std::numeric_limits<double>::lowest()};
+  if (range_left <= left && range_right >= right)
+    return tree[n];
+  int mid = (left + right) >> 1;
+  auto l = get_minmax(2 * n, left, mid, range_left, range_right);
+  auto r = get_minmax(2 * n + 1, mid + 1, right, range_left, range_right);
+  return {std::min(l.first, r.first), std::max(l.second, r.second)};
+}
+
 // MessageBytesDelegate
 
 MessageBytesDelegate::MessageBytesDelegate(QObject *parent) : QStyledItemDelegate(parent) {

tools/cabana/util.h

@@ -35,6 +35,19 @@ enum {
   BytesRole = Qt::UserRole + 2
 };
 
+class SegmentTree {
+public:
+  SegmentTree() = default;
+  void build(const QVector<QPointF> &arr);
+  inline std::pair<double, double> minmax(int left, int right) const { return get_minmax(1, 0, size - 1, left, right); }
+
+private:
+  std::pair<double, double> get_minmax(int n, int left, int right, int range_left, int range_right) const;
+  void build_tree(const QVector<QPointF> &arr, int n, int left, int right);
+  std::vector<std::pair<double ,double>> tree;
+  int size = 0;
+};
+
 class MessageBytesDelegate : public QStyledItemDelegate {
   Q_OBJECT
 public:

tools/replay/consoleui.cc

@@ -165,7 +165,10 @@ void ConsoleUI::updateStatus() {
   sm.update(0);
 
   if (status != Status::Paused) {
-    status = (sm.updated("carState") || sm.updated("liveParameters")) ? Status::Playing : Status::Waiting;
+    auto events = replay->events();
+    uint64_t current_mono_time = replay->routeStartTime() + replay->currentSeconds() * 1e9;
+    bool playing = !events->empty() && events->back()->mono_time > current_mono_time;
+    status = playing ? Status::Playing : Status::Waiting;
   }
   auto [status_str, status_color] = status_text[status];
   write_item(0, 0, "STATUS:    ", status_str, "      ", false, status_color);