From e57959e945b6c107ec4ac5c775a81a6236c909a7 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 10 Aug 2012 17:09:54 +0100 Subject: [PATCH] refresh --- meta | 7 +++---- patches/m206-always-use-homing-homeing | 12 +++++++++++- patches/refresh-temp | 10 ---------- 3 files changed, 14 insertions(+), 15 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index fd833aa..ac98e43 100644 --- a/meta +++ b/meta @@ -1,14 +1,13 @@ Version: 1 -Previous: 8c40777d1c1957283b411ac770d930bb10803871 -Head: 54ecfd0f487782bc3f2614035561dfae674beb91 +Previous: ae7cb468c82834649586cb44cb566deebd0c5adc +Head: 72e895deb734e65f156210332af659bcf42ea5f1 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: aec8ed489bd4ea8411f8297c1ae67db477a26bf5 - refresh-temp: 54ecfd0f487782bc3f2614035561dfae674beb91 + m206-always-use-homing-homeing: 72e895deb734e65f156210332af659bcf42ea5f1 Unapplied: eeprom-provide-smaller-code-fo: e8dc1bb8684120aa0cd81ed49eb995d25ef674a7 homeaxis-function: 656f93b5d2604b6c81d80dea3f7f9a5d23d0dd5a diff --git a/patches/m206-always-use-homing-homeing b/patches/m206-always-use-homing-homeing index a3109f8..168e467 100644 --- a/patches/m206-always-use-homing-homeing +++ b/patches/m206-always-use-homing-homeing @@ -15,7 +15,17 @@ home command. The values set using M206 are now added to the configuration variables [XYZ]_HOME_POS. This is achieved by replacing all uses of [XYZ]_HOME_POS in the code -by [XYZ]_HOME_POS_A which is a macro which includes the adjustment. +by a new home_pos[] which includes the adjustment. We also have to +adjust the uses of [XYZ]_{MIN,MAX}_POS similarly - see below. + + +To allow axis_is_at_home to be written as a function taking an axis +index rather than a macro taking an axis letter, we provide +constant arrays in program memory containing the values of +[XYZ]_{MIN,MAX,HOME}_POS from the compiled-in configuration. + +This is done with some helper macros to deal with the declaration +(XYZ_CONSTS_FROM_CONFIG) and program memory access (XYZ_CONFIG). A question arises: if the M206 offset is set, should this adjustment diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 1889155..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,10 +0,0 @@ -Bottom: d755416e1e02ccf9a60164760460cedc7a2fa44a -Top: d755416e1e02ccf9a60164760460cedc7a2fa44a -Author: Ian Jackson -Date: 2012-08-10 17:07:11 +0100 - -Refresh of m206-always-use-homing-homeing - ---- - - -- 2.30.2