Skip to content

Commit f4347a7

Browse files
author
Martin
committed
Critical speed fix to MultiFrameDecoder + cleanup
1 parent 9610f1c commit f4347a7

File tree

14 files changed

+142
-270
lines changed

14 files changed

+142
-270
lines changed
Binary file not shown.

examples/data-processing/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,5 +94,5 @@ Often you'll see references to UDS extended PIDs, e.g. `0x220101`. Here, `0x22`
9494

9595
A UDS DBC file can use extended multiplexing to decode UDS signals, utilizing the SID and DID as sequential multiplexors to distinguish between different UDS service modes and DIDs. See the UDS DBC file examples for a starting point on how this can be constructed.
9696

97-
The script merges the reconstructed UDS frames into the original data (removing the original entries of the response ID). The result is a new raw dataframe that can be processed as you would normally do (using a suitable DBC file). The above example has an associated DBC file, `tp_uds_hyundai_soc.dbc`, which lets you extract e.g. State of Charge.
97+
The script merges the reconstructed UDS frames into the original data (removing the original entries of the response ID). The result is a new raw dataframe that can be processed as you would normally do (using a suitable DBC file). The above example has an associated DBC file, `tp_uds.dbc`, which lets you extract e.g. State of Charge.
9898

examples/data-processing/dbc_files/tp_j1939.dbc

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,15 @@ BS_:
3636
BU_:
3737

3838

39-
BO_ 2314277376 SingleFrame: 8 Vector__XXX
40-
SG_ SF_signal_1 : 16|8@0+ (0.25,0) [0|16383.75] "rpm" Vector__XXX
41-
42-
BO_ 2649751296 TransportMsg: 8 Vector__XXX
43-
SG_ M_20_signal_1 m32 : 16|8@1+ (0.25,20) [0|0] "unit" Vector__XXX
44-
SG_ M_20_signal_2 m32 : 24|16@1+ (1,0) [0|0] "unit" Vector__XXX
45-
SG_ M_60_signal_1 m96 : 24|8@1+ (1,0) [0|0] "unit" Vector__XXX
46-
SG_ requested_ID M : 0|8@1+ (1,0) [0|255] "unit" Vector__XXX
39+
BO_ 2566841342 EC1: 40 Vector__XXX
40+
SG_ EngineSpeedAtPoint5 : 96|16@1+ (0.125,0) [0|8031.875] "rpm" Vector__XXX
4741

4842

4943

5044
BA_DEF_ BO_ "VFrameFormat" ENUM "StandardCAN","ExtendedCAN","StandardCAN_FD","ExtendedCAN_FD","J1939PG";
5145
BA_DEF_ "ProtocolType" STRING ;
5246
BA_DEF_DEF_ "VFrameFormat" "";
53-
BA_DEF_DEF_ "ProtocolType" "";
47+
BA_DEF_DEF_ "ProtocolType" "J1939PG";
5448
BA_ "ProtocolType" "";
55-
BA_ "VFrameFormat" BO_ 2314277376 1;
56-
BA_ "VFrameFormat" BO_ 2649751296 1;
57-
58-
SG_MUL_VAL_ 2649751296 M_20_signal_1 requested_ID 32-32;
59-
SG_MUL_VAL_ 2649751296 M_20_signal_2 requested_ID 32-32;
60-
SG_MUL_VAL_ 2649751296 M_60_signal_1 requested_ID 96-96;
49+
BA_ "VFrameFormat" BO_ 2566841342 1;
6150

examples/data-processing/dbc_files/tp_nmea.dbc

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,42 @@ BS_:
3636
BU_:
3737

3838

39-
BO_ 2314277376 SingleFrame: 8 Vector__XXX
40-
SG_ SF_signal_1 : 16|8@0+ (0.25,0) [0|16383.75] "rpm" Vector__XXX
39+
BO_ 2583168510 gnssPositionData: 51 Vector__XXX
40+
SG_ sid : 0|8@1+ (1,0) [0|0] "" Vector__XXX
41+
SG_ date : 8|16@1+ (1,0) [0|0] "days" Vector__XXX
42+
SG_ time : 24|32@1+ (0.0001,0) [0|0] "s" Vector__XXX
43+
SG_ latitude : 56|64@1- (1e-16,0) [0|0] "deg" Vector__XXX
44+
SG_ longitude : 120|64@1- (1e-16,0) [0|0] "deg" Vector__XXX
45+
SG_ altitude : 184|64@1- (1e-06,0) [0|0] "m" Vector__XXX
46+
SG_ gnssType : 248|4@1+ (1,0) [0|0] "" Vector__XXX
47+
SG_ method : 252|4@1+ (1,0) [0|0] "" Vector__XXX
48+
SG_ integrity : 256|2@1+ (1,0) [0|0] "" Vector__XXX
49+
SG_ reserved : 258|6@1+ (1,0) [0|0] "" Vector__XXX
50+
SG_ numberOfSvs : 264|8@1+ (1,0) [0|0] "" Vector__XXX
51+
SG_ hdop : 272|16@1- (0.01,0) [0|0] "" Vector__XXX
52+
SG_ pdop : 288|16@1- (0.01,0) [0|0] "" Vector__XXX
53+
SG_ geoidalSeparation : 304|32@1- (0.01,0) [0|0] "m" Vector__XXX
54+
SG_ referenceStations : 336|8@1+ (1,0) [0|0] "" Vector__XXX
55+
SG_ referenceStationType : 344|4@1+ (1,0) [0|0] "" Vector__XXX
56+
SG_ referenceStationId : 348|12@1+ (1,0) [0|0] "None" Vector__XXX
57+
SG_ ageOfDgnssCorrections : 360|16@1+ (0.01,0) [0|0] "s" Vector__XXX
4158

42-
BO_ 2649751296 TransportMsg: 8 Vector__XXX
43-
SG_ M_20_signal_1 m32 : 16|8@1+ (0.25,20) [0|0] "unit" Vector__XXX
44-
SG_ M_20_signal_2 m32 : 24|16@1+ (1,0) [0|0] "unit" Vector__XXX
45-
SG_ M_60_signal_1 m96 : 24|8@1+ (1,0) [0|0] "unit" Vector__XXX
46-
SG_ requested_ID M : 0|8@1+ (1,0) [0|255] "unit" Vector__XXX
4759

4860

49-
50-
BA_DEF_ BO_ "VFrameFormat" ENUM "StandardCAN","ExtendedCAN","StandardCAN_FD","ExtendedCAN_FD","J1939PG";
61+
CM_ BO_ 2583168510 "GNSS Position Data";
62+
BA_DEF_ BO_ "VFrameFormat" ENUM "StandardCAN","ExtendedCAN","reserved","J1939PG";
63+
BA_DEF_ "DatabaseVersion" STRING ;
64+
BA_DEF_ "BusType" STRING ;
5165
BA_DEF_ "ProtocolType" STRING ;
52-
BA_DEF_DEF_ "VFrameFormat" "";
53-
BA_DEF_DEF_ "ProtocolType" "";
54-
BA_ "ProtocolType" "";
55-
BA_ "VFrameFormat" BO_ 2314277376 1;
56-
BA_ "VFrameFormat" BO_ 2649751296 1;
57-
58-
SG_MUL_VAL_ 2649751296 M_20_signal_1 requested_ID 32-32;
59-
SG_MUL_VAL_ 2649751296 M_20_signal_2 requested_ID 32-32;
60-
SG_MUL_VAL_ 2649751296 M_60_signal_1 requested_ID 96-96;
66+
BA_DEF_ "DatabaseCompiler" STRING ;
67+
BA_DEF_DEF_ "VFrameFormat" "J1939PG";
68+
BA_DEF_DEF_ "DatabaseVersion" "1.2";
69+
BA_DEF_DEF_ "BusType" "";
70+
BA_DEF_DEF_ "ProtocolType" "J1939";
71+
BA_DEF_DEF_ "DatabaseCompiler" "";
72+
BA_ "VFrameFormat" BO_ 2583168510 3;
73+
VAL_ 2583168510 gnssType 8 "Galileo" 7 "surveyed" 6 "integrated" 5 "Chayka" 4 "GPS+SBAS/WAAS+GLONASS" 3 "GPS+SBAS/WAAS" 2 "GPS+GLONASS" 1 "GLONASS" 0 "GPS" ;
74+
VAL_ 2583168510 method 8 "Simulate mode" 7 "Manual Input" 6 "Estimated (DR) mode" 5 "RTK float" 4 "RTK Fixed Integer" 3 "Precise GNSS" 2 "DGNSS fix" 1 "GNSS fix" 0 "no GNSS" ;
75+
VAL_ 2583168510 integrity 2 "Caution" 1 "Safe" 0 "No integrity checking" ;
76+
VAL_ 2583168510 referenceStationType 8 "Galileo" 7 "surveyed" 6 "integrated" 5 "Chayka" 4 "GPS+SBAS/WAAS+GLONASS" 3 "GPS+SBAS/WAAS" 2 "GPS+GLONASS" 1 "GLONASS" 0 "GPS" ;
6177

examples/data-processing/dbc_files/tp_nmea_2.dbc

Lines changed: 0 additions & 77 deletions
This file was deleted.

examples/data-processing/dbc_files/tp_uds_test.dbc

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)