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

ARM: get home.c in. 

As usual, homing works just fine.
This commit is contained in:
Markus Hitter 2015-08-10 20:56:18 +02:00
parent d753e2ca7f
commit b849e28836
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile-ARM
View File

@ -100,9 +100,9 @@ TARGET = $(PROGRAM).hex
SOURCES = mendel.c cpu.c serial.c sermsg.c sersendf.c delay.c 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 += 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 += 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: # 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 # graycode.c pff.c watchdog.c pff_diskio.c
ifeq ($(MCU), lpc1114) ifeq ($(MCU), lpc1114)

6
gcode_process.c
View File

@ -196,7 +196,6 @@ void process_gcode_command() {
queue_wait(); queue_wait();
#ifndef __ARMEL_NOTYET__
if (next_target.seen_X) { if (next_target.seen_X) {
#if defined X_MIN_PIN #if defined X_MIN_PIN
home_x_negative(); home_x_negative();
@ -226,7 +225,6 @@ void process_gcode_command() {
if (!axisSelected) { if (!axisSelected) {
home(); home();
} }
#endif /* __ARMEL_NOTYET__ */
break; break;
case 90: case 90:
@ -301,7 +299,6 @@ void process_gcode_command() {
//? //?
//? Find the minimum limit of the specified axes by searching for the limit switch. //? Find the minimum limit of the specified axes by searching for the limit switch.
//? //?
#ifndef __ARMEL_NOTYET__
#if defined X_MIN_PIN #if defined X_MIN_PIN
if (next_target.seen_X) if (next_target.seen_X)
home_x_negative(); home_x_negative();
@ -314,7 +311,6 @@ void process_gcode_command() {
if (next_target.seen_Z) if (next_target.seen_Z)
home_z_negative(); home_z_negative();
#endif #endif
#endif /* __ARMEL_NOTYET__ */
break; break;
case 162: case 162:
@ -322,7 +318,6 @@ void process_gcode_command() {
//? //?
//? Find the maximum limit of the specified axes by searching for the limit switch. //? Find the maximum limit of the specified axes by searching for the limit switch.
//? //?
#ifndef __ARMEL_NOTYET__
#if defined X_MAX_PIN #if defined X_MAX_PIN
if (next_target.seen_X) if (next_target.seen_X)
home_x_positive(); home_x_positive();
@ -335,7 +330,6 @@ void process_gcode_command() {
if (next_target.seen_Z) if (next_target.seen_Z)
home_z_positive(); home_z_positive();
#endif #endif
#endif /* __ARMEL_NOTYET__ */
break; break;
// unknown gcode: spit an error // unknown gcode: spit an error