1
0
mirror of https://github.com/halleysfifthinc/Toyota-AVC-LAN synced 2025-06-05 23:16:13 +00:00

Tweak formatting rules

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

View File

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

View File

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

View File

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

View File

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

View File

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