CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9131 from Bob-the-Kuhn/LPC-formatted-prints

Browse Source 
[2.0.x] LPC1768 formatted print statements
This commit is contained in:
Scott Lahteine 2018-01-09 23:44:10 -06:00 committed by GitHub
commit cf654b9a1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 171 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
Marlin/src/HAL/HAL_LPC1768/HardwareSerial.h
View File

@ -73,27 +73,109 @@ public:
void IRQHandler(); void IRQHandler();
void print(const char value[]) { printf("%s" , value); } #define DEC 10
void print(char value, int = 0) { printf("%c" , value); } #define HEX 16
void print(unsigned char value, int = 0) { printf("%u" , value); } #define OCT 8
void print(int value, int = 0) { printf("%d" , value); } #define BIN 2
void print(unsigned int value, int = 0) { printf("%u" , value); } #define BYTE 0
void print(long value, int = 0) { printf("%ld" , value); }
void print(unsigned long value, int = 0) { printf("%lu" , value); }
void print(float value, int round = 6) { printf("%f" , value); }
void print(double value, int round = 6) { printf("%f" , value ); }
void println(const char value[]) { printf("%s\n" , value); } void print_bin(uint32_t value, uint8_t num_digits) {
void println(char value, int = 0) { printf("%c\n" , value); } uint32_t mask = 1 << (num_digits -1);
void println(unsigned char value, int = 0) { printf("%u\r\n" , value); } for (uint8_t i = 0; i < num_digits; i++) {
void println(int value, int = 0) { printf("%d\n" , value); } if (!(i % 4) && i) printf(" ");
void println(unsigned int value, int = 0) { printf("%u\n" , value); } if (!(i % 16) && i) printf(" ");
void println(long value, int = 0) { printf("%ld\n" , value); } if (value & mask) printf("1");
void println(unsigned long value, int = 0) { printf("%lu\n" , value); } else printf("0");
void println(float value, int round = 6) { printf("%f\n" , value ); } value <<= 1;
void println(double value, int round = 6) { printf("%f\n" , value ); } }
void println(void) { print('\n'); } }
void print(const char value[]) {
printf("%s" , value);
}
void print(char value, int nbase = BYTE) {
if (nbase == BIN) print_bin(value,8);
else if (nbase == OCT) printf("%3o", value);
else if (nbase == HEX) printf("%2X", value);
else if (nbase == DEC ) printf("%d", value);
else printf("%c" , value);
}
void print(unsigned char value, int nbase = BYTE) {
if (nbase == BIN) print_bin(value,8);
else if (nbase == OCT) printf("%3o", value);
else if (nbase == HEX) printf("%2X", value);
else printf("%u" , value);
}
void print(int value, int nbase = BYTE) {
if (nbase == BIN) print_bin(value,16);
else if (nbase == OCT) printf("%6o", value);
else if (nbase == HEX) printf("%4X", value);
else printf("%d", value);
}
void print(unsigned int value, int nbase = BYTE) {
if (nbase == BIN) print_bin(value,16);
else if (nbase == OCT) printf("%6o", value);
else if (nbase == HEX) printf("%4X", value);
else printf("%u" , value);
}
void print(long value, int nbase = BYTE) {
if (nbase == BIN) print_bin(value,32);
else if (nbase == OCT) printf("%11o", value);
else if (nbase == HEX) printf("%8X", value);
else printf("%ld" , value);
}
void print(unsigned long value, int nbase = BYTE) {
if (nbase == BIN) print_bin(value,32);
else if (nbase == OCT) printf("%11o", value);
else if (nbase == HEX) printf("%8X", value);
else printf("%lu" , value);
}
void print(float value, int round = 6) {
printf("%f" , value);
}
void print(double value, int round = 6) {
printf("%f" , value );
}
void println(const char value[]) {
printf("%s\n" , value);
}
void println(char value, int nbase = BYTE) {
print(value, nbase);
println();
}
void println(unsigned char value, int nbase = BYTE) {
print(value, nbase);
println();
}
void println(int value, int nbase = BYTE) {
print(value, nbase);
println();
}
void println(unsigned int value, int nbase = BYTE) {
print(value, nbase);
println();
}
void println(long value, int nbase = BYTE) {
print(value, nbase);
println();
}
void println(unsigned long value, int nbase = BYTE) {
print(value, nbase);
println();
}
void println(float value, int round = 6) {
printf("%f\n" , value );
}
void println(double value, int round = 6) {
printf("%f\n" , value );
}
void println(void) {
print('\n');
}
}; };

95
Marlin/src/HAL/HAL_LPC1768/serial.h
View File

@ -146,28 +146,64 @@ public:
} }
} }
#define DEC 10
#define HEX 16
#define OCT 8
#define BIN 2
#define BYTE 0
void print_bin(uint32_t value, uint8_t num_digits) {
uint32_t mask = 1 << (num_digits -1);
for (uint8_t i = 0; i < num_digits; i++) {
if (!(i % 4) && i) printf(" ");
if (!(i % 16) && i) printf(" ");
if (value & mask) printf("1");
else printf("0");
value <<= 1;
}
}
void print(const char value[]) { void print(const char value[]) {
printf("%s" , value); printf("%s" , value);
} }
void print(char value, int = 0) { void print(char value, int nbase = BYTE) {
printf("%c" , value); if (nbase == BIN) print_bin(value,8);
else if (nbase == OCT) printf("%3o", value);
else if (nbase == HEX) printf("%2X", value);
else if (nbase == DEC ) printf("%d", value);
else printf("%c" , value);
} }
void print(unsigned char value, int = 0) { void print(unsigned char value, int nbase = BYTE) {
printf("%u" , value); if (nbase == BIN) print_bin(value,8);
else if (nbase == OCT) printf("%3o", value);
else if (nbase == HEX) printf("%2X", value);
else printf("%u" , value);
} }
void print(int value, int = 0) { void print(int value, int nbase = BYTE) {
printf("%d" , value); if (nbase == BIN) print_bin(value,16);
else if (nbase == OCT) printf("%6o", value);
else if (nbase == HEX) printf("%4X", value);
else printf("%d", value);
} }
void print(unsigned int value, int = 0) { void print(unsigned int value, int nbase = BYTE) {
printf("%u" , value); if (nbase == BIN) print_bin(value,16);
else if (nbase == OCT) printf("%6o", value);
else if (nbase == HEX) printf("%4X", value);
else printf("%u" , value);
} }
void print(long value, int = 0) { void print(long value, int nbase = BYTE) {
printf("%ld" , value); if (nbase == BIN) print_bin(value,32);
else if (nbase == OCT) printf("%11o", value);
else if (nbase == HEX) printf("%8X", value);
else printf("%ld" , value);
} }
void print(unsigned long value, int = 0) { void print(unsigned long value, int nbase = BYTE) {
printf("%lu" , value); if (nbase == BIN) print_bin(value,32);
else if (nbase == OCT) printf("%11o", value);
else if (nbase == HEX) printf("%8X", value);
else printf("%lu" , value);
} }
void print(float value, int round = 6) { void print(float value, int round = 6) {
printf("%f" , value); printf("%f" , value);
} }
@ -175,26 +211,34 @@ public:
printf("%f" , value ); printf("%f" , value );
} }
void println(const char value[]) { void println(const char value[]) {
printf("%s\n" , value); printf("%s\n" , value);
} }
void println(char value, int = 0) { void println(char value, int nbase = BYTE) {
printf("%c\n" , value); print(value, nbase);
println();
} }
void println(unsigned char value, int = 0) { void println(unsigned char value, int nbase = BYTE) {
printf("%u\r\n" , value); print(value, nbase);
println();
} }
void println(int value, int = 0) { void println(int value, int nbase = BYTE) {
printf("%d\n" , value); print(value, nbase);
println();
} }
void println(unsigned int value, int = 0) { void println(unsigned int value, int nbase = BYTE) {
printf("%u\n" , value); print(value, nbase);
println();
} }
void println(long value, int = 0) { void println(long value, int nbase = BYTE) {
printf("%ld\n" , value); print(value, nbase);
println();
} }
void println(unsigned long value, int = 0) { void println(unsigned long value, int nbase = BYTE) {
printf("%lu\n" , value); print(value, nbase);
println();
} }
void println(float value, int round = 6) { void println(float value, int round = 6) {
printf("%f\n" , value ); printf("%f\n" , value );
@ -205,6 +249,7 @@ public:
void println(void) { void println(void) {
print('\n'); print('\n');
} }
volatile RingBuffer<uint8_t, 128> receive_buffer; volatile RingBuffer<uint8_t, 128> receive_buffer;
volatile RingBuffer<uint8_t, 128> transmit_buffer; volatile RingBuffer<uint8_t, 128> transmit_buffer;
volatile bool host_connected; volatile bool host_connected;