DAC commands syntax changed to avoid characters ?, :, ( and )

diff --git a/commands/cmd_dac.c b/commands/cmd_dac.c
index 7fc63eaed2b693fc39672f910e94937a10923329..2d6eba543f0cc3107d5d11082fb3ba93f93e3771 100644 (file)
--- a/commands/cmd_dac.c
+++ b/commands/cmd_dac.c
@@ -27,6 +27,7 @@
  */
 
 #include "cmd_dac.h"
+#include "stdio.h"
 
 #ifndef DOCGEN
 
@@ -43,20 +44,15 @@
  * @return     0 when OK or error code
  */
 int cmd_do_dac_pin_setup(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[]) {
-       int opchar;
        int pin;
-       int ret;
+       char *p=param[1];
+       char spareParams;
        int enabled;
-       char *p;
+       int ret;
 
-       if((opchar=cmd_opchar_check(cmd_io,des,param))<0)
-               return opchar;
-       p=param[1];
-       if(si_long(&p,(long*)&pin, 0) < 0)
-               return -CMDERR_BADPAR;
-       p=param[3];
-       if(si_long(&p,(long*)&enabled, 0) < 0)
+       if (sscanf(p, "%d %d %1s", &pin, &enabled, &spareParams) != 2) {
                return -CMDERR_BADPAR;
+       }
        ret = rpp_dac_setup(pin, enabled);
        if (ret == -1) {
                rpp_sci_printf("Pin out of range.");
@@ -80,20 +76,15 @@ int cmd_do_dac_pin_setup(cmd_io_t *cmd_io, const struct cmd_des *des, char *para
  * @return     0 when OK or error code
  */
 int cmd_do_dac_pin_set_val(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[]) {
-       int opchar;
        int pin;
-       int ret;
+       char *p=param[1];
+       char spareParams;
        int val;
-       char *p;
+       int ret;
 
-       if((opchar=cmd_opchar_check(cmd_io,des,param))<0)
-               return opchar;
-       p=param[1];
-       if(si_long(&p,(long*)&pin, 0) < 0)
-               return -CMDERR_BADPAR;
-       p=param[3];
-       if(si_long(&p,(long*)&val, 0) < 0)
+       if (sscanf(p, "%d %d %1s", &pin, &val, &spareParams) != 2) {
                return -CMDERR_BADPAR;
+       }
        ret = rpp_dac_set(pin, val);
        if (ret == -1) {
                rpp_sci_printf("Pin out of range.");
@@ -120,20 +111,15 @@ int cmd_do_dac_pin_set_val(cmd_io_t *cmd_io, const struct cmd_des *des, char *pa
  * @return     0 when OK or error code
  */
 int cmd_do_dac_pin_set_voltage(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[]) {
-       int opchar;
        int pin;
-       int ret;
+       char *p=param[1];
+       char spareParams;
        int mV;
-       char *p;
+       int ret;
 
-       if((opchar=cmd_opchar_check(cmd_io,des,param))<0)
-               return opchar;
-       p=param[1];
-       if(si_long(&p,(long*)&pin, 0) < 0)
-               return -CMDERR_BADPAR;
-       p=param[3];
-       if(si_long(&p,(long*)&mV, 0) < 0)
+       if (sscanf(p, "%d %d %1s", &pin, &mV, &spareParams) != 2) {
                return -CMDERR_BADPAR;
+       }
        ret = rpp_dac_set_voltage(pin, mV);
        if (ret == -1) {
                rpp_sci_printf("Pin out of range.");
@@ -155,11 +141,11 @@ int cmd_do_dac_pin_set_voltage(cmd_io_t *cmd_io, const struct cmd_des *des, char
 
 /** Descriptor of command for dac pin setup */
 cmd_des_t const cmd_des_dac_pin_setup = {
-       0, CDESM_OPCHR|CDESM_WR,
-       "dacpinenable#","Enable or disable a DAC pin",
+       0, 0,
+       "dacpinenable*","Enable or disable a DAC pin",
        "=== Command syntax ===\n"
        "\n"
-       "   dacpinenable<PIN>:<VALUE>\n"
+       "   dacpinenable<PIN> <VALUE>\n"
        "where\n"
        "* <PIN> is a number in range 1-4\n"
        "* <VALUE> is a number 0 (disable) or 1 (enable)\n"
@@ -172,7 +158,7 @@ cmd_des_t const cmd_des_dac_pin_setup = {
        "\n"
        "=== Example ===\n"
        "\n"
-       "   --> dacpinenable1:1\n"
+       "   --> dacpinenable1 1\n"
        "   dacpinenable1=1\n"
        "\n"
        "Enables pin DAC1 and prints its actual state (which will be 1)\n",
@@ -181,11 +167,11 @@ cmd_des_t const cmd_des_dac_pin_setup = {
 
 /** Descriptor of command for dac pin value set */
 cmd_des_t const cmd_des_dac_pin_set_val = {
-       0, CDESM_OPCHR|CDESM_WR,
-       "dacpinval#","Set raw value of a DAC register",
+       0, 0,
+       "dacpinval*","Set raw value of a DAC register",
        "=== Command syntax ===\n"
        "\n"
-       "   dacpinval<PIN>:<VALUE>\n"
+       "   dacpinval<PIN> <VALUE>\n"
        "where\n"
        "* <PIN> is a number in range 1-4\n"
        "* <VALUE> is a number in range 0-4095\n"
@@ -201,7 +187,7 @@ cmd_des_t const cmd_des_dac_pin_set_val = {
        "\n"
        "=== Example ===\n"
        "\n"
-       "   --> dacpinval1:4095\n"
+       "   --> dacpinval1 4095\n"
        "   dacpinval1=4095\n"
        "\n"
        "Set pin DAC1 voltage to 12V, and prints the value (4095).\n",
@@ -210,11 +196,11 @@ cmd_des_t const cmd_des_dac_pin_set_val = {
 
 /** Descriptor of command for dac pin voltage set */
 cmd_des_t const cmd_des_dac_pin_set_voltage = {
-       0, CDESM_OPCHR|CDESM_WR,
-       "dacpinvoltage#","Set voltage in mV of a DAC pin",
+       0, 0,
+       "dacpinvoltage*","Set voltage in mV of a DAC pin",
        "=== Command syntax ===\n"
        "\n"
-       "   dacpinvoltage<PIN>:<VALUE>\n"
+       "   dacpinvoltage<PIN> <VALUE>\n"
        "where\n"
        "* <PIN> is a number in range 1-4\n"
        "* <VALUE> is a number in range 0-12000\n"
@@ -228,12 +214,12 @@ cmd_des_t const cmd_des_dac_pin_set_voltage = {
        "\n"
        "=== Example ===\n"
        "\n"
-       "   --> dacpinvoltage1:8000\n"
+       "   --> dacpinvoltage1 8000\n"
        "dacpinvoltage1=8000\n"
        "\n"
        "Sets pin DAC1 to 8V, prints the actual voltage (8000)\n"
        "\n"
-       "   --> dacpinvoltage2:500\n"
+       "   --> dacpinvoltage2 500\n"
        "dacpinvoltage2=500\n"
        "\n"
        "Sets pin DAC2 to 500mV, prints actual voltage (500)\n",