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

refresh
---

diff --git a/meta b/meta
index fe35ba4..a843157 100644
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: cc6953857f737f04bda47d2787b2001a4402cc5f
-Head: 905e3d7296746e11a8551d6d491e6c7d0bc5a166
+Previous: 282324293f0537f259596e0f64647c1883dd1960
+Head: 957e966d2d5fb1884adb1f982ad01d39d547eb36
 Applied:
   marlin-pde-include-comment-for: a873541ef6b23100dc6dec15e6195e87cef6fce5
   add-to-marlin-gitignore: 71404eef293f1c93ba081a458120b45e5a48f566
   makefile-support-v-1: 0c35facc946fda47b18b3d28b7d9e832b6c41ae6
   makefile-avr-size: 3f15b7c7b863abfa2c6cb157a7f220ab9627d776
   motion-control-max-min: faccb358508d49d0bef35dc0521043f04508bcc3
-  m206-always-use-homing-homeing: 25b5201aa44df9dbd7af82a8bb1b9c7f65865757
-  refresh-temp: 905e3d7296746e11a8551d6d491e6c7d0bc5a166
+  m206-always-use-homing-homeing: 957e966d2d5fb1884adb1f982ad01d39d547eb36
 Unapplied:
   eeprom-provide-smaller-code-fo: a31f275d62753d55119658c98c39b59bc5efa8b2
   homeaxis-function: e83a4b447cd8a74d230e57bef4355d91d6b899fe
diff --git a/patches/m206-always-use-homing-homeing b/patches/m206-always-use-homing-homeing
index 11162d5..d7919d0 100644
--- a/patches/m206-always-use-homing-homeing
+++ b/patches/m206-always-use-homing-homeing
@@ -1,5 +1,5 @@
 Bottom: 681cec9bc49d48ceecfc6d5e9eff1c4f7f623fc6
-Top:    eaaf908848a4a0cd0e69f559ed75c700974fc20f
+Top:    f97dcd498bdb60ba836284b99c292a52ec1a1656
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-01 21:12:14 +0100
 
@@ -84,7 +84,7 @@ index 75b57d0..b465d85 100644
  
  // Handling multiple extruders pins
 diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index 5268a3d..c153298 100644
+index 5268a3d..d11b51c 100644
 --- a/Marlin/Marlin.pde
 +++ b/Marlin/Marlin.pde
 @@ -143,6 +143,8 @@ volatile bool feedmultiplychanged=false;
@@ -101,7 +101,7 @@ index 5268a3d..c153298 100644
  }
  
 +#define DEFINE_PGM_READ_ANY(type, reader)		\
-+    static inline float pgm_read_any(const type *p)	\
++    static inline type pgm_read_any(const type *p)	\
 +	{ return pgm_read_##reader##_near(p); }
 +
 +DEFINE_PGM_READ_ANY(float,       float);
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 817ef85..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: eaaf908848a4a0cd0e69f559ed75c700974fc20f
-Top:    f97dcd498bdb60ba836284b99c292a52ec1a1656
-Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
-Date:   2012-08-11 01:42:57 +0100
-
-Refresh of m206-always-use-homing-homeing
-
----
-
-diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index c153298..d11b51c 100644
---- a/Marlin/Marlin.pde
-+++ b/Marlin/Marlin.pde
-@@ -546,7 +546,7 @@ bool code_seen(char code)
- }
- 
- #define DEFINE_PGM_READ_ANY(type, reader)		\
--    static inline float pgm_read_any(const type *p)	\
-+    static inline type pgm_read_any(const type *p)	\
- 	{ return pgm_read_##reader##_near(p); }
- 
- DEFINE_PGM_READ_ANY(float,       float);