Changeset 272 for branches/atorf/RWTHMindstormsNXT-Lejos-Combined/@NXTmotor/wait.m

Timestamp:

09/18/08 17:57:06 (5 years ago)

Author:

atorf

Message:

Added changes from /branches/telle/RWTHMindstormsNXT-Lejos to current testing-branch

Files:

• branches/atorf/RWTHMindstormsNXT-Lejos-Combined/@NXTmotor/wait.m (modified) (3 diffs)

branches/atorf/RWTHMindstormsNXT-Lejos-Combined/@NXTmotor/wait.m

@@ -27 +27 @@
 %
 
-% Author: Aulis Telle, IND, RWTH Aachen
+% Signature
+%   Author: Aulis Telle (see AUTHORS)
+%   Date: 2008/08/15
+%   Copyright: 2007-2008, RWTH Aachen University
+%
+%
+% ***********************************************************************************************
+% *  This file is part of the RWTH - Mindstorms NXT Toolbox.                                    *
+% *                                                                                             *
+% *  The RWTH - Mindstorms NXT Toolbox is free software: you can redistribute it and/or modify  *
+% *  it under the terms of the GNU General Public License as published by the Free Software     *
+% *  Foundation, either version 3 of the License, or (at your option) any later version.        *
+% *                                                                                             *
+% *  The RWTH - Mindstorms NXT Toolbox is distributed in the hope that it will be useful,       *
+% *  but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS  *
+% *  FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.             *
+% *                                                                                             *
+% *  You should have received a copy of the GNU General Public License along with the           *
+% *  RWTH - Mindstorms NXT Toolbox. If not, see <http://www.gnu.org/licenses/>.                 *
+% ***********************************************************************************************
+
+
+if ~isa(obj,'NXTmotor')
+    error('MATLAB:RWTHMindstormsNXT:InvalidObject',...
+        'No NXTmotor object.');
+end
 
 if nargout > 0
@@ -41 +66 @@
 
 data = read(obj);
-if data.TachoLimit == 0 && ~ strcmp(data.RunState,'idle')
+if data.TachoLimit == 0 && ~ strcmpi(data.RunState,'idle')
     warning('RWTHMINDSTORMS:MotorWait',...
         'Motor running infinitely. Not waiting for this motor!');
@@ -47 +72 @@
 end
 
-while ~ strcmp(data.RunState,'idle')
+while ~ strcmpi(data.RunState,'idle')
     if exist('timedOut', 'var') && timeout > 0 && now >= endtime
         timedOut = 1;