sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keep "astyled" elements in MarlinSerial.*

Browse Source
This commit is contained in:
Scott Lahteine
2015-10-02 23:12:16 -07:00
parent f844d18724
commit 9ab5401df3
2 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/MarlinSerial.cpp
View File

@@ -102,7 +102,8 @@ void MarlinSerial::end() {
int MarlinSerial::peek(void) { int MarlinSerial::peek(void) {
if (rx_buffer.head == rx_buffer.tail) { if (rx_buffer.head == rx_buffer.tail) {
return -1; return -1;
} else { }
else {
return rx_buffer.buffer[rx_buffer.tail]; return rx_buffer.buffer[rx_buffer.tail];
} }
} }
@@ -162,7 +163,8 @@ void MarlinSerial::print(long n, int base) {
n = -n; n = -n;
} }
printNumber(n, 10); printNumber(n, 10);
} else { }
else {
printNumber(n, base); printNumber(n, base);
} }
} }
@@ -181,7 +183,7 @@ void MarlinSerial::println(void) {
print('\n'); print('\n');
} }
void MarlinSerial::println(const String &s) { void MarlinSerial::println(const String& s) {
print(s); print(s);
println(); println();
} }
@@ -243,16 +245,16 @@ void MarlinSerial::printNumber(unsigned long n, uint8_t base) {
} }
for (; i > 0; i--) for (; i > 0; i--)
print((char) (buf[i - 1] < 10 ? print((char)(buf[i - 1] < 10 ?
'0' + buf[i - 1] : '0' + buf[i - 1] :
'A' + buf[i - 1] - 10)); 'A' + buf[i - 1] - 10));
} }
void MarlinSerial::printFloat(double number, uint8_t digits) { void MarlinSerial::printFloat(double number, uint8_t digits) {
// Handle negative numbers // Handle negative numbers
if (number < 0.0) { if (number < 0.0) {
print('-'); print('-');
number = -number; number = -number;
} }
// Round correctly so that print(1.999, 2) prints as "2.00" // Round correctly so that print(1.999, 2) prints as "2.00"

15
Marlin/MarlinSerial.h
View File

@@ -29,8 +29,8 @@
// The presence of the UBRRH register is used to detect a UART. // The presence of the UBRRH register is used to detect a UART.
#define UART_PRESENT(port) ((port == 0 && (defined(UBRRH) || defined(UBRR0H))) || \ #define UART_PRESENT(port) ((port == 0 && (defined(UBRRH) || defined(UBRR0H))) || \
(port == 1 && defined(UBRR1H)) || (port == 2 && defined(UBRR2H)) || \ (port == 1 && defined(UBRR1H)) || (port == 2 && defined(UBRR2H)) || \
(port == 3 && defined(UBRR3H))) (port == 3 && defined(UBRR3H)))
// These are macros to build serial port register names for the selected SERIAL_PORT (C preprocessor // These are macros to build serial port register names for the selected SERIAL_PORT (C preprocessor
// requires two levels of indirection to expand macro values properly) // requires two levels of indirection to expand macro values properly)
@@ -99,7 +99,6 @@ class MarlinSerial { //: public Stream
FORCE_INLINE void write(uint8_t c) { FORCE_INLINE void write(uint8_t c) {
while (!TEST(M_UCSRxA, M_UDREx)) while (!TEST(M_UCSRxA, M_UDREx))
; ;
M_UDRx = c; M_UDRx = c;
} }
@@ -124,10 +123,10 @@ class MarlinSerial { //: public Stream
void printFloat(double, uint8_t); void printFloat(double, uint8_t);
public: public:
FORCE_INLINE void write(const char *str) { while (*str) write(*str++); } FORCE_INLINE void write(const char* str) { while (*str) write(*str++); }
FORCE_INLINE void write(const uint8_t *buffer, size_t size) { while (size--) write(*buffer++); } FORCE_INLINE void write(const uint8_t* buffer, size_t size) { while (size--) write(*buffer++); }
FORCE_INLINE void print(const String &s) { for (int i = 0; i < (int)s.length(); i++) write(s[i]); } FORCE_INLINE void print(const String& s) { for (int i = 0; i < (int)s.length(); i++) write(s[i]); }
FORCE_INLINE void print(const char *str) { write(str); } FORCE_INLINE void print(const char* str) { write(str); }
void print(char, int = BYTE); void print(char, int = BYTE);
void print(unsigned char, int = BYTE); void print(unsigned char, int = BYTE);
@@ -137,7 +136,7 @@ class MarlinSerial { //: public Stream
void print(unsigned long, int = DEC); void print(unsigned long, int = DEC);
void print(double, int = 2); void print(double, int = 2);
void println(const String &s); void println(const String& s);
void println(const char[]); void println(const char[]);
void println(char, int = BYTE); void println(char, int = BYTE);
void println(unsigned char, int = BYTE); void println(unsigned char, int = BYTE);