william@beaglebone:~/dev$ diff msp430-print.cpp cc3200-print.cpp > output.txt

4c4
<
---
>
9c9
<
---
>
14c14
<
---
>
18c18
<
---
>
44,48c44,48
<   size_t n = 0;
<   for (uint16_t i = 0; i < s.length(); i++) {
<     n += write(s[i]);
<   }
<   return n;
---
>     size_t n = 0;
>     for (uint16_t i = 0; i < s.length(); i++) {
>         n += write(s[i]);
>     }
>     return n;
53c53
<   return write(str);
---
>     return write(str);
58c58
<   return write(c);
---
>     return write(c);
63c63
<   return print((unsigned long) b, base);
---
>     return print((unsigned long) b, base);
68c68
<   return print((long) n, base);
---
>     return print((long) n, base);
73c73
<   return print((unsigned long) n, base);
---
>     return print((unsigned long) n, base);
78,89c78,89
<   if (base == 0) {
<     return write(n);
<   } else if (base == 10) {
<     if (n < 0) {
<       int t = print('-');
<       n = -n;
<       return printNumber(n, 10) + t;
<     }
<     return printNumber(n, 10);
<   } else {
<     return printNumber(n, base);
<   }
---
>     if (base == 0) {
>         return write(n);
>     } else if (base == 10) {
>         if (n < 0) {
>             int t = print('-');
>             n = -n;
>             return printNumber(n, 10) + t;
>         }
>         return printNumber(n, 10);
>     } else {
>         return printNumber(n, base);
>     }
94,95c94,95
<   if (base == 0) return write(n);
<   else return printNumber(n, base);
---
>     if (base == 0) return write(n);
>     else return printNumber(n, base);
100c100,105
<   return printFloat(n, digits);
---
>     return printFloat(n, digits);
> }
>
> size_t Print::print(float n, int digits)
> {
>     return printFloat(n, digits);
112c117
<   return x.printTo(*this);
---
>     return x.printTo(*this);
117,119c122,124
<   size_t n = print('\r');
<   n += print('\n');
<   return n;
---
>     size_t n = print('\r');
>     n += print('\n');
>     return n;
124,126c129,131
<   size_t n = print(s);
<   n += println();
<   return n;
---
>     size_t n = print(s);
>     n += println();
>     return n;
131,133c136,138
<   size_t n = print(c);
<   n += println();
<   return n;
---
>     size_t n = print(c);
>     n += println();
>     return n;
138,140c143,145
<   size_t n = print(c);
<   n += println();
<   return n;
---
>     size_t n = print(c);
>     n += println();
>     return n;
145,147c150,152
<   size_t n = print(b, base);
<   n += println();
<   return n;
---
>     size_t n = print(b, base);
>     n += println();
>     return n;
152,154c157,159
<   size_t n = print(num, base);
<   n += println();
<   return n;
---
>     size_t n = print(num, base);
>     n += println();
>     return n;
159,161c164,166
<   size_t n = print(num, base);
<   n += println();
<   return n;
---
>     size_t n = print(num, base);
>     n += println();
>     return n;
166,168c171,173
<   size_t n = print(num, base);
<   n += println();
<   return n;
---
>     size_t n = print(num, base);
>     n += println();
>     return n;
173,175c178,180
<   size_t n = print(num, base);
<   n += println();
<   return n;
---
>     size_t n = print(num, base);
>     n += println();
>     return n;
180,182c185,194
<   size_t n = print(num, digits);
<   n += println();
<   return n;
---
>     size_t n = print(num, digits);
>     n += println();
>     return n;
> }
>
> size_t Print::println(float num, int digits)
> {
>     size_t n = print(num, digits);
>     n += println();
>     return n;
187,189c199,201
<   size_t n = print(x);
<   n += println();
<   return n;
---
>     size_t n = print(x);
>     n += println();
>     return n;
195,196c207,208
<   char buf[8 * sizeof(long) + 1]; // Assumes 8-bit chars plus zero byte.
<   char *str = &buf[sizeof(buf) - 1];
---
>     char buf[8 * sizeof(long) + 1]; // Assumes 8-bit chars plus zero byte.
>     char *str = &buf[sizeof(buf) - 1];
198c210
<   *str = '\0';
---
>     *str = '\0';
200,201c212,213
<   // prevent crash if called with base == 1
<   if (base < 2) base = 10;
---
>     // prevent crash if called with base == 1
>     if (base < 2) base = 10;
203,208c215,220
<   do {
<     unsigned long m = n;
<     n /= base;
<     char c = m - base * n;
<     *--str = c < 10 ? c + '0' : c + 'A' - 10;
<   } while(n);
---
>     do {
>         unsigned long m = n;
>         n /= base;
>         char c = m - base * n;
>         *--str = c < 10 ? c + '0' : c + 'A' - 10;
>     } while(n);
210c222
<   return write(str);
---
>     return write(str);
215,222c227
<   size_t n = 0;
<
<   // Handle negative numbers
<   if (number < 0.0)
<   {
<      n += print('-');
<      number = -number;
<   }
---
>     size_t n = 0;
224,239c229,234
<   // Round correctly so that print(1.999, 2) prints as "2.00"
<   double rounding = 0.5;
<   for (uint8_t i=0; i<digits; ++i)
<     rounding /= 10.0;
<
<   number += rounding;
<
<   // Extract the integer part of the number and print it
<   unsigned long int_part = (unsigned long)number;
<   double remainder = number - (double)int_part;
<   n += print(int_part);
<
<   // Print the decimal point, but only if there are digits beyond
<   if (digits > 0) {
<     n += print(".");
<   }
---
>     // Handle negative numbers
>     if (number < 0.0)
>     {
>         n += print('-');
>         number = -number;
>     }
241,250c236,302
<   // Extract digits from the remainder one at a time
<   while (digits-- > 0)
<   {
<     remainder *= 10.0;
<     int toPrint = int(remainder);
<     n += print(toPrint);
<     remainder -= toPrint;
<   }
<
<   return n;
---
>     // Round correctly so that print(1.999, 2) prints as "2.00"
>     double rounding = 0.5;
>     for (uint8_t i=0; i<digits; ++i)
>         rounding /= 10.0;
>
>     number += rounding;
>
>     // Extract the integer part of the number and print it
>     unsigned long int_part = (unsigned long)number;
>     double remainder = number - (double)int_part;
>     n += print(int_part);
>
>     // Print the decimal point, but only if there are digits beyond
>     if (digits > 0) {
>         n += print(".");
>     }
>
>     // Extract digits from the remainder one at a time
>     while (digits-- > 0)
>     {
>         remainder *= 10.0;
>         int toPrint = int(remainder);
>         n += print(toPrint);
>         remainder -= toPrint;
>     }
>
>     return n;
> }
>
> size_t Print::printFloat(float number, uint8_t digits)
> {
>     size_t n = 0;
>
>     // Handle negative numbers
>     if (number < 0.0)
>     {
>         n += print('-');
>         number = -number;
>     }
>
>     // Round correctly so that print(1.999, 2) prints as "2.00"
>     float rounding = 0.5;
>     for (uint8_t i=0; i<digits; ++i)
>         rounding /= 10.0;
>
>     number += rounding;
>
>     // Extract the integer part of the number and print it
>     unsigned long int_part = (unsigned long)number;
>     float remainder = number - (float)int_part;
>     n += print(int_part);
>
>     // Print the decimal point, but only if there are digits beyond
>     if (digits > 0) {
>         n += print(".");
>     }
>
>     // Extract digits from the remainder one at a time
>     while (digits-- > 0)
>     {
>         remainder *= 10.0;
>         int toPrint = int(remainder);
>         n += print(toPrint);
>         remainder -= toPrint;
>     }
>
>     return n;