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

Add muteing functionality and avoid unnecessary work when muted

Browse Source
This commit is contained in:
Allen Hill 2023-10-25 14:10:42 -04:00
parent dea335af7f
commit b0b3d9f34e
3 changed files with 111 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/avclandrv.c
View File

@ -309,13 +309,11 @@ void AVCLAN_init() {
loop_until_bit_is_clear(RTC_PITSTATUS, RTC_CTRLBUSY_bp);
RTC.PITCTRLA = RTC_PERIOD_CYC32768_gc | RTC_PITEN_bm;
// Set PA4 and PC0 as outputs
PORTA.DIRSET = PIN4_bm;
PORTC.DIRSET = PIN0_bm;
// Set bus output pins to idle
AVC_SET_LOGICAL_1();
AVCLAN_muteDevice(0); // unmute AVCLAN bus TX
answerReq = cm_Null;
cd_status.cd1 = 1;
@ -368,6 +366,33 @@ ISR(RTC_PIT_vect) {
RTC.PITINTFLAGS |= RTC_PI_bm;
}
// Mute device TX on AVCLAN bus
void AVCLAN_muteDevice(uint8_t mute) {
if (mute) {
// clang-format off
__asm__ __volatile__("cbi %[vporta_dir], 4; \n\t"
"cbi %[vportc_dir], 0; \n\t"
::
[vporta_dir] "I"(_SFR_IO_ADDR(VPORTA_DIR)),
[vportc_dir] "I"(_SFR_IO_ADDR(VPORTC_DIR)));
// clang-format on
} else {
// clang-format off
__asm__ __volatile__("sbi %[vporta_dir], 4; \n\t"
"sbi %[vportc_dir], 0; \n\t"
::
[vporta_dir] "I"(_SFR_IO_ADDR(VPORTA_DIR)),
[vportc_dir] "I"(_SFR_IO_ADDR(VPORTC_DIR)));
// clang-format on
}
}
// Returns true if device TX is muted on AVCLAN bus
uint8_t AVCLAN_ismuted() {
return (((VPORTA_DIR & PIN4_bm) | (VPORTA_DIR & PIN0_bm)) == 0);
}
// Set AVC bus to `val` (logical 1 or 0) for `period` ticks of TCB1
void set_AVC_logic_for(uint8_t val, uint16_t period) {
TCB1.CNT = 0;
if (val) {
@ -646,7 +671,7 @@ uint8_t AVCLAN_readframe() {
}
// is this command for me ?
for_me = (frame.peripheral_addr == CD_ID);
for_me = !AVCLAN_ismuted() && (frame.peripheral_addr == CD_ID);
if (for_me)
AVCLAN_sendbit_ACK();
@ -731,6 +756,7 @@ uint8_t AVCLAN_readframe() {
if (printAllFrames)
AVCLAN_printframe(&frame, printBinary);
if (!AVCLAN_ismuted()) {
if (for_me) {
if (CheckCmd(&frame, stat1, sizeof(stat1))) {
answerReq = cm_Status1;
@ -797,6 +823,8 @@ uint8_t AVCLAN_readframe() {
return 1;
}
}
}
answerReq = cm_Null;
return 1;
}
@ -839,6 +867,9 @@ AVCLAN_frame_t *AVCLAN_parseframe(const uint8_t *bytes, uint8_t len) {
}
uint8_t AVCLAN_sendframe(const AVCLAN_frame_t *frame) {
if (AVCLAN_ismuted())
return 1;
STOPEvent;
// wait for free line

5
src/avclandrv.h
View File

@ -120,7 +120,6 @@ typedef struct AVCLAN_KnownMessage_struct {
} AVCLAN_KnownMessage_t;
typedef struct AVCLAN_frame_struct {
uint8_t valid;
MSG_TYPE_t broadcast; // 0 for broadcast messages
uint16_t controller_addr; // formerly "master"
uint16_t peripheral_addr; // formerly "slave"
@ -129,6 +128,9 @@ typedef struct AVCLAN_frame_struct {
uint8_t *data;
} AVCLAN_frame_t;
void AVCLAN_init();
void AVCLAN_muteDevice(uint8_t mute);
uint8_t AVCLAN_readframe();
uint8_t AVCLAN_sendframe(const AVCLAN_frame_t *frame);
@ -137,7 +139,6 @@ uint8_t AVCLAN_responseNeeded();
void AVCLAN_printframe(const AVCLAN_frame_t *frame, uint8_t binary);
AVCLAN_frame_t *AVCLAN_parseframe(const uint8_t *bytes, uint8_t len);
void AVCLAN_init();
void AVCLan_Send_Status();
void AVCLan_Register();
uint8_t AVCLan_SendAnswer();

10
src/sniffer.c
View File

@ -32,6 +32,7 @@
uint8_t echoCharacters;
uint8_t readBinary;
uint8_t muteBus;
uint8_t readkey;
const char const *offon[] = {"OFF", "ON"};
@ -143,6 +144,13 @@ int main() {
RS232_Print(offon[echoCharacters]);
RS232_Print("\n");
break;
case 'm': // Mute mockingboard device on AVCLAN bus
muteBus ^= 1;
AVCLAN_muteDevice(muteBus);
RS232_Print("Mute device: ");
RS232_Print(offon[muteBus]);
RS232_Print("\n");
break;
case 'b':
case 'B': // Beep
// answerReq = cm_Beep;
@ -277,9 +285,11 @@ void print_help() {
RS232_Print("S - read sequence\n"
"W - send command\n"
"Q - send broadcast\n"
"m - Toggle mute for mockingboard bus activity\n"
"l - Toggle message logging\n"
"k - Toggle character echo\n"
"R/r - register device\n"
"X/x - Turn binary ON or OFF, respectively\n"
"B - Beep\n"
"v - Toggle verbose logging\n"
#ifdef SOFTWARE_DEBUG