bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Additional missed patches

Browse Source
This commit is contained in:
Scott Lahteine 2017-04-09 04:20:06 -05:00
parent 635f182478
commit c26a315d0b
24 changed files with 64 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/Configuration.h
View File

@ -696,7 +696,7 @@
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
/* Enable Z Probe Repeatability test to see how accurate your probe is */
// Enable Z Probe Repeatability test to see how accurate your probe is
//#define Z_MIN_PROBE_REPEATABILITY_TEST
/**
@ -716,7 +716,7 @@
#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
/* For M851 give a range for adjusting the Z probe offset */
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20

4
Marlin/example_configurations/Cartesio/Configuration.h
View File

@ -695,7 +695,7 @@
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
/* Enable Z Probe Repeatability test to see how accurate your probe is */
// Enable Z Probe Repeatability test to see how accurate your probe is
//#define Z_MIN_PROBE_REPEATABILITY_TEST
/**
@ -715,7 +715,7 @@
#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
/* For M851 give a range for adjusting the Z probe offset */
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20

4
Marlin/example_configurations/Felix/Configuration.h
View File

@ -679,7 +679,7 @@
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
/* Enable Z Probe Repeatability test to see how accurate your probe is */
// Enable Z Probe Repeatability test to see how accurate your probe is
//#define Z_MIN_PROBE_REPEATABILITY_TEST
/**
@ -699,7 +699,7 @@
#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
/* For M851 give a range for adjusting the Z probe offset */
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20

4
Marlin/example_configurations/Felix/DUAL/Configuration.h
View File

@ -679,7 +679,7 @@
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
/* Enable Z Probe Repeatability test to see how accurate your probe is */
// Enable Z Probe Repeatability test to see how accurate your probe is
//#define Z_MIN_PROBE_REPEATABILITY_TEST
/**
@ -699,7 +699,7 @@
#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
/* For M851 give a range for adjusting the Z probe offset */
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20

4
Marlin/example_configurations/Hephestos/Configuration.h
View File

@ -687,7 +687,7 @@
//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
/* Enable Z Probe Repeatability test to see how accurate your probe is */
// Enable Z Probe Repeatability test to see how accurate your probe is
//#define Z_MIN_PROBE_REPEATABILITY_TEST
/**
@ -707,7 +707,7 @@
#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
/* For M851 give a range for adjusting the Z probe offset */
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20

4
Marlin/example_configurations/Hephestos_2/Configuration.h
View File

@ -690,7 +690,7 @@
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
/* Enable Z Probe Repeatability test to see how accurate your probe is */
// Enable Z Probe Repeatability test to see how accurate your probe is
//#define Z_MIN_PROBE_REPEATABILITY_TEST
/**
@ -710,7 +710,7 @@
#define Z_CLEARANCE_DEPLOY_PROBE 0 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 2 // Z Clearance between probe points
/* For M851 give a range for adjusting the Z probe offset */
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -2
#define Z_PROBE_OFFSET_RANGE_MAX 0

4
Marlin/example_configurations/K8200/Configuration.h
View File

@ -725,7 +725,7 @@
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
/* Enable Z Probe Repeatability test to see how accurate your probe is */
// Enable Z Probe Repeatability test to see how accurate your probe is
//#define Z_MIN_PROBE_REPEATABILITY_TEST
/**
@ -745,7 +745,7 @@
#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
/* For M851 give a range for adjusting the Z probe offset */
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20

4
Marlin/example_configurations/K8400/Configuration.h
View File

@ -696,7 +696,7 @@
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
/* Enable Z Probe Repeatability test to see how accurate your probe is */
// Enable Z Probe Repeatability test to see how accurate your probe is
//#define Z_MIN_PROBE_REPEATABILITY_TEST
/**
@ -716,7 +716,7 @@
#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
/* For M851 give a range for adjusting the Z probe offset */
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20

4
Marlin/example_configurations/K8400/Dual-head/Configuration.h
View File

@ -696,7 +696,7 @@
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
/* Enable Z Probe Repeatability test to see how accurate your probe is */
// Enable Z Probe Repeatability test to see how accurate your probe is
//#define Z_MIN_PROBE_REPEATABILITY_TEST
/**
@ -716,7 +716,7 @@
#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
/* For M851 give a range for adjusting the Z probe offset */
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20

4
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View File

@ -696,7 +696,7 @@
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
/* Enable Z Probe Repeatability test to see how accurate your probe is */
// Enable Z Probe Repeatability test to see how accurate your probe is
//#define Z_MIN_PROBE_REPEATABILITY_TEST
/**
@ -716,7 +716,7 @@
#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
/* For M851 give a range for adjusting the Z probe offset */
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20

4
Marlin/example_configurations/RigidBot/Configuration.h
View File

@ -695,7 +695,7 @@
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
/* Enable Z Probe Repeatability test to see how accurate your probe is */
// Enable Z Probe Repeatability test to see how accurate your probe is
//#define Z_MIN_PROBE_REPEATABILITY_TEST
/**
@ -715,7 +715,7 @@
#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
/* For M851 give a range for adjusting the Z probe offset */
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20

4
Marlin/example_configurations/SCARA/Configuration.h
View File

@ -711,7 +711,7 @@
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
/* Enable Z Probe Repeatability test to see how accurate your probe is */
// Enable Z Probe Repeatability test to see how accurate your probe is
//#define Z_MIN_PROBE_REPEATABILITY_TEST
/**
@ -731,7 +731,7 @@
#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
/* For M851 give a range for adjusting the Z probe offset */
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20

4
Marlin/example_configurations/TAZ4/Configuration.h
View File

@ -716,7 +716,7 @@
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
/* Enable Z Probe Repeatability test to see how accurate your probe is */
// Enable Z Probe Repeatability test to see how accurate your probe is
//#define Z_MIN_PROBE_REPEATABILITY_TEST
/**
@ -736,7 +736,7 @@
#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
/* For M851 give a range for adjusting the Z probe offset */
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20

4
Marlin/example_configurations/TinyBoy2/Configuration.h
View File

@ -747,7 +747,7 @@
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
/* Enable Z Probe Repeatability test to see how accurate your probe is */
// Enable Z Probe Repeatability test to see how accurate your probe is
//#define Z_MIN_PROBE_REPEATABILITY_TEST
/**
@ -767,7 +767,7 @@
#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
/* For M851 give a range for adjusting the Z probe offset */
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20

4
Marlin/example_configurations/WITBOX/Configuration.h
View File

@ -687,7 +687,7 @@
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
/* Enable Z Probe Repeatability test to see how accurate your probe is */
// Enable Z Probe Repeatability test to see how accurate your probe is
//#define Z_MIN_PROBE_REPEATABILITY_TEST
/**
@ -707,7 +707,7 @@
#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
/* For M851 give a range for adjusting the Z probe offset */
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20

4
Marlin/example_configurations/adafruit/ST7565/Configuration.h
View File

@ -696,7 +696,7 @@
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
/* Enable Z Probe Repeatability test to see how accurate your probe is */
// Enable Z Probe Repeatability test to see how accurate your probe is
//#define Z_MIN_PROBE_REPEATABILITY_TEST
/**
@ -716,7 +716,7 @@
#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
/* For M851 give a range for adjusting the Z probe offset */
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20

1
Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h
View File

@ -836,7 +836,6 @@
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20
// For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
// :{ 0:'Low', 1:'High' }
#define X_ENABLE_ON 0

23
Marlin/example_configurations/delta/flsun_kossel_mini/Configuration_adv.h
View File

@ -421,10 +421,10 @@
//#define DIGIPOT_MOTOR_CURRENT {135,135,135,135,135} // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
//#define DAC_MOTOR_CURRENT_DEFAULT { 70, 80, 90, 80 } // Default drive percent - X, Y, Z, E axis
/* 5DPRINT & AZTEEG_X3_PRO */
//#define DIGIPOT_I2C // uncomment to enable
// Uncomment to enable an I2C based DIGIPOT like on the Azteeg X3 Pro
//#define DIGIPOT_I2C
#define DIGIPOT_I2C_NUM_CHANNELS 8 // 5DPRINT: 4 AZTEEG_X3_PRO: 8
/* actual motor currents in Amps, need as many here as DIGIPOT_I2C_NUM_CHANNELS */
// Actual motor currents in Amps, need as many here as DIGIPOT_I2C_NUM_CHANNELS
#define DIGIPOT_I2C_MOTOR_CURRENTS {1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0} // AZTEEG_X3_PRO
//===========================================================================
@ -650,6 +650,11 @@
#define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
#define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
#define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
#elif ENABLED(AUTO_BED_LEVELING_UBL)
#define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET)
#define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET))
#define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET)
#define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET))
#endif
// @section extras
@ -804,6 +809,7 @@
//#define E1_IS_TMC
//#define E2_IS_TMC
//#define E3_IS_TMC
//#define E4_IS_TMC
#define X_MAX_CURRENT 1000 // in mA
#define X_SENSE_RESISTOR 91 // in mOhms
@ -845,6 +851,10 @@
#define E3_SENSE_RESISTOR 91
#define E3_MICROSTEPS 16
#define E4_MAX_CURRENT 1000
#define E4_SENSE_RESISTOR 91
#define E4_MICROSTEPS 16
#endif
// @section TMC2130
@ -886,6 +896,7 @@
//#define E1_IS_TMC2130
//#define E2_IS_TMC2130
//#define E3_IS_TMC2130
//#define E4_IS_TMC2130
/**
* Stepper driver settings
@ -971,6 +982,7 @@
//#define E1_IS_L6470
//#define E2_IS_L6470
//#define E3_IS_L6470
//#define E4_IS_L6470
#define X_MICROSTEPS 16 // number of microsteps
#define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be careful not to go too high
@ -1022,6 +1034,11 @@
#define E3_OVERCURRENT 2000
#define E3_STALLCURRENT 1500
#define E4_MICROSTEPS 16
#define E4_K_VAL 50
#define E4_OVERCURRENT 2000
#define E4_STALLCURRENT 1500
#endif
/**

4
Marlin/example_configurations/delta/generic/Configuration.h
View File

@ -798,7 +798,7 @@
//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
/* Enable Z Probe Repeatability test to see how accurate your probe is */
// Enable Z Probe Repeatability test to see how accurate your probe is
//#define Z_MIN_PROBE_REPEATABILITY_TEST
/**
@ -818,7 +818,7 @@
#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
/* For M851 give a range for adjusting the Z probe offset */
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20

4
Marlin/example_configurations/delta/kossel_mini/Configuration.h
View File

@ -793,7 +793,7 @@
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
/* Enable Z Probe Repeatability test to see how accurate your probe is */
// Enable Z Probe Repeatability test to see how accurate your probe is
//#define Z_MIN_PROBE_REPEATABILITY_TEST
/**
@ -813,7 +813,7 @@
#define Z_CLEARANCE_DEPLOY_PROBE 50 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
/* For M851 give a range for adjusting the Z probe offset */
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20

4
Marlin/example_configurations/delta/kossel_pro/Configuration.h
View File

@ -800,7 +800,7 @@
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
/* Enable Z Probe Repeatability test to see how accurate your probe is */
// Enable Z Probe Repeatability test to see how accurate your probe is
//#define Z_MIN_PROBE_REPEATABILITY_TEST
/**
@ -820,7 +820,7 @@
#define Z_CLEARANCE_DEPLOY_PROBE 100 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
/* For M851 give a range for adjusting the Z probe offset */
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -15
#define Z_PROBE_OFFSET_RANGE_MAX 5

4
Marlin/example_configurations/delta/kossel_xl/Configuration.h
View File

@ -809,7 +809,7 @@
//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
/* Enable Z Probe Repeatability test to see how accurate your probe is */
// Enable Z Probe Repeatability test to see how accurate your probe is
//#define Z_MIN_PROBE_REPEATABILITY_TEST
/**
@ -829,7 +829,7 @@
#define Z_CLEARANCE_DEPLOY_PROBE 20 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 10 // Z Clearance between probe points
/* For M851 give a range for adjusting the Z probe offset */
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20

4
Marlin/example_configurations/makibox/Configuration.h
View File

@ -699,7 +699,7 @@
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
/* Enable Z Probe Repeatability test to see how accurate your probe is */
// Enable Z Probe Repeatability test to see how accurate your probe is
//#define Z_MIN_PROBE_REPEATABILITY_TEST
/**
@ -719,7 +719,7 @@
#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
/* For M851 give a range for adjusting the Z probe offset */
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20

4
Marlin/example_configurations/tvrrug/Round2/Configuration.h
View File

@ -692,7 +692,7 @@
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
/* Enable Z Probe Repeatability test to see how accurate your probe is */
// Enable Z Probe Repeatability test to see how accurate your probe is
//#define Z_MIN_PROBE_REPEATABILITY_TEST
/**
@ -712,7 +712,7 @@
#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
/* For M851 give a range for adjusting the Z probe offset */
// For M851 give a range for adjusting the Z probe offset
#define Z_PROBE_OFFSET_RANGE_MIN -20
#define Z_PROBE_OFFSET_RANGE_MAX 20