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
452cab87
Commit
452cab87
authored
Oct 25, 2014
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debugging
parent
6b79bd97
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
Aberration_Calibration.java
src/main/java/Aberration_Calibration.java
+2
-0
CalibrationHardwareInterface.java
src/main/java/CalibrationHardwareInterface.java
+2
-1
No files found.
src/main/java/Aberration_Calibration.java
View file @
452cab87
...
@@ -6747,6 +6747,8 @@ if (MORE_BUTTONS) {
...
@@ -6747,6 +6747,8 @@ if (MORE_BUTTONS) {
/* ======================================================================== */
/* ======================================================================== */
if (label.equals("Load Equirectangular Maps")) {
if (label.equals("Load Equirectangular Maps")) {
DEBUG_LEVEL=MASTER_DEBUG_LEVEL;
DEBUG_LEVEL=MASTER_DEBUG_LEVEL;
// Reset existent pixel mapping (i.e. to reduce number of input files)
PIXEL_MAPPING=null;
if (PIXEL_MAPPING==null){
if (PIXEL_MAPPING==null){
if (DEBUG_LEVEL>1) System.out.println("Creating new PixelMapping from equirectangular maps");
if (DEBUG_LEVEL>1) System.out.println("Creating new PixelMapping from equirectangular maps");
PIXEL_MAPPING=new PixelMapping((String)null,DEBUG_LEVEL); // ask for and load sensor calibration files
PIXEL_MAPPING=new PixelMapping((String)null,DEBUG_LEVEL); // ask for and load sensor calibration files
...
...
src/main/java/CalibrationHardwareInterface.java
View file @
452cab87
...
@@ -2636,7 +2636,7 @@ public class CalibrationHardwareInterface {
...
@@ -2636,7 +2636,7 @@ public class CalibrationHardwareInterface {
throw
new
RuntimeException
(
msg
);
throw
new
RuntimeException
(
msg
);
}
}
while
(
true
)
{
while
(
true
)
{
enableMotors
(
true
);
// just in case?
// enableMotors(true); // just in case? - not here, test first
updateMotorsPosition
(
1
);
// wait one second before testing to decrease re-test frequency
updateMotorsPosition
(
1
);
// wait one second before testing to decrease re-test frequency
if
(
updateStatus
)
{
if
(
updateStatus
)
{
double
axialAngle
=
curpos
[
axialMotor
]/
this
.
stepsPerDegreeAxial
;
double
axialAngle
=
curpos
[
axialMotor
]/
this
.
stepsPerDegreeAxial
;
...
@@ -2655,6 +2655,7 @@ public class CalibrationHardwareInterface {
...
@@ -2655,6 +2655,7 @@ public class CalibrationHardwareInterface {
enableMotors
(
false
);
enableMotors
(
false
);
return
true
;
return
true
;
}
}
enableMotors
(
true
);
// does not need to be enabled before
long
nanoNow
=
System
.
nanoTime
();
long
nanoNow
=
System
.
nanoTime
();
if
((
stopRequested
!=
null
)
&&
(
stopRequested
.
get
()>
1
)){
if
((
stopRequested
!=
null
)
&&
(
stopRequested
.
get
()>
1
)){
enableMotors
(
false
);
enableMotors
(
false
);
...
...
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