From ce0d90903caa993010d0873d429eec2ffdd63189 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Mon, 20 Mar 2017 10:10:34 +0000 Subject: [PATCH] Update toyota example Change-Id: Ied4f715b486a2d4ef2b5ba4d49bbc339f95bffad Signed-off-by: Romain Forlot --- examples/toyota/configuration-generated.cpp | 4 +-- examples/toyota/signals.json | 40 ++++++++++++++--------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/examples/toyota/configuration-generated.cpp b/examples/toyota/configuration-generated.cpp index b7a761e7..4ffc9022 100644 --- a/examples/toyota/configuration-generated.cpp +++ b/examples/toyota/configuration-generated.cpp @@ -6,7 +6,7 @@ configuration_t::configuration_t() , can_message_definition_ { { - can_message_definition_t(0, "vcan0", 0x620, can_message_format_t::STANDARD, frequency_clock_t(0.00000f), true) + can_message_definition_t(0, "can0", 0x620, can_message_format_t::STANDARD, frequency_clock_t(0.00000f), true) } } , can_signals_ @@ -333,7 +333,7 @@ configuration_t::configuration_t() const std::string configuration_t::get_diagnostic_bus() const { - return "vcan0"; + return "can0"; } diff --git a/examples/toyota/signals.json b/examples/toyota/signals.json index b9d20409..6c895846 100644 --- a/examples/toyota/signals.json +++ b/examples/toyota/signals.json @@ -6,7 +6,7 @@ "commands": [], "messages": { "0x620": { - "bus": "vcan0", + "bus": "can0", "signals": { "doors.driver.open": { "generic_name": "doors.driver.open", @@ -48,133 +48,133 @@ }, "diagnostic_messages": [ { - "bus": "vcan0", + "bus": "can0", "pid": 4, "name": "engine.load", "frequency": 5, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "vcan0", + "bus": "can0", "pid": 5, "name": "engine.coolant.temperature", "frequency": 1, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "vcan0", + "bus": "can0", "pid": 10, "name": "fuel.pressure", "frequency": 1, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "vcan0", + "bus": "can0", "pid": 11, "name": "intake.manifold.pressure", "frequency": 1, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "vcan0", + "bus": "can0", "pid": 12, "name": "engine.speed", "frequency": 5, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "vcan0", + "bus": "can0", "pid": 13, "name": "vehicle.speed", "frequency": 5, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "vcan0", + "bus": "can0", "pid": 15, "name": "intake.air.temperature", "frequency": 1, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "vcan0", + "bus": "can0", "pid": 16, "name": "mass.airflow", "frequency": 5, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "vcan0", + "bus": "can0", "pid": 17, "name": "throttle.position", "frequency": 5, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "vcan0", + "bus": "can0", "pid": 31, "name": "running.time", "frequency": 1, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "vcan0", + "bus": "can0", "pid": 45, "name": "EGR.error", "frequency": 0, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "vcan0", + "bus": "can0", "pid": 47, "name": "fuel.level", "frequency": 1, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "vcan0", + "bus": "can0", "pid": 51, "name": "barometric.pressure", "frequency": 1, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "vcan0", + "bus": "can0", "pid": 76, "name": "commanded.throttle.position", "frequency": 1, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "vcan0", + "bus": "can0", "pid": 82, "name": "ethanol.fuel.percentage", "frequency": 1, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "vcan0", + "bus": "can0", "pid": 90, "name": "accelerator.pedal.position", "frequency": 5, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "vcan0", + "bus": "can0", "pid": 91, "name": "hybrid.battery-pack.remaining.life", "frequency": 5, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "vcan0", + "bus": "can0", "pid": 92, "name": "engine.oil.temperature", "frequency": 1, "decoder": "decoder_t::decode_obd2_response" }, { - "bus": "vcan0", + "bus": "can0", "pid": 99, "name": "engine.torque", "frequency": 1, -- 2.16.6