From b56af56b07113ea0436eb49d8ff9a074c80edcc3 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2012 01:35:52 +0100 Subject: [PATCH] pop --- meta | 10 +++++----- patches/eeprom-provide-smaller-code-fo | 6 +++--- patches/homeaxis-function | 6 +++--- patches/m206-save-values-in-eeprom | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meta b/meta index f4b328c..53faa1c 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: faea6bd574437ac3e587fc95febe98343faa35a7 -Head: 25b5201aa44df9dbd7af82a8bb1b9c7f65865757 +Previous: a473c2fd5b7f437ed1480734896ad07d359190fe +Head: 050a31d9f4979748f005c1a38eeb9a204881c483 Applied: marlin-pde-include-comment-for: a873541ef6b23100dc6dec15e6195e87cef6fce5 add-to-marlin-gitignore: 71404eef293f1c93ba081a458120b45e5a48f566 @@ -8,9 +8,9 @@ Applied: makefile-avr-size: 3f15b7c7b863abfa2c6cb157a7f220ab9627d776 motion-control-max-min: faccb358508d49d0bef35dc0521043f04508bcc3 m206-always-use-homing-homeing: 25b5201aa44df9dbd7af82a8bb1b9c7f65865757 + eeprom-provide-smaller-code-fo: a31f275d62753d55119658c98c39b59bc5efa8b2 + homeaxis-function: e83a4b447cd8a74d230e57bef4355d91d6b899fe + m206-save-values-in-eeprom: 050a31d9f4979748f005c1a38eeb9a204881c483 Unapplied: - eeprom-provide-smaller-code-fo: d351b9f64286d75dd4ebd4b09ed00ef31008364b - homeaxis-function: 7ff6b3c2e6523f2ac8b030dde0fac52595257339 - m206-save-values-in-eeprom: 5e01a34f57ba24e6685e40688b2649150e25be43 Hidden: enable-eeprom-settings: 4562a2810820a07bd84b55496164b5f4f4858eaa diff --git a/patches/eeprom-provide-smaller-code-fo b/patches/eeprom-provide-smaller-code-fo index 1ccdc7b..77bb2e7 100644 --- a/patches/eeprom-provide-smaller-code-fo +++ b/patches/eeprom-provide-smaller-code-fo @@ -1,5 +1,5 @@ -Bottom: a47c445c515e8480838e04500acc170cc895298e -Top: e8f1ac68845d759fcca286c4e4aa55a20a35f4b2 +Bottom: eaaf908848a4a0cd0e69f559ed75c700974fc20f +Top: 069dc0bcdbc203bf8d7412c0bf24b4c426068088 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 b358400..0355f93 100644 +index c153298..bb7c6f2 100644 --- a/Marlin/Marlin.pde +++ b/Marlin/Marlin.pde @@ -203,6 +203,13 @@ bool Stopped=false; diff --git a/patches/homeaxis-function b/patches/homeaxis-function index 662b011..0b9d141 100644 --- a/patches/homeaxis-function +++ b/patches/homeaxis-function @@ -1,5 +1,5 @@ -Bottom: e8f1ac68845d759fcca286c4e4aa55a20a35f4b2 -Top: 1e45527396d18a734fba0181fbbfbf3709b52c95 +Bottom: 069dc0bcdbc203bf8d7412c0bf24b4c426068088 +Top: 3ab4763ae3deebf76bc615f517ca3bef62175fed Author: Ian Jackson Date: 2012-08-08 18:30:34 +0100 @@ -18,7 +18,7 @@ Signed-off-by: Ian Jackson --- diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde -index 0355f93..fdb1b98 100644 +index bb7c6f2..4f876c2 100644 --- a/Marlin/Marlin.pde +++ b/Marlin/Marlin.pde @@ -557,6 +557,7 @@ bool code_seen(char code) diff --git a/patches/m206-save-values-in-eeprom b/patches/m206-save-values-in-eeprom index b068979..3b23f1b 100644 --- a/patches/m206-save-values-in-eeprom +++ b/patches/m206-save-values-in-eeprom @@ -1,5 +1,5 @@ -Bottom: 1e45527396d18a734fba0181fbbfbf3709b52c95 -Top: 742b5660b5324fd909a5fb552158d585c216b3c1 +Bottom: 3ab4763ae3deebf76bc615f517ca3bef62175fed +Top: f67f47d59b872b4a645e13abb30a1062b014ab83 Author: Ian Jackson Date: 2012-08-01 21:18:08 +0100 -- 2.30.2