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

Tweak formatting rules

Browse Source
This commit is contained in:
Allen Hill 2023-09-17 12:09:09 -04:00
parent 1d6690a234
commit 17f5510b16
5 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.clang-format
View File

@ -4,4 +4,6 @@ UseCRLF: false
BreakBeforeBraces: Attach BreakBeforeBraces: Attach
AllowShortBlocksOnASingleLine: Empty AllowShortBlocksOnASingleLine: Empty
IndentCaseLabels: true IndentCaseLabels: true
IndentPPDirectives: BeforeHash
AlignConsecutiveMacros: Consecutive
... ...

10
src/avclandrv.c
View File

@ -118,11 +118,11 @@
// Name difference between avr-libc and Microchip pack // Name difference between avr-libc and Microchip pack
#if defined(EVSYS_ASYNCCH00_bm) #if defined(EVSYS_ASYNCCH00_bm)
#define EVSYS_ASYNCCH0_0_bm EVSYS_ASYNCCH00_bm #define EVSYS_ASYNCCH0_0_bm EVSYS_ASYNCCH00_bm
#endif #endif
#define READING_BYTE GPIOR1 #define READING_BYTE GPIOR1
#define READING_NBITS GPIOR2 #define READING_NBITS GPIOR2
#define READING_PARITY GPIOR3 #define READING_PARITY GPIOR3
uint16_t CD_ID; uint16_t CD_ID;
@ -284,9 +284,9 @@ void AVCLAN_init() {
// TCB0 for read bit timing // TCB0 for read bit timing
#ifdef SOFTWARE_DEBUG #ifdef SOFTWARE_DEBUG
#define TCB_CNTMODE TCB_CNTMODE_FRQPW_gc #define TCB_CNTMODE TCB_CNTMODE_FRQPW_gc
#else #else
#define TCB_CNTMODE TCB_CNTMODE_PW_gc #define TCB_CNTMODE TCB_CNTMODE_PW_gc
#endif #endif
TCB0.CTRLB = TCB_CNTMODE; TCB0.CTRLB = TCB_CNTMODE;

4
src/com232.c
View File

@ -29,9 +29,9 @@
#include "timing.h" #include "timing.h"
#if USART_RXMODE == USART_RXMODE_CLK2X_gc #if USART_RXMODE == USART_RXMODE_CLK2X_gc
#define RXMODE_S 8 #define RXMODE_S 8
#elif USART_RXMODE == USART_RXMODE_NORMAL_gc #elif USART_RXMODE == USART_RXMODE_NORMAL_gc
#define RXMODE_S 16 #define RXMODE_S 16
#endif #endif
#define USART_BAUD_RATE(BAUD_RATE) \ #define USART_BAUD_RATE(BAUD_RATE) \

2
src/sniffer.c
View File

@ -31,7 +31,7 @@
#include "com232.h" #include "com232.h"
#define EV_NOTHING 0 #define EV_NOTHING 0
#define EV_STATUS 4 #define EV_STATUS 4
uint8_t Event; uint8_t Event;
uint8_t echoCharacters; uint8_t echoCharacters;

34
src/timing.h
View File

@ -1,52 +1,52 @@
#ifndef _TIMING_HPP_ #ifndef _TIMING_HPP_
#define _TIMING_HPP_ #define _TIMING_HPP_
#define __CLKCTRL_PDIV_2X_gc 2 #define __CLKCTRL_PDIV_2X_gc 2
#define __CLKCTRL_PDIV_4X_gc 4 #define __CLKCTRL_PDIV_4X_gc 4
#define __CLKCTRL_PDIV_8X_gc 8 #define __CLKCTRL_PDIV_8X_gc 8
#define __CLKCTRL_PDIV_16X_gc 16 #define __CLKCTRL_PDIV_16X_gc 16
#define __CLKCTRL_PDIV_32X_gc 32 #define __CLKCTRL_PDIV_32X_gc 32
#define __CLKCTRL_PDIV_64X_gc 64 #define __CLKCTRL_PDIV_64X_gc 64
#define __CLKCTRL_PDIV_6X_gc 6 #define __CLKCTRL_PDIV_6X_gc 6
#define __CLKCTRL_PDIV_10X_gc 10 #define __CLKCTRL_PDIV_10X_gc 10
#define __CLKCTRL_PDIV_12X_gc 12 #define __CLKCTRL_PDIV_12X_gc 12
#define __CLKCTRL_PDIV_24X_gc 24 #define __CLKCTRL_PDIV_24X_gc 24
#define __CLKCTRL_PDIV_48X_gc 48 #define __CLKCTRL_PDIV_48X_gc 48
#if CLK_PRESCALE == 0x01 #if CLK_PRESCALE == 0x01
#define F_CPU (FREQSEL / __CLK_PRESCALE_DIV) #define F_CPU (FREQSEL / __CLK_PRESCALE_DIV)
#define CYCLE_MUL __CLK_PRESCALE_DIV #define CYCLE_MUL __CLK_PRESCALE_DIV
#else #else
#define F_CPU (FREQSEL) #define F_CPU (FREQSEL)
#define CYCLE_MUL 1 #define CYCLE_MUL 1
#endif #endif
#if FREQSEL == 20000000L #if FREQSEL == 20000000L
#define CPU_CYCLE (50 * CYCLE_MUL) #define CPU_CYCLE (50 * CYCLE_MUL)
#elif FREQSEL == 16000000L #elif FREQSEL == 16000000L
#define CPU_CYCLE (62.5 * CYCLE_MUL) #define CPU_CYCLE (62.5 * CYCLE_MUL)
#else #else
#error "Not implemented" #error "Not implemented"
#endif #endif
#ifndef TCB_CLKSEL_CLKDIV1_gc #ifndef TCB_CLKSEL_CLKDIV1_gc
#define TCB_CLKSEL_CLKDIV1_gc (0x00 << 1) #define TCB_CLKSEL_CLKDIV1_gc (0x00 << 1)
#endif #endif
#ifndef TCB_CLKSEL_CLKDIV2_gc #ifndef TCB_CLKSEL_CLKDIV2_gc
#define TCB_CLKSEL_CLKDIV2_gc (0x01 << 1) #define TCB_CLKSEL_CLKDIV2_gc (0x01 << 1)
#endif #endif
#ifndef TCB_CLKSEL_CLKTCA_gc #ifndef TCB_CLKSEL_CLKTCA_gc
#define TCB_CLKSEL_CLKTCA_gc (0x02 << 1) #define TCB_CLKSEL_CLKTCA_gc (0x02 << 1)
#endif #endif
#if TCB_CLKSEL == TCB_CLKSEL_CLKDIV1_gc #if TCB_CLKSEL == TCB_CLKSEL_CLKDIV1_gc
#define TCB_TICK (CPU_CYCLE) #define TCB_TICK (CPU_CYCLE)
#elif TCB_CLKSEL == TCB_CLKSEL_CLKDIV2_gc #elif TCB_CLKSEL == TCB_CLKSEL_CLKDIV2_gc
#define TCB_TICK (CPU_CYCLE * 2) #define TCB_TICK (CPU_CYCLE * 2)
#elif TCB_CLKSEL == TCB_CLKSEL_CLKTCA_gc #elif TCB_CLKSEL == TCB_CLKSEL_CLKTCA_gc
#error "Not implemented" #error "Not implemented"
#endif #endif
// Measured at ±0.02 μs @ F_CPU=20MHz, TCB_CLKSEL=TCB_CLKSEL_CLKDIV1_gc // Measured at ±0.02 μs @ F_CPU=20MHz, TCB_CLKSEL=TCB_CLKSEL_CLKDIV1_gc