From be0af71b2e1734d20139fd802f89b4b80e1eb56b Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Thu, 16 Oct 2014 21:53:08 +0200 Subject: [PATCH] CoreXY: distribute new KINEMATICS definition to all config.h templates. --- config.gen3.h | 13 ++++++++ config.gen6.h | 13 ++++++++ config.gen7-v1.1-v1.3.h | 13 ++++++++ config.gen7-v1.4.h | 13 ++++++++ config.ramps-v1.2.h | 13 ++++++++ config.ramps-v1.3.h | 13 ++++++++ config.sanguinololu-v1.1.h | 13 ++++++++ config.sanguinololu-v1.2.h | 13 ++++++++ config.sanguish.h | 13 ++++++++ config.teensy.h | 13 ++++++++ config.teensypp.h | 57 ++++++++++++++++++++++-------------- testcases/config.h.Profiling | 13 ++++++++ 12 files changed, 178 insertions(+), 22 deletions(-) diff --git a/config.gen3.h b/config.gen3.h index f33f95a..198c53d 100644 --- a/config.gen3.h +++ b/config.gen3.h @@ -45,6 +45,19 @@ #define MOTHERBOARD +/** \def KINEMATICS + + This defines the type of kinematics your printer uses. That's essential! + + Valid values (see dda_kinematics.h): + + KINEMATICS_STRAIGHT Motors move axis directions directly. This is the + traditional type, found in many printers, including + Mendel, Prusa i3, Mendel90, Ormerod, Mantis. +*/ +#define KINEMATICS KINEMATICS_STRAIGHT + + /** \def STEPS_PER_M steps per meter ( = steps per mm * 1000 ) diff --git a/config.gen6.h b/config.gen6.h index d066da8..e22f603 100644 --- a/config.gen6.h +++ b/config.gen6.h @@ -46,6 +46,19 @@ #define MOTHERBOARD +/** \def KINEMATICS + + This defines the type of kinematics your printer uses. That's essential! + + Valid values (see dda_kinematics.h): + + KINEMATICS_STRAIGHT Motors move axis directions directly. This is the + traditional type, found in many printers, including + Mendel, Prusa i3, Mendel90, Ormerod, Mantis. +*/ +#define KINEMATICS KINEMATICS_STRAIGHT + + /** \def STEPS_PER_M steps per meter ( = steps per mm * 1000 ) diff --git a/config.gen7-v1.1-v1.3.h b/config.gen7-v1.1-v1.3.h index fdef074..c1c3dbe 100644 --- a/config.gen7-v1.1-v1.3.h +++ b/config.gen7-v1.1-v1.3.h @@ -52,6 +52,19 @@ #define MOTHERBOARD +/** \def KINEMATICS + + This defines the type of kinematics your printer uses. That's essential! + + Valid values (see dda_kinematics.h): + + KINEMATICS_STRAIGHT Motors move axis directions directly. This is the + traditional type, found in many printers, including + Mendel, Prusa i3, Mendel90, Ormerod, Mantis. +*/ +#define KINEMATICS KINEMATICS_STRAIGHT + + /** \def STEPS_PER_M steps per meter ( = steps per mm * 1000 ) diff --git a/config.gen7-v1.4.h b/config.gen7-v1.4.h index ad8706c..d08d5be 100644 --- a/config.gen7-v1.4.h +++ b/config.gen7-v1.4.h @@ -52,6 +52,19 @@ #define MOTHERBOARD +/** \def KINEMATICS + + This defines the type of kinematics your printer uses. That's essential! + + Valid values (see dda_kinematics.h): + + KINEMATICS_STRAIGHT Motors move axis directions directly. This is the + traditional type, found in many printers, including + Mendel, Prusa i3, Mendel90, Ormerod, Mantis. +*/ +#define KINEMATICS KINEMATICS_STRAIGHT + + /** \def STEPS_PER_M steps per meter ( = steps per mm * 1000 ) diff --git a/config.ramps-v1.2.h b/config.ramps-v1.2.h index 0a312d2..5879fd3 100644 --- a/config.ramps-v1.2.h +++ b/config.ramps-v1.2.h @@ -46,6 +46,19 @@ #define MOTHERBOARD +/** \def KINEMATICS + + This defines the type of kinematics your printer uses. That's essential! + + Valid values (see dda_kinematics.h): + + KINEMATICS_STRAIGHT Motors move axis directions directly. This is the + traditional type, found in many printers, including + Mendel, Prusa i3, Mendel90, Ormerod, Mantis. +*/ +#define KINEMATICS KINEMATICS_STRAIGHT + + /** \def STEPS_PER_M steps per meter ( = steps per mm * 1000 ) diff --git a/config.ramps-v1.3.h b/config.ramps-v1.3.h index 941a818..4e1c3bc 100644 --- a/config.ramps-v1.3.h +++ b/config.ramps-v1.3.h @@ -46,6 +46,19 @@ #define MOTHERBOARD +/** \def KINEMATICS + + This defines the type of kinematics your printer uses. That's essential! + + Valid values (see dda_kinematics.h): + + KINEMATICS_STRAIGHT Motors move axis directions directly. This is the + traditional type, found in many printers, including + Mendel, Prusa i3, Mendel90, Ormerod, Mantis. +*/ +#define KINEMATICS KINEMATICS_STRAIGHT + + /** \def STEPS_PER_M steps per meter ( = steps per mm * 1000 ) diff --git a/config.sanguinololu-v1.1.h b/config.sanguinololu-v1.1.h index 3fb5993..fd95c58 100644 --- a/config.sanguinololu-v1.1.h +++ b/config.sanguinololu-v1.1.h @@ -45,6 +45,19 @@ #define MOTHERBOARD +/** \def KINEMATICS + + This defines the type of kinematics your printer uses. That's essential! + + Valid values (see dda_kinematics.h): + + KINEMATICS_STRAIGHT Motors move axis directions directly. This is the + traditional type, found in many printers, including + Mendel, Prusa i3, Mendel90, Ormerod, Mantis. +*/ +#define KINEMATICS KINEMATICS_STRAIGHT + + /** \def STEPS_PER_M steps per meter ( = steps per mm * 1000 ) diff --git a/config.sanguinololu-v1.2.h b/config.sanguinololu-v1.2.h index 3f6be6e..1db5c5c 100644 --- a/config.sanguinololu-v1.2.h +++ b/config.sanguinololu-v1.2.h @@ -45,6 +45,19 @@ #define MOTHERBOARD +/** \def KINEMATICS + + This defines the type of kinematics your printer uses. That's essential! + + Valid values (see dda_kinematics.h): + + KINEMATICS_STRAIGHT Motors move axis directions directly. This is the + traditional type, found in many printers, including + Mendel, Prusa i3, Mendel90, Ormerod, Mantis. +*/ +#define KINEMATICS KINEMATICS_STRAIGHT + + /** \def STEPS_PER_M steps per meter ( = steps per mm * 1000 ) diff --git a/config.sanguish.h b/config.sanguish.h index b895091..8c0499a 100644 --- a/config.sanguish.h +++ b/config.sanguish.h @@ -52,6 +52,19 @@ #define MOTHERBOARD +/** \def KINEMATICS + + This defines the type of kinematics your printer uses. That's essential! + + Valid values (see dda_kinematics.h): + + KINEMATICS_STRAIGHT Motors move axis directions directly. This is the + traditional type, found in many printers, including + Mendel, Prusa i3, Mendel90, Ormerod, Mantis. +*/ +#define KINEMATICS KINEMATICS_STRAIGHT + + /** \def STEPS_PER_M steps per meter ( = steps per mm * 1000 ) diff --git a/config.teensy.h b/config.teensy.h index b886484..df00c78 100644 --- a/config.teensy.h +++ b/config.teensy.h @@ -46,6 +46,19 @@ #define MOTHERBOARD +/** \def KINEMATICS + + This defines the type of kinematics your printer uses. That's essential! + + Valid values (see dda_kinematics.h): + + KINEMATICS_STRAIGHT Motors move axis directions directly. This is the + traditional type, found in many printers, including + Mendel, Prusa i3, Mendel90, Ormerod, Mantis. +*/ +#define KINEMATICS KINEMATICS_STRAIGHT + + /** \def STEPS_PER_M steps per meter ( = steps per mm * 1000 ) diff --git a/config.teensypp.h b/config.teensypp.h index d088e1e..40c9e94 100644 --- a/config.teensypp.h +++ b/config.teensypp.h @@ -46,6 +46,19 @@ #define MOTHERBOARD +/** \def KINEMATICS + + This defines the type of kinematics your printer uses. That's essential! + + Valid values (see dda_kinematics.h): + + KINEMATICS_STRAIGHT Motors move axis directions directly. This is the + traditional type, found in many printers, including + Mendel, Prusa i3, Mendel90, Ormerod, Mantis. +*/ +#define KINEMATICS KINEMATICS_STRAIGHT + + /** \def STEPS_PER_M steps per meter ( = steps per mm * 1000 ) @@ -258,26 +271,26 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a USB GND GND |-----#####-----| +5V ATX +5SB - ATX PS_ON PWM 27 |b7 ##### b6| 26 PWM* Stepper Enable - PWM 0 |d0 b5| 25 PWM* - PWM 1 |d1 b4| 24 PWM - X_MIN 2 |d2 b3| 23 - Y_MIN 3 |d3 b2| 22 - Z_MIN 4 |d4 * * b1| 21 - 5 |d5 e e b0| 20 - LED 6 |d6 5 4 e7| 19 - 7 |d7 e6| 18 - 8 |e0 | GND - 9 |e1 a4 a0 R| AREF - 10 |c0 a5 a1 f0| 38 A0 - 11 |c1 a6 a2 f1| 39 A1 - 12 |c2 a7 a3 f2| 40 A2 - 13 |c3 f3| 41 A3 - Bed Heat PWM 14 |c4 V G R f4| 42 A4 - Extruder Heat PWM 15 |c5 c n S f5| 43 A5 + ATX PS_ON PWM 27 |b7 ##### b6| 26 PWM* Stepper Enable + PWM 0 |d0 b5| 25 PWM* + PWM 1 |d1 b4| 24 PWM + X_MIN 2 |d2 b3| 23 + Y_MIN 3 |d3 b2| 22 + Z_MIN 4 |d4 * * b1| 21 + 5 |d5 e e b0| 20 + LED 6 |d6 5 4 e7| 19 + 7 |d7 e6| 18 + 8 |e0 | GND + 9 |e1 a4 a0 R| AREF + 10 |c0 a5 a1 f0| 38 A0 + 11 |c1 a6 a2 f1| 39 A1 + 12 |c2 a7 a3 f2| 40 A2 + 13 |c3 f3| 41 A3 + Bed Heat PWM 14 |c4 V G R f4| 42 A4 + Extruder Heat PWM 15 |c5 c n S f5| 43 A5 Fan PWM 16 |c6 c d T f6| 44 A6 Bed TC - 17 |c7 * * * f7| 45 A7 Extruder TC *4.7k *+5 - ----------------- + 17 |c7 * * * f7| 45 A7 Extruder TC *4.7k *+5 + ----------------- Interior E4: 36, INT4 Interior E5: 37, INT5 @@ -287,12 +300,12 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a 29 a1 X_DIR 1 30 a2 Y_STEP 2 31 a3 Y_DIR 3 - 32 a4 Z_STEP 4 + 32 a4 Z_STEP 4 33 a5 Z_DIR 5 34 a6 E_STEP 6 35 a7 E_DIR 7 -* PWM on pins PB5/25/OC1A and PB6/26/OC1B pins would interfere with timer/counter1 for Teacup. +* PWM on pins PB5/25/OC1A and PB6/26/OC1B pins would interfere with timer/counter1 for Teacup. Avoid trying to use these two PWMs, and try to use the other 7 PWMs instead. */ @@ -709,7 +722,7 @@ PWM value for 'off' * OCR4D - PD7 - DIO12 - AIO9 * *~OCRAB - PB5 - DIO14 - AIO7 *** inverse of OCR4B (avoid it) *** * * OCR4B - PB6 - DIO15 - AIO6 * -* +* * For the at90usb1286, timer pin/mappings are as follows * * * * OCR0A - PB7 - DIO27 * diff --git a/testcases/config.h.Profiling b/testcases/config.h.Profiling index 1b4c00b..f551c8c 100644 --- a/testcases/config.h.Profiling +++ b/testcases/config.h.Profiling @@ -52,6 +52,19 @@ #define MOTHERBOARD +/** \def KINEMATICS + + This defines the type of kinematics your printer uses. That's essential! + + Valid values (see dda_kinematics.h): + + KINEMATICS_STRAIGHT Motors move axis directions directly. This is the + traditional type, found in many printers, including + Mendel, Prusa i3, Mendel90, Ormerod, Mantis. +*/ +#define KINEMATICS KINEMATICS_STRAIGHT + + /** \def STEPS_PER_M steps per meter ( = steps per mm * 1000 )