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
1d9887f5
Commit
1d9887f5
authored
Jun 02, 2016
by
Stefy Lanza (nextime / spora )
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Re-add configs
parent
7c04d49e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
23 deletions
+23
-23
Configuration_Cartesian.h
MK/Configuration_Cartesian.h
+15
-15
Configuration_Feature.h
MK/Configuration_Feature.h
+7
-7
Configuration_Store.cpp
MK/Configuration_Store.cpp
+1
-1
No files found.
MK/Configuration_Cartesian.h
View file @
1d9887f5
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
* Displayed in the LCD "Ready" message. *
* Displayed in the LCD "Ready" message. *
* *
* *
*****************************************************************************************/
*****************************************************************************************/
#define CUSTOM_MACHINE_NAME "
K40 Laser cutter
"
#define CUSTOM_MACHINE_NAME "
Prusa I3
"
/*****************************************************************************************/
/*****************************************************************************************/
...
@@ -156,7 +156,7 @@
...
@@ -156,7 +156,7 @@
* Change (or reverse the motor connector) if an axis goes the wrong way. *
* Change (or reverse the motor connector) if an axis goes the wrong way. *
* *
* *
*****************************************************************************************/
*****************************************************************************************/
#define INVERT_X_DIR
tru
e
#define INVERT_X_DIR
fals
e
#define INVERT_Y_DIR false
#define INVERT_Y_DIR false
#define INVERT_Z_DIR false
#define INVERT_Z_DIR false
#define INVERT_E0_DIR false
#define INVERT_E0_DIR false
...
@@ -178,7 +178,7 @@
...
@@ -178,7 +178,7 @@
#define DISABLE_X false
#define DISABLE_X false
#define DISABLE_Y false
#define DISABLE_Y false
#define DISABLE_Z false
#define DISABLE_Z false
#define DISABLE_E
tru
e // For all extruder
#define DISABLE_E
fals
e // For all extruder
// Disable only inactive extruder and keep active extruder enabled
// Disable only inactive extruder and keep active extruder enabled
#define DISABLE_INACTIVE_EXTRUDER false
#define DISABLE_INACTIVE_EXTRUDER false
/*****************************************************************************************/
/*****************************************************************************************/
...
@@ -191,11 +191,11 @@
...
@@ -191,11 +191,11 @@
* Travel limits after homing (units are in mm) *
* Travel limits after homing (units are in mm) *
* *
* *
*****************************************************************************************/
*****************************************************************************************/
#define X_MAX_POS
337
#define X_MAX_POS
200
#define X_MIN_POS 0
#define X_MIN_POS 0
#define Y_MAX_POS 2
3
0
#define Y_MAX_POS 2
0
0
#define Y_MIN_POS 0
#define Y_MIN_POS 0
#define Z_MAX_POS
75
#define Z_MAX_POS
200
#define Z_MIN_POS 0
#define Z_MIN_POS 0
#define E_MIN_POS 0
#define E_MIN_POS 0
/*****************************************************************************************/
/*****************************************************************************************/
...
@@ -388,7 +388,7 @@
...
@@ -388,7 +388,7 @@
******************************* Axis steps per unit *************************************
******************************* Axis steps per unit *************************************
*****************************************************************************************/
*****************************************************************************************/
// 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 {
78.7401, 157.4802, 6047.2440, 0, 0, 0, 0
}
#define DEFAULT_AXIS_STEPS_PER_UNIT {
80, 80, 3200, 625, 625, 625, 625
}
/*****************************************************************************************/
/*****************************************************************************************/
...
@@ -396,7 +396,7 @@
...
@@ -396,7 +396,7 @@
********************************** Axis feedrate ****************************************
********************************** Axis feedrate ****************************************
*****************************************************************************************/
*****************************************************************************************/
// X, Y, Z, E0...(per extruder). (mm/sec)
// X, Y, Z, E0...(per extruder). (mm/sec)
#define DEFAULT_MAX_FEEDRATE {
500, 500, 100, 25, 0, 0,
0}
#define DEFAULT_MAX_FEEDRATE {
300, 300, 2, 100, 100, 100, 10
0}
#define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
#define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
#define DEFAULT_MINIMUMFEEDRATE 0.0 // minimum feedrate
#define DEFAULT_MINIMUMFEEDRATE 0.0 // minimum feedrate
#define DEFAULT_MINTRAVELFEEDRATE 0.0
#define DEFAULT_MINTRAVELFEEDRATE 0.0
...
@@ -411,13 +411,13 @@
...
@@ -411,13 +411,13 @@
******************************** Axis accelleration *************************************
******************************** Axis accelleration *************************************
*****************************************************************************************/
*****************************************************************************************/
// 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 {
2000, 2
000, 50, 1000, 1000, 1000, 1000}
#define DEFAULT_MAX_ACCELERATION {
3000, 3
000, 50, 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 {
2000, 2000, 2000, 2
000}
#define DEFAULT_RETRACT_ACCELERATION {
10000, 10000, 10000, 10
000}
// 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
#define DEFAULT_ACCELERATION
2
000
#define DEFAULT_ACCELERATION
3
000
// X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
// X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
#define DEFAULT_TRAVEL_ACCELERATION
2
000
#define DEFAULT_TRAVEL_ACCELERATION
3
000
/*****************************************************************************************/
/*****************************************************************************************/
...
@@ -459,9 +459,9 @@
...
@@ -459,9 +459,9 @@
* For the other hotends it is their distance from the hotend 0. *
* For the other hotends it is their distance from the hotend 0. *
* *
* *
*****************************************************************************************/
*****************************************************************************************/
//
#define HOTEND_OFFSET_X {0.0, 0.0, 0.0, 0.0} // (in mm) for each hotend, offset of the hotend on the X axis
#define HOTEND_OFFSET_X {0.0, 0.0, 0.0, 0.0} // (in mm) for each hotend, offset of the hotend on the X axis
//
#define HOTEND_OFFSET_Y {0.0, 0.0, 0.0, 0.0} // (in mm) for each hotend, offset of the hotend on the Y axis
#define HOTEND_OFFSET_Y {0.0, 0.0, 0.0, 0.0} // (in mm) for each hotend, offset of the hotend on the Y axis
//
#define HOTEND_OFFSET_Z {0.0, 0.0, 0.0, 0.0} // (in mm) for each hotend, offset of the hotend on the Z axis
#define HOTEND_OFFSET_Z {0.0, 0.0, 0.0, 0.0} // (in mm) for each hotend, offset of the hotend on the Z axis
/*****************************************************************************************/
/*****************************************************************************************/
...
...
MK/Configuration_Feature.h
View file @
1d9887f5
...
@@ -149,7 +149,7 @@
...
@@ -149,7 +149,7 @@
* This prevents dangerous Extruder moves. *
* This prevents dangerous Extruder moves. *
* *
* *
***********************************************************************/
***********************************************************************/
//
#define PREVENT_DANGEROUS_EXTRUDE
#define PREVENT_DANGEROUS_EXTRUDE
#define EXTRUDE_MINTEMP 170 // degC
#define EXTRUDE_MINTEMP 170 // degC
// if PREVENT DANGEROUS EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
// if PREVENT DANGEROUS EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately.
...
@@ -875,13 +875,13 @@
...
@@ -875,13 +875,13 @@
* You also need to set FLOWMETER PIN in Configurations_pins.h *
* You also need to set FLOWMETER PIN in Configurations_pins.h *
* *
* *
**************************************************************************/
**************************************************************************/
#define FLOWMETER_SENSOR
//
#define FLOWMETER_SENSOR
#define FLOWMETER_MAXFLOW 6.0 // Liters per minute max
#define FLOWMETER_MAXFLOW 6.0 // Liters per minute max
#define FLOWMETER_MAXFREQ 55 // frequency of pulses at max flow
#define FLOWMETER_MAXFREQ 55 // frequency of pulses at max flow
// uncomment this to kill print job under the min flow rate, in liters/minute
// uncomment this to kill print job under the min flow rate, in liters/minute
#define MINFLOW_PROTECTION 4
//
#define MINFLOW_PROTECTION 4
/**************************************************************************/
/**************************************************************************/
...
@@ -1038,7 +1038,7 @@
...
@@ -1038,7 +1038,7 @@
// http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
// http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
//
//
// REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino
// REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino
#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
//
#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
// The RepRapWorld REPRAPWORLD_KEYPAD v1.1
// The RepRapWorld REPRAPWORLD_KEYPAD v1.1
// http://reprapworld.com/?products_details&products_id=202&cPath=1591_1626
// http://reprapworld.com/?products_details&products_id=202&cPath=1591_1626
...
@@ -1149,7 +1149,7 @@
...
@@ -1149,7 +1149,7 @@
* Check also Configuration_Laser.h *
* Check also Configuration_Laser.h *
* *
* *
**************************************************************************/
**************************************************************************/
#define LASERBEAM
//
#define LASERBEAM
/**************************************************************************/
/**************************************************************************/
...
@@ -1213,9 +1213,9 @@
...
@@ -1213,9 +1213,9 @@
************************** Motor's current ****************************
************************** Motor's current ****************************
***********************************************************************/
***********************************************************************/
// Motor Current setting (Only functional on ALLIGATOR BOARD)
// Motor Current setting (Only functional on ALLIGATOR BOARD)
#define MOTOR_CURRENT {1
, 1, 1, 1, 1, 1, 1
} // X Y Z E0 E1 E2 E3 - Values 0 - 2.5 A
#define MOTOR_CURRENT {1
.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0
} // X Y Z E0 E1 E2 E3 - Values 0 - 2.5 A
// Motor Current setting (Only functional when motor driver current ref pins are connected to a digital trimpot on supported boards)
// Motor Current setting (Only functional when motor driver current ref pins are connected to a digital trimpot on supported boards)
#define DIGIPOT_MOTOR_CURRENT {135,
135,135,135,
135} // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
#define DIGIPOT_MOTOR_CURRENT {135,
135, 135, 135,
135} // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
/***********************************************************************/
/***********************************************************************/
...
...
MK/Configuration_Store.cpp
View file @
1d9887f5
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
*/
*/
#include "base.h"
#include "base.h"
#define EEPROM_VERSION "MKV42
9
"
#define EEPROM_VERSION "MKV42
8
"
/**
/**
* MKV428 EEPROM Layout:
* MKV428 EEPROM Layout:
...
...
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