GitLab was upgraded during the server migration. If you cannot sign in, use "Forgot your password?" to reset it — passwords could not be carried over.

Commit 452cab87 authored Oct 25, 2014 by Andrey Filippov

debugging

parent 6b79bd97

src/main/java/Aberration_Calibration.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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 {
	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);