From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 9 Aug 2012 17:51:07 +0000 (+0100)
Subject: refresh (create temporary patch)
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=70fbe90f837256b70a346c90f490128ace2df9e2;p=marlin.git

refresh (create temporary patch)
---

diff --git a/meta b/meta
index 9951d56..a9c21d1 100644
--- a/meta
+++ b/meta
@@ -1,12 +1,13 @@
 Version: 1
-Previous: a01c814969b3e5da8a62e3b424269769df74c041
-Head: af1f4753e869f8ec16732c12218d81db2677ecfd
+Previous: 00b1be63e219d75377ed0e66ff53af386f4080f7
+Head: c8943f5e4f92fc13339e47af5d3bd993ee571cd3
 Applied:
   marlin-pde-include-comment-for: 121f976406e6921f5b511f6dc4882985cf4b4133
   add-to-marlin-gitignore: 83dcad520f19d2ea6f1164b9c04e1430b679b3e2
   makefile-support-v-1: 3f7781d27a680fa4faeb5d7f38250e4877632ce3
   motion-control-max-min: 44befa5f783994f92f7c6fd39b7f581cf174d9d4
   m206-always-use-homing-homeing: af1f4753e869f8ec16732c12218d81db2677ecfd
+  refresh-temp: c8943f5e4f92fc13339e47af5d3bd993ee571cd3
 Unapplied:
   eeprom-provide-smaller-code-fo: 908bebda77f754b762a36f96bc7d938aca4935ba
   m206-save-values-in-eeprom: bbde4ea454248ef02e59183cab6992c5d4331d8c
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 0000000..1616553
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,49 @@
+Bottom: c0a7e719fd15d0dc282dd2ab568458d732ca3e7a
+Top:    16ad8a282254b0756127083d40ec2dfcb7909072
+Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
+Date:   2012-08-09 18:51:07 +0100
+
+Refresh of m206-always-use-homing-homeing
+
+---
+
+diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
+index 11e1afa..b465d85 100644
+--- a/Marlin/Marlin.h
++++ b/Marlin/Marlin.h
+@@ -185,6 +185,7 @@ extern bool axis_relative_modes[];
+ extern float current_position[NUM_AXIS] ;
+ extern float add_homeing[3];
+ extern float min_pos[3];
++extern float max_pos[3];
+ extern unsigned char FanSpeed;
+ 
+ // Handling multiple extruders pins
+diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
+index e980174..e9ebd5c 100644
+--- a/Marlin/Marlin.pde
++++ b/Marlin/Marlin.pde
+@@ -144,6 +144,7 @@ volatile int extrudemultiply=100; //100->1 200->2
+ float current_position[NUM_AXIS] = { 0.0, 0.0, 0.0, 0.0 };
+ float add_homeing[3]={0,0,0};
+ float min_pos[3] = { X_MIN_POS, Y_MIN_POS, Z_MIN_POS };
++float max_pos[3] = { X_MAX_POS, Y_MAX_POS, Z_MAX_POS };
+ uint8_t active_extruder = 0;
+ unsigned char FanSpeed=0;
+ 
+@@ -545,12 +546,15 @@ bool code_seen(char code)
+ }
+ 
+ static const float base_min_pos[3] = { X_MIN_POS, Y_MIN_POS, Z_MIN_POS };
++static const float base_max_pos[3] = { X_MAX_POS, Y_MAX_POS, Z_MAX_POS };
+ static const float base_home_pos[3] = { X_HOME_POS, Y_HOME_POS, Z_HOME_POS };
+ 
+ static void axis_is_at_home(int axis) {
+   current_position[axis] = base_home_pos[axis] + add_homeing[axis];
+   min_pos[axis] = base_min_pos[axis];
++  max_pos[axis] = base_max_pos[axis];
+   if (add_homeing[axis] < 0) min_pos[axis] += add_homeing[axis];
++  else max_pos[axis] += add_homeing[axis];
+ }
+ 
+ #define HOMEAXIS(LETTER) \