From 85b3f0d18d951992a5a60c1921921ef49c5140b9 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 21 Sep 2013 13:29:52 +1000 Subject: [PATCH] AP_HAL: expanded printf test suite --- libraries/AP_HAL/examples/Printf/Printf.pde | 26 ++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/libraries/AP_HAL/examples/Printf/Printf.pde b/libraries/AP_HAL/examples/Printf/Printf.pde index 0c06a21999..7d3c0749e4 100644 --- a/libraries/AP_HAL/examples/Printf/Printf.pde +++ b/libraries/AP_HAL/examples/Printf/Printf.pde @@ -30,7 +30,26 @@ static const struct { { "%.1f", 3.71f, "3.7" }, { "%.1f", 3.75f, "3.8" }, { "%.2f", 3.75f, "3.75" }, - { "%.7f", 3.75f, "3.7500000" } + { "%.7f", 3.75f, "3.750000" }, + { "%f", 10.4f, "10.40000" }, + { "%f", 10.6f, "10.60000" }, + { "%f", 1020.4f, "1020.400" }, + { "%f", 1030.6f, "1030.600" }, + { "%f", 10304052.6f, "1.0304053e+07" }, + { "%f", 103040501.6f, "1.0304050e+08" }, + { "%f", 1030405023.6f, "1.0304050e+09" }, + { "%f", -1030.6f, "-1030.600" }, + { "%f", -10304052.6f, "-1.0304053e+07" }, + { "%f", -103040501.6f, "-1.0304050e+08" }, + { "%f", -1030405023.6f, "-1.0304050e+09" }, + { "%e", 103040501.6f, "1.0304050e+08" }, + { "%g", 103040501.6f, "1.030405e+08" }, + { "%e", -103040501.6f, "-1.0304050e+08" }, + { "%g", -103040501.6f, "-1.030405e+08" }, + { "%.0f", 10.4f, "10" }, + { "%.0f", 10.6f, "11" }, + { "%.1f", 10.4f, "10.4" }, + { "%.1f", 10.6f, "10.6" }, }; static void test_printf(void) @@ -42,10 +61,11 @@ static void test_printf(void) for (i=0; isnprintf(buf, sizeof(buf), float_tests[i].fmt, float_tests[i].v); if (strcmp(buf, float_tests[i].result) != 0) { - hal.console->printf("Failed float_tests[%u] '%s' -> '%s'\n", + hal.console->printf("Failed float_tests[%u] '%s' -> '%s' should be '%s'\n", (unsigned)i, float_tests[i].fmt, - buf); + buf, + float_tests[i].result); failures++; } }