Created
December 14, 2019 23:54
-
-
Save anttix/f7500b83d4773e451467f790e9160582 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/config/examples/MPCNC/Archim2_T8_16T_LCD_16step/Configuration.h b/config/examples/MPCNC/Archim2_T8_16T_LCD_16step/Configuration.h | |
| index 5dfd6c3..67e6ecb 100644 | |
| --- a/config/examples/MPCNC/Archim2_T8_16T_LCD_16step/Configuration.h | |
| +++ b/config/examples/MPCNC/Archim2_T8_16T_LCD_16step/Configuration.h | |
| @@ -71,7 +71,7 @@ | |
| // @section info | |
| // Author info of this build printed to the host during boot and M115 | |
| -#define STRING_CONFIG_H_AUTHOR "(V1 Engineering, Ryan, 402)" // Who made the changes. | |
| +#define STRING_CONFIG_H_AUTHOR "(V1 Engineering, Ryan, 414)" // Who made the changes. | |
| //#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) | |
| /** | |
| @@ -641,9 +641,9 @@ | |
| #define X_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. | |
| #define Y_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. | |
| #define Z_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. | |
| -#define X_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. | |
| -#define Y_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. | |
| -#define Z_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. | |
| +#define X_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. | |
| +#define Y_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. | |
| +#define Z_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. | |
| #define Z_MIN_PROBE_ENDSTOP_INVERTING true // Set to true to invert the logic of the probe. | |
| /** | |
| @@ -787,7 +787,7 @@ | |
| * http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html | |
| */ | |
| #if DISABLED(CLASSIC_JERK) | |
| - #define JUNCTION_DEVIATION_MM 0.005 // (mm) Distance from real junction edge | |
| + #define JUNCTION_DEVIATION_MM 0.1 // (mm) Distance from real junction edge | |
| #endif | |
| /** | |
| @@ -1401,7 +1401,7 @@ | |
| * M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes) | |
| * M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.) | |
| */ | |
| -#define EEPROM_SETTINGS // Persistent storage with M500 and M501 | |
| +//#define EEPROM_SETTINGS // Persistent storage with M500 and M501 | |
| //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! | |
| #define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM. | |
| #if ENABLED(EEPROM_SETTINGS) | |
| @@ -1872,6 +1872,11 @@ | |
| // | |
| #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER | |
| +// If you want you can define your own set of delays in Configuration.h | |
| +//#define ST7920_DELAY_1 DELAY_NS(0) | |
| +#define ST7920_DELAY_2 DELAY_NS(250) | |
| +#define ST7920_DELAY_3 DELAY_NS(250) | |
| + | |
| // | |
| // ReprapWorld Graphical LCD | |
| // https://reprapworld.com/?products_details&products_id/1218 | |
| diff --git a/config/examples/MPCNC/Archim2_T8_16T_LCD_16step/Configuration_adv.h b/config/examples/MPCNC/Archim2_T8_16T_LCD_16step/Configuration_adv.h | |
| index 16e2028..efda6bb 100644 | |
| --- a/config/examples/MPCNC/Archim2_T8_16T_LCD_16step/Configuration_adv.h | |
| +++ b/config/examples/MPCNC/Archim2_T8_16T_LCD_16step/Configuration_adv.h | |
| @@ -835,7 +835,7 @@ | |
| #define MICROSTEP32 HIGH,LOW,HIGH | |
| // Microstep setting (Only functional when stepper driver microstep pins are connected to MCU. | |
| -#define MICROSTEP_MODES { 16, 16, 16, 16, 16, 16 } // [1,2,4,8,16] | |
| +#define MICROSTEP_MODES { 16, 16, 16, 16, 16 } // [1,2,4,8,16] | |
| /** | |
| * @section stepper motor current | |
| @@ -891,7 +891,7 @@ | |
| // @section lcd | |
| #if EITHER(ULTIPANEL, EXTENSIBLE_UI) | |
| - #define MANUAL_FEEDRATE {30*60, 30*60, 3*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 SHORT_MANUAL_Z_MOVE 0.025 // (mm) Smallest manual Z move (< 0.1mm) | |
| #if ENABLED(ULTIPANEL) | |
| #define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position" | |
| @@ -1378,7 +1378,7 @@ | |
| #if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING) | |
| #define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds. | |
| // Note: Extra time may be added to mitigate controller latency. | |
| - #define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement). | |
| + //#define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement). | |
| //#define MOVE_Z_WHEN_IDLE // Jump to the move Z menu on doubleclick when printer is idle. | |
| #if ENABLED(MOVE_Z_WHEN_IDLE) | |
| #define MOVE_Z_IDLE_MULTIPLICATOR 1 // Multiply 1mm by this factor for the move step size. | |
| @@ -1490,7 +1490,7 @@ | |
| // | |
| #define ARC_SUPPORT // Disable this feature to save ~3226 bytes | |
| #if ENABLED(ARC_SUPPORT) | |
| - #define MM_PER_ARC_SEGMENT .15 // Length of each arc segment | |
| + #define MM_PER_ARC_SEGMENT .3 // Length of each arc segment | |
| #define MIN_ARC_SEGMENTS 24 // Minimum number of segments in a complete circle | |
| #define N_ARC_CORRECTION 25 // Number of interpolated segments between corrections | |
| //#define ARC_P_CIRCLES // Enable the 'P' parameter to specify complete circles | |
| diff --git a/config/examples/ZenXY/MiniRambo_16T/Configuration.h b/config/examples/ZenXY/MiniRambo_16T/Configuration.h | |
| index 0bc4065..1574ea6 100644 | |
| --- a/config/examples/ZenXY/MiniRambo_16T/Configuration.h | |
| +++ b/config/examples/ZenXY/MiniRambo_16T/Configuration.h | |
| @@ -71,7 +71,7 @@ | |
| // @section info | |
| // Author info of this build printed to the host during boot and M115 | |
| -#define STRING_CONFIG_H_AUTHOR "(V1 Engineering, Ryan, 402)" // Who made the changes. | |
| +#define STRING_CONFIG_H_AUTHOR "(V1 Engineering, Ryan, 414)" // Who made the changes. | |
| //#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) | |
| /** | |
| @@ -787,7 +787,7 @@ | |
| * http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html | |
| */ | |
| #if DISABLED(CLASSIC_JERK) | |
| - #define JUNCTION_DEVIATION_MM 0.005 // (mm) Distance from real junction edge | |
| + #define JUNCTION_DEVIATION_MM 0.1 // (mm) Distance from real junction edge | |
| #endif | |
| /** | |
| @@ -1401,7 +1401,7 @@ | |
| * M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes) | |
| * M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.) | |
| */ | |
| -#define EEPROM_SETTINGS // Persistent storage with M500 and M501 | |
| +//#define EEPROM_SETTINGS // Persistent storage with M500 and M501 | |
| //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! | |
| #define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM. | |
| #if ENABLED(EEPROM_SETTINGS) | |
| @@ -1871,6 +1871,11 @@ | |
| // | |
| #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER | |
| +// If you want you can define your own set of delays in Configuration.h | |
| +//#define ST7920_DELAY_1 DELAY_NS(0) | |
| +#define ST7920_DELAY_2 DELAY_NS(250) | |
| +#define ST7920_DELAY_3 DELAY_NS(250) | |
| + | |
| // | |
| // ReprapWorld Graphical LCD | |
| // https://reprapworld.com/?products_details&products_id/1218 | |
| diff --git a/config/examples/ZenXY/MiniRambo_16T/Configuration_adv.h b/config/examples/ZenXY/MiniRambo_16T/Configuration_adv.h | |
| index 142389a..fd5abe7 100644 | |
| --- a/config/examples/ZenXY/MiniRambo_16T/Configuration_adv.h | |
| +++ b/config/examples/ZenXY/MiniRambo_16T/Configuration_adv.h | |
| @@ -891,7 +891,7 @@ | |
| // @section lcd | |
| #if EITHER(ULTIPANEL, EXTENSIBLE_UI) | |
| - #define MANUAL_FEEDRATE {30*60, 30*60, 3*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 SHORT_MANUAL_Z_MOVE 0.025 // (mm) Smallest manual Z move (< 0.1mm) | |
| #if ENABLED(ULTIPANEL) | |
| #define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position" | |
| @@ -1378,7 +1378,7 @@ | |
| #if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING) | |
| #define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds. | |
| // Note: Extra time may be added to mitigate controller latency. | |
| - #define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement). | |
| + //#define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement). | |
| //#define MOVE_Z_WHEN_IDLE // Jump to the move Z menu on doubleclick when printer is idle. | |
| #if ENABLED(MOVE_Z_WHEN_IDLE) | |
| #define MOVE_Z_IDLE_MULTIPLICATOR 1 // Multiply 1mm by this factor for the move step size. | |
| @@ -1490,7 +1490,7 @@ | |
| // | |
| #define ARC_SUPPORT // Disable this feature to save ~3226 bytes | |
| #if ENABLED(ARC_SUPPORT) | |
| - #define MM_PER_ARC_SEGMENT .15 // Length of each arc segment | |
| + #define MM_PER_ARC_SEGMENT .3 // Length of each arc segment | |
| #define MIN_ARC_SEGMENTS 24 // Minimum number of segments in a complete circle | |
| #define N_ARC_CORRECTION 25 // Number of interpolated segments between corrections | |
| //#define ARC_P_CIRCLES // Enable the 'P' parameter to specify complete circles | |
| diff --git a/config/examples/ZenXY/Ramps_16T_LCD_32/Configuration.h b/config/examples/ZenXY/Ramps_16T_LCD_32/Configuration.h | |
| index ffa9b52..b2f1898 100644 | |
| --- a/config/examples/ZenXY/Ramps_16T_LCD_32/Configuration.h | |
| +++ b/config/examples/ZenXY/Ramps_16T_LCD_32/Configuration.h | |
| @@ -71,7 +71,7 @@ | |
| // @section info | |
| // Author info of this build printed to the host during boot and M115 | |
| -#define STRING_CONFIG_H_AUTHOR "(V1 Engineering, Ryan, 402)" // Who made the changes. | |
| +#define STRING_CONFIG_H_AUTHOR "(V1 Engineering, Ryan, 414)" // Who made the changes. | |
| //#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) | |
| /** | |
| @@ -787,7 +787,7 @@ | |
| * http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html | |
| */ | |
| #if DISABLED(CLASSIC_JERK) | |
| - #define JUNCTION_DEVIATION_MM 0.005 // (mm) Distance from real junction edge | |
| + #define JUNCTION_DEVIATION_MM 0.1 // (mm) Distance from real junction edge | |
| #endif | |
| /** | |
| @@ -1401,7 +1401,7 @@ | |
| * M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes) | |
| * M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.) | |
| */ | |
| -#define EEPROM_SETTINGS // Persistent storage with M500 and M501 | |
| +//#define EEPROM_SETTINGS // Persistent storage with M500 and M501 | |
| //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! | |
| #define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM. | |
| #if ENABLED(EEPROM_SETTINGS) | |
| @@ -1871,6 +1871,11 @@ | |
| // | |
| #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER | |
| +// If you want you can define your own set of delays in Configuration.h | |
| +//#define ST7920_DELAY_1 DELAY_NS(0) | |
| +#define ST7920_DELAY_2 DELAY_NS(250) | |
| +#define ST7920_DELAY_3 DELAY_NS(250) | |
| + | |
| // | |
| // ReprapWorld Graphical LCD | |
| // https://reprapworld.com/?products_details&products_id/1218 | |
| diff --git a/config/examples/ZenXY/Ramps_16T_LCD_32/Configuration_adv.h b/config/examples/ZenXY/Ramps_16T_LCD_32/Configuration_adv.h | |
| index e369a60..8dd1ec5 100644 | |
| --- a/config/examples/ZenXY/Ramps_16T_LCD_32/Configuration_adv.h | |
| +++ b/config/examples/ZenXY/Ramps_16T_LCD_32/Configuration_adv.h | |
| @@ -891,7 +891,7 @@ | |
| // @section lcd | |
| #if EITHER(ULTIPANEL, EXTENSIBLE_UI) | |
| - #define MANUAL_FEEDRATE {30*60, 30*60, 3*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 SHORT_MANUAL_Z_MOVE 0.025 // (mm) Smallest manual Z move (< 0.1mm) | |
| #if ENABLED(ULTIPANEL) | |
| #define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position" | |
| @@ -1378,7 +1378,7 @@ | |
| #if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING) | |
| #define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds. | |
| // Note: Extra time may be added to mitigate controller latency. | |
| - #define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement). | |
| + //#define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement). | |
| //#define MOVE_Z_WHEN_IDLE // Jump to the move Z menu on doubleclick when printer is idle. | |
| #if ENABLED(MOVE_Z_WHEN_IDLE) | |
| #define MOVE_Z_IDLE_MULTIPLICATOR 1 // Multiply 1mm by this factor for the move step size. | |
| @@ -1490,7 +1490,7 @@ | |
| // | |
| #define ARC_SUPPORT // Disable this feature to save ~3226 bytes | |
| #if ENABLED(ARC_SUPPORT) | |
| - #define MM_PER_ARC_SEGMENT .15 // Length of each arc segment | |
| + #define MM_PER_ARC_SEGMENT .3 // Length of each arc segment | |
| #define MIN_ARC_SEGMENTS 24 // Minimum number of segments in a complete circle | |
| #define N_ARC_CORRECTION 25 // Number of interpolated segments between corrections | |
| //#define ARC_P_CIRCLES // Enable the 'P' parameter to specify complete circles |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment