From 53bf23d9bbb314aedb6869dbc5d1bf15d47bef01 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Wed, 20 Jun 2012 15:32:13 +0200 Subject: [PATCH] picoproj: make the help about power mode more consistent Use the same terminology used in the Doxygen documentation, "power mode" instead of "power level". Print values using "%d" instead of "%x". --- doc/man/picoproj.1.txt | 4 ++-- examples/picoproj.c | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/doc/man/picoproj.1.txt b/doc/man/picoproj.1.txt index 309402c..263b0df 100644 --- a/doc/man/picoproj.1.txt +++ b/doc/man/picoproj.1.txt @@ -37,8 +37,8 @@ OPTIONS *-l* '':: the verbosity level of libam7xxx output (0-5) -*-p* '':: - power level of device, between 0 (off) and 4 (maximum) + +*-p* '':: + the power mode of device, between 0 (off) and 4 (turbo) + WARNING: Level 2 and greater require the master AND the slave connector to be plugged in. diff --git a/examples/picoproj.c b/examples/picoproj.c index b643918..54cbedf 100644 --- a/examples/picoproj.c +++ b/examples/picoproj.c @@ -41,8 +41,10 @@ static void usage(char *name) printf("\t\t\t\t\t1 - JPEG\n"); printf("\t\t\t\t\t2 - NV12\n"); printf("\t-l \t\tthe verbosity level of libam7xxx output (0-5)\n"); - printf("\t-p \tpower level of device, between %x (off) and %x (maximum)\n", AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO); - printf("\t\t\t\tWARNING: Level 2 and greater require the master AND\n\t\t\t\t\t the slave connector to be plugged in.\n"); + printf("\t-p \t\tthe power mode of device, between %d (off) and %d (turbo)\n", + AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO); + printf("\t\t\t\tWARNING: Level 2 and greater require the master AND\n"); + printf("\t\t\t\t the slave connector to be plugged in.\n"); printf("\t-z \t\tthe display zoom mode, between %d (original) and %d (test)\n", AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TEST); printf("\t-W \tthe width of the image to upload\n"); @@ -109,10 +111,11 @@ int main(int argc, char *argv[]) case AM7XXX_POWER_MIDDLE: case AM7XXX_POWER_HIGH: case AM7XXX_POWER_TURBO: - fprintf(stdout, "Power mode: %x\n", power_mode); + fprintf(stdout, "Power mode: %d\n", power_mode); break; default: - fprintf(stderr, "Invalid power mode value, must be between %x and %x\n", AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO); + fprintf(stderr, "Invalid power mode value, must be between %d and %d\n", + AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO); exit(EXIT_FAILURE); } break; -- 2.1.4