From: Ian Jackson Date: Fri, 10 Aug 2012 16:31:33 +0000 (+0100) Subject: refresh X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b644ce9d870c0f1014e981a50731fe00c794e86f;p=marlin.git refresh --- diff --git a/meta b/meta index 7783533..b6d0359 100644 --- a/meta +++ b/meta @@ -1,14 +1,13 @@ Version: 1 -Previous: dce75fbd2eb07f82f5d7b8422a14a40c3c4328c4 -Head: 71488c39ecb9c2d2fcd9a56a5e9e89ca118bdfe9 +Previous: e2b143a37506a304861d801d66f5c276f01bedd9 +Head: cc7a688bda30b8ffb2b89a4c0546b157f55f57ac Applied: marlin-pde-include-comment-for: 5b815da4d7f0a5bf87fbd2e70286f928e87b4d0d add-to-marlin-gitignore: 79afa80f1a7740edceceb4a4deda713d9b55960e makefile-support-v-1: 5f826531e0328e319ddb53617e4f3ade33537c92 makefile-avr-size: b1f12330781628c6463068489f7f052bf791bf0e motion-control-max-min: fef5e25d43e7d8429283b9e34205172aaa3a6a2f - m206-always-use-homing-homeing: 72e895deb734e65f156210332af659bcf42ea5f1 - refresh-temp: 71488c39ecb9c2d2fcd9a56a5e9e89ca118bdfe9 + m206-always-use-homing-homeing: cc7a688bda30b8ffb2b89a4c0546b157f55f57ac Unapplied: enable-eeprom-settings: 90e370bcce40d48795f310379a556beda3c0b294 eeprom-provide-smaller-code-fo: 0fbea35eb16f424788f2eb30d8a49dd3808f7a73 diff --git a/patches/m206-always-use-homing-homeing b/patches/m206-always-use-homing-homeing index 168e467..ac9763a 100644 --- a/patches/m206-always-use-homing-homeing +++ b/patches/m206-always-use-homing-homeing @@ -1,5 +1,5 @@ Bottom: ff33f6a6b492d6f370c84bddac52ac277dbd0fd9 -Top: d755416e1e02ccf9a60164760460cedc7a2fa44a +Top: 4cb43b29e74c044fc9b498b6787e34b6a3d43e33 Author: Ian Jackson Date: 2012-08-01 21:12:14 +0100 @@ -76,7 +76,7 @@ index 75b57d0..b465d85 100644 // Handling multiple extruders pins diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde -index d471d49..5b00f9c 100644 +index d471d49..a772fa6 100644 --- a/Marlin/Marlin.pde +++ b/Marlin/Marlin.pde @@ -143,6 +143,8 @@ volatile bool feedmultiplychanged=false; @@ -88,28 +88,34 @@ index d471d49..5b00f9c 100644 uint8_t active_extruder = 0; unsigned char FanSpeed=0; -@@ -543,6 +545,20 @@ bool code_seen(char code) +@@ -543,6 +545,26 @@ bool code_seen(char code) return (strchr_pointer != NULL); //Return True if a character was found } -+#define XYZ_CONFIG(type,array,axis) (pgm_read_##type##_near(&array##_P[(axis)])) ++#define DEFINE_PGM_READ_ANY(type, reader) \ ++ static inline float pgm_read_any(const type *p) \ ++ { return pgm_read_##reader##_near(p); } ++ ++#define XYZ_CONFIG(array,axis) (pgm_read_any(&array##_P[(axis)])) +#define XYZ_CONSTS_FROM_CONFIG(type, array, CONFIG) \ +static const PROGMEM type array##_P[3] = { X_##CONFIG, Y_##CONFIG, Z_##CONFIG }; + ++DEFINE_PGM_READ_ANY(float, float); ++ +XYZ_CONSTS_FROM_CONFIG(float, base_min_pos, MIN_POS); +XYZ_CONSTS_FROM_CONFIG(float, base_max_pos, MAX_POS); +XYZ_CONSTS_FROM_CONFIG(float, base_home_pos, HOME_POS); + +static void axis_is_at_home(int axis) { -+ current_position[axis] = XYZ_CONFIG(float, base_home_pos,axis) + add_homeing[axis]; -+ min_pos[axis] = XYZ_CONFIG(float, base_min_pos, axis) + add_homeing[axis]; -+ max_pos[axis] = XYZ_CONFIG(float, base_max_pos, axis) + add_homeing[axis]; ++ current_position[axis] = XYZ_CONFIG(base_home_pos, axis) + add_homeing[axis]; ++ min_pos[axis] = XYZ_CONFIG(base_min_pos, axis) + add_homeing[axis]; ++ max_pos[axis] = XYZ_CONFIG(base_max_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 +580,8 @@ bool code_seen(char code) +@@ -564,8 +586,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();\ \ @@ -120,7 +126,7 @@ index d471d49..5b00f9c 100644 feedrate = 0.0;\ endstops_hit_on_purpose();\ } -@@ -678,8 +694,8 @@ void process_commands() +@@ -678,8 +700,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(); @@ -131,7 +137,7 @@ index d471d49..5b00f9c 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,15 +1560,15 @@ void get_arc_coordinates() +@@ -1544,15 +1566,15 @@ void get_arc_coordinates() void clamp_to_software_endstops(float target[3]) { if (min_software_endstops) { diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 7caf0be..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,42 +0,0 @@ -Bottom: d755416e1e02ccf9a60164760460cedc7a2fa44a -Top: 4cb43b29e74c044fc9b498b6787e34b6a3d43e33 -Author: Ian Jackson -Date: 2012-08-10 17:31:32 +0100 - -Refresh of m206-always-use-homing-homeing - ---- - -diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde -index 5b00f9c..a772fa6 100644 ---- a/Marlin/Marlin.pde -+++ b/Marlin/Marlin.pde -@@ -545,18 +545,24 @@ bool code_seen(char code) - return (strchr_pointer != NULL); //Return True if a character was found - } - --#define XYZ_CONFIG(type,array,axis) (pgm_read_##type##_near(&array##_P[(axis)])) -+#define DEFINE_PGM_READ_ANY(type, reader) \ -+ static inline float pgm_read_any(const type *p) \ -+ { return pgm_read_##reader##_near(p); } -+ -+#define XYZ_CONFIG(array,axis) (pgm_read_any(&array##_P[(axis)])) - #define XYZ_CONSTS_FROM_CONFIG(type, array, CONFIG) \ - static const PROGMEM type array##_P[3] = { X_##CONFIG, Y_##CONFIG, Z_##CONFIG }; - -+DEFINE_PGM_READ_ANY(float, float); -+ - XYZ_CONSTS_FROM_CONFIG(float, base_min_pos, MIN_POS); - XYZ_CONSTS_FROM_CONFIG(float, base_max_pos, MAX_POS); - XYZ_CONSTS_FROM_CONFIG(float, base_home_pos, HOME_POS); - - static void axis_is_at_home(int axis) { -- current_position[axis] = XYZ_CONFIG(float, base_home_pos,axis) + add_homeing[axis]; -- min_pos[axis] = XYZ_CONFIG(float, base_min_pos, axis) + add_homeing[axis]; -- max_pos[axis] = XYZ_CONFIG(float, base_max_pos, axis) + add_homeing[axis]; -+ current_position[axis] = XYZ_CONFIG(base_home_pos, axis) + add_homeing[axis]; -+ min_pos[axis] = XYZ_CONFIG(base_min_pos, axis) + add_homeing[axis]; -+ max_pos[axis] = XYZ_CONFIG(base_max_pos, axis) + add_homeing[axis]; - } - - #define HOMEAXIS(LETTER) \