fix StepTicker walking off the end of active_motors array if the last motor is removed

[clinton/Smoothieware.git] / src / libs / StepTicker.h

diff --git a/src/libs/StepTicker.h b/src/libs/StepTicker.h
index c614a04..911b8d2 100644 (file)
--- a/src/libs/StepTicker.h
+++ b/src/libs/StepTicker.h
@@ -1,8 +1,8 @@
-/*  
+/*
       This file is part of Smoothie (http://smoothieware.org/). The motion control part is heavily based on Grbl (https://github.com/simen/grbl).
       Smoothie 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.
       Smoothie 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 Smoothie. If not, see <http://www.gnu.org/licenses/>. 
+      You should have received a copy of the GNU General Public License along with Smoothie. If not, see <http://www.gnu.org/licenses/>.
 */
 
 
@@ -22,16 +22,26 @@ class StepTicker{
         StepTicker();
         void set_frequency( double frequency );
         void tick();
+        void signal_moves_finished();
         StepperMotor* add_stepper_motor(StepperMotor* stepper_motor);
         void set_reset_delay( double seconds );
         void reset_tick();
+        void add_motor_to_active_list(StepperMotor* motor);
+        void remove_motor_from_active_list(StepperMotor* motor);
 
         double frequency;
-        vector<StepperMotor*> stepper_motors; 
+        vector<StepperMotor*> stepper_motors;
         uint32_t delay;
         uint32_t period;
         uint32_t debug;
         uint32_t last_duration;
+        bool has_axes;
+
+        bool moves_finished;
+        bool reset_step_pins;
+
+        StepperMotor* active_motors[12];
+        uint32_t active_motor_bm;
 };