Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MarlinKimbra
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
MarlinKimbra
Commits
21cdd97f
Commit
21cdd97f
authored
Jan 01, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Delta for configurator tool
parent
c4f77ca4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
33 deletions
+28
-33
Configuration_Delta.h
MarlinKimbra/Configuration_Delta.h
+25
-31
Configuration_Feature.h
MarlinKimbra/Configuration_Feature.h
+3
-2
No files found.
MarlinKimbra/Configuration_Delta.h
View file @
21cdd97f
...
@@ -14,9 +14,9 @@
...
@@ -14,9 +14,9 @@
* - Stepper step logic
* - Stepper step logic
* - Stepper direction
* - Stepper direction
* - Disables axis
* - Disables axis
* - Manual home positions
* - Travel limits
* - Travel limits
* - Axis relative mode
* - Axis relative mode
* - Manual home positions
* - Axis steps per unit
* - Axis steps per unit
* - Axis feedrate
* - Axis feedrate
* - Axis accelleration
* - Axis accelleration
...
@@ -262,6 +262,20 @@
...
@@ -262,6 +262,20 @@
/*****************************************************************************************/
/*****************************************************************************************/
/*****************************************************************************************
******************************** Manual home positions **********************************
*****************************************************************************************/
// The position of the homing switches
#define MANUAL_HOME_POSITIONS // If defined, MANUAL_*_HOME_POS below will be used
#define BED_CENTER_AT_0_0 // If defined, the center of the bed is at (X=0, Y=0)
//Manual homing switch locations:
#define MANUAL_X_HOME_POS 0
#define MANUAL_Y_HOME_POS 0
#define MANUAL_Z_HOME_POS 200 // Distance between nozzle and print surface after homing.
/*****************************************************************************************/
/*****************************************************************************************
/*****************************************************************************************
************************************ Travel limits **************************************
************************************ Travel limits **************************************
*****************************************************************************************
*****************************************************************************************
...
@@ -286,38 +300,21 @@
...
@@ -286,38 +300,21 @@
/*****************************************************************************************/
/*****************************************************************************************/
/*****************************************************************************************
******************************** Manual home positions **********************************
*****************************************************************************************/
// The position of the homing switches
#define MANUAL_HOME_POSITIONS // If defined, MANUAL_*_HOME_POS below will be used
#define BED_CENTER_AT_0_0 // If defined, the center of the bed is at (X=0, Y=0)
//Manual homing switch locations:
#define MANUAL_X_HOME_POS 0
#define MANUAL_Y_HOME_POS 0
#define MANUAL_Z_HOME_POS 200 // Distance between nozzle and print surface after homing.
/*****************************************************************************************/
/*****************************************************************************************
/*****************************************************************************************
******************************* Axis steps per unit *************************************
******************************* Axis steps per unit *************************************
*****************************************************************************************/
*****************************************************************************************/
#define XYZ_STEPS_PER_UNIT 80
// Default steps per unit X, Y, Z, E0...(per extruder)
// Default steps per unit X, Y, Z, E0...(per extruder)
#define DEFAULT_AXIS_STEPS_PER_UNIT {80, 80, 80, 625, 625, 625, 625}
#define DEFAULT_AXIS_STEPS_PER_UNIT {XYZ_STEPS_PER_UNIT, XYZ_STEPS_PER_UNIT, XYZ_STEPS_PER_UNIT, 625, 625, 625, 625}
/*****************************************************************************************/
/*****************************************************************************************/
/*****************************************************************************************
/*****************************************************************************************
********************************** Axis feedrate ****************************************
********************************** Axis feedrate ****************************************
*****************************************************************************************/
*****************************************************************************************/
#define XYZ_MAX_FEEDRATE 500 // (mm/sec)
#define XYZ_MANUAL_FEEDRATE 50 // (mm/min)
// X, Y, Z, E0...(per extruder). (mm/sec)
// X, Y, Z, E0...(per extruder). (mm/sec)
#define DEFAULT_MAX_FEEDRATE {
XYZ_MAX_FEEDRATE, XYZ_MAX_FEEDRATE, XYZ_MAX_FEEDRATE
, 100, 100, 100, 100}
#define DEFAULT_MAX_FEEDRATE {
500, 500, 500
, 100, 100, 100, 100}
// Feedrates for manual moves along X, Y, Z, E from panel
// Feedrates for manual moves along X, Y, Z, E from panel
#define MANUAL_FEEDRATE {
XYZ_MANUAL_FEEDRATE*60, XYZ_MANUAL_FEEDRATE*60, XYZ_MANUAL_FEEDRATE
*60, 60}
#define MANUAL_FEEDRATE {
50*60, 50*60, 50
*60, 60}
#define DEFAULT_MINIMUMFEEDRATE 0.0 // minimum feedrate
#define DEFAULT_MINIMUMFEEDRATE 0.0 // minimum feedrate
#define DEFAULT_MINTRAVELFEEDRATE 0.0
#define DEFAULT_MINTRAVELFEEDRATE 0.0
// Minimum planner junction speed. Sets the default minimum speed the planner plans for at the end
// Minimum planner junction speed. Sets the default minimum speed the planner plans for at the end
...
@@ -330,9 +327,8 @@
...
@@ -330,9 +327,8 @@
/*****************************************************************************************
/*****************************************************************************************
******************************** Axis accelleration *************************************
******************************** Axis accelleration *************************************
*****************************************************************************************/
*****************************************************************************************/
#define XYZ_MAX_ACCELERATION 5000 // (mm/s^2)
// Maximum start speed for accelerated moves. X, Y, Z, E0...(per extruder)
// Maximum start speed for accelerated moves. X, Y, Z, E0...(per extruder)
#define DEFAULT_MAX_ACCELERATION
{XYZ_MAX_ACCELERATION, XYZ_MAX_ACCELERATION, XYZ_MAX_ACCELERATION
, 1000, 1000, 1000, 1000}
#define DEFAULT_MAX_ACCELERATION
{5000, 5000, 5000
, 1000, 1000, 1000, 1000}
// Maximum acceleration in mm/s^2 for retracts E0... (per extruder)
// Maximum acceleration in mm/s^2 for retracts E0... (per extruder)
#define DEFAULT_RETRACT_ACCELERATION {10000, 10000, 10000, 10000}
#define DEFAULT_RETRACT_ACCELERATION {10000, 10000, 10000, 10000}
// X, Y, Z and E* maximum acceleration in mm/s^2 for printing moves
// X, Y, Z and E* maximum acceleration in mm/s^2 for printing moves
...
@@ -360,10 +356,8 @@
...
@@ -360,10 +356,8 @@
/*****************************************************************************************
/*****************************************************************************************
************************************ Homing feedrate ************************************
************************************ Homing feedrate ************************************
*****************************************************************************************/
*****************************************************************************************/
// set the homing speeds (mm/min)
// set the homing speeds (mm/min) X, Y, Z
#define HOMING_XYZ_FEEDRATE 100
#define HOMING_FEEDRATE {100*60, 100*60, 100*60, 0}
#define HOMING_FEEDRATE {HOMING_XYZ_FEEDRATE*60, HOMING_XYZ_FEEDRATE*60, HOMING_XYZ_FEEDRATE*60, 0}
// homing hits the endstop, then retracts by this distance, before it tries to slowly bump again:
// homing hits the endstop, then retracts by this distance, before it tries to slowly bump again:
#define XYZ_HOME_BUMP_MM 5
#define XYZ_HOME_BUMP_MM 5
// Re-Bump Speed Divisor (Divides the Homing Feedrate)
// Re-Bump Speed Divisor (Divides the Homing Feedrate)
...
...
MarlinKimbra/Configuration_Feature.h
View file @
21cdd97f
...
@@ -439,6 +439,7 @@
...
@@ -439,6 +439,7 @@
* Set DONDOLO SERVOPOS E0 angle for E0 extruder *
* Set DONDOLO SERVOPOS E0 angle for E0 extruder *
* Set DONDOLO SERVOPOS E1 angle for E1 extruder *
* Set DONDOLO SERVOPOS E1 angle for E1 extruder *
* Remember set HOTEND OFFSET X Y Z *
* Remember set HOTEND OFFSET X Y Z *
* *
***********************************************************************/
***********************************************************************/
//#define DONDOLO
//#define DONDOLO
#define DONDOLO_SERVO_INDEX 0
#define DONDOLO_SERVO_INDEX 0
...
@@ -977,10 +978,10 @@
...
@@ -977,10 +978,10 @@
* M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily). *
* M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily). *
* M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to. *
* M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to. *
* *
* *
* Uncomment EEPROM_SETTINGS to enable this feature. *
* Uncomment EEPROM SETTINGS to enable this feature. *
* Uncomment EEPROM CHITCHAT to enable EEPROM Serial responses. *
* *
* *
************************************************************************************************************************/
************************************************************************************************************************/
// Uncomment EEPROM_SETTINGS to enable EEPROM support
//#define EEPROM_SETTINGS
//#define EEPROM_SETTINGS
//#define EEPROM_CHITCHAT // Uncomment this to enable EEPROM Serial responses.
//#define EEPROM_CHITCHAT // Uncomment this to enable EEPROM Serial responses.
//#define DISABLE_M503
//#define DISABLE_M503
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment