ManuelW/grbl-LPC-CoreXY
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

undid changes to printIntegerInBase that resulted in the integers being printed in reverse...

Browse Source
This commit is contained in:
Simen Svale Skogsrud 2011-06-04 22:17:51 +02:00
parent 903303579f
commit 74db3e6c5b
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
print.c
View File

@ -42,24 +42,25 @@ void printPgmString(const char *s)
serial_write(c); serial_write(c);
} }
// Prints a single digit of any base up to 36. 0..9 prints as
// '0'..'9' while 10..35 prints as 'a'..'z'
void printDigit(uint8_t value) {
serial_write(value < 10 ?
'0' + value :
'a' + value - 10);
}
void printIntegerInBase(unsigned long n, unsigned long base) void printIntegerInBase(unsigned long n, unsigned long base)
{ {
unsigned char buf[8 * sizeof(long)]; // Assumes 8-bit chars.
unsigned long i = 0;
if (n == 0) { if (n == 0) {
printDigit(0); serial_write('0');
return; return;
} }
while (n > 0) { while (n > 0) {
printDigit(n % base); buf[i++] = n % base;
n /= base; n /= base;
} }
for (; i > 0; i--)
serial_write(buf[i - 1] < 10 ?
'0' + buf[i - 1] :
'A' + buf[i - 1] - 10);
} }
void printInteger(long n) void printInteger(long n)
@ -75,7 +76,8 @@ void printInteger(long n)
// A very simple // A very simple
void printFloat(double n) void printFloat(double n)
{ {
double integer_part, fractional_part, decimal_part; double integer_part, fractional_part;
uint8_t decimal_part;
fractional_part = modf(n, &integer_part); fractional_part = modf(n, &integer_part);
printInteger(integer_part); printInteger(integer_part);
serial_write('.'); serial_write('.');
@ -83,7 +85,7 @@ void printFloat(double n)
int decimals = DECIMAL_PLACES; int decimals = DECIMAL_PLACES;
while(decimals-- > 0) { while(decimals-- > 0) {
decimal_part = floor(fractional_part); decimal_part = floor(fractional_part);
printDigit(decimal_part); serial_write('0'+decimal_part);
fractional_part -= decimal_part; fractional_part -= decimal_part;
fractional_part *= 10; fractional_part *= 10;
} }