Diff: src/command.cpp

Revision:

30:d8721a46ee03

Parent:

25:8bcc8bea0e31

Child:

31:be17caf56d22

--- a/src/command.cpp	Tue Mar 05 19:21:32 2019 +0000
+++ b/src/command.cpp	Wed Mar 06 22:32:31 2019 +0000
@@ -34,7 +34,6 @@
 #include "math.h"
 #include "parameters.h"
 #include "all_io.h"
-//#include "calibrate.h"
 #include "boards.h"
 #include "menu.h"
 #include "command.h"
@@ -483,10 +482,6 @@
        strcpy(commandString, tok);
        tok = strtok(NULL, "=");
        commandData = atoi(tok);
-       //if(DEBUG){
-       //  sprintf(strbuf, "commandStringBuf= %s, commandData= %d", commandStringBuf, commandData);
-       //  sendSerial(strbuf);
-       //}
     }
     else{
         strcpy(commandString, commandStringBuf);
@@ -599,14 +594,6 @@
          boardMults = commandData;
          if(checkRange(boardMults, 0, 63) == 1){
             en_out_code = setBoardWeights(boardMults);
-            /*unsigned int bmult=boardMults;
-            for(int count=0;count<33;count++){
-            en_out_code = setBoardWeights(bmult++);
-            wait(0.25);
-            }
-            en_out_code = setBoardWeights(boardMults);
-            sprintf(strbuf, " en_out_code=%d\r\n", en_out_code);
-            sendSerial(strbuf);*/
             testing = TRUE;
          }else{
             showRangeError(1, boardMults, 0.0);
@@ -618,11 +605,6 @@
    // The integer value of boardMults is used to change en_out via setBoardWeights(boardMults).
    // en_out are binary weighted signals that activate groups of DC-DC converters on the slot cards.
    // en_out[6] = {en32, en16, en8, en4, en2, en1}
-   {
-      //if(DEBUG){
-      //  sprintf(strbuf, "my12=%d commandData=%d\r\n", my12, commandData);
-      //  sendSerial(strbuf);
-      //}
       
       if (readback)
       {
@@ -659,10 +641,8 @@
          testing = FALSE;
       }
       else if (rxbuf[bufloc] == '0')
-      //if (rxbuf[bufloc] == '0')
       {
          stopConverter();
-         //setDacsToZeroVolts();
          testing = FALSE;
       }
       else if ((rxbuf[bufloc] > '0') && (rxbuf[bufloc] < '0' + max_boards))
@@ -705,7 +685,6 @@
       stopConverter();
       testing = FALSE;
       my12 = 0;
-      //hv_en = OFF;
    }
    else if(!strcmp(commandString, "CAL"))
    {
@@ -748,7 +727,6 @@
       sendSerial(" !");
    }
 
-   //sendCRLF();
    menuPrompt(MENU_DCM1);
 }
 
@@ -774,8 +752,6 @@
    
    serialStatus.computer = FALSE;
    serialStatus.command  = FALSE;
-   
-   //sendSerial("didCommand\r\n");
 }
 
 /************************************************************