Skip to content

Commit 6d0bcb9

Browse files
SluderSluder
committed
merge
2 parents 3274676 + 80df279 commit 6d0bcb9

16 files changed

+6627
-144
lines changed

Diff for: ‎BinIdentifier.py

+718
Large diffs are not rendered by default.

Diff for: ‎ClusterBins.py

+776
Large diffs are not rendered by default.

Diff for: ‎JsonParser.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
# Predefined functions containing sensor addresses for comparision's
1010
sensors = {
11-
'batt_voltage': ['0x9a56', '0x9f5b', '0xa166', '0xa307', '-0xae2c', '0xd982', '0xe1cd'],
12-
'vehicle_speed': ['0x9be8', '0x9dce', '0xa59d', '0xa9a7', '0xafc6', '0xb960'],
13-
'engine_speed': ['0xa59d', '0xa5ec', '0xa9a7', '0xafc6', '0xb5bf', '0xb960'],
14-
'water_temp': ['0x9b46', '0xab56'],
15-
'ignition_timing': ['0xdb1a', '0xda0f'],
16-
'airflow': ['0xddcd'],
17-
'throttle_position': ['0xe1cd'],
18-
'knock_correction': ['0xafc6']
11+
"batt_voltage": ["0x9a50", "0xa20b", "0xa000", "0xa0f0", "0xabfe", "0xd809", "0xddf8"],
12+
"vehicle_speed": ["0x9c10", "0x9f13", "0xa1b7", "0xa633", "0xad12", "0xb500", "0xb91b"],
13+
"engine_speed": ["0x9cbe", "0xa31a", "0xa633", "0xadf3", "0xb4c2", "0xb87e", "0xc0d1"],
14+
"water_temp": ["0x9b7c", "0xa90b"],
15+
"ignition_timing": ["0xf91b", "0xf93f"],
16+
"airflow": ["0xdb5b"],
17+
"throttle_position": ["0xdd53"],
18+
"knock_correction": ["0xb2f3"]
1919
}
2020
# How far left & right to show address range
2121
hex_margin = 250
@@ -207,7 +207,7 @@ def _create_tables(control_file, ecu_files):
207207
ecu_file = EcuFile(file_name, json_data[file_name])
208208

209209
# Pick out control file
210-
if ecu_file.name == '27-93-EG33':
210+
if ecu_file.name == '14-95-EJ20T':
211211
control_file = ecu_file
212212
else:
213213
ecu_files.append(ecu_file)

Diff for: ‎Main.py

-135
This file was deleted.

Diff for: ‎README.md

Whitespace-only changes.

Diff for: ‎bins/703943-1990-Euro-Legacy-EJ18.bin

-64 KB
Binary file not shown.

Diff for: ‎bins/743A17-1995-JDM-Legacy-TT.bin

-64 KB
Binary file not shown.

Diff for: ‎cluster_matches.json

+168
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,168 @@
1+
{
2+
"Cluster 1": {
3+
"742512-1994-JDM-SVX-EG33.bin": {
4+
"batt_voltage": "0x102f",
5+
"vehicle_speed": "0x1071",
6+
"engine_speed": "0x106f",
7+
"water_temp": "0x1185",
8+
"ignition_timing": "0x10a2",
9+
"airflow": "0x1283",
10+
"throttle_position": "0x1036",
11+
"knock_correction": "0x1089"
12+
},
13+
"742521-1994-USDM-SVX-EG33.bin": {
14+
"batt_voltage": "0x10b4",
15+
"vehicle_speed": "0x1071",
16+
"engine_speed": "0x106f",
17+
"water_temp": "0x1185",
18+
"ignition_timing": "0x11ac",
19+
"airflow": "0x1283",
20+
"throttle_position": "0x1036",
21+
"knock_correction": "0x1071"
22+
},
23+
"722527-1993-USDM-SVX-EG33.bin": {
24+
"batt_voltage": "0x10b4",
25+
"vehicle_speed": "0x1282",
26+
"engine_speed": "0x12b9",
27+
"water_temp": "0x1185",
28+
"ignition_timing": "0x10a2",
29+
"airflow": "0x1283",
30+
"throttle_position": "0x1036",
31+
"knock_correction": "0x12a7"
32+
},
33+
"722515-1992-JDM-SVX-EG33.bin": {
34+
"batt_voltage": "0x102f",
35+
"vehicle_speed": "0x1071",
36+
"engine_speed": "0x106f",
37+
"water_temp": "0x1185",
38+
"ignition_timing": "0x10a2",
39+
"airflow": "0x103a",
40+
"throttle_position": "0x1036",
41+
"knock_correction": "0x1089"
42+
},
43+
"722531-1996-UK-SVX-EG33.bin": {
44+
"batt_voltage": "0x1186",
45+
"vehicle_speed": "0x106e",
46+
"engine_speed": "0x106f",
47+
"water_temp": "0x1185",
48+
"ignition_timing": "0x10a2",
49+
"airflow": "0x1283",
50+
"throttle_position": "0x1036",
51+
"knock_correction": "0x1089"
52+
},
53+
"742541-1994-MidEast-SVX-EG33.bin": {
54+
"batt_voltage": "0x102f",
55+
"vehicle_speed": "0x105c",
56+
"engine_speed": "0x12b9",
57+
"water_temp": "0x1185",
58+
"ignition_timing": "0x10a2",
59+
"airflow": "0x1283",
60+
"throttle_position": "0x1036",
61+
"knock_correction": "0x1134"
62+
},
63+
"722521-1991-USDM-SVX-EG33.bin": {
64+
"batt_voltage": "0x10b4",
65+
"vehicle_speed": "0x1071",
66+
"engine_speed": "0x106f",
67+
"water_temp": "0x1185",
68+
"ignition_timing": "0x10a2",
69+
"airflow": "0x1283",
70+
"throttle_position": "0x1036",
71+
"knock_correction": "0x105a"
72+
},
73+
"722525-1992-USDM-SVX-EG33.bin": {
74+
"batt_voltage": "0x102f",
75+
"vehicle_speed": "0x1071",
76+
"engine_speed": "0x106f",
77+
"water_temp": "0x1185",
78+
"ignition_timing": "0x10a2",
79+
"airflow": "0x1283",
80+
"throttle_position": "0x1036",
81+
"knock_correction": "0x1237"
82+
}
83+
},
84+
"Cluster 2": {
85+
"74401E-1996-JDM-WrxSTiV2RA-7K.bin": {
86+
"batt_voltage": "0x1170",
87+
"vehicle_speed": "0x1075",
88+
"engine_speed": "0x1196",
89+
"water_temp": "0x11a2",
90+
"ignition_timing": "0x109e",
91+
"airflow": "0x1307",
92+
"throttle_position": "0x133b",
93+
"knock_correction": "0x1328"
94+
},
95+
"744014-1995-JDM-Wrx-EJ20T.bin": {
96+
"batt_voltage": "0x1170",
97+
"vehicle_speed": "0x1075",
98+
"engine_speed": "0x1196",
99+
"water_temp": "0x11a2",
100+
"ignition_timing": "0x109e",
101+
"airflow": "0x1307",
102+
"throttle_position": "0x133b",
103+
"knock_correction": "0x1328"
104+
},
105+
"74401A-1995-JDM-WrxRA-EJ20T.bin": {
106+
"batt_voltage": "0x1170",
107+
"vehicle_speed": "0x1075",
108+
"engine_speed": "0x1196",
109+
"water_temp": "0x11a2",
110+
"ignition_timing": "0x109e",
111+
"airflow": "0x1307",
112+
"throttle_position": "0x133b",
113+
"knock_correction": "0x1328"
114+
},
115+
"744011-1994-JDM-Wrx-EJ20T.bin": {
116+
"batt_voltage": "0x1170",
117+
"vehicle_speed": "0x1075",
118+
"engine_speed": "0x1073",
119+
"water_temp": "0x11a2",
120+
"ignition_timing": "0x109e",
121+
"airflow": "0x11fd",
122+
"throttle_position": "0x1073",
123+
"knock_correction": "0x1328"
124+
}
125+
},
126+
"Cluster 3": {
127+
"733257-1993-Canada-Legacy-EJ22.bin": {
128+
"batt_voltage": "0x1072",
129+
"vehicle_speed": "0x1075",
130+
"engine_speed": "0x1073",
131+
"water_temp": "0x11a9",
132+
"ignition_timing": "0x109e",
133+
"airflow": "0x1307",
134+
"throttle_position": "0x1031",
135+
"knock_correction": "0x127c"
136+
},
137+
"7232A5-1992-UK-Legacy-EJ22.bin": {
138+
"batt_voltage": "0x1170",
139+
"vehicle_speed": "0x1075",
140+
"engine_speed": "0x1073",
141+
"water_temp": "0x11b0",
142+
"ignition_timing": "0x109e",
143+
"airflow": "0x1033",
144+
"throttle_position": {},
145+
"knock_correction": "0x105e"
146+
},
147+
"7237A2-1992-EDM-Legacy-EJ20.bin": {
148+
"batt_voltage": "0x1170",
149+
"vehicle_speed": "0x1075",
150+
"engine_speed": "0x1073",
151+
"water_temp": "0x11b0",
152+
"ignition_timing": "0x109e",
153+
"airflow": "0x103a",
154+
"throttle_position": "0x128a",
155+
"knock_correction": "0x1132"
156+
},
157+
"7237A5-1992-EDM-Legacy-EJ20.bin": {
158+
"batt_voltage": "0x11ce",
159+
"vehicle_speed": "0x1075",
160+
"engine_speed": "0x1073",
161+
"water_temp": "0x11b0",
162+
"ignition_timing": "0x109e",
163+
"airflow": "0x103a",
164+
"throttle_position": {},
165+
"knock_correction": "0x105e"
166+
}
167+
}
168+
}

0 commit comments

Comments
 (0)