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
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mindstorms
ev3-toolbox-matlab
Commits
1250413e
Commit
1250413e
authored
8 years ago
by
Tim Stadtmann
Browse files
Options
Downloads
Patches
Plain Diff
Overall clean up and minimal changes
parent
306b0650
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
source/MaskedHandle.m
+0
-4
0 additions, 4 deletions
source/MaskedHandle.m
source/Motor.m
+4
-5
4 additions, 5 deletions
source/Motor.m
source/__init__.py
+1
-1
1 addition, 1 deletion
source/__init__.py
source/displayProperties.m
+0
-0
0 additions, 0 deletions
source/displayProperties.m
with
5 additions
and
10 deletions
source/MaskedHandle.m
+
0
−
4
View file @
1250413e
...
@@ -7,10 +7,6 @@ classdef MaskedHandle < handle
...
@@ -7,10 +7,6 @@ classdef MaskedHandle < handle
function
findobj
(
varargin
)
function
findobj
(
varargin
)
findobj
@
findobj
(
varargin
{
:
});
findobj
@
findobj
(
varargin
{
:
});
end
end
% function findprop(varargin)
% findprop@findprop(varargin{:});
% end
function
notify
(
varargin
)
function
notify
(
varargin
)
notify
@
notify
(
varargin
{
:
});
notify
@
notify
(
varargin
{
:
});
...
...
This diff is collapsed.
Click to expand it.
source/Motor.m
+
4
−
5
View file @
1250413e
...
@@ -135,8 +135,8 @@ classdef Motor < MaskedHandle & dynamicprops
...
@@ -135,8 +135,8 @@ classdef Motor < MaskedHandle & dynamicprops
% connectedToBrick (bool): True if virtual brick is connected to physical brick.
% connectedToBrick (bool): True if virtual brick is connected to physical brick.
connectedToBrick
=
false
;
connectedToBrick
=
false
;
% state (MotorState): State-struct consisting of several special Motor-flags
% state (MotorState): State-struct consisting of several special Motor-flags
% See also MOTORSTATE
% See also MOTORSTATE
state
=
MotorState
();
state
=
MotorState
();
end
end
...
@@ -1002,7 +1002,7 @@ classdef Motor < MaskedHandle & dynamicprops
...
@@ -1002,7 +1002,7 @@ classdef Motor < MaskedHandle & dynamicprops
end
end
% assert(motor.physicalMotorConnected==true);
% assert(motor.physicalMotorConnected==true);
assert
(
motor
.
limitValue
==
0
);
%
assert(motor.limitValue==0);
if
motor
.
speedRegulation
if
motor
.
speedRegulation
motor
.
commInterface
.
outputSpeed
(
0
,
motor
.
port
,
power
);
motor
.
commInterface
.
outputSpeed
(
0
,
motor
.
port
,
power
);
...
@@ -1017,7 +1017,6 @@ classdef Motor < MaskedHandle & dynamicprops
...
@@ -1017,7 +1017,6 @@ classdef Motor < MaskedHandle & dynamicprops
fprintf
(
'(DEBUG) Motor::setPower: Called outputPower on Port %s\n'
,
port2str
(
'Motor'
,
motor
.
port
));
fprintf
(
'(DEBUG) Motor::setPower: Called outputPower on Port %s\n'
,
port2str
(
'Motor'
,
motor
.
port
));
end
end
end
end
%motor.sendPowerOnNextStart = false;
success
=
true
;
success
=
true
;
return
;
return
;
end
end
...
@@ -1185,7 +1184,7 @@ classdef Motor < MaskedHandle & dynamicprops
...
@@ -1185,7 +1184,7 @@ classdef Motor < MaskedHandle & dynamicprops
%applyState Sets motor state to saved state and deletes the dynamic property in
%applyState Sets motor state to saved state and deletes the dynamic property in
%which the latter is stored
%which the latter is stored
assert
(
length
(
motor
.
findprop
(
'savedState'
))
~=
0
);
%
assert(length(motor.findprop('savedState')) ~= 0);
motor
.
state
=
motor
.
savedState
;
motor
.
state
=
motor
.
savedState
;
delete
(
motor
.
findprop
(
'savedState'
))
delete
(
motor
.
findprop
(
'savedState'
))
...
...
This diff is collapsed.
Click to expand it.
source/__init__.py
+
1
−
1
View file @
1250413e
#!/usr/bin/python
#!/usr/bin/python
3
This diff is collapsed.
Click to expand it.
source/displayProperties.m
100755 → 100644
+
0
−
0
View file @
1250413e
File mode changed from 100755 to 100644
This diff is collapsed.
Click to expand it.
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