Commit d50746a3 authored by Jan-Gerrit Richter's avatar Jan-Gerrit Richter

used new eimar with arm

parent 4051f203
......@@ -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;
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment