From a5ca6627f69b833071a63efc37bab1542ab6710d Mon Sep 17 00:00:00 2001 From: Willem Oldemans Date: Thu, 22 Apr 2021 20:36:06 +0200 Subject: [PATCH] updated to bool --- extras/doc/AccelStepper_8h-source.html | 6 +++--- extras/doc/classAccelStepper.html | 16 ++++++++-------- src/AccelStepper.cpp | 6 +++--- src/AccelStepper.h | 8 ++++---- src/MultiStepper.cpp | 6 +++--- src/MultiStepper.h | 4 ++-- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/extras/doc/AccelStepper_8h-source.html b/extras/doc/AccelStepper_8h-source.html index 098f9f5..39cb2d7 100644 --- a/extras/doc/AccelStepper_8h-source.html +++ b/extras/doc/AccelStepper_8h-source.html @@ -196,12 +196,12 @@ 00181 /// fequently as possible, but at least once per minimum step interval, 00182 /// preferably in your main loop. 00183 /// \return true if the motor is at the target position. -00184 boolean run(); +00184 bool run(); 00185 00186 /// Poll the motor and step it if a step is due, implmenting a constant 00187 /// speed as set by the most recent call to setSpeed(). 00188 /// \return true if the motor was stepped. -00189 boolean runSpeed(); +00189 bool runSpeed(); 00190 00191 /// Sets the maximum permitted speed. the run() function will accelerate 00192 /// up to the speed set by this function. @@ -257,7 +257,7 @@ 00242 00243 /// Runs at the currently selected speed until the target position is reached 00244 /// Does not implement accelerations. -00245 boolean runSpeedToPosition(); +00245 bool runSpeedToPosition(); 00246 00247 /// Moves the motor to the new target position and blocks until it is at 00248 /// position. Dont use this in event loops, since it blocks. diff --git a/extras/doc/classAccelStepper.html b/extras/doc/classAccelStepper.html index a45161a..e6120f9 100644 --- a/extras/doc/classAccelStepper.html +++ b/extras/doc/classAccelStepper.html @@ -80,9 +80,9 @@ Public Member Functions   void move (long relative)   -boolean run () +bool run ()   -boolean runSpeed () +bool runSpeed ()   void setMaxSpeed (float speed)   @@ -104,7 +104,7 @@ Public Member Functions   void runToPosition ()   -boolean runSpeedToPosition () +bool runSpeedToPosition ()   void runToNewPosition (long position)   @@ -158,7 +158,7 @@ Protected Member Functions - +

Protected Attributes

boolean _direction
bool _direction
 

Detailed Description

@@ -570,7 +570,7 @@ Protected Attributes
- + @@ -592,7 +592,7 @@ Protected Attributes
boolean AccelStepper::run bool AccelStepper::run ( )
- + @@ -614,7 +614,7 @@ Protected Attributes
boolean AccelStepper::runSpeed bool AccelStepper::runSpeed ( )
- + @@ -1316,7 +1316,7 @@ Protected Attributes diff --git a/src/AccelStepper.cpp b/src/AccelStepper.cpp index 093d56d..e76b122 100644 --- a/src/AccelStepper.cpp +++ b/src/AccelStepper.cpp @@ -38,7 +38,7 @@ void AccelStepper::move(long relative) // Implements steps according to the current step interval // You must call this at least once per step // returns true if a step occurred -boolean AccelStepper::runSpeed() +bool AccelStepper::runSpeed() { // Dont do anything unless we actually have a step interval if (!_stepInterval) @@ -180,7 +180,7 @@ void AccelStepper::computeNewSpeed() // You must call this at least once per step, preferably in your main loop // If the motor is in the desired position, the cost is very small // returns true if the motor is still running to the target position. -boolean AccelStepper::run() +bool AccelStepper::run() { if (runSpeed()) computeNewSpeed(); @@ -616,7 +616,7 @@ void AccelStepper::runToPosition() YIELD; // Let system housekeeping occur } -boolean AccelStepper::runSpeedToPosition() +bool AccelStepper::runSpeedToPosition() { if (_targetPos == _currentPos) return false; diff --git a/src/AccelStepper.h b/src/AccelStepper.h index 5ab5aba..120bd16 100644 --- a/src/AccelStepper.h +++ b/src/AccelStepper.h @@ -401,13 +401,13 @@ public: /// preferably in your main loop. Note that each call to run() will make at most one step, and then only when a step is due, /// based on the current speed and the time since the last step. /// \return true if the motor is still running to the target position. - boolean run(); + bool run(); /// Poll the motor and step it if a step is due, implementing a constant /// speed as set by the most recent call to setSpeed(). You must call this as /// frequently as possible, but at least once per step interval, /// \return true if the motor was stepped. - boolean runSpeed(); + bool runSpeed(); /// Sets the maximum permitted speed. The run() function will accelerate /// up to the speed set by this function. @@ -474,7 +474,7 @@ public: /// Runs at the currently selected speed until the target position is reached. /// Does not implement accelerations. /// \return true if it stepped - boolean runSpeedToPosition(); + bool runSpeedToPosition(); /// Moves the motor (with acceleration/deceleration) /// to the new target position and blocks until it is at @@ -616,7 +616,7 @@ protected: /// Current direction motor is spinning in /// Protected because some peoples subclasses need it to be so - boolean _direction; // 1 == CW + bool _direction; // 1 == CW private: /// Number of pins on the stepper motor. Permits 2 or 4. 2 pins is a diff --git a/src/MultiStepper.cpp b/src/MultiStepper.cpp index 6a22e11..ae33bcb 100644 --- a/src/MultiStepper.cpp +++ b/src/MultiStepper.cpp @@ -11,7 +11,7 @@ MultiStepper::MultiStepper() { } -boolean MultiStepper::addStepper(AccelStepper& stepper) +bool MultiStepper::addStepper(AccelStepper& stepper) { if (_num_steppers >= MULTISTEPPER_MAX_STEPPERS) return false; // No room for more @@ -49,10 +49,10 @@ void MultiStepper::moveTo(long absolute[]) } // Returns true if any motor is still running to the target position. -boolean MultiStepper::run() +bool MultiStepper::run() { uint8_t i; - boolean ret = false; + bool ret = false; for (i = 0; i < _num_steppers; i++) { if ( _steppers[i]->distanceToGo() != 0) diff --git a/src/MultiStepper.h b/src/MultiStepper.h index d801bb0..c408648 100644 --- a/src/MultiStepper.h +++ b/src/MultiStepper.h @@ -40,7 +40,7 @@ public: /// There is an upper limit of MULTISTEPPER_MAX_STEPPERS = 10 to the number of steppers that can be managed /// \param[in] stepper Reference to a stepper to add to the managed list /// \return true if successful. false if the number of managed steppers would exceed MULTISTEPPER_MAX_STEPPERS - boolean addStepper(AccelStepper& stepper); + bool addStepper(AccelStepper& stepper); /// Set the target positions of all managed steppers /// according to a coordinate array. @@ -54,7 +54,7 @@ public: /// Calls runSpeed() on all the managed steppers /// that have not acheived their target position. /// \return true if any stepper is still in the process of running to its target position. - boolean run(); + bool run(); /// Runs all managed steppers until they acheived their target position. /// Blocks until all that position is acheived. If you dont
boolean AccelStepper::runSpeedToPosition bool AccelStepper::runSpeedToPosition ( )
- +
boolean AccelStepper::_directionbool AccelStepper::_direction