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

refresh
---

diff --git a/meta b/meta
index 0a0ca44..06a1538 100644
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 014735ce551481d9482ec9b51d49c252310a6f0b
-Head: 72a1be41250167d94523cb022ceebe6de8724ff8
+Previous: b2c0cb3871fce176e64768de5b904bf0c9066e35
+Head: 54328adc5660f884168c99eb86bffe0d4f2192c0
 Applied:
   marlin-pde-include-comment-for: 121f976406e6921f5b511f6dc4882985cf4b4133
   add-to-marlin-gitignore: 6a0fad50983c4fb5b60173ae96a6eb96ae9d4976
@@ -10,8 +10,7 @@ Applied:
   m206-always-use-homing-homeing: b5a83e7c60fcd37ea70396d521924b6c62555feb
   eeprom-provide-smaller-code-fo: 734e4f2645cecfee83e7ac0cb12ffe2a393f5f91
   m206-save-values-in-eeprom: edd3bb378915a4d3e17e3425db249807c73cc223
-  homeaxis-function: 5a7c15269ea9d129642cfd4122704001d3603e04
-  refresh-temp: 72a1be41250167d94523cb022ceebe6de8724ff8
+  homeaxis-function: 54328adc5660f884168c99eb86bffe0d4f2192c0
 Unapplied:
   enable-eeprom-settings: d8e404a6e1984efdaa7ede947fed09a0bcf9051c
 Hidden:
diff --git a/patches/homeaxis-function b/patches/homeaxis-function
index 7b112e1..8224317 100644
--- a/patches/homeaxis-function
+++ b/patches/homeaxis-function
@@ -1,5 +1,5 @@
 Bottom: 52539e835a54ac0f6858a1c830cc03875bec4769
-Top:    f693fc0a7b28acd01a23db82f7889d14d5516822
+Top:    65e89c3d4bc0793f6319f43ce50abe85a5c9509c
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-08 18:30:34 +0100
 
@@ -15,7 +15,7 @@ Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 ---
 
 diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index 9bcbf21..7b24e3b 100644
+index 9bcbf21..b159cb9 100644
 --- a/Marlin/Marlin.pde
 +++ b/Marlin/Marlin.pde
 @@ -552,9 +552,15 @@ bool code_seen(char code)
@@ -70,7 +70,7 @@ index 9bcbf21..7b24e3b 100644
 +#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 const unsigned char doaxis =
++  static PROGMEM const unsigned char doaxis =
 +    HOMEAXIS_DO_BIT(X) | 
 +    HOMEAXIS_DO_BIT(Y) |
 +    HOMEAXIS_DO_BIT(Z);
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index f35ae2a..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: f693fc0a7b28acd01a23db82f7889d14d5516822
-Top:    65e89c3d4bc0793f6319f43ce50abe85a5c9509c
-Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
-Date:   2012-08-09 19:11:01 +0100
-
-Refresh of homeaxis-function
-
----
-
-diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index 7b24e3b..b159cb9 100644
---- a/Marlin/Marlin.pde
-+++ b/Marlin/Marlin.pde
-@@ -574,7 +574,7 @@ 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 const unsigned char doaxis =
-+  static PROGMEM const unsigned char doaxis =
-     HOMEAXIS_DO_BIT(X) | 
-     HOMEAXIS_DO_BIT(Y) |
-     HOMEAXIS_DO_BIT(Z);