From 6770f1cdfb7b1017e7cdcb79aceced6ed530584e Mon Sep 17 00:00:00 2001
From: Shane Smiskol <shane@smiskol.com>
Date: Wed, 9 Feb 2022 11:59:15 -0800
Subject: [PATCH] CANParser: remove ts field (#557)

more usages
---
 can/common.h       | 3 +--
 can/common.pxd     | 1 -
 can/common_dbc.h   | 1 -
 can/parser.cc      | 8 +++-----
 can/parser_pyx.pyx | 7 -------
 5 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/can/common.h b/can/common.h
index a84f6c8..503deeb 100644
--- a/can/common.h
+++ b/can/common.h
@@ -34,7 +34,6 @@ public:
   std::vector<double> vals;
   std::vector<std::vector<double>> updated_vals;
 
-  uint16_t ts;
   uint64_t seen;
   uint64_t check_threshold;
 
@@ -44,7 +43,7 @@ public:
   bool ignore_checksum = false;
   bool ignore_counter = false;
 
-  bool parse(uint64_t sec, uint16_t ts_, uint8_t * dat);
+  bool parse(uint64_t sec, uint8_t * dat);
   bool update_counter_generic(int64_t v, int cnt_size);
 };
 
diff --git a/can/common.pxd b/can/common.pxd
index 4eb52e4..7835fb9 100644
--- a/can/common.pxd
+++ b/can/common.pxd
@@ -60,7 +60,6 @@ cdef extern from "common_dbc.h":
 
   cdef struct SignalValue:
     uint32_t address
-    uint16_t ts
     const char* name
     double value
     vector[double] updated_values
diff --git a/can/common_dbc.h b/can/common_dbc.h
index 9949bf0..1c12e69 100644
--- a/can/common_dbc.h
+++ b/can/common_dbc.h
@@ -24,7 +24,6 @@ struct MessageParseOptions {
 
 struct SignalValue {
   uint32_t address;
-  uint16_t ts;
   const char* name;
   double value;  // latest value
   std::vector<double> updated_values;  // values updated this cycle
diff --git a/can/parser.cc b/can/parser.cc
index e0105b5..fcca489 100644
--- a/can/parser.cc
+++ b/can/parser.cc
@@ -13,7 +13,7 @@
 // #define DEBUG printf
 #define INFO printf
 
-bool MessageState::parse(uint64_t sec, uint16_t ts_, uint8_t * dat) {
+bool MessageState::parse(uint64_t sec, uint8_t * dat) {
   uint64_t dat_le = read_u64_le(dat);
   uint64_t dat_be = read_u64_be(dat);
 
@@ -85,7 +85,6 @@ bool MessageState::parse(uint64_t sec, uint16_t ts_, uint8_t * dat) {
     vals[i] = tmp * sig.factor + sig.offset;
     updated_vals[i].push_back(vals[i]);
   }
-  ts = ts_;
   seen = sec;
 
   return true;
@@ -241,7 +240,7 @@ void CANParser::UpdateCans(uint64_t sec, const capnp::List<cereal::CanData>::Rea
     uint8_t dat[8] = {0};
     memcpy(dat, cmsg.getDat().begin(), cmsg.getDat().size());
 
-    state_it->second.parse(sec, cmsg.getBusTime(), dat);
+    state_it->second.parse(sec, dat);
   }
 }
 #endif
@@ -265,7 +264,7 @@ void CANParser::UpdateCans(uint64_t sec, const capnp::DynamicStruct::Reader& cms
   if (dat.size() > 8) return; //shouldn't ever happen
   uint8_t data[8] = {0};
   memcpy(data, dat.begin(), dat.size());
-  state_it->second.parse(sec, cmsg.get("busTime").as<uint16_t>(), data);
+  state_it->second.parse(sec, data);
 }
 
 void CANParser::UpdateValid(uint64_t sec) {
@@ -293,7 +292,6 @@ std::vector<SignalValue> CANParser::update_vl() {
       const Signal &sig = state.parse_sigs[i];
       ret.push_back((SignalValue){
         .address = state.address,
-        .ts = state.ts,
         .name = sig.name,
         .value = state.vals[i],
         .updated_values = state.updated_vals[i],
diff --git a/can/parser_pyx.pyx b/can/parser_pyx.pyx
index cd546b2..dbdc08d 100644
--- a/can/parser_pyx.pyx
+++ b/can/parser_pyx.pyx
@@ -29,7 +29,6 @@ cdef class CANParser:
   cdef readonly:
     string dbc_name
     dict vl
-    dict ts
     dict updated
     bool can_valid
     int can_invalid_cnt
@@ -43,7 +42,6 @@ cdef class CANParser:
     if not self.dbc:
       raise RuntimeError(f"Can't find DBC: {dbc_name}")
     self.vl = {}
-    self.ts = {}
     self.updated = {}
 
     self.can_invalid_cnt = CAN_INVALID_CNT
@@ -58,8 +56,6 @@ cdef class CANParser:
       self.address_to_msg_name[msg.address] = name
       self.vl[msg.address] = {}
       self.vl[name] = {}
-      self.ts[msg.address] = {}
-      self.ts[name] = {}
       self.updated[msg.address] = {}
       self.updated[name] = {}
 
@@ -127,9 +123,6 @@ cdef class CANParser:
       self.vl[cv.address][cv_name] = cv.value
       self.vl[name][cv_name] = cv.value
 
-      self.ts[cv.address][cv_name] = cv.ts
-      self.ts[name][cv_name] = cv.ts
-
       self.updated[cv.address][cv_name] = cv.updated_values
       self.updated[name][cv_name] = cv.updated_values