Klagarge/SummerSchool2-Controller
Archived
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases 1 Activity

change way for steering to be ready

Browse Source
This commit is contained in:
Rémi Heredero
2023-09-05 18:41:37 +02:00
parent 47bc51ac68
commit ad9e73f2eb
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
306-controller_interface.X/app/can_message.c
View File

@@ -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); KART_CST.STEERING_ALIVE_TIME = MEM_read_1_byte(MEMADD_STEERING_ALIVE_TIME);
ALIVE_emitResurrect(&steering()->myChecker, 500, 0); ALIVE_emitResurrect(&steering()->myChecker, 500, 0);
ALIVE_emitBorn(&steering()->myChecker, 1000, 0); ALIVE_emitBorn(&steering()->myChecker, 1000, 0);
ALIVE_emitReady(&steering()->myChecker, 5000, 0); //ALIVE_emitReady(&steering()->myChecker, 5000, 0);
} }
if(bField.bitSplit.b4) { if(bField.bitSplit.b4) {
if (steering()->myChecker.state == STAL_BORN){ if (steering()->myChecker.state == STAL_BORN){
//ALIVE_emitReady(&steering()->myChecker, 1000, 0); ALIVE_emitReady(&steering()->myChecker, 1000, 0);
} }
} }

11
306-controller_interface.X/main.c
View File

@@ -16,17 +16,6 @@ void main(void)
TMR0_SetInterruptHandler(XF_decrementAndQueueTimers); 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(); INTERRUPT_GlobalInterruptEnable();
while (1) while (1)