From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 8 Aug 2012 17:13:09 +0000 (+0100)
Subject: refresh
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c8d25435cec40ea2313eeb77d2d78af17aba0483;p=marlin.git

refresh
---

diff --git a/meta b/meta
index 7cbbd05..acacbfd 100644
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: 6dd68aa0c759e7c157fc1f6f0a0bb24fbb07e75e
-Head: ce2ff5440dd97eafca463582d39702e1dddefae0
+Previous: 137f58e1b7b170073814d31ebd10d1fb583b63ac
+Head: 1ea282dc0ff2eba5e864ecaae075a42600788661
 Applied:
   enable-eeprom-settings: 69566454491f7b7df675ad052f508f8e638e723d
   marlin-pde-include-comment-for: 096a27b572271c36dd71ee76cd7783e4c51dd5d5
   makefile-support-v-1: 4b98b847ffa96793fd76bf092b3c567fa77befe3
   m206-always-use-homing-homeing: c7ddc4372e205d4fe6a85249f8824228def4381c
   eeprom-provide-smaller-code-fo: 4361c56748aadf86df770de046a3e582c2d09207
-  m206-save-values-in-eeprom: ca20799f9a1c6b666354a941f8062e67712b453c
-  refresh-temp: ce2ff5440dd97eafca463582d39702e1dddefae0
+  m206-save-values-in-eeprom: 1ea282dc0ff2eba5e864ecaae075a42600788661
 Unapplied:
 Hidden:
diff --git a/patches/m206-save-values-in-eeprom b/patches/m206-save-values-in-eeprom
index eec085f..8afa877 100644
--- a/patches/m206-save-values-in-eeprom
+++ b/patches/m206-save-values-in-eeprom
@@ -1,5 +1,5 @@
 Bottom: e801707aef83979bce33278501a19bbc200940b9
-Top:    37ba7d9cdd7b85de30e642096693d975ea82b111
+Top:    2242de901f3337ed82c3135751ef06b0bb76da81
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-01 21:18:08 +0100
 
@@ -17,7 +17,7 @@ Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 ---
 
 diff --git a/Marlin/EEPROMwrite.h b/Marlin/EEPROMwrite.h
-index 96e2ec9..ce30826 100644
+index 96e2ec9..f077160 100644
 --- a/Marlin/EEPROMwrite.h
 +++ b/Marlin/EEPROMwrite.h
 @@ -38,7 +38,7 @@ template <class T> int EEPROM_readAnything(int &ee, T& value)
@@ -44,9 +44,9 @@ index 96e2ec9..ce30826 100644
 +    SERIAL_ECHO_START;
 +      SERIAL_ECHOLNPGM("Home offset (mm):");
 +      SERIAL_ECHO_START;
-+      SERIAL_ECHOPAIR_DOUBLE("  M206 X",add_homeing[0] );
-+      SERIAL_ECHOPAIR_DOUBLE(" Y" ,add_homeing[1] );
-+      SERIAL_ECHOPAIR_DOUBLE(" Z" ,add_homeing[2] );
++      SERIAL_ECHOPAIR("  M206 X",add_homeing[0] );
++      SERIAL_ECHOPAIR(" Y" ,add_homeing[1] );
++      SERIAL_ECHOPAIR(" Z" ,add_homeing[2] );
 +      SERIAL_ECHOLN("");
      #ifdef PIDTEMP
        SERIAL_ECHO_START;
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index a61dd79..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,26 +0,0 @@
-Bottom: 37ba7d9cdd7b85de30e642096693d975ea82b111
-Top:    2242de901f3337ed82c3135751ef06b0bb76da81
-Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
-Date:   2012-08-08 18:13:09 +0100
-
-Refresh of m206-save-values-in-eeprom
-
----
-
-diff --git a/Marlin/EEPROMwrite.h b/Marlin/EEPROMwrite.h
-index ce30826..f077160 100644
---- a/Marlin/EEPROMwrite.h
-+++ b/Marlin/EEPROMwrite.h
-@@ -123,9 +123,9 @@ inline void EEPROM_printSettings()
-     SERIAL_ECHO_START;
-       SERIAL_ECHOLNPGM("Home offset (mm):");
-       SERIAL_ECHO_START;
--      SERIAL_ECHOPAIR_DOUBLE("  M206 X",add_homeing[0] );
--      SERIAL_ECHOPAIR_DOUBLE(" Y" ,add_homeing[1] );
--      SERIAL_ECHOPAIR_DOUBLE(" Z" ,add_homeing[2] );
-+      SERIAL_ECHOPAIR("  M206 X",add_homeing[0] );
-+      SERIAL_ECHOPAIR(" Y" ,add_homeing[1] );
-+      SERIAL_ECHOPAIR(" Z" ,add_homeing[2] );
-       SERIAL_ECHOLN("");
-     #ifdef PIDTEMP
-       SERIAL_ECHO_START;