Commit 9b882415 authored by Andrey Filippov's avatar Andrey Filippov

merged with framepars

parents 1275e922 ad3a93f0
...@@ -23,3 +23,5 @@ excluding.lst ...@@ -23,3 +23,5 @@ excluding.lst
attic attic
board_elphel393 board_elphel393
scp scp
bitbake-logs
device-tree-logs
This diff is collapsed.
...@@ -453,8 +453,8 @@ static int fpga_jtag_release(struct inode *inode, struct file *filp) { ...@@ -453,8 +453,8 @@ static int fpga_jtag_release(struct inode *inode, struct file *filp) {
minors[p]=0; minors[p]=0;
JTAG_channels[chn].mode=JTAG_MODE_CLOSED; JTAG_channels[chn].mode=JTAG_MODE_CLOSED;
//D(printk("fpga_jtag_release: done\r\n")); //D(printk("fpga_jtag_release: done\r\n"));
dev_dbg(NULL, "fpga_jtag_release: done\r\n"); dev_dbg(NULL, "fpga_jtag_release: done, res= %d\n",res);
dev_info(NULL, "fpga_jtag_release: done, res= %d\n",res); // dev_info(NULL, "fpga_jtag_release: done, res= %d\n",res);
return (res<0)?res:0; return (res<0)?res:0;
} }
......
...@@ -1432,6 +1432,10 @@ int pgm_triggermode(int sensor_port, ///< sensor port number (0..3 ...@@ -1432,6 +1432,10 @@ int pgm_triggermode(int sensor_port, ///< sensor port number (0..3
if (camsync_mode.trig) { // if trigger mode, enable camsync module, if off - do nothing if (camsync_mode.trig) { // if trigger mode, enable camsync module, if off - do nothing
camsync_mode.en = 1; camsync_mode.en = 1;
camsync_mode.en_set = 1; camsync_mode.en_set = 1;
//When does it need to be disabled?
// camsync_mode.ts_chns = (thispars->pars[P_EXTERN_TIMESTAMP]?1:0) << sensor_port;
camsync_mode.ts_chns = 1 << sensor_port;
camsync_mode.ts_chns_set = 1 << sensor_port;
} }
camsync_mode.trig_set = 1; camsync_mode.trig_set = 1;
// set directly, bypassing sequencer as it may fail with wrong trigger // set directly, bypassing sequencer as it may fail with wrong trigger
...@@ -2626,8 +2630,11 @@ int pgm_trigseq (int sensor_port, ///< sensor port number (0..3 ...@@ -2626,8 +2630,11 @@ int pgm_trigseq (int sensor_port, ///< sensor port number (0..3
} }
// P_XMIT_TIMESTAMP changed? (0 - internal sequencer) // P_XMIT_TIMESTAMP changed? (0 - internal sequencer)
if (FRAMEPAR_MODIFIED(P_XMIT_TIMESTAMP)) { if (FRAMEPAR_MODIFIED(P_XMIT_TIMESTAMP)) {
camsync_mode.ts_chns = (thispars->pars[P_EXTERN_TIMESTAMP]?1:0) << sensor_port; camsync_mode.en_snd = (thispars->pars[P_XMIT_TIMESTAMP]?1:0);
camsync_mode.ts_chns_set = 1 << sensor_port; camsync_mode.en_snd_set = 1;
// camsync_mode.ts_chns = (thispars->pars[P_EXTERN_TIMESTAMP]?1:0) << sensor_port;
// camsync_mode.ts_chns_set = 1 << sensor_port;
} }
if (update_master_channel){ if (update_master_channel){
camsync_mode.master_chn = sensor_port; camsync_mode.master_chn = sensor_port;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment