Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
imagej-elphel
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Elphel
imagej-elphel
Commits
cd31f09e
Commit
cd31f09e
authored
Nov 26, 2016
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adding initIPs()
parent
3c321110
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
CalibrationHardwareInterface.java
src/main/java/CalibrationHardwareInterface.java
+7
-2
No files found.
src/main/java/CalibrationHardwareInterface.java
View file @
cd31f09e
...
...
@@ -530,6 +530,7 @@ public class CalibrationHardwareInterface {
}
}
initIPs
();
// was missing here?
initJP4
();
}
...
...
@@ -1039,7 +1040,9 @@ public class CalibrationHardwareInterface {
"&TRIG=4*3"
;
}
if
(
this
.
triggerPeriod
[
chn
]>
1
)
triggerMode
+=
"&TRIG_PERIOD=0*1"
;
// just stop it if it wasn't already, imgsrv /trig does not set it, only FPGA register
if
((
this
.
triggerPeriod
[
chn
]>
1
)
||
this
.
setupTriggerMode
)
{
triggerMode
+=
"&TRIG_PERIOD=0*1"
;
// just stop it if it wasn't already, imgsrv /trig does not set it, only FPGA register
}
}
}
else
{
if
(
this
.
setupTriggerMode
){
...
...
@@ -1047,7 +1050,9 @@ public class CalibrationHardwareInterface {
"&TRIG_OUT="
+(
this
.
noCabling
?(
0
):(
this
.
externalTriggerCabling
?
"0x800000"
:
"0x80000"
))+
"*0"
+
"&TRIG=4*3"
;
}
if
(
this
.
triggerPeriod
[
chn
]>
1
)
triggerMode
+=
"&TRIG_PERIOD=1*0"
;
// just imgsrv /trig does not set it, only FPGA register
if
((
this
.
triggerPeriod
[
chn
]>
1
)
||
this
.
setupTriggerMode
){
triggerMode
+=
"&TRIG_PERIOD=1*0"
;
// just imgsrv /trig does not set it, only FPGA register
}
}
...
...
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