From 883c488107fffec68105f3b10bb1b64d6c7ee658 Mon Sep 17 00:00:00 2001
From: Michael Moon <triffid.hunter@gmail.com>
Date: Tue, 10 Aug 2010 14:59:41 +1000
Subject: [PATCH] fixed some mess from moving stuff around

---
 dda.c     |  9 ---------
 gcode.c   | 10 ----------
 machine.h |  4 ----
 temp.c    |  4 ----
 4 files changed, 27 deletions(-)

diff --git a/dda.c b/dda.c
index 08402b1..9fdf6d3 100644
--- a/dda.c
+++ b/dda.c
@@ -120,10 +120,6 @@ void dda_create(DDA *dda, TARGET *target) {
 
 	// initialise DDA to a known state
 	dda->live = 0;
-<<<<<<< HEAD:mendel/dda.c
-=======
-// 	dda->total_steps = 0;
->>>>>>> mendel-triffid:dda.c
 	dda->waitfor_temp = 0;
 
 	if (debug_flags & DEBUG_DDA)
@@ -159,12 +155,7 @@ void dda_create(DDA *dda, TARGET *target) {
 		serial_writestr_P(PSTR("] ["));
 	}
 
-<<<<<<< HEAD:mendel/dda.c
 	dda->total_steps = dda->x_delta;
-=======
-// 	if (dda->x_delta > dda->total_steps)
-		dda->total_steps = dda->x_delta;
->>>>>>> mendel-triffid:dda.c
 	if (dda->y_delta > dda->total_steps)
 		dda->total_steps = dda->y_delta;
 	if (dda->z_delta > dda->total_steps)
diff --git a/gcode.c b/gcode.c
index c925a76..73ebe1f 100644
--- a/gcode.c
+++ b/gcode.c
@@ -538,13 +538,8 @@ void process_gcode_command(GCODE_COMMAND *gcmd) {
 				do {
 					// backup feedrate, move E very quickly then restore feedrate
 					uint32_t	f = startpoint.F;
-<<<<<<< HEAD:mendel/gcode.c
 					startpoint.F = MAXIMUM_FEEDRATE_E;
 					SpecialMoveE(E_STARTSTOP_STEPS, MAXIMUM_FEEDRATE_E);
-=======
-					startpoint.F = FEEDRATE_FAST_E;
-					SpecialMoveE(E_STARTSTOP_STEPS, FEEDRATE_FAST_E);
->>>>>>> mendel-triffid:gcode.c
 					startpoint.F = f;
 				} while (0);
 				break;
@@ -556,13 +551,8 @@ void process_gcode_command(GCODE_COMMAND *gcmd) {
 				do {
 					// backup feedrate, move E very quickly then restore feedrate
 					uint32_t	f = startpoint.F;
-<<<<<<< HEAD:mendel/gcode.c
 					startpoint.F = MAXIMUM_FEEDRATE_E;
 					SpecialMoveE(-E_STARTSTOP_STEPS, MAXIMUM_FEEDRATE_E);
-=======
-					startpoint.F = FEEDRATE_FAST_E;
-					SpecialMoveE(-E_STARTSTOP_STEPS, FEEDRATE_FAST_E);
->>>>>>> mendel-triffid:gcode.c
 					startpoint.F = f;
 				} while (0);
 				break;
diff --git a/machine.h b/machine.h
index 59ffdff..067391e 100644
--- a/machine.h
+++ b/machine.h
@@ -36,12 +36,8 @@
 #define	TEMP_HYSTERESIS		20
 #define	TEMP_RESIDENCY_TIME	60
 
-<<<<<<< HEAD:mendel/machine.h
 // --------------------------------------------------------------------------
 // you shouldn't need to edit something below this line
-=======
-#define	STEPS_PER_MM_E						((uint32_t) ((E_STEPS_PER_REV * EXTRUDER_NOZZLE_DIAMETER / EXTRUDER_SHAFT_RADIUS / PI / EXTRUDER_INLET_DIAMETER) + 0.5))
->>>>>>> mendel-triffid:machine.h
 
 // same as above with 25.4 scale factor
 #define	STEPS_PER_IN_X		((uint32_t) ((25.4 * STEPS_PER_MM_X) + 0.5))
diff --git a/temp.c b/temp.c
index 00f65bd..c1310b9 100644
--- a/temp.c
+++ b/temp.c
@@ -159,15 +159,11 @@ void temp_print() {
 
 		c = (current_temp & 3) * 25;
 		t = (target_temp & 3) * 25;
-<<<<<<< HEAD:mendel/temp.c
 		#ifdef REPRAP_HOST_COMPATIBILITY
 		sersendf_P(PSTR("T: %u.%u\n"), current_temp >> 2, c);
 		#else
 		sersendf_P(PSTR("T: %u.%u/%u.%u :%u\n"), current_temp >> 2, c, target_temp >> 2, t, temp_residency);
 		#endif
-=======
-		sersendf_P(PSTR("T: %u.%u/%u.%u :%u\n"), current_temp >> 2, c, target_temp >> 2, t, temp_residency);
->>>>>>> mendel-triffid:temp.c
 	}
 }