josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed some mess from moving stuff around

This commit is contained in:
Michael Moon 2010-08-10 14:59:41 +10:00
parent 0b51c1d0ab
commit 883c488107
4 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dda.c
View File

@ -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)

10
gcode.c
View File

@ -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;

4
machine.h
View File

@ -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))

4
temp.c
View File

@ -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
}
}