0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #3808 from thinkyhead/rc_singlenozzle

Browse source 
SINGLENOZZLE
This commit is contained in:
Scott Lahteine 2016-05-23 15:52:19 -07:00
parent 678cbad76a 0c7c45063b
commit 89e630b2fb
22 changed files with 86 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Marlin/Conditionals.h
View file

@ -539,6 +539,16 @@
#define ARRAY_BY_EXTRUDERS1(v1) ARRAY_BY_EXTRUDERS(v1, v1, v1, v1)
/**
* With SINGLENOZZLE all "extruders" are in the same place
*/
#if ENABLED(SINGLENOZZLE)
#undef EXTRUDER_OFFSET_X
#undef EXTRUDER_OFFSET_Y
#define EXTRUDER_OFFSET_X { 0 }
#define EXTRUDER_OFFSET_Y { 0 }
#endif
/**
* Z_DUAL_ENDSTOPS endstop reassignment
*/

3
Marlin/Configuration.h
View file

@ -120,6 +120,9 @@
// :[1,2,3,4]
#define EXTRUDERS 1
// For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
// For the other hotends it is their distance from the extruder 0 hotend.

4
Marlin/SanityCheck.h
View file

@ -149,7 +149,9 @@
#error "EXTRUDERS must be 1 with Z_DUAL_STEPPER_DRIVERS."
#endif
#endif // EXTRUDERS > 1
#elif ENABLED(SINGLENOZZLE)
#error "SINGLENOZZLE requires 2 or more EXTRUDERS."
#endif
/**
* Limited number of servos

3
Marlin/example_configurations/Felix/Configuration.h
View file

@ -120,6 +120,9 @@
// :[1,2,3,4]
#define EXTRUDERS 1
// For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
// For the other hotends it is their distance from the extruder 0 hotend.

3
Marlin/example_configurations/Felix/DUAL/Configuration.h
View file

@ -120,6 +120,9 @@
// :[1,2,3,4]
#define EXTRUDERS 2
// For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
// For the other hotends it is their distance from the extruder 0 hotend.

3
Marlin/example_configurations/Hephestos/Configuration.h
View file

@ -123,6 +123,9 @@
// :[1,2,3,4]
#define EXTRUDERS 1
// For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
// For the other hotends it is their distance from the extruder 0 hotend.

3
Marlin/example_configurations/Hephestos_2/Configuration.h
View file

@ -120,6 +120,9 @@
// :[1,2,3,4]
#define EXTRUDERS 1
// For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
// For the other hotends it is their distance from the extruder 0 hotend.

3
Marlin/example_configurations/K8200/Configuration.h
View file

@ -127,6 +127,9 @@
// :[1,2,3,4]
#define EXTRUDERS 1
// For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
// For the other hotends it is their distance from the extruder 0 hotend.

3
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View file

@ -120,6 +120,9 @@
// :[1,2,3,4]
#define EXTRUDERS 1
// For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
// For the other hotends it is their distance from the extruder 0 hotend.

3
Marlin/example_configurations/RigidBot/Configuration.h
View file

@ -120,6 +120,9 @@
// :[1,2,3,4]
#define EXTRUDERS 1 // Single extruder. Set to 2 for dual extruders
// For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
// For the other hotends it is their distance from the extruder 0 hotend.

3
Marlin/example_configurations/SCARA/Configuration.h
View file

@ -145,6 +145,9 @@
// :[1,2,3,4]
#define EXTRUDERS 1
// For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
// For the other hotends it is their distance from the extruder 0 hotend.

3
Marlin/example_configurations/TAZ4/Configuration.h
View file

@ -120,6 +120,9 @@
// :[1,2,3,4]
#define EXTRUDERS 1
// For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
// For the other hotends it is their distance from the extruder 0 hotend.

3
Marlin/example_configurations/WITBOX/Configuration.h
View file

@ -123,6 +123,9 @@
// :[1,2,3,4]
#define EXTRUDERS 1
// For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
// For the other hotends it is their distance from the extruder 0 hotend.

3
Marlin/example_configurations/adafruit/ST7565/Configuration.h
View file

@ -120,6 +120,9 @@
// :[1,2,3,4]
#define EXTRUDERS 1
// For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
// For the other hotends it is their distance from the extruder 0 hotend.

3
Marlin/example_configurations/delta/biv2.5/Configuration.h
View file

@ -120,6 +120,9 @@
// :[1,2,3,4]
#define EXTRUDERS 2
// For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
// For the other hotends it is their distance from the extruder 0 hotend.

3
Marlin/example_configurations/delta/generic/Configuration.h
View file

@ -120,6 +120,9 @@
// :[1,2,3,4]
#define EXTRUDERS 1
// For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
// For the other hotends it is their distance from the extruder 0 hotend.

3
Marlin/example_configurations/delta/kossel_mini/Configuration.h
View file

@ -120,6 +120,9 @@
// :[1,2,3,4]
#define EXTRUDERS 1
// For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
// For the other hotends it is their distance from the extruder 0 hotend.

3
Marlin/example_configurations/delta/kossel_pro/Configuration.h
View file

@ -126,6 +126,9 @@
// :[1,2,3,4]
#define EXTRUDERS 1
// For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
// For the other hotends it is their distance from the extruder 0 hotend.

3
Marlin/example_configurations/delta/kossel_xl/Configuration.h
View file

@ -113,6 +113,9 @@
// :[1,2,3,4]
#define EXTRUDERS 1
// For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
// For the other hotends it is their distance from the extruder 0 hotend.

3
Marlin/example_configurations/makibox/Configuration.h
View file

@ -120,6 +120,9 @@
// :[1,2,3,4]
#define EXTRUDERS 1
// For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
// For the other hotends it is their distance from the extruder 0 hotend.

3
Marlin/example_configurations/tvrrug/Round2/Configuration.h
View file

@ -120,6 +120,9 @@
// :[1,2,3,4]
#define EXTRUDERS 1
// For Cyclops or any "multi-extruder" that shares a single nozzle.
//#define SINGLENOZZLE
// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
// For the other hotends it is their distance from the extruder 0 hotend.

22
Marlin/temperature.cpp
View file

@ -417,19 +417,29 @@ float Temperature::get_pid_output(int e) {
pid_output = pTerm[e] + iTerm[e] - dTerm[e];
#if ENABLED(SINGLENOZZLE)
#define _NOZZLE_TEST true
#define _NOZZLE_EXTRUDER active_extruder
#define _CTERM_INDEX 0
#else
#define _NOZZLE_TEST e == active_extruder
#define _NOZZLE_EXTRUDER e
#define _CTERM_INDEX e
#endif
#if ENABLED(PID_ADD_EXTRUSION_RATE)
cTerm[e] = 0;
if (e == active_extruder) {
cTerm[_CTERM_INDEX] = 0;
if (_NOZZLE_TEST) {
long e_position = stepper.position(E_AXIS);
if (e_position > last_position[e]) {
lpq[lpq_ptr++] = e_position - last_position[e];
last_position[e] = e_position;
if (e_position > last_position[_NOZZLE_EXTRUDER]) {
lpq[lpq_ptr++] = e_position - last_position[_NOZZLE_EXTRUDER];
last_position[_NOZZLE_EXTRUDER] = e_position;
}
else {
lpq[lpq_ptr++] = 0;
}
if (lpq_ptr >= lpq_len) lpq_ptr = 0;
cTerm[e] = (lpq[lpq_ptr] / planner.axis_steps_per_unit[E_AXIS]) * PID_PARAM(Kc, e);
cTerm[_CTERM_INDEX] = (lpq[lpq_ptr] / planner.axis_steps_per_unit[E_AXIS]) * PID_PARAM(Kc, e);
pid_output += cTerm[e];
}
#endif //PID_ADD_EXTRUSION_RATE