Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-elphel
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
linux-elphel
Commits
fa5d6aea
Commit
fa5d6aea
authored
Nov 23, 2016
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Plain Diff
merged with framepars (trigger-related)
parents
363177f0
74d07703
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
99 additions
and
63 deletions
+99
-63
framepars.c
src/drivers/elphel/framepars.c
+1
-1
multi10359.c
src/drivers/elphel/multi10359.c
+11
-0
param_depend.h
src/drivers/elphel/param_depend.h
+2
-0
pgm_functions.c
src/drivers/elphel/pgm_functions.c
+84
-61
pgm_functions.h
src/drivers/elphel/pgm_functions.h
+1
-1
No files found.
src/drivers/elphel/framepars.c
View file @
fa5d6aea
...
...
@@ -1462,7 +1462,7 @@ void trigSlaveUpdate(int sensor_port) ///< sensor port number (0..3)
while
(
common_pars
->
updated
[
sensor_port
])
{
dev_dbg
(
g_devfp_ptr
,
"port= %d, thisFrameNumber[%d] = %d
\n
"
,
sensor_port
,
sensor_port
,
(
int
)
thisFrameNumber
(
sensor_port
));
common_pars
->
updated
[
sensor_port
]
=
0
;
if
(
pars_to_update
[
nupdate
].
num
!=
P_TRIG_PERIOD
){
//
???
if
(
pars_to_update
[
nupdate
].
num
!=
P_TRIG_PERIOD
){
//
updated any other parameter - treat as period is updated (make sure it will not trigger)
updated_period
=
FRAMEPAIR_FORCE_PROC
;
}
pars_to_update
[
nupdate
].
num
=
P_TRIG_MASTER
;
pars_to_update
[
nupdate
++
].
val
=
common_pars
->
master_chn
;
...
...
src/drivers/elphel/multi10359.c
View file @
fa5d6aea
...
...
@@ -1095,7 +1095,18 @@ int multisensor_pgm_detectsensor (int sensor_port, ///< sensor p
x393_sensio_ctrl
(
sensio_ctl
,
sensor_port
);
camsync_mode
.
trig
=
0
;
camsync_mode
.
trig_set
=
1
;
// Maybe it should be set to triggered mode first
x393_camsync_mode
(
camsync_mode
);
// Trying with the sequencer
// X393_SEQ_SEND1 (sensor_port, frame16, x393_camsync_mode, camsync_mode);
// dev_dbg(g_dev_ptr,"{%d} X3X3_SEQ_SEND1(0x%x, 0x%x, x393_camsync_mode, 0x%x)\n",
// sensor_port, sensor_port, frame16, (int) camsync_mode.d32);
udelay
(
100
);
GLOBALPARS
(
sensor_port
,
G_SENS_AVAIL
)
|=
1
<<
(
GLOBALPARS
(
sensor_port
,
G_SENS_AVAIL
));
// temporary to indicate sensor detection functions that they need to initialize multisensor registers
...
...
src/drivers/elphel/param_depend.h
View file @
fa5d6aea
...
...
@@ -169,6 +169,8 @@ const unsigned long param_depend_tab[]=
P_SENSOR_PHASE
,
ONCHANGE_SENSORPHASE
|
ONCHANGE_EXPOSURE
|
ONCHANGE_LIMITFPS
|
\
ONCHANGE_MEMSENSOR
|
ONCHANGE_MEMCOMPRESSOR
|
ONCHANGE_COMPMODE
|
ONCHANGE_COMPSTOP
|
ONCHANGE_COMPRESTART
,
P_FPGA_XTRA
,
ONCHANGE_LIMITFPS
,
//TODO NC393: Check - maybe no-need to stop/restart the compressor when changing trigger modes?
P_TRIG
,
ONCHANGE_RECALCSEQ
|
ONCHANGE_TRIGGERMODE
|
ONCHANGE_TRIGSEQ
|
ONCHANGE_LIMITFPS
|
/// Next to call with afterinit
ONCHANGE_MULTISENS
|
ONCHANGE_WINDOW
|
ONCHANGE_EXPOSURE
|
ONCHANGE_HIST
|
ONCHANGE_AEXP
|
ONCHANGE_FOCUSMODE
|
ONCHANGE_LIMITFPS
|
ONCHANGE_HIST
|
\
...
...
src/drivers/elphel/pgm_functions.c
View file @
fa5d6aea
This diff is collapsed.
Click to expand it.
src/drivers/elphel/pgm_functions.h
View file @
fa5d6aea
...
...
@@ -41,7 +41,7 @@ unsigned long sensor_to_camsync(unsigned long pixel_time, unsigned long sensor_c
#define X393_SEQ_SEND1S(port,frame,func,data,subchn) {if ((frame) < 0) seqr_##func (0, (data), (port), (subchn)); \
else seqa_##func ((frame), (data), (port), (subchn)); }
/** Tells if parameter is modifie
s
/** Tells if parameter is modifie
d
* @param x parameter index to test
* @return nonzero if modified */
#define FRAMEPAR_MODIFIED(x) (thispars->mod[(x) >> 5] & (1<<((x) & 0x1f)))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment