From fbeafe3ba7c7863c9f41c382c3041f219bdf3c2c Mon Sep 17 00:00:00 2001 From: Michael Moon Date: Wed, 20 Jan 2010 17:36:22 +1100 Subject: [PATCH] moved target struct to dda.h --- mendel/dda.c | 1 - mendel/dda.h | 9 ++++++++- mendel/gcode.c | 1 - mendel/gcode.h | 8 +------- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/mendel/dda.c b/mendel/dda.c index f54f589..c02362a 100644 --- a/mendel/dda.c +++ b/mendel/dda.c @@ -2,7 +2,6 @@ #include -#include "pinout.h" #include "timer.h" /* diff --git a/mendel/dda.h b/mendel/dda.h index 2210d40..8563d05 100644 --- a/mendel/dda.h +++ b/mendel/dda.h @@ -4,9 +4,16 @@ #include #include "pinout.h" -#include "gcode.h" #include "machine.h" +typedef struct { + int32_t X; + int32_t Y; + int32_t Z; + uint32_t E; + uint32_t F; +} TARGET; + typedef struct { // TARGET currentpoint; TARGET endpoint; diff --git a/mendel/gcode.c b/mendel/gcode.c index d7a2e6a..cad91c5 100644 --- a/mendel/gcode.c +++ b/mendel/gcode.c @@ -3,7 +3,6 @@ #include #include "machine.h" -#include "dda.h" #include "serial.h" #include "sermsg.h" #include "temp.h" diff --git a/mendel/gcode.h b/mendel/gcode.h index 2fcbed1..56f7fe4 100644 --- a/mendel/gcode.h +++ b/mendel/gcode.h @@ -3,13 +3,7 @@ #include -typedef struct { - int32_t X; - int32_t Y; - int32_t Z; - uint32_t E; - uint32_t F; -} TARGET; +#include "dda.h" typedef struct { uint16_t sign :1;