refresh

diff --git a/meta b/meta
index 6019f6cbde58c5e50ed4037c59ca00e8dc2588d9..04e5b548ed8907a6d18e898673cd23654f8afe6a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 0a1239b71e0240d307336162055064b9c27ab58c
-Head: 9181b5e7aa1f54d7589cda0c4aa996b447971822
+Previous: 1ed32c343aece75c1648a88abd9e82b0d4b29b60
+Head: 95a1ce0f13945575656e4fbc0c81f0b03c41ac1a
 Applied:
   marlin-pde-include-comment-for: 5b815da4d7f0a5bf87fbd2e70286f928e87b4d0d
   add-to-marlin-gitignore: 79afa80f1a7740edceceb4a4deda713d9b55960e
@@ -10,8 +10,7 @@ Applied:
   m206-always-use-homing-homeing: ef16d2c9bd8d55b96310ef873aad725f7974f968
   enable-eeprom-settings: 8daa65176ac195afeaad4a06c00a97dfff5951fe
   eeprom-provide-smaller-code-fo: dcb84ce5f56d58178c15475b0611e12bfa121805
-  homeaxis-function: e5e85eec1259f4132edf1a7a7fed165b08787167
-  refresh-temp: 9181b5e7aa1f54d7589cda0c4aa996b447971822
+  homeaxis-function: 95a1ce0f13945575656e4fbc0c81f0b03c41ac1a
 Unapplied:
   m206-save-values-in-eeprom: 94f5db01474efcbab9861266b525673769975493
 Hidden:

diff --git a/patches/homeaxis-function b/patches/homeaxis-function
index 13eb4b564b4af2b9f55333f47db59442d97f810c..db884d5a1cf7a0d81397387dc98a0fdb3e74dc17 100644 (file)
--- a/patches/homeaxis-function
+++ b/patches/homeaxis-function
@@ -1,5 +1,5 @@
 Bottom: d71f3b37e4db1c3205d924c9ac6d7db9c438baa6
-Top:    5b63d3f0e8ea3e9716f33f1f484e948ed713723f
+Top:    5fa5beaa03b93876dd6ab612fe616ff24197e851
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-08 18:30:34 +0100
 
@@ -15,10 +15,15 @@ Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 ---
 
 diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index 54441ea..63501a8 100644
+index 54441ea..32c6ec8 100644
 --- a/Marlin/Marlin.pde
 +++ b/Marlin/Marlin.pde
-@@ -565,6 +565,9 @@ DEFINE_PGM_READ_ANY(float,       float);
+@@ -561,10 +561,14 @@ bool code_seen(char code)
+ static const PROGMEM type array##_P[3] = { X_##CONFIG, Y_##CONFIG, Z_##CONFIG };
+ 
+ DEFINE_PGM_READ_ANY(float,       float);
++DEFINE_PGM_READ_ANY(signed char, byte);
+ 
  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);
@@ -28,7 +33,7 @@ index 54441ea..63501a8 100644
  
  static void axis_is_at_home(int axis) {
    current_position[axis] = XYZ_CONFIG(base_home_pos, axis) + add_homeing[axis];
-@@ -572,32 +575,41 @@ static void axis_is_at_home(int axis) {
+@@ -572,32 +576,41 @@ static void axis_is_at_home(int axis) {
    max_pos[axis] =          XYZ_CONFIG(base_max_pos, axis) + add_homeing[axis];
  }
  
@@ -69,14 +74,14 @@ index 54441ea..63501a8 100644
 +  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 * XYZ_CONFIG(float,max_length,axis) * XYZ_CONFIG(byte,home_dir,axis);
++    destination[axis] = 1.5 * XYZ_CONFIG(max_length,axis) * XYZ_CONFIG(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] = -XYZ_CONFIG(float,home_retract_mm,axis) * home_dir[axis];
++    destination[axis] = -XYZ_CONFIG(home_retract_mm,axis) * XYZ_CONFIG(home_dir,axis);
 +    plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder);
 +    st_synchronize();
 +   

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index da368a1..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,37 +0,0 @@
-Bottom: 5b63d3f0e8ea3e9716f33f1f484e948ed713723f
-Top:    5fa5beaa03b93876dd6ab612fe616ff24197e851
-Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
-Date:   2012-08-10 17:34:47 +0100
-
-Refresh of homeaxis-function
-
----
-
-diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index 63501a8..32c6ec8 100644
---- a/Marlin/Marlin.pde
-+++ b/Marlin/Marlin.pde
-@@ -561,6 +561,7 @@ bool code_seen(char code)
- static const PROGMEM type array##_P[3] = { X_##CONFIG, Y_##CONFIG, Z_##CONFIG };
- 
- DEFINE_PGM_READ_ANY(float,       float);
-+DEFINE_PGM_READ_ANY(signed char, byte);
- 
- XYZ_CONSTS_FROM_CONFIG(float, base_min_pos,    MIN_POS);
- XYZ_CONSTS_FROM_CONFIG(float, base_max_pos,    MAX_POS);
-@@ -587,14 +588,14 @@ static void homeaxis(int axis) {
-   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 * XYZ_CONFIG(float,max_length,axis) * XYZ_CONFIG(byte,home_dir,axis);
-+    destination[axis] = 1.5 * XYZ_CONFIG(max_length,axis) * XYZ_CONFIG(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] = -XYZ_CONFIG(float,home_retract_mm,axis) * home_dir[axis];
-+    destination[axis] = -XYZ_CONFIG(home_retract_mm,axis) * XYZ_CONFIG(home_dir,axis);
-     plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder);
-     st_synchronize();