summaryrefslogtreecommitdiff
path: root/Tonokip_Firmware
diff options
context:
space:
mode:
authorSam Ward <sam@tolon.com.au>2011-05-12 13:07:52 +0800
committerSam Ward <sam@tolon.com.au>2011-05-12 13:07:52 +0800
commit3b3af86ec6a68ebd7ed79f6ddf5026d8c7c6aa5e (patch)
tree914d24f12a8bd9424abf7e368b6b76c5b6bb598a /Tonokip_Firmware
parent838eb694109cf62a0bc2b9236596abc623f354a7 (diff)
Fixed prepare_move function prototype and inlining
Diffstat (limited to 'Tonokip_Firmware')
-rw-r--r--Tonokip_Firmware/Tonokip_Firmware.h1
-rw-r--r--Tonokip_Firmware/Tonokip_Firmware.pde2
2 files changed, 2 insertions, 1 deletions
diff --git a/Tonokip_Firmware/Tonokip_Firmware.h b/Tonokip_Firmware/Tonokip_Firmware.h
index 65bfccd..4e3c7ea 100644
--- a/Tonokip_Firmware/Tonokip_Firmware.h
+++ b/Tonokip_Firmware/Tonokip_Firmware.h
@@ -17,6 +17,7 @@ void FlushSerialRequestResend();
void ClearToSend();
void get_coordinates();
+void prepare_move();
void linear_move(unsigned long x_steps_remaining, unsigned long y_steps_remaining, unsigned long z_steps_remaining, unsigned long e_steps_remaining);
void disable_x();
void disable_y();
diff --git a/Tonokip_Firmware/Tonokip_Firmware.pde b/Tonokip_Firmware/Tonokip_Firmware.pde
index d5b3b41..d4a28d9 100644
--- a/Tonokip_Firmware/Tonokip_Firmware.pde
+++ b/Tonokip_Firmware/Tonokip_Firmware.pde
@@ -832,7 +832,7 @@ inline void get_coordinates()
}
}
-void prepare_move()
+inline void prepare_move()
{
//Find direction
if(destination_x >= current_x) direction_x=1;