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
0688d981
Commit
0688d981
authored
Nov 26, 2016
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
moved new debuds under conditions
parent
db1ed4e7
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
CalibrationHardwareInterface.java
src/main/java/CalibrationHardwareInterface.java
+2
-2
No files found.
src/main/java/CalibrationHardwareInterface.java
View file @
0688d981
...
@@ -289,7 +289,7 @@ public class CalibrationHardwareInterface {
...
@@ -289,7 +289,7 @@ public class CalibrationHardwareInterface {
this
.
triggerURL
=
"http://"
+
this
.
cameraSubnet
+(
this
.
iBaseIP
+
this
.
masterSubCamera
)+
":"
+
this
.
triggerURL
=
"http://"
+
this
.
cameraSubnet
+(
this
.
iBaseIP
+
this
.
masterSubCamera
)+
":"
+
(
this
.
imgsrvPort
+
(
this
.
masterPort
&
3
))+
"/"
+
triggerURLcmd
;
(
this
.
imgsrvPort
+
(
this
.
masterPort
&
3
))+
"/"
+
triggerURLcmd
;
System
.
out
.
println
(
"DEBUG393: initIPs(): this.triggerURL ="
+
this
.
triggerURL
);
if
(
this
.
debugLevel
>
1
)
System
.
out
.
println
(
"DEBUG393: initIPs(): this.triggerURL ="
+
this
.
triggerURL
);
}
}
/*
/*
//pre nc393
//pre nc393
...
@@ -987,7 +987,7 @@ public class CalibrationHardwareInterface {
...
@@ -987,7 +987,7 @@ public class CalibrationHardwareInterface {
System
.
out
.
println
(
"Master port mismatch for camera "
+
ip
+
" (master) - parameters master port = "
+
System
.
out
.
println
(
"Master port mismatch for camera "
+
ip
+
" (master) - parameters master port = "
+
this
.
masterPort
+
", camera responded with "
+
this
.
cameraMasterPort
[
chn
]
);
this
.
masterPort
+
", camera responded with "
+
this
.
cameraMasterPort
[
chn
]
);
}
}
System
.
out
.
println
(
"DEBUG393: chn="
+
chn
+
" sensor_port="
+
sensor_port
+
" ip= "
+
ip
+
" isMasterSubcamera="
+
isMasterSubcamera
+
" isMasterPort="
+
isMasterPort
);
if
(
this
.
debugLevel
>
1
)
System
.
out
.
println
(
"DEBUG393: chn="
+
chn
+
" sensor_port="
+
sensor_port
+
" ip= "
+
ip
+
" isMasterSubcamera="
+
isMasterSubcamera
+
" isMasterPort="
+
isMasterPort
);
boolean
exposureOnly
=!
Double
.
isNaN
(
exposureScale
);
boolean
exposureOnly
=!
Double
.
isNaN
(
exposureScale
);
int
minExposure
=
10
;
// usec
int
minExposure
=
10
;
// usec
int
maxExposure
=
1000000
;
//usec
int
maxExposure
=
1000000
;
//usec
...
...
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