Merge branch 'master' of gitlab:wintermute/hackover2013-badge-firmware

[hackover2013-badge-firmware.git] / project / cmd_tbl.h

diff --git a/project/cmd_tbl.h b/project/cmd_tbl.h
index c305d07..83d3880 100644 (file)
--- a/project/cmd_tbl.h
+++ b/project/cmd_tbl.h
@@ -93,6 +93,10 @@ void cmd_lm75b_gettemp(uint8_t argc, char **argv);
 void cmd_sd_dir(uint8_t argc, char **argv);
 #endif
 
+#ifdef CFG_PWM
+void cmd_pwm(uint8_t argc, char **argv);
+#endif
+
 #define CMD_NOPARAMS "This command has no parameters"
 
 /**************************************************************************/
@@ -133,7 +137,7 @@ cmd_t cmd_tbl[] =
   { "p",    3,  3,  0, cmd_pixel             , "Draw Pixel"                     , "'p <x> <y> <color>'" },
   { "P",    6,  6,  0, cmd_progress          , "Progress Bar"                   , "'P <x> <y> <w> <h> <%> <barclr>'" },
   { "r",    5,  7,  0, cmd_rectangle         , "Rectangle"                      , "'r <x1> <y1> <x2> <y2> <color> [<filled[0|1]> <bcolor>]'" },
-  { "R",    7,  7,  0, cmd_rectangleround    , "Rounded Rectangle"              , "'R <x1> <y1> <x2> <y2> <color> <radius> <corners>'" },
+  { "R",    7,  9,  0, cmd_rectangleround    , "Rounded Rectangle"              , "'R <x1> <y1> <x2> <y2> <color> <radius> <corners> [<filled[0|1]> <bcolor>]'" },
   { "s",    2, 99,  0, cmd_textw             , "Text Width"                     , "'s <font#> <msg>'" },
   { "t",    6, 99,  0, cmd_text              , "Text"                           , "'t <x> <y> <bgcolor> <fontcolor> <font#> <msg>'" },
   { "v",    7,  8,  0, cmd_triangle          , "Triangle"                       , "'v <x1> <y1> <x2> <y2> <x3> <y3> <color> [<filled[0|1]>]'" },
@@ -153,6 +157,10 @@ cmd_t cmd_tbl[] =
   #ifdef CFG_SDCARD
   { "d",    0,  1,  0,  cmd_sd_dir           , "Dir (SD Card)"                  , "'d [<path>]'" },
   #endif
+
+  #ifdef CFG_PWM
+  { "M",    2,  2,  0,  cmd_pwm              , "PWM Control"                    , "'M [<dutycycle(%)>] [<frequency(ticks)>]'" },
+  #endif
 };
 
 #endif
\ No newline at end of file