From 9f1a209f4f9f44a1dcc7f73de9e2d1b9e6157cb3 Mon Sep 17 00:00:00 2001 From: lirudy Date: Wed, 25 Aug 2021 23:02:04 +0800 Subject: [PATCH 1/3] Update SConscript fix vw check file name --- panda/board/SConscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panda/board/SConscript b/panda/board/SConscript index bacb92f51..e92f32e18 100644 --- a/panda/board/SConscript +++ b/panda/board/SConscript @@ -37,7 +37,7 @@ else: "-DPANDA", ] - if FindFile('dp_vw', '/data/params/d') != None: + if FindFile('dp_vw_panda', '/data/params/d') != None: with open('/data/params/d/dp_vw_panda') as f: if (int(f.read().strip())) == 1: PROJECT_FLAGS += ['-Dvw'] From c2d44cb333a5ea6f693cb173e79693034e3e5783 Mon Sep 17 00:00:00 2001 From: lirudy Date: Wed, 25 Aug 2021 23:03:11 +0800 Subject: [PATCH 2/3] Update power_saving.h --- panda/board/power_saving.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panda/board/power_saving.h b/panda/board/power_saving.h index efc2a5721..6847fb664 100644 --- a/panda/board/power_saving.h +++ b/panda/board/power_saving.h @@ -32,7 +32,7 @@ void set_power_save_state(int state) { // Volkswagen community port: // If this is a White or Grey Panda, always keep the CAN transceivers // powered up so that transparent forwarding is maintained. - current_board->enable_can_transceivers(board_has_obd() ? enable : true); + current_board->enable_can_transceivers(current_board->has_obd ? enable : true); #else current_board->enable_can_transceivers(enable); #endif From 1afd68d485624e65742ce9b154e5a65cb647748f Mon Sep 17 00:00:00 2001 From: lirudy Date: Wed, 25 Aug 2021 23:33:40 +0800 Subject: [PATCH 3/3] Update safety_defaults.h fix vw j533 mode for w/g panda: relay stock signal on j533 bus , just ONLY for White / Grey Panda!!! --- panda/board/safety/safety_defaults.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panda/board/safety/safety_defaults.h b/panda/board/safety/safety_defaults.h index 118e6acb3..8676165ec 100644 --- a/panda/board/safety/safety_defaults.h +++ b/panda/board/safety/safety_defaults.h @@ -32,7 +32,7 @@ static int default_fwd_hook(int bus_num, CAN_FIFOMailBox_TypeDef *to_fwd) { // Don't do this for BP/C2, where we have Advanced Actual Relay Technology. int bus_fwd = -1; - if(!board_has_relay()) { + if(hw_type == HW_TYPE_WHITE_PANDA || hw_type == HW_TYPE_GREY_PANDA) { switch (bus_num) { case 0: bus_fwd = 2;