From 78268323cd8eeb9092ca3bbaf0f580a2269619ff Mon Sep 17 00:00:00 2001
From: Angus Gratton <gus@projectgus.com>
Date: Mon, 5 Jun 2023 07:04:09 +1000
Subject: [PATCH] cabana dbc: Sort signals by name if start bits are equal
 (#28399)

old-commit-hash: f659d4d44b1192467a7ad0d34c4f6747ae7382b4
---
 tools/cabana/dbc/dbc.cc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/cabana/dbc/dbc.cc b/tools/cabana/dbc/dbc.cc
index cb5ebff602..aaa4a97ea9 100644
--- a/tools/cabana/dbc/dbc.cc
+++ b/tools/cabana/dbc/dbc.cc
@@ -9,7 +9,13 @@ std::vector<const cabana::Signal*> cabana::Msg::getSignals() const {
   std::vector<const Signal*> ret;
   ret.reserve(sigs.size());
   for (auto &sig : sigs) ret.push_back(&sig);
-  std::sort(ret.begin(), ret.end(), [](auto l, auto r) { return l->start_bit < r->start_bit; });
+  std::sort(ret.begin(), ret.end(), [](auto l, auto r) {
+    if (l->start_bit != r->start_bit) {
+      return l->start_bit < r->start_bit;
+    }
+    // For VECTOR__INDEPENDENT_SIG_MSG, many signals have same start bit
+    return l->name < r->name;
+  });
   return ret;
 }