chiark / gitweb /
refresh (create temporary patch)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2012 00:42:57 +0000 (01:42 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2012 00:42:57 +0000 (01:42 +0100)
meta
patches/refresh-temp [new file with mode: 0644]

diff --git a/meta b/meta
index bc94703b7ae58b5b292d9da8a5c398f4e95a5adc..fe35ba49c13354aaf317f055233f8c241ae649ec 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 7d764af3dc9910cadf6ee4ae576d6ccb536fbef1
-Head: 25b5201aa44df9dbd7af82a8bb1b9c7f65865757
+Previous: cc6953857f737f04bda47d2787b2001a4402cc5f
+Head: 905e3d7296746e11a8551d6d491e6c7d0bc5a166
 Applied:
   marlin-pde-include-comment-for: a873541ef6b23100dc6dec15e6195e87cef6fce5
   add-to-marlin-gitignore: 71404eef293f1c93ba081a458120b45e5a48f566
@@ -8,6 +8,7 @@ Applied:
   makefile-avr-size: 3f15b7c7b863abfa2c6cb157a7f220ab9627d776
   motion-control-max-min: faccb358508d49d0bef35dc0521043f04508bcc3
   m206-always-use-homing-homeing: 25b5201aa44df9dbd7af82a8bb1b9c7f65865757
+  refresh-temp: 905e3d7296746e11a8551d6d491e6c7d0bc5a166
 Unapplied:
   eeprom-provide-smaller-code-fo: a31f275d62753d55119658c98c39b59bc5efa8b2
   homeaxis-function: e83a4b447cd8a74d230e57bef4355d91d6b899fe
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..817ef85
--- /dev/null
@@ -0,0 +1,22 @@
+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);