From ad9e73f2ebf8cff789a4c302ef2bd79c227f00a8 Mon Sep 17 00:00:00 2001 From: Klagarge Date: Tue, 5 Sep 2023 18:41:37 +0200 Subject: [PATCH] change way for steering to be ready --- 306-controller_interface.X/app/can_message.c | 4 ++-- 306-controller_interface.X/main.c | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/306-controller_interface.X/app/can_message.c b/306-controller_interface.X/app/can_message.c index ad7d86c..53e18c3 100644 --- a/306-controller_interface.X/app/can_message.c +++ b/306-controller_interface.X/app/can_message.c @@ -268,11 +268,11 @@ void CM_processIncome(uint8_t idSender, uint8_t idMsg, bool rtr, uint32_t data){ KART_CST.STEERING_ALIVE_TIME = MEM_read_1_byte(MEMADD_STEERING_ALIVE_TIME); ALIVE_emitResurrect(&steering()->myChecker, 500, 0); ALIVE_emitBorn(&steering()->myChecker, 1000, 0); - ALIVE_emitReady(&steering()->myChecker, 5000, 0); + //ALIVE_emitReady(&steering()->myChecker, 5000, 0); } if(bField.bitSplit.b4) { if (steering()->myChecker.state == STAL_BORN){ - //ALIVE_emitReady(&steering()->myChecker, 1000, 0); + ALIVE_emitReady(&steering()->myChecker, 1000, 0); } } diff --git a/306-controller_interface.X/main.c b/306-controller_interface.X/main.c index c5d1467..942aae9 100644 --- a/306-controller_interface.X/main.c +++ b/306-controller_interface.X/main.c @@ -16,17 +16,6 @@ void main(void) TMR0_SetInterruptHandler(XF_decrementAndQueueTimers); - - ECAN_Initialize(); - RXB0CONbits.RXFUL = 0; - RXB1CONbits.RXFUL = 0; - B0CONbits.RXFUL = 0; - B1CONbits.RXFUL = 0; - B2CONbits.RXFUL = 0; - B3CONbits.RXFUL = 0; - B4CONbits.RXFUL = 0; - B5CONbits.RXFUL = 0; - PIR5bits.RXBnIF = 0; INTERRUPT_GlobalInterruptEnable(); while (1)