Skip to content

Commit 7b14e6d

Browse files
committed
fixed indent in Uart.h Uart.cpp
1 parent 5a466d8 commit 7b14e6d

File tree

2 files changed

+87
-87
lines changed

2 files changed

+87
-87
lines changed

cores/arduino/Uart.cpp

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -22,144 +22,144 @@
2222

2323
Uart::Uart(SERCOM *_s, uint8_t _pinRX, uint8_t _pinTX)
2424
{
25-
sercom = _s;
26-
uc_pinRX = _pinRX;
27-
uc_pinTX = _pinTX;
25+
sercom = _s;
26+
uc_pinRX = _pinRX;
27+
uc_pinTX = _pinTX;
2828
}
2929

3030
void Uart::begin(unsigned long baudrate)
3131
{
32-
begin(baudrate, (uint8_t)SERIAL_8N1);
32+
begin(baudrate, (uint8_t)SERIAL_8N1);
3333
}
3434

3535
void Uart::begin(unsigned long baudrate, uint8_t config)
3636
{
3737
pinPeripheral(uc_pinRX, g_APinDescription[uc_pinRX].ulPinType);
3838
pinPeripheral(uc_pinTX, g_APinDescription[uc_pinTX].ulPinType);
3939

40-
sercom->initUART(UART_INT_CLOCK, SAMPLE_RATE_x16, baudrate);
41-
sercom->initFrame(extractCharSize(config), LSB_FIRST, extractParity(config), extractNbStopBit(config));
42-
sercom->initPads(UART_TX_PAD_2, SERCOM_RX_PAD_3);
40+
sercom->initUART(UART_INT_CLOCK, SAMPLE_RATE_x16, baudrate);
41+
sercom->initFrame(extractCharSize(config), LSB_FIRST, extractParity(config), extractNbStopBit(config));
42+
sercom->initPads(UART_TX_PAD_2, SERCOM_RX_PAD_3);
4343

4444

45-
sercom->enableUART();
45+
sercom->enableUART();
4646
}
4747

4848
void Uart::end()
4949
{
50-
sercom->resetUART();
51-
rxBuffer.clear();
50+
sercom->resetUART();
51+
rxBuffer.clear();
5252
}
5353

5454
void Uart::flush()
5555
{
56-
sercom->flushUART();
56+
sercom->flushUART();
5757
}
5858

5959
void Uart::IrqHandler()
6060
{
61-
if(sercom->availableDataUART())
62-
{
63-
rxBuffer.store_char(sercom->readDataUART());
64-
}
61+
if(sercom->availableDataUART())
62+
{
63+
rxBuffer.store_char(sercom->readDataUART());
64+
}
6565

66-
if( sercom->isBufferOverflowErrorUART() ||
67-
sercom->isFrameErrorUART() ||
68-
sercom->isParityErrorUART())
69-
{
70-
sercom->clearStatusUART();
71-
}
66+
if( sercom->isBufferOverflowErrorUART() ||
67+
sercom->isFrameErrorUART() ||
68+
sercom->isParityErrorUART())
69+
{
70+
sercom->clearStatusUART();
71+
}
7272
}
7373

7474
int Uart::available()
7575
{
76-
return rxBuffer.available();
76+
return rxBuffer.available();
7777
}
7878

7979
int Uart::peek()
8080
{
81-
return rxBuffer.peek();
81+
return rxBuffer.peek();
8282
}
8383

8484
int Uart::read()
8585
{
86-
return rxBuffer.read_char();
86+
return rxBuffer.read_char();
8787
}
8888

8989
size_t Uart::write(const uint8_t data)
9090
{
91-
sercom->writeDataUART(data);
92-
return 1;
91+
sercom->writeDataUART(data);
92+
return 1;
9393
}
9494

9595
size_t Uart::write(const char * data)
9696
{
97-
size_t writed = 0;
97+
size_t writed = 0;
9898

99-
while(*data != '\0')
100-
{
101-
writed += write(*data);
102-
++data;
103-
}
99+
while(*data != '\0')
100+
{
101+
writed += write(*data);
102+
++data;
103+
}
104104

105-
return writed;
105+
return writed;
106106
}
107107

108108
SercomNumberStopBit Uart::extractNbStopBit(uint8_t config)
109109
{
110-
switch(config & HARDSER_STOP_BIT_MASK)
111-
{
112-
case HARDSER_STOP_BIT_1:
113-
default:
114-
return SERCOM_STOP_BIT_1;
110+
switch(config & HARDSER_STOP_BIT_MASK)
111+
{
112+
case HARDSER_STOP_BIT_1:
113+
default:
114+
return SERCOM_STOP_BIT_1;
115115

116-
case HARDSER_STOP_BIT_2:
117-
return SERCOM_STOP_BITS_2;
118-
}
116+
case HARDSER_STOP_BIT_2:
117+
return SERCOM_STOP_BITS_2;
118+
}
119119
}
120120

121121
SercomUartCharSize Uart::extractCharSize(uint8_t config)
122122
{
123-
switch(config & HARDSER_DATA_MASK)
124-
{
125-
case HARDSER_DATA_5:
126-
return UART_CHAR_SIZE_5_BITS;
123+
switch(config & HARDSER_DATA_MASK)
124+
{
125+
case HARDSER_DATA_5:
126+
return UART_CHAR_SIZE_5_BITS;
127127

128-
case HARDSER_DATA_6:
129-
return UART_CHAR_SIZE_6_BITS;
128+
case HARDSER_DATA_6:
129+
return UART_CHAR_SIZE_6_BITS;
130130

131-
case HARDSER_DATA_7:
132-
return UART_CHAR_SIZE_7_BITS;
131+
case HARDSER_DATA_7:
132+
return UART_CHAR_SIZE_7_BITS;
133133

134-
case HARDSER_DATA_8:
135-
default:
136-
return UART_CHAR_SIZE_8_BITS;
134+
case HARDSER_DATA_8:
135+
default:
136+
return UART_CHAR_SIZE_8_BITS;
137137

138-
}
138+
}
139139
}
140140

141141
SercomParityMode Uart::extractParity(uint8_t config)
142142
{
143-
switch(config & HARDSER_PARITY_MASK)
144-
{
145-
case HARDSER_PARITY_NONE:
146-
default:
147-
return SERCOM_NO_PARITY;
143+
switch(config & HARDSER_PARITY_MASK)
144+
{
145+
case HARDSER_PARITY_NONE:
146+
default:
147+
return SERCOM_NO_PARITY;
148148

149-
case HARDSER_PARITY_EVEN:
150-
return SERCOM_EVEN_PARITY;
149+
case HARDSER_PARITY_EVEN:
150+
return SERCOM_EVEN_PARITY;
151151

152-
case HARDSER_PARITY_ODD:
153-
return SERCOM_ODD_PARITY;
154-
}
152+
case HARDSER_PARITY_ODD:
153+
return SERCOM_ODD_PARITY;
154+
}
155155
}
156156

157157
void SERCOM0_Handler()
158158
{
159-
Serial1.IrqHandler();
159+
Serial1.IrqHandler();
160160
}
161161

162162
void SERCOM5_Handler()
163163
{
164-
Serial.IrqHandler();
164+
Serial.IrqHandler();
165165
}

cores/arduino/Uart.h

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,32 +28,32 @@
2828

2929
class Uart : public HardwareSerial
3030
{
31-
public:
32-
Uart(SERCOM *_s, uint8_t _pinRX, uint8_t _pinTX);
33-
void begin(unsigned long baudRate);
34-
void begin(unsigned long baudrate, uint8_t config);
35-
void end();
36-
int available();
37-
int peek();
38-
int read();
39-
void flush();
40-
size_t write(const uint8_t data);
41-
size_t write(const char * data);
42-
43-
void IrqHandler();
44-
45-
operator bool() { return true; }
46-
47-
private:
48-
SERCOM *sercom;
49-
RingBuffer rxBuffer;
31+
public:
32+
Uart(SERCOM *_s, uint8_t _pinRX, uint8_t _pinTX);
33+
void begin(unsigned long baudRate);
34+
void begin(unsigned long baudrate, uint8_t config);
35+
void end();
36+
int available();
37+
int peek();
38+
int read();
39+
void flush();
40+
size_t write(const uint8_t data);
41+
size_t write(const char * data);
42+
43+
void IrqHandler();
44+
45+
operator bool() { return true; }
46+
47+
private:
48+
SERCOM *sercom;
49+
RingBuffer rxBuffer;
5050

5151
uint8_t uc_pinRX;
5252
uint8_t uc_pinTX;
5353

54-
SercomNumberStopBit extractNbStopBit(uint8_t config);
55-
SercomUartCharSize extractCharSize(uint8_t config);
56-
SercomParityMode extractParity(uint8_t config);
54+
SercomNumberStopBit extractNbStopBit(uint8_t config);
55+
SercomUartCharSize extractCharSize(uint8_t config);
56+
SercomParityMode extractParity(uint8_t config);
5757
};
5858

5959
extern Uart Serial;

0 commit comments

Comments
 (0)