dragonpilot beta3

date: 2023-08-22T14:21:17
commit: 6148ce3d77530281f890970718e9c42b2acc5ff1

opendbc/can/common.h

@@ -76,8 +76,7 @@ public:
   uint64_t can_invalid_cnt = CAN_INVALID_CNT;
 
   CANParser(int abus, const std::string& dbc_name,
-            const std::vector<MessageParseOptions> &options,
-            const std::vector<SignalParseOptions> &sigoptions);
+            const std::vector<std::pair<uint32_t, int>> &messages);
   CANParser(int abus, const std::string& dbc_name, bool ignore_checksum, bool ignore_counter);
   #ifndef DYNAMIC_CAPNP
   void update_string(const std::string &data, bool sendcan);

opendbc/can/common.pxd

@@ -3,6 +3,7 @@
 
 from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t
 from libcpp cimport bool
+from libcpp.pair cimport pair
 from libcpp.string cimport string
 from libcpp.vector cimport vector
 
@@ -48,14 +49,6 @@ cdef extern from "common_dbc.h":
     vector[Msg] msgs
     vector[Val] vals
 
-  cdef struct SignalParseOptions:
-    uint32_t address
-    string name
-
-  cdef struct MessageParseOptions:
-    uint32_t address
-    int check_frequency
-
   cdef struct SignalValue:
     uint32_t address
     uint64_t ts_nanos
@@ -74,8 +67,8 @@ cdef extern from "common.h":
   cdef cppclass CANParser:
     bool can_valid
     bool bus_timeout
-    CANParser(int, string, vector[MessageParseOptions], vector[SignalParseOptions])
-    void update_strings(vector[string]&, vector[SignalValue]&, bool)
+    CANParser(int, string, vector[pair[uint32_t, int]])
+    void update_strings(vector[string]&, vector[SignalValue]&, bool) except +
 
   cdef cppclass CANPacker:
    CANPacker(string)

opendbc/can/common_dbc.h

@@ -12,16 +12,6 @@ struct SignalPackValue {
   double value;
 };
 
-struct SignalParseOptions {
-  uint32_t address;
-  std::string name;
-};
-
-struct MessageParseOptions {
-  uint32_t address;
-  int check_frequency;
-};
-
 struct SignalValue {
   uint32_t address;
   uint64_t ts_nanos;

opendbc/can/packer_pyx.cpp

@@ -1405,7 +1405,7 @@ static const char *__pyx_f[] = {
 /*--- Type declarations ---*/
 struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker;
 
-/* "common.pxd":10
+/* "common.pxd":11
  * 
  * 
  * ctypedef unsigned int (*calc_checksum_type)(uint32_t, const Signal&, const vector[uint8_t] &)             # <<<<<<<<<<<<<<
@@ -2112,6 +2112,8 @@ static PyObject *__pyx_f_7opendbc_3can_10packer_pyx_9CANPacker_make_can_msg(stru
 
 /* Module declarations from "libcpp" */
 
+/* Module declarations from "libcpp.pair" */
+
 /* Module declarations from "opendbc.can.common" */
 
 /* Module declarations from "opendbc.can.packer_pyx" */
@@ -2218,6 +2220,8 @@ typedef struct {
   #if CYTHON_USE_MODULE_STATE
   #endif
   #if CYTHON_USE_MODULE_STATE
+  #endif
+  #if CYTHON_USE_MODULE_STATE
   PyObject *__pyx_type_7opendbc_3can_10packer_pyx_CANPacker;
   #endif
   PyTypeObject *__pyx_ptype_7opendbc_3can_10packer_pyx_CANPacker;
@@ -2473,6 +2477,8 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #if CYTHON_USE_MODULE_STATE
 #endif
 #if CYTHON_USE_MODULE_STATE
+#endif
+#if CYTHON_USE_MODULE_STATE
 #define __pyx_type_7opendbc_3can_10packer_pyx_CANPacker __pyx_mstate_global->__pyx_type_7opendbc_3can_10packer_pyx_CANPacker
 #endif
 #define __pyx_ptype_7opendbc_3can_10packer_pyx_CANPacker __pyx_mstate_global->__pyx_ptype_7opendbc_3can_10packer_pyx_CANPacker