From 6ed34a503ac6a32be4a06721b9797e7d94ba8e22 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 6 Jun 2017 10:23:51 +0200 Subject: Update signals.json and generated files. Adding fake windows signals, Fix wrong bit_position about doors (not fake signal) In fact all signals are fake except of doors signals and OBD2 diagnostic messages. Change-Id: Ia5877bb9720b11b0ff3593788d3e79324b0fa44e Signed-off-by: Romain Forlot --- CAN-binder/examples/toyota/signals.json | 93 ++++++++++++++++++++++----------- 1 file changed, 63 insertions(+), 30 deletions(-) (limited to 'CAN-binder/examples/toyota') diff --git a/CAN-binder/examples/toyota/signals.json b/CAN-binder/examples/toyota/signals.json index 91c56ac..cd08918 100644 --- a/CAN-binder/examples/toyota/signals.json +++ b/CAN-binder/examples/toyota/signals.json @@ -6,47 +6,80 @@ "commands": [], "messages": { "0x620": { - "bus": "can0", + "bus": "hs", "signals": { "doors.driver.open": { "generic_name": "doors.front_left.open", - "bit_position": 46, + "bit_position": 43, "bit_size": 1, "factor": 1.0, "offset": 0, "decoder": "decoder_t::booleanDecoder"}, "doors.passenger.open": { "generic_name": "doors.front_right.open", - "bit_position": 47, + "bit_position": 44, "bit_size": 1, "factor": 1.0, "offset": 0, "decoder": "decoder_t::booleanDecoder"}, "doors.rearleft.open": { "generic_name": "doors.rear_left.open", - "bit_position": 54, + "bit_position": 46, "bit_size": 1, "factor": 1.0, "offset": 0, "decoder": "decoder_t::booleanDecoder"}, "doors.rearright.open": { "generic_name": "doors.rear_right.open", - "bit_position": 53, + "bit_position": 45, "bit_size": 4, "factor": 1.0, "offset": 0, "decoder": "decoder_t::booleanDecoder"}, "doors.coffer.open": { "generic_name": "doors.boot.open", - "bit_position": 56, + "bit_position": 47, + "bit_size": 1, + "factor": 1.0, + "offset": 0, + "decoder": "decoder_t::booleanDecoder"} + } + }, + "0x799": { + "bus": "hs", + "signals": { + "windows.driver.open": { + "generic_name": "windows.front_left.open", + "bit_position": 43, + "bit_size": 1, + "factor": 1.0, + "offset": 0, + "decoder": "decoder_t::booleanDecoder"}, + "windows.passenger.open": { + "generic_name": "windows.front_right.open", + "bit_position": 44, + "bit_size": 1, + "factor": 1.0, + "offset": 0, + "decoder": "decoder_t::booleanDecoder"}, + "windows.rearleft.open": { + "generic_name": "windows.rear_left.open", + "bit_position": 46, "bit_size": 1, "factor": 1.0, "offset": 0, + "decoder": "decoder_t::booleanDecoder"}, + "windows.rearright.open": { + "generic_name": "windows.rear_right.open", + "bit_position": 45, + "bit_size": 4, + "factor": 1.0, + "offset": 0, "decoder": "decoder_t::booleanDecoder"} } }, "0x3D9": { - "bus": "can0", + "bus": "hs", "signals": { "PT_FuelLevelPct": { "generic_name": "fuel.level", @@ -73,7 +106,7 @@ } }, "0x4D1": { - "bus": "can0", + "bus": "hs", "signals": { "PT_EngineOilTempHigh": { "generic_name": "engine.oil.temp.high", @@ -93,7 +126,7 @@ } }, "0x3E9": { - "bus": "can0", + "bus": "hs", "signals": { "PT_VehicleAvgSpeed": { "generic_name": "vehicle.average.speed", @@ -107,147 +140,147 @@ }, "diagnostic_messages": [ { - "bus": "can0", + "bus": "hs", "pid": 4, "name": "engine.load", "frequency": 5, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "can0", + "bus": "hs", "pid": 5, "name": "engine.coolant.temperature", "frequency": 1, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "can0", + "bus": "hs", "pid": 10, "name": "fuel.pressure", "frequency": 1, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "can0", + "bus": "hs", "pid": 11, "name": "intake.manifold.pressure", "frequency": 1, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "can0", + "bus": "hs", "pid": 12, "name": "engine.speed", "frequency": 5, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "can0", + "bus": "hs", "pid": 13, "name": "vehicle.speed", "frequency": 5, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "can0", + "bus": "hs", "pid": 15, "name": "intake.air.temperature", "frequency": 1, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "can0", + "bus": "hs", "pid": 16, "name": "mass.airflow", "frequency": 5, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "can0", + "bus": "hs", "pid": 17, "name": "throttle.position", "frequency": 5, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "can0", + "bus": "hs", "pid": 31, "name": "running.time", "frequency": 1, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "can0", + "bus": "hs", "pid": 45, "name": "EGR.error", "frequency": 0, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "can0", + "bus": "hs", "pid": 47, "name": "fuel.level", "frequency": 1, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "can0", + "bus": "hs", "pid": 51, "name": "barometric.pressure", "frequency": 1, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "can0", + "bus": "hs", "pid": 70, "name": "ambient.air.temperature", "frequency": 1, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "can0", + "bus": "hs", "pid": 76, "name": "commanded.throttle.position", "frequency": 1, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "can0", + "bus": "hs", "pid": 82, "name": "ethanol.fuel.percentage", "frequency": 1, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "can0", + "bus": "hs", "pid": 90, "name": "accelerator.pedal.position", "frequency": 5, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "can0", + "bus": "hs", "pid": 91, "name": "hybrid.battery-pack.remaining.life", "frequency": 5, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "can0", + "bus": "hs", "pid": 92, "name": "engine.oil.temperature", "frequency": 1, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "can0", + "bus": "hs", "pid": 94, "name": "engine.fuel.rate", "frequency": 1, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "can0", + "bus": "hs", "pid": 99, "name": "engine.torque", "frequency": 1, -- cgit 1.2.3-korg