From eb56fff37a4a2738df7add08779db51a0a6f38e2 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 12 Apr 2022 10:22:11 -0700 Subject: [PATCH 1/9] Honda: remove interceptor scaling (#588) * update threshold * generate --- acura_ilx_2016_can_generated.dbc | 4 ++-- acura_rdx_2018_can_generated.dbc | 4 ++-- generator/honda/_comma.dbc | 4 ++-- honda_civic_touring_2016_can_generated.dbc | 4 ++-- honda_clarity_hybrid_2018_can_generated.dbc | 4 ++-- honda_crv_executive_2016_can_generated.dbc | 4 ++-- honda_crv_touring_2016_can_generated.dbc | 4 ++-- honda_fit_ex_2018_can_generated.dbc | 4 ++-- honda_fit_hybrid_2018_can_generated.dbc | 4 ++-- honda_odyssey_exl_2018_generated.dbc | 4 ++-- honda_odyssey_extreme_edition_2018_china_can_generated.dbc | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/acura_ilx_2016_can_generated.dbc b/acura_ilx_2016_can_generated.dbc index 56770bca22..d01658693b 100644 --- a/acura_ilx_2016_can_generated.dbc +++ b/acura_ilx_2016_can_generated.dbc @@ -10,8 +10,8 @@ BO_ 512 GAS_COMMAND: 6 EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (0.253984064,-83.3) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" EON + SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON + SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON diff --git a/acura_rdx_2018_can_generated.dbc b/acura_rdx_2018_can_generated.dbc index 49ae842343..0837789b6e 100644 --- a/acura_rdx_2018_can_generated.dbc +++ b/acura_rdx_2018_can_generated.dbc @@ -10,8 +10,8 @@ BO_ 512 GAS_COMMAND: 6 EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (0.253984064,-83.3) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" EON + SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON + SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON diff --git a/generator/honda/_comma.dbc b/generator/honda/_comma.dbc index c96250baed..8be69203ef 100644 --- a/generator/honda/_comma.dbc +++ b/generator/honda/_comma.dbc @@ -6,8 +6,8 @@ BO_ 512 GAS_COMMAND: 6 EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (0.253984064,-83.3) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" EON + SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON + SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON diff --git a/honda_civic_touring_2016_can_generated.dbc b/honda_civic_touring_2016_can_generated.dbc index 3a2a196fd5..8191daa1a9 100644 --- a/honda_civic_touring_2016_can_generated.dbc +++ b/honda_civic_touring_2016_can_generated.dbc @@ -10,8 +10,8 @@ BO_ 512 GAS_COMMAND: 6 EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (0.253984064,-83.3) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" EON + SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON + SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON diff --git a/honda_clarity_hybrid_2018_can_generated.dbc b/honda_clarity_hybrid_2018_can_generated.dbc index c1478c1039..b9d0e18936 100644 --- a/honda_clarity_hybrid_2018_can_generated.dbc +++ b/honda_clarity_hybrid_2018_can_generated.dbc @@ -10,8 +10,8 @@ BO_ 512 GAS_COMMAND: 6 EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (0.253984064,-83.3) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" EON + SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON + SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON diff --git a/honda_crv_executive_2016_can_generated.dbc b/honda_crv_executive_2016_can_generated.dbc index aa11f190c6..ac150c1090 100644 --- a/honda_crv_executive_2016_can_generated.dbc +++ b/honda_crv_executive_2016_can_generated.dbc @@ -10,8 +10,8 @@ BO_ 512 GAS_COMMAND: 6 EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (0.253984064,-83.3) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" EON + SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON + SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON diff --git a/honda_crv_touring_2016_can_generated.dbc b/honda_crv_touring_2016_can_generated.dbc index b32b6cb597..105ded5676 100644 --- a/honda_crv_touring_2016_can_generated.dbc +++ b/honda_crv_touring_2016_can_generated.dbc @@ -10,8 +10,8 @@ BO_ 512 GAS_COMMAND: 6 EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (0.253984064,-83.3) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" EON + SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON + SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON diff --git a/honda_fit_ex_2018_can_generated.dbc b/honda_fit_ex_2018_can_generated.dbc index e41b529b51..2d6b6204e9 100644 --- a/honda_fit_ex_2018_can_generated.dbc +++ b/honda_fit_ex_2018_can_generated.dbc @@ -10,8 +10,8 @@ BO_ 512 GAS_COMMAND: 6 EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (0.253984064,-83.3) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" EON + SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON + SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON diff --git a/honda_fit_hybrid_2018_can_generated.dbc b/honda_fit_hybrid_2018_can_generated.dbc index 7ad3ffd7ce..f28dab5b06 100644 --- a/honda_fit_hybrid_2018_can_generated.dbc +++ b/honda_fit_hybrid_2018_can_generated.dbc @@ -10,8 +10,8 @@ BO_ 512 GAS_COMMAND: 6 EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (0.253984064,-83.3) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" EON + SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON + SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON diff --git a/honda_odyssey_exl_2018_generated.dbc b/honda_odyssey_exl_2018_generated.dbc index a684234c58..86a4f85647 100644 --- a/honda_odyssey_exl_2018_generated.dbc +++ b/honda_odyssey_exl_2018_generated.dbc @@ -10,8 +10,8 @@ BO_ 512 GAS_COMMAND: 6 EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (0.253984064,-83.3) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" EON + SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON + SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON diff --git a/honda_odyssey_extreme_edition_2018_china_can_generated.dbc b/honda_odyssey_extreme_edition_2018_china_can_generated.dbc index f0c5c27086..d0c327d1e5 100644 --- a/honda_odyssey_extreme_edition_2018_china_can_generated.dbc +++ b/honda_odyssey_extreme_edition_2018_china_can_generated.dbc @@ -10,8 +10,8 @@ BO_ 512 GAS_COMMAND: 6 EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (0.253984064,-83.3) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" EON + SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON + SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON From 004db342a825155f7bd03e7d08f3861e18b23795 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 12 Apr 2022 22:34:27 -0700 Subject: [PATCH 2/9] CANParser: add flag for bus timeout (#586) * CANParser: add flag for bus timeout * bump to 500ms * 10x most frequent msg * little test * per bus * Update can/parser.cc --- can/common.h | 3 +++ can/common.pxd | 1 + can/parser.cc | 15 +++++++++++ can/parser_pyx.pyx | 2 ++ can/tests/test_packer_parser.py | 44 ++++++++++++++++++++++++++++++++- 5 files changed, 64 insertions(+), 1 deletion(-) diff --git a/can/common.h b/can/common.h index 5041eaf251..c9bd6f6315 100644 --- a/can/common.h +++ b/can/common.h @@ -60,7 +60,10 @@ class CANParser { public: bool can_valid = false; + bool bus_timeout = false; uint64_t last_sec = 0; + uint64_t last_nonempty_sec = 0; + uint64_t bus_timeout_threshold = 0; CANParser(int abus, const std::string& dbc_name, const std::vector &options, diff --git a/can/common.pxd b/can/common.pxd index 107d0c2304..eddc7e2503 100644 --- a/can/common.pxd +++ b/can/common.pxd @@ -74,6 +74,7 @@ cdef extern from "common.h": cdef cppclass CANParser: bool can_valid + bool bus_timeout CANParser(int, string, vector[MessageParseOptions], vector[SignalParseOptions]) void update_string(string, bool) vector[SignalValue] query_latest() diff --git a/can/parser.cc b/can/parser.cc index 96b6b1568a..2b7f6c868f 100644 --- a/can/parser.cc +++ b/can/parser.cc @@ -108,6 +108,8 @@ CANParser::CANParser(int abus, const std::string& dbc_name, assert(dbc); init_crc_lookup_tables(); + bus_timeout_threshold = std::numeric_limits::max(); + for (const auto& op : options) { MessageState &state = message_states[op.address]; state.address = op.address; @@ -116,6 +118,9 @@ CANParser::CANParser(int abus, const std::string& dbc_name, // msg is not valid if a message isn't received for 10 consecutive steps if (op.check_frequency > 0) { state.check_threshold = (1000000000ULL / op.check_frequency) * 10; + + // bus timeout threshold should be 10x the fastest msg + bus_timeout_threshold = std::min(bus_timeout_threshold, state.check_threshold); } const Msg* msg = NULL; @@ -213,6 +218,8 @@ void CANParser::update_string(const std::string &data, bool sendcan) { void CANParser::UpdateCans(uint64_t sec, const capnp::List::Reader& cans) { //DEBUG("got %d messages\n", cans.size()); + bool bus_empty = true; + // parse the messages for (int i = 0; i < cans.size(); i++) { auto cmsg = cans[i]; @@ -220,6 +227,8 @@ void CANParser::UpdateCans(uint64_t sec, const capnp::List::Rea // DEBUG("skip %d: wrong bus\n", cmsg.getAddress()); continue; } + bus_empty = false; + auto state_it = message_states.find(cmsg.getAddress()); if (state_it == message_states.end()) { // DEBUG("skip %d: not specified\n", cmsg.getAddress()); @@ -243,6 +252,12 @@ void CANParser::UpdateCans(uint64_t sec, const capnp::List::Rea memcpy(data.data(), dat.begin(), dat.size()); state_it->second.parse(sec, data); } + + // update bus timeout + if (!bus_empty) { + last_nonempty_sec = sec; + } + bus_timeout = (sec - last_nonempty_sec) > bus_timeout_threshold; } #endif diff --git a/can/parser_pyx.pyx b/can/parser_pyx.pyx index b5f381962d..5b30cc50ef 100644 --- a/can/parser_pyx.pyx +++ b/can/parser_pyx.pyx @@ -30,6 +30,7 @@ cdef class CANParser: dict vl dict vl_all bool can_valid + bool bus_timeout string dbc_name int can_invalid_cnt @@ -111,6 +112,7 @@ cdef class CANParser: if self.can.can_valid: self.can_invalid_cnt = 0 self.can_valid = self.can_invalid_cnt < CAN_INVALID_CNT + self.bus_timeout = self.can.bus_timeout new_vals = self.can.query_latest() for cv in new_vals: diff --git a/can/tests/test_packer_parser.py b/can/tests/test_packer_parser.py index e7710c769d..92b398cd7c 100755 --- a/can/tests/test_packer_parser.py +++ b/can/tests/test_packer_parser.py @@ -7,10 +7,13 @@ from opendbc.can.packer import CANPacker # Python implementation so we don't have to depend on boardd -def can_list_to_can_capnp(can_msgs, msgtype='can'): +def can_list_to_can_capnp(can_msgs, msgtype='can', logMonoTime=None): dat = messaging.new_message() dat.init(msgtype, len(can_msgs)) + if logMonoTime is not None: + dat.logMonoTime = logMonoTime + for i, can_msg in enumerate(can_msgs): if msgtype == 'sendcan': cc = dat.sendcan[i] @@ -149,6 +152,45 @@ def test_subaru(self): idx += 1 + def test_bus_timeout(self): + """Test CAN bus timeout detection""" + dbc_file = "honda_civic_touring_2016_can_generated" + + freq = 100 + checks = [("VSA_STATUS", freq), ("STEER_MOTOR_TORQUE", freq/2)] + + parser = CANParser(dbc_file, [], checks, 0) + packer = CANPacker(dbc_file) + + i = 0 + def send_msg(blank=False): + nonlocal i + i += 1 + t = i*((1 / freq) * 1e9) + + if blank: + msgs = [] + else: + msgs = [packer.make_can_msg("VSA_STATUS", 0, {}), ] + + can = can_list_to_can_capnp(msgs, logMonoTime=t) + parser.update_strings([can, ]) + + # all good, no timeout + for _ in range(1000): + send_msg() + self.assertFalse(parser.bus_timeout, str(_)) + + # timeout after 10 blank msgs + for n in range(200): + send_msg(blank=True) + self.assertEqual(n >= 10, parser.bus_timeout) + + # no timeout immediately after seen again + send_msg() + self.assertFalse(parser.bus_timeout) + + def test_updated(self): """Test updated value dict""" dbc_file = "honda_civic_touring_2016_can_generated" From bdbf186962e7aaf63696e72ee3336145e97794df Mon Sep 17 00:00:00 2001 From: Cameron Clough Date: Wed, 13 Apr 2022 17:48:25 +0100 Subject: [PATCH 3/9] add missing import for std::numeric_limits<...>::max() (#589) --- can/parser.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/can/parser.cc b/can/parser.cc index 2b7f6c868f..c396c7b179 100644 --- a/can/parser.cc +++ b/can/parser.cc @@ -1,6 +1,7 @@ #include #include #include +#include #include #include @@ -61,7 +62,7 @@ bool MessageState::parse(uint64_t sec, const std::vector &dat) { bool counter_failed = false; if (!ignore_counter) { - if (sig.type == SignalType::HONDA_COUNTER || sig.type == SignalType::VOLKSWAGEN_COUNTER || sig.type == SignalType::PEDAL_COUNTER) { + if (sig.type == SignalType::HONDA_COUNTER || sig.type == SignalType::VOLKSWAGEN_COUNTER || sig.type == SignalType::PEDAL_COUNTER) { counter_failed = !update_counter_generic(tmp, sig.size); } } From 025e9eed4055ec9590dee578b5b6970bc68db1c5 Mon Sep 17 00:00:00 2001 From: Igor Biletksyy Date: Thu, 14 Apr 2022 17:01:39 -0700 Subject: [PATCH 4/9] body: add motors currents msg --- comma_body.dbc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/comma_body.dbc b/comma_body.dbc index c5391652ab..c7e9b12ad0 100644 --- a/comma_body.dbc +++ b/comma_body.dbc @@ -21,6 +21,12 @@ BO_ 515 BODY_DATA: 4 XXX SG_ BATT_PERCENTAGE : 23|7@0+ (1,0) [0|100] "" XXX SG_ CHARGER_CONNECTED : 16|1@0+ (1,0) [0|1] "" XXX +BO_ 516 MOTORS_CURRENT: 8 XXX + SG_ LEFT_PHA_AB : 7|16@0- (1,0) [-32768|32767] "" XXX + SG_ LEFT_PHA_BC : 23|16@0- (1,0) [-32768|32767] "" XXX + SG_ RIGHT_PHA_AB : 39|16@0- (1,0) [-32768|32767] "" XXX + SG_ RIGHT_PHA_BC : 55|16@0- (1,0) [-32768|32767] "" XXX + BO_ 592 TORQUE_CMD: 6 XXX SG_ TORQUE_L : 7|16@0- (1,0) [-1000|1000] "" XXX SG_ TORQUE_R : 23|16@0- (1,0) [-1000|1000] "" XXX From 35cf5c9e5dbaeb8b8a36c65a396036fa7d4d1055 Mon Sep 17 00:00:00 2001 From: Igor Biletksyy Date: Fri, 15 Apr 2022 13:47:41 -0700 Subject: [PATCH 5/9] body: add cells count, fix bugs --- comma_body.dbc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/comma_body.dbc b/comma_body.dbc index c7e9b12ad0..1928c50bb2 100644 --- a/comma_body.dbc +++ b/comma_body.dbc @@ -18,8 +18,9 @@ BO_ 514 VAR_VALUES: 3 XXX BO_ 515 BODY_DATA: 4 XXX SG_ MCU_TEMP : 7|8@0+ (0.1,0) [0|125] "" XXX SG_ BATT_VOLTAGE : 15|16@0+ (0.01,0) [0|60] "" XXX - SG_ BATT_PERCENTAGE : 23|7@0+ (1,0) [0|100] "" XXX - SG_ CHARGER_CONNECTED : 16|1@0+ (1,0) [0|1] "" XXX + SG_ BATT_PERCENTAGE : 31|7@0+ (1,0) [0|100] "" XXX + SG_ CHARGER_CONNECTED : 24|1@0+ (1,0) [0|1] "" XXX + SG_ CELLS_COUNT : 35|4@0+ (1,0) [0|15] "" XXX BO_ 516 MOTORS_CURRENT: 8 XXX SG_ LEFT_PHA_AB : 7|16@0- (1,0) [-32768|32767] "" XXX From 9f3902657df4ff2d359d6c1686d7c008d27b7c7a Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 19 Apr 2022 10:55:34 -0700 Subject: [PATCH 6/9] cleanup sconstruct --- SConstruct | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index dbcaa83f93..e25b9760f7 100644 --- a/SConstruct +++ b/SConstruct @@ -53,9 +53,8 @@ env = Environment( tools=["default", "cython"] ) -QCOM_REPLAY = False common = '' -Export('env', 'zmq', 'arch', 'QCOM_REPLAY', 'common') +Export('env', 'zmq', 'arch', 'common') cereal = [File('#cereal/libcereal.a')] messaging = [File('#cereal/libmessaging.a')] From 88ed84f557aec059aed62370df7be7da2e209f81 Mon Sep 17 00:00:00 2001 From: cydia2020 <12470297+cydia2020@users.noreply.github.com> Date: Wed, 20 Apr 2022 04:06:06 +1000 Subject: [PATCH 7/9] Toyota: fix description of DISTANCE signal (#592) * fix description of DISTANCE and arrange ACC_CONTROL in numerical order * run generator --- generator/toyota/_toyota_2017.dbc | 16 ++++++++-------- toyota_new_mc_pt_generated.dbc | 16 ++++++++-------- toyota_nodsu_pt_generated.dbc | 16 ++++++++-------- toyota_tnga_k_pt_generated.dbc | 16 ++++++++-------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/generator/toyota/_toyota_2017.dbc b/generator/toyota/_toyota_2017.dbc index 1145d23e12..c3ef84857c 100644 --- a/generator/toyota/_toyota_2017.dbc +++ b/generator/toyota/_toyota_2017.dbc @@ -145,19 +145,19 @@ BO_ 742 LEAD_INFO: 8 DSU BO_ 835 ACC_CONTROL: 8 DSU SG_ ACCEL_CMD : 7|16@0- (0.001,0) [-20|20] "m/s^2" HCU - SG_ ACC_MALFUNCTION : 18|1@0+ (1,0) [0|0] "" XXX - SG_ ACC_CUT_IN : 25|1@0+ (1,0) [0|1] "" XXX SG_ ALLOW_LONG_PRESS : 17|2@0+ (1,0) [0|2] "" XXX - SG_ ITS_CONNECT_LEAD : 39|8@0+ (1,0) [0|1] "" Vector__XXX - SG_ ACC_TYPE : 23|2@0+ (1,0) [0|3] "" HCU + SG_ ACC_MALFUNCTION : 18|1@0+ (1,0) [0|0] "" XXX + SG_ RADAR_DIRTY : 19|1@0+ (1,0) [0|1] "" XXX SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX + SG_ ACC_TYPE : 23|2@0+ (1,0) [0|3] "" HCU + SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU + SG_ ACC_CUT_IN : 25|1@0+ (1,0) [0|1] "" XXX SG_ PERMIT_BRAKING : 30|1@0+ (1,0) [0|1] "" HCU SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU - SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU - SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + SG_ ITS_CONNECT_LEAD : 39|8@0+ (1,0) [0|1] "" Vector__XXX SG_ ACCEL_CMD_ALT : 47|8@0- (0.05,0) [0|0] "m/s^2" XXX - SG_ RADAR_DIRTY : 19|1@0+ (1,0) [0|1] "" XXX + SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX BO_ 836 PRE_COLLISION_2: 8 DSU SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX @@ -378,7 +378,7 @@ CM_ SG_ 835 ACC_TYPE "if 2, car is likely to have a permanent low speed lockout. CM_ SG_ 835 RADAR_DIRTY "Display Clean Radar Sensor message on HUD"; CM_ SG_ 835 ACC_MALFUNCTION "display ACC fault on dash if set to 1"; CM_ SG_ 835 ACC_CUT_IN "Display blinking yellow lead if set to 1"; -CM_ SG_ 835 DISTANCE "Display Distance Bars on HUD Permanently"; +CM_ SG_ 835 DISTANCE "Cycle through ACC following distance from long, mid, short when set to 1"; CM_ SG_ 835 ITS_CONNECT_LEAD "Displayed when lead car is capable of ITS Connect"; CM_ SG_ 835 ALLOW_LONG_PRESS "Enable Toyota's factory set speed increment behaviour, available on both metrics cars and imperial unit cars"; CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG."; diff --git a/toyota_new_mc_pt_generated.dbc b/toyota_new_mc_pt_generated.dbc index d471061d9c..c4afc5d0fb 100644 --- a/toyota_new_mc_pt_generated.dbc +++ b/toyota_new_mc_pt_generated.dbc @@ -190,19 +190,19 @@ BO_ 742 LEAD_INFO: 8 DSU BO_ 835 ACC_CONTROL: 8 DSU SG_ ACCEL_CMD : 7|16@0- (0.001,0) [-20|20] "m/s^2" HCU - SG_ ACC_MALFUNCTION : 18|1@0+ (1,0) [0|0] "" XXX - SG_ ACC_CUT_IN : 25|1@0+ (1,0) [0|1] "" XXX SG_ ALLOW_LONG_PRESS : 17|2@0+ (1,0) [0|2] "" XXX - SG_ ITS_CONNECT_LEAD : 39|8@0+ (1,0) [0|1] "" Vector__XXX - SG_ ACC_TYPE : 23|2@0+ (1,0) [0|3] "" HCU + SG_ ACC_MALFUNCTION : 18|1@0+ (1,0) [0|0] "" XXX + SG_ RADAR_DIRTY : 19|1@0+ (1,0) [0|1] "" XXX SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX + SG_ ACC_TYPE : 23|2@0+ (1,0) [0|3] "" HCU + SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU + SG_ ACC_CUT_IN : 25|1@0+ (1,0) [0|1] "" XXX SG_ PERMIT_BRAKING : 30|1@0+ (1,0) [0|1] "" HCU SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU - SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU - SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + SG_ ITS_CONNECT_LEAD : 39|8@0+ (1,0) [0|1] "" Vector__XXX SG_ ACCEL_CMD_ALT : 47|8@0- (0.05,0) [0|0] "m/s^2" XXX - SG_ RADAR_DIRTY : 19|1@0+ (1,0) [0|1] "" XXX + SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX BO_ 836 PRE_COLLISION_2: 8 DSU SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX @@ -423,7 +423,7 @@ CM_ SG_ 835 ACC_TYPE "if 2, car is likely to have a permanent low speed lockout. CM_ SG_ 835 RADAR_DIRTY "Display Clean Radar Sensor message on HUD"; CM_ SG_ 835 ACC_MALFUNCTION "display ACC fault on dash if set to 1"; CM_ SG_ 835 ACC_CUT_IN "Display blinking yellow lead if set to 1"; -CM_ SG_ 835 DISTANCE "Display Distance Bars on HUD Permanently"; +CM_ SG_ 835 DISTANCE "Cycle through ACC following distance from long, mid, short when set to 1"; CM_ SG_ 835 ITS_CONNECT_LEAD "Displayed when lead car is capable of ITS Connect"; CM_ SG_ 835 ALLOW_LONG_PRESS "Enable Toyota's factory set speed increment behaviour, available on both metrics cars and imperial unit cars"; CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG."; diff --git a/toyota_nodsu_pt_generated.dbc b/toyota_nodsu_pt_generated.dbc index 3f023be4e8..e579b79f9a 100644 --- a/toyota_nodsu_pt_generated.dbc +++ b/toyota_nodsu_pt_generated.dbc @@ -190,19 +190,19 @@ BO_ 742 LEAD_INFO: 8 DSU BO_ 835 ACC_CONTROL: 8 DSU SG_ ACCEL_CMD : 7|16@0- (0.001,0) [-20|20] "m/s^2" HCU - SG_ ACC_MALFUNCTION : 18|1@0+ (1,0) [0|0] "" XXX - SG_ ACC_CUT_IN : 25|1@0+ (1,0) [0|1] "" XXX SG_ ALLOW_LONG_PRESS : 17|2@0+ (1,0) [0|2] "" XXX - SG_ ITS_CONNECT_LEAD : 39|8@0+ (1,0) [0|1] "" Vector__XXX - SG_ ACC_TYPE : 23|2@0+ (1,0) [0|3] "" HCU + SG_ ACC_MALFUNCTION : 18|1@0+ (1,0) [0|0] "" XXX + SG_ RADAR_DIRTY : 19|1@0+ (1,0) [0|1] "" XXX SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX + SG_ ACC_TYPE : 23|2@0+ (1,0) [0|3] "" HCU + SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU + SG_ ACC_CUT_IN : 25|1@0+ (1,0) [0|1] "" XXX SG_ PERMIT_BRAKING : 30|1@0+ (1,0) [0|1] "" HCU SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU - SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU - SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + SG_ ITS_CONNECT_LEAD : 39|8@0+ (1,0) [0|1] "" Vector__XXX SG_ ACCEL_CMD_ALT : 47|8@0- (0.05,0) [0|0] "m/s^2" XXX - SG_ RADAR_DIRTY : 19|1@0+ (1,0) [0|1] "" XXX + SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX BO_ 836 PRE_COLLISION_2: 8 DSU SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX @@ -423,7 +423,7 @@ CM_ SG_ 835 ACC_TYPE "if 2, car is likely to have a permanent low speed lockout. CM_ SG_ 835 RADAR_DIRTY "Display Clean Radar Sensor message on HUD"; CM_ SG_ 835 ACC_MALFUNCTION "display ACC fault on dash if set to 1"; CM_ SG_ 835 ACC_CUT_IN "Display blinking yellow lead if set to 1"; -CM_ SG_ 835 DISTANCE "Display Distance Bars on HUD Permanently"; +CM_ SG_ 835 DISTANCE "Cycle through ACC following distance from long, mid, short when set to 1"; CM_ SG_ 835 ITS_CONNECT_LEAD "Displayed when lead car is capable of ITS Connect"; CM_ SG_ 835 ALLOW_LONG_PRESS "Enable Toyota's factory set speed increment behaviour, available on both metrics cars and imperial unit cars"; CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG."; diff --git a/toyota_tnga_k_pt_generated.dbc b/toyota_tnga_k_pt_generated.dbc index 4053263ddd..256b0e8be6 100644 --- a/toyota_tnga_k_pt_generated.dbc +++ b/toyota_tnga_k_pt_generated.dbc @@ -190,19 +190,19 @@ BO_ 742 LEAD_INFO: 8 DSU BO_ 835 ACC_CONTROL: 8 DSU SG_ ACCEL_CMD : 7|16@0- (0.001,0) [-20|20] "m/s^2" HCU - SG_ ACC_MALFUNCTION : 18|1@0+ (1,0) [0|0] "" XXX - SG_ ACC_CUT_IN : 25|1@0+ (1,0) [0|1] "" XXX SG_ ALLOW_LONG_PRESS : 17|2@0+ (1,0) [0|2] "" XXX - SG_ ITS_CONNECT_LEAD : 39|8@0+ (1,0) [0|1] "" Vector__XXX - SG_ ACC_TYPE : 23|2@0+ (1,0) [0|3] "" HCU + SG_ ACC_MALFUNCTION : 18|1@0+ (1,0) [0|0] "" XXX + SG_ RADAR_DIRTY : 19|1@0+ (1,0) [0|1] "" XXX SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX + SG_ ACC_TYPE : 23|2@0+ (1,0) [0|3] "" HCU + SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU + SG_ ACC_CUT_IN : 25|1@0+ (1,0) [0|1] "" XXX SG_ PERMIT_BRAKING : 30|1@0+ (1,0) [0|1] "" HCU SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU - SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU - SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + SG_ ITS_CONNECT_LEAD : 39|8@0+ (1,0) [0|1] "" Vector__XXX SG_ ACCEL_CMD_ALT : 47|8@0- (0.05,0) [0|0] "m/s^2" XXX - SG_ RADAR_DIRTY : 19|1@0+ (1,0) [0|1] "" XXX + SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX BO_ 836 PRE_COLLISION_2: 8 DSU SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX @@ -423,7 +423,7 @@ CM_ SG_ 835 ACC_TYPE "if 2, car is likely to have a permanent low speed lockout. CM_ SG_ 835 RADAR_DIRTY "Display Clean Radar Sensor message on HUD"; CM_ SG_ 835 ACC_MALFUNCTION "display ACC fault on dash if set to 1"; CM_ SG_ 835 ACC_CUT_IN "Display blinking yellow lead if set to 1"; -CM_ SG_ 835 DISTANCE "Display Distance Bars on HUD Permanently"; +CM_ SG_ 835 DISTANCE "Cycle through ACC following distance from long, mid, short when set to 1"; CM_ SG_ 835 ITS_CONNECT_LEAD "Displayed when lead car is capable of ITS Connect"; CM_ SG_ 835 ALLOW_LONG_PRESS "Enable Toyota's factory set speed increment behaviour, available on both metrics cars and imperial unit cars"; CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG."; From 84e0f59441e5b10362e087d6df3fca73c7237538 Mon Sep 17 00:00:00 2001 From: Jason Young <46612682+jyoung8607@users.noreply.github.com> Date: Wed, 20 Apr 2022 16:09:03 -0400 Subject: [PATCH 8/9] VW MQB: Populate Kombi_03 signals (#593) --- vw_mqb_2010.dbc | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/vw_mqb_2010.dbc b/vw_mqb_2010.dbc index 6d461b26fd..031f77e910 100644 --- a/vw_mqb_2010.dbc +++ b/vw_mqb_2010.dbc @@ -1361,6 +1361,16 @@ BO_ 1624 Licht_vorne_01: 8 XXX BO_ 1646 Klima_03: 8 XXX BO_ 1720 Kombi_03: 8 XXX + SG_ KBI_Reifenumfang : 0|12@1+ (1,0) [0|4095] "Unit_MilliMeter" XXX + SG_ KBI_Variante_USA : 12|1@1+ (1.0,0.0) [0.0|1] "" XXX + SG_ KBI_Variante : 13|1@1+ (1.0,0.0) [0.0|1] "" XXX + SG_ KBI_BCmE_aktiv : 16|1@1+ (1.0,0.0) [0.0|1] "" XXX + SG_ KBI_Sparhinweis_quittiert : 17|1@1+ (1.0,0.0) [0.0|1] "" XXX + SG_ KBI_Tankfuellstand_Prozent : 18|7@1+ (1,0) [0|100] "Unit_PerCent" XXX + SG_ KBI_Nachtanken_erkannt : 25|1@1+ (1.0,0.0) [0.0|1] "" XXX + SG_ KBI_Tankinhalt_hochaufl : 26|14@1+ (0.01,0) [0.00|163.81] "Unit_Liter" XXX + SG_ KBI_Max_Tankinhalt : 40|8@1+ (0.5,0) [0.0|126.5] "" XXX + SG_ KBI_Reifenumfang_Sekundaer : 48|12@1+ (1,0) [0|4095] "Unit_MilliMeter" XXX BO_ 391 EV_Gearshift: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX @@ -1410,6 +1420,23 @@ CM_ SG_ 780 Abstand "Following distance"; CM_ SG_ 780 SetSpeed "ACC set speed"; CM_ SG_ 391 GearPosition "Traditional PRND plus B-mode aggressive regen, B-mode mapped to Drive"; CM_ SG_ 960 ZAS_Kl_15 "Indicates ignition on"; +CM_ SG_ 1720 KBI_BCmE_aktiv "Anzeige BCmE aktiv (BCmE-Screen oder Einsparhinweis in der Anzeige)"; +CM_ SG_ 1720 KBI_Max_Tankinhalt "Mitteilung des maximalen Tankinhalts an das Reichweitenmodul"; +CM_ SG_ 1720 KBI_Nachtanken_erkannt "Statusinformation Nachtankmodus"; +CM_ SG_ 1720 KBI_Reifenumfang "Mittlerer Radumfang aus der K-Zahl gerechnet in Millimeter. Byte 2 Bit 5,4 reserviert, Byte 2 Bit 3..0 und Byte 1 Bit 7..0; Wertebereich 0..4096 mm +"; +CM_ SG_ 1720 KBI_Reifenumfang_Sekundaer "Fahrzeuge mit unterschiedlichen Reifenumfängen Vorderachse / Hinterachse: + +Primärachse: KBI_Reifenumfang +Sekundärachse: KBI_Reifenumfang_Sekundaer +"; +CM_ SG_ 1720 KBI_Sparhinweis_quittiert "angezeigter Sparhinweis ist quittiert. Signal wird nach zwei Sendebotschaften wieder auf '0' gesetzt."; +CM_ SG_ 1720 KBI_Tankfuellstand_Prozent "Tankfüllstand in %"; +CM_ SG_ 1720 KBI_Tankinhalt_hochaufl "angezeigter Tankinhalt hochauflösend zur Restreichweitenberechnung"; +CM_ SG_ 1720 KBI_Variante "Zeigt an ob es sich um ein konventionelles Zeiger-Kombiinstrument handelt oder um eine Volldisplay-Kombiinstrument"; +CM_ SG_ 1720 KBI_Variante_USA "In diesem Signal wird die HW-Variante des Kombis ausgegeben, ACC plausibilisiert auf dieses Signal hin seine US-Codierung"; + + VAL_ 159 EPS_HCA_Status 0 "disabled" 1 "initializing" 2 "fault" 3 "ready" 4 "rejected" 5 "active"; VAL_ 173 GE_Fahrstufe 5 "P" 6 "R" 7 "N" 8 "D" 9 "S" 10 "E" 13 "T" 14 "T"; VAL_ 288 TSK_Status 0 "init" 1 "disabled" 2 "enabled" 3 "regulating" 4 "accel_pedal_override" 5 "brake_only" 6 "temp_fault" 7 "perm_fault"; @@ -1418,3 +1445,11 @@ VAL_ 302 ACC_Hold_Type 0 "no_request" 1 "hold" 2 "park" 3 "hold_standby" 4 "star VAL_ 391 GearPosition 2 "P" 3 "R" 4 "N" 5 "D" 6 "D"; VAL_ 391 RegenBrakingMode 0 "default" 1 "B1" 2 "B2" 3 "B3"; VAL_ 870 Fast_Send_Rate_Active 0 "1 Hz" 1 "50 Hz"; +VAL_ 1720 KBI_Variante_USA 0 "keine USA-Variante" 1 "USA-Variante" ; +VAL_ 1720 KBI_Variante 0 "Zeiger Kombiinstrument" 1 "Volldisplay Kombiinstrument" ; +VAL_ 1720 KBI_BCmE_aktiv 0 "Anzeige_nicht_aktiv" 1 "Anzeige_aktiv" ; +VAL_ 1720 KBI_Sparhinweis_quittiert 0 "nicht_quittiert" 1 "quittiert" ; +VAL_ 1720 KBI_Tankfuellstand_Prozent 126 "Init" 127 "Fehler" ; +VAL_ 1720 KBI_Nachtanken_erkannt 0 "Geberbetrieb" 1 "Nachtankmodus" ; +VAL_ 1720 KBI_Tankinhalt_hochaufl 16382 "Init" 16383 "Fehler" ; +VAL_ 1720 KBI_Max_Tankinhalt 254 "Init" 255 "Fehler" ; From e19ba095c3ee288d629284e24ec7e0deaf645f3f Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 20 Apr 2022 22:20:01 -0700 Subject: [PATCH 9/9] Toyota: remove interceptor scaling (#552) * set scale to 1 and make signals match * remove offsets as well --- generator/toyota/_comma.dbc | 4 ++-- toyota_new_mc_pt_generated.dbc | 4 ++-- toyota_nodsu_pt_generated.dbc | 4 ++-- toyota_tnga_k_pt_generated.dbc | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/generator/toyota/_comma.dbc b/generator/toyota/_comma.dbc index fa2af17aaa..b4dd0d9c9b 100644 --- a/generator/toyota/_comma.dbc +++ b/generator/toyota/_comma.dbc @@ -18,8 +18,8 @@ BO_ 512 GAS_COMMAND: 6 EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (0.159375,-75.555) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (0.159375,-151.111) [0|1] "" EON + SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON + SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON diff --git a/toyota_new_mc_pt_generated.dbc b/toyota_new_mc_pt_generated.dbc index c4afc5d0fb..63e0ed961d 100644 --- a/toyota_new_mc_pt_generated.dbc +++ b/toyota_new_mc_pt_generated.dbc @@ -22,8 +22,8 @@ BO_ 512 GAS_COMMAND: 6 EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (0.159375,-75.555) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (0.159375,-151.111) [0|1] "" EON + SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON + SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON diff --git a/toyota_nodsu_pt_generated.dbc b/toyota_nodsu_pt_generated.dbc index e579b79f9a..868bb1b8b3 100644 --- a/toyota_nodsu_pt_generated.dbc +++ b/toyota_nodsu_pt_generated.dbc @@ -22,8 +22,8 @@ BO_ 512 GAS_COMMAND: 6 EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (0.159375,-75.555) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (0.159375,-151.111) [0|1] "" EON + SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON + SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON diff --git a/toyota_tnga_k_pt_generated.dbc b/toyota_tnga_k_pt_generated.dbc index 256b0e8be6..0c1d50e508 100644 --- a/toyota_tnga_k_pt_generated.dbc +++ b/toyota_tnga_k_pt_generated.dbc @@ -22,8 +22,8 @@ BO_ 512 GAS_COMMAND: 6 EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (0.159375,-75.555) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (0.159375,-151.111) [0|1] "" EON + SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON + SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON