bump submodules

commaai · Dec 18, 2023 · 816b442 · 816b442
1 parent 248eabf
commit 816b442
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/3rdparty/cereal b/3rdparty/cereal
diff --git a/3rdparty/opendbc b/3rdparty/opendbc
diff --git a/cmake/FindCereal.cmake b/cmake/FindCereal.cmake
@@ -5,7 +5,7 @@ else (Cereal_LIBRARIES AND Cereal_INCLUDE_DIRS)
 
   # build cereal before we search for required Cereal plugin libs below
   execute_process(
-    COMMAND scons -j8
+    COMMAND scons -j8 --minimal
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/cereal
   )
 

diff --git a/plotjuggler_plugins/DataLoadRlog/rlog_parser.cpp b/plotjuggler_plugins/DataLoadRlog/rlog_parser.cpp
@@ -60,12 +60,12 @@ bool RlogMessageParser::parseMessageCereal(capnp::DynamicStruct::Reader event)
     selectDBCDialog();  // prompts for and loads DBC
   }
 
-  uint64_t last_sec = event.get("logMonoTime").as<uint64_t>();
-  double time_stamp = (double)last_sec / 1e9;
-  return parseMessageImpl("", event, time_stamp, last_sec, true);
+  uint64_t last_nanos = event.get("logMonoTime").as<uint64_t>();
+  double time_stamp = (double)last_nanos / 1e9;
+  return parseMessageImpl("", event, time_stamp, last_nanos, true);
 }
 
-bool RlogMessageParser::parseMessageImpl(const std::string& topic_name, capnp::DynamicValue::Reader value, double time_stamp, uint64_t last_sec, bool is_root)
+bool RlogMessageParser::parseMessageImpl(const std::string& topic_name, capnp::DynamicValue::Reader value, double time_stamp, uint64_t last_nanos, bool is_root)
 {
   PJ::PlotData& _data_series = getSeries(topic_name);
 
@@ -99,15 +99,15 @@ bool RlogMessageParser::parseMessageImpl(const std::string& topic_name, capnp::D
     {
       if (topic_name == "/can" || topic_name == "/sendcan")
       {
-        parseCanMessage(topic_name, value.as<capnp::DynamicList>(), time_stamp, last_sec);
+        parseCanMessage(topic_name, value.as<capnp::DynamicList>(), time_stamp, last_nanos);
       }
       else
       {
         // TODO: Parse lists properly
         int i = 0;
         for(auto element : value.as<capnp::DynamicList>())
         {
-          parseMessageImpl(topic_name + '/' + std::to_string(i), element, time_stamp, last_sec, false);
+          parseMessageImpl(topic_name + '/' + std::to_string(i), element, time_stamp, last_nanos, false);
           i++;
         }
       }
@@ -147,11 +147,11 @@ bool RlogMessageParser::parseMessageImpl(const std::string& topic_name, capnp::D
 
           if (!is_root || in_union)
           {
-            parseMessageImpl(topic_name + '/' + name, structValue.get(field), time_stamp, last_sec, false);
+            parseMessageImpl(topic_name + '/' + name, structValue.get(field), time_stamp, last_nanos, false);
           }
           else if (is_root && !in_union)
           {
-            parseMessageImpl(topic_name + '/' + structName + "/__" + name, structValue.get(field), time_stamp, last_sec, false);
+            parseMessageImpl(topic_name + '/' + structName + "/__" + name, structValue.get(field), time_stamp, last_nanos, false);
           }
         }
       }
@@ -168,7 +168,7 @@ bool RlogMessageParser::parseMessageImpl(const std::string& topic_name, capnp::D
 }
 
 bool RlogMessageParser::parseCanMessage(
-  const std::string& topic_name, capnp::DynamicList::Reader listValue, double time_stamp, uint64_t last_sec)
+  const std::string& topic_name, capnp::DynamicList::Reader listValue, double time_stamp, uint64_t last_nanos)
 {
   if (dbc_name.empty()) {
     return false;
@@ -180,13 +180,13 @@ bool RlogMessageParser::parseCanMessage(
     uint8_t bus = value.get("src").as<uint8_t>();
     if (parsers.find(bus) == parsers.end()) {
       parsers[bus] = std::make_shared<CANParser>(bus, dbc_name, true, true);
-      parsers[bus]->first_sec = last_sec;
+      parsers[bus]->first_nanos = last_nanos;
     }
 
     updated_busses.insert(bus);
-    parsers[bus]->last_sec = last_sec;
-    parsers[bus]->UpdateCans(last_sec, value);
-    parsers[bus]->UpdateValid(last_sec);
+    parsers[bus]->last_nanos = last_nanos;
+    parsers[bus]->UpdateCans(last_nanos, value);
+    parsers[bus]->UpdateValid(last_nanos);
   }
   for (uint8_t bus : updated_busses) {
     std::vector<SignalValue> signal_values;
@@ -204,9 +204,9 @@ bool RlogMessageParser::parseCanMessage(
       {(double)p->can_valid, "can_valid"},
       {(double)p->bus_timeout, "bus_timeout"},
       {(double)p->bus_timeout_threshold, "bus_timeout_threshold"},
-      {(double)p->first_sec, "first_sec"},
-      {(double)p->last_sec, "last_sec"},
-      {(double)p->last_nonempty_sec, "last_nonempty_sec"},
+      {(double)p->first_nanos, "first_nanos"},
+      {(double)p->last_nanos, "last_nanos"},
+      {(double)p->last_nonempty_nanos, "last_nonempty_nanos"},
       {(double)p->can_invalid_cnt, "can_invalid_cnt"},
     };
     for (auto k : parser_state) {

diff --git a/plotjuggler_plugins/DataStreamCereal/datastream_cereal.cpp b/plotjuggler_plugins/DataStreamCereal/datastream_cereal.cpp
@@ -76,7 +76,7 @@ bool DataStreamCereal::start(QStringList*)
   for (const auto &serv : services)
   {
     SubSocket *socket;
-    socket = SubSocket::create(c, std::string(serv.name), address.toStdString(), false, true);  // don't conflate
+    socket = SubSocket::create(c, std::string(serv.second.name), address.toStdString(), false, true);  // don't conflate
     assert(socket != 0);
 
     poller->registerSocket(socket);
+2 −2		.github/workflows/tests.yml
+8 −6		.pre-commit-config.yaml
+2 −2		Dockerfile
+5 −3		SConstruct
+1 −1		can/common.cc
+7 −7		can/common.h
+2 −2		can/common.pxd
+0 −2		can/common_dbc.h
+1 −1		can/packer.cc
+51 −40		can/parser.cc
+8 −7		can/parser_pyx.pyx
+2 −1		can/tests/test_define.py
+73 −1		can/tests/test_packer_parser.py
+13 −9		chrysler_pacifica_2017_hybrid_generated.dbc
+13 −3		chrysler_ram_dt_generated.dbc
+13 −3		chrysler_ram_hd_generated.dbc
+13 −3		generator/chrysler/_stellantis_common.dbc
+1 −0		generator/chrysler/_stellantis_common_ram.py
+0 −6		generator/chrysler/chrysler_pacifica_2017_hybrid.dbc
+12 −8		generator/gm/gm_global_a_powertrain.dbc
+1 −2		generator/honda/honda_civic_touring_2016_can.dbc
+24 −1		generator/subaru/_subaru_global.dbc
+6 −5		generator/subaru/_subaru_preglobal_2015.dbc
+2 −10		generator/subaru/subaru_global_2017.dbc
+2 −2		generator/toyota/toyota_nodsu_pt.dbc
+8 −0		gm_global_a_lowspeed.dbc
+12 −8		gm_global_a_powertrain_generated.dbc
+1 −2		honda_civic_touring_2016_can_generated.dbc
+94 −7		hyundai_canfd.dbc
+6 −0		hyundai_kia_generic.dbc
+14 −0		mazda_2017.dbc
+6 −5		subaru_forester_2017_generated.dbc
+26 −11		subaru_global_2017_generated.dbc
+24 −1		subaru_global_2020_hybrid_generated.dbc
+6 −5		subaru_outback_2015_generated.dbc
+6 −5		subaru_outback_2019_generated.dbc
+2 −2		toyota_nodsu_pt_generated.dbc
+1 −1		vw_golf_mk4.dbc