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

Replace a bunch of defines with an enum

Browse Source
This commit is contained in:
Allen Hill 2023-08-23 18:52:09 -04:00
parent 9226e7e0f8
commit 408f648f77
3 changed files with 58 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/avclandrv.c
View File

@ -193,7 +193,7 @@ void AVCLan_Init() {
TCB1.CTRLA = TCB_CLKSEL_CLKDIV2_gc | TCB_ENABLE_bm; TCB1.CTRLA = TCB_CLKSEL_CLKDIV2_gc | TCB_ENABLE_bm;
message_len = 0; message_len = 0;
answerReq = cmNull; answerReq = cm_Null;
check_timeout = 0; check_timeout = 0;
cd_Disc = 1; cd_Disc = 1;
@ -453,69 +453,69 @@ uint8_t AVCLan_Read_Message() {
if (for_me) { if (for_me) {
if (CheckCmd((uint8_t *)stat1)) { if (CheckCmd((uint8_t *)stat1)) {
answerReq = cmStatus1; answerReq = cm_Status1;
return 1; return 1;
} }
if (CheckCmd((uint8_t *)stat2)) { if (CheckCmd((uint8_t *)stat2)) {
answerReq = cmStatus2; answerReq = cm_Status2;
return 1; return 1;
} }
if (CheckCmd((uint8_t *)stat3)) { if (CheckCmd((uint8_t *)stat3)) {
answerReq = cmStatus3; answerReq = cm_Status3;
return 1; return 1;
} }
if (CheckCmd((uint8_t *)stat4)) { if (CheckCmd((uint8_t *)stat4)) {
answerReq = cmStatus4; answerReq = cm_Status4;
return 1; return 1;
} }
// if (CheckCmd((uint8_t*)stat5)) { answerReq = cmStatus5; return 1; } // if (CheckCmd((uint8_t*)stat5)) { answerReq = cm_Status5; return 1; }
if (CheckCmd((uint8_t *)play_req1)) { if (CheckCmd((uint8_t *)play_req1)) {
answerReq = cmPlayReq1; answerReq = cm_PlayReq1;
return 1; return 1;
} }
if (CheckCmd((uint8_t *)play_req2)) { if (CheckCmd((uint8_t *)play_req2)) {
answerReq = cmPlayReq2; answerReq = cm_PlayReq2;
return 1; return 1;
} }
if (CheckCmd((uint8_t *)play_req3)) { if (CheckCmd((uint8_t *)play_req3)) {
answerReq = cmPlayReq3; answerReq = cm_PlayReq3;
return 1; return 1;
} }
if (CheckCmd((uint8_t *)stop_req)) { if (CheckCmd((uint8_t *)stop_req)) {
answerReq = cmStopReq; answerReq = cm_StopReq;
return 1; return 1;
} }
if (CheckCmd((uint8_t *)stop_req2)) { if (CheckCmd((uint8_t *)stop_req2)) {
answerReq = cmStopReq2; answerReq = cm_StopReq2;
return 1; return 1;
} }
} else { // broadcast check } else { // broadcast check
if (CheckCmd((uint8_t *)lan_playit)) { if (CheckCmd((uint8_t *)lan_playit)) {
answerReq = cmPlayIt; answerReq = cm_PlayIt;
return 1; return 1;
} }
if (CheckCmd((uint8_t *)lan_check)) { if (CheckCmd((uint8_t *)lan_check)) {
answerReq = cmCheck; answerReq = cm_Check;
CMD_CHECK[6] = message[3]; CMD_CHECK[6] = message[3];
return 1; return 1;
} }
if (CheckCmd((uint8_t *)lan_reg)) { if (CheckCmd((uint8_t *)lan_reg)) {
answerReq = cmRegister; answerReq = cm_Register;
return 1; return 1;
} }
if (CheckCmd((uint8_t *)lan_init)) { if (CheckCmd((uint8_t *)lan_init)) {
answerReq = cmInit; answerReq = cm_Init;
return 1; return 1;
} }
if (CheckCmd((uint8_t *)lan_stat1)) { if (CheckCmd((uint8_t *)lan_stat1)) {
answerReq = cmStatus1; answerReq = cm_Status1;
return 1; return 1;
} }
} }
answerReq = cmNull; answerReq = cm_Null;
return 1; return 1;
} }
@ -771,43 +771,43 @@ uint8_t AVCLan_SendAnswer() {
uint8_t r = 0; uint8_t r = 0;
switch (answerReq) { switch (answerReq) {
case cmStatus1: case cm_Status1:
r = AVCLan_SendAnswerFrame((uint8_t *)CMD_STATUS1); r = AVCLan_SendAnswerFrame((uint8_t *)CMD_STATUS1);
break; break;
case cmStatus2: case cm_Status2:
r = AVCLan_SendAnswerFrame((uint8_t *)CMD_STATUS2); r = AVCLan_SendAnswerFrame((uint8_t *)CMD_STATUS2);
break; break;
case cmStatus3: case cm_Status3:
r = AVCLan_SendAnswerFrame((uint8_t *)CMD_STATUS3); r = AVCLan_SendAnswerFrame((uint8_t *)CMD_STATUS3);
break; break;
case cmStatus4: case cm_Status4:
r = AVCLan_SendAnswerFrame((uint8_t *)CMD_STATUS4); r = AVCLan_SendAnswerFrame((uint8_t *)CMD_STATUS4);
break; break;
case cmRegister: case cm_Register:
r = AVCLan_SendAnswerFrame((uint8_t *)CMD_REGISTER); r = AVCLan_SendAnswerFrame((uint8_t *)CMD_REGISTER);
break; break;
case cmInit: // RS232_Print("INIT\n"); case cm_Init: // RS232_Print("INIT\n");
r = AVCLan_SendInitCommands(); r = AVCLan_SendInitCommands();
break; break;
case cmCheck: case cm_Check:
r = AVCLan_SendAnswerFrame((uint8_t *)CMD_CHECK); r = AVCLan_SendAnswerFrame((uint8_t *)CMD_CHECK);
check_timeout = 0; check_timeout = 0;
CMD_CHECK[6]++; CMD_CHECK[6]++;
RS232_Print("AVCCHK\n"); RS232_Print("AVCCHK\n");
break; break;
case cmPlayReq1: case cm_PlayReq1:
playMode = 0; playMode = 0;
r = AVCLan_SendAnswerFrame((uint8_t *)CMD_PLAY_OK1); r = AVCLan_SendAnswerFrame((uint8_t *)CMD_PLAY_OK1);
break; break;
case cmPlayReq2: case cm_PlayReq2:
case cmPlayReq3: case cm_PlayReq3:
playMode = 0; playMode = 0;
r = AVCLan_SendAnswerFrame((uint8_t *)CMD_PLAY_OK2); r = AVCLan_SendAnswerFrame((uint8_t *)CMD_PLAY_OK2);
if (!r) if (!r)
r = AVCLan_SendAnswerFrame((uint8_t *)CMD_PLAY_OK3); r = AVCLan_SendAnswerFrame((uint8_t *)CMD_PLAY_OK3);
CD_Mode = stPlay; CD_Mode = stPlay;
break; break;
case cmPlayIt: case cm_PlayIt:
playMode = 1; playMode = 1;
RS232_Print("PLAY\n"); RS232_Print("PLAY\n");
CMD_PLAY_OK4[7] = cd_Disc; CMD_PLAY_OK4[7] = cd_Disc;
@ -819,8 +819,8 @@ uint8_t AVCLan_SendAnswer() {
AVCLan_Send_Status(); AVCLan_Send_Status();
CD_Mode = stPlay; CD_Mode = stPlay;
break; break;
case cmStopReq: case cm_StopReq:
case cmStopReq2: case cm_StopReq2:
CD_Mode = stStop; CD_Mode = stStop;
playMode = 0; playMode = 0;
@ -831,12 +831,12 @@ uint8_t AVCLan_SendAnswer() {
CMD_STOP2[10] = cd_Time_Sec; CMD_STOP2[10] = cd_Time_Sec;
r = AVCLan_SendAnswerFrame((uint8_t *)CMD_STOP2); r = AVCLan_SendAnswerFrame((uint8_t *)CMD_STOP2);
break; break;
case cmBeep: case cm_Beep:
AVCLan_SendAnswerFrame((uint8_t *)CMD_BEEP); AVCLan_SendAnswerFrame((uint8_t *)CMD_BEEP);
break; break;
} }
answerReq = cmNull; answerReq = cm_Null;
return r; return r;
} }
@ -844,8 +844,8 @@ void AVCLan_Register() {
RS232_Print("REG_ST\n"); RS232_Print("REG_ST\n");
AVCLan_SendAnswerFrame((uint8_t *)CMD_REGISTER); AVCLan_SendAnswerFrame((uint8_t *)CMD_REGISTER);
RS232_Print("REG_END\n"); RS232_Print("REG_END\n");
// AVCLan_Command( cmRegister ); // AVCLan_Command( cm_Register );
AVCLan_Command(cmInit); AVCLan_Command(cm_Init);
} }
uint8_t AVCLan_Command(uint8_t command) { uint8_t AVCLan_Command(uint8_t command) {

48
src/avclandrv.h
View File

@ -51,31 +51,29 @@ void AVC_ReleaseLine();
extern uint16_t CD_ID; // CD Changer ID extern uint16_t CD_ID; // CD Changer ID
extern uint16_t HU_ID; // Head-unit ID extern uint16_t HU_ID; // Head-unit ID
#define cmNull 0 typedef enum {
#define cmStatus1 1 cm_Null = 0,
#define cmStatus2 2 cm_Status1 = 1,
#define cmStatus3 3 cm_Status2 = 2,
#define cmStatus4 4 cm_Status3 = 3,
cm_Status4 = 4,
#define cmRegister 100 cm_PlayReq1 = 5,
#define cmInit 101 cm_PlayReq2 = 6,
#define cmCheck 102 cm_PlayReq3 = 7,
#define cmPlayIt 103 cm_StopReq = 8,
#define cmBeep 110 cm_StopReq2 = 9,
cm_Register = 100,
#define cmNextTrack 120 cm_Init = 101,
#define cmPrevTrack 121 cm_Check = 102,
#define cmNextDisc 122 cm_PlayIt = 103,
#define cmPrevDisc 123 cm_Beep = 110,
cm_NextTrack = 120,
#define cmScanModeOn 130 cm_PrevTrack = 121,
#define cmScanModeOff 131 cm_NextDisc = 122,
cm_PrevDisc = 123,
#define cmPlayReq1 5 cm_ScanModeOn = 130,
#define cmPlayReq2 6 cm_ScanModeOff = 131,
#define cmPlayReq3 7 } commands;
#define cmStopReq 8
#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;

2
src/sniffer.c
View File

@ -107,7 +107,7 @@ int main() {
break; break;
case 'R': case 'R':
RS232_Print("REGIST:\n"); RS232_Print("REGIST:\n");
AVCLan_Command(cmRegister); AVCLan_Command(cm_Register);
TCB1.CNT = 0; TCB1.CNT = 0;
while (TCB1.CNT < 540) {} while (TCB1.CNT < 540) {}
CHECK_AVC_LINE; CHECK_AVC_LINE;