Merge pull request RCMast3r#16 from RCMast3r/proto_gen_hotfix

Proto gen hotfix
hytech-racing · Apr 2, 2024 · b2c2c05 · b2c2c05
2 parents dfab592 + a90c7c2
commit b2c2c05
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@ result
 result/
 .env
 .idea/
-*.mat
+*.mat
+*.log
diff --git a/py_data_acq/py_data_acq/common/protobuf_helpers.py b/py_data_acq/py_data_acq/common/protobuf_helpers.py
@@ -25,6 +25,7 @@ def pack_protobuf_msg(cantools_dict: dict, msg_name: str, message_classes):
         pb_msg = message_classes[msg_name]()
     for key in cantools_dict.keys():
         if(type(cantools_dict[key]) is namedsignalvalue.NamedSignalValue):
+            print(msg_name)
             setattr(pb_msg, key, str(cantools_dict[key].value))
         else:
             setattr(pb_msg, key, cantools_dict[key])

diff --git a/py_dbc_proto_gen/dbc_to_proto.py b/py_dbc_proto_gen/dbc_to_proto.py
@@ -61,16 +61,31 @@ def append_proto_message_from_CAN_message(file, can_msg: can.message.Message):
                 + str(line_index)
                 + ";"
             )
-        elif sig.length > 1:
+        elif (sig.length > 1 and sig.length <=32):
             line = (
                 "    int32 "
                 + create_field_name(sig.name)
                 + " = "
                 + str(line_index)
                 + ";"
             )
+        elif (sig.length >= 32 and not sig.is_signed):
+            line = (
+                "    uint64 "
+                + create_field_name(sig.name)
+                + " = "
+                + str(line_index)
+                + ";"
+            )
         else:
-            print("ERROR")
+            line = (
+                "    int64 "
+                + create_field_name(sig.name)
+                + " = "
+                + str(line_index)
+                + ";"
+            )
+
         file.write(line + "\n")
     file.write("}\n\n")
     return file