summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDave Hylands <dhylands@gmail.com>2014-01-12 10:39:32 -0800
committerDave Hylands <dhylands@gmail.com>2014-01-12 10:45:17 -0800
commitb5f458278ca535bb03e84220c6db0d8ecd979586 (patch)
tree0f504d9f8ff0cc117ede4c5defbc2f13a061bd1a
parentfd17921b75817a07d688ccaa9130f65c1181f910 (diff)
downloadmicropython-b5f458278ca535bb03e84220c6db0d8ecd979586.tar.gz
micropython-b5f458278ca535bb03e84220c6db0d8ecd979586.zip
Added a hacky implementation for %g
-rw-r--r--stm/printf.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/stm/printf.c b/stm/printf.c
index fa94269257..bcd377f7dc 100644
--- a/stm/printf.c
+++ b/stm/printf.c
@@ -206,6 +206,21 @@ int pfenv_printf(const pfenv_t *pfenv, const char *fmt, va_list args) {
case 'P': // ?
chrs += pfenv_print_int(pfenv, va_arg(args, int), 0, 16, 'A', flags, width);
break;
+ case 'g':
+ {
+ // This is a very hacky approach to printing floats. Micropython
+ // uses %g when using print, and I just wanted to see somthing
+ // usable. I expect that this will be replaced with something
+ // more appropriate.
+ char dot = '.';
+ double d = va_arg(args, double);
+ int left = (int)d;
+ int right = (int)((d - (double)(int)d) * 1000000.0);
+ chrs += pfenv_print_int(pfenv, left, 1, 10, 'a', flags, width);
+ chrs += pfenv_print_strn(pfenv, &dot, 1, flags, width);
+ chrs += pfenv_print_int(pfenv, right, 0, 10, 'a', PF_FLAG_ZERO_PAD, 6);
+ break;
+ }
default:
pfenv->print_strn(pfenv->data, fmt, 1);
chrs += 1;