From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 9 Aug 2012 18:04:36 +0000 (+0100)
Subject: refresh
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=79f4a789b1f19524425425b72c88df305315b022;p=marlin.git

refresh
---

diff --git a/meta b/meta
index ca452d7..b957ca8 100644
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: 7b3fb7629e2e86c36ffd4afe005e19e384745077
-Head: 2b09e555095538703fbe843eeb06448d34e67cbc
+Previous: 390ac16e39b5a895976dd0eca74ecff4f29af69d
+Head: b5a83e7c60fcd37ea70396d521924b6c62555feb
 Applied:
   marlin-pde-include-comment-for: 121f976406e6921f5b511f6dc4882985cf4b4133
   add-to-marlin-gitignore: 6a0fad50983c4fb5b60173ae96a6eb96ae9d4976
   makefile-support-v-1: 90c247c0f2f80ca736bb1d43ff738460f0d1a824
   makefile-avr-size: e7ca49239c134da3660d80b1005a9564672d6c6b
   motion-control-max-min: 91d59adf663163ca1d6a8795fc22cfc5c9902dfe
-  m206-always-use-homing-homeing: 198972f885a18d76b2dbcf7e38bf3839c8a3658a
-  refresh-temp: 2b09e555095538703fbe843eeb06448d34e67cbc
+  m206-always-use-homing-homeing: b5a83e7c60fcd37ea70396d521924b6c62555feb
 Unapplied:
   eeprom-provide-smaller-code-fo: 908bebda77f754b762a36f96bc7d938aca4935ba
   m206-save-values-in-eeprom: bbde4ea454248ef02e59183cab6992c5d4331d8c
diff --git a/patches/m206-always-use-homing-homeing b/patches/m206-always-use-homing-homeing
index 004f1ec..52d971a 100644
--- a/patches/m206-always-use-homing-homeing
+++ b/patches/m206-always-use-homing-homeing
@@ -1,5 +1,5 @@
 Bottom: ff33f6a6b492d6f370c84bddac52ac277dbd0fd9
-Top:    8eb77e3bc2adc097741bd8387c5a66999ef1e334
+Top:    c2feea4afd56caea863e82cd486423f93f510614
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-01 21:12:14 +0100
 
@@ -63,7 +63,7 @@ index 75b57d0..b465d85 100644
  
  // Handling multiple extruders pins
 diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index d471d49..e9ebd5c 100644
+index d471d49..be91124 100644
 --- a/Marlin/Marlin.pde
 +++ b/Marlin/Marlin.pde
 @@ -143,6 +143,8 @@ volatile bool feedmultiplychanged=false;
@@ -79,9 +79,9 @@ index d471d49..e9ebd5c 100644
    return (strchr_pointer != NULL);  //Return True if a character was found
  }
  
-+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 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 };
 +
 +static void axis_is_at_home(int axis) {
 +  current_position[axis] = base_home_pos[axis] + add_homeing[axis];
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index a499a4f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,26 +0,0 @@
-Bottom: 8eb77e3bc2adc097741bd8387c5a66999ef1e334
-Top:    c2feea4afd56caea863e82cd486423f93f510614
-Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
-Date:   2012-08-09 19:04:35 +0100
-
-Refresh of m206-always-use-homing-homeing
-
----
-
-diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index e9ebd5c..be91124 100644
---- a/Marlin/Marlin.pde
-+++ b/Marlin/Marlin.pde
-@@ -545,9 +545,9 @@ bool code_seen(char code)
-   return (strchr_pointer != NULL);  //Return True if a character was found
- }
- 
--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 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 };
- 
- static void axis_is_at_home(int axis) {
-   current_position[axis] = base_home_pos[axis] + add_homeing[axis];