Updated utils.py and requirements.txt

Author: MatinF

examples/data-processing/dbc_files/tp_uds.dbc

@@ -37,15 +37,15 @@ BU_:
 
 
 BO_ 2028 Battery: 62 Vector__XXX
- SG_ M_SID_0x220101_StateOfChargeBMS m257 : 56|8@1+ (0.5,0) [0|0] "%" Vector__XXX
- SG_ response m98M : 15|16@0+ (1,0) [0|0] "unit" Vector__XXX
- SG_ service M : 7|8@0+ (1,0) [0|0] "" Vector__XXX
+ SG_ M_SID_0x220101_StateOfChargeBMS m257 : 64|8@1+ (0.5,0) [0|0] "%" Vector__XXX
+ SG_ response m98M : 23|16@0+ (1,0) [0|0] "unit" Vector__XXX
+ SG_ service M : 15|8@0+ (1,0) [0|0] "" Vector__XXX
 
 BO_ 1979 Temperature: 54 Vector__XXX
- SG_ M_SID_0x220100_IndoorTemp m256 : 64|8@1+ (0.5,-40) [0|0] "degC" Vector__XXX
- SG_ response m98 : 15|16@0+ (1,0) [0|0] "unit" Vector__XXX
- SG_ service M : 7|8@0+ (1,0) [0|0] "" Vector__XXX
- SG_ M_SID_0x220100_OutdoorTemp : 79|8@0+ (0.5,-40) [0|0] "" Vector__XXX
+ SG_ M_SID_0x220100_IndoorTemp m256 : 72|8@1+ (0.5,-40) [0|0] "degC" Vector__XXX
+ SG_ response m98 : 23|16@0+ (1,0) [0|0] "unit" Vector__XXX
+ SG_ service M : 15|8@0+ (1,0) [0|0] "" Vector__XXX
+ SG_ M_SID_0x220100_OutdoorTemp : 87|8@0+ (0.5,-40) [0|0] "" Vector__XXX
 
 
 

examples/data-processing/dbc_files/tp_uds_nissan.dbc

@@ -37,12 +37,12 @@ BU_:
 
 
 BO_ 1979 SoC_Temp: 55 Vector__XXX
- SG_ SoC m1 : 271|24@0+ (1e-04,0) [0|0] "%" Vector__XXX
- SG_ BatPackTemp1 m4 : 32|8@1+ (1,0) [0|0] "%" Vector__XXX
- SG_ BatPackTemp2 m4 : 56|8@1+ (1,0) [0|0] "%" Vector__XXX
- SG_ BatPackTemp4 m4 : 104|8@1+ (1,0) [0|0] "%" Vector__XXX
- SG_ response m97M : 8|8@1+ (1,0) [0|0] "" Vector__XXX
- SG_ service M : 0|8@1+ (1,0) [0|0] "" Vector__XXX
+ SG_ SoC m1 : 279|24@0+ (0.0001,0) [0|0] "%" Vector__XXX
+ SG_ BatPackTemp1 m4 : 40|8@1+ (1,0) [0|0] "%" Vector__XXX
+ SG_ BatPackTemp2 m4 : 64|8@1+ (1,0) [0|0] "%" Vector__XXX
+ SG_ BatPackTemp4 m4 : 112|8@1+ (1,0) [0|0] "%" Vector__XXX
+ SG_ response m97M : 16|8@1+ (1,0) [0|0] "" Vector__XXX
+ SG_ service M : 8|8@1+ (1,0) [0|0] "" Vector__XXX
 
 
 

examples/data-processing/requirements.txt

@@ -19,8 +19,8 @@ J1939-PGN==0.4
 jmespath==0.10.0
 mdf-iter>=0.0.7
 multidict==5.1.0
-numpy==1.20.3
-pandas==1.2.4
+numpy==1.23.2
+pandas==1.4.3
 pathlib2==2.3.5
 python-dateutil==2.8.1
 pytz==2021.1

examples/data-processing/utils.py

@@ -172,12 +172,12 @@ def extract_phys(self, df_raw):
         for db in self.db_list:
             df_decoder = can_decoder.DataFrameDecoder(db)
 
-            df_phys_temp = pd.DataFrame()
+            df_phys_temp = []
             for length, group in df_raw.groupby("DataLength"):
                 df_phys_group = df_decoder.decode_frame(group)
-                df_phys_temp = df_phys_temp.append(df_phys_group)
+                df_phys_temp.append(df_phys_group)
 
-            df_phys = df_phys.append(df_phys_temp.sort_index())
+            df_phys = pd.concat(df_phys_temp,ignore_index=False).sort_index()
 
         # remove duplicates in case multiple DBC files contain identical signals
         df_phys["datetime"] = df_phys.index
@@ -274,9 +274,10 @@ def __init__(self, tp_type=""):
             "SINGLE_FRAME": 0x00,
             "FIRST_FRAME": 0x10,
             "CONSEQ_FRAME": 0x20,
-            "ff_payload_start": 2,
+            "ff_payload_start": 1,
             "bam_pgn": -1,
             "res_id_list_hex": [
+                "0x7A8",
                 "0x7E0",
                 "0x7E9",
                 "0x7EA",
@@ -287,6 +288,10 @@ def __init__(self, tp_type=""):
                 "0x7EF",
                 "0x7EA",
                 "0x7BB",
+                "0x7C8",
+                "0x7CE",
+                "0x7D1",
+                "0x17fe007b",
             ],
         }
 
@@ -383,13 +388,13 @@ def calculate_sa(self, frame_id):
         return sa
 
     def construct_new_tp_frame(self, base_frame, payload_concatenated, can_id):
-        new_frame = base_frame
-        new_frame.at["DataBytes"] = payload_concatenated
-        new_frame.at["DLC"] = 0
-        new_frame.at["DataLength"] = len(payload_concatenated)
+        new_frame = base_frame.copy(deep=True)
+        new_frame.loc["DataBytes"] = payload_concatenated
+        new_frame.loc["DLC"] = 0
+        new_frame.loc["DataLength"] = len(payload_concatenated)
 
         if can_id:
-            new_frame.at["ID"] = can_id
+            new_frame.loc["ID"] = can_id
 
         return new_frame