Skip to content

Commit 07fa98f

Browse files
author
zhou jielei
committed
revert scm buttom
1 parent 1146111 commit 07fa98f

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

opendbc/safety/safety/safety_honda.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ static bool honda_bosch_scm_alt = false;
4141
typedef enum {HONDA_NIDEC, HONDA_BOSCH} HondaHw;
4242
static HondaHw honda_hw = HONDA_NIDEC;
4343

44-
static uint32_t honda_last_send_scm_button = 0U;
4544

4645
static int honda_get_pt_bus(void) {
4746
return ((honda_hw == HONDA_BOSCH) && !honda_bosch_radarless) ? 1 : 0;
@@ -227,10 +226,6 @@ static bool honda_tx_hook(const CANPacket_t *to_send) {
227226
int bus_pt = honda_get_pt_bus();
228227
int bus_buttons = (honda_bosch_radarless) ? 2 : bus_pt; // the camera controls ACC on radarless Bosch cars
229228

230-
// record time if sending 1A6 or 296
231-
if (((addr == 0x1A6) || (addr == 0x296)) && (bus == bus_pt)) {
232-
honda_last_send_scm_button = microsecond_timer_get();
233-
}
234229

235230
// ACC_HUD: safety check (nidec w/o pedal)
236231
if ((addr == 0x30C) && (bus == bus_pt)) {
@@ -333,7 +328,6 @@ static safety_config honda_nidec_init(uint16_t param) {
333328
honda_bosch_long = false;
334329
honda_bosch_radarless = false;
335330
honda_bosch_scm_alt = false;
336-
honda_last_send_scm_button = 0U;
337331

338332
safety_config ret;
339333

@@ -385,7 +379,6 @@ static safety_config honda_bosch_init(uint16_t param) {
385379
// Checking for alternate brake override from safety parameter
386380
honda_alt_brake_msg = GET_FLAG(param, HONDA_PARAM_ALT_BRAKE);
387381
honda_bosch_scm_alt = false;
388-
honda_last_send_scm_button = 0U;
389382

390383
// radar disabled so allow gas/brakes
391384
#ifdef ALLOW_DEBUG
@@ -449,13 +442,6 @@ static int honda_bosch_fwd_hook(int bus_num, int addr) {
449442

450443
if (bus_num == 0) {
451444
bus_fwd = 2;
452-
// block forwarding 1A6 or 296 for 40ms when op send scm message
453-
bool is_addr_valid = (addr == 0x1A6) || (addr == 0x296);
454-
uint32_t elapsed_time = get_ts_elapsed(microsecond_timer_get(), honda_last_send_scm_button);
455-
bool is_time_within_limit = (elapsed_time >= 1U);
456-
if (is_addr_valid && is_time_within_limit) {
457-
bus_fwd = -1;
458-
}
459445
}
460446
if (bus_num == 2) {
461447
bool is_lkas_msg = (addr == 0xE4) || (addr == 0xE5) || (addr == 0x33D) || (addr == 0x33DA) || (addr == 0x33DB);

0 commit comments

Comments
 (0)