Skip to content

Commit

Permalink
Fix merge issue
Browse files Browse the repository at this point in the history
  • Loading branch information
rafcabezas committed Dec 21, 2020
1 parent 3a72ea5 commit c683777
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions panda/board/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,8 @@ void TIM1_BRK_TIM9_IRQ_Handler(void) {
heartbeat_counter += 1U;
}

//BB we do not want to disable safety mode when on tesla
/*
#ifdef EON
// check heartbeat counter if we are running EON code.
// if the heartbeat has been gone for a while, go to SILENT safety mode and enter power save
Expand Down Expand Up @@ -755,6 +757,7 @@ void TIM1_BRK_TIM9_IRQ_Handler(void) {
current_board->set_usb_power_mode(USB_POWER_CDP);
}
#endif
*/

// check registers
check_registers();
Expand Down

0 comments on commit c683777

Please sign in to comment.