From 96137f1a8acef875db2f6ff6c7972a8bb8062159 Mon Sep 17 00:00:00 2001 From: Riccardo Date: Tue, 3 Dec 2019 16:27:34 -0800 Subject: [PATCH] VW can based ignition not needed. it has ignition line at camera as well. --- board/drivers/can.h | 5 ----- board/safety/safety_volkswagen.h | 1 - 2 files changed, 6 deletions(-) diff --git a/board/drivers/can.h b/board/drivers/can.h index 504056f0c3484d..8ced8d782aa095 100644 --- a/board/drivers/can.h +++ b/board/drivers/can.h @@ -344,11 +344,6 @@ void ignition_can_hook(CAN_FIFOMailBox_TypeDef *to_push) { // this message isn't all zeros when ignition is on ignition_can = GET_BYTES_04(to_push) != 0; } - // VW exception - if ((addr == 0x3C0) && (len == 4)) { - // VW Terminal 15 (ignition-on) state - ignition_can = (GET_BYTE(to_push, 2) & 0x2) != 0; - } } } diff --git a/board/safety/safety_volkswagen.h b/board/safety/safety_volkswagen.h index 0f79b8607752ad..98136e3bf5cb39 100644 --- a/board/safety/safety_volkswagen.h +++ b/board/safety/safety_volkswagen.h @@ -5,7 +5,6 @@ #define MSG_HCA_01 0x126 #define MSG_GRA_ACC_01 0x12B #define MSG_LDW_02 0x397 -#define MSG_KLEMMEN_STATUS_01 0x3C0 const int VOLKSWAGEN_MAX_STEER = 250; // 2.5 Nm (EPS side max of 3.0Nm with fault if violated) const int VOLKSWAGEN_MAX_RT_DELTA = 75; // 4 max rate up * 50Hz send rate * 250000 RT interval / 1000000 = 50 ; 50 * 1.5 for safety pad = 75