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

Reformat using clang format

Browse Source
This commit is contained in:
Allen Hill 2023-08-18 21:27:32 -04:00
parent e8d7f5b297
commit 1da1a52c68
8 changed files with 1193 additions and 1127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.clang-format Normal file
View File

@ -0,0 +1,6 @@
---
BasedOnStyle: LLVM
UseCRLF: false
BreakBeforeBraces: Attach
AllowShortBlocksOnASingleLine: Empty
...

1
GlobalDef.c
View File

@ -26,7 +26,6 @@
#include "GlobalDef.h" #include "GlobalDef.h"
// max 10 events in fifo // max 10 events in fifo
byte EventCount; byte EventCount;
byte EventCmd[10]; byte EventCmd[10];

12
GlobalDef.h
View File

@ -18,8 +18,8 @@
// AVC LAN bus on AC2 (PA6/7) // AVC LAN bus on AC2 (PA6/7)
// PA6 AINP0 + // PA6 AINP0 +
// PA7 AINN1 - // PA7 AINN1 -
#define INPUT_IS_SET ( bit_is_set( AC2_STATUS, AC_STATE_bp ) ) #define INPUT_IS_SET (bit_is_set(AC2_STATUS, AC_STATE_bp))
#define INPUT_IS_CLEAR ( bit_is_clear( AC2_STATUS, AC_STATE_bp ) ) #define INPUT_IS_CLEAR (bit_is_clear(AC2_STATUS, AC_STATE_bp))
#define LED_DDR DDRB #define LED_DDR DDRB
#define LED_PORT PORTB #define LED_PORT PORTB
@ -31,8 +31,8 @@
typedef unsigned char byte; typedef unsigned char byte;
typedef unsigned int word; typedef unsigned int word;
inline void LedOff( void ); inline void LedOff(void);
inline void LedOn( void ); inline void LedOn(void);
// max 10 events in fifo // max 10 events in fifo
extern byte EventCount; extern byte EventCount;
@ -51,8 +51,8 @@ extern byte Event;
#define smMin 5 #define smMin 5
#define smWDay 6 #define smWDay 6
//#define STOPEvent cbi(TIMSK, TOIE1); cbi(UCSRB, RXCIE); // #define STOPEvent cbi(TIMSK, TOIE1); cbi(UCSRB, RXCIE);
//#define STARTEvent sbi(TIMSK, TOIE1); sbi(UCSRB, RXCIE); // #define STARTEvent sbi(TIMSK, TOIE1); sbi(UCSRB, RXCIE);
extern byte showLog; extern byte showLog;
extern byte showLog2; extern byte showLog2;

623
avclandrv.c
View File

File diff suppressed because it is too large Load Diff

27
avclandrv.h
View File

@ -27,17 +27,21 @@
*/ */
#ifndef __AVCLANDRV_H #ifndef __AVCLANDRV_H
#define __AVCLANDRV_H #define __AVCLANDRV_H
#include "GlobalDef.h" #include "GlobalDef.h"
#define STOPEvent cbi(RTC.PITINTCTRL, RTC_PI_bp); cbi(USART0.CTRLA, USART_RXCIE_bp); #define STOPEvent \
#define STARTEvent sbi(RTC.PITINTCTRL, RTC_PI_bp); sbi(USART0.CTRLA, USART_RXCIE_bp); cbi(RTC.PITINTCTRL, RTC_PI_bp); \
cbi(USART0.CTRLA, USART_RXCIE_bp);
#define STARTEvent \
sbi(RTC.PITINTCTRL, RTC_PI_bp); \
sbi(USART0.CTRLA, USART_RXCIE_bp);
#define CHECK_AVC_LINE \
#define CHECK_AVC_LINE if (INPUT_IS_SET) AVCLan_Read_Message(); if (INPUT_IS_SET) \
AVCLan_Read_Message();
void AVC_HoldLine(); void AVC_HoldLine();
void AVC_ReleaseLine(); void AVC_ReleaseLine();
@ -51,10 +55,9 @@ extern byte HU_ID_2; // 0x40
extern byte CD_ID_1; // 0x03 extern byte CD_ID_1; // 0x03
extern byte CD_ID_2; // 0x60 extern byte CD_ID_2; // 0x60
// DVD CHANGER // DVD CHANGER
//#define CD_ID_1 0x02 // #define CD_ID_1 0x02
//#define CD_ID_2 0x50 // #define CD_ID_2 0x50
#define cmNull 0 #define cmNull 0
#define cmStatus1 1 #define cmStatus1 1
@ -62,7 +65,6 @@ extern byte CD_ID_2; // 0x60
#define cmStatus3 3 #define cmStatus3 3
#define cmStatus4 4 #define cmStatus4 4
#define cmRegister 100 #define cmRegister 100
#define cmInit 101 #define cmInit 101
#define cmCheck 102 #define cmCheck 102
@ -83,10 +85,9 @@ extern byte CD_ID_2; // 0x60
#define cmStopReq 8 #define cmStopReq 8
#define cmStopReq2 9 #define cmStopReq2 9
typedef enum { stStop=0, stPlay=1 } cd_modes; typedef enum { stStop = 0, stPlay = 1 } cd_modes;
extern cd_modes CD_Mode; extern cd_modes CD_Mode;
extern byte broadcast; extern byte broadcast;
extern byte master1; extern byte master1;
extern byte master2; extern byte master2;
@ -127,10 +128,10 @@ void ShowInMessage();
void ShowOutMessage(); void ShowOutMessage();
#ifdef SOFTWARE_DEBUG #ifdef SOFTWARE_DEBUG
void AVCLan_Measure(); void AVCLan_Measure();
#endif #endif
#ifdef HARDWARE_DEBUG #ifdef HARDWARE_DEBUG
void SetHighLow(); void SetHighLow();
#endif #endif
extern byte answerReq; extern byte answerReq;

97
com232.c
View File

@ -24,64 +24,63 @@
*/ */
#include <avr/io.h>
#include <avr/interrupt.h>
#include <avr/pgmspace.h>
#include "com232.h" #include "com232.h"
#include <avr/interrupt.h>
#include <avr/io.h>
#include <avr/pgmspace.h>
byte RS232_RxCharBuffer[25], RS232_RxCharBegin, RS232_RxCharEnd; byte RS232_RxCharBuffer[25], RS232_RxCharBegin, RS232_RxCharEnd;
byte readkey; byte readkey;
void RS232_Init(void) void RS232_Init(void) {
{ // // init LED
// // init LED // sbi(DDRB, 5);
// sbi(DDRB, 5); // cbi(PORTB, 5);
// cbi(PORTB, 5);
RS232_RxCharBegin = RS232_RxCharEnd = 0; RS232_RxCharBegin = RS232_RxCharEnd = 0;
USART0.CTRLA = USART_RXCIE_bm; // Enable receive interrupts USART0.CTRLA = USART_RXCIE_bm; // Enable receive interrupts
USART0.CTRLB = USART_RXEN_bm | USART_TXEN_bm | USART_RXMODE_NORMAL_gc; // Enable Rx/Tx and set receive mode normal USART0.CTRLB = USART_RXEN_bm | USART_TXEN_bm |
USART0.CTRLC = USART_CMODE_ASYNCHRONOUS_gc | USART_PMODE_DISABLED_gc | USART_CHSIZE_8BIT_gc | USART_SBMODE_1BIT_gc; // Async UART with 8N1 config USART_RXMODE_NORMAL_gc; // Enable Rx/Tx and set receive mode
// normal
USART0.CTRLC = USART_CMODE_ASYNCHRONOUS_gc | USART_PMODE_DISABLED_gc |
USART_CHSIZE_8BIT_gc |
USART_SBMODE_1BIT_gc; // Async UART with 8N1 config
USART0.BAUD = 256; // 250k baud rate (64*F_CPU/(16*250k)) for F_CPU = 16MHz USART0.BAUD = 256; // 250k baud rate (64*F_CPU/(16*250k)) for F_CPU = 16MHz
} }
ISR(USART0_RXC_vect) ISR(USART0_RXC_vect) {
{ RS232_RxCharBuffer[RS232_RxCharEnd] = USART0_RXDATAL; // Store received
RS232_RxCharBuffer[RS232_RxCharEnd] = USART0_RXDATAL; // Store received character to the End of Buffer // character to the End
// of Buffer
RS232_RxCharEnd++; RS232_RxCharEnd++;
} }
void RS232_SendByte(byte Data) void RS232_SendByte(byte Data) {
{ loop_until_bit_is_set(USART0_STATUS,
loop_until_bit_is_set(USART0_STATUS, USART_DREIF_bp); // wait for UART to become available USART_DREIF_bp); // wait for UART to become available
USART0_TXDATAL = Data; // send character USART0_TXDATAL = Data; // send character
} }
void RS232_Print_P(const char * str_addr) void RS232_Print_P(const char *str_addr) {
{
register byte c; register byte c;
while ( (c = pgm_read_byte(str_addr++) ) ) while ((c = pgm_read_byte(str_addr++))) {
{
if (c == '\n') if (c == '\n')
RS232_SendByte('\r'); RS232_SendByte('\r');
RS232_SendByte(c); RS232_SendByte(c);
} }
} }
void RS232_Print(const char *pBuf) void RS232_Print(const char *pBuf) {
{
register byte c; register byte c;
while ((c = *pBuf++)) while ((c = *pBuf++)) {
{
if (c == '\n') if (c == '\n')
RS232_SendByte('\r'); RS232_SendByte('\r');
RS232_SendByte(c); RS232_SendByte(c);
} }
} }
void RS232_PrintHex4(byte Data) void RS232_PrintHex4(byte Data) {
{
byte Character = Data & 0x0f; byte Character = Data & 0x0f;
Character += '0'; Character += '0';
if (Character > '9') if (Character > '9')
@ -89,53 +88,51 @@ void RS232_PrintHex4(byte Data)
RS232_SendByte(Character); RS232_SendByte(Character);
} }
void RS232_PrintHex8(byte Data) void RS232_PrintHex8(byte Data) {
{
RS232_PrintHex4(Data >> 4); RS232_PrintHex4(Data >> 4);
RS232_PrintHex4(Data); RS232_PrintHex4(Data);
} }
void RS232_PrintDec(byte Data) void RS232_PrintDec(byte Data) {
{ if (Data > 99) {
if (Data>99) {
RS232_SendByte('*'); RS232_SendByte('*');
return; return;
} }
if (Data<10) { if (Data < 10) {
RS232_SendByte('0'+Data); RS232_SendByte('0' + Data);
return; return;
} }
byte c; byte c;
unsigned short v,v1; unsigned short v, v1;
v = Data; v = Data;
v1 = v/10; v1 = v / 10;
c = '0' + (v-v1*10); c = '0' + (v - v1 * 10);
RS232_SendByte('0'+v1); RS232_SendByte('0' + v1);
RS232_SendByte(c); RS232_SendByte(c);
} }
void RS232_PrintDec2(byte Data) void RS232_PrintDec2(byte Data) {
{ if (Data < 10)
if (Data<10) RS232_SendByte('0'); RS232_SendByte('0');
RS232_PrintDec(Data); RS232_PrintDec(Data);
} }
char* itoa(int i, char b[]){ char *itoa(int i, char b[]) {
char const digit[] = "0123456789"; char const digit[] = "0123456789";
char* p = b; char *p = b;
if(i<0){ if (i < 0) {
*p++ = '-'; *p++ = '-';
i *= -1; i *= -1;
} }
int shifter = i; int shifter = i;
do{ //Move to where representation ends do { // Move to where representation ends
++p; ++p;
shifter = shifter/10; shifter = shifter / 10;
}while(shifter); } while (shifter);
*p = '\0'; *p = '\0';
do{ //Move back, inserting digits as u go do { // Move back, inserting digits as u go
*--p = digit[i%10]; *--p = digit[i % 10];
i = i/10; i = i / 10;
}while(i); } while (i);
return b; return b;
} }

8
com232.h
View File

@ -33,17 +33,13 @@ extern byte RS232_RxCharBuffer[25], RS232_RxCharBegin, RS232_RxCharEnd;
extern byte readkey; extern byte readkey;
void RS232_Init(void); void RS232_Init(void);
extern void RS232_Print_P(const char * str_addr); extern void RS232_Print_P(const char *str_addr);
extern void RS232_SendByte(byte Data); extern void RS232_SendByte(byte Data);
extern void RS232_Print(const char *pBuf); extern void RS232_Print(const char *pBuf);
extern void RS232_PrintHex4(byte Data); extern void RS232_PrintHex4(byte Data);
extern void RS232_PrintHex8(byte Data); extern void RS232_PrintHex8(byte Data);
extern void RS232_PrintDec(byte Data); extern void RS232_PrintDec(byte Data);
extern void RS232_PrintDec2(byte Data); extern void RS232_PrintDec2(byte Data);
extern char* itoa(int i, char b[]); extern char *itoa(int i, char b[]);
// LED
#define LED_ON() cbi(PORTB, 5)
#define LED_OFF() sbi(PORTB, 5)
#endif // __COM232_H #endif // __COM232_H

120
sniffer.c
View File

@ -24,13 +24,13 @@
*/ */
#include <avr/io.h>
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <avr/io.h>
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
#include "GlobalDef.h" #include "GlobalDef.h"
#include "com232.h"
#include "avclandrv.h" #include "avclandrv.h"
#include "com232.h"
void Setup(); void Setup();
@ -38,8 +38,7 @@ byte rcv_command[5];
byte rcv_pos = 0; byte rcv_pos = 0;
byte rcv_time_clr = 0; byte rcv_time_clr = 0;
int main() int main() {
{
byte readSeq = 0; byte readSeq = 0;
byte s_len = 0; byte s_len = 0;
byte s_dig = 0; byte s_dig = 0;
@ -50,8 +49,9 @@ int main()
Setup(); Setup();
RS232_Print("AVCLan reader 1.00\nReady\n\n"); RS232_Print("AVCLan reader 1.00\nReady\n\n");
// LED_OFF(); // LED_OFF();
RS232_Print_P(PSTR("\nS - read sequence\nW - send command\nQ - send broadcast\nL/l - log on/off\nK/k - seq. echo on/off\n")); RS232_Print_P(PSTR("\nS - read sequence\nW - send command\nQ - send "
"broadcast\nL/l - log on/off\nK/k - seq. echo on/off\n"));
RS232_Print_P(PSTR("R/r - register device\nB - Beep\n")); RS232_Print_P(PSTR("R/r - register device\nB - Beep\n"));
#ifdef HARDWARE_DEBUG #ifdef HARDWARE_DEBUG
RS232_Print_P(PSTR("1 - Hold High/low\nE - Print line status\n")); RS232_Print_P(PSTR("1 - Hold High/low\nE - Print line status\n"));
@ -69,59 +69,70 @@ int main()
} else { } else {
// LED_OFF(); // LED_OFF();
// check command from HU // check command from HU
if (answerReq != 0) AVCLan_SendAnswer(); if (answerReq != 0)
AVCLan_SendAnswer();
} }
// HandleEvent // HandleEvent
switch (Event) { switch (Event) {
case EV_STATUS: Event &= ~EV_STATUS; case EV_STATUS:
Event &= ~EV_STATUS;
AVCLan_Send_Status(); AVCLan_Send_Status();
break; break;
} }
// Key handler // Key handler
if (RS232_RxCharEnd) { if (RS232_RxCharEnd) {
cbi(USART0.CTRLA, USART_RXCIE_bp); // disable RX complete interrupt cbi(USART0.CTRLA, USART_RXCIE_bp); // disable RX complete interrupt
readkey = RS232_RxCharBuffer[RS232_RxCharBegin]; // read begin of received Buffer readkey = RS232_RxCharBuffer[RS232_RxCharBegin]; // read begin of received
// Buffer
RS232_RxCharBegin++; RS232_RxCharBegin++;
if (RS232_RxCharBegin == RS232_RxCharEnd) // if Buffer is empty if (RS232_RxCharBegin == RS232_RxCharEnd) // if Buffer is empty
RS232_RxCharBegin = RS232_RxCharEnd = 0; // reset Buffer RS232_RxCharBegin = RS232_RxCharEnd = 0; // reset Buffer
sbi(USART0.CTRLA, USART_RXCIE_bp); // enable RX complete interrupt sbi(USART0.CTRLA, USART_RXCIE_bp); // enable RX complete interrupt
switch (readkey) { switch (readkey) {
case 'S': showLog = 0; case 'S':
showLog = 0;
RS232_Print_P(PSTR("READ SEQUENCE > \n")); RS232_Print_P(PSTR("READ SEQUENCE > \n"));
readSeq = 1; readSeq = 1;
s_len=0; s_len = 0;
s_dig=0; s_dig = 0;
s_c[0]=s_c[1]=0; s_c[0] = s_c[1] = 0;
break; break;
case 'W' : showLog = 1; case 'W':
readSeq=0; showLog = 1;
readSeq = 0;
AVCLan_SendMyData(data_tmp, s_len); AVCLan_SendMyData(data_tmp, s_len);
break; break;
case 'Q' : showLog = 1; case 'Q':
readSeq=0; showLog = 1;
readSeq = 0;
AVCLan_SendMyDataBroadcast(data_tmp, s_len); AVCLan_SendMyDataBroadcast(data_tmp, s_len);
break; break;
case 'R': RS232_Print_P(PSTR("REGIST:\n")); case 'R':
AVCLan_Command( cmRegister ); RS232_Print_P(PSTR("REGIST:\n"));
AVCLan_Command(cmRegister);
TCB1.CNT = 0; TCB1.CNT = 0;
while( TCB1.CNT < 540 ); while (TCB1.CNT < 540) {}
CHECK_AVC_LINE; CHECK_AVC_LINE;
break; break;
case 'r': AVCLan_Register(); case 'r':
AVCLan_Register();
break; break;
case 'l': RS232_Print_P(PSTR("Log OFF\n")); case 'l':
RS232_Print_P(PSTR("Log OFF\n"));
showLog = 0; showLog = 0;
break; break;
case 'L': RS232_Print_P(PSTR("Log ON\n")); case 'L':
RS232_Print_P(PSTR("Log ON\n"));
showLog = 1; showLog = 1;
break; break;
case 'k': RS232_Print_P(PSTR("str OFF\n")); case 'k':
RS232_Print_P(PSTR("str OFF\n"));
showLog2 = 0; showLog2 = 0;
break; break;
case 'K': RS232_Print_P(PSTR("str ON\n")); case 'K':
RS232_Print_P(PSTR("str ON\n"));
showLog2 = 1; showLog2 = 1;
break; break;
case 'B': case 'B':
@ -139,7 +150,7 @@ int main()
SetHighLow(); SetHighLow();
break; break;
case 'E': case 'E':
if(INPUT_IS_SET) { if (INPUT_IS_SET) {
RS232_Print_P(PSTR("Set/High/1\n")); RS232_Print_P(PSTR("Set/High/1\n"));
} else if (INPUT_IS_CLEAR) { } else if (INPUT_IS_CLEAR) {
RS232_Print_P(PSTR("Unset/Low/0\n")); RS232_Print_P(PSTR("Unset/Low/0\n"));
@ -154,25 +165,29 @@ int main()
break; break;
#endif #endif
default : default:
if (readSeq==1) { if (readSeq == 1) {
s_c[s_dig]=readkey; s_c[s_dig] = readkey;
s_dig++; s_dig++;
if (s_dig==2) { if (s_dig == 2) {
if (s_c[0]<':') s_c[0] -= 48; if (s_c[0] < ':')
else s_c[0] -= 55; s_c[0] -= 48;
else
s_c[0] -= 55;
data_tmp[s_len] = 16 * s_c[0]; data_tmp[s_len] = 16 * s_c[0];
if (s_c[1]<':') s_c[1] -= 48; if (s_c[1] < ':')
else s_c[1] -= 55; s_c[1] -= 48;
else
s_c[1] -= 55;
data_tmp[s_len] += s_c[1]; data_tmp[s_len] += s_c[1];
s_len++; s_len++;
s_dig=0; s_dig = 0;
s_c[0]=s_c[1]=0; s_c[0] = s_c[1] = 0;
} }
if (showLog2) { if (showLog2) {
RS232_Print_P(PSTR("CURRENT SEQUENCE > ")); RS232_Print_P(PSTR("CURRENT SEQUENCE > "));
for (i=0; i<s_len; i++) { for (i = 0; i < s_len; i++) {
RS232_PrintHex8(data_tmp[i]); RS232_PrintHex8(data_tmp[i]);
RS232_SendByte(' '); RS232_SendByte(' ');
} }
@ -180,13 +195,12 @@ int main()
} }
} }
} // switch (readkey) } // switch (readkey)
}// if (RS232_RxCharEnd) } // if (RS232_RxCharEnd)
} }
return 0; return 0;
} }
void Setup() void Setup() {
{
CD_ID_1 = 0x03; CD_ID_1 = 0x03;
CD_ID_2 = 0x60; CD_ID_2 = 0x60;
@ -196,8 +210,8 @@ void Setup()
showLog = 1; showLog = 1;
showLog2 = 1; showLog2 = 1;
// Default is zero; resetting/zeroing unnecessary // Default is zero; resetting/zeroing unnecessary
// MCUCR = 0; // MCUCR = 0;
loop_until_bit_is_clear(RTC_STATUS, RTC_CTRLABUSY_bp); loop_until_bit_is_clear(RTC_STATUS, RTC_CTRLABUSY_bp);
RTC.CTRLA = RTC_PRESCALER_DIV1_gc; RTC.CTRLA = RTC_PRESCALER_DIV1_gc;
@ -206,10 +220,8 @@ void Setup()
loop_until_bit_is_clear(RTC_PITSTATUS, RTC_CTRLBUSY_bp); loop_until_bit_is_clear(RTC_PITSTATUS, RTC_CTRLBUSY_bp);
RTC.PITCTRLA = RTC_PERIOD_CYC32768_gc | RTC_PITEN_bm; RTC.PITCTRLA = RTC_PERIOD_CYC32768_gc | RTC_PITEN_bm;
RS232_Init(); RS232_Init();
AVCLan_Init(); AVCLan_Init();
Event = EV_NOTHING; Event = EV_NOTHING;
@ -217,16 +229,14 @@ void Setup()
} }
// Periodic interrupt with a 1 sec period // Periodic interrupt with a 1 sec period
ISR(RTC_PIT_vect) ISR(RTC_PIT_vect) {
{ if (CD_Mode == stPlay) {
if (CD_Mode==stPlay) cd_Time_Sec = incBCD(cd_Time_Sec);
{ if (cd_Time_Sec == 0x60) {
cd_Time_Sec=incBCD(cd_Time_Sec);
if (cd_Time_Sec==0x60) {
cd_Time_Sec = 0; cd_Time_Sec = 0;
cd_Time_Min=incBCD(cd_Time_Min); cd_Time_Min = incBCD(cd_Time_Min);
if (cd_Time_Min==0xA0) { if (cd_Time_Min == 0xA0) {
cd_Time_Min=0x0; cd_Time_Min = 0x0;
} }
} }
} }