Diff: main.cpp

Revision:

4:8a4a3fc59e57

Parent:

3:23cce037011f

Child:

5:9fd02d06973b

--- a/main.cpp	Thu Aug 15 23:26:19 2013 +0000
+++ b/main.cpp	Wed Sep 04 02:48:20 2013 +0000
@@ -127,10 +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
                 
-                //note that there are some issues 
+                
                 if(TFC_Ticker[0]>1000 && TFC_LineScanImageReady>0)
                     {
                      TFC_Ticker[0] = 0;
@@ -145,30 +147,42 @@
                         
                          TFC_SetBatteryLED_Level(t);
                         
+                         // camera 1
                          for(i=0;i<8;i++)
                          {
                             for(j=0;j<16;j++)
                             {
-                                 TERMINAL_PRINTF("%X,",TFC_LineScanImage0[(i*8)+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);
                          }
-                        
-                         for(i=0;i<8;i++)
-                         {
-                              for(j=0;j<16;j++)
+                         
+                         // camera 2
+                         if (NumCameras == 2)
+                         {                        
+                            for(i=0;i<8;i++)
+                            {
+                               for(j=0;j<16;j++)
                                {
-                                 TERMINAL_PRINTF("%X",TFC_LineScanImage1[(i*8)+j]);
+                                  TERMINAL_PRINTF("%X",TFC_LineScanImage1[(i*16)+j]);
                                 
-                                 if((i*8)+j==127)
-                                     TERMINAL_PRINTF("\r\n",TFC_LineScanImage1[(i*8)+j]);
-                                 else
-                                     TERMINAL_PRINTF(",",TFC_LineScanImage1[(i*8)+j]);
-                                }   
-                                
-                                wait_ms(10);  
-                        }                                       
+                                  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);  
+                            }
+                         }                                     
                             
                     }