zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🩹 Revert extra axis changes

Browse source
This commit is contained in:
Scott Lahteine 2022-07-29 05:30:26 -05:00
parent 8e6aa1b113
commit af6995845c
3 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Marlin/Configuration.h
View file

@ -965,13 +965,6 @@
#define PSI_HOMING_OFFSET 0 #define PSI_HOMING_OFFSET 0
#endif #endif
// Articulated robot (arm). Joints are directly mapped to axes with 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 =========================== //============================== Endstop Settings ===========================
//=========================================================================== //===========================================================================

2
Marlin/src/gcode/temp/M106_M107.cpp
View file

@ -85,8 +85,6 @@ void GcodeSuite::M106() {
if (!got_preset && parser.seenval('S')) if (!got_preset && parser.seenval('S'))
speed = parser.value_ushort(); speed = parser.value_ushort();
TERN_(FOAMCUTTER_XYUV, speed *= 2.55); // Get command in % of max heat
// Set speed, with constraint // Set speed, with constraint
thermalManager.set_fan_speed(pfan, speed); thermalManager.set_fan_speed(pfan, speed);

8
Marlin/src/inc/SanityCheck.h
View file

@ -1490,8 +1490,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#error "CNC_WORKSPACE_PLANES currently requires LINEAR_AXES >= 3" #error "CNC_WORKSPACE_PLANES currently requires LINEAR_AXES >= 3"
#elif ENABLED(DIRECT_STEPPING) && LINEAR_AXES > XYZ #elif ENABLED(DIRECT_STEPPING) && LINEAR_AXES > XYZ
#error "DIRECT_STEPPING currently requires LINEAR_AXES 3" #error "DIRECT_STEPPING currently requires LINEAR_AXES 3"
#elif ENABLED(FOAMCUTTER_XYUV) && LINEAR_AXES < 5 #elif ENABLED(LINEAR_ADVANCE) && HAS_I_AXIS
#error "FOAMCUTTER_XYUV requires LINEAR_AXES >= 5." #error "LINEAR_ADVANCE currently requires LINEAR_AXES <= 3."
#endif #endif
/** /**
@ -1536,8 +1536,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 * 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) #if MANY(DELTA, MORGAN_SCARA, MP_SCARA, AXEL_TPARA, COREXY, COREXZ, COREYZ, COREYX, COREZX, COREZY, MARKFORGED_XY, MARKFORGED_YX)
#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." #error "Please enable only one of DELTA, MORGAN_SCARA, MP_SCARA, AXEL_TPARA, COREXY, COREXZ, COREYZ, COREYX, COREZX, COREZY, MARKFORGED_XY, or MARKFORGED_YX."
#endif #endif
/** /**