enforce askdemod argument 0 or 1

diff --git a/winsrc/command.cpp b/winsrc/command.cpp
index c1b3e372d4b09a456fa2b290559b182704ebb11e..f03bada4c00d7a57cd3716729f6215a9e68a1542 100644 (file)
--- a/winsrc/command.cpp
+++ b/winsrc/command.cpp
@@ -2272,9 +2272,11 @@ static void Cmdaskdemod(char *str) {
        int c, high = 0, low = 0;\r
 \r
        // TODO: complain if we do not give 2 arguments here !\r
        int c, high = 0, low = 0;\r
 \r
        // TODO: complain if we do not give 2 arguments here !\r

+       // (AL - this doesn't make sense! we're only using one argument!!!)\r

        sscanf(str, "%i", &c);\r
 \r
        /* Detect high and lows and clock */\r
        sscanf(str, "%i", &c);\r
 \r
        /* Detect high and lows and clock */\r

+       // (AL - clock???)\r

        for (i = 0; i < GraphTraceLen; i++)\r
        {\r
                if (GraphBuffer[i] > high)\r
        for (i = 0; i < GraphTraceLen; i++)\r
        {\r
                if (GraphBuffer[i] > high)\r


@@ -2282,6 +2284,10 @@ static void Cmdaskdemod(char *str) {
                else if (GraphBuffer[i] < low)\r
                        low = GraphBuffer[i];\r
        }\r
                else if (GraphBuffer[i] < low)\r
                        low = GraphBuffer[i];\r
        }\r

+       if(c != 0 && c != 1) {\r
+               PrintToScrollback("Invalid argument: %s",str);\r
+               return;\r
+               }\r

 \r
        if (GraphBuffer[0] > 0) {\r
                GraphBuffer[0] = 1-c;\r
 \r
        if (GraphBuffer[0] > 0) {\r
                GraphBuffer[0] = 1-c;\r


@@ -2829,7 +2835,7 @@ static struct {
        char            *docString;\r
 } CommandTable[] = {\r
        {"amp",                                 CmdAmp,                                         1, "Amplify peaks"},\r
        char            *docString;\r
 } CommandTable[] = {\r
        {"amp",                                 CmdAmp,                                         1, "Amplify peaks"},\r

-       {"askdemod",                    Cmdaskdemod,                            1, "<samples per bit> <0|1> -- Attempt to demodulate simple ASK tags"},\r
+       {"askdemod",                    Cmdaskdemod,                            1, "<0|1> -- Attempt to demodulate simple ASK tags"},\r

        {"autocorr",                    CmdAutoCorr,                            1, "<window length> -- Autocorrelation over window"},\r
        {"bitsamples",          CmdBitsamples,                  0, "Get raw samples as bitstring"},\r
        {"bitstream",                   Cmdbitstream,                           1, "[clock rate] -- Convert waveform into a bitstream"},\r
        {"autocorr",                    CmdAutoCorr,                            1, "<window length> -- Autocorrelation over window"},\r
        {"bitsamples",          CmdBitsamples,                  0, "Get raw samples as bitstring"},\r
        {"bitstream",                   Cmdbitstream,                           1, "[clock rate] -- Convert waveform into a bitstream"},\r