summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormidopple <mdoppler@gmx.at>2012-03-28 15:37:26 +0200
committermidopple <mdoppler@gmx.at>2012-03-28 15:37:26 +0200
commit2579d9390d9c2a94bf7ab296ebc1c6f539a725a9 (patch)
tree51029a04bbfc88f02ca0962cb16a9ad5a80ed726
parentc3324a234cca095b4db6cd1b2f42278fe41b93c0 (diff)
parent85f61f040ff303fbd88b311bc861fe29b1789234 (diff)
Merge from experimental, thanks to triffid_hunter
-rw-r--r--README2
-rw-r--r--Sprinter/Sprinter.pde13
2 files changed, 7 insertions, 8 deletions
diff --git a/README b/README
index 5d5664d..0100e80 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-The leading developers of Sprinter are currently Kliment and caru, though many others contribute with their patches.
+The leading developers of Sprinter are currently Kliment, caru and midopple, though many others contribute with their patches.
This is a firmware for RAMPS and other reprap single-processor electronics setups. It supports printing from SD card, active heatbed control, and ATmega internal pullups.
diff --git a/Sprinter/Sprinter.pde b/Sprinter/Sprinter.pde
index 229fda7..3cec6a5 100644
--- a/Sprinter/Sprinter.pde
+++ b/Sprinter/Sprinter.pde
@@ -993,6 +993,12 @@ void get_command()
}
+static bool check_endstops = true;
+
+void enable_endstops(bool check)
+{
+ check_endstops = check;
+}
FORCE_INLINE float code_value() { return (strtod(&cmdbuffer[bufindr][strchr_pointer - cmdbuffer[bufindr] + 1], NULL)); }
FORCE_INLINE long code_value_long() { return (strtol(&cmdbuffer[bufindr][strchr_pointer - cmdbuffer[bufindr] + 1], NULL, 10)); }
@@ -2699,8 +2705,6 @@ static bool old_y_max_endstop=false;
static bool old_z_min_endstop=false;
static bool old_z_max_endstop=false;
-static bool check_endstops = true;
-
// __________________________
@@ -2726,11 +2730,6 @@ void st_wake_up()
ENABLE_STEPPER_DRIVER_INTERRUPT();
}
-void enable_endstops(bool check)
-{
- check_endstops = check;
-}
-
FORCE_INLINE unsigned short calc_timer(unsigned short step_rate)
{
unsigned short timer;