Diff: main.cpp

Revision:

5:9fd02d06973b

Parent:

4:8a4a3fc59e57

diff -r 8a4a3fc59e57 -r 9fd02d06973b main.cpp
--- a/main.cpp	Wed Sep 04 02:48:20 2013 +0000
+++ b/main.cpp	Mon Mar 17 14:10:28 2014 +0000
@@ -34,7 +34,7 @@
  
 int main()
 {
-    uint32_t i,j,t = 0;
+    uint32_t i,t = 0;
   
     PC.baud(115200);
     TFC_TickerObj.attach_us(&TFC_TickerUpdate,2000);
@@ -127,13 +127,12 @@
             
             case 3 :
             
-                uint32_t NumCameras = 1;     // Enter here how many line scan cameras hooked up
          
                 //Demo Mode 3 will be in Freescale Garage Mode.  It will beam data from the Camera to the 
                 //Labview Application
                 
                 
-                if(TFC_Ticker[0]>1000 && TFC_LineScanImageReady>0)
+                if(TFC_Ticker[0]>50 && TFC_LineScanImageReady>0)
                     {
                      TFC_Ticker[0] = 0;
                      TFC_LineScanImageReady=0;
@@ -148,46 +147,22 @@
                          TFC_SetBatteryLED_Level(t);
                         
                          // camera 1
-                         for(i=0;i<8;i++)
+                         for(i=0;i<128;i++)
                          {
-                            for(j=0;j<16;j++)
-                            {
-                               TERMINAL_PRINTF("%X",TFC_LineScanImage0[(i*16)+j]);
-
-                               if (NumCameras == 1)
-                               {
-                                 if((i==7)&&(j==15))
-                                     TERMINAL_PRINTF("\r\n",TFC_LineScanImage0[(i*16)+j]);
-                                 else
-                                     TERMINAL_PRINTF(",",TFC_LineScanImage0[(i*16)+j]);
-                               }                  
-
-                            }
-                            wait_ms(10);
+                               TERMINAL_PRINTF("%X,",TFC_LineScanImage0[i]);
                          }
-                         
-                         // camera 2
-                         if (NumCameras == 2)
-                         {                        
-                            for(i=0;i<8;i++)
-                            {
-                               for(j=0;j<16;j++)
-                               {
-                                  TERMINAL_PRINTF("%X",TFC_LineScanImage1[(i*16)+j]);
-                                
-                                  if((i==7)&&(j==15))
-                                     TERMINAL_PRINTF("\r\n",TFC_LineScanImage1[(i*16)+j]);
-                                  else
-                                     TERMINAL_PRINTF(",",TFC_LineScanImage1[(i*16)+j]);
-                               }        
-                               wait_ms(10);  
-                            }
-                         }                                     
-                            
+                        
+                        // camera 2
+                         for(i=0;i<128;i++)
+                         {
+                                 if(i==127)
+                                     TERMINAL_PRINTF("%X\r\n",TFC_LineScanImage1[i]);
+                                 else
+                                     TERMINAL_PRINTF("%X,",TFC_LineScanImage1[i]);
+                           
+                         }
                     }
-                    
-
-
+                 
                 break;
             }
     }