Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Institute of Technical Acoustics (ITA)
toolbox
Commits
d50746a3
Commit
d50746a3
authored
Dec 05, 2017
by
Jan-Gerrit Richter
Browse files
used new eimar with arm
parent
4051f203
Changes
2
Hide whitespace changes
Inline
Side-by-side
applications/Hardware/ITAMotorControl/ClassStuff/itaMotorControl/itaMotorNanotec_Arm.m
View file @
d50746a3
...
...
@@ -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_l
imit
(
1
))
||
(
angle
>
this
.
ARM_l
imit
(
2
))
ita_verbose_info
([
'Arm: Only values between '
num2str
(
this
.
ARM_l
imit
(
1
))
' and '
num2str
(
this
.
ARM_l
imit
(
2
))
' are allowed!'
],
0
)
if
(
angle
<
this
.
motorL
imit
s
(
1
))
||
(
angle
>
this
.
motorL
imit
s
(
2
))
ita_verbose_info
([
'Arm: Only values between '
num2str
(
this
.
motorL
imit
s
(
1
))
' and '
num2str
(
this
.
motorL
imit
s
(
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
;
...
...
applications/Measurement/ClassStuff/itaMSPlaybackRecord.m
View file @
d50746a3
...
...
@@ -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
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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