flywithu/Toyota-AVC-LAN
1
0
Fork 0
mirror of https://github.com/halleysfifthinc/Toyota-AVC-LAN synced 2025-06-07 07:56:21 +00:00
Code Issues Releases Wiki Activity

Fix reading functions

Browse Source
This commit is contained in:
Allen Hill 2023-09-13 17:16:21 -04:00
parent de658f1fb7
commit 3c5c1d269e
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/avclandrv.c
View File

@ -96,6 +96,8 @@
#include "avclandrv.h" #include "avclandrv.h"
#include "com232.h" #include "com232.h"
// F_CPU defined in timing.h and potentially needed by avr-libc (e.g. delay.h)
#include "timing.h" #include "timing.h"
// Enable AVC bus Tx // Enable AVC bus Tx
@ -429,12 +431,12 @@ ISR(TCB0_INT_vect) {
#endif #endif
// If input was set for less than 26 us (a generous half period), bit was a 1 // If input was set for less than 26 us (a generous half period), bit was a 1
READING_BYTE <<= 1;
pulsewidth = TCB0.CCMP; pulsewidth = TCB0.CCMP;
if (pulsewidth < (uint16_t)AVCLAN_READBIT_THRESHOLD) { if (pulsewidth < (uint16_t)AVCLAN_READBIT_THRESHOLD) {
READING_BYTE++; READING_BYTE++;
READING_PARITY++; READING_PARITY++;
} }
READING_BYTE <<= 1;
READING_NBITS--; READING_NBITS--;
} }
@ -476,10 +478,10 @@ uint8_t AVCLAN_readbitsl(uint16_t *bits, int8_t len) {
uint8_t parity = 0; uint8_t parity = 0;
if (len > 8) { if (len > 8) {
uint8_t over = len - 8; uint8_t over = len - 8;
parity = AVCLAN_readbitsi((uint8_t *)bits + 0, over); parity = AVCLAN_readbitsi((uint8_t *)bits + 1, over);
len -= over; len -= over;
} }
parity += AVCLAN_readbitsi((uint8_t *)bits + 1, len); parity += AVCLAN_readbitsi((uint8_t *)bits + 0, len);
return (parity & 1); return (parity & 1);
} }
@ -488,6 +490,7 @@ uint8_t AVCLAN_readbitsl(uint16_t *bits, int8_t len) {
uint8_t AVCLAN_readbyte(uint8_t *byte) { uint8_t AVCLAN_readbyte(uint8_t *byte) {
cli(); cli();
READING_BYTE = 0; READING_BYTE = 0;
READING_PARITY = 0;
READING_NBITS = 8; READING_NBITS = 8;
sei(); sei();
@ -541,9 +544,12 @@ uint8_t CheckCmd(const AVCLAN_frame_t *frame, const uint8_t *cmd) {
uint8_t AVCLAN_readframe() { uint8_t AVCLAN_readframe() {
STOPEvent; // disable timer1 interrupt STOPEvent; // disable timer1 interrupt
uint8_t data[MAXMSGLEN];
uint8_t i; uint8_t i;
uint8_t for_me = 0; uint8_t for_me = 0;
AVCLAN_frame_t frame = {0}; AVCLAN_frame_t frame = {
.data = data,
};
uint8_t parity = 0; uint8_t parity = 0;
uint8_t tmp = 0; uint8_t tmp = 0;