From d05bfe736ce65fbbd55c4d23c454068dbe5ac629 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 8 Aug 2012 18:04:09 +0100 Subject: [PATCH] pop --- meta | 8 ++++---- patches/m206-save-values-in-eeprom | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta b/meta index 8a85f8c..930c60e 100644 --- a/meta +++ b/meta @@ -1,12 +1,12 @@ Version: 1 -Previous: 01288797db61d168a55551921803a6ef3bc80abf -Head: c7ddc4372e205d4fe6a85249f8824228def4381c +Previous: 970788628a7f57c57efc90ea20ec869fe6c241cb +Head: ca20799f9a1c6b666354a941f8062e67712b453c 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 Unapplied: - eeprom-provide-smaller-code-fo: 903e2fa63f1dee6b029b76bb6749d412c1cc3219 - m206-save-values-in-eeprom: a7ff3675bdb6149f684e0e3a15c1a594ea2db815 Hidden: diff --git a/patches/m206-save-values-in-eeprom b/patches/m206-save-values-in-eeprom index 44a9072..eec085f 100644 --- a/patches/m206-save-values-in-eeprom +++ b/patches/m206-save-values-in-eeprom @@ -1,5 +1,5 @@ -Bottom: 5fa92f577560a8def7ed5e4eb27c03563022c045 -Top: ddd160b1afdf3c41ea68ceeb8d9d125c06186447 +Bottom: e801707aef83979bce33278501a19bbc200940b9 +Top: 37ba7d9cdd7b85de30e642096693d975ea82b111 Author: Ian Jackson Date: 2012-08-01 21:18:08 +0100 @@ -17,7 +17,7 @@ Signed-off-by: Ian Jackson --- diff --git a/Marlin/EEPROMwrite.h b/Marlin/EEPROMwrite.h -index 96791c7..baacc8d 100644 +index 96e2ec9..ce30826 100644 --- a/Marlin/EEPROMwrite.h +++ b/Marlin/EEPROMwrite.h @@ -38,7 +38,7 @@ template int EEPROM_readAnything(int &ee, T& value) @@ -37,9 +37,9 @@ index 96791c7..baacc8d 100644 #ifdef PIDTEMP EEPROM_writeAnything(i,Kp); EEPROM_writeAnything(i,Ki); -@@ -128,6 +129,13 @@ inline void EEPROM_printSettings() - SERIAL_ECHOPAIR_DOUBLE(" Z" ,max_z_jerk); - SERIAL_ECHOPAIR_DOUBLE(" E" ,max_e_jerk); +@@ -119,6 +120,13 @@ inline void EEPROM_printSettings() + SERIAL_ECHOPAIR(" Z" ,max_z_jerk); + SERIAL_ECHOPAIR(" E" ,max_e_jerk); SERIAL_ECHOLN(""); + SERIAL_ECHO_START; + SERIAL_ECHOLNPGM("Home offset (mm):"); @@ -51,7 +51,7 @@ index 96791c7..baacc8d 100644 #ifdef PIDTEMP SERIAL_ECHO_START; SERIAL_ECHOLNPGM("PID settings:"); -@@ -162,6 +170,7 @@ inline void EEPROM_RetrieveSettings(bool def=false) +@@ -153,6 +161,7 @@ inline void EEPROM_RetrieveSettings(bool def=false) EEPROM_readAnything(i,max_xy_jerk); EEPROM_readAnything(i,max_z_jerk); EEPROM_readAnything(i,max_e_jerk); @@ -59,7 +59,7 @@ index 96791c7..baacc8d 100644 #ifndef PIDTEMP float Kp,Ki,Kd; #endif -@@ -192,6 +201,7 @@ inline void EEPROM_RetrieveSettings(bool def=false) +@@ -183,6 +192,7 @@ inline void EEPROM_RetrieveSettings(bool def=false) max_xy_jerk=DEFAULT_XYJERK; max_z_jerk=DEFAULT_ZJERK; max_e_jerk=DEFAULT_EJERK; -- 2.30.2