diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2015-04-01 21:26:47 +0200 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2015-04-01 21:26:47 +0200 |
| commit | a1d746f850c487c065e518052f5205812a1f4adf (patch) | |
| tree | 9653755aa923167f93dc67b4dd784bca6a4567e3 | |
| parent | 4e99cc60d3af0a1a8e195f6dd2f107f3769118e0 (diff) | |
| download | ipecamera-a1d746f850c487c065e518052f5205812a1f4adf.tar.gz ipecamera-a1d746f850c487c065e518052f5205812a1f4adf.tar.bz2 ipecamera-a1d746f850c487c065e518052f5205812a1f4adf.tar.xz ipecamera-a1d746f850c487c065e518052f5205812a1f4adf.zip | |
Do not touch READOUT flag as requested by Michele. Now we can get data from DMA when camera is not grabbing
| -rw-r--r-- | ipecamera/ipecamera.c | 2 | ||||
| -rw-r--r-- | ipecamera/private.h | 4 | ||||
| -rwxr-xr-x | tests/ipecamera/autotrigger.sh | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/ipecamera/ipecamera.c b/ipecamera/ipecamera.c index f54c29d..892c59e 100644 --- a/ipecamera/ipecamera.c +++ b/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 { diff --git a/ipecamera/private.h b/ipecamera/private.h index db5298e..cf2d689 100644 --- a/ipecamera/private.h +++ b/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 diff --git a/tests/ipecamera/autotrigger.sh b/tests/ipecamera/autotrigger.sh index 1c8f353..5f8b4db 100755 --- a/tests/ipecamera/autotrigger.sh +++ b/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 |