From c7425def28d097d9f0981b3814046b572d7560f0 Mon Sep 17 00:00:00 2001
From: Dean Lee <deanlee3@gmail.com>
Date: Sat, 24 Jun 2023 04:14:11 +0800
Subject: [PATCH] cabana: fixed the issue of parsing multiplexed signals
 (#28660)

old-commit-hash: 6cc600e84f3a42bcf402730073d22fe6cd16b8d3
---
 tools/cabana/dbc/dbc.cc     | 3 +++
 tools/cabana/dbc/dbcfile.cc | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/cabana/dbc/dbc.cc b/tools/cabana/dbc/dbc.cc
index 1ce5f8e12c..4b6ad86557 100644
--- a/tools/cabana/dbc/dbc.cc
+++ b/tools/cabana/dbc/dbc.cc
@@ -111,6 +111,9 @@ void cabana::Msg::update() {
   for (auto sig : sigs) {
     sig->multiplexor = sig->type == cabana::Signal::Type::Multiplexed ? multiplexor : nullptr;
     if (!sig->multiplexor) {
+      if (sig->type == cabana::Signal::Type::Multiplexed) {
+        sig->type = cabana::Signal::Type::Normal;
+      }
       sig->multiplex_value = 0;
     }
   }
diff --git a/tools/cabana/dbc/dbcfile.cc b/tools/cabana/dbc/dbcfile.cc
index ab20017505..d894d56197 100644
--- a/tools/cabana/dbc/dbcfile.cc
+++ b/tools/cabana/dbc/dbcfile.cc
@@ -136,7 +136,6 @@ void DBCFile::parse(const QString &content) {
           dbc_assert(++multiplexor_cnt < 2, "Multiple multiplexor");
           s.type = cabana::Signal::Type::Multiplexor;
         } else {
-          dbc_assert(multiplexor_cnt == 1, "No multiplexor");
           s.type = cabana::Signal::Type::Multiplexed;
           s.multiplex_value = indicator.mid(1).toInt();
         }