diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index f09316808d8cd3500a24de499450abe92ad7cf58..59f677b9f5e7b55d70835c3d503c0f34c92c2f42 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -9,7 +9,7 @@
//Implementation of an idea by Prof Braino to inform user that any changes made
//to this build by the user have been successfully uploaded into firmware.
#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time
-#define STRING_CONFIG_H_AUTHOR "(Boris Landoni)" //Who made the changes.
+-#define STRING_CONFIG_H_AUTHOR "(none, default config)" //Who made the changes.
// SERIAL_PORT selects which serial port should be used for communication with the host.
// This allows the connection of wireless adapters (for instance) to non-default port pins.
@@ -90,7 +90,7 @@
// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan) (1k pullup)
-#define TEMP_SENSOR_0 5
+#define TEMP_SENSOR_0 -1
#define TEMP_SENSOR_1 -1
#define TEMP_SENSOR_2 0
#define TEMP_SENSOR_BED 0
@@ -141,9 +141,9 @@
// If you are using a preconfigured hotend then you can use one of the value sets by uncommenting it
// Ultimaker
-// #define DEFAULT_Kp 22.2
-// #define DEFAULT_Ki 1.08
-// #define DEFAULT_Kd 114
+ #define DEFAULT_Kp 22.2
+ #define DEFAULT_Ki 1.08
+ #define DEFAULT_Kd 114
// Makergear
// #define DEFAULT_Kp 7.0
@@ -151,9 +151,9 @@
// #define DEFAULT_Kd 12
// Mendel Parts V9 on 12V
- #define DEFAULT_Kp 63.0
- #define DEFAULT_Ki 2.25
- #define DEFAULT_Kd 440
+// #define DEFAULT_Kp 63.0
+// #define DEFAULT_Ki 2.25
+// #define DEFAULT_Kd 440
#endif // PIDTEMP
// Bed Temperature Control
@@ -224,18 +224,18 @@
#endif
#ifdef ENDSTOPPULLUPS
-// #define ENDSTOPPULLUP_XMAX
-// #define ENDSTOPPULLUP_YMAX
-// #define ENDSTOPPULLUP_ZMAX
+ #define ENDSTOPPULLUP_XMAX
+ #define ENDSTOPPULLUP_YMAX
+ #define ENDSTOPPULLUP_ZMAX
#define ENDSTOPPULLUP_XMIN
#define ENDSTOPPULLUP_YMIN
#define ENDSTOPPULLUP_ZMIN
#endif
// The pullups are needed if you directly connect a mechanical endswitch between the signal and ground pins.
-const bool X_ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops.
-const bool Y_ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops.
-const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops.
+const bool X_ENDSTOPS_INVERTING = true; // set to true to invert the logic of the endstops.
+const bool Y_ENDSTOPS_INVERTING = true; // set to true to invert the logic of the endstops.
+const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of the endstops.
//#define DISABLE_MAX_ENDSTOPS
// For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
@@ -247,15 +247,15 @@ const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of t
// Disables axis when it's not being used.
#define DISABLE_X false
#define DISABLE_Y false
-#define DISABLE_Z true
+#define DISABLE_Z false
#define DISABLE_E false // For all extruders
-#define INVERT_X_DIR false // for Mendel set to false, for Orca set to true
+#define INVERT_X_DIR true // for Mendel set to false, for Orca set to true
#define INVERT_Y_DIR false // for Mendel set to true, for Orca set to false
-#define INVERT_Z_DIR false // for Mendel set to false, for Orca set to true
-#define INVERT_E0_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false
-#define INVERT_E1_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false
-#define INVERT_E2_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false
+#define INVERT_Z_DIR true // for Mendel set to false, for Orca set to true
+#define INVERT_E0_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false
+#define INVERT_E1_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false
+#define INVERT_E2_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false
// ENDSTOP SETTINGS:
// Sets direction of endstops when homing; 1=MAX, -1=MIN
@@ -266,11 +266,11 @@ const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of t
#define min_software_endstops true //If true, axis won't move to coordinates less than HOME_POS.
#define max_software_endstops true //If true, axis won't move to coordinates greater than the defined lengths below.
// Travel limits after homing
-#define X_MAX_POS 200
+#define X_MAX_POS 205
#define X_MIN_POS 0
-#define Y_MAX_POS 200
+#define Y_MAX_POS 205
#define Y_MIN_POS 0
-#define Z_MAX_POS 220
+#define Z_MAX_POS 200
#define Z_MIN_POS 0
#define X_MAX_LENGTH (X_MAX_POS - X_MIN_POS)
@@ -292,8 +292,8 @@ const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of t
// default settings
-#define DEFAULT_AXIS_STEPS_PER_UNIT {64.25,64.25,2560,600} // default steps per unit for ultimaker
-#define DEFAULT_MAX_FEEDRATE {500, 500, 5, 500} // (mm/sec)
+#define DEFAULT_AXIS_STEPS_PER_UNIT {78.7402,78.7402,200.0*8/3,760*1.1} // default steps per unit for ultimaker
+#define DEFAULT_MAX_FEEDRATE {500, 500, 5, 25} // (mm/sec)
#define DEFAULT_MAX_ACCELERATION {9000,9000,100,10000} // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
#define DEFAULT_ACCELERATION 1000 // X, Y, Z and E max acceleration in mm/s^2 for printing moves
@@ -320,7 +320,7 @@ const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of t
// 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.
//define this to enable eeprom support
-#define EEPROM_SETTINGS
+//#define EEPROM_SETTINGS
//to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
// please keep turned on if you can.
//#define EEPROM_CHITCHAT
@@ -340,7 +340,7 @@ const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of t
//#define SDSUPPORT // Enable SD Card Support in Hardware Console
//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
-#define ULTIMAKERCONTROLLER //as available from the ultimaker online store.
+//#define ULTIMAKERCONTROLLER //as available from the ultimaker online store.
//#define ULTIPANEL //the ultipanel as on thingiverse
// The RepRapDiscount Smart Controller (white PCB)