Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support FOAMCUTTER_XYUV with RAMPS #24325

Merged
merged 15 commits into from
Jun 22, 2022
Merged

support FOAMCUTTER_XYUV with RAMPS #24325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
818ace0
support FOAMCUTTER_XYUV with RAMPS
DerAndere1 Jun 10, 2022
6bbf073
fix compilation with more than 3 axes and LCD
DerAndere1 Jun 11, 2022
b49c1ac
try using MSG_MOVE_N, MSG_AMAX_N macros
DerAndere1 Jun 11, 2022
d18b103
fix up static item with index
thinkyhead Jun 18, 2022
b68e8d1
use static item with index
thinkyhead Jun 18, 2022
40e4ce7
update lcd move for string subst
thinkyhead Jun 18, 2022
e892010
move foamcutter pin changes to top
thinkyhead Jun 18, 2022
a94aa89
misc cleanup
thinkyhead Jun 18, 2022
9b97898
add options as standard
thinkyhead Jun 18, 2022
a0155a0
a little more cleanup
thinkyhead Jun 18, 2022
9abd8ea
Merge 'bugfix-2.1.x' into pr/24325
thinkyhead Jun 18, 2022
a6f730d
use a loop
thinkyhead Jun 18, 2022
359d406
more use of MAP
thinkyhead Jun 18, 2022
23ba5a8
Try MAPLIST here
thinkyhead Jun 20, 2022
be20835
Merge branch 'bugfix-2.1.x' into pr/24325
thinkyhead Jun 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Marlin/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,6 +865,13 @@
#define POLAR_SEGMENTS_PER_SECOND 5
#endif

// Enable for an articulated robot (robot arm). Joints are directly mapped to axes (no kinematics).
//#define ARTICULATED_ROBOT_ARM

// For a hot wire cutter with parallel horizontal axes (X, I) where the heights of the two wire
// ends are controlled by parallel axes (Y, J). Joints are directly mapped to axes (no kinematics).
//#define FOAMCUTTER_XYUV

//===========================================================================
//============================== Endstop Settings ===========================
//===========================================================================
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/inc/SanityCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1567,8 +1567,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
/**
* Allow only one kinematic type to be defined
*/
#if MANY(DELTA, MORGAN_SCARA, MP_SCARA, AXEL_TPARA, COREXY, COREXZ, COREYZ, COREYX, COREZX, COREZY, MARKFORGED_XY, MARKFORGED_YX, FOAMCUTTER_XYUV)
#error "Please enable only one of DELTA, MORGAN_SCARA, MP_SCARA, AXEL_TPARA, COREXY, COREXZ, COREYZ, COREYX, COREZX, COREZY, MARKFORGED_XY, MARKFORGED_YX, or FOAMCUTTER_XYUV."
#if MANY(DELTA, MORGAN_SCARA, MP_SCARA, AXEL_TPARA, COREXY, COREXZ, COREYZ, COREYX, COREZX, COREZY, MARKFORGED_XY, MARKFORGED_YX, ARTICULATED_ROBOT_ARM, FOAMCUTTER_XYUV)
#error "Please enable only one of DELTA, MORGAN_SCARA, MP_SCARA, AXEL_TPARA, COREXY, COREXZ, COREYZ, COREYX, COREZX, COREZY, MARKFORGED_XY, MARKFORGED_YX, ARTICULATED_ROBOT_ARM, or FOAMCUTTER_XYUV."
#endif

/**
Expand Down
29 changes: 28 additions & 1 deletion Marlin/src/pins/ramps/pins_RAMPS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,31 @@
#define SERVO3_PIN 4
#endif

//
// Foam Cutter requirements
//

#if ENABLED(FOAMCUTTER_XYUV)
#ifndef MOSFET_C_PIN
#define MOSFET_C_PIN -1
#endif
#if HAS_CUTTER && !defined(SPINDLE_LASER_ENA_PIN) && NUM_SERVOS < 2
#define SPINDLE_LASER_PWM_PIN 8 // Hardware PWM
#endif
#ifndef Z_MIN_PIN
#define Z_MIN_PIN -1
DerAndere1 marked this conversation as resolved.
Show resolved Hide resolved
#endif
#ifndef Z_MAX_PIN
#define Z_MAX_PIN -1
#endif
#ifndef I_STOP_PIN
#define I_STOP_PIN 18
#endif
#ifndef J_STOP_PIN
#define J_STOP_PIN 19
#endif
#endif

//
// Limit Switches
//
Expand Down Expand Up @@ -272,7 +297,9 @@
#if HAS_CUTTER && !defined(SPINDLE_LASER_ENA_PIN)
#if NUM_SERVOS < 2 // Use servo connector if possible
#define SPINDLE_LASER_ENA_PIN 4 // Pullup or pulldown!
#define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
#ifndef SPINDLE_LASER_PWM_PIN
#define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
#endif
#define SPINDLE_DIR_PIN 5
#elif HAS_FREE_AUX2_PINS
#define SPINDLE_LASER_ENA_PIN 40 // Pullup or pulldown!
Expand Down