Skip to content

[2.0.x] fix indentations #10934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 2 commits into from
Jun 5, 2018
Merged

[2.0.x] fix indentations #10934

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3aa362
[2.0.x] fix indentations
GMagician Jun 4, 2018
c8c4569
missing indentation
GMagician Jun 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,9 @@
const bool isr_enabled = TEST(M_UCSRxB, M_RXCIEx);
CBI(M_UCSRxB, M_RXCIEx);
#endif
const int v = rx_buffer.head == rx_buffer.tail ? -1 : rx_buffer.buffer[rx_buffer.tail];

const int v = rx_buffer.head == rx_buffer.tail ? -1 : rx_buffer.buffer[rx_buffer.tail];

#if RX_BUFFER_SIZE > 256
// Reenable RX interrupts if they were enabled
if (isr_enabled) SBI(M_UCSRxB, M_RXCIEx);
Expand Down Expand Up @@ -343,7 +345,7 @@
CBI(M_UCSRxB, M_RXCIEx);
#endif

const ring_buffer_pos_t h = rx_buffer.head, t = rx_buffer.tail;
const ring_buffer_pos_t h = rx_buffer.head, t = rx_buffer.tail;

#if RX_BUFFER_SIZE > 256
if (isr_enabled) SBI(M_UCSRxB, M_RXCIEx);
Expand All @@ -358,7 +360,7 @@
CBI(M_UCSRxB, M_RXCIEx);
#endif

rx_buffer.tail = rx_buffer.head;
rx_buffer.tail = rx_buffer.head;

#if RX_BUFFER_SIZE > 256
if (isr_enabled) SBI(M_UCSRxB, M_RXCIEx);
Expand Down