Added PWM cmd (thanks Miceuz)

diff --git a/project/cmd_tbl.h b/project/cmd_tbl.h
index 0bc977d..022f1ac 100644 (file)
--- a/project/cmd_tbl.h
+++ b/project/cmd_tbl.h
@@ -93,7 +93,9 @@ 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"
 
@@ -155,7 +157,10 @@ cmd_t cmd_tbl[] =
   #ifdef CFG_SDCARD
   { "d",    0,  1,  0,  cmd_sd_dir           , "Dir (SD Card)"                  , "'d [<path>]'" },
   #endif
-  { "pwm", 0, 2, 0, cmd_pwm, "PWM Control", "'pwm [<duty_cycle>] [<frequency>]'" },
+
+  #ifdef CFG_PWM
+  { "M",    0,  2,  0,  cmd_pwm              , "PWM Control"                    , "'M [<dutycycle(%)>] [<dutycycle(ticks)>]'" },
+  #endif
 };
 
 #endif
\ No newline at end of file

diff --git a/project/commands/cmd_pwm.c b/project/commands/cmd_pwm.c
index 00e7de4..c327a0a 100644 (file)
--- a/project/commands/cmd_pwm.c
+++ b/project/commands/cmd_pwm.c
@@ -1,7 +1,7 @@
 /**************************************************************************/\r
 /*! \r
     @file     cmd_sysinfo.c\r
-    @author   K. Townsend (microBuilder.eu)\r
+    @author   Miceuz\r
 \r
     @brief    Code to execute for cmd_sysinfo in the 'core/cmd'\r
               command-line interpretter.\r
@@ -10,7 +10,7 @@
 \r
     Software License Agreement (BSD License)\r
 \r
-    Copyright (c) 2010, microBuilder SARL\r
+    Copyright (c) 2012, microBuilder SARL\r
     All rights reserved.\r
 \r
     Redistribution and use in source and binary forms, with or without\r
@@ -40,14 +40,10 @@
 \r
 #include "projectconfig.h"\r
 #include "core/cmd/cmd.h"\r
-#include "core/systick/systick.h"\r
-#include "core/iap/iap.h"\r
 #include "project/commands.h"       // Generic helper functions\r
-#include "core/pwm/pwm.h"\r
 \r
-#ifdef CFG_PRINTF_UART\r
-  #include "core/uart/uart.h"\r
-#endif\r
+#ifdef CFG_PWM\r
+  #include "core/pwm/pwm.h"\r
 \r
 /**************************************************************************/\r
 /*! \r
@@ -58,27 +54,26 @@ uint8_t pwmStarted = 0;
 \r
 void cmd_pwm(uint8_t argc, char **argv) {\r
     int32_t frequencyTicks = 65535;\r
-    int32_t dutyCycle = 25;\r
+    int32_t dutyCycle = CFG_PWM_DEFAULT_DUTYCYCLE;\r
     \r
     if(argc > 0) {\r
         getNumber (argv[0], &dutyCycle);\r
         if(dutyCycle < 1 || dutyCycle > 100) {\r
-            printf("Invalid duty cycle. Duty cycle must be [1 .. 65535]%s", CFG_PRINTF_NEWLINE);\r
+            printf("Invalid duty cycle [1..65535]%s", CFG_PRINTF_NEWLINE);\r
             return;\r
         }\r
 \r
         if(argc > 1) {\r
             getNumber (argv[1], &frequencyTicks);\r
             if(frequencyTicks < 0 || frequencyTicks > 0xffff) {\r
-                printf("Invalid frequency. Frequency must be [1 .. 65535]%s", CFG_PRINTF_NEWLINE);\r
+                printf("Invalid frequency [1..65535]%s", CFG_PRINTF_NEWLINE);\r
                 return;\r
             }\r
         } else {\r
             frequencyTicks = 65535;\r
         }\r
     } else {\r
-        dutyCycle = 25;\r
-\r
+        dutyCycle = CFG_PWM_DEFAULT_DUTYCYCLE;\r
     }\r
 \r
     if(! pwmStarted) {\r
@@ -94,4 +89,5 @@ void cmd_pwm(uint8_t argc, char **argv) {
         pwmStart();\r
         pwmStarted = 1;\r
     }\r
-}
\ No newline at end of file
+}\r
+#endif\r