From: Ian Jackson Date: Fri, 10 Aug 2012 16:11:51 +0000 (+0100) Subject: pop X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b512506786391e22e6d8f3ac9f059b3a0273394a;p=marlin.git pop --- diff --git a/meta b/meta index da94c09..ba612fc 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: 542ea623e86871cb20f44ce1d9fcfbfab43ce442 -Head: 72e895deb734e65f156210332af659bcf42ea5f1 +Previous: a51b45e83cb99c8d166838543fd755756d7e25f1 +Head: ab2e48b9e85aa55da357bd6007a4a85dca0082f9 Applied: marlin-pde-include-comment-for: 5b815da4d7f0a5bf87fbd2e70286f928e87b4d0d add-to-marlin-gitignore: 79afa80f1a7740edceceb4a4deda713d9b55960e @@ -8,8 +8,8 @@ Applied: makefile-avr-size: b1f12330781628c6463068489f7f052bf791bf0e motion-control-max-min: fef5e25d43e7d8429283b9e34205172aaa3a6a2f m206-always-use-homing-homeing: 72e895deb734e65f156210332af659bcf42ea5f1 + eeprom-provide-smaller-code-fo: ab2e48b9e85aa55da357bd6007a4a85dca0082f9 Unapplied: - eeprom-provide-smaller-code-fo: e8dc1bb8684120aa0cd81ed49eb995d25ef674a7 homeaxis-function: 656f93b5d2604b6c81d80dea3f7f9a5d23d0dd5a m206-save-values-in-eeprom: 94f5db01474efcbab9861266b525673769975493 Hidden: diff --git a/patches/eeprom-provide-smaller-code-fo b/patches/eeprom-provide-smaller-code-fo index 54c637d..6ed9759 100644 --- a/patches/eeprom-provide-smaller-code-fo +++ b/patches/eeprom-provide-smaller-code-fo @@ -1,5 +1,5 @@ -Bottom: ad98c0229e8c7036d7c4e6d12cdf7a7e26176d84 -Top: 1bd17dcdb2e343f4dbb916d3f957e80d5a871447 +Bottom: d755416e1e02ccf9a60164760460cedc7a2fa44a +Top: 98e986968e4608c4841331fa155138cb63e883a6 Author: Ian Jackson Date: 2012-08-04 16:13:25 +0100 @@ -36,7 +36,7 @@ index b465d85..8e833d1 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 05e7d5a..ba8b3b8 100644 +index 5b00f9c..5d11177 100644 --- a/Marlin/Marlin.pde +++ b/Marlin/Marlin.pde @@ -203,6 +203,13 @@ bool Stopped=false;