From b849e2883693aeaa217c89f96f51cc5ca011fc85 Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Mon, 10 Aug 2015 20:56:18 +0200 Subject: [PATCH] ARM: get home.c in. As usual, homing works just fine. --- Makefile-ARM | 4 ++-- gcode_process.c | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Makefile-ARM b/Makefile-ARM index a657a29..3a3c03e 100644 --- a/Makefile-ARM +++ b/Makefile-ARM @@ -100,9 +100,9 @@ TARGET = $(PROGRAM).hex SOURCES = mendel.c cpu.c serial.c sermsg.c sersendf.c delay.c SOURCES += gcode_parse.c gcode_process.c pinio.c timer.c clock.c SOURCES += dda_queue.c dda_maths.c dda_kinematics.c dda.c dda_lookahead.c -SOURCES += analog.c temp.c heater.c +SOURCES += analog.c temp.c heater.c home.c # Sources left: -# home.c crc.c intercom.c debug.c spi.c usb_serial.c +# crc.c intercom.c debug.c spi.c usb_serial.c # graycode.c pff.c watchdog.c pff_diskio.c ifeq ($(MCU), lpc1114) diff --git a/gcode_process.c b/gcode_process.c index 9b737ed..c533d03 100644 --- a/gcode_process.c +++ b/gcode_process.c @@ -196,7 +196,6 @@ void process_gcode_command() { queue_wait(); - #ifndef __ARMEL_NOTYET__ if (next_target.seen_X) { #if defined X_MIN_PIN home_x_negative(); @@ -226,7 +225,6 @@ void process_gcode_command() { if (!axisSelected) { home(); } - #endif /* __ARMEL_NOTYET__ */ break; case 90: @@ -301,7 +299,6 @@ void process_gcode_command() { //? //? Find the minimum limit of the specified axes by searching for the limit switch. //? - #ifndef __ARMEL_NOTYET__ #if defined X_MIN_PIN if (next_target.seen_X) home_x_negative(); @@ -314,7 +311,6 @@ void process_gcode_command() { if (next_target.seen_Z) home_z_negative(); #endif - #endif /* __ARMEL_NOTYET__ */ break; case 162: @@ -322,7 +318,6 @@ void process_gcode_command() { //? //? Find the maximum limit of the specified axes by searching for the limit switch. //? - #ifndef __ARMEL_NOTYET__ #if defined X_MAX_PIN if (next_target.seen_X) home_x_positive(); @@ -335,7 +330,6 @@ void process_gcode_command() { if (next_target.seen_Z) home_z_positive(); #endif - #endif /* __ARMEL_NOTYET__ */ break; // unknown gcode: spit an error