Skip to content
Snippets Groups Projects
Commit 1250413e authored by Tim Stadtmann's avatar Tim Stadtmann
Browse files

Overall clean up and minimal changes

parent 306b0650
Branches
Tags
No related merge requests found
...@@ -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{:});
......
...@@ -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'))
......
#!/usr/bin/python #!/usr/bin/python3
File mode changed from 100755 to 100644
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment