sink

diff --git a/meta b/meta
index f5ae15a5f07cd2bafc2c40a467f47a397207680f..38fce6715490ef3f2ee669b30da9898616eec5b9 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,11 @@
 Version: 1
-Previous: ef60e95ca0dc026af16e31b718d6d731b4c07bc3
-Head: 78a2b7d92b8ee452c22db01b3236ad16047533c2
+Previous: c136cc953e6d6a2ad0b426d4385f6dcaca572e6b
+Head: caf745544fb082b72aff44878592fcc28aa75b22
 Applied:
-  makefile-support-v-1: 59de9f09a248a5af04203378018ff95f86ff092d
-  m206-always-use-homing-homeing: 704568f265fbb370658a153f8240239dd776f5cc
-  eeprom-provide-smaller-code-fo: 3f690257c022b5c6945f7d2f070c89ee1c8275c8
-  marlin-pde-include-comment-for: 78a2b7d92b8ee452c22db01b3236ad16047533c2
+  marlin-pde-include-comment-for: 2449e9fec7791468f9221832c67d6d0327818a6b
+  makefile-support-v-1: e5bcc15b1d07b2f3a237ce92d6c0a4071e2d73e7
+  m206-always-use-homing-homeing: 1bd54c199294003feab6949f597ef39244ebdd3e
+  eeprom-provide-smaller-code-fo: caf745544fb082b72aff44878592fcc28aa75b22
 Unapplied:
   enable-eeprom-settings: bb3eec4aa60cbfc88238166d067cc513f3dd7ad4
   m206-save-values-in-eeprom: a7ff3675bdb6149f684e0e3a15c1a594ea2db815

diff --git a/patches/eeprom-provide-smaller-code-fo b/patches/eeprom-provide-smaller-code-fo
index 5e4a8a69abf9e32a1e5bf15ca376cb0532d4a464..e0fc8d74180cfec274801dbcae98a88cbe07de50 100644 (file)
--- a/patches/eeprom-provide-smaller-code-fo
+++ b/patches/eeprom-provide-smaller-code-fo
@@ -1,5 +1,5 @@
-Bottom: 1b669c311107d1dd3a4b83e5e099e5155e4f27a4
-Top:    f71276ce0bb76f5c8c5c3c6cdb0be4e72eb00f48
+Bottom: b5069f0e7634f4a689b665b3bb196be5cefac23e
+Top:    2ef6975e6b8b4864d232a7e9c1fadb3d2a6bb3b3
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-04 16:13:25 +0100
 
@@ -41,10 +41,10 @@ index c8115af..a78d2ee 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 9f8e98c..d0c8d79 100644
+index 6158eec..1dec2b8 100644
 --- a/Marlin/Marlin.pde
 +++ b/Marlin/Marlin.pde
-@@ -200,6 +200,13 @@ bool Stopped=false;
+@@ -202,6 +202,13 @@ bool Stopped=false;
  
  void get_arc_coordinates();
  

diff --git a/patches/m206-always-use-homing-homeing b/patches/m206-always-use-homing-homeing
index 6ff4b46b185a90efcbb64b6bd178db677ace31e3..ca410b617be2523f7c0568d9450c1ce302c9aced 100644 (file)
--- a/patches/m206-always-use-homing-homeing
+++ b/patches/m206-always-use-homing-homeing
@@ -1,5 +1,5 @@
-Bottom: 2863265553f0918e2af709f6fb8a01097102cf69
-Top:    1b669c311107d1dd3a4b83e5e099e5155e4f27a4
+Bottom: a7ceab8ef30dc49cd9931d571fb7ce62ef1fd67d
+Top:    b5069f0e7634f4a689b665b3bb196be5cefac23e
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-01 21:12:14 +0100
 
@@ -41,10 +41,10 @@ index 4123634..c8115af 100644
  
  // Handling multiple extruders pins
 diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index 73f1f41..9f8e98c 100644
+index f38920b..6158eec 100644
 --- a/Marlin/Marlin.pde
 +++ b/Marlin/Marlin.pde
-@@ -141,6 +141,7 @@ volatile bool feedmultiplychanged=false;
+@@ -143,6 +143,7 @@ volatile bool feedmultiplychanged=false;
  volatile int extrudemultiply=100; //100->1 200->2
  float current_position[NUM_AXIS] = { 0.0, 0.0, 0.0, 0.0 };
  float add_homeing[3]={0,0,0};
@@ -52,7 +52,7 @@ index 73f1f41..9f8e98c 100644
  uint8_t active_extruder = 0;
  unsigned char FanSpeed=0;
  
-@@ -541,6 +542,14 @@ bool code_seen(char code)
+@@ -543,6 +544,14 @@ bool code_seen(char code)
    return (strchr_pointer != NULL);  //Return True if a character was found
  }
  
@@ -67,7 +67,7 @@ index 73f1f41..9f8e98c 100644
  #define HOMEAXIS(LETTER) \
    if ((LETTER##_MIN_PIN > -1 && LETTER##_HOME_DIR==-1) || (LETTER##_MAX_PIN > -1 && LETTER##_HOME_DIR==1))\
      { \
-@@ -562,8 +571,8 @@ bool code_seen(char code)
+@@ -564,8 +573,8 @@ bool code_seen(char code)
      plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder); \
      st_synchronize();\
      \
@@ -78,7 +78,7 @@ index 73f1f41..9f8e98c 100644
      feedrate = 0.0;\
      endstops_hit_on_purpose();\
    }
-@@ -676,8 +685,8 @@ void process_commands()
+@@ -678,8 +687,8 @@ void process_commands()
          plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder);
          st_synchronize();
      
@@ -89,7 +89,7 @@ index 73f1f41..9f8e98c 100644
          plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
          destination[X_AXIS] = current_position[X_AXIS];
          destination[Y_AXIS] = current_position[Y_AXIS];
-@@ -1542,9 +1551,9 @@ void get_arc_coordinates()
+@@ -1544,9 +1553,9 @@ void get_arc_coordinates()
  void prepare_move()
  {
    if (min_software_endstops) {

diff --git a/patches/makefile-support-v-1 b/patches/makefile-support-v-1
index 7d0e426f342ff2a75910e4620f30bc34755b3fa8..ad385149eaa2a544b2e0f6fd4760eeb285c8b56d 100644 (file)
--- a/patches/makefile-support-v-1
+++ b/patches/makefile-support-v-1
@@ -1,5 +1,5 @@
-Bottom: c655a797e3b5192e7f839c7c53285901284a2b4b
-Top:    2863265553f0918e2af709f6fb8a01097102cf69
+Bottom: ea0dec1cbcd304d9d1750032f70194ceeb751dd6
+Top:    a7ceab8ef30dc49cd9931d571fb7ce62ef1fd67d
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-01 21:31:38 +0100
 

diff --git a/patches/marlin-pde-include-comment-for b/patches/marlin-pde-include-comment-for
index 7864ff9c3063a1604b137712c1f1eb347e779efe..73739996ceefe04d8241f458fc2f6042c99911f2 100644 (file)
--- a/patches/marlin-pde-include-comment-for
+++ b/patches/marlin-pde-include-comment-for
@@ -1,5 +1,5 @@
-Bottom: f71276ce0bb76f5c8c5c3c6cdb0be4e72eb00f48
-Top:    2ef6975e6b8b4864d232a7e9c1fadb3d2a6bb3b3
+Bottom: c655a797e3b5192e7f839c7c53285901284a2b4b
+Top:    ea0dec1cbcd304d9d1750032f70194ceeb751dd6
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-08 17:56:39 +0100
 
@@ -14,7 +14,7 @@ Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 ---
 
 diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
-index d0c8d79..1dec2b8 100644
+index 73f1f41..f38920b 100644
 --- a/Marlin/Marlin.pde
 +++ b/Marlin/Marlin.pde
 @@ -1,3 +1,5 @@