From d398f5e11ca0a10628924fe02f5be412436bae0f Mon Sep 17 00:00:00 2001
From: Maximilian Schnabel <maximilian.schnabel@rwth-aachen.de>
Date: Mon, 2 Mar 2020 15:17:12 +0100
Subject: [PATCH] Revert "added warning to setProperties, if invalid input
parameters are given"
This reverts commit 1c8f3a2e1bb1700dfece4c28dda235173ad9e6dd
---
source/Motor.m | 60 +++++++++++++++++++++++---------------------------
1 file changed, 27 insertions(+), 33 deletions(-)
diff --git a/source/Motor.m b/source/Motor.m
index a562d13..50b3403 100644
--- a/source/Motor.m
+++ b/source/Motor.m
@@ -347,15 +347,17 @@ classdef Motor < MaskedHandle & dynamicprops
% * This is a pretty 'heavy' function, as it tests if both motors are
% connected AND aren't running, wasting four packets, keep that in mind.
%
- % Example:
- % b = EV3(); % |br|
- % b.connect('usb'); % |br|
- % m = b.motorA; % |br|
- % slave = b.motorB; % |br|
- % m.power = 50; % |br|
- % m.syncedStart(slave); % |br|
- % % Do stuff |br|
- % m.stop(); % |br|
+ %::
+ %
+ % Example:
+ % brick = EV3();
+ % brick.connect('usb');
+ % motor = brick.motorA;
+ % slave = brick.motorB;
+ % motor.power = 50;
+ % motor.syncedStart(slave);
+ % % Do stuff
+ % motor.stop();
%
% See also MOTOR.STOP, MOTOR.SYNCEDSTOP / :meth:`stop`, :meth:`syncedStop`
@@ -713,20 +715,21 @@ classdef Motor < MaskedHandle & dynamicprops
% power (numeric in [-100,100]): *[OPTIONAL]*
% batteryMode ('Voltage'|'Percentage'): *[OPTIONAL]*
%
- % Example:
- % b = EV3(); % |br|
- % b.connect('bt', 'serPort', '/dev/rfcomm0'); % |br|
- % b.motorA.setProperties('debug', 'on', 'power', 50, 'limitValue', 720, 'speedRegulation', 'on'); % |br|
- % % Instead of: b.motorA.debug = 'on'; |br|
- % % b.motorA.power = 50; |br|
- % % b.motorA.limitValue = 720; |br|
- % % b.motorA.speedRegulation = 'on'; |br|
+ % ::
+ %
+ % Example:
+ % brick = EV3();
+ % brick.connect('bt', 'serPort', '/dev/rfcomm0');
+ % brick.motorA.setProperties('debug', 'on', 'power', 50, 'limitValue', 720, 'speedRegulation', 'on');
+ % % Instead of: brick.motorA.debug = 'on';
+ % % brick.motorA.power = 50;
+ % % brick.motorA.limitValue = 720;
+ % % brick.motorA.speedRegulation = 'on';
%
p = inputParser();
p.KeepUnmatched = 1;
-
% Set default values
if motor.init
defaultDebug = 0;
@@ -764,17 +767,7 @@ classdef Motor < MaskedHandle & dynamicprops
% Parse...
p.parse(varargin{:});
-
- if ~isempty(fieldnames(p.Unmatched))
- A = fieldnames(p.Unmatched);
- warn = 'The following input parameters were invalid: ';
- warn = [warn A{1}];
- for i = 2:length(A)
- warn = [warn ', ' A{i}];
- end
- warning(warn)
- end
-
+
% Set properties
if motor.init
motor.port = p.Results.port;
@@ -1049,9 +1042,10 @@ classdef Motor < MaskedHandle & dynamicprops
end
% If motor is *busily* running, stop it. That avoids suicidal stuff like:
- % b = EV3(); b.connect('usb');
- % b.motorA.start();
- % b.disconnect(); -> Motor still running and cannot directly be stopped anymore
+ % brick = EV3();
+ % brick.connect('usb');
+ % brick.motorA.start();
+ % brick.disconnect(); -> Motor still running and cannot directly be stopped anymore
if motor.isRunning
motor.stop();
end
@@ -1073,4 +1067,4 @@ classdef Motor < MaskedHandle & dynamicprops
end
end
end
-end
\ No newline at end of file
+end
--
GitLab