From: Ian Jackson Date: Fri, 10 Aug 2012 16:41:12 +0000 (+0100) Subject: goto X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=540dbfb0aad2928b6bce322ebce5d2f5f4497b78;p=marlin.git goto --- diff --git a/meta b/meta index 0740884..e3b4ffb 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: e28a3fd2829866bde0acd5c6921dcbf873712f55 -Head: 31068042f1ce0c442be19a8055046f62716403b2 +Previous: c072e81f210a50a592e672ff3f8ffefb589e23c9 +Head: a18cc767374a4f34713ab94fc092449a1422a821 Applied: marlin-pde-include-comment-for: 5b815da4d7f0a5bf87fbd2e70286f928e87b4d0d add-to-marlin-gitignore: 79afa80f1a7740edceceb4a4deda713d9b55960e @@ -8,9 +8,9 @@ Applied: makefile-avr-size: b1f12330781628c6463068489f7f052bf791bf0e motion-control-max-min: fef5e25d43e7d8429283b9e34205172aaa3a6a2f m206-always-use-homing-homeing: 31068042f1ce0c442be19a8055046f62716403b2 + enable-eeprom-settings: 4562a2810820a07bd84b55496164b5f4f4858eaa + eeprom-provide-smaller-code-fo: a18cc767374a4f34713ab94fc092449a1422a821 Unapplied: - enable-eeprom-settings: 8daa65176ac195afeaad4a06c00a97dfff5951fe - eeprom-provide-smaller-code-fo: dcb84ce5f56d58178c15475b0611e12bfa121805 homeaxis-function: 95a1ce0f13945575656e4fbc0c81f0b03c41ac1a m206-save-values-in-eeprom: 94f5db01474efcbab9861266b525673769975493 Hidden: diff --git a/patches/eeprom-provide-smaller-code-fo b/patches/eeprom-provide-smaller-code-fo index 22c3473..dc8022b 100644 --- a/patches/eeprom-provide-smaller-code-fo +++ b/patches/eeprom-provide-smaller-code-fo @@ -1,5 +1,5 @@ -Bottom: 0de6bcfbded554c7e0f24cb559085d479490f841 -Top: d71f3b37e4db1c3205d924c9ac6d7db9c438baa6 +Bottom: ade905244c4ab6ec25fa2d2a2409a15a78d1e8e4 +Top: da29116f21970312595da6db4896c228dace90f1 Author: Ian Jackson Date: 2012-08-04 16:13:25 +0100 @@ -36,7 +36,7 @@ index b465d85..208ac33 100644 //things to write to serial from Programmemory. saves 400 to 2k of RAM. diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde -index a772fa6..54441ea 100644 +index b358400..0355f93 100644 --- a/Marlin/Marlin.pde +++ b/Marlin/Marlin.pde @@ -203,6 +203,13 @@ bool Stopped=false; diff --git a/patches/enable-eeprom-settings b/patches/enable-eeprom-settings index 22a2159..5c63372 100644 --- a/patches/enable-eeprom-settings +++ b/patches/enable-eeprom-settings @@ -1,5 +1,5 @@ -Bottom: 4cb43b29e74c044fc9b498b6787e34b6a3d43e33 -Top: 0de6bcfbded554c7e0f24cb559085d479490f841 +Bottom: a47c445c515e8480838e04500acc170cc895298e +Top: ade905244c4ab6ec25fa2d2a2409a15a78d1e8e4 Author: Ian Jackson Date: 2012-08-08 17:57:15 +0100