forksand
/
marlin-lulzbot-laser
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adjustments for prototype lifting-nozzle extruder.

Browse Source
master
Marcio Teixeira 8 years ago
parent 37ea8d17df
commit 82a423154a
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File

7
Marlin/Conditionals_LulzBot.h
Unescape View File

@ -726,7 +726,12 @@
// 16 chars max ^^^^^^^^^^^^^^^ // 16 chars max ^^^^^^^^^^^^^^^
#define LULZBOT_M115_EXTRUDER_TYPE "ServoMcStruder" #define LULZBOT_M115_EXTRUDER_TYPE "ServoMcStruder"
#define LULZBOT_NUM_SERVOS 1 #define LULZBOT_NUM_SERVOS 1
#define LULZBOT_SWITCHING_EXTRUDER_NO_REVERSE
#define LULZBOT_SWITCHING_EXTRUDER
#define LULZBOT_SWITCHING_NOZZLE #define LULZBOT_SWITCHING_NOZZLE
#define LULZBOT_SWITCHING_SERVO_ANGLES { 0, 67 }
#undef LULZBOT_E_STEPS
#define LULZBOT_E_STEPS 420
#endif /* TOOLHEAD_Devel_ServoDual */ #endif /* TOOLHEAD_Devel_ServoDual */
#if defined(TOOLHEAD_Yellowfin_DualExtruderV3) || defined(TOOLHEAD_Devel_ServoDual) #if defined(TOOLHEAD_Yellowfin_DualExtruderV3) || defined(TOOLHEAD_Devel_ServoDual)
@ -1019,7 +1024,7 @@
// default steps per unit for LulzBot TAZ. // default steps per unit for LulzBot TAZ.
#if defined(LULZBOT_DISTINCT_E_FACTORS) && LULZBOT_EXTRUDERS == 2 #if defined(LULZBOT_DISTINCT_E_FACTORS) && LULZBOT_EXTRUDERS == 2 && !defined(LULZBOT_SWITCHING_EXTRUDER)
#define LULZBOT_DEFAULT_AXIS_STEPS_PER_UNIT {LULZBOT_XY_STEPS,LULZBOT_XY_STEPS,LULZBOT_Z_STEPS,LULZBOT_E_STEPS,LULZBOT_E_STEPS} #define LULZBOT_DEFAULT_AXIS_STEPS_PER_UNIT {LULZBOT_XY_STEPS,LULZBOT_XY_STEPS,LULZBOT_Z_STEPS,LULZBOT_E_STEPS,LULZBOT_E_STEPS}
#else #else
#define LULZBOT_DEFAULT_AXIS_STEPS_PER_UNIT {LULZBOT_XY_STEPS,LULZBOT_XY_STEPS,LULZBOT_Z_STEPS,LULZBOT_E_STEPS} #define LULZBOT_DEFAULT_AXIS_STEPS_PER_UNIT {LULZBOT_XY_STEPS,LULZBOT_XY_STEPS,LULZBOT_Z_STEPS,LULZBOT_E_STEPS}

10
Marlin/Configuration.h
Unescape View File

@ -161,10 +161,12 @@
#endif #endif
// A dual extruder that uses a single stepper motor // A dual extruder that uses a single stepper motor
//#define SWITCHING_EXTRUDER #if defined(LULZBOT_SWITCHING_EXTRUDER)
#define SWITCHING_EXTRUDER
#endif
#if ENABLED(SWITCHING_EXTRUDER) #if ENABLED(SWITCHING_EXTRUDER)
#define SWITCHING_EXTRUDER_SERVO_NR 0 #define SWITCHING_EXTRUDER_SERVO_NR 0
#define SWITCHING_EXTRUDER_SERVO_ANGLES { 0, 90 } // Angles for E0, E1[, E2, E3] #define SWITCHING_EXTRUDER_SERVO_ANGLES LULZBOT_SWITCHING_SERVO_ANGLES // Angles for E0, E1[, E2, E3]
#if EXTRUDERS > 3 #if EXTRUDERS > 3
#define SWITCHING_EXTRUDER_E23_SERVO_NR 1 #define SWITCHING_EXTRUDER_E23_SERVO_NR 1
#endif #endif
@ -172,11 +174,11 @@
// A dual-nozzle that uses a servomotor to raise/lower one of the nozzles // A dual-nozzle that uses a servomotor to raise/lower one of the nozzles
#if defined(LULZBOT_SWITCHING_NOZZLE) #if defined(LULZBOT_SWITCHING_NOZZLE)
#define SWITCHING_NOZZLE #define SWITCHING_NOZZLE LULZBOT_SWITCHING_NOZZLE
#endif #endif
#if ENABLED(SWITCHING_NOZZLE) #if ENABLED(SWITCHING_NOZZLE)
#define SWITCHING_NOZZLE_SERVO_NR 0 #define SWITCHING_NOZZLE_SERVO_NR 0
#define SWITCHING_NOZZLE_SERVO_ANGLES { 0, 90 } // Angles for E0, E1 #define SWITCHING_NOZZLE_SERVO_ANGLES LULZBOT_SWITCHING_SERVO_ANGLES // Angles for E0, E1
//#define HOTEND_OFFSET_Z { 0.0, 0.0 } //#define HOTEND_OFFSET_Z { 0.0, 0.0 }
#endif #endif

6
Marlin/stepper_indirection.h
Unescape View File

@ -416,7 +416,11 @@
* Extruder indirection for the single E axis * Extruder indirection for the single E axis
*/ */
#if ENABLED(SWITCHING_EXTRUDER) #if ENABLED(SWITCHING_EXTRUDER)
#if EXTRUDERS == 2 #if defined(LULZBOT_SWITCHING_EXTRUDER_NO_REVERSE)
#define E_STEP_WRITE(v) E0_STEP_WRITE(v)
#define NORM_E_DIR() E0_DIR_WRITE( INVERT_E0_DIR)
#define REV_E_DIR() E0_DIR_WRITE(!INVERT_E0_DIR)
#elif EXTRUDERS == 2
#define E_STEP_WRITE(v) E0_STEP_WRITE(v) #define E_STEP_WRITE(v) E0_STEP_WRITE(v)
#define NORM_E_DIR() E0_DIR_WRITE(current_block->active_extruder ? INVERT_E0_DIR : !INVERT_E0_DIR) #define NORM_E_DIR() E0_DIR_WRITE(current_block->active_extruder ? INVERT_E0_DIR : !INVERT_E0_DIR)
#define REV_E_DIR() E0_DIR_WRITE(current_block->active_extruder ? !INVERT_E0_DIR : INVERT_E0_DIR) #define REV_E_DIR() E0_DIR_WRITE(current_block->active_extruder ? !INVERT_E0_DIR : INVERT_E0_DIR)

Write Preview
Loading…
Cancel
Save