diff --git a/src/systemcmds/param/param.cpp b/src/systemcmds/param/param.cpp index 80adb32c27..336dae7220 100644 --- a/src/systemcmds/param/param.cpp +++ b/src/systemcmds/param/param.cpp @@ -73,13 +73,6 @@ enum class COMPARE_ERROR_LEVEL { SILENT = 1, }; - -#ifdef __PX4_QURT -#define PARAM_PRINT PX4_INFO -#else -#define PARAM_PRINT PX4_INFO_RAW -#endif - static int do_save(const char *param_file_name); static int do_save_default(); static int do_load(const char *param_file_name); @@ -470,10 +463,10 @@ do_save_default() static int do_show(const char *search_string, bool only_changed) { - PARAM_PRINT("Symbols: x = used, + = saved, * = unsaved\n"); + PX4_INFO_RAW("Symbols: x = used, + = saved, * = unsaved\n"); // also show unused params if we show non-default values only param_foreach(do_show_print, (char *)search_string, only_changed, !only_changed); - PARAM_PRINT("\n %u/%u parameters used.\n", param_count_used(), param_count()); + PX4_INFO_RAW("\n %u/%u parameters used.\n", param_count_used(), param_count()); return 0; } @@ -481,19 +474,19 @@ do_show(const char *search_string, bool only_changed) static int do_show_for_airframe() { - PARAM_PRINT("if [ $AUTOCNF = yes ]\n"); - PARAM_PRINT("then\n"); + PX4_INFO_RAW("if [ $AUTOCNF = yes ]\n"); + PX4_INFO_RAW("then\n"); param_foreach(do_show_print_for_airframe, nullptr, true, true); - PARAM_PRINT("fi\n"); + PX4_INFO_RAW("fi\n"); return 0; } static int do_show_all() { - PARAM_PRINT("Symbols: x = used, + = saved, * = unsaved\n"); + PX4_INFO_RAW("Symbols: x = used, + = saved, * = unsaved\n"); param_foreach(do_show_print, nullptr, false, false); - PARAM_PRINT("\n %u parameters total, %u used.\n", param_count(), param_count_used()); + PX4_INFO_RAW("\n %u parameters total, %u used.\n", param_count(), param_count_used()); return 0; } @@ -513,14 +506,14 @@ do_show_quiet(const char *param_name) switch (param_type(param)) { case PARAM_TYPE_INT32: if (!param_get(param, &ii)) { - PARAM_PRINT("%ld", (long)ii); + PX4_INFO_RAW("%ld", (long)ii); } break; case PARAM_TYPE_FLOAT: if (!param_get(param, &ff)) { - PARAM_PRINT("%4.4f", (double)ff); + PX4_INFO_RAW("%4.4f", (double)ff); } break; @@ -542,7 +535,7 @@ do_find(const char *name) return 1; } - PARAM_PRINT("Found param %s at index %i\n", name, (int)ret); + PX4_INFO_RAW("Found param %s at index %i\n", name, (int)ret); return 0; } @@ -567,27 +560,27 @@ do_show_index(const char *index, bool used_index) return 1; } - PARAM_PRINT("index %d: %c %c %s [%d,%d] : ", i, (param_used(param) ? 'x' : ' '), + PX4_INFO_RAW("index %d: %c %c %s [%d,%d] : ", i, (param_used(param) ? 'x' : ' '), param_value_unsaved(param) ? '*' : (param_value_is_default(param) ? ' ' : '+'), param_name(param), param_get_used_index(param), param_get_index(param)); switch (param_type(param)) { case PARAM_TYPE_INT32: if (!param_get(param, &ii)) { - PARAM_PRINT("%ld\n", (long)ii); + PX4_INFO_RAW("%ld\n", (long)ii); } break; case PARAM_TYPE_FLOAT: if (!param_get(param, &ff)) { - PARAM_PRINT("%4.4f\n", (double)ff); + PX4_INFO_RAW("%4.4f\n", (double)ff); } break; default: - PARAM_PRINT("\n", 0 + param_type(param)); + PX4_INFO_RAW("\n", 0 + param_type(param)); } return 0; @@ -637,7 +630,7 @@ do_show_print(void *arg, param_t param) } } - PARAM_PRINT("%c %c %s [%d,%d] : ", (param_used(param) ? 'x' : ' '), + PX4_INFO_RAW("%c %c %s [%d,%d] : ", (param_used(param) ? 'x' : ' '), param_value_unsaved(param) ? '*' : (param_value_is_default(param) ? ' ' : '+'), param_name(param), param_get_used_index(param), param_get_index(param)); @@ -648,7 +641,7 @@ do_show_print(void *arg, param_t param) switch (param_type(param)) { case PARAM_TYPE_INT32: if (!param_get(param, &i)) { - PARAM_PRINT("%ld\n", (long)i); + PX4_INFO_RAW("%ld\n", (long)i); return; } @@ -656,18 +649,18 @@ do_show_print(void *arg, param_t param) case PARAM_TYPE_FLOAT: if (!param_get(param, &f)) { - PARAM_PRINT("%4.4f\n", (double)f); + PX4_INFO_RAW("%4.4f\n", (double)f); return; } break; default: - PARAM_PRINT("\n", 0 + param_type(param)); + PX4_INFO_RAW("\n", 0 + param_type(param)); return; } - PARAM_PRINT("\n", (unsigned long)param); + PX4_INFO_RAW("\n", (unsigned long)param); } static void @@ -689,19 +682,19 @@ do_show_print_for_airframe(void *arg, param_t param) int32_t i; float f; - PARAM_PRINT("\tparam set %s ", p_name); + PX4_INFO_RAW("\tparam set %s ", p_name); switch (param_type(param)) { case PARAM_TYPE_INT32: if (!param_get(param, &i)) { - PARAM_PRINT("%ld\n", (long)i); + PX4_INFO_RAW("%ld\n", (long)i); return; } break; case PARAM_TYPE_FLOAT: if (!param_get(param, &f)) { - PARAM_PRINT("%4.4f\n", (double)f); + PX4_INFO_RAW("%4.4f\n", (double)f); return; } break; @@ -710,7 +703,7 @@ do_show_print_for_airframe(void *arg, param_t param) return; } - PARAM_PRINT("\n", (unsigned long)param); + PX4_INFO_RAW("\n", (unsigned long)param); } static int @@ -740,12 +733,11 @@ do_set(const char *name, const char *val, bool fail_on_not_found) int32_t newval = strtol(val, &end, 10); if (i != newval) { - PARAM_PRINT("%c %s: ", + PX4_INFO_RAW("%c %s: curr: %ld -> new: %ld\n", param_value_unsaved(param) ? '*' : (param_value_is_default(param) ? ' ' : '+'), - param_name(param)); - PARAM_PRINT("curr: %ld", (long)i); + param_name(param), + (long)i, (long)newval); param_set(param, &newval); - PARAM_PRINT(" -> new: %ld\n", (long)newval); } } @@ -762,12 +754,11 @@ do_set(const char *name, const char *val, bool fail_on_not_found) if (f != newval) { #pragma GCC diagnostic pop - PARAM_PRINT("%c %s: ", + PX4_INFO_RAW("%c %s: curr: %4.4f -> new: %4.4f\n", param_value_unsaved(param) ? '*' : (param_value_is_default(param) ? ' ' : '+'), - param_name(param)); - PARAM_PRINT("curr: %4.4f", (double)f); + param_name(param), + (double)f, (double)newval); param_set(param, &newval); - PARAM_PRINT(" -> new: %4.4f\n", (double)newval); } }