Diff: main.cpp

Revision:

5:1be2795321e2

Parent:

4:4f7a57fac239

--- a/main.cpp	Tue Oct 07 20:37:37 2014 +0000
+++ b/main.cpp	Tue Oct 07 21:31:25 2014 +0000
@@ -69,7 +69,7 @@
     assignports(&hwl);
     setdefault(hwl);
     // reuse getVesion 
-    getVersion gv(VERSION, VERSION, __TIME__, __DATE__ );
+    getVersion gv(VERSION, VERSION, __TIME__, __DATE__);
     getVersion gvc;
     getsscmVersion gvsscm;
     SWSPI spi(hwl.mosi[0], hwl.miso[0], hwl.sclk[0]); // mosi, miso, sclk
@@ -119,62 +119,62 @@
                     pc.printf("check now ranges %d %d  \n\r", cmd.con,
                               cmd.devnr);
                     if (!strcmp(cmd.cmd, "spa1")) {
-                        adc[cmd.con-1][cmd.devnr-1].setPattern1(cmd.datain);
+                        adc[cmd.con - 1][cmd.devnr - 1].setPattern1(cmd.datain);
                         cmd.dataout = cmd.datain;
                         cmd.status = 0;
                     }
                     if (!strcmp(cmd.cmd, "spa2")) {
-                        adc[cmd.con-1][cmd.devnr-1].setPattern2(cmd.datain);
+                        adc[cmd.con - 1][cmd.devnr - 1].setPattern2(cmd.datain);
                         cmd.dataout = cmd.datain;
                         cmd.status = 0;
                     }
                     if (!strcmp(cmd.cmd, "rpa1")) {
-                        adc[cmd.con-1][cmd.devnr-1].readPattern1(do16);
+                        adc[cmd.con - 1][cmd.devnr - 1].readPattern1(do16);
                         cmd.dataout=do16;
                         cmd.status=0;
                     }
                     if (!strcmp(cmd.cmd, "rpa2")) {
-                        adc[cmd.con-1][cmd.devnr-1].readPattern2(do16);
+                        adc[cmd.con - 1][cmd.devnr - 1].readPattern2(do16);
                         cmd.dataout=do16;
                         cmd.status=0;
                     }
                     if (!strcmp(cmd.cmd, "rr08")) {
-                        adc[cmd.con-1][cmd.devnr-1].readReg8(cmd.ch, do8);
+                        adc[cmd.con - 1][cmd.devnr - 1].readReg8(cmd.ch, do8);
                         cmd.dataout = (u16) do8;
-                        cmd.status=0;
+                        cmd.status= 0 ;
                     }
                     if (!strcmp(cmd.cmd, "rr16")) {
-                        adc[cmd.con-1][cmd.devnr-1].readReg16(cmd.ch, do16);
-                        cmd.dataout= (u32) do16;
-                        cmd.status=0;
+                        adc[cmd.con - 1][cmd.devnr - 1].readReg16(cmd.ch, do16);
+                        cmd.dataout = (u32) do16;
+                        cmd.status = 0;
                     }
                     if (!strcmp(cmd.cmd, "sr08")) {
-                        adc[cmd.con-1][cmd.devnr-1].setReg8(cmd.ch, (u8) cmd.datain);
+                        adc[cmd.con - 1][cmd.devnr - 1].setReg8(cmd.ch, (u8) cmd.datain);
                         cmd.dataout = cmd.datain;
                         cmd.status = 0;
                     }
                     if (!strcmp(cmd.cmd, "sr16")) {
-                        adc[cmd.con-1][cmd.devnr-1].setReg16(cmd.ch, (u16) cmd.datain);
+                        adc[cmd.con - 1][cmd.devnr - 1].setReg16(cmd.ch, (u16) cmd.datain);
                         cmd.dataout = cmd.datain;
-                        cmd.status=0;
+                        cmd.status = 0;
                     }
                     if (!strcmp(cmd.cmd, "ghrv")) {
-                        do16 = adc[cmd.con-1][cmd.devnr-1].getHdrVersion();
+                        do16 = adc[cmd.con - 1][cmd.devnr - 1].getHdrVersion();
                         cmd.dataout = do16;
                         cmd.status=0;
                     }
                     if (!strcmp(cmd.cmd, "gscv")) {
-                        do16 = adc[cmd.con-1][cmd.devnr-1].getSrcVersion();
+                        do16 = adc[cmd.con - 1][cmd.devnr - 1].getSrcVersion();
                         cmd.dataout = do16;
-                        cmd.status=0;
+                        cmd.status = 0;
                     }
                     if (!strcmp(cmd.cmd, "ini1")) {
-                        adc[cmd.con-1][cmd.devnr-1].init1();
+                        adc[cmd.con - 1][cmd.devnr - 1].init1();
                         cmd.dataout = cmd.datain;
                         cmd.status = 0;
                     }
                     if (!strcmp(cmd.cmd, "ini2")) {
-                        adc[cmd.con-1][cmd.devnr-1].init2();
+                        adc[cmd.con - 1][cmd.devnr - 1].init2();
                         cmd.dataout = cmd.datain;
                         cmd.status = 0;
                     }
@@ -182,80 +182,80 @@
                 case DAC :
                     cmd.status = 2;
                     if (!strcmp(cmd.cmd, "sdac")) {
-                        dac[cmd.con-1][cmd.devnr-1].set_dac(cmd.ch, cmd.datain);
+                        dac[cmd.con - 1][cmd.devnr - 1].set_dac(cmd.ch, cmd.datain);
                         cmd.dataout = cmd.datain;
                         cmd.status = 0;
                     }
                     if (!strcmp(cmd.cmd, "rdac")) {
-                        do16=dac[cmd.con-1][cmd.devnr-1].get_dac(cmd.ch);
-                        cmd.dataout=do16;
-                        cmd.status=0;
+                        do16=dac[cmd.con - 1][cmd.devnr - 1].get_dac(cmd.ch);
+                        cmd.dataout = do16;
+                        cmd.status = 0;
                     }
                     if (!strcmp(cmd.cmd, "ini1")) {
-                        dac[cmd.con-1][cmd.devnr-1].init1();
+                        dac[cmd.con - 1][cmd.devnr - 1].init1();
                         cmd.dataout = cmd.datain;
                         cmd.status = 0;
                     }
                     if (!strcmp(cmd.cmd, "ini2")) {
-                        dac[cmd.con-1][cmd.devnr-1].init2();
+                        dac[cmd.con - 1][cmd.devnr - 1].init2();
                         cmd.dataout = cmd.datain;
                         cmd.status = 0;
                     }
                     if (!strcmp(cmd.cmd, "srst")) {
-                        dac[cmd.con-1][cmd.devnr-1].soft_rst();
+                        dac[cmd.con - 1][cmd.devnr - 1].soft_rst();
                         cmd.dataout = cmd.datain;
                         cmd.status = 0;
                     }
                     if (!strcmp(cmd.cmd, "ghrv")) {
-                        do16 = dac[cmd.con-1][cmd.devnr-1].getHdrVersion();
+                        do16 = dac[cmd.con - 1][cmd.devnr - 1].getHdrVersion();
                         cmd.dataout = do16;
                         cmd.status = 0;
                     }
                     if (!strcmp(cmd.cmd, "gscv")) {
-                        do16 = dac[cmd.con-1][cmd.devnr-1].getSrcVersion();
+                        do16 = dac[cmd.con - 1][cmd.devnr - 1].getSrcVersion();
                         cmd.dataout = do16;
                         cmd.status = 0;
                     }
                     break; 
                 case TEMP:
-                    cmd.status=2;
+                    cmd.status = 2;
                     if (!strcmp(cmd.cmd, "rtpd")) {
-                        do16 = temp[cmd.con-1][cmd.devnr-1].get_T();
+                        do16 = temp[cmd.con - 1][cmd.devnr - 1].get_T();
                         cmd.dataout = do16;
                         cmd.status = 0;
                     }
                     if (!strcmp(cmd.cmd, "gtid")) {
-                        do8 = temp[cmd.con-1][cmd.devnr-1].getId();
+                        do8 = temp[cmd.con - 1][cmd.devnr - 1].getId();
                         cmd.dataout = do8;
                         cmd.status = 0;
                     }
                     if (!strcmp(cmd.cmd, "rtcr")) {
-                        do16 = temp[cmd.con-1][cmd.devnr-1].get_TcritSP();
+                        do16 = temp[cmd.con - 1][cmd.devnr - 1].get_TcritSP();
                         cmd.dataout = do16;
                         cmd.status = 0;
                     }
                     if (!strcmp(cmd.cmd, "stcr")) {
-                        temp[cmd.con-1][cmd.devnr-1].set_TcritSP(cmd.datain);
+                        temp[cmd.con - 1][cmd.devnr - 1].set_TcritSP(cmd.datain);
                         cmd.dataout = cmd.datain;
                         cmd.status = 0;
                     }
                     if (!strcmp(cmd.cmd, "ghrv")) {
-                        do16 = temp[cmd.con-1][cmd.devnr-1].getHdrVersion();
+                        do16 = temp[cmd.con - 1][cmd.devnr - 1].getHdrVersion();
                         cmd.dataout = do16;
-                        cmd.status=0;
+                        cmd.status = 0;
                     }
-                    if (!strcmp( cmd.cmd, "gscv")) {
-                        do16 = temp[cmd.con-1][cmd.devnr-1].getSrcVersion();
+                    if (!strcmp(cmd.cmd, "gscv")) {
+                        do16 = temp[cmd.con - 1][cmd.devnr - 1].getSrcVersion();
                         cmd.dataout = do16;
-                        cmd.status=0;
+                        cmd.status = 0;
                     }
                     if (!strcmp(cmd.cmd, "ini1")) {
-                        temp[cmd.con-1][cmd.devnr-1].init1();
+                        temp[cmd.con - 1][cmd.devnr - 1].init1();
                         cmd.dataout = cmd.datain;
                         cmd.status = 0;
                     }
                     if (!strcmp(cmd.cmd, "ini2")) {
-                        temp[cmd.con-1][cmd.devnr-1].init2();
+                        temp[cmd.con - 1][cmd.devnr - 1].init2();
                         cmd.dataout = cmd.datain;
                         cmd.status = 0;
                     }
@@ -264,12 +264,12 @@
                     cmd.status = 2;
                     if (!strcmp(cmd.cmd, "t_hb")) {
                         heartbeat = !heartbeat;
-                        cmd.status=2;
+                        cmd.status = 2;
                     }
                     if (!strcmp(cmd.cmd, "gmpv")) {
                         do16 = gv.getHdrVersion();
                         cmd.dataout = do16;
-                        cmd.status=0;
+                        cmd.status = 0;
                     }        
                     if (!strcmp(cmd.cmd, "gvhv")) {
                         do16 = gvc.getHdrVersion();
@@ -293,7 +293,7 @@
                     }          
                     break;
              default:
-                cmd.status=1;
+                cmd.status = 1;
              break;
             } // end switch 
             encode_cmd(cmdoutstr, &cmd);