Skip to content

Commit

Permalink
Merge pull request #12 from xx979xx/HKG
Browse files Browse the repository at this point in the history
fix auto merge bug
  • Loading branch information
xx979xx authored Dec 17, 2019
2 parents 14e176c + e78bd1a commit 81d883d
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions panda/board/safety/safety_hyundai.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,6 @@ static void hyundai_rx_hook(CAN_FIFOMailBox_TypeDef *to_push) {
hyundai_cruise_engaged_last = cruise_engaged;
}

// 832 is lkas cmd. If it is on camera bus, then giraffe switch 2 is high
if ((addr == 832) && (bus == hyundai_camera_bus) && (hyundai_camera_bus != 0)) {
hyundai_giraffe_switch_2 = 1;
}
}

static int hyundai_tx_hook(CAN_FIFOMailBox_TypeDef *to_send) {
Expand Down

0 comments on commit 81d883d

Please sign in to comment.