Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
ev3-toolbox-matlab
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Container registry
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mindstorms
ev3-toolbox-matlab
Commits
f6761ead
Commit
f6761ead
authored
8 years ago
by
Tim Stadtmann
Browse files
Options
Downloads
Patches
Plain Diff
Fix typos
parent
05119577
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/Motor.m
+8
-8
8 additions, 8 deletions
source/Motor.m
with
8 additions
and
8 deletions
source/Motor.m
+
8
−
8
View file @
f6761ead
...
@@ -362,9 +362,9 @@ classdef Motor < MaskedHandle & dynamicprops
...
@@ -362,9 +362,9 @@ classdef Motor < MaskedHandle & dynamicprops
error
(
'Motor::syncedStart: One of the motors is already running!'
);
error
(
'Motor::syncedStart: One of the motors is already running!'
);
end
end
if
motor
.
power
==
0
%
if motor.power == 0
warning
(
'Motor::syncedStart: Synchronized motors starting with power=0.'
);
%
warning('Motor::syncedStart: Synchronized motors starting with power=0.');
end
%
end
% If the motor coasts into its stops, the internal tachocount has to be reset
% If the motor coasts into its stops, the internal tachocount has to be reset
% before each start for it to behave predictable
% before each start for it to behave predictable
...
@@ -670,8 +670,8 @@ classdef Motor < MaskedHandle & dynamicprops
...
@@ -670,8 +670,8 @@ classdef Motor < MaskedHandle & dynamicprops
% If new brakeMode is 'Brake': reset internal tachocount once
% If new brakeMode is 'Brake': reset internal tachocount once
% Note: if new brakeMode is 'Coast', internal tachocount is always reset
% Note: if new brakeMode is 'Coast', internal tachocount is always reset
% right before starting, so it's not necessary here
% right before starting, so it's not necessary here
if
~
motor
.
state
.
init
&&
strcmpi
(
brakeMode
,
'Brake'
)
&&
...
if
~
motor
.
init
&&
strcmpi
(
brakeMode
,
'Brake'
)
&&
...
motor
.
state
.
connectedToBrick
&&
motor
.
physicalMotorConnected
motor
.
connectedToBrick
&&
motor
.
physicalMotorConnected
motor
.
internalReset
();
motor
.
internalReset
();
end
end
...
@@ -1136,13 +1136,13 @@ classdef Motor < MaskedHandle & dynamicprops
...
@@ -1136,13 +1136,13 @@ classdef Motor < MaskedHandle & dynamicprops
% % do stuff
% % do stuff
%
%
if
motor
.
state
.
connectedToBrick
if
motor
.
connectedToBrick
if
isCommInterfaceValid
(
motor
.
commInterface
)
if
isCommInterfaceValid
(
motor
.
commInterface
)
error
(
'Motor::connect: Motor-Object already has a comm handle.'
);
error
(
'Motor::connect: Motor-Object already has a comm handle.'
);
else
else
warning
([
'Motor::connect: Motor.
state.
connectedToBrick is set to
''
True
''
, but '
,
...
warning
([
'Motor::connect: Motor.connectedToBrick is set to
''
True
''
, but '
,
...
'comm handle is invalid. Deleting invalid handle and '
,
...
'comm handle is invalid. Deleting invalid handle and '
,
...
'resetting Motor.
state.
connectedToBrick now...'
]);
'resetting Motor.connectedToBrick now...'
]);
motor
.
disconnect
();
motor
.
disconnect
();
...
...
This diff is collapsed.
Click to expand it.
Tim Stadtmann
@tim.stadtmann
·
8 years ago
Author
Developer
"Typos" :D
"Typos" :D
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment