Procházet zdrojové kódy

Do not touch READOUT flag as requested by Michele. Now we can get data from DMA when camera is not grabbing

Suren A. Chilingaryan před 9 roky
rodič
revize
a1d746f850
3 změnil soubory, kde provedl 3 přidání a 7 odebrání
  1. 0 2
      ipecamera/ipecamera.c
  2. 1 3
      ipecamera/private.h
  3. 2 2
      tests/ipecamera/autotrigger.sh

+ 0 - 2
ipecamera/ipecamera.c

@@ -299,8 +299,6 @@ int ipecamera_start(pcilib_context_t *vctx, pcilib_event_t event_mask, pcilib_ev
     }
 
 	// Allow readout and clean the FRAME_REQUEST mode if set for some reason
-    GET_REG(control_reg, value);
-    SET_REG(control_reg, value|IPECAMERA_READOUT_FLAG);
     usleep(IPECAMERA_SLEEP_TIME);
     if (value&0x1000) ctx->fr_mode = 1;
     else {

+ 1 - 3
ipecamera/private.h

@@ -35,9 +35,7 @@
 #define IPECAMERA_WIDTH (IPECAMERA_MAX_CHANNELS * IPECAMERA_PIXELS_PER_CHANNEL)
 
 #define IPECAMERA_FRAME_REQUEST 		0x80000209 // 0x1E9
-#define IPECAMERA_READOUT_FLAG			0x200
-#define IPECAMERA_READOUT			0x80000201 // 0x3E1
-#define IPECAMERA_IDLE 				0x80000001 // 0x1E1
+#define IPECAMERA_IDLE 				0x80000201 // 0x1E1
 #define IPECAMERA_START_INTERNAL_STIMULI 	0x1F1
 
 #define IPECAMERA_MODE_16_CHAN_IO		0

+ 2 - 2
tests/ipecamera/autotrigger.sh

@@ -10,9 +10,9 @@ pci -g -o /dev/null --run-time 12000000 --verbose 10 &
 pid=$!
 
 usleep 100000
-pci -w 9040 80000a01
+pci -w 9040 80004a01
 usleep 10000000
-pci -w 9040 80000001
+pci -w 9040 80000201
 
 echo "Waiting grabber to finish"
 wait $pid