From 741c20232382299498d3d369d8987bc594cfe871 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 8 Aug 2012 18:56:49 +0100 Subject: [PATCH] refresh --- meta | 7 +++---- patches/m206-always-use-homing-homeing | 15 ++++++++------- patches/refresh-temp | 23 ----------------------- 3 files changed, 11 insertions(+), 34 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index c499a17..198d36f 100644 --- a/meta +++ b/meta @@ -1,12 +1,11 @@ Version: 1 -Previous: 3af86881722491571b25e94f09d3fc3bce8618bc -Head: 8e0cb32e7da9bebb173a615dd16a2fafa3cddaea +Previous: f88495a20bede155f4e6b9ccef2b4bee59f05cb2 +Head: 41901733783d11dd7fe80267e1c8effa1aa69800 Applied: marlin-pde-include-comment-for: 121f976406e6921f5b511f6dc4882985cf4b4133 add-to-marlin-gitignore: 83dcad520f19d2ea6f1164b9c04e1430b679b3e2 makefile-support-v-1: 3f7781d27a680fa4faeb5d7f38250e4877632ce3 - m206-always-use-homing-homeing: f389e9efa29905ea703de07bd502ed53faa45404 - refresh-temp: 8e0cb32e7da9bebb173a615dd16a2fafa3cddaea + m206-always-use-homing-homeing: 41901733783d11dd7fe80267e1c8effa1aa69800 Unapplied: eeprom-provide-smaller-code-fo: f581408bb7e043193e0a8f9a78e8ded4798edf2b m206-save-values-in-eeprom: 00b6f3342f0b13a7393158546b6f175c013d7fe5 diff --git a/patches/m206-always-use-homing-homeing b/patches/m206-always-use-homing-homeing index 7e815ff..1000cb5 100644 --- a/patches/m206-always-use-homing-homeing +++ b/patches/m206-always-use-homing-homeing @@ -1,5 +1,5 @@ Bottom: eb35f0d7db096a862ee737a5537019f96d6e6f16 -Top: d0d5d048fda009daef93f44a721dcee568ca2308 +Top: 8b41053f51ee51e0877345a8761e69d6bef34c39 Author: Ian Jackson Date: 2012-08-01 21:12:14 +0100 @@ -64,7 +64,7 @@ index 4123634..c8115af 100644 // Handling multiple extruders pins diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde -index f38920b..6158eec 100644 +index f38920b..4abd98b 100644 --- a/Marlin/Marlin.pde +++ b/Marlin/Marlin.pde @@ -143,6 +143,7 @@ volatile bool feedmultiplychanged=false; @@ -75,7 +75,7 @@ index f38920b..6158eec 100644 uint8_t active_extruder = 0; unsigned char FanSpeed=0; -@@ -543,6 +544,14 @@ bool code_seen(char code) +@@ -543,6 +544,15 @@ bool code_seen(char code) return (strchr_pointer != NULL); //Return True if a character was found } @@ -84,13 +84,14 @@ index f38920b..6158eec 100644 + +static void axis_is_at_home(int axis) { + current_position[axis] = base_home_pos[axis] + add_homeing[axis]; -+ min_pos[axis] = base_min_pos[axis] + add_homeing[axis]; ++ min_pos[axis] = base_min_pos[axis]; ++ if (add_homeing[axis] < 0) min_pos[axis] += add_homeing[axis]; +} + #define HOMEAXIS(LETTER) \ if ((LETTER##_MIN_PIN > -1 && LETTER##_HOME_DIR==-1) || (LETTER##_MAX_PIN > -1 && LETTER##_HOME_DIR==1))\ { \ -@@ -564,8 +573,8 @@ bool code_seen(char code) +@@ -564,8 +574,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();\ \ @@ -101,7 +102,7 @@ index f38920b..6158eec 100644 feedrate = 0.0;\ endstops_hit_on_purpose();\ } -@@ -678,8 +687,8 @@ void process_commands() +@@ -678,8 +688,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(); @@ -112,7 +113,7 @@ index f38920b..6158eec 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]; -@@ -1544,9 +1553,9 @@ void get_arc_coordinates() +@@ -1544,9 +1554,9 @@ void get_arc_coordinates() void prepare_move() { if (min_software_endstops) { diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 85f9494..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,23 +0,0 @@ -Bottom: d0d5d048fda009daef93f44a721dcee568ca2308 -Top: 8b41053f51ee51e0877345a8761e69d6bef34c39 -Author: Ian Jackson -Date: 2012-08-08 18:56:48 +0100 - -Refresh of m206-always-use-homing-homeing - ---- - -diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde -index 6158eec..4abd98b 100644 ---- a/Marlin/Marlin.pde -+++ b/Marlin/Marlin.pde -@@ -549,7 +549,8 @@ static const float base_home_pos[3] = { X_HOME_POS, Y_HOME_POS, Z_HOME_POS }; - - static void axis_is_at_home(int axis) { - current_position[axis] = base_home_pos[axis] + add_homeing[axis]; -- min_pos[axis] = base_min_pos[axis] + add_homeing[axis]; -+ min_pos[axis] = base_min_pos[axis]; -+ if (add_homeing[axis] < 0) min_pos[axis] += add_homeing[axis]; - } - - #define HOMEAXIS(LETTER) \ -- 2.30.2