Merge remote-tracking branch 'upstream/import-2.0.x' into config_kingroon_90

This commit is contained in:
Scott Lahteine 2020-05-05 13:51:11 -05:00
commit 94748ee3f5
6 changed files with 11213 additions and 13 deletions

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -415,7 +415,7 @@
* 998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
* 999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
*/
#define TEMP_SENSOR_0 5
#define TEMP_SENSOR_0 22
#define TEMP_SENSOR_1 0
#define TEMP_SENSOR_2 0
#define TEMP_SENSOR_3 0
@ -423,7 +423,7 @@
#define TEMP_SENSOR_5 0
#define TEMP_SENSOR_6 0
#define TEMP_SENSOR_7 0
#define TEMP_SENSOR_BED 5
#define TEMP_SENSOR_BED 23
#define TEMP_SENSOR_PROBE 0
#define TEMP_SENSOR_CHAMBER 0
@ -1174,14 +1174,14 @@
// @section extruder
// For direct drive extruder v9 set to true, for geared extruder set to false.
#define INVERT_E0_DIR false
#define INVERT_E1_DIR false
#define INVERT_E2_DIR false
#define INVERT_E3_DIR false
#define INVERT_E4_DIR false
#define INVERT_E5_DIR false
#define INVERT_E6_DIR false
#define INVERT_E7_DIR false
#define INVERT_E0_DIR true
#define INVERT_E1_DIR true
#define INVERT_E2_DIR true
#define INVERT_E3_DIR true
#define INVERT_E4_DIR true
#define INVERT_E5_DIR true
#define INVERT_E6_DIR true
#define INVERT_E7_DIR true
// @section homing
@ -1196,7 +1196,7 @@
// Direction of endstops when homing; 1=MAX, -1=MIN
// :[-1,1]
#define X_HOME_DIR 1 // deltas always home to max
#define X_HOME_DIR 1
#define Y_HOME_DIR 1
#define Z_HOME_DIR 1
@ -1475,7 +1475,7 @@
#endif
// Delta only homes to Z
#define HOMING_FEEDRATE_Z (200*60)
#define HOMING_FEEDRATE_Z (1000) // 200*60 was killing the endstop
// Validate that endstops are triggered on homing moves
#define VALIDATE_HOMING_ENDSTOPS

View file

@ -169,7 +169,7 @@
* and/or decrease WATCH_TEMP_INCREASE. WATCH_TEMP_INCREASE should not be set
* below 2.
*/
#define WATCH_TEMP_PERIOD 20 // Seconds
#define WATCH_TEMP_PERIOD 60 // Seconds, heating is quite slow in Rostock 301
#define WATCH_TEMP_INCREASE 2 // Degrees Celsius
#endif