From d50746a365c7b639cb78c1ed44399df683b6d571 Mon Sep 17 00:00:00 2001 From: Jan-Gerrit Richter Date: Tue, 5 Dec 2017 11:48:40 +0100 Subject: [PATCH] used new eimar with arm --- .../ClassStuff/itaMotorControl/itaMotorNanotec_Arm.m | 8 ++++---- applications/Measurement/ClassStuff/itaMSPlaybackRecord.m | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/applications/Hardware/ITAMotorControl/ClassStuff/itaMotorControl/itaMotorNanotec_Arm.m b/applications/Hardware/ITAMotorControl/ClassStuff/itaMotorControl/itaMotorNanotec_Arm.m index 39326912..b336f9b1 100644 --- a/applications/Hardware/ITAMotorControl/ClassStuff/itaMotorControl/itaMotorNanotec_Arm.m +++ b/applications/Hardware/ITAMotorControl/ClassStuff/itaMotorControl/itaMotorNanotec_Arm.m @@ -13,7 +13,7 @@ classdef itaMotorNanotec_Arm < itaMotorNanotec end properties - + horizontalCorrectionFactor = 0; end properties(Constant, Hidden = true) @@ -224,14 +224,14 @@ classdef itaMotorNanotec_Arm < itaMotorNanotec return; end - if (angle < this.ARM_limit(1)) || (angle > this.ARM_limit(2)) - ita_verbose_info(['Arm: Only values between ' num2str(this.ARM_limit(1)) ' and ' num2str(this.ARM_limit(2)) ' are allowed!'], 0) + if (angle < this.motorLimits(1)) || (angle > this.motorLimits(2)) + ita_verbose_info(['Arm: Only values between ' num2str(this.motorLimits(1)) ' and ' num2str(this.motorLimits(2)) ' are allowed!'], 0) ret = false; % this.wait = false; return; end - angle = angle - 120.1; % Larger substractive value: Higher position. Checkt at 90�. + angle = angle - 120-1.7+this.horizontalCorrectionFactor; % Larger substractive value: Higher position. Checkt at 90�. motorControl = this.mMotorControl; diff --git a/applications/Measurement/ClassStuff/itaMSPlaybackRecord.m b/applications/Measurement/ClassStuff/itaMSPlaybackRecord.m index 71b2ac79..24f376e4 100644 --- a/applications/Measurement/ClassStuff/itaMSPlaybackRecord.m +++ b/applications/Measurement/ClassStuff/itaMSPlaybackRecord.m @@ -220,6 +220,12 @@ classdef itaMSPlaybackRecord < itaMSRecord end max_rec_lvl = max(abs(result.timeData),[],1); + % add history line + commitID = ita_git_getMasterCommitHash; + if ~isempty(commitID) + result = ita_metainfo_add_historyline(result,'Measurement',commitID); + end + end function [result, max_rec_lvl] = run(this) -- GitLab