pop (CONFLICT)

diff --git a/meta b/meta
index f36292c92fb77e13bf84904dbed570f7e656d8cd..cc1090816dd8fa50022221a8411c680cd4551567 100644 (file)
--- a/meta
+++ b/meta
@@ -1,5 +1,5 @@
 Version: 1
-Previous: fff3e358b3a5c9742993fb78d949714144f1e3db
+Previous: ac724a24a64717981d6de01f0a7498883bbf393d
 Head: cbcc7aa58ad53444050f92de0db19bfd10d1e99c
 Applied:
   marlin-pde-include-comment-for: 5b815da4d7f0a5bf87fbd2e70286f928e87b4d0d
@@ -10,7 +10,7 @@ Applied:
   m206-always-use-homing-homeing: 72e895deb734e65f156210332af659bcf42ea5f1
   enable-eeprom-settings: 90e370bcce40d48795f310379a556beda3c0b294
   eeprom-provide-smaller-code-fo: 0fbea35eb16f424788f2eb30d8a49dd3808f7a73
+  homeaxis-function: cbcc7aa58ad53444050f92de0db19bfd10d1e99c
 Unapplied:
-  homeaxis-function: 656f93b5d2604b6c81d80dea3f7f9a5d23d0dd5a
   m206-save-values-in-eeprom: 94f5db01474efcbab9861266b525673769975493
 Hidden:

diff --git a/patches/homeaxis-function b/patches/homeaxis-function
index 0ed05998e2fe8995780a053b162be6293a3092db..a25b34b36d998d8ef27a95fed812e2944fbf3e9a 100644 (file)
--- a/patches/homeaxis-function
+++ b/patches/homeaxis-function
@@ -1,5 +1,5 @@
-Bottom: 1bd17dcdb2e343f4dbb916d3f957e80d5a871447
-Top:    fa16ca3345dfe76c421399a5a8cf3be7cb1b42ff
+Bottom: 36e31553d776fe0068394d49b207ca63596f8dbb
+Top:    36e31553d776fe0068394d49b207ca63596f8dbb
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-08 18:30:34 +0100
 
@@ -14,93 +14,4 @@ Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 
 ---
 
-diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index ba8b3b8..c93825f 100644
---- a/Marlin/Marlin.pde
-+++ b/Marlin/Marlin.pde
-@@ -552,9 +552,15 @@ bool code_seen(char code)
-   return (strchr_pointer != NULL);  //Return True if a character was found
- }
- 
--static const PROGMEM float base_min_pos[3] = { X_MIN_POS, Y_MIN_POS, Z_MIN_POS };
--static const PROGMEM float base_max_pos[3] = { X_MAX_POS, Y_MAX_POS, Z_MAX_POS };
--static const PROGMEM float base_home_pos[3] = { X_HOME_POS, Y_HOME_POS, Z_HOME_POS };
-+#define XYZ_CONSTS_FROM_CONFIG(type, array, CONFIG) \
-+static const PROGMEM type array[3] = { X_##CONFIG, Y_##CONFIG, Z_##CONFIG };
-+
-+XYZ_CONSTS_FROM_CONFIG(float, base_min_pos,    MIN_POS);
-+XYZ_CONSTS_FROM_CONFIG(float, base_max_pos,    MAX_POS);
-+XYZ_CONSTS_FROM_CONFIG(float, base_home_pos,   HOME_POS);
-+XYZ_CONSTS_FROM_CONFIG(float, max_length,      MAX_LENGTH);
-+XYZ_CONSTS_FROM_CONFIG(float, home_retract_mm, HOME_RETRACT_MM);
-+XYZ_CONSTS_FROM_CONFIG(signed char, home_dir,  HOME_DIR);
- 
- static void axis_is_at_home(int axis) {
-   current_position[axis] = base_home_pos[axis] + add_homeing[axis];
-@@ -562,32 +568,41 @@ static void axis_is_at_home(int axis) {
-   max_pos[axis] = base_max_pos[axis] + add_homeing[axis];
- }
- 
--#define HOMEAXIS(LETTER) \
--  if ((LETTER##_MIN_PIN > -1 && LETTER##_HOME_DIR==-1) || (LETTER##_MAX_PIN > -1 && LETTER##_HOME_DIR==1))\
--    { \
--    current_position[LETTER##_AXIS] = 0; \
--    plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); \
--    destination[LETTER##_AXIS] = 1.5 * LETTER##_MAX_LENGTH * LETTER##_HOME_DIR; \
--    feedrate = homing_feedrate[LETTER##_AXIS]; \
--    plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder); \
--    st_synchronize();\
--    \
--    current_position[LETTER##_AXIS] = 0;\
--    plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);\
--    destination[LETTER##_AXIS] = -LETTER##_HOME_RETRACT_MM * LETTER##_HOME_DIR;\
--    plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder); \
--    st_synchronize();\
--    \
--    destination[LETTER##_AXIS] = 2*LETTER##_HOME_RETRACT_MM * LETTER##_HOME_DIR;\
--    feedrate = homing_feedrate[LETTER##_AXIS]/2 ;  \
--    plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder); \
--    st_synchronize();\
--    \
--    axis_is_at_home(LETTER##_AXIS);                                   \
--    destination[LETTER##_AXIS] = current_position[LETTER##_AXIS]; \
--    feedrate = 0.0;\
--    endstops_hit_on_purpose();\
-+static void homeaxis(int axis) {
-+#define HOMEAXIS_DO_BIT(LETTER) \
-+  ((LETTER##_MIN_PIN > -1 && LETTER##_HOME_DIR==-1) || (LETTER##_MAX_PIN > -1 && LETTER##_HOME_DIR==1) ? 1 << LETTER##_AXIS : 0)
-+
-+  static PROGMEM const unsigned char doaxis =
-+    HOMEAXIS_DO_BIT(X) | 
-+    HOMEAXIS_DO_BIT(Y) |
-+    HOMEAXIS_DO_BIT(Z);
-+
-+  if (doaxis & (1<<axis)) {
-+    current_position[axis] = 0;
-+    plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
-+    destination[axis] = 1.5 * max_length[axis] * home_dir[axis];
-+    feedrate = homing_feedrate[axis];
-+    plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder);
-+    st_synchronize();
-+   
-+    current_position[axis] = 0;
-+    plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
-+    destination[axis] = -home_retract_mm[axis] * home_dir[axis];
-+    plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder);
-+    st_synchronize();
-+   
-+    destination[axis] = 2*home_retract_mm[axis] * home_dir[axis];
-+    feedrate = homing_feedrate[axis]/2 ; 
-+    plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder);
-+    st_synchronize();
-+   
-+    axis_is_at_home(axis);                                    
-+    destination[axis] = current_position[axis];
-+    feedrate = 0.0;
-+    endstops_hit_on_purpose();
-   }
-+}
-+#define HOMEAXIS(LETTER) homeaxis(LETTER##_AXIS)
- 
- void process_commands()
- {
+