shift a bunch of header stuff around

diff --git a/src/libs/FPointer.h b/src/libs/FPointer.h
index bec4243..f04278f 100644 (file)
--- a/src/libs/FPointer.h
+++ b/src/libs/FPointer.h
@@ -19,9 +19,13 @@ THE SOFTWARE.
 
 #ifndef AJK_FPOINTER_H
 #define AJK_FPOINTER_H
+
 #ifndef NULL
 #define NULL 0
 #endif
+
+#include <cstdint>
+
 namespace AjK {
 
 class FPointerDummy;

diff --git a/src/libs/Kernel.h b/src/libs/Kernel.h
index 4122c91..5ca1f24 100644 (file)
--- a/src/libs/Kernel.h
+++ b/src/libs/Kernel.h
@@ -21,6 +21,7 @@
 #include "modules/robot/Planner.h"
 #include "modules/robot/Robot.h"
 #include "modules/robot/Stepper.h"
+#include "mri.h"
 #include <array>
 
 #define THEKERNEL Kernel::instance

diff --git a/src/libs/Module.h b/src/libs/Module.h
index 7abeee6..98d81a5 100644 (file)
--- a/src/libs/Module.h
+++ b/src/libs/Module.h
@@ -38,7 +38,6 @@ class Module {
         #define EVENT(name, func) virtual void func (void*);
         #include "Event.h"
         #undef EVENT
-        Kernel * kernel;
 };
 
 #endif

diff --git a/src/libs/StepTicker.cpp b/src/libs/StepTicker.cpp
index 0a1b51d..bebb600 100644 (file)
--- a/src/libs/StepTicker.cpp
+++ b/src/libs/StepTicker.cpp
@@ -6,13 +6,16 @@
 */
 
 
+#include "StepTicker.h"
 
 using namespace std;
 #include <vector>
+
 #include "libs/nuts_bolts.h"
 #include "libs/Module.h"
 #include "libs/Kernel.h"
-#include "StepTicker.h"
+#include "StepperMotor.h"
+
 #include "system_LPC17xx.h" // mbed.h lib
 
 #include <mri.h>

diff --git a/src/libs/StepTicker.h b/src/libs/StepTicker.h
index ceedc1e..908d128 100644 (file)
--- a/src/libs/StepTicker.h
+++ b/src/libs/StepTicker.h
@@ -12,10 +12,10 @@
 
 using namespace std;
 #include <vector>
-#include "libs/nuts_bolts.h"
+
 #include "libs/Module.h"
-#include "libs/Kernel.h"
-#include "libs/StepperMotor.h"
+
+class StepperMotor;
 
 class StepTicker{
     public:

diff --git a/src/libs/StepperMotor.cpp b/src/libs/StepperMotor.cpp
index f031f04..5954a5d 100644 (file)
--- a/src/libs/StepperMotor.cpp
+++ b/src/libs/StepperMotor.cpp
@@ -4,9 +4,9 @@
       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/>.
 */
-#include "mri.h"
-#include "libs/Kernel.h"
 #include "StepperMotor.h"
+
+#include "Kernel.h"
 #include "MRI_Hooks.h"
 
 // A StepperMotor represents an actual stepper motor. It is used to generate steps that move the actual motor at a given speed

diff --git a/src/libs/StepperMotor.h b/src/libs/StepperMotor.h
index 1eddd4a..6e654d7 100644 (file)
--- a/src/libs/StepperMotor.h
+++ b/src/libs/StepperMotor.h
@@ -8,10 +8,11 @@
 #ifndef STEPPERMOTOR_H
 #define STEPPERMOTOR_H
 
-#include "libs/Kernel.h"
 #include "libs/Hook.h"
+#include "Pin.h"
 
 class StepTicker;
+class Hook;
 
 class StepperMotor {
     public:

diff --git a/src/modules/robot/Planner.cpp b/src/modules/robot/Planner.cpp
index c1e7048..0baabee 100644 (file)
--- a/src/modules/robot/Planner.cpp
+++ b/src/modules/robot/Planner.cpp
@@ -17,6 +17,7 @@ using namespace std;
 #include "Block.h"
 #include "Planner.h"
 #include "Conveyor.h"
+#include "StepperMotor.h"
 
 #define acceleration_checksum          CHECKSUM("acceleration")
 #define max_jerk_checksum              CHECKSUM("max_jerk")

diff --git a/src/modules/robot/Robot.cpp b/src/modules/robot/Robot.cpp
index 78e2e6c..d7d1936 100644 (file)
--- a/src/modules/robot/Robot.cpp
+++ b/src/modules/robot/Robot.cpp
@@ -7,16 +7,18 @@
 
 #include "libs/Module.h"
 #include "libs/Kernel.h"
+
+#include <math.h>
 #include <string>
 using std::string;
-#include <math.h>
+
 #include "Planner.h"
 #include "Conveyor.h"
 #include "Robot.h"
-#include "libs/nuts_bolts.h"
-#include "libs/Pin.h"
-#include "libs/StepperMotor.h"
-#include "../communication/utils/Gcode.h"
+#include "nuts_bolts.h"
+#include "Pin.h"
+#include "StepperMotor.h"
+#include "Gcode.h"
 #include "PublicDataRequest.h"
 #include "arm_solutions/BaseSolution.h"
 #include "arm_solutions/CartesianSolution.h"

diff --git a/src/modules/robot/Robot.h b/src/modules/robot/Robot.h
index 893c264..debac58 100644 (file)
--- a/src/modules/robot/Robot.h
+++ b/src/modules/robot/Robot.h
@@ -11,12 +11,6 @@
 #include <string>
 using std::string;
 #include "libs/Module.h"
-#include "libs/Kernel.h"
-#include "../communication/utils/Gcode.h"
-#include "arm_solutions/BaseSolution.h"
-#include "Planner.h"
-#include "libs/Pin.h"
-#include "libs/StepperMotor.h"
 #include "RobotPublicAccess.h"
 
 #define NEXT_ACTION_DEFAULT 0
@@ -40,7 +34,9 @@ using std::string;
 #define SPINDLE_DIRECTION_CW 0
 #define SPINDLE_DIRECTION_CCW 1
 
-
+class Gcode;
+class BaseSolution;
+class StepperMotor;
 
 class Robot : public Module {
     public:

diff --git a/src/modules/robot/Stepper.cpp b/src/modules/robot/Stepper.cpp
index 2864e1f..3ae8968 100644 (file)
--- a/src/modules/robot/Stepper.cpp
+++ b/src/modules/robot/Stepper.cpp
@@ -5,15 +5,20 @@
       You should have received a copy of the GNU General Public License along with Smoothie. If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "Stepper.h"
+
 #include "libs/Module.h"
 #include "libs/Kernel.h"
-#include "Stepper.h"
 #include "Planner.h"
 #include "Conveyor.h"
+#include "StepperMotor.h"
+
 #include <vector>
 using namespace std;
+
 #include "libs/nuts_bolts.h"
 #include "libs/Hook.h"
+
 #include <mri.h>
 
 

diff --git a/src/modules/robot/Stepper.h b/src/modules/robot/Stepper.h
index ed9489f..dbe975d 100644 (file)
--- a/src/modules/robot/Stepper.h
+++ b/src/modules/robot/Stepper.h
@@ -7,10 +7,12 @@
 
 #ifndef STEPPER_H
 #define STEPPER_H
+
 #include "libs/Module.h"
-#include "libs/Kernel.h"
-#include "Planner.h"
-#include "Block.h"
+
+class Block;
+class Hook;
+class StepperMotor;
 
 #define microseconds_per_step_pulse_checksum        CHECKSUM("microseconds_per_step_pulse")
 #define acceleration_ticks_per_second_checksum      CHECKSUM("acceleration_ticks_per_second")

diff --git a/src/modules/tools/extruder/Extruder.cpp b/src/modules/tools/extruder/Extruder.cpp
index ee6e31a..7105f6b 100644 (file)
--- a/src/modules/tools/extruder/Extruder.cpp
+++ b/src/modules/tools/extruder/Extruder.cpp
@@ -5,11 +5,15 @@
     You should have received a copy of the GNU General Public License along with Smoothie. If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "Extruder.h"
+
 #include "libs/Module.h"
 #include "libs/Kernel.h"
+
 #include "modules/robot/Conveyor.h"
 #include "modules/robot/Block.h"
-#include "modules/tools/extruder/Extruder.h"
+#include "StepperMotor.h"
+
 #include <mri.h>
 
 #define extruder_module_enable_checksum      CHECKSUM("extruder_module_enable")

diff --git a/src/modules/tools/touchprobe/Touchprobe.cpp b/src/modules/tools/touchprobe/Touchprobe.cpp
index 41173b7..67d4921 100644 (file)
--- a/src/modules/tools/touchprobe/Touchprobe.cpp
+++ b/src/modules/tools/touchprobe/Touchprobe.cpp
@@ -7,6 +7,8 @@
 
 #include "Touchprobe.h"
 
+#include "BaseSolution.h"
+
 void Touchprobe::on_module_loaded() {
     // if the module is disabled -> do nothing
     this->enabled = THEKERNEL->config->value( touchprobe_enable_checksum )->by_default(false)->as_bool();