flywithu/Toyota-AVC-LAN
1
0
Fork 0
mirror of https://github.com/halleysfifthinc/Toyota-AVC-LAN synced 2025-10-28 00:47:29 +00:00
Code Issues Releases Wiki Activity

Rename for_me to shouldACK

Browse Source
This commit is contained in:
Allen Hill 2023-10-25 14:13:20 -04:00
parent c4831b1b48
commit dbe8b8b877
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/avclandrv.c
View File

@ -607,8 +607,6 @@ uint8_t AVCLAN_readframe() {
STOPEvent; // disable timer1 interrupt STOPEvent; // disable timer1 interrupt
uint8_t data[MAXMSGLEN]; uint8_t data[MAXMSGLEN];
uint8_t i;
uint8_t for_me = 0;
AVCLAN_frame_t frame = { AVCLAN_frame_t frame = {
.data = data, .data = data,
}; };
@ -667,10 +665,9 @@ uint8_t AVCLAN_readframe() {
return 0; return 0;
} }
// is this command for me ? uint8_t shouldACK = !AVCLAN_ismuted() && (frame.peripheral_addr == CD_ID);
for_me = !AVCLAN_ismuted() && (frame.peripheral_addr == CD_ID);
if (for_me) if (shouldACK)
AVCLAN_sendbit_ACK(); AVCLAN_sendbit_ACK();
else else
AVCLAN_readbits(&tmp, 1); AVCLAN_readbits(&tmp, 1);
@ -690,7 +687,7 @@ uint8_t AVCLAN_readframe() {
RS232_Print(".\n"); RS232_Print(".\n");
STARTEvent; STARTEvent;
return 0; return 0;
} else if (for_me) { } else if (shouldACK) {
AVCLAN_sendbit_ACK(); AVCLAN_sendbit_ACK();
} else { } else {
AVCLAN_readbits(&tmp, 1); AVCLAN_readbits(&tmp, 1);
@ -711,7 +708,7 @@ uint8_t AVCLAN_readframe() {
RS232_Print(".\n"); RS232_Print(".\n");
STARTEvent; STARTEvent;
return 0; return 0;
} else if (for_me) { } else if (shouldACK) {
AVCLAN_sendbit_ACK(); AVCLAN_sendbit_ACK();
} else { } else {
AVCLAN_readbits(&tmp, 1); AVCLAN_readbits(&tmp, 1);
@ -725,7 +722,7 @@ uint8_t AVCLAN_readframe() {
return 0; return 0;
} }
for (i = 0; i < frame.length; i++) { for (uint8_t i = 0; i < frame.length; i++) {
parity = AVCLAN_readbyte(&frame.data[i]); parity = AVCLAN_readbyte(&frame.data[i]);
AVCLAN_readbits(&tmp, 1); AVCLAN_readbits(&tmp, 1);
if (parity != (tmp & 1)) { if (parity != (tmp & 1)) {
@ -741,7 +738,7 @@ uint8_t AVCLAN_readframe() {
RS232_Print(".\n"); RS232_Print(".\n");
STARTEvent; STARTEvent;
return 0; return 0;
} else if (for_me) { } else if (shouldACK) {
AVCLAN_sendbit_ACK(); AVCLAN_sendbit_ACK();
} else { } else {
AVCLAN_readbits(&tmp, 1); AVCLAN_readbits(&tmp, 1);
@ -754,7 +751,7 @@ uint8_t AVCLAN_readframe() {
AVCLAN_printframe(&frame, printBinary); AVCLAN_printframe(&frame, printBinary);
if (!AVCLAN_ismuted()) { if (!AVCLAN_ismuted()) {
if (for_me) { if (shouldACK) {
if (CheckCmd(&frame, stat1, sizeof(stat1))) { if (CheckCmd(&frame, stat1, sizeof(stat1))) {
answerReq = cm_Status1; answerReq = cm_Status1;
return 1; return 1;