From e19fe4054d192218fbcef5b3a04371eb37a4e07b Mon Sep 17 00:00:00 2001 From: AnHardt Date: Thu, 3 Dec 2015 00:38:27 +0100 Subject: [PATCH 001/232] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index f65ba9d2c5..9401e05c73 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,6 @@ __Google Hangout:__ 0) leds |= LED_A; - if (target_temperature[0] > 0) leds |= LED_B; - if (fanSpeed) leds |= LED_C; - #if EXTRUDERS > 1 - if (target_temperature[1] > 0) leds |= LED_C; - #endif - if (leds != ledsprev) { - lcd.setBacklight(leds); - ledsprev = leds; - } + // Set the LEDS - referred to as backlights by the LiquidTWI2 library + static uint8_t ledsprev = 0; + uint8_t leds = 0; + if (target_temperature_bed > 0) leds |= LED_A; + if (target_temperature[0] > 0) leds |= LED_B; + if (fanSpeed) leds |= LED_C; + #if EXTRUDERS > 1 + if (target_temperature[1] > 0) leds |= LED_C; #endif + if (leds != ledsprev) { + lcd.setBacklight(leds); + ledsprev = leds; + } } #endif // LCD_HAS_STATUS_INDICATORS From 0fbfb2250615f84998fcec8078c04490757820b7 Mon Sep 17 00:00:00 2001 From: Wurstnase Date: Fri, 4 Dec 2015 09:30:13 +0100 Subject: [PATCH 003/232] Renaming delta speeds (PR2824) dx -> dsx dy -> dsy dz -> dsz de -> dse --- Marlin/planner.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Marlin/planner.cpp b/Marlin/planner.cpp index b2d91606d5..ab98758e8a 100644 --- a/Marlin/planner.cpp +++ b/Marlin/planner.cpp @@ -931,18 +931,18 @@ float junction_deviation = 0.1; float safe_speed = vmax_junction; if ((moves_queued > 1) && (previous_nominal_speed > 0.0001)) { - float dx = current_speed[X_AXIS] - previous_speed[X_AXIS], - dy = current_speed[Y_AXIS] - previous_speed[Y_AXIS], - dz = fabs(csz - previous_speed[Z_AXIS]), - de = fabs(cse - previous_speed[E_AXIS]), - jerk = sqrt(dx * dx + dy * dy); + float dsx = current_speed[X_AXIS] - previous_speed[X_AXIS], + dsy = current_speed[Y_AXIS] - previous_speed[Y_AXIS], + dsz = fabs(csz - previous_speed[Z_AXIS]), + dse = fabs(cse - previous_speed[E_AXIS]), + jerk = sqrt(dsx * dsx + dsy * dsy); // if ((fabs(previous_speed[X_AXIS]) > 0.0001) || (fabs(previous_speed[Y_AXIS]) > 0.0001)) { vmax_junction = block->nominal_speed; // } if (jerk > max_xy_jerk) vmax_junction_factor = max_xy_jerk / jerk; - if (dz > max_z_jerk) vmax_junction_factor = min(vmax_junction_factor, max_z_jerk / dz); - if (de > max_e_jerk) vmax_junction_factor = min(vmax_junction_factor, max_e_jerk / de); + if (dsz > max_z_jerk) vmax_junction_factor = min(vmax_junction_factor, max_z_jerk / dsz); + if (dse > max_e_jerk) vmax_junction_factor = min(vmax_junction_factor, max_e_jerk / dse); vmax_junction = min(previous_nominal_speed, vmax_junction * vmax_junction_factor); // Limit speed to max previous speed } From 6bfcb74c25bfccfe602f5ea4bc2f786b200345c4 Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Sat, 5 Dec 2015 19:31:59 -0600 Subject: [PATCH 004/232] The probe stowing coordinates have changed --- .../delta/kossel_pro/Configuration.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 377b444d28..3975862fe4 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -66,7 +66,7 @@ Here are some standard links for getting your machine calibrated: // This determines the communication speed of the printer // :[2400,9600,19200,38400,57600,115200,250000] -#define BAUDRATE 250000 +#define BAUDRATE 115200 // Enable the Bluetooth serial interface on AT90USB devices //#define BLUETOOTH @@ -465,7 +465,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // @section bedlevel -//#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line) +#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line) //#define DEBUG_LEVELING_FEATURE //#define Z_MIN_PROBE_REPEATABILITY_TEST // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled. @@ -599,20 +599,20 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_XYZ #define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00 - #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0 + #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z Z_PROBE_ALLEN_KEY_DEPLOY_1_Z #define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE HOMING_FEEDRATE_XYZ #define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00 - #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0 + #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z Z_PROBE_ALLEN_KEY_DEPLOY_2_Z #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_XYZ/2) #define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip - #define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00 + #define Z_PROBE_ALLEN_KEY_STOW_1_Y -125.00 #define Z_PROBE_ALLEN_KEY_STOW_1_Z 75.0 #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ - #define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe - #define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00 - #define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0 + #define Z_PROBE_ALLEN_KEY_STOW_2_X Z_PROBE_ALLEN_KEY_STOW_1_X // move down to retract probe + #define Z_PROBE_ALLEN_KEY_STOW_2_Y Z_PROBE_ALLEN_KEY_STOW_1_Y + #define Z_PROBE_ALLEN_KEY_STOW_2_Z 0.0 #define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ/2) #define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0 // return to 0,0,100 #define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0 From 6d691aceee6859df57f2cf614ab42c08352b220e Mon Sep 17 00:00:00 2001 From: Wurstnase Date: Fri, 4 Dec 2015 09:37:55 +0100 Subject: [PATCH 005/232] change dx, dy, dz and de from float to long anything is long, we don't need float there --- Marlin/planner.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/planner.cpp b/Marlin/planner.cpp index ab98758e8a..1e2f70d07b 100644 --- a/Marlin/planner.cpp +++ b/Marlin/planner.cpp @@ -507,15 +507,15 @@ float junction_deviation = 0.1; target[Z_AXIS] = lround(z * axis_steps_per_unit[Z_AXIS]); target[E_AXIS] = lround(e * axis_steps_per_unit[E_AXIS]); - float dx = target[X_AXIS] - position[X_AXIS], - dy = target[Y_AXIS] - position[Y_AXIS], - dz = target[Z_AXIS] - position[Z_AXIS]; + long dx = target[X_AXIS] - position[X_AXIS], + dy = target[Y_AXIS] - position[Y_AXIS], + dz = target[Z_AXIS] - position[Z_AXIS]; // DRYRUN ignores all temperature constraints and assures that the extruder is instantly satisfied if (marlin_debug_flags & DEBUG_DRYRUN) position[E_AXIS] = target[E_AXIS]; - float de = target[E_AXIS] - position[E_AXIS]; + long de = target[E_AXIS] - position[E_AXIS]; #if ENABLED(PREVENT_DANGEROUS_EXTRUDE) if (de) { From 78a347a01ad3441659a76c540bdc4866c6b0d7d1 Mon Sep 17 00:00:00 2001 From: Wurstnase Date: Fri, 4 Dec 2015 09:41:13 +0100 Subject: [PATCH 006/232] change nx, ny, nz and ne from float to long st_set_position takes long ```void st_set_position(const long& x, const long& y, const long& z, const long& e)``` --- Marlin/planner.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/planner.cpp b/Marlin/planner.cpp index 1e2f70d07b..b90be9f16c 100644 --- a/Marlin/planner.cpp +++ b/Marlin/planner.cpp @@ -1029,10 +1029,10 @@ float junction_deviation = 0.1; apply_rotation_xyz(plan_bed_level_matrix, x, y, z); #endif - float nx = position[X_AXIS] = lround(x * axis_steps_per_unit[X_AXIS]), - ny = position[Y_AXIS] = lround(y * axis_steps_per_unit[Y_AXIS]), - nz = position[Z_AXIS] = lround(z * axis_steps_per_unit[Z_AXIS]), - ne = position[E_AXIS] = lround(e * axis_steps_per_unit[E_AXIS]); + long nx = position[X_AXIS] = lround(x * axis_steps_per_unit[X_AXIS]), + ny = position[Y_AXIS] = lround(y * axis_steps_per_unit[Y_AXIS]), + nz = position[Z_AXIS] = lround(z * axis_steps_per_unit[Z_AXIS]), + ne = position[E_AXIS] = lround(e * axis_steps_per_unit[E_AXIS]); st_set_position(nx, ny, nz, ne); previous_nominal_speed = 0.0; // Resets planner junction speeds. Assumes start from rest. From fcceb981914662d9ac7b11087fb42f3a2dfbe2ee Mon Sep 17 00:00:00 2001 From: AnHardt Date: Mon, 9 Nov 2015 13:21:47 +0100 Subject: [PATCH 007/232] Unglobalize no_wait_for_cooling --- Marlin/Marlin_main.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 1de6a9fec9..8e53c2aa64 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -288,7 +288,6 @@ static millis_t stepper_inactive_time = DEFAULT_STEPPER_DEACTIVE_TIME * 1000L; millis_t print_job_start_ms = 0; ///< Print job start time millis_t print_job_stop_ms = 0; ///< Print job stop time static uint8_t target_extruder; -bool no_wait_for_cooling = true; bool target_direction; #if ENABLED(AUTO_BED_LEVELING_FEATURE) @@ -3890,6 +3889,8 @@ inline void gcode_M105() { * M109: Wait for extruder(s) to reach temperature */ inline void gcode_M109() { + bool no_wait_for_cooling = true; + if (setTargetedHotend(109)) return; if (marlin_debug_flags & DEBUG_DRYRUN) return; @@ -3976,6 +3977,8 @@ inline void gcode_M109() { * Rxxx Wait for bed current temp to reach target temp. Waits when heating and cooling */ inline void gcode_M190() { + bool no_wait_for_cooling = true; + if (marlin_debug_flags & DEBUG_DRYRUN) return; LCD_MESSAGEPGM(MSG_BED_HEATING); From 57da1b84978fc6cceaef1118a040c53394531f0a Mon Sep 17 00:00:00 2001 From: AnHardt Date: Tue, 10 Nov 2015 00:02:11 +0100 Subject: [PATCH 008/232] Host parseble output for M109, M190 and M303 Make the output of M105 more similar to Repetier. Make the text-print pert of M105 an extra function to make it reusable. `print_heaterstates()` Use `print_heaterstates()` in M019, M190 and M303 --- Marlin/Marlin.h | 4 ++ Marlin/Marlin_main.cpp | 138 +++++++++++++++++++++++------------------ Marlin/temperature.cpp | 17 ++--- 3 files changed, 87 insertions(+), 72 deletions(-) diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index b25df0607f..b463ba75d5 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -351,6 +351,10 @@ extern uint8_t active_extruder; extern void digipot_i2c_init(); #endif +#if HAS_TEMP_0 || HAS_TEMP_BED || ENABLED(HEATER_0_USES_MAX6675) + void print_heaterstates(); +#endif + extern void calculate_volumetric_multipliers(); #endif //MARLIN_H diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 8e53c2aa64..12682cd44e 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -3802,14 +3802,9 @@ inline void gcode_M104() { } } -/** - * M105: Read hot end and bed temperature - */ -inline void gcode_M105() { - if (setTargetedHotend(105)) return; +#if HAS_TEMP_0 || HAS_TEMP_BED || ENABLED(HEATER_0_USES_MAX6675) - #if HAS_TEMP_0 || HAS_TEMP_BED || ENABLED(HEATER_0_USES_MAX6675) - SERIAL_PROTOCOLPGM(MSG_OK); + void print_heaterstates() { #if HAS_TEMP_0 || ENABLED(HEATER_0_USES_MAX6675) SERIAL_PROTOCOLPGM(" T:"); SERIAL_PROTOCOL_F(degHotend(target_extruder), 1); @@ -3822,52 +3817,78 @@ inline void gcode_M105() { SERIAL_PROTOCOLPGM(" /"); SERIAL_PROTOCOL_F(degTargetBed(), 1); #endif - for (int8_t e = 0; e < EXTRUDERS; ++e) { - SERIAL_PROTOCOLPGM(" T"); - SERIAL_PROTOCOL(e); - SERIAL_PROTOCOLCHAR(':'); - SERIAL_PROTOCOL_F(degHotend(e), 1); - SERIAL_PROTOCOLPGM(" /"); - SERIAL_PROTOCOL_F(degTargetHotend(e), 1); - } + #if EXTRUDERS > 1 + for (int8_t e = 0; e < EXTRUDERS; ++e) { + SERIAL_PROTOCOLPGM(" T"); + SERIAL_PROTOCOL(e); + SERIAL_PROTOCOLCHAR(':'); + SERIAL_PROTOCOL_F(degHotend(e), 1); + SERIAL_PROTOCOLPGM(" /"); + SERIAL_PROTOCOL_F(degTargetHotend(e), 1); + } + #endif + #if HAS_TEMP_BED + SERIAL_PROTOCOLPGM(" B@:"); + #ifdef BED_WATTS + SERIAL_PROTOCOL((BED_WATTS * getHeaterPower(-1)) / 127); + SERIAL_PROTOCOLCHAR('W'); + #else + SERIAL_PROTOCOL(getHeaterPower(-1)); + #endif + #endif + SERIAL_PROTOCOLPGM(" @:"); + #ifdef EXTRUDER_WATTS + SERIAL_PROTOCOL((EXTRUDER_WATTS * getHeaterPower(target_extruder)) / 127); + SERIAL_PROTOCOLCHAR('W'); + #else + SERIAL_PROTOCOL(getHeaterPower(target_extruder)); + #endif + #if EXTRUDERS > 1 + for (int8_t e = 0; e < EXTRUDERS; ++e) { + SERIAL_PROTOCOLPGM(" @"); + SERIAL_PROTOCOL(e); + SERIAL_PROTOCOLCHAR(':'); + #ifdef EXTRUDER_WATTS + SERIAL_PROTOCOL((EXTRUDER_WATTS * getHeaterPower(e)) / 127); + SERIAL_PROTOCOLCHAR('W'); + #else + SERIAL_PROTOCOL(getHeaterPower(e)); + #endif + } + #endif + #if ENABLED(SHOW_TEMP_ADC_VALUES) + #if HAS_TEMP_BED + SERIAL_PROTOCOLPGM(" ADC B:"); + SERIAL_PROTOCOL_F(degBed(), 1); + SERIAL_PROTOCOLPGM("C->"); + SERIAL_PROTOCOL_F(rawBedTemp() / OVERSAMPLENR, 0); + #endif + for (int8_t cur_extruder = 0; cur_extruder < EXTRUDERS; ++cur_extruder) { + SERIAL_PROTOCOLPGM(" T"); + SERIAL_PROTOCOL(cur_extruder); + SERIAL_PROTOCOLCHAR(':'); + SERIAL_PROTOCOL_F(degHotend(cur_extruder), 1); + SERIAL_PROTOCOLPGM("C->"); + SERIAL_PROTOCOL_F(rawHotendTemp(cur_extruder) / OVERSAMPLENR, 0); + } + #endif + } +#endif + +/** + * M105: Read hot end and bed temperature + */ +inline void gcode_M105() { + if (setTargetedHotend(105)) return; + + #if HAS_TEMP_0 || HAS_TEMP_BED || ENABLED(HEATER_0_USES_MAX6675) + SERIAL_PROTOCOLPGM(MSG_OK); + print_heaterstates(); #else // !HAS_TEMP_0 && !HAS_TEMP_BED SERIAL_ERROR_START; SERIAL_ERRORLNPGM(MSG_ERR_NO_THERMISTORS); #endif - SERIAL_PROTOCOLPGM(" @:"); - #ifdef EXTRUDER_WATTS - SERIAL_PROTOCOL((EXTRUDER_WATTS * getHeaterPower(target_extruder)) / 127); - SERIAL_PROTOCOLCHAR('W'); - #else - SERIAL_PROTOCOL(getHeaterPower(target_extruder)); - #endif - - SERIAL_PROTOCOLPGM(" B@:"); - #ifdef BED_WATTS - SERIAL_PROTOCOL((BED_WATTS * getHeaterPower(-1)) / 127); - SERIAL_PROTOCOLCHAR('W'); - #else - SERIAL_PROTOCOL(getHeaterPower(-1)); - #endif - - #if ENABLED(SHOW_TEMP_ADC_VALUES) - #if HAS_TEMP_BED - SERIAL_PROTOCOLPGM(" ADC B:"); - SERIAL_PROTOCOL_F(degBed(), 1); - SERIAL_PROTOCOLPGM("C->"); - SERIAL_PROTOCOL_F(rawBedTemp() / OVERSAMPLENR, 0); - #endif - for (int8_t cur_extruder = 0; cur_extruder < EXTRUDERS; ++cur_extruder) { - SERIAL_PROTOCOLPGM(" T"); - SERIAL_PROTOCOL(cur_extruder); - SERIAL_PROTOCOLCHAR(':'); - SERIAL_PROTOCOL_F(degHotend(cur_extruder), 1); - SERIAL_PROTOCOLPGM("C->"); - SERIAL_PROTOCOL_F(rawHotendTemp(cur_extruder) / OVERSAMPLENR, 0); - } - #endif - SERIAL_EOL; } @@ -3932,10 +3953,9 @@ inline void gcode_M109() { { // while loop if (millis() > temp_ms + 1000UL) { //Print temp & remaining time every 1s while waiting - SERIAL_PROTOCOLPGM("T:"); - SERIAL_PROTOCOL_F(degHotend(target_extruder), 1); - SERIAL_PROTOCOLPGM(" E:"); - SERIAL_PROTOCOL((int)target_extruder); + #if HAS_TEMP_0 || HAS_TEMP_BED || ENABLED(HEATER_0_USES_MAX6675) + print_heaterstates(); + #endif #ifdef TEMP_RESIDENCY_TIME SERIAL_PROTOCOLPGM(" W:"); if (residency_start_ms > -1) { @@ -3996,13 +4016,10 @@ inline void gcode_M109() { if (ms > temp_ms + 1000UL) { //Print Temp Reading every 1 second while heating up. temp_ms = ms; float tt = degHotend(active_extruder); - SERIAL_PROTOCOLPGM("T:"); - SERIAL_PROTOCOL(tt); - SERIAL_PROTOCOLPGM(" E:"); - SERIAL_PROTOCOL((int)active_extruder); - SERIAL_PROTOCOLPGM(" B:"); - SERIAL_PROTOCOL_F(degBed(), 1); - SERIAL_EOL; + #if HAS_TEMP_0 || HAS_TEMP_BED || ENABLED(HEATER_0_USES_MAX6675) + print_heaterstates(); + SERIAL_EOL; + #endif } idle(); } @@ -4915,6 +4932,9 @@ inline void gcode_M303() { int e = code_seen('E') ? code_value_short() : 0; int c = code_seen('C') ? code_value_short() : 5; float temp = code_seen('S') ? code_value() : (e < 0 ? 70.0 : 150.0); + + if (e >=0 && e < EXTRUDERS) + target_extruder = e; PID_autotune(temp, e, c); } diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp index 99cd2afd40..d3b0f188c1 100644 --- a/Marlin/temperature.cpp +++ b/Marlin/temperature.cpp @@ -328,19 +328,10 @@ void PID_autotune(float temp, int extruder, int ncycles) { } // Every 2 seconds... if (ms > temp_ms + 2000) { - int p; - if (extruder < 0) { - p = soft_pwm_bed; - SERIAL_PROTOCOLPGM(MSG_B); - } - else { - p = soft_pwm[extruder]; - SERIAL_PROTOCOLPGM(MSG_T); - } - - SERIAL_PROTOCOL(input); - SERIAL_PROTOCOLPGM(MSG_AT); - SERIAL_PROTOCOLLN(p); + #if HAS_TEMP_0 || HAS_TEMP_BED || ENABLED(HEATER_0_USES_MAX6675) + print_heaterstates(); + SERIAL_EOL; + #endif temp_ms = ms; } // every 2 seconds From 60d5658da89d7d59d00ee7d940fd96172d8934f9 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 3 Dec 2015 16:31:22 -0800 Subject: [PATCH 009/232] Revert nozzle_bed_fan_menu_items For some reason that I cannot determine, using a sub-function causes the Tune sub-menu to act strangely, yet replacing the function call with its code content works perfectly. --- Marlin/ultralcd.cpp | 82 ++++++++++++++++++++++++++++++--------------- 1 file changed, 55 insertions(+), 27 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 05af60b6f4..a23995d7c8 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -504,10 +504,25 @@ void lcd_set_home_offsets() { void watch_temp_callback_E3() {} #endif // EXTRUDERS > 3 #endif + /** - * Items shared between Tune and Temperature menus + * + * "Tune" submenu + * */ -static void nozzle_bed_fan_menu_items(uint8_t &encoderLine, uint8_t &_lineNr, uint8_t &_drawLineNr, uint8_t &_menuItemNr, bool &wasClicked, bool &itemSelected) { +static void lcd_tune_menu() { + START_MENU(); + + // + // ^ Main + // + MENU_ITEM(back, MSG_MAIN, lcd_main_menu); + + // + // Speed: + // + MENU_ITEM_EDIT(int3, MSG_SPEED, &feedrate_multiplier, 10, 999); + // // Nozzle: // Nozzle [1-4]: @@ -546,29 +561,6 @@ static void nozzle_bed_fan_menu_items(uint8_t &encoderLine, uint8_t &_lineNr, ui // Fan Speed: // MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED, &fanSpeed, 0, 255); -} - - -/** - * - * "Tune" submenu - * - */ -static void lcd_tune_menu() { - START_MENU(); - - // - // ^ Main - // - MENU_ITEM(back, MSG_MAIN, lcd_main_menu); - - // - // Speed: - // - MENU_ITEM_EDIT(int3, MSG_SPEED, &feedrate_multiplier, 10, 999); - - // Nozzle, Bed, and Fan Control - nozzle_bed_fan_menu_items(encoderLine, _lineNr, _drawLineNr, _menuItemNr, wasClicked, itemSelected); // // Flow: @@ -1033,8 +1025,44 @@ static void lcd_control_temperature_menu() { // MENU_ITEM(back, MSG_CONTROL, lcd_control_menu); - // Nozzle, Bed, and Fan Control - nozzle_bed_fan_menu_items(encoderLine, _lineNr, _drawLineNr, _menuItemNr, wasClicked, itemSelected); + // + // Nozzle: + // Nozzle [1-4]: + // + #if EXTRUDERS == 1 + #if TEMP_SENSOR_0 != 0 + MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15, watch_temp_callback_E0); + #endif + #else //EXTRUDERS > 1 + #if TEMP_SENSOR_0 != 0 + MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N1, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15, watch_temp_callback_E0); + #endif + #if TEMP_SENSOR_1 != 0 + MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N2, &target_temperature[1], 0, HEATER_1_MAXTEMP - 15, watch_temp_callback_E1); + #endif + #if EXTRUDERS > 2 + #if TEMP_SENSOR_2 != 0 + MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N3, &target_temperature[2], 0, HEATER_2_MAXTEMP - 15, watch_temp_callback_E2); + #endif + #if EXTRUDERS > 3 + #if TEMP_SENSOR_3 != 0 + MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N4, &target_temperature[3], 0, HEATER_3_MAXTEMP - 15, watch_temp_callback_E3); + #endif + #endif // EXTRUDERS > 3 + #endif // EXTRUDERS > 2 + #endif // EXTRUDERS > 1 + + // + // Bed: + // + #if TEMP_SENSOR_BED != 0 + MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_BED, &target_temperature_bed, 0, BED_MAXTEMP - 15); + #endif + + // + // Fan Speed: + // + MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED, &fanSpeed, 0, 255); // // Autotemp, Min, Max, Fact From 4f314afaf05748a64bfa3a062f57337c1fbde053 Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Thu, 10 Dec 2015 05:13:10 -0600 Subject: [PATCH 010/232] Allow Thermistor #12 to be used on hotends also MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit //100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed) Caveat Emptor —- I’m not sure that this really makes sense, but why keep someone from using it? --- Marlin/thermistortables.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/thermistortables.h b/Marlin/thermistortables.h index 425cc8968e..4e3cbf5c4f 100644 --- a/Marlin/thermistortables.h +++ b/Marlin/thermistortables.h @@ -957,7 +957,7 @@ const short temptable_60[][2] PROGMEM = { {1008 * OVERSAMPLENR, 0}, }; #endif -#if (THERMISTORBED == 12) +#if (THERMISTORHEATER_0 == 12) || (THERMISTORHEATER_1 == 12) || (THERMISTORHEATER_2 == 12) || (THERMISTORHEATER_3 == 12) || (THERMISTORBED == 12) //100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed) const short temptable_12[][2] PROGMEM = { {35 * OVERSAMPLENR, 180}, //top rating 180C From e2da2b4105ea4b64c6742d5cf964d7e4f8903f03 Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Thu, 10 Dec 2015 05:25:55 -0600 Subject: [PATCH 011/232] Back port language translation --- Marlin/language_nl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/language_nl.h b/Marlin/language_nl.h index bd6b86b092..1b0c4ebdd5 100644 --- a/Marlin/language_nl.h +++ b/Marlin/language_nl.h @@ -121,8 +121,8 @@ #define MSG_BABYSTEP_Y "Babystap Y" #define MSG_BABYSTEP_Z "Babystap Z" #define MSG_ENDSTOP_ABORT "Endstop afbr." -#define MSG_END_HOUR "hours" -#define MSG_END_MINUTE "minutes" +#define MSG_END_HOUR "uur" +#define MSG_END_MINUTE "minuten" #if ENABLED(DELTA_CALIBRATION_MENU) #define MSG_DELTA_CALIBRATE "Delta Calibratie" From e7b40bbe988927a84d6f76eb1a2294bc09e704c4 Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Thu, 10 Dec 2015 05:59:36 -0600 Subject: [PATCH 012/232] Change link to U8glib source --- Marlin/Configuration.h | 10 +++++----- Marlin/example_configurations/Felix/Configuration.h | 8 ++++---- .../example_configurations/Felix/Configuration_DUAL.h | 6 +++--- .../example_configurations/Hephestos/Configuration.h | 8 ++++---- Marlin/example_configurations/K8200/Configuration.h | 8 ++++---- .../RepRapWorld/Megatronics/Configuration.h | 8 ++++---- Marlin/example_configurations/RigidBot/Configuration.h | 8 ++++---- Marlin/example_configurations/SCARA/Configuration.h | 8 ++++---- Marlin/example_configurations/TAZ4/Configuration.h | 8 ++++---- Marlin/example_configurations/WITBOX/Configuration.h | 8 ++++---- .../adafruit/ST7565/Configuration.h | 8 ++++---- .../delta/biv2.5/Configuration.h | 8 ++++---- .../delta/generic/Configuration.h | 8 ++++---- .../delta/kossel_mini/Configuration.h | 8 ++++---- .../delta/kossel_pro/Configuration.h | 8 ++++---- Marlin/example_configurations/makibox/Configuration.h | 8 ++++---- .../tvrrug/Round2/Configuration.h | 8 ++++---- 17 files changed, 68 insertions(+), 68 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index c4fa028cec..5838943898 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -688,13 +688,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD // http://panucatt.com -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define VIKI2 //#define miniVIKI // This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define ELB_FULL_GRAPHIC_CONTROLLER //#define SD_DETECT_INVERTED @@ -709,7 +709,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The RepRapDiscount FULL GRAPHIC Smart Controller (quadratic white PCB) // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // The RepRapWorld REPRAPWORLD_KEYPAD v1.1 @@ -743,9 +743,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs //#define LCD_I2C_VIKI - + // SSD1306 OLED generic display support -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define U8GLIB_SSD1306 // Shift register panels diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index a3ffe29039..c06bfa0517 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -670,13 +670,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD // http://panucatt.com -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define VIKI2 //#define miniVIKI // This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define ELB_FULL_GRAPHIC_CONTROLLER //#define SD_DETECT_INVERTED @@ -691,7 +691,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The RepRapDiscount FULL GRAPHIC Smart Controller (quadratic white PCB) // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // The RepRapWorld REPRAPWORLD_KEYPAD v1.1 @@ -727,7 +727,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define LCD_I2C_VIKI // SSD1306 OLED generic display support -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define U8GLIB_SSD1306 // Shift register panels diff --git a/Marlin/example_configurations/Felix/Configuration_DUAL.h b/Marlin/example_configurations/Felix/Configuration_DUAL.h index 09adeae13c..a0368c40e9 100644 --- a/Marlin/example_configurations/Felix/Configuration_DUAL.h +++ b/Marlin/example_configurations/Felix/Configuration_DUAL.h @@ -640,13 +640,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD // http://panucatt.com -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define VIKI2 //#define miniVIKI // This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define ELB_FULL_GRAPHIC_CONTROLLER //#define SD_DETECT_INVERTED @@ -661,7 +661,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The RepRapDiscount FULL GRAPHIC Smart Controller (quadratic white PCB) // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // The RepRapWorld REPRAPWORLD_KEYPAD v1.1 diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 519f3c7899..cd71535488 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -679,13 +679,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD // http://panucatt.com -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define VIKI2 //#define miniVIKI // This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define ELB_FULL_GRAPHIC_CONTROLLER //#define SD_DETECT_INVERTED @@ -700,7 +700,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // The RepRapDiscount FULL GRAPHIC Smart Controller (quadratic white PCB) // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // The RepRapWorld REPRAPWORLD_KEYPAD v1.1 @@ -736,7 +736,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //#define LCD_I2C_VIKI // SSD1306 OLED generic display support -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define U8GLIB_SSD1306 // Shift register panels diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 66af2bbe92..3287924dc5 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -675,13 +675,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD // http://panucatt.com -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define VIKI2 //#define miniVIKI // This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define ELB_FULL_GRAPHIC_CONTROLLER //#define SD_DETECT_INVERTED @@ -696,7 +696,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The RepRapDiscount FULL GRAPHIC Smart Controller (quadratic white PCB) // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // The RepRapWorld REPRAPWORLD_KEYPAD v1.1 @@ -732,7 +732,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define LCD_I2C_VIKI // SSD1306 OLED generic display support -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define U8GLIB_SSD1306 // Shift register panels diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index 630830f706..115baee3cd 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -687,13 +687,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD // http://panucatt.com -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define VIKI2 //#define miniVIKI // This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define ELB_FULL_GRAPHIC_CONTROLLER //#define SD_DETECT_INVERTED @@ -708,7 +708,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The RepRapDiscount FULL GRAPHIC Smart Controller (quadratic white PCB) // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // The RepRapWorld REPRAPWORLD_KEYPAD v1.1 @@ -744,7 +744,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define LCD_I2C_VIKI // SSD1306 OLED generic display support -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define U8GLIB_SSD1306 // Shift register panels diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 7cd0f005c9..154a5da778 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -674,13 +674,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD // http://panucatt.com -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define VIKI2 //#define miniVIKI // This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define ELB_FULL_GRAPHIC_CONTROLLER //#define SD_DETECT_INVERTED @@ -695,7 +695,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The RepRapDiscount FULL GRAPHIC Smart Controller (quadratic white PCB) // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino // // RigidBoard: To rewire this for a RigidBot see http://rigidtalk.com/wiki/index.php?title=LCD_Smart_Controller // @@ -734,7 +734,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define LCD_I2C_VIKI // SSD1306 OLED generic display support -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define U8GLIB_SSD1306 // Shift register panels diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 50bec62241..da24a5b214 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -695,13 +695,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD // http://panucatt.com -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define VIKI2 //#define miniVIKI // This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define ELB_FULL_GRAPHIC_CONTROLLER //#define SD_DETECT_INVERTED @@ -716,7 +716,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The RepRapDiscount FULL GRAPHIC Smart Controller (quadratic white PCB) // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // The RepRapWorld REPRAPWORLD_KEYPAD v1.1 @@ -752,7 +752,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define LCD_I2C_VIKI // SSD1306 OLED generic display support -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define U8GLIB_SSD1306 // Shift register panels diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index 1c42c65795..d7f312a4fc 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -706,13 +706,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD // http://panucatt.com -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define VIKI2 //#define miniVIKI // This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define ELB_FULL_GRAPHIC_CONTROLLER //#define SD_DETECT_INVERTED @@ -727,7 +727,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The RepRapDiscount FULL GRAPHIC Smart Controller (quadratic white PCB) // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // The RepRapWorld REPRAPWORLD_KEYPAD v1.1 @@ -763,7 +763,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define LCD_I2C_VIKI // SSD1306 OLED generic display support -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define U8GLIB_SSD1306 // Shift register panels diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index f0666e74d2..19fc03403f 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -678,13 +678,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD // http://panucatt.com -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define VIKI2 //#define miniVIKI // This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define ELB_FULL_GRAPHIC_CONTROLLER //#define SD_DETECT_INVERTED @@ -699,7 +699,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // The RepRapDiscount FULL GRAPHIC Smart Controller (quadratic white PCB) // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // The RepRapWorld REPRAPWORLD_KEYPAD v1.1 @@ -735,7 +735,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //#define LCD_I2C_VIKI // SSD1306 OLED generic display support -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define U8GLIB_SSD1306 // Shift register panels diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index e3cf3a3385..90935308de 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -687,13 +687,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD // http://panucatt.com -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define VIKI2 //#define miniVIKI // This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino #define ELB_FULL_GRAPHIC_CONTROLLER //#define SD_DETECT_INVERTED @@ -708,7 +708,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The RepRapDiscount FULL GRAPHIC Smart Controller (quadratic white PCB) // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // The RepRapWorld REPRAPWORLD_KEYPAD v1.1 @@ -744,7 +744,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define LCD_I2C_VIKI // SSD1306 OLED generic display support -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define U8GLIB_SSD1306 // Shift register panels diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index 60f07b81c1..bbb15ffa8f 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -809,13 +809,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD // http://panucatt.com -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define VIKI2 //#define miniVIKI // This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define ELB_FULL_GRAPHIC_CONTROLLER //#define SD_DETECT_INVERTED @@ -830,7 +830,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // The RepRapDiscount FULL GRAPHIC Smart Controller (quadratic white PCB) // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // The RepRapWorld REPRAPWORLD_KEYPAD v1.1 @@ -869,7 +869,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //#define LCD_I2C_VIKI // SSD1306 OLED generic display support -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define U8GLIB_SSD1306 // Shift register panels diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 6776940b28..7b8afbef08 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -810,13 +810,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD // http://panucatt.com -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define VIKI2 //#define miniVIKI // This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define ELB_FULL_GRAPHIC_CONTROLLER //#define SD_DETECT_INVERTED @@ -831,7 +831,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // The RepRapDiscount FULL GRAPHIC Smart Controller (quadratic white PCB) // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // The RepRapWorld REPRAPWORLD_KEYPAD v1.1 @@ -874,7 +874,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //#define LCD_I2C_VIKI // SSD1306 OLED generic display support -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define U8GLIB_SSD1306 // Shift register panels diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index ec96b75782..ba37cff436 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -814,13 +814,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD // http://panucatt.com -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define VIKI2 //#define miniVIKI // This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define ELB_FULL_GRAPHIC_CONTROLLER //#define SD_DETECT_INVERTED @@ -835,7 +835,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The RepRapDiscount FULL GRAPHIC Smart Controller (quadratic white PCB) // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // The RepRapWorld REPRAPWORLD_KEYPAD v1.1 @@ -874,7 +874,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define LCD_I2C_VIKI // SSD1306 OLED generic display support -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define U8GLIB_SSD1306 // Shift register panels diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 3975862fe4..ed798c4e49 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -804,13 +804,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD // http://panucatt.com -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define VIKI2 //#define miniVIKI // This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define ELB_FULL_GRAPHIC_CONTROLLER //#define SD_DETECT_INVERTED @@ -825,7 +825,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The RepRapDiscount FULL GRAPHIC Smart Controller (quadratic white PCB) // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // The RepRapWorld REPRAPWORLD_KEYPAD v1.1 @@ -864,7 +864,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define LCD_I2C_VIKI // SSD1306 OLED generic display support -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define U8GLIB_SSD1306 // Shift register panels diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index bc74b6dc01..db943ee528 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -689,13 +689,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD // http://panucatt.com -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define VIKI2 //#define miniVIKI // This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define ELB_FULL_GRAPHIC_CONTROLLER //#define SD_DETECT_INVERTED @@ -710,7 +710,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // The RepRapDiscount FULL GRAPHIC Smart Controller (quadratic white PCB) // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // The RepRapWorld REPRAPWORLD_KEYPAD v1.1 @@ -746,7 +746,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define LCD_I2C_VIKI // SSD1306 OLED generic display support -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define U8GLIB_SSD1306 // Shift register panels diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 2636192d11..50b9a28801 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -682,13 +682,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD // http://panucatt.com -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define VIKI2 //#define miniVIKI // This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define ELB_FULL_GRAPHIC_CONTROLLER //#define SD_DETECT_INVERTED @@ -703,7 +703,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // The RepRapDiscount FULL GRAPHIC Smart Controller (quadratic white PCB) // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // The RepRapWorld REPRAPWORLD_KEYPAD v1.1 @@ -739,7 +739,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //#define LCD_I2C_VIKI // SSD1306 OLED generic display support -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: https://github.com/olikraus/U8glib_Arduino //#define U8GLIB_SSD1306 // Shift register panels From 0cebe85e65d7a9119ae756b56fc5b1431a962761 Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Thu, 10 Dec 2015 06:09:44 -0600 Subject: [PATCH 013/232] Clean up spacing and duplicate entries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Removing trailing whitespace • Adjusting indention for better readability • Removing duplicated entries --- Marlin/Configuration_adv.h | 133 +++++++++--------- .../Felix/Configuration_adv.h | 50 +++---- .../Hephestos/Configuration_adv.h | 50 +++---- .../K8200/Configuration_adv.h | 50 +++---- .../RigidBot/Configuration_adv.h | 50 +++---- .../SCARA/Configuration_adv.h | 50 +++---- .../TAZ4/Configuration_adv.h | 50 +++---- .../WITBOX/Configuration_adv.h | 50 +++---- .../delta/biv2.5/Configuration_adv.h | 50 +++---- .../delta/generic/Configuration_adv.h | 50 +++---- .../delta/kossel_mini/Configuration_adv.h | 50 +++---- .../delta/kossel_pro/Configuration_adv.h | 50 +++---- .../makibox/Configuration_adv.h | 50 +++---- .../tvrrug/Round2/Configuration_adv.h | 50 +++---- 14 files changed, 390 insertions(+), 393 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 51141fc3c1..cba6f9fb65 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -137,7 +137,7 @@ #if ENABLED(Z_DUAL_STEPPER_DRIVERS) // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper. - // That way the machine is capable to align the bed during home, since both Z steppers are homed. + // That way the machine is capable to align the bed during home, since both Z steppers are homed. // There is also an implementation of M666 (software endstops adjustment) to this feature. // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed. // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2. @@ -335,8 +335,8 @@ // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT // we don't have a big font for Cyrillic, Kana //#define USE_BIG_EDIT_FONT - - // If you have spare 2300Byte of progmem and want to use a + + // If you have spare 2300Byte of progmem and want to use a // smaller font on the Info-screen uncomment the next line. //#define USE_SMALL_INFOFONT #endif // DOGLCD @@ -347,10 +347,10 @@ //#define USE_WATCHDOG #if ENABLED(USE_WATCHDOG) -// If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. -// The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. -// However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. -//#define WATCHDOG_RESET_MANUAL + // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. + // The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. + // However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. + //#define WATCHDOG_RESET_MANUAL #endif // @section lcd @@ -389,7 +389,7 @@ #define MM_PER_ARC_SEGMENT 1 #define N_ARC_CORRECTION 25 -const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement +const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement // @section temperature @@ -461,7 +461,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st #endif /******************************************************************************\ - * enable this section if you have TMC26X motor drivers. + * enable this section if you have TMC26X motor drivers. * you need to import the TMC26XStepper library into the arduino IDE for this ******************************************************************************/ @@ -470,60 +470,60 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -//#define X_IS_TMC + //#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps - -//#define X2_IS_TMC + + //#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps - -//#define Y_IS_TMC + + //#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps - -//#define Y2_IS_TMC + + //#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms - #define Y2_MICROSTEPS 16 //number of microsteps - -//#define Z_IS_TMC + #define Y2_MICROSTEPS 16 //number of microsteps + + //#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps - -//#define Z2_IS_TMC + + //#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps - -//#define E0_IS_TMC + + //#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps - -//#define E1_IS_TMC + + //#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms - #define E1_MICROSTEPS 16 //number of microsteps - -//#define E2_IS_TMC + #define E1_MICROSTEPS 16 //number of microsteps + + //#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms - #define E2_MICROSTEPS 16 //number of microsteps - -//#define E3_IS_TMC + #define E2_MICROSTEPS 16 //number of microsteps + + //#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms - #define E3_MICROSTEPS 16 //number of microsteps + #define E3_MICROSTEPS 16 //number of microsteps #endif /******************************************************************************\ - * enable this section if you have L6470 motor drivers. + * enable this section if you have L6470 motor drivers. * you need to import the L6470 library into the arduino IDE for this ******************************************************************************/ @@ -532,69 +532,66 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -//#define X_IS_L6470 + //#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps - #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high + #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall - -//#define X2_IS_L6470 + + //#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps - #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high + #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall - -//#define Y_IS_L6470 + + //#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps - #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high + #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall - -//#define Y2_IS_L6470 - #define Y2_MICROSTEPS 16 //number of microsteps - #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high + + //#define Y2_IS_L6470 + #define Y2_MICROSTEPS 16 //number of microsteps + #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off - #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall - -//#define Z_IS_L6470 + #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall + + //#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps - #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high + #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall - -//#define Z2_IS_L6470 + + //#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps - #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high + #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall - -//#define E0_IS_L6470 + + //#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps - #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high + #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall - -//#define E1_IS_L6470 - #define E1_MICROSTEPS 16 //number of microsteps + + //#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps - #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high + #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall - -//#define E2_IS_L6470 - #define E2_MICROSTEPS 16 //number of microsteps + + //#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps - #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high + #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall - -//#define E3_IS_L6470 - #define E3_MICROSTEPS 16 //number of microsteps + + //#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps - #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high + #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall - + #endif #include "Conditionals.h" diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h index 5e9c5ea8c8..b529d9ee12 100644 --- a/Marlin/example_configurations/Felix/Configuration_adv.h +++ b/Marlin/example_configurations/Felix/Configuration_adv.h @@ -356,10 +356,10 @@ //#define USE_WATCHDOG #if ENABLED(USE_WATCHDOG) -// If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. -// The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. -// However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. -//#define WATCHDOG_RESET_MANUAL + // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. + // The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. + // However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. + //#define WATCHDOG_RESET_MANUAL #endif // @section lcd @@ -397,7 +397,7 @@ #define MM_PER_ARC_SEGMENT 1 #define N_ARC_CORRECTION 25 -const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement +const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement // @section temperature @@ -475,52 +475,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -//#define X_IS_TMC + //#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -//#define X2_IS_TMC + //#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -//#define Y_IS_TMC + //#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -//#define Y2_IS_TMC + //#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -//#define Z_IS_TMC + //#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -//#define Z2_IS_TMC + //#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -//#define E0_IS_TMC + //#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -//#define E1_IS_TMC + //#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -//#define E2_IS_TMC + //#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -//#define E3_IS_TMC + //#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -537,61 +537,61 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -//#define X_IS_L6470 + //#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define X2_IS_L6470 + //#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y_IS_L6470 + //#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y2_IS_L6470 + //#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z_IS_L6470 + //#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z2_IS_L6470 + //#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E0_IS_L6470 + //#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E1_IS_L6470 + //#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E2_IS_L6470 + //#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E3_IS_L6470 + //#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off diff --git a/Marlin/example_configurations/Hephestos/Configuration_adv.h b/Marlin/example_configurations/Hephestos/Configuration_adv.h index 13f402c63d..59bf7e018c 100644 --- a/Marlin/example_configurations/Hephestos/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos/Configuration_adv.h @@ -356,10 +356,10 @@ //#define USE_WATCHDOG #if ENABLED(USE_WATCHDOG) -// If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. -// The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. -// However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. -//#define WATCHDOG_RESET_MANUAL + // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. + // The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. + // However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. + //#define WATCHDOG_RESET_MANUAL #endif // @section lcd @@ -397,7 +397,7 @@ #define MM_PER_ARC_SEGMENT 1 #define N_ARC_CORRECTION 25 -const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement +const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement // @section temperature @@ -475,52 +475,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -//#define X_IS_TMC + //#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -//#define X2_IS_TMC + //#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -//#define Y_IS_TMC + //#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -//#define Y2_IS_TMC + //#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -//#define Z_IS_TMC + //#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -//#define Z2_IS_TMC + //#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -//#define E0_IS_TMC + //#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -//#define E1_IS_TMC + //#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -//#define E2_IS_TMC + //#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -//#define E3_IS_TMC + //#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -537,61 +537,61 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -//#define X_IS_L6470 + //#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define X2_IS_L6470 + //#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y_IS_L6470 + //#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y2_IS_L6470 + //#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z_IS_L6470 + //#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z2_IS_L6470 + //#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E0_IS_L6470 + //#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E1_IS_L6470 + //#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E2_IS_L6470 + //#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E3_IS_L6470 + //#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off diff --git a/Marlin/example_configurations/K8200/Configuration_adv.h b/Marlin/example_configurations/K8200/Configuration_adv.h index c0e058d5e7..1bf4103c72 100644 --- a/Marlin/example_configurations/K8200/Configuration_adv.h +++ b/Marlin/example_configurations/K8200/Configuration_adv.h @@ -356,10 +356,10 @@ //#define USE_WATCHDOG #if ENABLED(USE_WATCHDOG) -// If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. -// The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. -// However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. -//#define WATCHDOG_RESET_MANUAL + // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. + // The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. + // However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. + //#define WATCHDOG_RESET_MANUAL #endif // @section lcd @@ -397,7 +397,7 @@ #define MM_PER_ARC_SEGMENT 1 #define N_ARC_CORRECTION 25 -const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement +const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement // @section temperature @@ -475,52 +475,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -//#define X_IS_TMC + //#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -//#define X2_IS_TMC + //#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -//#define Y_IS_TMC + //#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -//#define Y2_IS_TMC + //#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -//#define Z_IS_TMC + //#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -//#define Z2_IS_TMC + //#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -//#define E0_IS_TMC + //#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -//#define E1_IS_TMC + //#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -//#define E2_IS_TMC + //#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -//#define E3_IS_TMC + //#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -537,61 +537,61 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -//#define X_IS_L6470 + //#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define X2_IS_L6470 + //#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y_IS_L6470 + //#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y2_IS_L6470 + //#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z_IS_L6470 + //#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z2_IS_L6470 + //#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E0_IS_L6470 + //#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E1_IS_L6470 + //#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E2_IS_L6470 + //#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E3_IS_L6470 + //#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h index 0abad2e5df..fe8e2db97d 100644 --- a/Marlin/example_configurations/RigidBot/Configuration_adv.h +++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h @@ -348,10 +348,10 @@ //#define USE_WATCHDOG #if ENABLED(USE_WATCHDOG) -// If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. -// The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. -// However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. -//#define WATCHDOG_RESET_MANUAL + // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. + // The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. + // However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. + //#define WATCHDOG_RESET_MANUAL #endif // @section lcd @@ -389,7 +389,7 @@ #define MM_PER_ARC_SEGMENT 1 #define N_ARC_CORRECTION 25 -const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement +const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement // @section temperature @@ -470,52 +470,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -//#define X_IS_TMC + //#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -//#define X2_IS_TMC + //#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -//#define Y_IS_TMC + //#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -//#define Y2_IS_TMC + //#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -//#define Z_IS_TMC + //#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -//#define Z2_IS_TMC + //#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -//#define E0_IS_TMC + //#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -//#define E1_IS_TMC + //#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -//#define E2_IS_TMC + //#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -//#define E3_IS_TMC + //#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -532,61 +532,61 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -//#define X_IS_L6470 + //#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define X2_IS_L6470 + //#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y_IS_L6470 + //#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y2_IS_L6470 + //#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z_IS_L6470 + //#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z2_IS_L6470 + //#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E0_IS_L6470 + //#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E1_IS_L6470 + //#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E2_IS_L6470 + //#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E3_IS_L6470 + //#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h index eb64a0d6b3..7866b7da31 100644 --- a/Marlin/example_configurations/SCARA/Configuration_adv.h +++ b/Marlin/example_configurations/SCARA/Configuration_adv.h @@ -356,10 +356,10 @@ //#define USE_WATCHDOG #if ENABLED(USE_WATCHDOG) -// If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. -// The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. -// However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. -//#define WATCHDOG_RESET_MANUAL + // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. + // The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. + // However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. + //#define WATCHDOG_RESET_MANUAL #endif // @section lcd @@ -397,7 +397,7 @@ #define MM_PER_ARC_SEGMENT 1 #define N_ARC_CORRECTION 25 -const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement +const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement // @section temperature @@ -475,52 +475,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -//#define X_IS_TMC + //#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -//#define X2_IS_TMC + //#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -//#define Y_IS_TMC + //#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -//#define Y2_IS_TMC + //#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -//#define Z_IS_TMC + //#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -//#define Z2_IS_TMC + //#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -//#define E0_IS_TMC + //#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -//#define E1_IS_TMC + //#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -//#define E2_IS_TMC + //#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -//#define E3_IS_TMC + //#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -537,61 +537,61 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -//#define X_IS_L6470 + //#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define X2_IS_L6470 + //#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y_IS_L6470 + //#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y2_IS_L6470 + //#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z_IS_L6470 + //#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z2_IS_L6470 + //#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E0_IS_L6470 + //#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E1_IS_L6470 + //#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E2_IS_L6470 + //#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E3_IS_L6470 + //#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off diff --git a/Marlin/example_configurations/TAZ4/Configuration_adv.h b/Marlin/example_configurations/TAZ4/Configuration_adv.h index b4e4539fe7..ee7fbcf94b 100644 --- a/Marlin/example_configurations/TAZ4/Configuration_adv.h +++ b/Marlin/example_configurations/TAZ4/Configuration_adv.h @@ -355,10 +355,10 @@ //#define USE_WATCHDOG #if ENABLED(USE_WATCHDOG) -// If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. -// The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. -// However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. -//#define WATCHDOG_RESET_MANUAL + // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. + // The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. + // However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. + //#define WATCHDOG_RESET_MANUAL #endif // @section lcd @@ -397,7 +397,7 @@ #define MM_PER_ARC_SEGMENT 1 #define N_ARC_CORRECTION 25 -const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement +const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement // @section temperature @@ -478,52 +478,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -//#define X_IS_TMC + //#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -//#define X2_IS_TMC + //#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -//#define Y_IS_TMC + //#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -//#define Y2_IS_TMC + //#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -//#define Z_IS_TMC + //#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -//#define Z2_IS_TMC + //#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -//#define E0_IS_TMC + //#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -//#define E1_IS_TMC + //#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -//#define E2_IS_TMC + //#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -//#define E3_IS_TMC + //#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -540,61 +540,61 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -//#define X_IS_L6470 + //#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define X2_IS_L6470 + //#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y_IS_L6470 + //#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y2_IS_L6470 + //#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z_IS_L6470 + //#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z2_IS_L6470 + //#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E0_IS_L6470 + //#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E1_IS_L6470 + //#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E2_IS_L6470 + //#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E3_IS_L6470 + //#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off diff --git a/Marlin/example_configurations/WITBOX/Configuration_adv.h b/Marlin/example_configurations/WITBOX/Configuration_adv.h index 3a006b58cf..cf6b6faa3d 100644 --- a/Marlin/example_configurations/WITBOX/Configuration_adv.h +++ b/Marlin/example_configurations/WITBOX/Configuration_adv.h @@ -356,10 +356,10 @@ //#define USE_WATCHDOG #if ENABLED(USE_WATCHDOG) -// If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. -// The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. -// However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. -//#define WATCHDOG_RESET_MANUAL + // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. + // The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. + // However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. + //#define WATCHDOG_RESET_MANUAL #endif // @section lcd @@ -397,7 +397,7 @@ #define MM_PER_ARC_SEGMENT 1 #define N_ARC_CORRECTION 25 -const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement +const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement // @section temperature @@ -475,52 +475,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -//#define X_IS_TMC + //#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -//#define X2_IS_TMC + //#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -//#define Y_IS_TMC + //#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -//#define Y2_IS_TMC + //#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -//#define Z_IS_TMC + //#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -//#define Z2_IS_TMC + //#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -//#define E0_IS_TMC + //#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -//#define E1_IS_TMC + //#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -//#define E2_IS_TMC + //#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -//#define E3_IS_TMC + //#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -537,61 +537,61 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -//#define X_IS_L6470 + //#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define X2_IS_L6470 + //#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y_IS_L6470 + //#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y2_IS_L6470 + //#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z_IS_L6470 + //#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z2_IS_L6470 + //#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E0_IS_L6470 + //#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E1_IS_L6470 + //#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E2_IS_L6470 + //#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E3_IS_L6470 + //#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h index 26ed97b22a..96c8614491 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h @@ -357,10 +357,10 @@ //#define USE_WATCHDOG #if ENABLED(USE_WATCHDOG) -// If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. -// The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. -// However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. -//#define WATCHDOG_RESET_MANUAL + // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. + // The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. + // However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. + //#define WATCHDOG_RESET_MANUAL #endif // @section lcd @@ -398,7 +398,7 @@ #define MM_PER_ARC_SEGMENT 1 #define N_ARC_CORRECTION 25 -const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement +const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement // @section temperature @@ -476,52 +476,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -//#define X_IS_TMC + //#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -//#define X2_IS_TMC + //#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -//#define Y_IS_TMC + //#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -//#define Y2_IS_TMC + //#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -//#define Z_IS_TMC + //#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -//#define Z2_IS_TMC + //#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -//#define E0_IS_TMC + //#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -//#define E1_IS_TMC + //#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -//#define E2_IS_TMC + //#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -//#define E3_IS_TMC + //#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -538,61 +538,61 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -//#define X_IS_L6470 + //#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define X2_IS_L6470 + //#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y_IS_L6470 + //#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y2_IS_L6470 + //#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z_IS_L6470 + //#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z2_IS_L6470 + //#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E0_IS_L6470 + //#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E1_IS_L6470 + //#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E2_IS_L6470 + //#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E3_IS_L6470 + //#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h index dc77577480..6539466035 100644 --- a/Marlin/example_configurations/delta/generic/Configuration_adv.h +++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h @@ -358,10 +358,10 @@ //#define USE_WATCHDOG #if ENABLED(USE_WATCHDOG) -// If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. -// The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. -// However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. -//#define WATCHDOG_RESET_MANUAL + // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. + // The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. + // However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. + //#define WATCHDOG_RESET_MANUAL #endif // @section lcd @@ -399,7 +399,7 @@ #define MM_PER_ARC_SEGMENT 1 #define N_ARC_CORRECTION 25 -const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement +const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement // @section temperature @@ -477,52 +477,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -//#define X_IS_TMC + //#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -//#define X2_IS_TMC + //#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -//#define Y_IS_TMC + //#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -//#define Y2_IS_TMC + //#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -//#define Z_IS_TMC + //#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -//#define Z2_IS_TMC + //#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -//#define E0_IS_TMC + //#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -//#define E1_IS_TMC + //#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -//#define E2_IS_TMC + //#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -//#define E3_IS_TMC + //#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -539,61 +539,61 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -//#define X_IS_L6470 + //#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define X2_IS_L6470 + //#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y_IS_L6470 + //#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y2_IS_L6470 + //#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z_IS_L6470 + //#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z2_IS_L6470 + //#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E0_IS_L6470 + //#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E1_IS_L6470 + //#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E2_IS_L6470 + //#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E3_IS_L6470 + //#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h index 95724e9e5d..1725193952 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h @@ -357,10 +357,10 @@ //#define USE_WATCHDOG #if ENABLED(USE_WATCHDOG) -// If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. -// The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. -// However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. -//#define WATCHDOG_RESET_MANUAL + // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. + // The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. + // However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. + //#define WATCHDOG_RESET_MANUAL #endif // @section lcd @@ -398,7 +398,7 @@ #define MM_PER_ARC_SEGMENT 1 #define N_ARC_CORRECTION 25 -const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement +const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement // @section temperature @@ -476,52 +476,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -//#define X_IS_TMC + //#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -//#define X2_IS_TMC + //#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -//#define Y_IS_TMC + //#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -//#define Y2_IS_TMC + //#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -//#define Z_IS_TMC + //#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -//#define Z2_IS_TMC + //#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -//#define E0_IS_TMC + //#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -//#define E1_IS_TMC + //#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -//#define E2_IS_TMC + //#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -//#define E3_IS_TMC + //#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -538,61 +538,61 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -//#define X_IS_L6470 + //#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define X2_IS_L6470 + //#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y_IS_L6470 + //#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y2_IS_L6470 + //#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z_IS_L6470 + //#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z2_IS_L6470 + //#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E0_IS_L6470 + //#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E1_IS_L6470 + //#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E2_IS_L6470 + //#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E3_IS_L6470 + //#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h index f500e42482..61373b3ed8 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h @@ -361,10 +361,10 @@ //#define USE_WATCHDOG #if ENABLED(USE_WATCHDOG) -// If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. -// The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. -// However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. -//#define WATCHDOG_RESET_MANUAL + // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. + // The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. + // However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. + //#define WATCHDOG_RESET_MANUAL #endif // @section lcd @@ -402,7 +402,7 @@ #define MM_PER_ARC_SEGMENT 1 #define N_ARC_CORRECTION 25 -const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement +const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement // @section temperature @@ -480,52 +480,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -//#define X_IS_TMC + //#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -//#define X2_IS_TMC + //#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -//#define Y_IS_TMC + //#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -//#define Y2_IS_TMC + //#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -//#define Z_IS_TMC + //#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -//#define Z2_IS_TMC + //#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -//#define E0_IS_TMC + //#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -//#define E1_IS_TMC + //#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -//#define E2_IS_TMC + //#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -//#define E3_IS_TMC + //#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -542,61 +542,61 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -//#define X_IS_L6470 + //#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define X2_IS_L6470 + //#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y_IS_L6470 + //#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y2_IS_L6470 + //#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z_IS_L6470 + //#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z2_IS_L6470 + //#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E0_IS_L6470 + //#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E1_IS_L6470 + //#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E2_IS_L6470 + //#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E3_IS_L6470 + //#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h index c837be88d2..6e5921dd3f 100644 --- a/Marlin/example_configurations/makibox/Configuration_adv.h +++ b/Marlin/example_configurations/makibox/Configuration_adv.h @@ -355,10 +355,10 @@ //#define USE_WATCHDOG #if ENABLED(USE_WATCHDOG) -// If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. -// The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. -// However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. -//#define WATCHDOG_RESET_MANUAL + // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. + // The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. + // However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. + //#define WATCHDOG_RESET_MANUAL #endif // @section lcd @@ -396,7 +396,7 @@ #define MM_PER_ARC_SEGMENT 1 #define N_ARC_CORRECTION 25 -const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement +const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement // @section temperature @@ -474,52 +474,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -//#define X_IS_TMC + //#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -//#define X2_IS_TMC + //#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -//#define Y_IS_TMC + //#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -//#define Y2_IS_TMC + //#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -//#define Z_IS_TMC + //#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -//#define Z2_IS_TMC + //#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -//#define E0_IS_TMC + //#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -//#define E1_IS_TMC + //#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -//#define E2_IS_TMC + //#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -//#define E3_IS_TMC + //#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -536,61 +536,61 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -//#define X_IS_L6470 + //#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define X2_IS_L6470 + //#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y_IS_L6470 + //#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y2_IS_L6470 + //#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z_IS_L6470 + //#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z2_IS_L6470 + //#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E0_IS_L6470 + //#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E1_IS_L6470 + //#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E2_IS_L6470 + //#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E3_IS_L6470 + //#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h index 5facef82ed..01b15afa49 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h @@ -356,10 +356,10 @@ //#define USE_WATCHDOG #if ENABLED(USE_WATCHDOG) -// If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. -// The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. -// However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. -//#define WATCHDOG_RESET_MANUAL + // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. + // The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. + // However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. + //#define WATCHDOG_RESET_MANUAL #endif // @section lcd @@ -397,7 +397,7 @@ #define MM_PER_ARC_SEGMENT 1 #define N_ARC_CORRECTION 25 -const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement +const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement // @section temperature @@ -475,52 +475,52 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_TMCDRIVER #if ENABLED(HAVE_TMCDRIVER) -//#define X_IS_TMC + //#define X_IS_TMC #define X_MAX_CURRENT 1000 //in mA #define X_SENSE_RESISTOR 91 //in mOhms #define X_MICROSTEPS 16 //number of microsteps -//#define X2_IS_TMC + //#define X2_IS_TMC #define X2_MAX_CURRENT 1000 //in mA #define X2_SENSE_RESISTOR 91 //in mOhms #define X2_MICROSTEPS 16 //number of microsteps -//#define Y_IS_TMC + //#define Y_IS_TMC #define Y_MAX_CURRENT 1000 //in mA #define Y_SENSE_RESISTOR 91 //in mOhms #define Y_MICROSTEPS 16 //number of microsteps -//#define Y2_IS_TMC + //#define Y2_IS_TMC #define Y2_MAX_CURRENT 1000 //in mA #define Y2_SENSE_RESISTOR 91 //in mOhms #define Y2_MICROSTEPS 16 //number of microsteps -//#define Z_IS_TMC + //#define Z_IS_TMC #define Z_MAX_CURRENT 1000 //in mA #define Z_SENSE_RESISTOR 91 //in mOhms #define Z_MICROSTEPS 16 //number of microsteps -//#define Z2_IS_TMC + //#define Z2_IS_TMC #define Z2_MAX_CURRENT 1000 //in mA #define Z2_SENSE_RESISTOR 91 //in mOhms #define Z2_MICROSTEPS 16 //number of microsteps -//#define E0_IS_TMC + //#define E0_IS_TMC #define E0_MAX_CURRENT 1000 //in mA #define E0_SENSE_RESISTOR 91 //in mOhms #define E0_MICROSTEPS 16 //number of microsteps -//#define E1_IS_TMC + //#define E1_IS_TMC #define E1_MAX_CURRENT 1000 //in mA #define E1_SENSE_RESISTOR 91 //in mOhms #define E1_MICROSTEPS 16 //number of microsteps -//#define E2_IS_TMC + //#define E2_IS_TMC #define E2_MAX_CURRENT 1000 //in mA #define E2_SENSE_RESISTOR 91 //in mOhms #define E2_MICROSTEPS 16 //number of microsteps -//#define E3_IS_TMC + //#define E3_IS_TMC #define E3_MAX_CURRENT 1000 //in mA #define E3_SENSE_RESISTOR 91 //in mOhms #define E3_MICROSTEPS 16 //number of microsteps @@ -537,61 +537,61 @@ const unsigned int dropsegments=5; //everything with less than this number of st //#define HAVE_L6470DRIVER #if ENABLED(HAVE_L6470DRIVER) -//#define X_IS_L6470 + //#define X_IS_L6470 #define X_MICROSTEPS 16 //number of microsteps #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define X2_IS_L6470 + //#define X2_IS_L6470 #define X2_MICROSTEPS 16 //number of microsteps #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y_IS_L6470 + //#define Y_IS_L6470 #define Y_MICROSTEPS 16 //number of microsteps #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Y2_IS_L6470 + //#define Y2_IS_L6470 #define Y2_MICROSTEPS 16 //number of microsteps #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z_IS_L6470 + //#define Z_IS_L6470 #define Z_MICROSTEPS 16 //number of microsteps #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define Z2_IS_L6470 + //#define Z2_IS_L6470 #define Z2_MICROSTEPS 16 //number of microsteps #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E0_IS_L6470 + //#define E0_IS_L6470 #define E0_MICROSTEPS 16 //number of microsteps #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E1_IS_L6470 + //#define E1_IS_L6470 #define E1_MICROSTEPS 16 //number of microsteps #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E2_IS_L6470 + //#define E2_IS_L6470 #define E2_MICROSTEPS 16 //number of microsteps #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall -//#define E3_IS_L6470 + //#define E3_IS_L6470 #define E3_MICROSTEPS 16 //number of microsteps #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high #define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off From 0b429461d58f1c0a032eae3015ca868eed507047 Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Thu, 10 Dec 2015 06:18:34 -0600 Subject: [PATCH 014/232] Back port Cosmetic changes --- .../Felix/Configuration.h | 24 +++++------ .../Felix/Configuration_DUAL.h | 32 +++++++------- .../Hephestos/Configuration.h | 24 +++++------ .../K8200/Configuration.h | 24 +++++------ .../RepRapWorld/Megatronics/Configuration.h | 24 +++++------ .../RigidBot/Configuration.h | 24 +++++------ .../SCARA/Configuration.h | 42 +++++++++---------- .../TAZ4/Configuration.h | 24 +++++------ .../WITBOX/Configuration.h | 24 +++++------ .../adafruit/ST7565/Configuration.h | 24 +++++------ .../delta/biv2.5/Configuration.h | 24 +++++------ .../delta/generic/Configuration.h | 24 +++++------ .../delta/kossel_mini/Configuration.h | 24 +++++------ .../delta/kossel_pro/Configuration.h | 24 +++++------ .../makibox/Configuration.h | 24 +++++------ .../tvrrug/Round2/Configuration.h | 24 +++++------ 16 files changed, 205 insertions(+), 205 deletions(-) diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index c06bfa0517..f946d35c0a 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -460,14 +460,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #else // !AUTO_BED_LEVELING_GRID - // Arbitrary points to probe. - // A simple cross-product is used to estimate the plane of the bed. - #define ABL_PROBE_PT_1_X 15 - #define ABL_PROBE_PT_1_Y 180 - #define ABL_PROBE_PT_2_X 15 - #define ABL_PROBE_PT_2_Y 20 - #define ABL_PROBE_PT_3_X 170 - #define ABL_PROBE_PT_3_Y 20 + // Arbitrary points to probe. + // A simple cross-product is used to estimate the plane of the bed. + #define ABL_PROBE_PT_1_X 15 + #define ABL_PROBE_PT_1_Y 180 + #define ABL_PROBE_PT_2_X 15 + #define ABL_PROBE_PT_2_Y 20 + #define ABL_PROBE_PT_3_X 170 + #define ABL_PROBE_PT_3_Y 20 #endif // AUTO_BED_LEVELING_GRID @@ -486,14 +486,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. - // Useful to retract a deployable Z probe. + //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. + // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. -// If you have enabled the bed auto leveling and are using the same Z probe for Z homing, -// it is highly recommended you let this Z_SAFE_HOMING enabled!!! + // If you have enabled the bed auto leveling and are using the same Z probe for Z homing, + // it is highly recommended you let this Z_SAFE_HOMING enabled!!! #define Z_SAFE_HOMING // This feature is meant to avoid Z homing with Z probe outside the bed area. // When defined, it will: diff --git a/Marlin/example_configurations/Felix/Configuration_DUAL.h b/Marlin/example_configurations/Felix/Configuration_DUAL.h index a0368c40e9..bd7b8eed4e 100644 --- a/Marlin/example_configurations/Felix/Configuration_DUAL.h +++ b/Marlin/example_configurations/Felix/Configuration_DUAL.h @@ -228,10 +228,10 @@ Here are some standard links for getting your machine calibrated: //#define PID_BED_DEBUG // Sends debug data to the serial port. #if ENABLED(PIDTEMPBED) -// Felix Foil Heater - #define DEFAULT_bedKp 103.37 - #define DEFAULT_bedKi 2.79 - #define DEFAULT_bedKd 956.94 + // Felix Foil Heater + #define DEFAULT_bedKp 103.37 + #define DEFAULT_bedKi 2.79 + #define DEFAULT_bedKd 956.94 // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles. #endif // PIDTEMPBED @@ -431,14 +431,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #else // !AUTO_BED_LEVELING_GRID - // Arbitrary points to probe. - // A simple cross-product is used to estimate the plane of the bed. - #define ABL_PROBE_PT_1_X 15 - #define ABL_PROBE_PT_1_Y 180 - #define ABL_PROBE_PT_2_X 15 - #define ABL_PROBE_PT_2_Y 20 - #define ABL_PROBE_PT_3_X 170 - #define ABL_PROBE_PT_3_Y 20 + // Arbitrary points to probe. + // A simple cross-product is used to estimate the plane of the bed. + #define ABL_PROBE_PT_1_X 15 + #define ABL_PROBE_PT_1_Y 180 + #define ABL_PROBE_PT_2_X 15 + #define ABL_PROBE_PT_2_Y 20 + #define ABL_PROBE_PT_3_X 170 + #define ABL_PROBE_PT_3_Y 20 #endif // AUTO_BED_LEVELING_GRID @@ -457,14 +457,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. - // Useful to retract a deployable Z probe. + //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. + // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. -// If you have enabled the bed auto leveling and are using the same Z probe for Z homing, -// it is highly recommended you let this Z_SAFE_HOMING enabled!!! + // If you have enabled the bed auto leveling and are using the same Z probe for Z homing, + // it is highly recommended you let this Z_SAFE_HOMING enabled!!! #define Z_SAFE_HOMING // This feature is meant to avoid Z homing with Z probe outside the bed area. // When defined, it will: diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index cd71535488..9fe3715f7f 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -471,14 +471,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #else // !AUTO_BED_LEVELING_GRID - // Arbitrary points to probe. - // A simple cross-product is used to estimate the plane of the bed. - #define ABL_PROBE_PT_1_X 15 - #define ABL_PROBE_PT_1_Y 180 - #define ABL_PROBE_PT_2_X 15 - #define ABL_PROBE_PT_2_Y 20 - #define ABL_PROBE_PT_3_X 170 - #define ABL_PROBE_PT_3_Y 20 + // Arbitrary points to probe. + // A simple cross-product is used to estimate the plane of the bed. + #define ABL_PROBE_PT_1_X 15 + #define ABL_PROBE_PT_1_Y 180 + #define ABL_PROBE_PT_2_X 15 + #define ABL_PROBE_PT_2_Y 20 + #define ABL_PROBE_PT_3_X 170 + #define ABL_PROBE_PT_3_Y 20 #endif // AUTO_BED_LEVELING_GRID @@ -497,14 +497,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. - // Useful to retract a deployable Z probe. + //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. + // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. -// If you have enabled the bed auto leveling and are using the same Z probe for Z homing, -// it is highly recommended you let this Z_SAFE_HOMING enabled!!! + // If you have enabled the bed auto leveling and are using the same Z probe for Z homing, + // it is highly recommended you let this Z_SAFE_HOMING enabled!!! #define Z_SAFE_HOMING // This feature is meant to avoid Z homing with Z probe outside the bed area. // When defined, it will: diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 3287924dc5..426d8e9b68 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -466,14 +466,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #else // !AUTO_BED_LEVELING_GRID - // Arbitrary points to probe. - // A simple cross-product is used to estimate the plane of the bed. - #define ABL_PROBE_PT_1_X 15 - #define ABL_PROBE_PT_1_Y 180 - #define ABL_PROBE_PT_2_X 15 - #define ABL_PROBE_PT_2_Y 20 - #define ABL_PROBE_PT_3_X 170 - #define ABL_PROBE_PT_3_Y 20 + // Arbitrary points to probe. + // A simple cross-product is used to estimate the plane of the bed. + #define ABL_PROBE_PT_1_X 15 + #define ABL_PROBE_PT_1_Y 180 + #define ABL_PROBE_PT_2_X 15 + #define ABL_PROBE_PT_2_Y 20 + #define ABL_PROBE_PT_3_X 170 + #define ABL_PROBE_PT_3_Y 20 #endif // AUTO_BED_LEVELING_GRID @@ -492,14 +492,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. - // Useful to retract a deployable Z probe. + //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. + // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. -// If you have enabled the bed auto leveling and are using the same Z probe for Z homing, -// it is highly recommended you let this Z_SAFE_HOMING enabled!!! + // If you have enabled the bed auto leveling and are using the same Z probe for Z homing, + // it is highly recommended you let this Z_SAFE_HOMING enabled!!! #define Z_SAFE_HOMING // This feature is meant to avoid Z homing with Z probe outside the bed area. // When defined, it will: diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index 115baee3cd..e03debc8fc 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -479,14 +479,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #else // !AUTO_BED_LEVELING_GRID - // Arbitrary points to probe. - // A simple cross-product is used to estimate the plane of the bed. - #define ABL_PROBE_PT_1_X 15 - #define ABL_PROBE_PT_1_Y 180 - #define ABL_PROBE_PT_2_X 15 - #define ABL_PROBE_PT_2_Y 20 - #define ABL_PROBE_PT_3_X 170 - #define ABL_PROBE_PT_3_Y 20 + // Arbitrary points to probe. + // A simple cross-product is used to estimate the plane of the bed. + #define ABL_PROBE_PT_1_X 15 + #define ABL_PROBE_PT_1_Y 180 + #define ABL_PROBE_PT_2_X 15 + #define ABL_PROBE_PT_2_Y 20 + #define ABL_PROBE_PT_3_X 170 + #define ABL_PROBE_PT_3_Y 20 #endif // AUTO_BED_LEVELING_GRID @@ -505,14 +505,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. - // Useful to retract a deployable Z probe. + //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. + // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. -// If you have enabled the bed auto leveling and are using the same Z probe for Z homing, -// it is highly recommended you let this Z_SAFE_HOMING enabled!!! + // If you have enabled the bed auto leveling and are using the same Z probe for Z homing, + // it is highly recommended you let this Z_SAFE_HOMING enabled!!! #define Z_SAFE_HOMING // This feature is meant to avoid Z homing with Z probe outside the bed area. // When defined, it will: diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 154a5da778..987fc36d33 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -464,14 +464,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #else // !AUTO_BED_LEVELING_GRID - // Arbitrary points to probe. - // A simple cross-product is used to estimate the plane of the bed. - #define ABL_PROBE_PT_1_X 15 - #define ABL_PROBE_PT_1_Y 180 - #define ABL_PROBE_PT_2_X 15 - #define ABL_PROBE_PT_2_Y 20 - #define ABL_PROBE_PT_3_X 170 - #define ABL_PROBE_PT_3_Y 20 + // Arbitrary points to probe. + // A simple cross-product is used to estimate the plane of the bed. + #define ABL_PROBE_PT_1_X 15 + #define ABL_PROBE_PT_1_Y 180 + #define ABL_PROBE_PT_2_X 15 + #define ABL_PROBE_PT_2_Y 20 + #define ABL_PROBE_PT_3_X 170 + #define ABL_PROBE_PT_3_Y 20 #endif // AUTO_BED_LEVELING_GRID @@ -490,14 +490,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. - // Useful to retract a deployable Z probe. + //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. + // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. -// If you have enabled the bed auto leveling and are using the same Z probe for Z homing, -// it is highly recommended you let this Z_SAFE_HOMING enabled!!! + // If you have enabled the bed auto leveling and are using the same Z probe for Z homing, + // it is highly recommended you let this Z_SAFE_HOMING enabled!!! #define Z_SAFE_HOMING // This feature is meant to avoid Z homing with Z probe outside the bed area. // When defined, it will: diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index da24a5b214..05c315917f 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -331,9 +331,9 @@ Here are some standard links for getting your machine calibrated: // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined //#define ENDSTOPPULLUP_XMAX //#define ENDSTOPPULLUP_YMAX - #define ENDSTOPPULLUP_ZMAX // open pin, inverted - #define ENDSTOPPULLUP_XMIN // open pin, inverted - #define ENDSTOPPULLUP_YMIN // open pin, inverted + #define ENDSTOPPULLUP_ZMAX // open pin, inverted + #define ENDSTOPPULLUP_XMIN // open pin, inverted + #define ENDSTOPPULLUP_YMIN // open pin, inverted //#define ENDSTOPPULLUP_ZMIN //#define ENDSTOPPULLUP_ZMIN_PROBE #endif @@ -486,14 +486,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #else // !AUTO_BED_LEVELING_GRID - // Arbitrary points to probe. - // A simple cross-product is used to estimate the plane of the bed. - #define ABL_PROBE_PT_1_X 15 - #define ABL_PROBE_PT_1_Y 180 - #define ABL_PROBE_PT_2_X 15 - #define ABL_PROBE_PT_2_Y 20 - #define ABL_PROBE_PT_3_X 170 - #define ABL_PROBE_PT_3_Y 20 + // Arbitrary points to probe. + // A simple cross-product is used to estimate the plane of the bed. + #define ABL_PROBE_PT_1_X 15 + #define ABL_PROBE_PT_1_Y 180 + #define ABL_PROBE_PT_2_X 15 + #define ABL_PROBE_PT_2_Y 20 + #define ABL_PROBE_PT_3_X 170 + #define ABL_PROBE_PT_3_Y 20 #endif // AUTO_BED_LEVELING_GRID @@ -512,21 +512,21 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. - // Useful to retract a deployable Z probe. + //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. + // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. -// If you have enabled the bed auto leveling and are using the same Z probe for Z homing, -// it is highly recommended you let this Z_SAFE_HOMING enabled!!! + // If you have enabled the bed auto leveling and are using the same Z probe for Z homing, + // it is highly recommended you let this Z_SAFE_HOMING enabled!!! - //#define Z_SAFE_HOMING // This feature is meant to avoid Z homing with Z probe outside the bed area. - // When defined, it will: - // - Allow Z homing only after X and Y homing AND stepper drivers still enabled. - // - If stepper drivers timeout, it will need X and Y homing again before Z homing. - // - Position the Z probe in a defined XY point before Z Homing when homing all axis (G28). - // - Block Z homing only when the Z probe is outside bed area. + //#define Z_SAFE_HOMING // This feature is meant to avoid Z homing with Z probe outside the bed area. + // When defined, it will: + // - Allow Z homing only after X and Y homing AND stepper drivers still enabled. + // - If stepper drivers timeout, it will need X and Y homing again before Z homing. + // - Position the Z probe in a defined XY point before Z Homing when homing all axis (G28). + // - Block Z homing only when the Z probe is outside bed area. #if ENABLED(Z_SAFE_HOMING) diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index d7f312a4fc..484d32da14 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -497,14 +497,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #else // !AUTO_BED_LEVELING_GRID - // Arbitrary points to probe. - // A simple cross-product is used to estimate the plane of the bed. - #define ABL_PROBE_PT_1_X 15 - #define ABL_PROBE_PT_1_Y 180 - #define ABL_PROBE_PT_2_X 15 - #define ABL_PROBE_PT_2_Y 20 - #define ABL_PROBE_PT_3_X 170 - #define ABL_PROBE_PT_3_Y 20 + // Arbitrary points to probe. + // A simple cross-product is used to estimate the plane of the bed. + #define ABL_PROBE_PT_1_X 15 + #define ABL_PROBE_PT_1_Y 180 + #define ABL_PROBE_PT_2_X 15 + #define ABL_PROBE_PT_2_Y 20 + #define ABL_PROBE_PT_3_X 170 + #define ABL_PROBE_PT_3_Y 20 #endif // AUTO_BED_LEVELING_GRID @@ -523,14 +523,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. - // Useful to retract a deployable Z probe. + //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. + // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. -// If you have enabled the bed auto leveling and are using the same Z probe for Z homing, -// it is highly recommended you let this Z_SAFE_HOMING enabled!!! + // If you have enabled the bed auto leveling and are using the same Z probe for Z homing, + // it is highly recommended you let this Z_SAFE_HOMING enabled!!! #define Z_SAFE_HOMING // This feature is meant to avoid Z homing with Z probe outside the bed area. // When defined, it will: diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 19fc03403f..2d235e59e7 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -470,14 +470,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #else // !AUTO_BED_LEVELING_GRID - // Arbitrary points to probe. - // A simple cross-product is used to estimate the plane of the bed. - #define ABL_PROBE_PT_1_X 15 - #define ABL_PROBE_PT_1_Y 180 - #define ABL_PROBE_PT_2_X 15 - #define ABL_PROBE_PT_2_Y 20 - #define ABL_PROBE_PT_3_X 170 - #define ABL_PROBE_PT_3_Y 20 + // Arbitrary points to probe. + // A simple cross-product is used to estimate the plane of the bed. + #define ABL_PROBE_PT_1_X 15 + #define ABL_PROBE_PT_1_Y 180 + #define ABL_PROBE_PT_2_X 15 + #define ABL_PROBE_PT_2_Y 20 + #define ABL_PROBE_PT_3_X 170 + #define ABL_PROBE_PT_3_Y 20 #endif // AUTO_BED_LEVELING_GRID @@ -496,14 +496,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. - // Useful to retract a deployable Z probe. + //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. + // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. -// If you have enabled the bed auto leveling and are using the same Z probe for Z homing, -// it is highly recommended you let this Z_SAFE_HOMING enabled!!! + // If you have enabled the bed auto leveling and are using the same Z probe for Z homing, + // it is highly recommended you let this Z_SAFE_HOMING enabled!!! #define Z_SAFE_HOMING // This feature is meant to avoid Z homing with Z probe outside the bed area. // When defined, it will: diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 90935308de..442ee1d7b4 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -479,14 +479,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #else // !AUTO_BED_LEVELING_GRID - // Arbitrary points to probe. - // A simple cross-product is used to estimate the plane of the bed. - #define ABL_PROBE_PT_1_X 15 - #define ABL_PROBE_PT_1_Y 180 - #define ABL_PROBE_PT_2_X 15 - #define ABL_PROBE_PT_2_Y 20 - #define ABL_PROBE_PT_3_X 170 - #define ABL_PROBE_PT_3_Y 20 + // Arbitrary points to probe. + // A simple cross-product is used to estimate the plane of the bed. + #define ABL_PROBE_PT_1_X 15 + #define ABL_PROBE_PT_1_Y 180 + #define ABL_PROBE_PT_2_X 15 + #define ABL_PROBE_PT_2_Y 20 + #define ABL_PROBE_PT_3_X 170 + #define ABL_PROBE_PT_3_Y 20 #endif // AUTO_BED_LEVELING_GRID @@ -505,14 +505,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. - // Useful to retract a deployable Z probe. + //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. + // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. -// If you have enabled the bed auto leveling and are using the same Z probe for Z homing, -// it is highly recommended you let this Z_SAFE_HOMING enabled!!! + // If you have enabled the bed auto leveling and are using the same Z probe for Z homing, + // it is highly recommended you let this Z_SAFE_HOMING enabled!!! #define Z_SAFE_HOMING // This feature is meant to avoid Z homing with Z probe outside the bed area. // When defined, it will: diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index bbb15ffa8f..ec78143c63 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -517,14 +517,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #else // !AUTO_BED_LEVELING_GRID - // Arbitrary points to probe. - // A simple cross-product is used to estimate the plane of the bed. - #define ABL_PROBE_PT_1_X 15 - #define ABL_PROBE_PT_1_Y 180 - #define ABL_PROBE_PT_2_X 15 - #define ABL_PROBE_PT_2_Y 20 - #define ABL_PROBE_PT_3_X 170 - #define ABL_PROBE_PT_3_Y 20 + // Arbitrary points to probe. + // A simple cross-product is used to estimate the plane of the bed. + #define ABL_PROBE_PT_1_X 15 + #define ABL_PROBE_PT_1_Y 180 + #define ABL_PROBE_PT_2_X 15 + #define ABL_PROBE_PT_2_Y 20 + #define ABL_PROBE_PT_3_X 170 + #define ABL_PROBE_PT_3_Y 20 #endif // AUTO_BED_LEVELING_GRID @@ -543,8 +543,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 50 // How much the Z axis will be raised after the last probing point. -//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. - // Useful to retract a deployable Z probe. + //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. + // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. @@ -630,8 +630,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ #endif -// If you have enabled the bed auto leveling and are using the same Z probe for Z homing, -// it is highly recommended you let this Z_SAFE_HOMING enabled!!! + // If you have enabled the bed auto leveling and are using the same Z probe for Z homing, + // it is highly recommended you let this Z_SAFE_HOMING enabled!!! #define Z_SAFE_HOMING // This feature is meant to avoid Z homing with Z probe outside the bed area. // When defined, it will: diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 7b8afbef08..78284a928d 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -518,14 +518,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #else // !AUTO_BED_LEVELING_GRID - // Arbitrary points to probe. - // A simple cross-product is used to estimate the plane of the bed. - #define ABL_PROBE_PT_1_X 15 - #define ABL_PROBE_PT_1_Y 180 - #define ABL_PROBE_PT_2_X 15 - #define ABL_PROBE_PT_2_Y 20 - #define ABL_PROBE_PT_3_X 170 - #define ABL_PROBE_PT_3_Y 20 + // Arbitrary points to probe. + // A simple cross-product is used to estimate the plane of the bed. + #define ABL_PROBE_PT_1_X 15 + #define ABL_PROBE_PT_1_Y 180 + #define ABL_PROBE_PT_2_X 15 + #define ABL_PROBE_PT_2_Y 20 + #define ABL_PROBE_PT_3_X 170 + #define ABL_PROBE_PT_3_Y 20 #endif // AUTO_BED_LEVELING_GRID @@ -544,8 +544,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points #define Z_RAISE_AFTER_PROBING 50 // How much the Z axis will be raised after the last probing point. -//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. - // Useful to retract a deployable Z probe. + //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. + // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. @@ -631,8 +631,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ #endif -// If you have enabled the bed auto leveling and are using the same Z probe for Z homing, -// it is highly recommended you let this Z_SAFE_HOMING enabled!!! + // If you have enabled the bed auto leveling and are using the same Z probe for Z homing, + // it is highly recommended you let this Z_SAFE_HOMING enabled!!! #define Z_SAFE_HOMING // This feature is meant to avoid Z homing with Z probe outside the bed area. // When defined, it will: diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index ba37cff436..75e4d11ba4 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -518,14 +518,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #else // !AUTO_BED_LEVELING_GRID - // Arbitrary points to probe. - // A simple cross-product is used to estimate the plane of the bed. - #define ABL_PROBE_PT_1_X 15 - #define ABL_PROBE_PT_1_Y 180 - #define ABL_PROBE_PT_2_X 15 - #define ABL_PROBE_PT_2_Y 20 - #define ABL_PROBE_PT_3_X 170 - #define ABL_PROBE_PT_3_Y 20 + // Arbitrary points to probe. + // A simple cross-product is used to estimate the plane of the bed. + #define ABL_PROBE_PT_1_X 15 + #define ABL_PROBE_PT_1_Y 180 + #define ABL_PROBE_PT_2_X 15 + #define ABL_PROBE_PT_2_Y 20 + #define ABL_PROBE_PT_3_X 170 + #define ABL_PROBE_PT_3_Y 20 #endif // AUTO_BED_LEVELING_GRID @@ -544,8 +544,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points #define Z_RAISE_AFTER_PROBING 50 // How much the Z axis will be raised after the last probing point. -//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. - // Useful to retract a deployable Z probe. + //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. + // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. @@ -635,8 +635,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ #endif -// If you have enabled the bed auto leveling and are using the same Z probe for Z homing, -// it is highly recommended you let this Z_SAFE_HOMING enabled!!! + // If you have enabled the bed auto leveling and are using the same Z probe for Z homing, + // it is highly recommended you let this Z_SAFE_HOMING enabled!!! #define Z_SAFE_HOMING // This feature is meant to avoid Z homing with Z probe outside the bed area. // When defined, it will: diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index ed798c4e49..43fc9ae738 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -505,14 +505,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #else // !AUTO_BED_LEVELING_GRID - // Arbitrary points to probe. - // A simple cross-product is used to estimate the plane of the bed. - #define ABL_PROBE_PT_1_X 15 - #define ABL_PROBE_PT_1_Y 180 - #define ABL_PROBE_PT_2_X 15 - #define ABL_PROBE_PT_2_Y 20 - #define ABL_PROBE_PT_3_X 170 - #define ABL_PROBE_PT_3_Y 20 + // Arbitrary points to probe. + // A simple cross-product is used to estimate the plane of the bed. + #define ABL_PROBE_PT_1_X 15 + #define ABL_PROBE_PT_1_Y 180 + #define ABL_PROBE_PT_2_X 15 + #define ABL_PROBE_PT_2_Y 20 + #define ABL_PROBE_PT_3_X 170 + #define ABL_PROBE_PT_3_Y 20 #endif // AUTO_BED_LEVELING_GRID @@ -533,8 +533,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. - // Useful to retract a deployable Z probe. + //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. + // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. @@ -620,8 +620,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ #endif -// If you have enabled the bed auto leveling and are using the same Z probe for Z homing, -// it is highly recommended you let this Z_SAFE_HOMING enabled!!! + // If you have enabled the bed auto leveling and are using the same Z probe for Z homing, + // it is highly recommended you let this Z_SAFE_HOMING enabled!!! #define Z_SAFE_HOMING // This feature is meant to avoid Z homing with Z probe outside the bed area. // When defined, it will: diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index db943ee528..2f8fd73ba8 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -481,14 +481,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #else // !AUTO_BED_LEVELING_GRID - // Arbitrary points to probe. - // A simple cross-product is used to estimate the plane of the bed. - #define ABL_PROBE_PT_1_X 15 - #define ABL_PROBE_PT_1_Y 180 - #define ABL_PROBE_PT_2_X 15 - #define ABL_PROBE_PT_2_Y 20 - #define ABL_PROBE_PT_3_X 170 - #define ABL_PROBE_PT_3_Y 20 + // Arbitrary points to probe. + // A simple cross-product is used to estimate the plane of the bed. + #define ABL_PROBE_PT_1_X 15 + #define ABL_PROBE_PT_1_Y 180 + #define ABL_PROBE_PT_2_X 15 + #define ABL_PROBE_PT_2_Y 20 + #define ABL_PROBE_PT_3_X 170 + #define ABL_PROBE_PT_3_Y 20 #endif // AUTO_BED_LEVELING_GRID @@ -507,14 +507,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. - // Useful to retract a deployable Z probe. + //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. + // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. -// If you have enabled the bed auto leveling and are using the same Z probe for Z homing, -// it is highly recommended you let this Z_SAFE_HOMING enabled!!! + // If you have enabled the bed auto leveling and are using the same Z probe for Z homing, + // it is highly recommended you let this Z_SAFE_HOMING enabled!!! #define Z_SAFE_HOMING // This feature is meant to avoid Z homing with Z probe outside the bed area. // When defined, it will: diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 50b9a28801..9a6aac98d3 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -469,14 +469,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #else // !AUTO_BED_LEVELING_GRID - // Arbitrary points to probe. - // A simple cross-product is used to estimate the plane of the bed. - #define ABL_PROBE_PT_1_X 15 - #define ABL_PROBE_PT_1_Y 180 - #define ABL_PROBE_PT_2_X 15 - #define ABL_PROBE_PT_2_Y 20 - #define ABL_PROBE_PT_3_X 170 - #define ABL_PROBE_PT_3_Y 20 + // Arbitrary points to probe. + // A simple cross-product is used to estimate the plane of the bed. + #define ABL_PROBE_PT_1_X 15 + #define ABL_PROBE_PT_1_Y 180 + #define ABL_PROBE_PT_2_X 15 + #define ABL_PROBE_PT_2_Y 20 + #define ABL_PROBE_PT_3_X 170 + #define ABL_PROBE_PT_3_Y 20 #endif // AUTO_BED_LEVELING_GRID @@ -495,14 +495,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. - // Useful to retract a deployable Z probe. + //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. + // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. -// If you have enabled the bed auto leveling and are using the same Z probe for Z homing, -// it is highly recommended you let this Z_SAFE_HOMING enabled!!! + // If you have enabled the bed auto leveling and are using the same Z probe for Z homing, + // it is highly recommended you let this Z_SAFE_HOMING enabled!!! #define Z_SAFE_HOMING // This feature is meant to avoid Z homing with Z probe outside the bed area. // When defined, it will: From 1635613c255ae87a88ede49cf05ff03bc7b65794 Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Thu, 10 Dec 2015 06:22:26 -0600 Subject: [PATCH 015/232] Backport cosmetic --- Marlin/Configuration.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 5838943898..b7f8f4f1df 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -478,14 +478,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #else // !AUTO_BED_LEVELING_GRID - // Arbitrary points to probe. - // A simple cross-product is used to estimate the plane of the bed. - #define ABL_PROBE_PT_1_X 15 - #define ABL_PROBE_PT_1_Y 180 - #define ABL_PROBE_PT_2_X 15 - #define ABL_PROBE_PT_2_Y 20 - #define ABL_PROBE_PT_3_X 170 - #define ABL_PROBE_PT_3_Y 20 + // Arbitrary points to probe. + // A simple cross-product is used to estimate the plane of the bed. + #define ABL_PROBE_PT_1_X 15 + #define ABL_PROBE_PT_1_Y 180 + #define ABL_PROBE_PT_2_X 15 + #define ABL_PROBE_PT_2_Y 20 + #define ABL_PROBE_PT_3_X 170 + #define ABL_PROBE_PT_3_Y 20 #endif // AUTO_BED_LEVELING_GRID @@ -504,8 +504,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. -//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. - // Useful to retract a deployable Z probe. + //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. + // Useful to retract a deployable Z probe. //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. From 3b2973da6ab6ddb8e3ed5ccca154663a3a7b3a05 Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Thu, 10 Dec 2015 07:03:28 -0600 Subject: [PATCH 016/232] Prepare Ramps for user redefinition --- Marlin/pins_RAMPS_13.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Marlin/pins_RAMPS_13.h b/Marlin/pins_RAMPS_13.h index dde95a2ede..b761448b7e 100644 --- a/Marlin/pins_RAMPS_13.h +++ b/Marlin/pins_RAMPS_13.h @@ -41,7 +41,9 @@ #define X_DIR_PIN 55 #define X_ENABLE_PIN 38 #define X_MIN_PIN 3 -#define X_MAX_PIN 2 +#ifndef X_MAX_PIN + #define X_MAX_PIN 2 +#endif #define Y_STEP_PIN 60 #define Y_DIR_PIN 61 @@ -98,8 +100,6 @@ #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL) #define KILL_PIN 41 -#else - #define KILL_PIN -1 #endif #if MB(RAMPS_13_EFF) @@ -271,3 +271,7 @@ #define MISO_PIN 50 #define MOSI_PIN 51 #endif + +#ifndef KILL_PIN + // #define KILL_PIN -1 +#endif From 0fa3bac8eebe20d8416cd0826c245fb93eba1fdb Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Thu, 10 Dec 2015 07:03:55 -0600 Subject: [PATCH 017/232] =?UTF-8?q?If=20unused,=20just=20don=E2=80=99t=20d?= =?UTF-8?q?efine=20it.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/pins_RAMPS_13.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/pins_RAMPS_13.h b/Marlin/pins_RAMPS_13.h index b761448b7e..2f21035cf3 100644 --- a/Marlin/pins_RAMPS_13.h +++ b/Marlin/pins_RAMPS_13.h @@ -232,7 +232,7 @@ #if ENABLED(G3D_PANEL) #define SD_DETECT_PIN 49 #else - #define SD_DETECT_PIN -1 // Ramps doesn't use this + // #define SD_DETECT_PIN -1 // Ramps doesn't use this #endif #endif From 58658c9279cb05ec4836c69b014965d4c169fc5e Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Thu, 10 Dec 2015 05:26:48 -0600 Subject: [PATCH 018/232] Call the probe pin a probe pin and not a min endstop --- Marlin/pins_BRAINWAVE_PRO.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/pins_BRAINWAVE_PRO.h b/Marlin/pins_BRAINWAVE_PRO.h index 4f954b6b1c..8d1e53e1a6 100644 --- a/Marlin/pins_BRAINWAVE_PRO.h +++ b/Marlin/pins_BRAINWAVE_PRO.h @@ -31,7 +31,7 @@ #define Z_DIR_PIN 28 #define Z_ENABLE_PIN 37 #define Z_MAX_PIN 36 -#define Z_MIN_PIN 17 // Bed Z probe +#define Z_MIN_PROBE_PIN 17 // Bed Z probe #define E0_STEP_PIN 35 #define E0_DIR_PIN 34 From 7a670e39117c5d98a519d25ce64090eda15b62f0 Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Thu, 10 Dec 2015 07:05:38 -0600 Subject: [PATCH 019/232] Improve planner & stepper PR #263 --- Marlin/planner.cpp | 9 +++++---- Marlin/stepper.cpp | 48 +++++++++++++++++++++------------------------- 2 files changed, 27 insertions(+), 30 deletions(-) diff --git a/Marlin/planner.cpp b/Marlin/planner.cpp index b90be9f16c..7f54c8950c 100644 --- a/Marlin/planner.cpp +++ b/Marlin/planner.cpp @@ -227,16 +227,17 @@ void planner_reverse_pass_kernel(block_t* previous, block_t* current, block_t* n // If entry speed is already at the maximum entry speed, no need to recheck. Block is cruising. // If not, block in state of acceleration or deceleration. Reset entry speed to maximum and // check for maximum allowable speed reductions to ensure maximum possible planned speed. - if (current->entry_speed != current->max_entry_speed) { + float max_entry_speed = current->max_entry_speed; + if (current->entry_speed != max_entry_speed) { // If nominal length true, max junction speed is guaranteed to be reached. Only compute // for max allowable speed if block is decelerating and nominal length is false. - if (!current->nominal_length_flag && current->max_entry_speed > next->entry_speed) { - current->entry_speed = min(current->max_entry_speed, + if (!current->nominal_length_flag && max_entry_speed > next->entry_speed) { + current->entry_speed = min(max_entry_speed, max_allowable_speed(-current->acceleration, next->entry_speed, current->millimeters)); } else { - current->entry_speed = current->max_entry_speed; + current->entry_speed = max_entry_speed; } current->recalculate_flag = true; diff --git a/Marlin/stepper.cpp b/Marlin/stepper.cpp index 327b6449af..fa1e9bfdcf 100644 --- a/Marlin/stepper.cpp +++ b/Marlin/stepper.cpp @@ -68,9 +68,9 @@ volatile static unsigned long step_events_completed; // The number of step event static long acceleration_time, deceleration_time; //static unsigned long accelerate_until, decelerate_after, acceleration_rate, initial_rate, final_rate, nominal_rate; static unsigned short acc_step_rate; // needed for deceleration start point -static char step_loops; +static uint8_t step_loops; +static uint8_t step_loops_nominal; static unsigned short OCR1A_nominal; -static unsigned short step_loops_nominal; volatile long endstops_trigsteps[3] = { 0 }; volatile long endstops_stepsTotal, endstops_stepsDone; @@ -480,7 +480,8 @@ void st_wake_up() { FORCE_INLINE unsigned short calc_timer(unsigned short step_rate) { unsigned short timer; - if (step_rate > MAX_STEP_FREQUENCY) step_rate = MAX_STEP_FREQUENCY; + + NOMORE(step_rate, MAX_STEP_FREQUENCY); if (step_rate > 20000) { // If steprate > 20kHz >> step 4 times step_rate = (step_rate >> 2) & 0x3fff; @@ -494,8 +495,8 @@ FORCE_INLINE unsigned short calc_timer(unsigned short step_rate) { step_loops = 1; } - if (step_rate < (F_CPU / 500000)) step_rate = (F_CPU / 500000); - step_rate -= (F_CPU / 500000); // Correct for minimal speed + NOLESS(step_rate, F_CPU / 500000); + step_rate -= F_CPU / 500000; // Correct for minimal speed if (step_rate >= (8 * 256)) { // higher step rate unsigned short table_address = (unsigned short)&speed_lookuptable_fast[(unsigned char)(step_rate >> 8)][0]; unsigned char tmp_step_rate = (step_rate & 0x00ff); @@ -699,8 +700,7 @@ ISR(TIMER1_COMPA_vect) { acc_step_rate += current_block->initial_rate; // upper limit - if (acc_step_rate > current_block->nominal_rate) - acc_step_rate = current_block->nominal_rate; + NOMORE(acc_step_rate, current_block->nominal_rate); // step_rate to timer interval timer = calc_timer(acc_step_rate); @@ -709,10 +709,9 @@ ISR(TIMER1_COMPA_vect) { #if ENABLED(ADVANCE) - for (int8_t i = 0; i < step_loops; i++) { - advance += advance_rate; - } - //if (advance > current_block->advance) advance = current_block->advance; + advance += advance_rate * step_loops; + //NOLESS(advance, current_block->advance); + // Do E steps + advance steps e_steps[current_block->active_extruder] += ((advance >> 8) - old_advance); old_advance = advance >> 8; @@ -722,29 +721,26 @@ ISR(TIMER1_COMPA_vect) { else if (step_events_completed > (unsigned long)current_block->decelerate_after) { MultiU24X32toH16(step_rate, deceleration_time, current_block->acceleration_rate); - if (step_rate > acc_step_rate) { // Check step_rate stays positive - step_rate = current_block->final_rate; + if (step_rate <= acc_step_rate) { // Still decelerating? + step_rate = acc_step_rate - step_rate; + NOLESS(step_rate, current_block->final_rate); } - else { - step_rate = acc_step_rate - step_rate; // Decelerate from aceleration end point. - } - - // lower limit - if (step_rate < current_block->final_rate) + else step_rate = current_block->final_rate; // step_rate to timer interval timer = calc_timer(step_rate); OCR1A = timer; deceleration_time += timer; + #if ENABLED(ADVANCE) - for (int8_t i = 0; i < step_loops; i++) { - advance -= advance_rate; - } - if (advance < final_advance) advance = final_advance; + advance -= advance_rate * step_loops; + NOLESS(advance, final_advance); + // Do E steps + advance steps - e_steps[current_block->active_extruder] += ((advance >> 8) - old_advance); - old_advance = advance >> 8; + uint32_t advance_whole = advance >> 8; + e_steps[current_block->active_extruder] += advance_whole - old_advance; + old_advance = advance_whole; #endif //ADVANCE } else { @@ -1201,7 +1197,7 @@ void digipot_init() { SPI.begin(); pinMode(DIGIPOTSS_PIN, OUTPUT); - for (int i = 0; i <= 4; i++) { + for (int i = 0; i < COUNT(digipot_motor_current); i++) { //digitalPotWrite(digipot_ch[i], digipot_motor_current[i]); digipot_current(i, digipot_motor_current[i]); } From f6950acb8e93b94f9e32120c1a2468dad23d5020 Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Thu, 10 Dec 2015 18:25:41 -0600 Subject: [PATCH 020/232] =?UTF-8?q?Residual=20unused=20variable=20?= =?UTF-8?q?=E2=80=94=20Backport?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/Marlin_main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 12682cd44e..d21bd599e9 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -4015,7 +4015,6 @@ inline void gcode_M109() { millis_t ms = millis(); if (ms > temp_ms + 1000UL) { //Print Temp Reading every 1 second while heating up. temp_ms = ms; - float tt = degHotend(active_extruder); #if HAS_TEMP_0 || HAS_TEMP_BED || ENABLED(HEATER_0_USES_MAX6675) print_heaterstates(); SERIAL_EOL; From 5eeea2f611ca7104b90a789ae1a16aa719603ad9 Mon Sep 17 00:00:00 2001 From: Ruwan J Egoda Gamage Date: Sat, 12 Dec 2015 20:57:36 -0500 Subject: [PATCH 021/232] Fixing Rigidbot LCD Panel Support --- Marlin/cardreader.cpp | 2 +- .../RigidBot/Configuration.h | 11 ++-- .../RigidBot/Configuration_adv.h | 8 +-- Marlin/pins_RIGIDBOARD.h | 31 +++++------ Marlin/ultralcd.cpp | 51 ++++++++++++++++--- Marlin/ultralcd.h | 3 ++ 6 files changed, 77 insertions(+), 29 deletions(-) diff --git a/Marlin/cardreader.cpp b/Marlin/cardreader.cpp index 61f4a93ccf..f6b55f9301 100644 --- a/Marlin/cardreader.cpp +++ b/Marlin/cardreader.cpp @@ -196,7 +196,7 @@ void CardReader::initsd() { if (root.isOpen()) root.close(); #if ENABLED(SDEXTRASLOW) - #define SPI_SPEED SPI_QUARTER_SPEED + #define SPI_SPEED SPI_SIXTEENTH_SPEED #elif ENABLED(SDSLOW) #define SPI_SPEED SPI_HALF_SPEED #else diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 987fc36d33..e0c956e17f 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -219,6 +219,11 @@ Here are some standard links for getting your machine calibrated: //#define DEFAULT_Ki 0.85 //#define DEFAULT_Kd 245 + // E3D w/ rigidbot cartridge + //#define DEFAULT_Kp 16.30 + //#define DEFAULT_Ki 0.95 + //#define DEFAULT_Kd 69.69 + #endif // PIDTEMP //=========================================================================== @@ -611,7 +616,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // 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 #if ENABLED(EEPROM_SETTINGS) // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: @@ -651,10 +656,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define ULTRA_LCD //general LCD support, also 16x2 //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) -//#define SDSUPPORT // Enable SD Card Support in Hardware Console +#define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h index fe8e2db97d..5a70c9d5cc 100644 --- a/Marlin/example_configurations/RigidBot/Configuration_adv.h +++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h @@ -279,9 +279,9 @@ //=============================Additional Features=========================== //=========================================================================== -#define ENCODER_RATE_MULTIPLIER // If defined, certain menu edit operations automatically multiply the steps when the encoder is moved quickly -#define ENCODER_10X_STEPS_PER_SEC 75 // If the encoder steps per sec exceeds this value, multiply steps moved x10 to quickly advance the value -#define ENCODER_100X_STEPS_PER_SEC 160 // If the encoder steps per sec exceeds this value, multiply steps moved x100 to really quickly advance the value +//#define ENCODER_RATE_MULTIPLIER // If defined, certain menu edit operations automatically multiply the steps when the encoder is moved quickly +//#define ENCODER_10X_STEPS_PER_SEC 75 // If the encoder steps per sec exceeds this value, multiply steps moved x10 to quickly advance the value +//#define ENCODER_100X_STEPS_PER_SEC 160 // If the encoder steps per sec exceeds this value, multiply steps moved x100 to really quickly advance the value //#define CHDK 4 //Pin for triggering CHDK to take a picture see how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/ #define CHDK_DELAY 50 //How long in ms the pin should stay HIGH before going LOW again @@ -414,7 +414,7 @@ const unsigned int dropsegments = 5; //everything with less than this number of //The ASCII buffer for receiving from the serial: #define MAX_CMD_SIZE 96 -#define BUFSIZE 4 +#define BUFSIZE 8 // Bad Serial-connections can miss a received command by sending an 'ok' // Therefore some clients abort after 30 seconds in a timeout. diff --git a/Marlin/pins_RIGIDBOARD.h b/Marlin/pins_RIGIDBOARD.h index 4f8abc1266..3fe46a9ff6 100644 --- a/Marlin/pins_RIGIDBOARD.h +++ b/Marlin/pins_RIGIDBOARD.h @@ -5,7 +5,10 @@ #include "pins_RAMPS_13.h" #if ENABLED(Z_MIN_PROBE_ENDSTOP) - #define Z_MIN_PROBE_PIN 19 + #undef Z_MAX_PIN + #define Z_MAX_PIN -1 + #undef Z_MIN_PROBE_PIN + #define Z_MIN_PROBE_PIN 19 // Z-MAX pin J14 End Stops #endif #undef HEATER_0_PIN @@ -25,24 +28,22 @@ #undef BEEPER_PIN #define BEEPER_PIN -1 - #undef SD_DETECT_PIN - #define SD_DETECT_PIN 22 - - // Extra button definitions, substitute for EN1 / EN2 - #define BTN_UP 37 // BTN_EN1 - #define BTN_DWN 35 // BTN_EN2 - #define BTN_LFT 33 - #define BTN_RT 32 - - // Marlin can respond to UP/DOWN by default - // #undef BTN_EN1 - // #undef BTN_EN2 - //#define BTN_EN1 -1 - //#define BTN_EN2 -1 + // Direction buttons + #define BTN_UP 37 + #define BTN_DWN 35 + #define BTN_LFT 33 + #define BTN_RT 32 + // 'R' button #undef BTN_ENC #define BTN_ENC 31 + // Disable encoder + #undef BTN_EN1 + #define BTN_EN1 -1 + #undef BTN_EN2 + #define BTN_EN2 -1 + #undef SD_DETECT_PIN #define SD_DETECT_PIN 22 diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index a23995d7c8..2f835a3c69 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -218,6 +218,9 @@ static void lcd_status_screen(); #if ENABLED(REPRAPWORLD_KEYPAD) volatile uint8_t buttons_reprapworld_keypad; // to store the keypad shift register values #endif + #if ENABLED(RIGIDBOT_PANEL) + volatile millis_t next_fake_encoder_update_ms; + #endif #if ENABLED(LCD_HAS_SLOW_BUTTONS) volatile uint8_t slow_buttons; // Bits of the pressed buttons. @@ -1524,11 +1527,15 @@ void lcd_init() { lcd_implementation_init(); #if ENABLED(NEWPANEL) + #if BTN_EN1 > 0 + SET_INPUT(BTN_EN1); + WRITE(BTN_EN1, HIGH); + #endif - SET_INPUT(BTN_EN1); - SET_INPUT(BTN_EN2); - WRITE(BTN_EN1, HIGH); - WRITE(BTN_EN2, HIGH); + #if BTN_EN2 > 0 + SET_INPUT(BTN_EN2); + WRITE(BTN_EN2, HIGH); + #endif #if BTN_ENC > 0 SET_INPUT(BTN_ENC); @@ -1543,6 +1550,14 @@ void lcd_init() { WRITE(SHIFT_LD, HIGH); #endif + #ifdef RIGIDBOT_PANEL + pinMode(BTN_UP,INPUT); + pinMode(BTN_DWN,INPUT); + pinMode(BTN_LFT,INPUT); + pinMode(BTN_RT,INPUT); + next_fake_encoder_update_ms = 0; + #endif + #else // Not NEWPANEL #if ENABLED(SR_LCD_2W_NL) // Non latching 2 wire shift register @@ -1843,8 +1858,32 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; } void lcd_buttons_update() { #if ENABLED(NEWPANEL) uint8_t newbutton = 0; - if (READ(BTN_EN1) == 0) newbutton |= EN_A; - if (READ(BTN_EN2) == 0) newbutton |= EN_B; + #if BTN_EN1 > 0 + if (READ(BTN_EN1) == 0) newbutton |= EN_A; + #endif + #if BTN_EN2 > 0 + if (READ(BTN_EN2) == 0) newbutton |= EN_B; + #endif + #if ENABLED(RIGIDBOT_PANEL) + if (millis() > next_fake_encoder_update_ms && READ(BTN_UP) == 0) { + encoderDiff = -1 * ENCODER_STEPS_PER_MENU_ITEM; + next_fake_encoder_update_ms = millis() + 300; + } + if (millis() > next_fake_encoder_update_ms && READ(BTN_DWN) == 0) { + encoderDiff = ENCODER_STEPS_PER_MENU_ITEM; + next_fake_encoder_update_ms = millis() + 300; + } + if (millis() > next_fake_encoder_update_ms && READ(BTN_LFT) == 0) { + encoderDiff = -1 * ENCODER_PULSES_PER_STEP; + next_fake_encoder_update_ms = millis() + 300; + } + if (millis() > next_fake_encoder_update_ms && READ(BTN_RT) == 0) { + encoderDiff = ENCODER_PULSES_PER_STEP; + next_fake_encoder_update_ms = millis() + 300; + } + #endif + + #if BTN_ENC > 0 if (millis() > next_button_update_ms && READ(BTN_ENC) == 0) newbutton |= EN_C; #endif diff --git a/Marlin/ultralcd.h b/Marlin/ultralcd.h index 23df71cc44..b73b26f163 100644 --- a/Marlin/ultralcd.h +++ b/Marlin/ultralcd.h @@ -41,6 +41,9 @@ #if ENABLED(REPRAPWORLD_KEYPAD) extern volatile uint8_t buttons_reprapworld_keypad; // to store the keypad shift register values #endif + #if ENABLED(RIGIDBOT_PANEL) + extern volatile millis_t next_fake_encoder_update_ms; + #endif #else FORCE_INLINE void lcd_buttons_update() {} #endif From 83c4131ba3dd37c21862bb7a509638c2e8c30d33 Mon Sep 17 00:00:00 2001 From: Ruwan J Egoda Gamage Date: Sun, 13 Dec 2015 12:40:48 -0500 Subject: [PATCH 022/232] Cleaning up, getting rid of the fake encoder count variable. --- Marlin/ultralcd.cpp | 40 +++++++++++++++++++--------------------- Marlin/ultralcd.h | 3 --- 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 2f835a3c69..c6a951c7fa 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -218,9 +218,6 @@ static void lcd_status_screen(); #if ENABLED(REPRAPWORLD_KEYPAD) volatile uint8_t buttons_reprapworld_keypad; // to store the keypad shift register values #endif - #if ENABLED(RIGIDBOT_PANEL) - volatile millis_t next_fake_encoder_update_ms; - #endif #if ENABLED(LCD_HAS_SLOW_BUTTONS) volatile uint8_t slow_buttons; // Bits of the pressed buttons. @@ -1555,7 +1552,6 @@ void lcd_init() { pinMode(BTN_DWN,INPUT); pinMode(BTN_LFT,INPUT); pinMode(BTN_RT,INPUT); - next_fake_encoder_update_ms = 0; #endif #else // Not NEWPANEL @@ -1685,7 +1681,7 @@ void lcd_update() { int32_t encoderMovementSteps = abs(encoderDiff) / ENCODER_PULSES_PER_STEP; if (lastEncoderMovementMillis != 0) { - // Note that the rate is always calculated between to passes through the + // Note that the rate is always calculated between to passes through the // loop and that the abs of the encoderDiff value is tracked. float encoderStepRate = (float)(encoderMovementSteps) / ((float)(ms - lastEncoderMovementMillis)) * 1000.0; @@ -1865,25 +1861,27 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; } if (READ(BTN_EN2) == 0) newbutton |= EN_B; #endif #if ENABLED(RIGIDBOT_PANEL) - if (millis() > next_fake_encoder_update_ms && READ(BTN_UP) == 0) { - encoderDiff = -1 * ENCODER_STEPS_PER_MENU_ITEM; - next_fake_encoder_update_ms = millis() + 300; - } - if (millis() > next_fake_encoder_update_ms && READ(BTN_DWN) == 0) { - encoderDiff = ENCODER_STEPS_PER_MENU_ITEM; - next_fake_encoder_update_ms = millis() + 300; - } - if (millis() > next_fake_encoder_update_ms && READ(BTN_LFT) == 0) { - encoderDiff = -1 * ENCODER_PULSES_PER_STEP; - next_fake_encoder_update_ms = millis() + 300; - } - if (millis() > next_fake_encoder_update_ms && READ(BTN_RT) == 0) { - encoderDiff = ENCODER_PULSES_PER_STEP; - next_fake_encoder_update_ms = millis() + 300; + millis_t now = millis(); + if (now > next_button_update_ms) { + if (READ(BTN_UP) == 0) { + encoderDiff = -1 * ENCODER_STEPS_PER_MENU_ITEM; + next_button_update_ms = now + 300; + } + else if (READ(BTN_DWN) == 0) { + encoderDiff = ENCODER_STEPS_PER_MENU_ITEM; + next_button_update_ms = now + 300; + } + else if (READ(BTN_LFT) == 0) { + encoderDiff = -1 * ENCODER_PULSES_PER_STEP; + next_button_update_ms = now + 300; + } + else if (READ(BTN_RT) == 0) { + encoderDiff = ENCODER_PULSES_PER_STEP; + next_button_update_ms = now + 300; + } } #endif - #if BTN_ENC > 0 if (millis() > next_button_update_ms && READ(BTN_ENC) == 0) newbutton |= EN_C; #endif diff --git a/Marlin/ultralcd.h b/Marlin/ultralcd.h index b73b26f163..23df71cc44 100644 --- a/Marlin/ultralcd.h +++ b/Marlin/ultralcd.h @@ -41,9 +41,6 @@ #if ENABLED(REPRAPWORLD_KEYPAD) extern volatile uint8_t buttons_reprapworld_keypad; // to store the keypad shift register values #endif - #if ENABLED(RIGIDBOT_PANEL) - extern volatile millis_t next_fake_encoder_update_ms; - #endif #else FORCE_INLINE void lcd_buttons_update() {} #endif From e6cc232184281d74365f14e596df3e4be59a816a Mon Sep 17 00:00:00 2001 From: Ruwan J Egoda Gamage Date: Sun, 13 Dec 2015 15:47:10 -0500 Subject: [PATCH 023/232] Adding SDULTRASLOW variable. Instead of changing SDEXTRASLOW variable to a slower speed, the new SDULTRASLOW is used for rigidbot panel. --- Marlin/cardreader.cpp | 4 +++- Marlin/example_configurations/Felix/Configuration.h | 1 + Marlin/example_configurations/Felix/Configuration_DUAL.h | 1 + Marlin/example_configurations/Hephestos/Configuration.h | 1 + Marlin/example_configurations/K8200/Configuration.h | 1 + .../RepRapWorld/Megatronics/Configuration.h | 1 + Marlin/example_configurations/RigidBot/Configuration.h | 3 ++- Marlin/example_configurations/SCARA/Configuration.h | 1 + Marlin/example_configurations/TAZ4/Configuration.h | 1 + Marlin/example_configurations/WITBOX/Configuration.h | 1 + Marlin/example_configurations/adafruit/ST7565/Configuration.h | 1 + Marlin/example_configurations/delta/biv2.5/Configuration.h | 1 + Marlin/example_configurations/delta/generic/Configuration.h | 1 + .../example_configurations/delta/kossel_mini/Configuration.h | 1 + .../example_configurations/delta/kossel_pro/Configuration.h | 1 + Marlin/example_configurations/makibox/Configuration.h | 1 + Marlin/example_configurations/tvrrug/Round2/Configuration.h | 1 + 17 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Marlin/cardreader.cpp b/Marlin/cardreader.cpp index f6b55f9301..5b69174da5 100644 --- a/Marlin/cardreader.cpp +++ b/Marlin/cardreader.cpp @@ -195,8 +195,10 @@ void CardReader::initsd() { cardOK = false; if (root.isOpen()) root.close(); - #if ENABLED(SDEXTRASLOW) + #if ENABLED(SDULTRASLOW) #define SPI_SPEED SPI_SIXTEENTH_SPEED + #elif ENABLED(SDEXTRASLOW) + #define SPI_SPEED SPI_QUARTER_SPEED #elif ENABLED(SDSLOW) #define SPI_SPEED SPI_HALF_SPEED #else diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index f946d35c0a..ba67118989 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -651,6 +651,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // Changed behaviour! If you need SDSUPPORT uncomment it! //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/Felix/Configuration_DUAL.h b/Marlin/example_configurations/Felix/Configuration_DUAL.h index bd7b8eed4e..1d21b37531 100644 --- a/Marlin/example_configurations/Felix/Configuration_DUAL.h +++ b/Marlin/example_configurations/Felix/Configuration_DUAL.h @@ -620,6 +620,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // Changed behaviour! If you need SDSUPPORT uncomment it! //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 9fe3715f7f..4e7bc9c713 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -660,6 +660,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 426d8e9b68..220532af31 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -656,6 +656,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // Changed behaviour! If you need SDSUPPORT uncomment it! //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index e03debc8fc..9b628d9ff1 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -668,6 +668,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) #define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index e0c956e17f..ca1df7fc3e 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -659,7 +659,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 05c315917f..881c607656 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -676,6 +676,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // Changed behaviour! If you need SDSUPPORT uncomment it! //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index 484d32da14..aa839b8b95 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -687,6 +687,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // Changed behaviour! If you need SDSUPPORT uncomment it! //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication #define ENCODER_PULSES_PER_STEP 2 // Increase if you have a high resolution encoder #define ENCODER_STEPS_PER_MENU_ITEM 1 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 2d235e59e7..5443f51ee5 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -659,6 +659,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 442ee1d7b4..4032fbdde0 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -668,6 +668,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index ec78143c63..bbdfd827ce 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -790,6 +790,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // Changed behaviour! If you need SDSUPPORT uncomment it! //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 78284a928d..bee80589a5 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -791,6 +791,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // Changed behaviour! If you need SDSUPPORT uncomment it! //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 75e4d11ba4..85f0f6b6ea 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -795,6 +795,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // Changed behaviour! If you need SDSUPPORT uncomment it! //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 43fc9ae738..44f03d52f3 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -785,6 +785,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 2f8fd73ba8..c16da81014 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -670,6 +670,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 9a6aac98d3..a74d2e51bc 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -663,6 +663,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // Changed behaviour! If you need SDSUPPORT uncomment it! //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking From a64bcd53e96503e94cff754f7f45c39ba3d2aaa5 Mon Sep 17 00:00:00 2001 From: Ruwan J Egoda Gamage Date: Sun, 13 Dec 2015 22:06:03 -0500 Subject: [PATCH 024/232] reusing millis() --- Marlin/ultralcd.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index c6a951c7fa..a671a707e3 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1860,8 +1860,10 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; } #if BTN_EN2 > 0 if (READ(BTN_EN2) == 0) newbutton |= EN_B; #endif - #if ENABLED(RIGIDBOT_PANEL) + #if ENABLED(RIGIDBOT_PANEL) || BTN_ENC > 0 millis_t now = millis(); + #endif + #if ENABLED(RIGIDBOT_PANEL) if (now > next_button_update_ms) { if (READ(BTN_UP) == 0) { encoderDiff = -1 * ENCODER_STEPS_PER_MENU_ITEM; @@ -1881,9 +1883,8 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; } } } #endif - #if BTN_ENC > 0 - if (millis() > next_button_update_ms && READ(BTN_ENC) == 0) newbutton |= EN_C; + if (now > next_button_update_ms && READ(BTN_ENC) == 0) newbutton |= EN_C; #endif buttons = newbutton; #if ENABLED(LCD_HAS_SLOW_BUTTONS) From 2c9e0415c77d754930cd91e1903ffaff46ddec18 Mon Sep 17 00:00:00 2001 From: Ruwan J Egoda Gamage Date: Sun, 13 Dec 2015 23:23:01 -0500 Subject: [PATCH 025/232] Getting rid of SDEXTRASLOW, SDSLOW variables. --- Marlin/cardreader.cpp | 8 +------- Marlin/example_configurations/Felix/Configuration.h | 4 +--- Marlin/example_configurations/Felix/Configuration_DUAL.h | 4 +--- Marlin/example_configurations/Hephestos/Configuration.h | 4 +--- Marlin/example_configurations/K8200/Configuration.h | 4 +--- .../RepRapWorld/Megatronics/Configuration.h | 4 +--- Marlin/example_configurations/RigidBot/Configuration.h | 4 +--- Marlin/example_configurations/SCARA/Configuration.h | 4 +--- Marlin/example_configurations/TAZ4/Configuration.h | 4 +--- Marlin/example_configurations/WITBOX/Configuration.h | 4 +--- .../adafruit/ST7565/Configuration.h | 4 +--- .../example_configurations/delta/biv2.5/Configuration.h | 4 +--- .../example_configurations/delta/generic/Configuration.h | 4 +--- .../delta/kossel_mini/Configuration.h | 4 +--- .../delta/kossel_pro/Configuration.h | 4 +--- Marlin/example_configurations/makibox/Configuration.h | 4 +--- .../example_configurations/tvrrug/Round2/Configuration.h | 4 +--- 17 files changed, 17 insertions(+), 55 deletions(-) diff --git a/Marlin/cardreader.cpp b/Marlin/cardreader.cpp index 5b69174da5..dd4dee3af6 100644 --- a/Marlin/cardreader.cpp +++ b/Marlin/cardreader.cpp @@ -195,13 +195,7 @@ void CardReader::initsd() { cardOK = false; if (root.isOpen()) root.close(); - #if ENABLED(SDULTRASLOW) - #define SPI_SPEED SPI_SIXTEENTH_SPEED - #elif ENABLED(SDEXTRASLOW) - #define SPI_SPEED SPI_QUARTER_SPEED - #elif ENABLED(SDSLOW) - #define SPI_SPEED SPI_HALF_SPEED - #else + #ifndef SPI_SPEED #define SPI_SPEED SPI_FULL_SPEED #endif diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index ba67118989..0d1eb86460 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -649,9 +649,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) //#define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! -//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/Felix/Configuration_DUAL.h b/Marlin/example_configurations/Felix/Configuration_DUAL.h index 1d21b37531..d91caae685 100644 --- a/Marlin/example_configurations/Felix/Configuration_DUAL.h +++ b/Marlin/example_configurations/Felix/Configuration_DUAL.h @@ -618,9 +618,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) //#define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! -//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 4e7bc9c713..10950b27bc 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -658,9 +658,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #define ULTRA_LCD //general LCD support, also 16x2 //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 220532af31..4c79570bad 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -654,9 +654,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) //#define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! -//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index 9b628d9ff1..df92706ece 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -666,9 +666,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define ULTRA_LCD //general LCD support, also 16x2 //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) #define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index ca1df7fc3e..8ec53268cf 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -658,9 +658,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) #define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! -//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +#define SPI_SPEED SPI_EIGHTH_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 881c607656..1cd2600093 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -674,9 +674,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) //#define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! -//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index aa839b8b95..55ce81c14a 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -685,9 +685,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) //#define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! -//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication #define ENCODER_PULSES_PER_STEP 2 // Increase if you have a high resolution encoder #define ENCODER_STEPS_PER_MENU_ITEM 1 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 5443f51ee5..03a06cd398 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -657,9 +657,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #define ULTRA_LCD //general LCD support, also 16x2 //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 4032fbdde0..d166fa72b0 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -666,9 +666,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define ULTRA_LCD //general LCD support, also 16x2 //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index bbdfd827ce..2f900354b3 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -788,9 +788,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) //#define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! -//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index bee80589a5..861d8d3665 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -789,9 +789,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) //#define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! -//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 85f0f6b6ea..94143491b2 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -793,9 +793,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) //#define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! -//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 44f03d52f3..35c4cb7c7d 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -783,9 +783,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define ULTRA_LCD //general LCD support, also 16x2 //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index c16da81014..5d99544d87 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -668,9 +668,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define ULTRA_LCD //general LCD support, also 16x2 //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index a74d2e51bc..9091073611 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -661,9 +661,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) //#define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! -//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking From 71aafb79a030823d5a4ced1854bb60598c414275 Mon Sep 17 00:00:00 2001 From: esenapaj Date: Wed, 23 Dec 2015 08:03:54 +0900 Subject: [PATCH 026/232] Update Configuration_adv.h --- .../Felix/Configuration_adv.h | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h index b529d9ee12..0fba67b2b3 100644 --- a/Marlin/example_configurations/Felix/Configuration_adv.h +++ b/Marlin/example_configurations/Felix/Configuration_adv.h @@ -36,16 +36,6 @@ #define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius #endif -/** - * Automatic Temperature: - * The hotend target temperature is calculated by all the buffered lines of gcode. - * The maximum buffered steps/sec of the extruder motor is called "se". - * Start autotemp mode with M109 S B F - * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by - * mintemp and maxtemp. Turn this off by excuting M109 without F* - * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. - * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode - */ #if ENABLED(PIDTEMP) // this adds an experimental additional term to the heating power, proportional to the extrusion speed. // if Kc is chosen well, the additional required power due to increased melting should be compensated. @@ -56,14 +46,16 @@ #endif #endif - -//automatic temperature: The hot end target temperature is calculated by all the buffered lines of gcode. -//The maximum buffered steps/sec of the extruder motor are called "se". -//You enter the autotemp mode by a M109 S B F -// the target temperature is set to mintemp+factor*se[steps/sec] and limited by mintemp and maxtemp -// you exit the value by any M109 without F* -// Also, if the temperature is set to a value B F + * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by + * mintemp and maxtemp. Turn this off by excuting M109 without F* + * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. + * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode + */ #define AUTOTEMP #if ENABLED(AUTOTEMP) #define AUTOTEMP_OLDWEIGHT 0.98 From 056daf00fcdc8be703774c140a7bdc1f1aaf2206 Mon Sep 17 00:00:00 2001 From: esenapaj Date: Wed, 23 Dec 2015 08:06:15 +0900 Subject: [PATCH 027/232] Update Configuration_adv.h --- .../Hephestos/Configuration_adv.h | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/Marlin/example_configurations/Hephestos/Configuration_adv.h b/Marlin/example_configurations/Hephestos/Configuration_adv.h index 59bf7e018c..c60284a9e4 100644 --- a/Marlin/example_configurations/Hephestos/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos/Configuration_adv.h @@ -36,16 +36,6 @@ #define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius #endif -/** - * Automatic Temperature: - * The hotend target temperature is calculated by all the buffered lines of gcode. - * The maximum buffered steps/sec of the extruder motor is called "se". - * Start autotemp mode with M109 S B F - * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by - * mintemp and maxtemp. Turn this off by excuting M109 without F* - * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. - * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode - */ #if ENABLED(PIDTEMP) // this adds an experimental additional term to the heating power, proportional to the extrusion speed. // if Kc is chosen well, the additional required power due to increased melting should be compensated. @@ -56,14 +46,16 @@ #endif #endif - -//automatic temperature: The hot end target temperature is calculated by all the buffered lines of gcode. -//The maximum buffered steps/sec of the extruder motor are called "se". -//You enter the autotemp mode by a M109 S B F -// the target temperature is set to mintemp+factor*se[steps/sec] and limited by mintemp and maxtemp -// you exit the value by any M109 without F* -// Also, if the temperature is set to a value B F + * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by + * mintemp and maxtemp. Turn this off by excuting M109 without F* + * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. + * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode + */ #define AUTOTEMP #if ENABLED(AUTOTEMP) #define AUTOTEMP_OLDWEIGHT 0.98 From 5ee6fe63850da9fd625a4fd4f6fb40f362db0980 Mon Sep 17 00:00:00 2001 From: esenapaj Date: Wed, 23 Dec 2015 08:07:12 +0900 Subject: [PATCH 028/232] Update Configuration_adv.h --- .../K8200/Configuration_adv.h | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/Marlin/example_configurations/K8200/Configuration_adv.h b/Marlin/example_configurations/K8200/Configuration_adv.h index 1bf4103c72..07fa3d8bc3 100644 --- a/Marlin/example_configurations/K8200/Configuration_adv.h +++ b/Marlin/example_configurations/K8200/Configuration_adv.h @@ -36,16 +36,6 @@ #define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius #endif -/** - * Automatic Temperature: - * The hotend target temperature is calculated by all the buffered lines of gcode. - * The maximum buffered steps/sec of the extruder motor is called "se". - * Start autotemp mode with M109 S B F - * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by - * mintemp and maxtemp. Turn this off by excuting M109 without F* - * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. - * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode - */ #if ENABLED(PIDTEMP) // this adds an experimental additional term to the heating power, proportional to the extrusion speed. // if Kc is chosen well, the additional required power due to increased melting should be compensated. @@ -56,14 +46,16 @@ #endif #endif - -//automatic temperature: The hot end target temperature is calculated by all the buffered lines of gcode. -//The maximum buffered steps/sec of the extruder motor are called "se". -//You enter the autotemp mode by a M109 S B F -// the target temperature is set to mintemp+factor*se[steps/sec] and limited by mintemp and maxtemp -// you exit the value by any M109 without F* -// Also, if the temperature is set to a value B F + * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by + * mintemp and maxtemp. Turn this off by excuting M109 without F* + * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. + * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode + */ #define AUTOTEMP #if ENABLED(AUTOTEMP) #define AUTOTEMP_OLDWEIGHT 0.98 From 992fbb831d004642da3f8bab5ac5585638bbb546 Mon Sep 17 00:00:00 2001 From: esenapaj Date: Wed, 23 Dec 2015 08:08:45 +0900 Subject: [PATCH 029/232] Update Configuration_adv.h --- .../SCARA/Configuration_adv.h | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h index 7866b7da31..514e0f3c36 100644 --- a/Marlin/example_configurations/SCARA/Configuration_adv.h +++ b/Marlin/example_configurations/SCARA/Configuration_adv.h @@ -36,16 +36,6 @@ #define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius #endif -/** - * Automatic Temperature: - * The hotend target temperature is calculated by all the buffered lines of gcode. - * The maximum buffered steps/sec of the extruder motor is called "se". - * Start autotemp mode with M109 S B F - * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by - * mintemp and maxtemp. Turn this off by excuting M109 without F* - * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. - * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode - */ #if ENABLED(PIDTEMP) // this adds an experimental additional term to the heating power, proportional to the extrusion speed. // if Kc is chosen well, the additional required power due to increased melting should be compensated. @@ -56,14 +46,16 @@ #endif #endif - -//automatic temperature: The hot end target temperature is calculated by all the buffered lines of gcode. -//The maximum buffered steps/sec of the extruder motor are called "se". -//You enter the autotemp mode by a M109 S B F -// the target temperature is set to mintemp+factor*se[steps/sec] and limited by mintemp and maxtemp -// you exit the value by any M109 without F* -// Also, if the temperature is set to a value B F + * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by + * mintemp and maxtemp. Turn this off by excuting M109 without F* + * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. + * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode + */ #define AUTOTEMP #if ENABLED(AUTOTEMP) #define AUTOTEMP_OLDWEIGHT 0.98 From efcb769003b7434272d90fa193f70ccf4aff7ddb Mon Sep 17 00:00:00 2001 From: esenapaj Date: Wed, 23 Dec 2015 08:09:57 +0900 Subject: [PATCH 030/232] Update Configuration_adv.h --- .../WITBOX/Configuration_adv.h | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/Marlin/example_configurations/WITBOX/Configuration_adv.h b/Marlin/example_configurations/WITBOX/Configuration_adv.h index cf6b6faa3d..1f207cb827 100644 --- a/Marlin/example_configurations/WITBOX/Configuration_adv.h +++ b/Marlin/example_configurations/WITBOX/Configuration_adv.h @@ -36,16 +36,6 @@ #define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius #endif -/** - * Automatic Temperature: - * The hotend target temperature is calculated by all the buffered lines of gcode. - * The maximum buffered steps/sec of the extruder motor is called "se". - * Start autotemp mode with M109 S B F - * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by - * mintemp and maxtemp. Turn this off by excuting M109 without F* - * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. - * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode - */ #if ENABLED(PIDTEMP) // this adds an experimental additional term to the heating power, proportional to the extrusion speed. // if Kc is chosen well, the additional required power due to increased melting should be compensated. @@ -56,14 +46,16 @@ #endif #endif - -//automatic temperature: The hot end target temperature is calculated by all the buffered lines of gcode. -//The maximum buffered steps/sec of the extruder motor are called "se". -//You enter the autotemp mode by a M109 S B F -// the target temperature is set to mintemp+factor*se[steps/sec] and limited by mintemp and maxtemp -// you exit the value by any M109 without F* -// Also, if the temperature is set to a value B F + * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by + * mintemp and maxtemp. Turn this off by excuting M109 without F* + * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. + * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode + */ #define AUTOTEMP #if ENABLED(AUTOTEMP) #define AUTOTEMP_OLDWEIGHT 0.98 From 39c62fbd6f0bcaab194031b119ad4878b3545cf0 Mon Sep 17 00:00:00 2001 From: esenapaj Date: Wed, 23 Dec 2015 08:12:04 +0900 Subject: [PATCH 031/232] Update Configuration_adv.h --- .../delta/biv2.5/Configuration_adv.h | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h index 96c8614491..dc31b7ca89 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h @@ -36,16 +36,6 @@ #define THERMAL_PROTECTION_BED_HYSTERESIS 4 // Degrees Celsius #endif -/** - * Automatic Temperature: - * The hotend target temperature is calculated by all the buffered lines of gcode. - * The maximum buffered steps/sec of the extruder motor is called "se". - * Start autotemp mode with M109 S B F - * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by - * mintemp and maxtemp. Turn this off by excuting M109 without F* - * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. - * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode - */ #if ENABLED(PIDTEMP) // this adds an experimental additional term to the heating power, proportional to the extrusion speed. // if Kc is chosen well, the additional required power due to increased melting should be compensated. @@ -56,14 +46,16 @@ #endif #endif - -//automatic temperature: The hot end target temperature is calculated by all the buffered lines of gcode. -//The maximum buffered steps/sec of the extruder motor are called "se". -//You enter the autotemp mode by a M109 S B F -// the target temperature is set to mintemp+factor*se[steps/sec] and limited by mintemp and maxtemp -// you exit the value by any M109 without F* -// Also, if the temperature is set to a value B F + * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by + * mintemp and maxtemp. Turn this off by excuting M109 without F* + * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. + * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode + */ #define AUTOTEMP #if ENABLED(AUTOTEMP) #define AUTOTEMP_OLDWEIGHT 0.98 From 04ab61bf40b881f8faf82982ccc30ab09cf2cd53 Mon Sep 17 00:00:00 2001 From: esenapaj Date: Wed, 23 Dec 2015 08:12:28 +0900 Subject: [PATCH 032/232] Update Configuration_adv.h --- .../delta/generic/Configuration_adv.h | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h index 6539466035..d7ec88d221 100644 --- a/Marlin/example_configurations/delta/generic/Configuration_adv.h +++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h @@ -36,16 +36,6 @@ #define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius #endif -/** - * Automatic Temperature: - * The hotend target temperature is calculated by all the buffered lines of gcode. - * The maximum buffered steps/sec of the extruder motor is called "se". - * Start autotemp mode with M109 S B F - * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by - * mintemp and maxtemp. Turn this off by excuting M109 without F* - * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. - * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode - */ #if ENABLED(PIDTEMP) // this adds an experimental additional term to the heating power, proportional to the extrusion speed. // if Kc is chosen well, the additional required power due to increased melting should be compensated. @@ -56,14 +46,16 @@ #endif #endif - -//automatic temperature: The hot end target temperature is calculated by all the buffered lines of gcode. -//The maximum buffered steps/sec of the extruder motor are called "se". -//You enter the autotemp mode by a M109 S B F -// the target temperature is set to mintemp+factor*se[steps/sec] and limited by mintemp and maxtemp -// you exit the value by any M109 without F* -// Also, if the temperature is set to a value B F + * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by + * mintemp and maxtemp. Turn this off by excuting M109 without F* + * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. + * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode + */ #define AUTOTEMP #if ENABLED(AUTOTEMP) #define AUTOTEMP_OLDWEIGHT 0.98 From 5cf1c38ea1eec0045a551282fa356cbcbec97c5c Mon Sep 17 00:00:00 2001 From: esenapaj Date: Wed, 23 Dec 2015 08:12:54 +0900 Subject: [PATCH 033/232] Update Configuration_adv.h --- .../delta/kossel_mini/Configuration_adv.h | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h index 1725193952..e3d85ad88e 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h @@ -36,16 +36,6 @@ #define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius #endif -/** - * Automatic Temperature: - * The hotend target temperature is calculated by all the buffered lines of gcode. - * The maximum buffered steps/sec of the extruder motor is called "se". - * Start autotemp mode with M109 S B F - * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by - * mintemp and maxtemp. Turn this off by excuting M109 without F* - * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. - * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode - */ #if ENABLED(PIDTEMP) // this adds an experimental additional term to the heating power, proportional to the extrusion speed. // if Kc is chosen well, the additional required power due to increased melting should be compensated. @@ -56,14 +46,16 @@ #endif #endif - -//automatic temperature: The hot end target temperature is calculated by all the buffered lines of gcode. -//The maximum buffered steps/sec of the extruder motor are called "se". -//You enter the autotemp mode by a M109 S B F -// the target temperature is set to mintemp+factor*se[steps/sec] and limited by mintemp and maxtemp -// you exit the value by any M109 without F* -// Also, if the temperature is set to a value B F + * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by + * mintemp and maxtemp. Turn this off by excuting M109 without F* + * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. + * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode + */ #define AUTOTEMP #if ENABLED(AUTOTEMP) #define AUTOTEMP_OLDWEIGHT 0.98 From 1403b9acc0eccc94b57b42a1f3908fcc76b5eee3 Mon Sep 17 00:00:00 2001 From: esenapaj Date: Wed, 23 Dec 2015 08:15:20 +0900 Subject: [PATCH 034/232] Update Configuration_adv.h --- .../delta/kossel_pro/Configuration_adv.h | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h index 61373b3ed8..4a09907ff0 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h @@ -40,16 +40,6 @@ #define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius #endif -/** - * Automatic Temperature: - * The hotend target temperature is calculated by all the buffered lines of gcode. - * The maximum buffered steps/sec of the extruder motor is called "se". - * Start autotemp mode with M109 S B F - * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by - * mintemp and maxtemp. Turn this off by excuting M109 without F* - * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. - * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode - */ #if ENABLED(PIDTEMP) // this adds an experimental additional term to the heating power, proportional to the extrusion speed. // if Kc is chosen well, the additional required power due to increased melting should be compensated. @@ -60,14 +50,16 @@ #endif #endif - -//automatic temperature: The hot end target temperature is calculated by all the buffered lines of gcode. -//The maximum buffered steps/sec of the extruder motor are called "se". -//You enter the autotemp mode by a M109 S B F -// the target temperature is set to mintemp+factor*se[steps/sec] and limited by mintemp and maxtemp -// you exit the value by any M109 without F* -// Also, if the temperature is set to a value B F + * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by + * mintemp and maxtemp. Turn this off by excuting M109 without F* + * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. + * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode + */ #define AUTOTEMP #if ENABLED(AUTOTEMP) #define AUTOTEMP_OLDWEIGHT 0.98 From 0de5fcad0a88ab7960db0efe5aebe99f2648105c Mon Sep 17 00:00:00 2001 From: esenapaj Date: Wed, 23 Dec 2015 08:16:06 +0900 Subject: [PATCH 035/232] Update Configuration_adv.h --- .../makibox/Configuration_adv.h | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h index 6e5921dd3f..640a2b7ff6 100644 --- a/Marlin/example_configurations/makibox/Configuration_adv.h +++ b/Marlin/example_configurations/makibox/Configuration_adv.h @@ -36,16 +36,6 @@ #define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius #endif -/** - * Automatic Temperature: - * The hotend target temperature is calculated by all the buffered lines of gcode. - * The maximum buffered steps/sec of the extruder motor is called "se". - * Start autotemp mode with M109 S B F - * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by - * mintemp and maxtemp. Turn this off by excuting M109 without F* - * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. - * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode - */ #if ENABLED(PIDTEMP) // this adds an experimental additional term to the heating power, proportional to the extrusion speed. // if Kc is chosen well, the additional required power due to increased melting should be compensated. @@ -56,14 +46,16 @@ #endif #endif - -//automatic temperature: The hot end target temperature is calculated by all the buffered lines of gcode. -//The maximum buffered steps/sec of the extruder motor are called "se". -//You enter the autotemp mode by a M109 S B F -// the target temperature is set to mintemp+factor*se[steps/sec] and limited by mintemp and maxtemp -// you exit the value by any M109 without F* -// Also, if the temperature is set to a value B F + * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by + * mintemp and maxtemp. Turn this off by excuting M109 without F* + * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. + * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode + */ #define AUTOTEMP #if ENABLED(AUTOTEMP) #define AUTOTEMP_OLDWEIGHT 0.98 From 8d2aa2368d8d7eacc84b4d608a9eade1c8ad0ce1 Mon Sep 17 00:00:00 2001 From: esenapaj Date: Wed, 23 Dec 2015 08:16:36 +0900 Subject: [PATCH 036/232] Update Configuration_adv.h --- .../tvrrug/Round2/Configuration_adv.h | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h index 01b15afa49..75c7c2095e 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h @@ -36,16 +36,6 @@ #define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius #endif -/** - * Automatic Temperature: - * The hotend target temperature is calculated by all the buffered lines of gcode. - * The maximum buffered steps/sec of the extruder motor is called "se". - * Start autotemp mode with M109 S B F - * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by - * mintemp and maxtemp. Turn this off by excuting M109 without F* - * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. - * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode - */ #if ENABLED(PIDTEMP) // this adds an experimental additional term to the heating power, proportional to the extrusion speed. // if Kc is chosen well, the additional required power due to increased melting should be compensated. @@ -56,14 +46,16 @@ #endif #endif - -//automatic temperature: The hot end target temperature is calculated by all the buffered lines of gcode. -//The maximum buffered steps/sec of the extruder motor are called "se". -//You enter the autotemp mode by a M109 S B F -// the target temperature is set to mintemp+factor*se[steps/sec] and limited by mintemp and maxtemp -// you exit the value by any M109 without F* -// Also, if the temperature is set to a value B F + * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by + * mintemp and maxtemp. Turn this off by excuting M109 without F* + * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. + * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode + */ #define AUTOTEMP #if ENABLED(AUTOTEMP) #define AUTOTEMP_OLDWEIGHT 0.98 From 06555febdd30df8d4d95e48bdf46cbd886934813 Mon Sep 17 00:00:00 2001 From: Ruwan J Egoda Gamage Date: Thu, 24 Dec 2015 12:12:25 -0500 Subject: [PATCH 037/232] Using SET_INPUT instead of pinMode --- Marlin/ultralcd.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index a671a707e3..b8b9769e74 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1548,10 +1548,10 @@ void lcd_init() { #endif #ifdef RIGIDBOT_PANEL - pinMode(BTN_UP,INPUT); - pinMode(BTN_DWN,INPUT); - pinMode(BTN_LFT,INPUT); - pinMode(BTN_RT,INPUT); + SET_INPUT(BTN_UP); + SET_INPUT(BTN_DWN); + SET_INPUT(BTN_LFT); + SET_INPUT(BTN_RT); #endif #else // Not NEWPANEL From 2932602643cce9a5d8edd3fb148aa33a65ea9fba Mon Sep 17 00:00:00 2001 From: Naruto-kyun Date: Fri, 15 Jan 2016 16:50:43 +0100 Subject: [PATCH 038/232] Update stepper.cpp Forgot Z2_MIN_PIN --- Marlin/stepper.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Marlin/stepper.cpp b/Marlin/stepper.cpp index fa1e9bfdcf..395b517863 100644 --- a/Marlin/stepper.cpp +++ b/Marlin/stepper.cpp @@ -942,6 +942,13 @@ void st_init() { WRITE(Z_MIN_PIN,HIGH); #endif #endif + + #if HAS_Z2_MIN + SET_INPUT(Z2_MIN_PIN); + #if ENABLED(ENDSTOPPULLUP_ZMIN) + WRITE(Z2_MIN_PIN,HIGH); + #endif + #endif #if HAS_X_MAX SET_INPUT(X_MAX_PIN); From 7c94c83765e5db484f1543eed2ae884d05add50c Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Wed, 16 Dec 2015 08:33:51 -0600 Subject: [PATCH 039/232] Repair formula mangled by PR#1319 in Jan 2015 --- Marlin/scripts/createTemperatureLookupMarlin.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Marlin/scripts/createTemperatureLookupMarlin.py b/Marlin/scripts/createTemperatureLookupMarlin.py index 4f54c2833d..81747f7dd1 100755 --- a/Marlin/scripts/createTemperatureLookupMarlin.py +++ b/Marlin/scripts/createTemperatureLookupMarlin.py @@ -1,7 +1,7 @@ #!/usr/bin/python """Thermistor Value Lookup Table Generator -Generates lookup to temperature values for use in a microcontroller in C format based on: +Generates lookup to temperature values for use in a microcontroller in C format based on: http://en.wikipedia.org/wiki/Steinhart-Hart_equation The main use is for Arduino programs that read data from the circuit board described here: @@ -45,7 +45,7 @@ class Thermistor: c = (y - x) / ((l3 - l2) * (l1 + l2 + l3)) b = x - c * (l1**2 + l2**2 + l1*l2) a = y1 - (b + l1**2 *c)*l1 - + if c < 0: print "//////////////////////////////////////////////////////////////////////////////////////" print "// WARNING: negative coefficient 'c'! Something may be wrong with the measurements! //" @@ -73,13 +73,13 @@ class Thermistor: def temp(self, adc): "Convert ADC reading into a temperature in Celcius" l = log(self.resist(adc)) - Tinv = self.c1 + self.c2*l + self.c3* l**3) # inverse temperature + Tinv = self.c1 + self.c2*l + self.c3* l**3 # inverse temperature return (1/Tinv) - ZERO # temperature def adc(self, temp): "Convert temperature into a ADC reading" x = (self.c1 - (1.0 / (temp+ZERO))) / (2*self.c3) - y = sqrt((self.c2 / (3*self.c3)**3 + x**2) + y = sqrt((self.c2 / (3*self.c3))**3 + x**2) r = exp((y-x)**(1.0/3) - (y+x)**(1.0/3)) return (r / (self.rp + r)) * ARES @@ -93,7 +93,7 @@ def main(argv): r3 = 226.15 # resistance at high temperature (226.15 Ohm) rp = 4700; # pull-up resistor (4.7 kOhm) num_temps = 36; # number of entries for look-up table - + try: opts, args = getopt.getopt(argv, "h", ["help", "rp=", "t1=", "t2=", "t3=", "num-temps="]) except getopt.GetoptError as err: From a366697649c991a1b9f1c95f6318da90eb463ae1 Mon Sep 17 00:00:00 2001 From: esenapaj Date: Wed, 23 Dec 2015 08:29:51 +0900 Subject: [PATCH 040/232] Update Configuration.h --- Marlin/example_configurations/delta/biv2.5/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index ec78143c63..faa271dab5 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -512,7 +512,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // Non-linear bed leveling will be used. // Compensate by interpolating between the nearest four Z probe values for each point. // Useful for deltas where the print surface may appear like a bowl or dome shape. - // Works best with ACCURATE_BED_LEVELING_POINTS 5 or higher. + // Works best with AUTO_BED_LEVELING_GRID_POINTS 5 or higher. #define AUTO_BED_LEVELING_GRID_POINTS 9 #else // !AUTO_BED_LEVELING_GRID From df0d599c79074762f8a557009daad7a6c4da7782 Mon Sep 17 00:00:00 2001 From: esenapaj Date: Wed, 23 Dec 2015 08:31:28 +0900 Subject: [PATCH 041/232] Update Configuration.h --- Marlin/example_configurations/delta/generic/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 78284a928d..f488163333 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -513,7 +513,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // Non-linear bed leveling will be used. // Compensate by interpolating between the nearest four Z probe values for each point. // Useful for deltas where the print surface may appear like a bowl or dome shape. - // Works best with ACCURATE_BED_LEVELING_POINTS 5 or higher. + // Works best with AUTO_BED_LEVELING_GRID_POINTS 5 or higher. #define AUTO_BED_LEVELING_GRID_POINTS 9 #else // !AUTO_BED_LEVELING_GRID From b8f0c8a4c76a587f4a967824972079407a853eff Mon Sep 17 00:00:00 2001 From: esenapaj Date: Wed, 23 Dec 2015 08:32:07 +0900 Subject: [PATCH 042/232] Update Configuration.h --- Marlin/example_configurations/delta/kossel_mini/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 75e4d11ba4..3a94ce2f51 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -513,7 +513,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // Non-linear bed leveling will be used. // Compensate by interpolating between the nearest four Z probe values for each point. // Useful for deltas where the print surface may appear like a bowl or dome shape. - // Works best with ACCURATE_BED_LEVELING_POINTS 5 or higher. + // Works best with AUTO_BED_LEVELING_GRID_POINTS 5 or higher. #define AUTO_BED_LEVELING_GRID_POINTS 9 #else // !AUTO_BED_LEVELING_GRID From 59d345a3dd48f9dc02032699d539290fb22bf517 Mon Sep 17 00:00:00 2001 From: esenapaj Date: Wed, 23 Dec 2015 08:33:01 +0900 Subject: [PATCH 043/232] Update Configuration.h --- Marlin/example_configurations/delta/kossel_pro/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 43fc9ae738..592471dd25 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -500,7 +500,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // Non-linear bed leveling will be used. // Compensate by interpolating between the nearest four Z probe values for each point. // Useful for deltas where the print surface may appear like a bowl or dome shape. - // Works best with ACCURATE_BED_LEVELING_POINTS 5 or higher. + // Works best with AUTO_BED_LEVELING_GRID_POINTS 5 or higher. #define AUTO_BED_LEVELING_GRID_POINTS 7 #else // !AUTO_BED_LEVELING_GRID From 4882a7eded67b3e83df36b6a09fc87e2a9a8b602 Mon Sep 17 00:00:00 2001 From: esenapaj Date: Fri, 29 Jan 2016 18:38:25 +0900 Subject: [PATCH 044/232] more suitable display format for delta printer --- Marlin/ultralcd.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index b8b9769e74..810bfcff99 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1180,7 +1180,11 @@ static void lcd_control_motion_menu() { #endif MENU_ITEM_EDIT(float5, MSG_ACC, &acceleration, 10, 99000); MENU_ITEM_EDIT(float3, MSG_VXY_JERK, &max_xy_jerk, 1, 990); - MENU_ITEM_EDIT(float52, MSG_VZ_JERK, &max_z_jerk, 0.1, 990); + #if ENABLED(DELTA) + MENU_ITEM_EDIT(float3, MSG_VZ_JERK, &max_z_jerk, 1, 990); + #else + MENU_ITEM_EDIT(float52, MSG_VZ_JERK, &max_z_jerk, 0.1, 990); + #endif MENU_ITEM_EDIT(float3, MSG_VE_JERK, &max_e_jerk, 1, 990); MENU_ITEM_EDIT(float3, MSG_VMAX MSG_X, &max_feedrate[X_AXIS], 1, 999); MENU_ITEM_EDIT(float3, MSG_VMAX MSG_Y, &max_feedrate[Y_AXIS], 1, 999); @@ -1196,7 +1200,11 @@ static void lcd_control_motion_menu() { MENU_ITEM_EDIT(float5, MSG_A_TRAVEL, &travel_acceleration, 100, 99000); MENU_ITEM_EDIT(float52, MSG_XSTEPS, &axis_steps_per_unit[X_AXIS], 5, 9999); MENU_ITEM_EDIT(float52, MSG_YSTEPS, &axis_steps_per_unit[Y_AXIS], 5, 9999); - MENU_ITEM_EDIT(float51, MSG_ZSTEPS, &axis_steps_per_unit[Z_AXIS], 5, 9999); + #if ENABLED(DELTA) + MENU_ITEM_EDIT(float52, MSG_ZSTEPS, &axis_steps_per_unit[Z_AXIS], 5, 9999); + #else + MENU_ITEM_EDIT(float51, MSG_ZSTEPS, &axis_steps_per_unit[Z_AXIS], 5, 9999); + #endif MENU_ITEM_EDIT(float51, MSG_ESTEPS, &axis_steps_per_unit[E_AXIS], 5, 9999); #if ENABLED(ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED) MENU_ITEM_EDIT(bool, MSG_ENDSTOP_ABORT, &abort_on_endstop_hit); From becbfe106538b7844d71d6717feeac0eedbaa396 Mon Sep 17 00:00:00 2001 From: Ruwan J Egoda Gamage Date: Sat, 12 Dec 2015 20:57:36 -0500 Subject: [PATCH 045/232] Fixing Rigidbot LCD Panel Support --- Marlin/cardreader.cpp | 2 +- .../RigidBot/Configuration.h | 11 ++-- .../RigidBot/Configuration_adv.h | 8 +-- Marlin/pins_RIGIDBOARD.h | 31 +++++------ Marlin/ultralcd.cpp | 51 ++++++++++++++++--- Marlin/ultralcd.h | 3 ++ 6 files changed, 77 insertions(+), 29 deletions(-) diff --git a/Marlin/cardreader.cpp b/Marlin/cardreader.cpp index 61f4a93ccf..f6b55f9301 100644 --- a/Marlin/cardreader.cpp +++ b/Marlin/cardreader.cpp @@ -196,7 +196,7 @@ void CardReader::initsd() { if (root.isOpen()) root.close(); #if ENABLED(SDEXTRASLOW) - #define SPI_SPEED SPI_QUARTER_SPEED + #define SPI_SPEED SPI_SIXTEENTH_SPEED #elif ENABLED(SDSLOW) #define SPI_SPEED SPI_HALF_SPEED #else diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 987fc36d33..e0c956e17f 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -219,6 +219,11 @@ Here are some standard links for getting your machine calibrated: //#define DEFAULT_Ki 0.85 //#define DEFAULT_Kd 245 + // E3D w/ rigidbot cartridge + //#define DEFAULT_Kp 16.30 + //#define DEFAULT_Ki 0.95 + //#define DEFAULT_Kd 69.69 + #endif // PIDTEMP //=========================================================================== @@ -611,7 +616,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // 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 #if ENABLED(EEPROM_SETTINGS) // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: @@ -651,10 +656,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define ULTRA_LCD //general LCD support, also 16x2 //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) -//#define SDSUPPORT // Enable SD Card Support in Hardware Console +#define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h index fe8e2db97d..5a70c9d5cc 100644 --- a/Marlin/example_configurations/RigidBot/Configuration_adv.h +++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h @@ -279,9 +279,9 @@ //=============================Additional Features=========================== //=========================================================================== -#define ENCODER_RATE_MULTIPLIER // If defined, certain menu edit operations automatically multiply the steps when the encoder is moved quickly -#define ENCODER_10X_STEPS_PER_SEC 75 // If the encoder steps per sec exceeds this value, multiply steps moved x10 to quickly advance the value -#define ENCODER_100X_STEPS_PER_SEC 160 // If the encoder steps per sec exceeds this value, multiply steps moved x100 to really quickly advance the value +//#define ENCODER_RATE_MULTIPLIER // If defined, certain menu edit operations automatically multiply the steps when the encoder is moved quickly +//#define ENCODER_10X_STEPS_PER_SEC 75 // If the encoder steps per sec exceeds this value, multiply steps moved x10 to quickly advance the value +//#define ENCODER_100X_STEPS_PER_SEC 160 // If the encoder steps per sec exceeds this value, multiply steps moved x100 to really quickly advance the value //#define CHDK 4 //Pin for triggering CHDK to take a picture see how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/ #define CHDK_DELAY 50 //How long in ms the pin should stay HIGH before going LOW again @@ -414,7 +414,7 @@ const unsigned int dropsegments = 5; //everything with less than this number of //The ASCII buffer for receiving from the serial: #define MAX_CMD_SIZE 96 -#define BUFSIZE 4 +#define BUFSIZE 8 // Bad Serial-connections can miss a received command by sending an 'ok' // Therefore some clients abort after 30 seconds in a timeout. diff --git a/Marlin/pins_RIGIDBOARD.h b/Marlin/pins_RIGIDBOARD.h index 4f8abc1266..3fe46a9ff6 100644 --- a/Marlin/pins_RIGIDBOARD.h +++ b/Marlin/pins_RIGIDBOARD.h @@ -5,7 +5,10 @@ #include "pins_RAMPS_13.h" #if ENABLED(Z_MIN_PROBE_ENDSTOP) - #define Z_MIN_PROBE_PIN 19 + #undef Z_MAX_PIN + #define Z_MAX_PIN -1 + #undef Z_MIN_PROBE_PIN + #define Z_MIN_PROBE_PIN 19 // Z-MAX pin J14 End Stops #endif #undef HEATER_0_PIN @@ -25,24 +28,22 @@ #undef BEEPER_PIN #define BEEPER_PIN -1 - #undef SD_DETECT_PIN - #define SD_DETECT_PIN 22 - - // Extra button definitions, substitute for EN1 / EN2 - #define BTN_UP 37 // BTN_EN1 - #define BTN_DWN 35 // BTN_EN2 - #define BTN_LFT 33 - #define BTN_RT 32 - - // Marlin can respond to UP/DOWN by default - // #undef BTN_EN1 - // #undef BTN_EN2 - //#define BTN_EN1 -1 - //#define BTN_EN2 -1 + // Direction buttons + #define BTN_UP 37 + #define BTN_DWN 35 + #define BTN_LFT 33 + #define BTN_RT 32 + // 'R' button #undef BTN_ENC #define BTN_ENC 31 + // Disable encoder + #undef BTN_EN1 + #define BTN_EN1 -1 + #undef BTN_EN2 + #define BTN_EN2 -1 + #undef SD_DETECT_PIN #define SD_DETECT_PIN 22 diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index a23995d7c8..2f835a3c69 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -218,6 +218,9 @@ static void lcd_status_screen(); #if ENABLED(REPRAPWORLD_KEYPAD) volatile uint8_t buttons_reprapworld_keypad; // to store the keypad shift register values #endif + #if ENABLED(RIGIDBOT_PANEL) + volatile millis_t next_fake_encoder_update_ms; + #endif #if ENABLED(LCD_HAS_SLOW_BUTTONS) volatile uint8_t slow_buttons; // Bits of the pressed buttons. @@ -1524,11 +1527,15 @@ void lcd_init() { lcd_implementation_init(); #if ENABLED(NEWPANEL) + #if BTN_EN1 > 0 + SET_INPUT(BTN_EN1); + WRITE(BTN_EN1, HIGH); + #endif - SET_INPUT(BTN_EN1); - SET_INPUT(BTN_EN2); - WRITE(BTN_EN1, HIGH); - WRITE(BTN_EN2, HIGH); + #if BTN_EN2 > 0 + SET_INPUT(BTN_EN2); + WRITE(BTN_EN2, HIGH); + #endif #if BTN_ENC > 0 SET_INPUT(BTN_ENC); @@ -1543,6 +1550,14 @@ void lcd_init() { WRITE(SHIFT_LD, HIGH); #endif + #ifdef RIGIDBOT_PANEL + pinMode(BTN_UP,INPUT); + pinMode(BTN_DWN,INPUT); + pinMode(BTN_LFT,INPUT); + pinMode(BTN_RT,INPUT); + next_fake_encoder_update_ms = 0; + #endif + #else // Not NEWPANEL #if ENABLED(SR_LCD_2W_NL) // Non latching 2 wire shift register @@ -1843,8 +1858,32 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; } void lcd_buttons_update() { #if ENABLED(NEWPANEL) uint8_t newbutton = 0; - if (READ(BTN_EN1) == 0) newbutton |= EN_A; - if (READ(BTN_EN2) == 0) newbutton |= EN_B; + #if BTN_EN1 > 0 + if (READ(BTN_EN1) == 0) newbutton |= EN_A; + #endif + #if BTN_EN2 > 0 + if (READ(BTN_EN2) == 0) newbutton |= EN_B; + #endif + #if ENABLED(RIGIDBOT_PANEL) + if (millis() > next_fake_encoder_update_ms && READ(BTN_UP) == 0) { + encoderDiff = -1 * ENCODER_STEPS_PER_MENU_ITEM; + next_fake_encoder_update_ms = millis() + 300; + } + if (millis() > next_fake_encoder_update_ms && READ(BTN_DWN) == 0) { + encoderDiff = ENCODER_STEPS_PER_MENU_ITEM; + next_fake_encoder_update_ms = millis() + 300; + } + if (millis() > next_fake_encoder_update_ms && READ(BTN_LFT) == 0) { + encoderDiff = -1 * ENCODER_PULSES_PER_STEP; + next_fake_encoder_update_ms = millis() + 300; + } + if (millis() > next_fake_encoder_update_ms && READ(BTN_RT) == 0) { + encoderDiff = ENCODER_PULSES_PER_STEP; + next_fake_encoder_update_ms = millis() + 300; + } + #endif + + #if BTN_ENC > 0 if (millis() > next_button_update_ms && READ(BTN_ENC) == 0) newbutton |= EN_C; #endif diff --git a/Marlin/ultralcd.h b/Marlin/ultralcd.h index 23df71cc44..b73b26f163 100644 --- a/Marlin/ultralcd.h +++ b/Marlin/ultralcd.h @@ -41,6 +41,9 @@ #if ENABLED(REPRAPWORLD_KEYPAD) extern volatile uint8_t buttons_reprapworld_keypad; // to store the keypad shift register values #endif + #if ENABLED(RIGIDBOT_PANEL) + extern volatile millis_t next_fake_encoder_update_ms; + #endif #else FORCE_INLINE void lcd_buttons_update() {} #endif From 6f9e9c0e4f97ebb0b22fbb4b9957762d1434ac31 Mon Sep 17 00:00:00 2001 From: Ruwan J Egoda Gamage Date: Sun, 13 Dec 2015 12:40:48 -0500 Subject: [PATCH 046/232] Cleaning up, getting rid of the fake encoder count variable. --- Marlin/ultralcd.cpp | 40 +++++++++++++++++++--------------------- Marlin/ultralcd.h | 3 --- 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 2f835a3c69..c6a951c7fa 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -218,9 +218,6 @@ static void lcd_status_screen(); #if ENABLED(REPRAPWORLD_KEYPAD) volatile uint8_t buttons_reprapworld_keypad; // to store the keypad shift register values #endif - #if ENABLED(RIGIDBOT_PANEL) - volatile millis_t next_fake_encoder_update_ms; - #endif #if ENABLED(LCD_HAS_SLOW_BUTTONS) volatile uint8_t slow_buttons; // Bits of the pressed buttons. @@ -1555,7 +1552,6 @@ void lcd_init() { pinMode(BTN_DWN,INPUT); pinMode(BTN_LFT,INPUT); pinMode(BTN_RT,INPUT); - next_fake_encoder_update_ms = 0; #endif #else // Not NEWPANEL @@ -1685,7 +1681,7 @@ void lcd_update() { int32_t encoderMovementSteps = abs(encoderDiff) / ENCODER_PULSES_PER_STEP; if (lastEncoderMovementMillis != 0) { - // Note that the rate is always calculated between to passes through the + // Note that the rate is always calculated between to passes through the // loop and that the abs of the encoderDiff value is tracked. float encoderStepRate = (float)(encoderMovementSteps) / ((float)(ms - lastEncoderMovementMillis)) * 1000.0; @@ -1865,25 +1861,27 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; } if (READ(BTN_EN2) == 0) newbutton |= EN_B; #endif #if ENABLED(RIGIDBOT_PANEL) - if (millis() > next_fake_encoder_update_ms && READ(BTN_UP) == 0) { - encoderDiff = -1 * ENCODER_STEPS_PER_MENU_ITEM; - next_fake_encoder_update_ms = millis() + 300; - } - if (millis() > next_fake_encoder_update_ms && READ(BTN_DWN) == 0) { - encoderDiff = ENCODER_STEPS_PER_MENU_ITEM; - next_fake_encoder_update_ms = millis() + 300; - } - if (millis() > next_fake_encoder_update_ms && READ(BTN_LFT) == 0) { - encoderDiff = -1 * ENCODER_PULSES_PER_STEP; - next_fake_encoder_update_ms = millis() + 300; - } - if (millis() > next_fake_encoder_update_ms && READ(BTN_RT) == 0) { - encoderDiff = ENCODER_PULSES_PER_STEP; - next_fake_encoder_update_ms = millis() + 300; + millis_t now = millis(); + if (now > next_button_update_ms) { + if (READ(BTN_UP) == 0) { + encoderDiff = -1 * ENCODER_STEPS_PER_MENU_ITEM; + next_button_update_ms = now + 300; + } + else if (READ(BTN_DWN) == 0) { + encoderDiff = ENCODER_STEPS_PER_MENU_ITEM; + next_button_update_ms = now + 300; + } + else if (READ(BTN_LFT) == 0) { + encoderDiff = -1 * ENCODER_PULSES_PER_STEP; + next_button_update_ms = now + 300; + } + else if (READ(BTN_RT) == 0) { + encoderDiff = ENCODER_PULSES_PER_STEP; + next_button_update_ms = now + 300; + } } #endif - #if BTN_ENC > 0 if (millis() > next_button_update_ms && READ(BTN_ENC) == 0) newbutton |= EN_C; #endif diff --git a/Marlin/ultralcd.h b/Marlin/ultralcd.h index b73b26f163..23df71cc44 100644 --- a/Marlin/ultralcd.h +++ b/Marlin/ultralcd.h @@ -41,9 +41,6 @@ #if ENABLED(REPRAPWORLD_KEYPAD) extern volatile uint8_t buttons_reprapworld_keypad; // to store the keypad shift register values #endif - #if ENABLED(RIGIDBOT_PANEL) - extern volatile millis_t next_fake_encoder_update_ms; - #endif #else FORCE_INLINE void lcd_buttons_update() {} #endif From 1b7c44362872650b6ae9a792dc49742966a47aed Mon Sep 17 00:00:00 2001 From: Ruwan J Egoda Gamage Date: Sun, 13 Dec 2015 15:47:10 -0500 Subject: [PATCH 047/232] Adding SDULTRASLOW variable. Instead of changing SDEXTRASLOW variable to a slower speed, the new SDULTRASLOW is used for rigidbot panel. --- Marlin/cardreader.cpp | 4 +++- Marlin/example_configurations/Felix/Configuration.h | 1 + Marlin/example_configurations/Felix/Configuration_DUAL.h | 1 + Marlin/example_configurations/Hephestos/Configuration.h | 1 + Marlin/example_configurations/K8200/Configuration.h | 1 + .../RepRapWorld/Megatronics/Configuration.h | 1 + Marlin/example_configurations/RigidBot/Configuration.h | 3 ++- Marlin/example_configurations/SCARA/Configuration.h | 1 + Marlin/example_configurations/TAZ4/Configuration.h | 1 + Marlin/example_configurations/WITBOX/Configuration.h | 1 + Marlin/example_configurations/adafruit/ST7565/Configuration.h | 1 + Marlin/example_configurations/delta/biv2.5/Configuration.h | 1 + Marlin/example_configurations/delta/generic/Configuration.h | 1 + .../example_configurations/delta/kossel_mini/Configuration.h | 1 + .../example_configurations/delta/kossel_pro/Configuration.h | 1 + Marlin/example_configurations/makibox/Configuration.h | 1 + Marlin/example_configurations/tvrrug/Round2/Configuration.h | 1 + 17 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Marlin/cardreader.cpp b/Marlin/cardreader.cpp index f6b55f9301..5b69174da5 100644 --- a/Marlin/cardreader.cpp +++ b/Marlin/cardreader.cpp @@ -195,8 +195,10 @@ void CardReader::initsd() { cardOK = false; if (root.isOpen()) root.close(); - #if ENABLED(SDEXTRASLOW) + #if ENABLED(SDULTRASLOW) #define SPI_SPEED SPI_SIXTEENTH_SPEED + #elif ENABLED(SDEXTRASLOW) + #define SPI_SPEED SPI_QUARTER_SPEED #elif ENABLED(SDSLOW) #define SPI_SPEED SPI_HALF_SPEED #else diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index f946d35c0a..ba67118989 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -651,6 +651,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // Changed behaviour! If you need SDSUPPORT uncomment it! //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/Felix/Configuration_DUAL.h b/Marlin/example_configurations/Felix/Configuration_DUAL.h index bd7b8eed4e..1d21b37531 100644 --- a/Marlin/example_configurations/Felix/Configuration_DUAL.h +++ b/Marlin/example_configurations/Felix/Configuration_DUAL.h @@ -620,6 +620,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // Changed behaviour! If you need SDSUPPORT uncomment it! //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 9fe3715f7f..4e7bc9c713 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -660,6 +660,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 426d8e9b68..220532af31 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -656,6 +656,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // Changed behaviour! If you need SDSUPPORT uncomment it! //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index e03debc8fc..9b628d9ff1 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -668,6 +668,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) #define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index e0c956e17f..ca1df7fc3e 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -659,7 +659,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 05c315917f..881c607656 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -676,6 +676,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // Changed behaviour! If you need SDSUPPORT uncomment it! //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index 484d32da14..aa839b8b95 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -687,6 +687,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // Changed behaviour! If you need SDSUPPORT uncomment it! //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication #define ENCODER_PULSES_PER_STEP 2 // Increase if you have a high resolution encoder #define ENCODER_STEPS_PER_MENU_ITEM 1 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 2d235e59e7..5443f51ee5 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -659,6 +659,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 442ee1d7b4..4032fbdde0 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -668,6 +668,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index faa271dab5..2289d3d0d4 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -790,6 +790,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // Changed behaviour! If you need SDSUPPORT uncomment it! //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index f488163333..11e263c81b 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -791,6 +791,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // Changed behaviour! If you need SDSUPPORT uncomment it! //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 3a94ce2f51..fe458ed0f7 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -795,6 +795,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // Changed behaviour! If you need SDSUPPORT uncomment it! //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 592471dd25..e3510fb741 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -785,6 +785,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 2f8fd73ba8..c16da81014 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -670,6 +670,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 9a6aac98d3..a74d2e51bc 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -663,6 +663,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // Changed behaviour! If you need SDSUPPORT uncomment it! //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking From 1833049b8a043994b33e57459370a7f9de75456e Mon Sep 17 00:00:00 2001 From: Ruwan J Egoda Gamage Date: Sun, 13 Dec 2015 22:06:03 -0500 Subject: [PATCH 048/232] reusing millis() --- Marlin/ultralcd.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index c6a951c7fa..a671a707e3 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1860,8 +1860,10 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; } #if BTN_EN2 > 0 if (READ(BTN_EN2) == 0) newbutton |= EN_B; #endif - #if ENABLED(RIGIDBOT_PANEL) + #if ENABLED(RIGIDBOT_PANEL) || BTN_ENC > 0 millis_t now = millis(); + #endif + #if ENABLED(RIGIDBOT_PANEL) if (now > next_button_update_ms) { if (READ(BTN_UP) == 0) { encoderDiff = -1 * ENCODER_STEPS_PER_MENU_ITEM; @@ -1881,9 +1883,8 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; } } } #endif - #if BTN_ENC > 0 - if (millis() > next_button_update_ms && READ(BTN_ENC) == 0) newbutton |= EN_C; + if (now > next_button_update_ms && READ(BTN_ENC) == 0) newbutton |= EN_C; #endif buttons = newbutton; #if ENABLED(LCD_HAS_SLOW_BUTTONS) From b58083b0fa9af218689efcc1b0c042f2acfc8d30 Mon Sep 17 00:00:00 2001 From: Ruwan J Egoda Gamage Date: Sun, 13 Dec 2015 23:23:01 -0500 Subject: [PATCH 049/232] Getting rid of SDEXTRASLOW, SDSLOW variables. --- Marlin/cardreader.cpp | 8 +------- Marlin/example_configurations/Felix/Configuration.h | 4 +--- Marlin/example_configurations/Felix/Configuration_DUAL.h | 4 +--- Marlin/example_configurations/Hephestos/Configuration.h | 4 +--- Marlin/example_configurations/K8200/Configuration.h | 4 +--- .../RepRapWorld/Megatronics/Configuration.h | 4 +--- Marlin/example_configurations/RigidBot/Configuration.h | 4 +--- Marlin/example_configurations/SCARA/Configuration.h | 4 +--- Marlin/example_configurations/TAZ4/Configuration.h | 4 +--- Marlin/example_configurations/WITBOX/Configuration.h | 4 +--- .../adafruit/ST7565/Configuration.h | 4 +--- .../example_configurations/delta/biv2.5/Configuration.h | 4 +--- .../example_configurations/delta/generic/Configuration.h | 4 +--- .../delta/kossel_mini/Configuration.h | 4 +--- .../delta/kossel_pro/Configuration.h | 4 +--- Marlin/example_configurations/makibox/Configuration.h | 4 +--- .../example_configurations/tvrrug/Round2/Configuration.h | 4 +--- 17 files changed, 17 insertions(+), 55 deletions(-) diff --git a/Marlin/cardreader.cpp b/Marlin/cardreader.cpp index 5b69174da5..dd4dee3af6 100644 --- a/Marlin/cardreader.cpp +++ b/Marlin/cardreader.cpp @@ -195,13 +195,7 @@ void CardReader::initsd() { cardOK = false; if (root.isOpen()) root.close(); - #if ENABLED(SDULTRASLOW) - #define SPI_SPEED SPI_SIXTEENTH_SPEED - #elif ENABLED(SDEXTRASLOW) - #define SPI_SPEED SPI_QUARTER_SPEED - #elif ENABLED(SDSLOW) - #define SPI_SPEED SPI_HALF_SPEED - #else + #ifndef SPI_SPEED #define SPI_SPEED SPI_FULL_SPEED #endif diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index ba67118989..0d1eb86460 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -649,9 +649,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) //#define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! -//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/Felix/Configuration_DUAL.h b/Marlin/example_configurations/Felix/Configuration_DUAL.h index 1d21b37531..d91caae685 100644 --- a/Marlin/example_configurations/Felix/Configuration_DUAL.h +++ b/Marlin/example_configurations/Felix/Configuration_DUAL.h @@ -618,9 +618,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) //#define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! -//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 4e7bc9c713..10950b27bc 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -658,9 +658,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #define ULTRA_LCD //general LCD support, also 16x2 //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 220532af31..4c79570bad 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -654,9 +654,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) //#define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! -//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index 9b628d9ff1..df92706ece 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -666,9 +666,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l #define ULTRA_LCD //general LCD support, also 16x2 //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) #define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index ca1df7fc3e..8ec53268cf 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -658,9 +658,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) #define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! -//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +#define SPI_SPEED SPI_EIGHTH_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 881c607656..1cd2600093 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -674,9 +674,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) //#define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! -//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index aa839b8b95..55ce81c14a 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -685,9 +685,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) //#define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! -//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication #define ENCODER_PULSES_PER_STEP 2 // Increase if you have a high resolution encoder #define ENCODER_STEPS_PER_MENU_ITEM 1 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 5443f51ee5..03a06cd398 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -657,9 +657,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo #define ULTRA_LCD //general LCD support, also 16x2 //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 4032fbdde0..d166fa72b0 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -666,9 +666,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define ULTRA_LCD //general LCD support, also 16x2 //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index 2289d3d0d4..a7a5e34c2d 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -788,9 +788,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) //#define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! -//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 11e263c81b..6c57a1be70 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -789,9 +789,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) //#define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! -//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index fe458ed0f7..68cf825628 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -793,9 +793,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) //#define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! -//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index e3510fb741..4a3800cbc5 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -783,9 +783,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define ULTRA_LCD //general LCD support, also 16x2 //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index c16da81014..5d99544d87 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -668,9 +668,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l //#define ULTRA_LCD //general LCD support, also 16x2 //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) #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 SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index a74d2e51bc..9091073611 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -661,9 +661,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) //#define SDSUPPORT // Enable SD Card Support in Hardware Console // Changed behaviour! If you need SDSUPPORT uncomment it! -//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error) +//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking From 1270fbfd38b4a6589eba563d9cd63d48d56c3aa0 Mon Sep 17 00:00:00 2001 From: Ruwan J Egoda Gamage Date: Thu, 24 Dec 2015 12:12:25 -0500 Subject: [PATCH 050/232] Using SET_INPUT instead of pinMode --- Marlin/ultralcd.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index a671a707e3..b8b9769e74 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1548,10 +1548,10 @@ void lcd_init() { #endif #ifdef RIGIDBOT_PANEL - pinMode(BTN_UP,INPUT); - pinMode(BTN_DWN,INPUT); - pinMode(BTN_LFT,INPUT); - pinMode(BTN_RT,INPUT); + SET_INPUT(BTN_UP); + SET_INPUT(BTN_DWN); + SET_INPUT(BTN_LFT); + SET_INPUT(BTN_RT); #endif #else // Not NEWPANEL From 159ff94afdb6c3def7b1ae583dc3b9a9baf5b746 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 7 Feb 2016 02:07:21 -0800 Subject: [PATCH 051/232] Remove obsolete HEATER_BED_DUTY_CYCLE_DIVIDER #2977 --- Marlin/Configuration.h | 5 ----- Marlin/configurator/config/Configuration.h | 5 ----- Marlin/example_configurations/Felix/Configuration.h | 5 ----- Marlin/example_configurations/Felix/Configuration_DUAL.h | 5 ----- Marlin/example_configurations/Hephestos/Configuration.h | 5 ----- Marlin/example_configurations/K8200/Configuration.h | 5 ----- .../RepRapWorld/Megatronics/Configuration.h | 5 ----- Marlin/example_configurations/RigidBot/Configuration.h | 5 ----- Marlin/example_configurations/SCARA/Configuration.h | 5 ----- Marlin/example_configurations/TAZ4/Configuration.h | 5 ----- Marlin/example_configurations/WITBOX/Configuration.h | 5 ----- .../example_configurations/adafruit/ST7565/Configuration.h | 5 ----- Marlin/example_configurations/delta/biv2.5/Configuration.h | 5 ----- Marlin/example_configurations/delta/generic/Configuration.h | 5 ----- .../example_configurations/delta/kossel_mini/Configuration.h | 5 ----- .../example_configurations/delta/kossel_pro/Configuration.h | 5 ----- Marlin/example_configurations/makibox/Configuration.h | 5 ----- Marlin/example_configurations/tvrrug/Round2/Configuration.h | 5 ----- 18 files changed, 90 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index b7f8f4f1df..61712921fd 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -178,11 +178,6 @@ Here are some standard links for getting your machine calibrated: #define HEATER_3_MAXTEMP 275 #define BED_MAXTEMP 150 -// If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the -// average current. The value should be an integer and the heat bed will be turned on for 1 interval of -// HEATER_BED_DUTY_CYCLE_DIVIDER intervals. -//#define HEATER_BED_DUTY_CYCLE_DIVIDER 4 - // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS //#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=I^2/R //#define BED_WATTS (12.0*12.0/1.1) // P=I^2/R diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h index 3d00134fb0..2ffe574181 100644 --- a/Marlin/configurator/config/Configuration.h +++ b/Marlin/configurator/config/Configuration.h @@ -178,11 +178,6 @@ Here are some standard links for getting your machine calibrated: #define HEATER_3_MAXTEMP 275 #define BED_MAXTEMP 150 -// If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the -// average current. The value should be an integer and the heat bed will be turned on for 1 interval of -// HEATER_BED_DUTY_CYCLE_DIVIDER intervals. -//#define HEATER_BED_DUTY_CYCLE_DIVIDER 4 - // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS //#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=I^2/R //#define BED_WATTS (12.0*12.0/1.1) // P=I^2/R diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index 0d1eb86460..eda6e5e01e 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -178,11 +178,6 @@ Here are some standard links for getting your machine calibrated: #define HEATER_3_MAXTEMP 275 #define BED_MAXTEMP 150 -// If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the -// average current. The value should be an integer and the heat bed will be turned on for 1 interval of -// HEATER_BED_DUTY_CYCLE_DIVIDER intervals. -//#define HEATER_BED_DUTY_CYCLE_DIVIDER 4 - // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS //#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=I^2/R //#define BED_WATTS (12.0*12.0/1.1) // P=I^2/R diff --git a/Marlin/example_configurations/Felix/Configuration_DUAL.h b/Marlin/example_configurations/Felix/Configuration_DUAL.h index d91caae685..160e844267 100644 --- a/Marlin/example_configurations/Felix/Configuration_DUAL.h +++ b/Marlin/example_configurations/Felix/Configuration_DUAL.h @@ -167,11 +167,6 @@ Here are some standard links for getting your machine calibrated: #define HEATER_3_MAXTEMP 275 #define BED_MAXTEMP 150 -// If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the -// average current. The value should be an integer and the heat bed will be turned on for 1 interval of -// HEATER_BED_DUTY_CYCLE_DIVIDER intervals. -//#define HEATER_BED_DUTY_CYCLE_DIVIDER 4 - // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS //#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=I^2/R //#define BED_WATTS (12.0*12.0/1.1) // P=I^2/R diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 10950b27bc..b86df6aff7 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -181,11 +181,6 @@ Here are some standard links for getting your machine calibrated: #define HEATER_3_MAXTEMP 260 #define BED_MAXTEMP 150 -// If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the -// average current. The value should be an integer and the heat bed will be turned on for 1 interval of -// HEATER_BED_DUTY_CYCLE_DIVIDER intervals. -//#define HEATER_BED_DUTY_CYCLE_DIVIDER 4 - // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS //#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=I^2/R //#define BED_WATTS (12.0*12.0/1.1) // P=I^2/R diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 4c79570bad..ba61cb52b1 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -183,11 +183,6 @@ Here are some standard links for getting your machine calibrated: #define HEATER_3_MAXTEMP 275 #define BED_MAXTEMP 150 -// If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the -// average current. The value should be an integer and the heat bed will be turned on for 1 interval of -// HEATER_BED_DUTY_CYCLE_DIVIDER intervals. -//#define HEATER_BED_DUTY_CYCLE_DIVIDER 4 - // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS //#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=I^2/R //#define BED_WATTS (12.0*12.0/1.1) // P=I^2/R diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index df92706ece..7524af5cfd 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -178,11 +178,6 @@ Here are some standard links for getting your machine calibrated: #define HEATER_3_MAXTEMP 275 #define BED_MAXTEMP 150 -// If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the -// average current. The value should be an integer and the heat bed will be turned on for 1 interval of -// HEATER_BED_DUTY_CYCLE_DIVIDER intervals. -//#define HEATER_BED_DUTY_CYCLE_DIVIDER 4 - // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS //#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=I^2/R //#define BED_WATTS (12.0*12.0/1.1) // P=I^2/R diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 8ec53268cf..bcbc7219b9 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -178,11 +178,6 @@ Here are some standard links for getting your machine calibrated: #define HEATER_3_MAXTEMP 275 #define BED_MAXTEMP 150 -// If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the -// average current. The value should be an integer and the heat bed will be turned on for 1 interval of -// HEATER_BED_DUTY_CYCLE_DIVIDER intervals. -//#define HEATER_BED_DUTY_CYCLE_DIVIDER 4 - // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS //#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=I^2/R //#define BED_WATTS (12.0*12.0/1.1) // P=I^2/R diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 1cd2600093..957568d4ce 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -203,11 +203,6 @@ Here are some standard links for getting your machine calibrated: #define HEATER_3_MAXTEMP 275 #define BED_MAXTEMP 150 -// If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the -// average current. The value should be an integer and the heat bed will be turned on for 1 interval of -// HEATER_BED_DUTY_CYCLE_DIVIDER intervals. -//#define HEATER_BED_DUTY_CYCLE_DIVIDER 4 - // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS #define EXTRUDER_WATTS (2*2/5.9) // P=I^2/R #define BED_WATTS (5.45*5.45/2.2) // P=I^2/R diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index 55ce81c14a..b216277aae 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -178,11 +178,6 @@ Here are some standard links for getting your machine calibrated: #define HEATER_3_MAXTEMP 250 #define BED_MAXTEMP 150 -// If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the -// average current. The value should be an integer and the heat bed will be turned on for 1 interval of -// HEATER_BED_DUTY_CYCLE_DIVIDER intervals. -//#define HEATER_BED_DUTY_CYCLE_DIVIDER 4 - // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS //#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=I^2/R //#define BED_WATTS (12.0*12.0/1.1) // P=I^2/R diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 03a06cd398..9b7859348d 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -181,11 +181,6 @@ Here are some standard links for getting your machine calibrated: #define HEATER_3_MAXTEMP 260 #define BED_MAXTEMP 150 -// If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the -// average current. The value should be an integer and the heat bed will be turned on for 1 interval of -// HEATER_BED_DUTY_CYCLE_DIVIDER intervals. -//#define HEATER_BED_DUTY_CYCLE_DIVIDER 4 - // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS //#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=I^2/R //#define BED_WATTS (12.0*12.0/1.1) // P=I^2/R diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index d166fa72b0..72f4396210 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -178,11 +178,6 @@ Here are some standard links for getting your machine calibrated: #define HEATER_3_MAXTEMP 275 #define BED_MAXTEMP 150 -// If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the -// average current. The value should be an integer and the heat bed will be turned on for 1 interval of -// HEATER_BED_DUTY_CYCLE_DIVIDER intervals. -//#define HEATER_BED_DUTY_CYCLE_DIVIDER 4 - // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS //#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=I^2/R //#define BED_WATTS (12.0*12.0/1.1) // P=I^2/R diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index a7a5e34c2d..509dc971d9 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -178,11 +178,6 @@ Here are some standard links for getting your machine calibrated: #define HEATER_3_MAXTEMP 275 #define BED_MAXTEMP 150 -// If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the -// average current. The value should be an integer and the heat bed will be turned on for 1 interval of -// HEATER_BED_DUTY_CYCLE_DIVIDER intervals. -//#define HEATER_BED_DUTY_CYCLE_DIVIDER 4 - // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS //#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=I^2/R //#define BED_WATTS (12.0*12.0/1.1) // P=I^2/R diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 6c57a1be70..f38a63b171 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -178,11 +178,6 @@ Here are some standard links for getting your machine calibrated: #define HEATER_3_MAXTEMP 275 #define BED_MAXTEMP 150 -// If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the -// average current. The value should be an integer and the heat bed will be turned on for 1 interval of -// HEATER_BED_DUTY_CYCLE_DIVIDER intervals. -//#define HEATER_BED_DUTY_CYCLE_DIVIDER 4 - // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS //#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=I^2/R //#define BED_WATTS (12.0*12.0/1.1) // P=I^2/R diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 68cf825628..6d017494a4 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -178,11 +178,6 @@ Here are some standard links for getting your machine calibrated: #define HEATER_3_MAXTEMP 275 #define BED_MAXTEMP 150 -// If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the -// average current. The value should be an integer and the heat bed will be turned on for 1 interval of -// HEATER_BED_DUTY_CYCLE_DIVIDER intervals. -//#define HEATER_BED_DUTY_CYCLE_DIVIDER 4 - // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS //#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=I^2/R //#define BED_WATTS (12.0*12.0/1.1) // P=I^2/R diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 4a3800cbc5..c8077ad1cb 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -182,11 +182,6 @@ Here are some standard links for getting your machine calibrated: #define HEATER_3_MAXTEMP 275 #define BED_MAXTEMP 150 -// If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the -// average current. The value should be an integer and the heat bed will be turned on for 1 interval of -// HEATER_BED_DUTY_CYCLE_DIVIDER intervals. -//#define HEATER_BED_DUTY_CYCLE_DIVIDER 4 - // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS //#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=I^2/R //#define BED_WATTS (12.0*12.0/1.1) // P=I^2/R diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 5d99544d87..080abb2c5f 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -178,11 +178,6 @@ Here are some standard links for getting your machine calibrated: #define HEATER_3_MAXTEMP 275 #define BED_MAXTEMP 150 -// If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the -// average current. The value should be an integer and the heat bed will be turned on for 1 interval of -// HEATER_BED_DUTY_CYCLE_DIVIDER intervals. -//#define HEATER_BED_DUTY_CYCLE_DIVIDER 4 - // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS //#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=I^2/R //#define BED_WATTS (12.0*12.0/1.1) // P=I^2/R diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 9091073611..80cf1d1a40 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -178,11 +178,6 @@ Here are some standard links for getting your machine calibrated: #define HEATER_3_MAXTEMP 275 #define BED_MAXTEMP 150 -// If your bed has low resistance e.g. .6 ohm and throws the fuse you can duty cycle it to reduce the -// average current. The value should be an integer and the heat bed will be turned on for 1 interval of -// HEATER_BED_DUTY_CYCLE_DIVIDER intervals. -//#define HEATER_BED_DUTY_CYCLE_DIVIDER 4 - // If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS //#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=I^2/R //#define BED_WATTS (12.0*12.0/1.1) // P=I^2/R From 8e66028d25f8ac67f555b725b2eea101d6c16e48 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 8 Feb 2016 14:13:53 -0800 Subject: [PATCH 052/232] Apply the ABL rotation matrix to the extruder offset. --- Marlin/Marlin_main.cpp | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index d21bd599e9..21b3354df4 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -5649,9 +5649,24 @@ inline void gcode_T(uint8_t tmp_extruder) { delayed_move_time = 0; } #else // !DUAL_X_CARRIAGE - // Offset extruder (only by XY) - for (int i = X_AXIS; i <= Y_AXIS; i++) - current_position[i] += extruder_offset[i][tmp_extruder] - extruder_offset[i][active_extruder]; + #if ENABLED(AUTO_BED_LEVELING_FEATURE) + // Offset extruder, make sure to apply the bed level rotation matrix + vector_3 tmp_offset_vec = vector_3(extruder_offset[X_AXIS][tmp_extruder], + extruder_offset[Y_AXIS][tmp_extruder], + extruder_offset[Z_AXIS][tmp_extruder]), + act_offset_vec = vector_3(extruder_offset[X_AXIS][active_extruder], + extruder_offset[Y_AXIS][active_extruder], + extruder_offset[Z_AXIS][active_extruder]), + offset_vec = tmp_offset_vec - act_offset_vec; + offset_vec.apply_rotation(plan_bed_level_matrix.transpose(plan_bed_level_matrix)); + current_position[X_AXIS] += offset_vec.x; + current_position[Y_AXIS] += offset_vec.y; + current_position[Z_AXIS] += offset_vec.z; + #else // !AUTO_BED_LEVELING_FEATURE + // Offset extruder (only by XY) + for (int i=X_AXIS; i<=Y_AXIS; i++) + current_position[i] += extruder_offset[i][tmp_extruder] - extruder_offset[i][active_extruder]; + #endif // !AUTO_BED_LEVELING_FEATURE // Set the new active extruder and position active_extruder = tmp_extruder; #endif // !DUAL_X_CARRIAGE From efbd705eda30e18f807799bd991662852afea94e Mon Sep 17 00:00:00 2001 From: AnHardt Date: Tue, 9 Feb 2016 13:36:03 +0100 Subject: [PATCH 053/232] Replace the "ok" in M280, M301, M304, M851 with output not including an "ok" Replace the "ok" in M280, M301, M304, M851 with output not including an "ok" to avoid senting two "ok"s for a single g-code. Doing the same for M105 would break the input filters of the hosts. For M105 the other "ok" is omitted. --- Marlin/Marlin_main.cpp | 62 ++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index d21bd599e9..47678d94d1 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -4749,19 +4749,18 @@ inline void gcode_M226() { if (servo_index >= 0 && servo_index < NUM_SERVOS) servo[servo_index].move(servo_position); else { - SERIAL_ECHO_START; - SERIAL_ECHO("Servo "); - SERIAL_ECHO(servo_index); - SERIAL_ECHOLN(" out of range"); + SERIAL_ERROR_START; + SERIAL_ERROR("Servo "); + SERIAL_ERROR(servo_index); + SERIAL_ERRORLN(" out of range"); } } else if (servo_index >= 0) { - SERIAL_PROTOCOL(MSG_OK); - SERIAL_PROTOCOL(" Servo "); - SERIAL_PROTOCOL(servo_index); - SERIAL_PROTOCOL(": "); - SERIAL_PROTOCOL(servo[servo_index].read()); - SERIAL_EOL; + SERIAL_ECHO_START; + SERIAL_ECHO(" Servo "); + SERIAL_ECHO(servo_index); + SERIAL_ECHO(": "); + SERIAL_ECHOLN(servo[servo_index].read()); } } @@ -4812,27 +4811,27 @@ inline void gcode_M226() { #endif updatePID(); - SERIAL_PROTOCOL(MSG_OK); + SERIAL_ECHO_START; #if ENABLED(PID_PARAMS_PER_EXTRUDER) - SERIAL_PROTOCOL(" e:"); // specify extruder in serial output - SERIAL_PROTOCOL(e); + SERIAL_ECHO(" e:"); // specify extruder in serial output + SERIAL_ECHO(e); #endif // PID_PARAMS_PER_EXTRUDER - SERIAL_PROTOCOL(" p:"); - SERIAL_PROTOCOL(PID_PARAM(Kp, e)); - SERIAL_PROTOCOL(" i:"); - SERIAL_PROTOCOL(unscalePID_i(PID_PARAM(Ki, e))); - SERIAL_PROTOCOL(" d:"); - SERIAL_PROTOCOL(unscalePID_d(PID_PARAM(Kd, e))); + SERIAL_ECHO(" p:"); + SERIAL_ECHO(PID_PARAM(Kp, e)); + SERIAL_ECHO(" i:"); + SERIAL_ECHO(unscalePID_i(PID_PARAM(Ki, e))); + SERIAL_ECHO(" d:"); + SERIAL_ECHO(unscalePID_d(PID_PARAM(Kd, e))); #if ENABLED(PID_ADD_EXTRUSION_RATE) - SERIAL_PROTOCOL(" c:"); + SERIAL_ECHO(" c:"); //Kc does not have scaling applied above, or in resetting defaults - SERIAL_PROTOCOL(PID_PARAM(Kc, e)); + SERIAL_ECHO(PID_PARAM(Kc, e)); #endif SERIAL_EOL; } else { - SERIAL_ECHO_START; - SERIAL_ECHOLN(MSG_INVALID_EXTRUDER); + SERIAL_ERROR_START; + SERIAL_ERRORLN(MSG_INVALID_EXTRUDER); } } @@ -4846,14 +4845,13 @@ inline void gcode_M226() { if (code_seen('D')) bedKd = scalePID_d(code_value()); updatePID(); - SERIAL_PROTOCOL(MSG_OK); - SERIAL_PROTOCOL(" p:"); - SERIAL_PROTOCOL(bedKp); - SERIAL_PROTOCOL(" i:"); - SERIAL_PROTOCOL(unscalePID_i(bedKi)); - SERIAL_PROTOCOL(" d:"); - SERIAL_PROTOCOL(unscalePID_d(bedKd)); - SERIAL_EOL; + SERIAL_ECHO_START; + SERIAL_ECHO(" p:"); + SERIAL_ECHO(bedKp); + SERIAL_ECHO(" i:"); + SERIAL_ECHO(unscalePID_i(bedKi)); + SERIAL_ECHO(" d:"); + SERIAL_ECHOLN(unscalePID_d(bedKd)); } #endif // PIDTEMPBED @@ -5285,7 +5283,7 @@ inline void gcode_M503() { float value = code_value(); if (Z_PROBE_OFFSET_RANGE_MIN <= value && value <= Z_PROBE_OFFSET_RANGE_MAX) { zprobe_zoffset = value; - SERIAL_ECHOPGM(MSG_OK); + SERIAL_ECHO(zprobe_zoffset); } else { SERIAL_ECHOPGM(MSG_Z_MIN); From 6f473f7fc68540444b544497c67160bda8ba9a3d Mon Sep 17 00:00:00 2001 From: AnHardt Date: Tue, 9 Feb 2016 19:23:26 +0100 Subject: [PATCH 054/232] Repair N in ADVANCED_OK Send the correct line number. If no N was in the command - non't send an N. --- Marlin/Marlin_main.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index d21bd599e9..c524c3274a 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -6263,7 +6263,13 @@ void ok_to_send() { #endif SERIAL_PROTOCOLPGM(MSG_OK); #if ENABLED(ADVANCED_OK) - SERIAL_PROTOCOLPGM(" N"); SERIAL_PROTOCOL(gcode_LastN); + char* p = command_queue[cmd_queue_index_r]; + if (*p == 'N') { + SERIAL_PROTOCOL(' '); + SERIAL_ECHO(*p++); + while ((*p >= '0' && *p <= '9') || *p == '-') + SERIAL_ECHO(*p++); + } SERIAL_PROTOCOLPGM(" P"); SERIAL_PROTOCOL(int(BLOCK_BUFFER_SIZE - movesplanned() - 1)); SERIAL_PROTOCOLPGM(" B"); SERIAL_PROTOCOL(BUFSIZE - commands_in_queue); #endif From cdcb80f3c5bdd29569273f7549801a3b1144d4f8 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 9 Feb 2016 18:00:35 -0800 Subject: [PATCH 055/232] Allow no-space after initial command Addresses issue #2715 --- Marlin/Marlin_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index d21bd599e9..53cdc29e45 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -5716,7 +5716,7 @@ void process_next_command() { // Args pointer optimizes code_seen, especially those taking XYZEF // This wastes a little cpu on commands that expect no arguments. current_command_args = current_command; - while (*current_command_args && *current_command_args != ' ') ++current_command_args; + while (*current_command_args >= '0' && *current_command_args <= '9') ++current_command_args; while (*current_command_args == ' ') ++current_command_args; // Interpret the code int From 400e9329be32c2488feaeafe3727cedb32c09da8 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 9 Feb 2016 18:03:13 -0800 Subject: [PATCH 056/232] Allow spaces after a code letter --- Marlin/Marlin_main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 53cdc29e45..a40269d71a 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -973,6 +973,7 @@ void get_command() { bool code_has_value() { int i = 1; char c = seen_pointer[i]; + while (c == ' ') c = seen_pointer[++i]; if (c == '-' || c == '+') c = seen_pointer[++i]; if (c == '.') c = seen_pointer[++i]; return (c >= '0' && c <= '9'); From 711e5db19a7c980b8674391dd837e7ed2d717bd7 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 9 Feb 2016 18:16:35 -0800 Subject: [PATCH 057/232] Tweak comment in process_next_command --- Marlin/Marlin_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index a40269d71a..34e93c6fd8 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -5692,7 +5692,7 @@ void process_next_command() { // Sanitize the current command: // - Skip leading spaces - // - Bypass N[0-9][0-9]*[ ]* + // - Bypass N[-0-9][0-9]*[ ]* // - Overwrite * with nul to mark the end while (*current_command == ' ') ++current_command; if (*current_command == 'N' && ((current_command[1] >= '0' && current_command[1] <= '9') || current_command[1] == '-')) { From 68457ee9034fdd4f6b01ba317ae26d99256d4e55 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 9 Feb 2016 20:04:07 -0800 Subject: [PATCH 058/232] For Dual Y/Z use the next available extruder pins --- Marlin/Conditionals.h | 3 +++ Marlin/pins.h | 22 ++++++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h index 979ddb791f..bf96f0f210 100644 --- a/Marlin/Conditionals.h +++ b/Marlin/Conditionals.h @@ -462,6 +462,7 @@ #define HAS_E1_ENABLE (PIN_EXISTS(E1_ENABLE)) #define HAS_E2_ENABLE (PIN_EXISTS(E2_ENABLE)) #define HAS_E3_ENABLE (PIN_EXISTS(E3_ENABLE)) + #define HAS_E4_ENABLE (PIN_EXISTS(E4_ENABLE)) #define HAS_X_DIR (PIN_EXISTS(X_DIR)) #define HAS_X2_DIR (PIN_EXISTS(X2_DIR)) #define HAS_Y_DIR (PIN_EXISTS(Y_DIR)) @@ -472,6 +473,7 @@ #define HAS_E1_DIR (PIN_EXISTS(E1_DIR)) #define HAS_E2_DIR (PIN_EXISTS(E2_DIR)) #define HAS_E3_DIR (PIN_EXISTS(E3_DIR)) + #define HAS_E4_DIR (PIN_EXISTS(E4_DIR)) #define HAS_X_STEP (PIN_EXISTS(X_STEP)) #define HAS_X2_STEP (PIN_EXISTS(X2_STEP)) #define HAS_Y_STEP (PIN_EXISTS(Y_STEP)) @@ -482,6 +484,7 @@ #define HAS_E1_STEP (PIN_EXISTS(E1_STEP)) #define HAS_E2_STEP (PIN_EXISTS(E2_STEP)) #define HAS_E3_STEP (PIN_EXISTS(E3_STEP)) + #define HAS_E4_STEP (PIN_EXISTS(E4_STEP)) /** * Helper Macros for heaters and extruder fan diff --git a/Marlin/pins.h b/Marlin/pins.h index 8846b428f0..bbb7df8a57 100644 --- a/Marlin/pins.h +++ b/Marlin/pins.h @@ -236,16 +236,26 @@ #define Z_MIN_PIN -1 #endif +// +// Dual Y and Dual Z support +// These options are mutually-exclusive +// + +#define __EPIN(p,q) E##p##_##q##_PIN +#define _EPIN(p,q) __EPIN(p,q) + +// The Y2 axis, if any, should be the next open extruder port #ifndef Y2_STEP_PIN - #define Y2_STEP_PIN E1_STEP_PIN - #define Y2_DIR_PIN E1_DIR_PIN - #define Y2_ENABLE_PIN E1_ENABLE_PIN + #define Y2_STEP_PIN _EPIN(EXTRUDERS, STEP) + #define Y2_DIR_PIN _EPIN(EXTRUDERS, DIR) + #define Y2_ENABLE_PIN _EPIN(EXTRUDERS, ENABLE) #endif +// The Z2 axis, if any, should be the next open extruder port #ifndef Z2_STEP_PIN - #define Z2_STEP_PIN E1_STEP_PIN - #define Z2_DIR_PIN E1_DIR_PIN - #define Z2_ENABLE_PIN E1_ENABLE_PIN + #define Z2_STEP_PIN _EPIN(EXTRUDERS, STEP) + #define Z2_DIR_PIN _EPIN(EXTRUDERS, DIR) + #define Z2_ENABLE_PIN _EPIN(EXTRUDERS, ENABLE) #endif #define SENSITIVE_PINS { 0, 1, \ From b83e472bd3b60a6cf65229e6f57d592f663ebeca Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 10 Feb 2016 20:49:25 -0800 Subject: [PATCH 059/232] Rename fpos_t to avoid libc conflict --- Marlin/SdBaseFile.cpp | 6 +++--- Marlin/SdBaseFile.h | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Marlin/SdBaseFile.cpp b/Marlin/SdBaseFile.cpp index 3806ac982c..301dfc2592 100644 --- a/Marlin/SdBaseFile.cpp +++ b/Marlin/SdBaseFile.cpp @@ -291,7 +291,7 @@ bool SdBaseFile::getFilename(char* name) { return true; } //------------------------------------------------------------------------------ -void SdBaseFile::getpos(fpos_t* pos) { +void SdBaseFile::getpos(filepos_t* pos) { pos->position = curPosition_; pos->cluster = curCluster_; } @@ -923,7 +923,7 @@ fail: * \return The byte if no error and not at eof else -1; */ int SdBaseFile::peek() { - fpos_t pos; + filepos_t pos; getpos(&pos); int c = read(); if (c >= 0) setpos(&pos); @@ -1479,7 +1479,7 @@ fail: return false; } //------------------------------------------------------------------------------ -void SdBaseFile::setpos(fpos_t* pos) { +void SdBaseFile::setpos(filepos_t* pos) { curPosition_ = pos->position; curCluster_ = pos->cluster; } diff --git a/Marlin/SdBaseFile.h b/Marlin/SdBaseFile.h index 84d72b7b4b..f2d2b594d8 100644 --- a/Marlin/SdBaseFile.h +++ b/Marlin/SdBaseFile.h @@ -31,16 +31,16 @@ #include "SdVolume.h" //------------------------------------------------------------------------------ /** - * \struct fpos_t + * \struct filepos_t * \brief internal type for istream * do not use in user apps */ -struct fpos_t { +struct filepos_t { /** stream position */ uint32_t position; /** cluster for position */ uint32_t cluster; - fpos_t() : position(0), cluster(0) {} + filepos_t() : position(0), cluster(0) {} }; // use the gnu style oflag in open() @@ -196,11 +196,11 @@ class SdBaseFile { /** get position for streams * \param[out] pos struct to receive position */ - void getpos(fpos_t* pos); + void getpos(filepos_t* pos); /** set position for streams * \param[out] pos struct with value for new position */ - void setpos(fpos_t* pos); + void setpos(filepos_t* pos); //---------------------------------------------------------------------------- bool close(); bool contiguousRange(uint32_t* bgnBlock, uint32_t* endBlock); From 8ea55323d86caeeca504928ae19d4bfd888d14c5 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 15 Feb 2016 14:52:04 -0600 Subject: [PATCH 060/232] Fix for not raising Z before homing X and Y --- Marlin/Marlin_main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index d21bd599e9..066a850386 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -2308,7 +2308,8 @@ inline void gcode_G28() { } #endif - #elif DISABLED(Z_SAFE_HOMING) && defined(Z_RAISE_BEFORE_HOMING) && Z_RAISE_BEFORE_HOMING > 0 + #elif defined(Z_RAISE_BEFORE_HOMING) && Z_RAISE_BEFORE_HOMING > 0 +// #elif DISABLED(Z_SAFE_HOMING) && defined(Z_RAISE_BEFORE_HOMING) && Z_RAISE_BEFORE_HOMING > 0 // Raise Z before homing any other axes // (Does this need to be "negative home direction?" Why not just use Z_RAISE_BEFORE_HOMING?) From 31656e68bcb938e734a8eb35af4507e26af633a4 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 15 Feb 2016 15:53:40 -0600 Subject: [PATCH 061/232] Fix for homing X and Y before raising Z when Z_SAFE_HOMING is set. --- Marlin/Marlin_main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 066a850386..716eb92d24 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -2309,7 +2309,6 @@ inline void gcode_G28() { #endif #elif defined(Z_RAISE_BEFORE_HOMING) && Z_RAISE_BEFORE_HOMING > 0 -// #elif DISABLED(Z_SAFE_HOMING) && defined(Z_RAISE_BEFORE_HOMING) && Z_RAISE_BEFORE_HOMING > 0 // Raise Z before homing any other axes // (Does this need to be "negative home direction?" Why not just use Z_RAISE_BEFORE_HOMING?) From 373e8a1ad4ec9753e54343a766e8fb7adc8c7cbe Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 11 Feb 2016 18:17:17 -0800 Subject: [PATCH 062/232] Fixes for COREXY and COREXZ coordinates --- Marlin/Marlin_main.cpp | 28 +++++++-------- Marlin/planner.cpp | 2 +- Marlin/stepper.cpp | 82 ++++++++++++++++++++++++++++++------------ 3 files changed, 75 insertions(+), 37 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index d21bd599e9..830ffff51e 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -1321,7 +1321,7 @@ static void setup_for_endstop_move() { st_synchronize(); // Tell the planner where we ended up - Get this from the stepper handler - zPosition = st_get_position_mm(Z_AXIS); + zPosition = st_get_axis_position_mm(Z_AXIS); plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], zPosition, current_position[E_AXIS]); // move up the retract distance @@ -1339,7 +1339,7 @@ static void setup_for_endstop_move() { endstops_hit_on_purpose(); // clear endstop hit flags // Get the current stepper position after bumping an endstop - current_position[Z_AXIS] = st_get_position_mm(Z_AXIS); + current_position[Z_AXIS] = st_get_axis_position_mm(Z_AXIS); sync_plan_position(); #if ENABLED(DEBUG_LEVELING_FEATURE) @@ -3143,7 +3143,7 @@ inline void gcode_G28() { float x_tmp = current_position[X_AXIS] + X_PROBE_OFFSET_FROM_EXTRUDER, y_tmp = current_position[Y_AXIS] + Y_PROBE_OFFSET_FROM_EXTRUDER, z_tmp = current_position[Z_AXIS], - real_z = st_get_position_mm(Z_AXIS); //get the real Z (since plan_get_position is now correcting the plane) + real_z = st_get_axis_position_mm(Z_AXIS); //get the real Z (since plan_get_position is now correcting the plane) #if ENABLED(DEBUG_LEVELING_FEATURE) if (marlin_debug_flags & DEBUG_LEVELING) { @@ -3585,10 +3585,10 @@ inline void gcode_M42() { } } - double X_current = st_get_position_mm(X_AXIS), - Y_current = st_get_position_mm(Y_AXIS), - Z_current = st_get_position_mm(Z_AXIS), - E_current = st_get_position_mm(E_AXIS), + double X_current = st_get_axis_position_mm(X_AXIS), + Y_current = st_get_axis_position_mm(Y_AXIS), + Z_current = st_get_axis_position_mm(Z_AXIS), + E_current = st_get_axis_position_mm(E_AXIS), X_probe_location = X_current, Y_probe_location = Y_current, Z_start_location = Z_current + Z_RAISE_BEFORE_PROBING; @@ -3642,10 +3642,10 @@ inline void gcode_M42() { active_extruder); st_synchronize(); - current_position[X_AXIS] = X_current = st_get_position_mm(X_AXIS); - current_position[Y_AXIS] = Y_current = st_get_position_mm(Y_AXIS); - current_position[Z_AXIS] = Z_current = st_get_position_mm(Z_AXIS); - current_position[E_AXIS] = E_current = st_get_position_mm(E_AXIS); + current_position[X_AXIS] = X_current = st_get_axis_position_mm(X_AXIS); + current_position[Y_AXIS] = Y_current = st_get_axis_position_mm(Y_AXIS); + current_position[Z_AXIS] = Z_current = st_get_axis_position_mm(Z_AXIS); + current_position[E_AXIS] = E_current = st_get_axis_position_mm(E_AXIS); // // OK, do the initial probe to get us close to the bed. @@ -3657,15 +3657,15 @@ inline void gcode_M42() { setup_for_endstop_move(); run_z_probe(); - current_position[Z_AXIS] = Z_current = st_get_position_mm(Z_AXIS); - Z_start_location = st_get_position_mm(Z_AXIS) + Z_RAISE_BEFORE_PROBING; + Z_current = current_position[Z_AXIS] = st_get_axis_position_mm(Z_AXIS); + Z_start_location = Z_current + Z_RAISE_BEFORE_PROBING; plan_buffer_line(X_probe_location, Y_probe_location, Z_start_location, E_current, homing_feedrate[X_AXIS] / 60, active_extruder); st_synchronize(); - current_position[Z_AXIS] = Z_current = st_get_position_mm(Z_AXIS); + Z_current = current_position[Z_AXIS] = st_get_axis_position_mm(Z_AXIS); if (deploy_probe_for_each_reading) stow_z_probe(); diff --git a/Marlin/planner.cpp b/Marlin/planner.cpp index 7f54c8950c..1407c075b2 100644 --- a/Marlin/planner.cpp +++ b/Marlin/planner.cpp @@ -1005,7 +1005,7 @@ float junction_deviation = 0.1; #if ENABLED(AUTO_BED_LEVELING_FEATURE) && DISABLED(DELTA) vector_3 plan_get_position() { - vector_3 position = vector_3(st_get_position_mm(X_AXIS), st_get_position_mm(Y_AXIS), st_get_position_mm(Z_AXIS)); + vector_3 position = vector_3(st_get_axis_position_mm(X_AXIS), st_get_axis_position_mm(Y_AXIS), st_get_axis_position_mm(Z_AXIS)); //position.debug("in plan_get position"); //plan_bed_level_matrix.debug("in plan_get_position"); diff --git a/Marlin/stepper.cpp b/Marlin/stepper.cpp index 395b517863..c275907c68 100644 --- a/Marlin/stepper.cpp +++ b/Marlin/stepper.cpp @@ -93,8 +93,8 @@ static volatile char endstop_hit_bits = 0; // use X_MIN, Y_MIN, Z_MIN and Z_MIN_ static bool check_endstops = true; -volatile long count_position[NUM_AXIS] = { 0 }; -volatile signed char count_direction[NUM_AXIS] = { 1, 1, 1, 1 }; +volatile long count_position[NUM_AXIS] = { 0 }; // Positions of stepper motors, in step units +volatile signed char count_direction[NUM_AXIS] = { 1 }; //=========================================================================== @@ -286,9 +286,17 @@ void checkHitEndstops() { } } +#if ENABLED(COREXY) || ENABLED(COREXZ) + #if ENABLED(COREXY) + #define CORE_AXIS_2 B_AXIS + #else + #define CORE_AXIS_2 C_AXIS + #endif +#endif + void enable_endstops(bool check) { check_endstops = check; } -// Check endstops +// Check endstops - called from ISR! inline void update_endstops() { #if ENABLED(Z_DUAL_ENDSTOPS) @@ -311,23 +319,36 @@ inline void update_endstops() { // TEST_ENDSTOP: test the old and the current status of an endstop #define TEST_ENDSTOP(ENDSTOP) (TEST(current_endstop_bits, ENDSTOP) && TEST(old_endstop_bits, ENDSTOP)) - #define UPDATE_ENDSTOP(AXIS,MINMAX) \ - SET_ENDSTOP_BIT(AXIS, MINMAX); \ - if (TEST_ENDSTOP(_ENDSTOP(AXIS, MINMAX)) && (current_block->steps[_AXIS(AXIS)] > 0)) { \ - endstops_trigsteps[_AXIS(AXIS)] = count_position[_AXIS(AXIS)]; \ - _ENDSTOP_HIT(AXIS); \ - step_events_completed = current_block->step_event_count; \ - } + #if ENABLED(COREXY) || ENABLED(COREXZ) - #if ENABLED(COREXY) - // Head direction in -X axis for CoreXY bots. - // If DeltaX == -DeltaY, the movement is only in Y axis - if ((current_block->steps[A_AXIS] != current_block->steps[B_AXIS]) || (TEST(out_bits, A_AXIS) == TEST(out_bits, B_AXIS))) { - if (TEST(out_bits, X_HEAD)) - #elif ENABLED(COREXZ) - // Head direction in -X axis for CoreXZ bots. - // If DeltaX == -DeltaZ, the movement is only in Z axis - if ((current_block->steps[A_AXIS] != current_block->steps[C_AXIS]) || (TEST(out_bits, A_AXIS) == TEST(out_bits, C_AXIS))) { + #define _SET_TRIGSTEPS(AXIS) do { \ + float axis_pos = count_position[_AXIS(AXIS)]; \ + if (_AXIS(AXIS) == A_AXIS) \ + axis_pos = (axis_pos + count_position[CORE_AXIS_2]) / 2; \ + else if (_AXIS(AXIS) == CORE_AXIS_2) \ + axis_pos = (count_position[A_AXIS] - axis_pos) / 2; \ + endstops_trigsteps[_AXIS(AXIS)] = axis_pos; \ + } while(0) + + #else + + #define _SET_TRIGSTEPS(AXIS) endstops_trigsteps[_AXIS(AXIS)] = count_position[_AXIS(AXIS)] + + #endif // COREXY || COREXZ + + #define UPDATE_ENDSTOP(AXIS,MINMAX) do { \ + SET_ENDSTOP_BIT(AXIS, MINMAX); \ + if (TEST_ENDSTOP(_ENDSTOP(AXIS, MINMAX)) && current_block->steps[_AXIS(AXIS)] > 0) { \ + _SET_TRIGSTEPS(AXIS); \ + _ENDSTOP_HIT(AXIS); \ + step_events_completed = current_block->step_event_count; \ + } \ + } while(0) + + #if ENABLED(COREXY) || ENABLED(COREXZ) + // Head direction in -X axis for CoreXY and CoreXZ bots. + // If Delta1 == -Delta2, the movement is only in Y or Z axis + if ((current_block->steps[A_AXIS] != current_block->steps[CORE_AXIS_2]) || (TEST(out_bits, A_AXIS) == TEST(out_bits, CORE_AXIS_2))) { if (TEST(out_bits, X_HEAD)) #else if (TEST(out_bits, X_AXIS)) // stepping along -X axis (regular Cartesian bot) @@ -1087,14 +1108,31 @@ void st_set_e_position(const long& e) { } long st_get_position(uint8_t axis) { - long count_pos; CRITICAL_SECTION_START; - count_pos = count_position[axis]; + long count_pos = count_position[axis]; CRITICAL_SECTION_END; return count_pos; } -float st_get_position_mm(AxisEnum axis) { return st_get_position(axis) / axis_steps_per_unit[axis]; } +float st_get_axis_position_mm(AxisEnum axis) { + float axis_pos; + #if ENABLED(COREXY) | ENABLED(COREXZ) + if (axis == X_AXIS || axis == CORE_AXIS_2) { + CRITICAL_SECTION_START; + long pos1 = count_position[A_AXIS], + pos2 = count_position[CORE_AXIS_2]; + CRITICAL_SECTION_END; + // ((a1+a2)+(a1-a2))/2 -> (a1+a2+a1-a2)/2 -> (a1+a1)/2 -> a1 + // ((a1+a2)-(a1-a2))/2 -> (a1+a2-a1+a2)/2 -> (a2+a2)/2 -> a2 + axis_pos = (pos1 + ((axis == X_AXIS) ? pos2 : -pos2)) / 2.0f; + } + else + axis_pos = st_get_position(axis); + #else + axis_pos = st_get_position(axis); + #endif + return axis_pos / axis_steps_per_unit[axis]; +} void finishAndDisableSteppers() { st_synchronize(); From 83ffc9eb4f3a768bbaab6ad6979de919c03979bd Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 11 Feb 2016 18:18:22 -0800 Subject: [PATCH 063/232] Show raw steps in M114 This is a proposed change. This section of M114 output is a debug extension according to RepRap wiki. --- Marlin/Marlin_main.cpp | 33 +++++++++++++++++++++++++++------ Marlin/language.h | 1 + 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 830ffff51e..0b50589654 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -4283,12 +4283,33 @@ inline void gcode_M114() { SERIAL_PROTOCOLPGM(" E:"); SERIAL_PROTOCOL(current_position[E_AXIS]); - SERIAL_PROTOCOLPGM(MSG_COUNT_X); - SERIAL_PROTOCOL(st_get_position_mm(X_AXIS)); - SERIAL_PROTOCOLPGM(" Y:"); - SERIAL_PROTOCOL(st_get_position_mm(Y_AXIS)); - SERIAL_PROTOCOLPGM(" Z:"); - SERIAL_PROTOCOL(st_get_position_mm(Z_AXIS)); + CRITICAL_SECTION_START; + extern volatile long count_position[NUM_AXIS]; + long xpos = count_position[X_AXIS], + ypos = count_position[Y_AXIS], + zpos = count_position[Z_AXIS]; + CRITICAL_SECTION_END; + + #if ENABLED(COREXY) || ENABLED(COREXZ) + SERIAL_PROTOCOLPGM(MSG_COUNT_A); + #else + SERIAL_PROTOCOLPGM(MSG_COUNT_X); + #endif + SERIAL_PROTOCOL(xpos); + + #if ENABLED(COREXY) + SERIAL_PROTOCOLPGM(" B:"); + #else + SERIAL_PROTOCOLPGM(" Y:"); + #endif + SERIAL_PROTOCOL(ypos); + + #if ENABLED(COREXZ) + SERIAL_PROTOCOLPGM(" C:"); + #else + SERIAL_PROTOCOLPGM(" Z:"); + #endif + SERIAL_PROTOCOL(zpos); SERIAL_EOL; diff --git a/Marlin/language.h b/Marlin/language.h index e5c65a8f43..d9cf6c7db5 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -124,6 +124,7 @@ #define MSG_ERR_NO_THERMISTORS "No thermistors - no temperature" #define MSG_M115_REPORT "FIRMWARE_NAME:Marlin " DETAILED_BUILD_VERSION " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" UUID "\n" #define MSG_COUNT_X " Count X: " +#define MSG_COUNT_A " Count A: " #define MSG_ERR_KILLED "Printer halted. kill() called!" #define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" #define MSG_RESEND "Resend: " From be691b51f19f7972c1c12a9841ee4b82e43b24ba Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 6 Feb 2016 14:38:11 -0800 Subject: [PATCH 064/232] Remove references to marlinfirmware.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The domain is gone and doesn’t redirect, so for now show no URL on the boot screen. --- Marlin/Marlin_main.cpp | 2 +- Marlin/ultralcd_implementation_hitachi_HD44780.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index d21bd599e9..22256db14e 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -74,7 +74,7 @@ * - http://objects.reprap.org/wiki/Mendel_User_Manual:_RepRapGCodes * * Help us document these G-codes online: - * - http://marlinfirmware.org/index.php/G-Code + * - https://github.com/MarlinFirmware/Marlin/wiki/G-Code-in-Marlin * - http://reprap.org/wiki/G-code * * ----------------- diff --git a/Marlin/ultralcd_implementation_hitachi_HD44780.h b/Marlin/ultralcd_implementation_hitachi_HD44780.h index b2178b8043..0ba411cf8e 100644 --- a/Marlin/ultralcd_implementation_hitachi_HD44780.h +++ b/Marlin/ultralcd_implementation_hitachi_HD44780.h @@ -414,6 +414,7 @@ char lcd_print(char* str) { unsigned lcd_print(char c) { return charset_mapper(c); } #if ENABLED(SHOW_BOOTSCREEN) + void lcd_erase_line(int line) { lcd.setCursor(0, 3); for (int i = 0; i < LCD_WIDTH; i++) @@ -486,18 +487,21 @@ unsigned lcd_print(char c) { return charset_mapper(c); } lcd.setCursor(TEXT_SCREEN_LOGO_SHIFT, 1); lcd_printPGM(PSTR("|Marlin|")); lcd.setCursor(TEXT_SCREEN_LOGO_SHIFT, 2); lcd.print('\x02'); lcd_printPGM(PSTR( "------" )); lcd.print('\x03'); - lcd_scroll(0, 3, PSTR("marlinfirmware.org"), LCD_WIDTH, 3000); + delay(2000); #ifdef STRING_SPLASH_LINE1 lcd_erase_line(3); lcd_scroll(0, 3, PSTR(STRING_SPLASH_LINE1), LCD_WIDTH, 1000); #endif + #ifdef STRING_SPLASH_LINE2 lcd_erase_line(3); lcd_scroll(0, 3, PSTR(STRING_SPLASH_LINE2), LCD_WIDTH, 1000); #endif } + #endif // SHOW_BOOTSCREEN + /* Possible status screens: 16x2 |000/000 B000/000| From b81d3b83cf4c94d4d0224e572be9ab0c7b2ef37e Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 7 Feb 2016 00:25:39 -0800 Subject: [PATCH 065/232] Drop the experimental Configurator Development moved to https://github.com/thinkyhead/MarlinConfigurator --- Marlin/configurator/config/Configuration.h | 853 ---------- .../configurator/config/Configuration_adv.h | 602 ------- Marlin/configurator/config/_htaccess | 1 - Marlin/configurator/config/boards.h | 64 - Marlin/configurator/config/language.h | 228 --- Marlin/configurator/css/configurator.css | 344 ---- Marlin/configurator/css/logo.png | Bin 1266 -> 0 bytes Marlin/configurator/index.html | 129 -- Marlin/configurator/js/FileSaver.min.js | 2 - Marlin/configurator/js/binaryfileuploader.js | 79 - Marlin/configurator/js/binarystring.js | 168 -- Marlin/configurator/js/configurator.js | 1432 ----------------- Marlin/configurator/js/jcanvas.js | 524 ------ Marlin/configurator/js/jquery-2.1.3.min.js | 4 - Marlin/configurator/js/jstepper.js | 220 --- Marlin/configurator/js/jszip.min.js | 14 - 16 files changed, 4664 deletions(-) delete mode 100644 Marlin/configurator/config/Configuration.h delete mode 100644 Marlin/configurator/config/Configuration_adv.h delete mode 100644 Marlin/configurator/config/_htaccess delete mode 100644 Marlin/configurator/config/boards.h delete mode 100644 Marlin/configurator/config/language.h delete mode 100644 Marlin/configurator/css/configurator.css delete mode 100644 Marlin/configurator/css/logo.png delete mode 100644 Marlin/configurator/index.html delete mode 100755 Marlin/configurator/js/FileSaver.min.js delete mode 100644 Marlin/configurator/js/binaryfileuploader.js delete mode 100644 Marlin/configurator/js/binarystring.js delete mode 100644 Marlin/configurator/js/configurator.js delete mode 100644 Marlin/configurator/js/jcanvas.js delete mode 100644 Marlin/configurator/js/jquery-2.1.3.min.js delete mode 100644 Marlin/configurator/js/jstepper.js delete mode 100755 Marlin/configurator/js/jszip.min.js diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h deleted file mode 100644 index 2ffe574181..0000000000 --- a/Marlin/configurator/config/Configuration.h +++ /dev/null @@ -1,853 +0,0 @@ -#ifndef CONFIGURATION_H -#define CONFIGURATION_H - -#include "boards.h" -#include "macros.h" - -//=========================================================================== -//============================= Getting Started ============================= -//=========================================================================== -/* -Here are some standard links for getting your machine calibrated: - * http://reprap.org/wiki/Calibration - * http://youtu.be/wAL9d7FgInk - * http://calculator.josefprusa.cz - * http://reprap.org/wiki/Triffid_Hunter%27s_Calibration_Guide - * http://www.thingiverse.com/thing:5573 - * https://sites.google.com/site/repraplogphase/calibration-of-your-reprap - * http://www.thingiverse.com/thing:298812 -*/ - -// This configuration file contains the basic settings. -// Advanced settings can be found in Configuration_adv.h -// BASIC SETTINGS: select your board type, temperature sensor type, axis scaling, and endstop configuration - -//=========================================================================== -//============================= DELTA Printer =============================== -//=========================================================================== -// For a Delta printer replace the configuration files with the files in the -// example_configurations/delta directory. -// - -//=========================================================================== -//============================= SCARA Printer =============================== -//=========================================================================== -// For a Scara printer replace the configuration files with the files in the -// example_configurations/SCARA directory. -// - -// @section info - -#if ENABLED(USE_AUTOMATIC_VERSIONING) - #include "_Version.h" -#else - #include "Default_Version.h" -#endif - -// User-specified version info of this build to display in [Pronterface, etc] terminal window during -// startup. 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_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. -#define SHOW_BOOTSCREEN -#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 -//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 - -// @section machine - -// 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. -// Serial port 0 is still used by the Arduino bootloader regardless of this setting. -// :[0,1,2,3,4,5,6,7] -#define SERIAL_PORT 0 - -// This determines the communication speed of the printer -// :[2400,9600,19200,38400,57600,115200,250000] -#define BAUDRATE 250000 - -// Enable the Bluetooth serial interface on AT90USB devices -//#define BLUETOOTH - -// The following define selects which electronics board you have. -// Please choose the name from boards.h that matches your setup -#ifndef MOTHERBOARD - #define MOTHERBOARD BOARD_RAMPS_13_EFB -#endif - -// Optional custom name for your RepStrap or other custom machine -// Displayed in the LCD "Ready" message -//#define CUSTOM_MACHINE_NAME "3D Printer" - -// Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) -// You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) -//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000" - -// This defines the number of extruders -// :[1,2,3,4] -#define EXTRUDERS 1 - -// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing). -// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder). -// For the other hotends it is their distance from the extruder 0 hotend. -//#define EXTRUDER_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis -//#define EXTRUDER_OFFSET_Y {0.0, 5.00} // (in mm) for each extruder, offset of the hotend on the Y axis - -//// The following define selects which power supply you have. Please choose the one that matches your setup -// 1 = ATX -// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC) -// :{1:'ATX',2:'X-Box 360'} - -#define POWER_SUPPLY 1 - -// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it. -//#define PS_DEFAULT_OFF - -// @section temperature - -//=========================================================================== -//============================= Thermal Settings ============================ -//=========================================================================== -// -//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table -// -//// Temperature sensor settings: -// -2 is thermocouple with MAX6675 (only for sensor 0) -// -1 is thermocouple with AD595 -// 0 is not used -// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup) -// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup) -// 3 is Mendel-parts thermistor (4.7k pullup) -// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !! -// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup) -// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup) -// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup) -// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup) -// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) -// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup) -// 10 is 100k RS thermistor 198-961 (4.7k pullup) -// 11 is 100k beta 3950 1% thermistor (4.7k pullup) -// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed) -// 13 is 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE" -// 20 is the PT100 circuit found in the Ultimainboard V2.x -// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 -// -// 1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k -// (but gives greater accuracy and more stable PID) -// 51 is 100k thermistor - EPCOS (1k pullup) -// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup) -// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup) -// -// 1047 is Pt1000 with 4k7 pullup -// 1010 is Pt1000 with 1k pullup (non standard) -// 147 is Pt100 with 4k7 pullup -// 110 is Pt100 with 1k pullup (non standard) -// 998 and 999 are Dummy Tables. They will ALWAYS read 25°C or the temperature defined below. -// Use it for Testing or Development purposes. NEVER for production machine. -//#define DUMMY_THERMISTOR_998_VALUE 25 -//#define DUMMY_THERMISTOR_999_VALUE 100 -// :{ '0': "Not used", '4': "10k !! do not use for a hotend. Bad resolution at high temp. !!", '1': "100k / 4.7k - EPCOS", '51': "100k / 1k - EPCOS", '6': "100k / 4.7k EPCOS - Not as accurate as Table 1", '5': "100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '7': "100k / 4.7k Honeywell 135-104LAG-J01", '71': "100k / 4.7k Honeywell 135-104LAF-J01", '8': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9': "100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10': "100k / 4.7k RS 198-961", '11': "100k / 4.7k beta 3950 1%", '12': "100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13': "100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '60': "100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '55': "100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '2': "200k / 4.7k - ATC Semitec 204GT-2", '52': "200k / 1k - ATC Semitec 204GT-2", '-2': "Thermocouple + MAX6675 (only for sensor 0)", '-1': "Thermocouple + AD595", '3': "Mendel-parts / 4.7k", '1047': "Pt1000 / 4.7k", '1010': "Pt1000 / 1k (non standard)", '20': "PT100 (Ultimainboard V2.x)", '147': "Pt100 / 4.7k", '110': "Pt100 / 1k (non-standard)", '998': "Dummy 1", '999': "Dummy 2" } -#define TEMP_SENSOR_0 1 -#define TEMP_SENSOR_1 0 -#define TEMP_SENSOR_2 0 -#define TEMP_SENSOR_3 0 -#define TEMP_SENSOR_BED 0 - -// This makes temp sensor 1 a redundant sensor for sensor 0. If the temperatures difference between these sensors is to high the print will be aborted. -//#define TEMP_SENSOR_1_AS_REDUNDANT -#define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10 - -// Actual temperature must be close to target for this long before M109 returns success -#define TEMP_RESIDENCY_TIME 10 // (seconds) -#define TEMP_HYSTERESIS 3 // (degC) range of +/- temperatures considered "close" to the target one -#define TEMP_WINDOW 1 // (degC) Window around target to start the residency timer x degC early. - -// The minimal temperature defines the temperature below which the heater will not be enabled It is used -// to check that the wiring to the thermistor is not broken. -// Otherwise this would lead to the heater being powered on all the time. -#define HEATER_0_MINTEMP 5 -#define HEATER_1_MINTEMP 5 -#define HEATER_2_MINTEMP 5 -#define HEATER_3_MINTEMP 5 -#define BED_MINTEMP 5 - -// When temperature exceeds max temp, your heater will be switched off. -// This feature exists to protect your hotend from overheating accidentally, but *NOT* from thermistor short/failure! -// You should use MINTEMP for thermistor short/failure protection. -#define HEATER_0_MAXTEMP 275 -#define HEATER_1_MAXTEMP 275 -#define HEATER_2_MAXTEMP 275 -#define HEATER_3_MAXTEMP 275 -#define BED_MAXTEMP 150 - -// If you want the M105 heater power reported in watts, define the BED_WATTS, and (shared for all extruders) EXTRUDER_WATTS -//#define EXTRUDER_WATTS (12.0*12.0/6.7) // P=I^2/R -//#define BED_WATTS (12.0*12.0/1.1) // P=I^2/R - -//=========================================================================== -//============================= PID Settings ================================ -//=========================================================================== -// PID Tuning Guide here: http://reprap.org/wiki/PID_Tuning - -// Comment the following line to disable PID and enable bang-bang. -#define PIDTEMP -#define BANG_MAX 255 // limits current to nozzle while in bang-bang mode; 255=full current -#define PID_MAX BANG_MAX // limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current -#if ENABLED(PIDTEMP) - //#define PID_DEBUG // Sends debug data to the serial port. - //#define PID_OPENLOOP 1 // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX - //#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay - //#define PID_PARAMS_PER_EXTRUDER // Uses separate PID parameters for each extruder (useful for mismatched extruders) - // Set/get with gcode: M301 E[extruder number, 0-2] - #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature - // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max. - #define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term - #define K1 0.95 //smoothing factor within the PID - - // If you are using a pre-configured 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 - - // MakerGear - //#define DEFAULT_Kp 7.0 - //#define DEFAULT_Ki 0.1 - //#define DEFAULT_Kd 12 - - // Mendel Parts V9 on 12V - //#define DEFAULT_Kp 63.0 - //#define DEFAULT_Ki 2.25 - //#define DEFAULT_Kd 440 - -#endif // PIDTEMP - -//=========================================================================== -//============================= PID > Bed Temperature Control =============== -//=========================================================================== -// Select PID or bang-bang with PIDTEMPBED. If bang-bang, BED_LIMIT_SWITCHING will enable hysteresis -// -// Uncomment this to enable PID on the bed. It uses the same frequency PWM as the extruder. -// If your PID_dT is the default, and correct for your hardware/configuration, that means 7.689Hz, -// which is fine for driving a square wave into a resistive load and does not significantly impact you FET heating. -// This also works fine on a Fotek SSR-10DA Solid State Relay into a 250W heater. -// If your configuration is significantly different than this and you don't understand the issues involved, you probably -// shouldn't use bed PID until someone else verifies your hardware works. -// If this is enabled, find your own PID constants below. -//#define PIDTEMPBED - -//#define BED_LIMIT_SWITCHING - -// This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option. -// all forms of bed control obey this (PID, bang-bang, bang-bang with hysteresis) -// setting this to anything other than 255 enables a form of PWM to the bed just like HEATER_BED_DUTY_CYCLE_DIVIDER did, -// so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) -#define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current - -//#define PID_BED_DEBUG // Sends debug data to the serial port. - -#if ENABLED(PIDTEMPBED) - - #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term - - //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) - //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10) - #define DEFAULT_bedKp 10.00 - #define DEFAULT_bedKi .023 - #define DEFAULT_bedKd 305.4 - - //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) - //from pidautotune - //#define DEFAULT_bedKp 97.1 - //#define DEFAULT_bedKi 1.41 - //#define DEFAULT_bedKd 1675.16 - - // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles. -#endif // PIDTEMPBED - -// @section extruder - -//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit -//can be software-disabled for whatever purposes by -#define PREVENT_DANGEROUS_EXTRUDE -//if PREVENT_DANGEROUS_EXTRUDE is on, you can still disable (uncomment) very long bits of extrusion separately. -#define PREVENT_LENGTHY_EXTRUDE - -#define EXTRUDE_MINTEMP 170 -#define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances. - -//=========================================================================== -//======================== Thermal Runaway Protection ======================= -//=========================================================================== - -/** - * Thermal Runaway Protection protects your printer from damage and fire if a - * thermistor falls out or temperature sensors fail in any way. - * - * The issue: If a thermistor falls out or a temperature sensor fails, - * Marlin can no longer sense the actual temperature. Since a disconnected - * thermistor reads as a low temperature, the firmware will keep the heater on. - * - * The solution: Once the temperature reaches the target, start observing. - * If the temperature stays too far below the target (hysteresis) for too long, - * the firmware will halt as a safety precaution. - */ - -#define THERMAL_PROTECTION_HOTENDS // Enable thermal protection for all extruders -#define THERMAL_PROTECTION_BED // Enable thermal protection for the heated bed - -//=========================================================================== -//============================= Mechanical Settings ========================= -//=========================================================================== - -// @section machine - -// Uncomment this option to enable CoreXY kinematics -//#define COREXY - -// Uncomment this option to enable CoreXZ kinematics -//#define COREXZ - -// Enable this option for Toshiba steppers -//#define CONFIG_STEPPERS_TOSHIBA - -// @section homing - -// coarse Endstop Settings -#define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors - -#if DISABLED(ENDSTOPPULLUPS) - // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined - //#define ENDSTOPPULLUP_XMAX - //#define ENDSTOPPULLUP_YMAX - //#define ENDSTOPPULLUP_ZMAX - //#define ENDSTOPPULLUP_XMIN - //#define ENDSTOPPULLUP_YMIN - //#define ENDSTOPPULLUP_ZMIN - //#define ENDSTOPPULLUP_ZMIN_PROBE -#endif - -// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). -const bool X_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop. -const bool Y_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop. -const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop. -const bool X_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop. -const bool Y_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop. -const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop. -const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop. -//#define DISABLE_MAX_ENDSTOPS -//#define DISABLE_MIN_ENDSTOPS - -// If you want to enable the Z probe pin, but disable its use, uncomment the line below. -// This only affects a Z probe endstop if you have separate Z min endstop as well and have -// activated Z_MIN_PROBE_ENDSTOP below. If you are using the Z Min endstop on your Z probe, -// this has no effect. -//#define DISABLE_Z_MIN_PROBE_ENDSTOP - -// For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 -// :{0:'Low',1:'High'} -#define X_ENABLE_ON 0 -#define Y_ENABLE_ON 0 -#define Z_ENABLE_ON 0 -#define E_ENABLE_ON 0 // For all extruders - -// Disables axis when it's not being used. -// WARNING: When motors turn off there is a chance of losing position accuracy! -#define DISABLE_X false -#define DISABLE_Y false -#define DISABLE_Z false - -// @section extruder - -#define DISABLE_E false // For all extruders -#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled - -// @section machine - -// Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. -#define INVERT_X_DIR false -#define INVERT_Y_DIR true -#define INVERT_Z_DIR false - -// @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 - -// @section homing - -// ENDSTOP SETTINGS: -// Sets direction of endstops when homing; 1=MAX, -1=MIN -// :[-1,1] -#define X_HOME_DIR -1 -#define Y_HOME_DIR -1 -#define Z_HOME_DIR -1 - -#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. - -// @section machine - -// Travel limits after homing (units are in mm) -#define X_MIN_POS 0 -#define Y_MIN_POS 0 -#define Z_MIN_POS 0 -#define X_MAX_POS 200 -#define Y_MAX_POS 200 -#define Z_MAX_POS 200 - -//=========================================================================== -//========================= Filament Runout Sensor ========================== -//=========================================================================== -//#define FILAMENT_RUNOUT_SENSOR // Uncomment for defining a filament runout sensor such as a mechanical or opto endstop to check the existence of filament - // In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made. - // It is assumed that when logic high = filament available - // when logic low = filament ran out -#if ENABLED(FILAMENT_RUNOUT_SENSOR) - const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned - #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined. - #define FILAMENT_RUNOUT_SCRIPT "M600" -#endif - -//=========================================================================== -//=========================== Manual Bed Leveling =========================== -//=========================================================================== - -//#define MANUAL_BED_LEVELING // Add display menu option for bed leveling. -//#define MESH_BED_LEVELING // Enable mesh bed leveling. - -#if ENABLED(MANUAL_BED_LEVELING) - #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. -#endif // MANUAL_BED_LEVELING - -#if ENABLED(MESH_BED_LEVELING) - #define MESH_MIN_X 10 - #define MESH_MAX_X (X_MAX_POS - MESH_MIN_X) - #define MESH_MIN_Y 10 - #define MESH_MAX_Y (Y_MAX_POS - MESH_MIN_Y) - #define MESH_NUM_X_POINTS 3 // Don't use more than 7 points per axis, implementation limited. - #define MESH_NUM_Y_POINTS 3 - #define MESH_HOME_SEARCH_Z 4 // Z after Home, bed somewhere below but above 0.0. -#endif // MESH_BED_LEVELING - -//=========================================================================== -//============================ Bed Auto Leveling ============================ -//=========================================================================== - -// @section bedlevel - -//#define AUTO_BED_LEVELING_FEATURE // Delete the comment to enable (remove // at the start of the line) -//#define DEBUG_LEVELING_FEATURE -#define Z_MIN_PROBE_REPEATABILITY_TEST // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled. - -#if ENABLED(AUTO_BED_LEVELING_FEATURE) - - // There are 2 different ways to specify probing locations: - // - // - "grid" mode - // Probe several points in a rectangular grid. - // You specify the rectangle and the density of sample points. - // This mode is preferred because there are more measurements. - // - // - "3-point" mode - // Probe 3 arbitrary points on the bed (that aren't colinear) - // You specify the XY coordinates of all 3 points. - - // Enable this to sample the bed in a grid (least squares solution). - // Note: this feature generates 10KB extra code size. - #define AUTO_BED_LEVELING_GRID - - #if ENABLED(AUTO_BED_LEVELING_GRID) - - #define LEFT_PROBE_BED_POSITION 15 - #define RIGHT_PROBE_BED_POSITION 170 - #define FRONT_PROBE_BED_POSITION 20 - #define BACK_PROBE_BED_POSITION 170 - - #define MIN_PROBE_EDGE 10 // The Z probe square sides can be no smaller than this. - - // Set the number of grid points per dimension. - // You probably don't need more than 3 (squared=9). - #define AUTO_BED_LEVELING_GRID_POINTS 2 - - #else // !AUTO_BED_LEVELING_GRID - - // Arbitrary points to probe. - // A simple cross-product is used to estimate the plane of the bed. - #define ABL_PROBE_PT_1_X 15 - #define ABL_PROBE_PT_1_Y 180 - #define ABL_PROBE_PT_2_X 15 - #define ABL_PROBE_PT_2_Y 20 - #define ABL_PROBE_PT_3_X 170 - #define ABL_PROBE_PT_3_Y 20 - - #endif // AUTO_BED_LEVELING_GRID - - // Offsets to the Z probe relative to the nozzle tip. - // X and Y offsets must be integers. - #define X_PROBE_OFFSET_FROM_EXTRUDER -25 // Z probe to nozzle X offset: -left +right - #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Z probe to nozzle Y offset: -front +behind - #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z probe to nozzle Z offset: -below (always!) - - #define Z_RAISE_BEFORE_HOMING 4 // (in mm) Raise Z axis before homing (G28) for Z probe clearance. - // Be sure you have this distance over your Z_MAX_POS in case. - - #define XY_TRAVEL_SPEED 8000 // X and Y axis travel speed between probes, in mm/min. - - #define Z_RAISE_BEFORE_PROBING 15 // How much the Z axis will be raised before traveling to the first probing point. - #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. - #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. - -//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. - // Useful to retract a deployable Z probe. - - //#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell. - //#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. - -// If you have enabled the bed auto leveling and are using the same Z probe for Z homing, -// it is highly recommended you let this Z_SAFE_HOMING enabled!!! - - #define Z_SAFE_HOMING // This feature is meant to avoid Z homing with Z probe outside the bed area. - // When defined, it will: - // - Allow Z homing only after X and Y homing AND stepper drivers still enabled. - // - If stepper drivers timeout, it will need X and Y homing again before Z homing. - // - Position the Z probe in a defined XY point before Z Homing when homing all axis (G28). - // - Block Z homing only when the Z probe is outside bed area. - - #if ENABLED(Z_SAFE_HOMING) - - #define Z_SAFE_HOMING_X_POINT ((X_MIN_POS + X_MAX_POS) / 2) // X point for Z homing when homing all axis (G28). - #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28). - - #endif - - // Support for a dedicated Z probe endstop separate from the Z min endstop. - // If you would like to use both a Z probe and a Z min endstop together, - // uncomment #define Z_MIN_PROBE_ENDSTOP and read the instructions below. - // If you still want to use the Z min endstop for homing, disable Z_SAFE_HOMING above. - // Example: To park the head outside the bed area when homing with G28. - // - // WARNING: - // The Z min endstop will need to set properly as it would without a Z probe - // to prevent head crashes and premature stopping during a print. - // - // To use a separate Z probe endstop, you must have a Z_MIN_PROBE_PIN - // defined in the pins_XXXXX.h file for your control board. - // If you are using a servo based Z probe, you will need to enable NUM_SERVOS, - // Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES in the R/C SERVO support below. - // RAMPS 1.3/1.4 boards may be able to use the 5V, Ground and the D32 pin - // in the Aux 4 section of the RAMPS board. Use 5V for powered sensors, - // otherwise connect to ground and D32 for normally closed configuration - // and 5V and D32 for normally open configurations. - // Normally closed configuration is advised and assumed. - // The D32 pin in Aux 4 on RAMPS maps to the Arduino D32 pin. - // Z_MIN_PROBE_PIN is setting the pin to use on the Arduino. - // Since the D32 pin on the RAMPS maps to D32 on Arduino, this works. - // D32 is currently selected in the RAMPS 1.3/1.4 pin file. - // All other boards will need changes to the respective pins_XXXXX.h file. - // - // WARNING: - // Setting the wrong pin may have unexpected and potentially disastrous outcomes. - // Use with caution and do your homework. - // - //#define Z_MIN_PROBE_ENDSTOP - -#endif // AUTO_BED_LEVELING_FEATURE - - -// @section homing - -// The position of the homing switches -//#define MANUAL_HOME_POSITIONS // If defined, MANUAL_*_HOME_POS below will be used -//#define BED_CENTER_AT_0_0 // If defined, the center of the bed is at (X=0, Y=0) - -// Manual homing switch locations: -// For deltabots this means top and center of the Cartesian print volume. -#if ENABLED(MANUAL_HOME_POSITIONS) - #define MANUAL_X_HOME_POS 0 - #define MANUAL_Y_HOME_POS 0 - #define MANUAL_Z_HOME_POS 0 - //#define MANUAL_Z_HOME_POS 402 // For delta: Distance between nozzle and print surface after homing. -#endif - -// @section movement - -/** - * MOVEMENT SETTINGS - */ - -#define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0} // set the homing speeds (mm/min) - -// default settings - -#define DEFAULT_AXIS_STEPS_PER_UNIT {80,80,4000,500} // default steps per unit for Ultimaker -#define DEFAULT_MAX_FEEDRATE {300, 300, 5, 25} // (mm/sec) -#define DEFAULT_MAX_ACCELERATION {3000,3000,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 3000 // X, Y, Z and E acceleration in mm/s^2 for printing moves -#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration in mm/s^2 for retracts -#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves - -// The speed change that does not require acceleration (i.e. the software might assume it can be done instantaneously) -#define DEFAULT_XYJERK 20.0 // (mm/sec) -#define DEFAULT_ZJERK 0.4 // (mm/sec) -#define DEFAULT_EJERK 5.0 // (mm/sec) - - -//============================================================================= -//============================= Additional Features =========================== -//============================================================================= - -// @section more - -// Custom M code points -#define CUSTOM_M_CODES -#if ENABLED(CUSTOM_M_CODES) - #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 - #define Z_PROBE_OFFSET_RANGE_MIN -20 - #define Z_PROBE_OFFSET_RANGE_MAX 20 - #endif -#endif - -// @section extras - -// EEPROM -// The microcontroller can store settings in the EEPROM, e.g. max velocity... -// M500 - stores parameters in EEPROM -// 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 - -#if ENABLED(EEPROM_SETTINGS) - // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: - #define EEPROM_CHITCHAT // Please keep turned on if you can. -#endif - -// -// M100 Free Memory Watcher -// -//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose - -// @section temperature - -// Preheat Constants -#define PLA_PREHEAT_HOTEND_TEMP 180 -#define PLA_PREHEAT_HPB_TEMP 70 -#define PLA_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255 - -#define ABS_PREHEAT_HOTEND_TEMP 240 -#define ABS_PREHEAT_HPB_TEMP 110 -#define ABS_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255 - -//==============================LCD and SD support============================= -// @section lcd - -// Define your display language below. Replace (en) with your language code and uncomment. -// en, pl, fr, de, es, ru, bg, it, pt, pt-br, fi, an, nl, ca, eu, kana, kana_utf8, cn, test -// See also language.h -#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) - -// Choose ONE of these 3 charsets. This has to match your hardware. Ignored for full graphic display. -// To find out what type you have - compile with (test) - upload - click to get the menu. You'll see two typical lines from the upper half of the charset. -// See also documentation/LCDLanguageFont.md - #define DISPLAY_CHARSET_HD44780_JAPAN // this is the most common hardware - //#define DISPLAY_CHARSET_HD44780_WESTERN - //#define DISPLAY_CHARSET_HD44780_CYRILLIC - -//#define ULTRA_LCD //general LCD support, also 16x2 -//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) -//#define SDSUPPORT // Enable SD Card Support in Hardware Console -// Changed behaviour! If you need SDSUPPORT uncomment it! -//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) -//#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication -//#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder -//#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking -//#define ULTIMAKERCONTROLLER //as available from the Ultimaker online store. -//#define ULTIPANEL //the UltiPanel as on Thingiverse -//#define SPEAKER // The sound device is a speaker - not a buzzer. A buzzer resonates with his own frequency. -//#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click -//#define LCD_FEEDBACK_FREQUENCY_HZ 1000 // this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click - // 0 to disable buzzer feedback. Test with M300 S P -// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3) -// http://reprap.org/wiki/PanelOne -//#define PANEL_ONE - -// The MaKr3d Makr-Panel with graphic controller and SD support -// http://reprap.org/wiki/MaKr3d_MaKrPanel -//#define MAKRPANEL - -// The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD -// http://panucatt.com -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib -//#define VIKI2 -//#define miniVIKI - -// This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ -// -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib -//#define ELB_FULL_GRAPHIC_CONTROLLER -//#define SD_DETECT_INVERTED - -// The RepRapDiscount Smart Controller (white PCB) -// http://reprap.org/wiki/RepRapDiscount_Smart_Controller -//#define REPRAP_DISCOUNT_SMART_CONTROLLER - -// The GADGETS3D G3D LCD/SD Controller (blue PCB) -// http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel -//#define G3D_PANEL - -// The RepRapDiscount FULL GRAPHIC Smart Controller (quadratic white PCB) -// http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller -// -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib -//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER - -// The RepRapWorld REPRAPWORLD_KEYPAD v1.1 -// http://reprapworld.com/?products_details&products_id=202&cPath=1591_1626 -//#define REPRAPWORLD_KEYPAD -//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 // how much should be moved when a key is pressed, eg 10.0 means 10mm per click - -// The Elefu RA Board Control Panel -// http://www.elefu.com/index.php?route=product/product&product_id=53 -// REMEMBER TO INSTALL LiquidCrystal_I2C.h in your ARDUINO library folder: https://github.com/kiyoshigawa/LiquidCrystal_I2C -//#define RA_CONTROL_PANEL - -// The MakerLab Mini Panel with graphic controller and SD support -// http://reprap.org/wiki/Mini_panel -//#define MINIPANEL - -/** - * I2C Panels - */ - -//#define LCD_I2C_SAINSMART_YWROBOT - -// PANELOLU2 LCD with status LEDs, separate encoder and click inputs -// -// This uses the LiquidTWI2 library v1.2.3 or later ( https://github.com/lincomatic/LiquidTWI2 ) -// Make sure the LiquidTWI2 directory is placed in the Arduino or Sketchbook libraries subdirectory. -// (v1.2.3 no longer requires you to define PANELOLU in the LiquidTWI2.h library header file) -// Note: The PANELOLU2 encoder click input can either be directly connected to a pin -// (if BTN_ENC defined to != -1) or read through I2C (when BTN_ENC == -1). -//#define LCD_I2C_PANELOLU2 - -// Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs -//#define LCD_I2C_VIKI - -// SSD1306 OLED generic display support -// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib -//#define U8GLIB_SSD1306 - -// Shift register panels -// --------------------- -// 2 wire Non-latching LCD SR from: -// https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection -// LCD configuration: http://reprap.org/wiki/SAV_3D_LCD -//#define SAV_3DLCD - -// @section extras - -// Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino -//#define FAST_PWM_FAN - -// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency -// which is not as annoying as with the hardware PWM. On the other hand, if this frequency -// is too low, you should also increment SOFT_PWM_SCALE. -//#define FAN_SOFT_PWM - -// Incrementing this by 1 will double the software PWM frequency, -// affecting heaters, and the fan if FAN_SOFT_PWM is enabled. -// However, control resolution will be halved for each increment; -// at zero value, there are 128 effective control positions. -#define SOFT_PWM_SCALE 0 - -// Temperature status LEDs that display the hotend and bet temperature. -// If all hotends and bed temperature and temperature setpoint are < 54C then the BLUE led is on. -// Otherwise the RED led is on. There is 1C hysteresis. -//#define TEMP_STAT_LEDS - -// M240 Triggers a camera by emulating a Canon RC-1 Remote -// Data from: http://www.doc-diy.net/photo/rc-1_hacked/ -//#define PHOTOGRAPH_PIN 23 - -// SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure -//#define SF_ARC_FIX - -// Support for the BariCUDA Paste Extruder. -//#define BARICUDA - -//define BlinkM/CyzRgb Support -//#define BLINKM - -/*********************************************************************\ -* R/C SERVO support -* Sponsored by TrinityLabs, Reworked by codexmas -**********************************************************************/ - -// Number of servos -// -// If you select a configuration below, this will receive a default value and does not need to be set manually -// set it manually if you have more servos than extruders and wish to manually control some -// leaving it undefined or defining as 0 will disable the servo subsystem -// If unsure, leave commented / disabled -// -//#define NUM_SERVOS 3 // Servo index starts with 0 for M280 command - -// Servo Endstops -// -// This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes. -// Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500. -// -//#define X_ENDSTOP_SERVO_NR 1 -//#define Y_ENDSTOP_SERVO_NR 2 -//#define Z_ENDSTOP_SERVO_NR 0 -//#define SERVO_ENDSTOP_ANGLES {{0,0}, {0,0}, {70,0}} // X,Y,Z Axis Extend and Retract angles - -// Servo deactivation -// -// With this option servos are powered only during movement, then turned off to prevent jitter. -//#define DEACTIVATE_SERVOS_AFTER_MOVE - -#if ENABLED(DEACTIVATE_SERVOS_AFTER_MOVE) - // Delay (in microseconds) before turning the servo off. This depends on the servo speed. - // 300ms is a good value but you can try less delay. - // If the servo can't reach the requested position, increase it. - #define SERVO_DEACTIVATION_DELAY 300 -#endif - -/**********************************************************************\ - * Support for a filament diameter sensor - * Also allows adjustment of diameter at print time (vs at slicing) - * Single extruder only at this point (extruder 0) - * - * Motherboards - * 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector - * 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E) - * 301 - Rambo - uses Analog input 3 - * Note may require analog pins to be defined for different motherboards - **********************************************************************/ -// Uncomment below to enable -//#define FILAMENT_SENSOR - -#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2) -#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel - -#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation -#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm -#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm -#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM) - -//defines used in the code -#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially - -//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec. -//#define FILAMENT_LCD_DISPLAY - -#include "Configuration_adv.h" -#include "thermistortables.h" - -#endif //CONFIGURATION_H diff --git a/Marlin/configurator/config/Configuration_adv.h b/Marlin/configurator/config/Configuration_adv.h deleted file mode 100644 index ab6502aa84..0000000000 --- a/Marlin/configurator/config/Configuration_adv.h +++ /dev/null @@ -1,602 +0,0 @@ -#ifndef CONFIGURATION_ADV_H -#define CONFIGURATION_ADV_H - -#include "Conditionals.h" - -// @section temperature - -//=========================================================================== -//=============================Thermal Settings ============================ -//=========================================================================== - -#if ENABLED(BED_LIMIT_SWITCHING) - #define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS -#endif -#define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control - -/** - * Thermal Protection parameters - */ -#if ENABLED(THERMAL_PROTECTION_HOTENDS) - #define THERMAL_PROTECTION_PERIOD 40 // Seconds - #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius - - /** - * Whenever an M104 or M109 increases the target temperature the firmware will wait for the - * WATCH_TEMP_PERIOD to expire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE - * degrees, the machine is halted, requiring a hard reset. This test restarts with any M104/M109, - * but only if the current temperature is far enough below the target for a reliable test. - */ - #define WATCH_TEMP_PERIOD 16 // Seconds - #define WATCH_TEMP_INCREASE 4 // Degrees Celsius -#endif - -#if ENABLED(THERMAL_PROTECTION_BED) - #define THERMAL_PROTECTION_BED_PERIOD 20 // Seconds - #define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius -#endif - -#if ENABLED(PIDTEMP) - // this adds an experimental additional term to the heating power, proportional to the extrusion speed. - // if Kc is chosen well, the additional required power due to increased melting should be compensated. - #define PID_ADD_EXTRUSION_RATE - #if ENABLED(PID_ADD_EXTRUSION_RATE) - #define DEFAULT_Kc (100) //heating power=Kc*(e_speed) - #define LPQ_MAX_LEN 50 - #endif -#endif - -/** - * Automatic Temperature: - * The hotend target temperature is calculated by all the buffered lines of gcode. - * The maximum buffered steps/sec of the extruder motor is called "se". - * Start autotemp mode with M109 S B F - * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by - * mintemp and maxtemp. Turn this off by excuting M109 without F* - * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. - * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode - */ -#define AUTOTEMP -#if ENABLED(AUTOTEMP) - #define AUTOTEMP_OLDWEIGHT 0.98 -#endif - -//Show Temperature ADC value -//The M105 command return, besides traditional information, the ADC value read from temperature sensors. -//#define SHOW_TEMP_ADC_VALUES - -// @section extruder - -// extruder run-out prevention. -//if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded -//#define EXTRUDER_RUNOUT_PREVENT -#define EXTRUDER_RUNOUT_MINTEMP 190 -#define EXTRUDER_RUNOUT_SECONDS 30. -#define EXTRUDER_RUNOUT_ESTEPS 14. //mm filament -#define EXTRUDER_RUNOUT_SPEED 1500. //extrusion speed -#define EXTRUDER_RUNOUT_EXTRUDE 100 - -// @section temperature - -//These defines help to calibrate the AD595 sensor in case you get wrong temperature measurements. -//The measured temperature is defined as "actualTemp = (measuredTemp * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET" -#define TEMP_SENSOR_AD595_OFFSET 0.0 -#define TEMP_SENSOR_AD595_GAIN 1.0 - -//This is for controlling a fan to cool down the stepper drivers -//it will turn on when any driver is enabled -//and turn off after the set amount of seconds from last driver being disabled again -#define CONTROLLERFAN_PIN -1 //Pin used for the fan to cool controller (-1 to disable) -#define CONTROLLERFAN_SECS 60 //How many seconds, after all motors were disabled, the fan should run -#define CONTROLLERFAN_SPEED 255 // == full speed - -// When first starting the main fan, run it at full speed for the -// given number of milliseconds. This gets the fan spinning reliably -// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu) -//#define FAN_KICKSTART_TIME 100 - -// This defines the minimal speed for the main fan, run in PWM mode -// to enable uncomment and set minimal PWM speed for reliable running (1-255) -// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM -//#define FAN_MIN_PWM 50 - -// @section extruder - -// Extruder cooling fans -// Configure fan pin outputs to automatically turn on/off when the associated -// extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE. -// Multiple extruders can be assigned to the same pin in which case -// the fan will turn on when any selected extruder is above the threshold. -#define EXTRUDER_0_AUTO_FAN_PIN -1 -#define EXTRUDER_1_AUTO_FAN_PIN -1 -#define EXTRUDER_2_AUTO_FAN_PIN -1 -#define EXTRUDER_3_AUTO_FAN_PIN -1 -#define EXTRUDER_AUTO_FAN_TEMPERATURE 50 -#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed - - -//=========================================================================== -//=============================Mechanical Settings=========================== -//=========================================================================== - -// @section homing - -#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing - -// @section extras - -//#define Z_LATE_ENABLE // Enable Z the last moment. Needed if your Z driver overheats. - -// A single Z stepper driver is usually used to drive 2 stepper motors. -// Uncomment this define to utilize a separate stepper driver for each Z axis motor. -// Only a few motherboards support this, like RAMPS, which have dual extruder support (the 2nd, often unused, extruder driver is used -// to control the 2nd Z axis stepper motor). The pins are currently only defined for a RAMPS motherboards. -// On a RAMPS (or other 5 driver) motherboard, using this feature will limit you to using 1 extruder. -//#define Z_DUAL_STEPPER_DRIVERS - -#if ENABLED(Z_DUAL_STEPPER_DRIVERS) - - // Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper. - // That way the machine is capable to align the bed during home, since both Z steppers are homed. - // There is also an implementation of M666 (software endstops adjustment) to this feature. - // After Z homing, this adjustment is applied to just one of the steppers in order to align the bed. - // One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2. - // If the Z stepper axis is closer to the bed, the measure Z > Z2 (yes, it is.. think about it) and the Z adjust would be positive. - // Play a little bit with small adjustments (0.5mm) and check the behaviour. - // The M119 (endstops report) will start reporting the Z2 Endstop as well. - - //#define Z_DUAL_ENDSTOPS - - #if ENABLED(Z_DUAL_ENDSTOPS) - #define Z2_MAX_PIN 36 //Endstop used for Z2 axis. In this case I'm using XMAX in a Rumba Board (pin 36) - const bool Z2_MAX_ENDSTOP_INVERTING = false; - #define DISABLE_XMAX_ENDSTOP //Better to disable the XMAX to avoid conflict. Just rename "XMAX_ENDSTOP" by the endstop you are using for Z2 axis. - #endif - -#endif // Z_DUAL_STEPPER_DRIVERS - -// Same again but for Y Axis. -//#define Y_DUAL_STEPPER_DRIVERS - -#if ENABLED(Y_DUAL_STEPPER_DRIVERS) - // Define if the two Y drives need to rotate in opposite directions - #define INVERT_Y2_VS_Y_DIR true -#endif - -// Enable this for dual x-carriage printers. -// A dual x-carriage design has the advantage that the inactive extruder can be parked which -// prevents hot-end ooze contaminating the print. It also reduces the weight of each x-carriage -// allowing faster printing speeds. -//#define DUAL_X_CARRIAGE -#if ENABLED(DUAL_X_CARRIAGE) - // Configuration for second X-carriage - // Note: the first x-carriage is defined as the x-carriage which homes to the minimum endstop; - // the second x-carriage always homes to the maximum endstop. - #define X2_MIN_POS 80 // set minimum to ensure second x-carriage doesn't hit the parked first X-carriage - #define X2_MAX_POS 353 // set maximum to the distance between toolheads when both heads are homed - #define X2_HOME_DIR 1 // the second X-carriage always homes to the maximum endstop position - #define X2_HOME_POS X2_MAX_POS // default home position is the maximum carriage position - // However: In this mode the EXTRUDER_OFFSET_X value for the second extruder provides a software - // override for X2_HOME_POS. This also allow recalibration of the distance between the two endstops - // without modifying the firmware (through the "M218 T1 X???" command). - // Remember: you should set the second extruder x-offset to 0 in your slicer. - - // Pins for second x-carriage stepper driver (defined here to avoid further complicating pins.h) - #define X2_ENABLE_PIN 29 - #define X2_STEP_PIN 25 - #define X2_DIR_PIN 23 - - // There are a few selectable movement modes for dual x-carriages using M605 S - // Mode 0: Full control. The slicer has full control over both x-carriages and can achieve optimal travel results - // as long as it supports dual x-carriages. (M605 S0) - // Mode 1: Auto-park mode. The firmware will automatically park and unpark the x-carriages on tool changes so - // that additional slicer support is not required. (M605 S1) - // Mode 2: Duplication mode. The firmware will transparently make the second x-carriage and extruder copy all - // actions of the first x-carriage. This allows the printer to print 2 arbitrary items at - // once. (2nd extruder x offset and temp offset are set using: M605 S2 [Xnnn] [Rmmm]) - - // This is the default power-up mode which can be later using M605. - #define DEFAULT_DUAL_X_CARRIAGE_MODE 0 - - // Default settings in "Auto-park Mode" - #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder - #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder - - // Default x offset in duplication mode (typically set to half print bed width) - #define DEFAULT_DUPLICATION_X_OFFSET 100 - -#endif //DUAL_X_CARRIAGE - -// @section homing - -//homing hits the endstop, then retracts by this distance, before it tries to slowly bump again: -#define X_HOME_BUMP_MM 5 -#define Y_HOME_BUMP_MM 5 -#define Z_HOME_BUMP_MM 2 -#define HOMING_BUMP_DIVISOR {2, 2, 4} // Re-Bump Speed Divisor (Divides the Homing Feedrate) -//#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially. - -// When G28 is called, this option will make Y home before X -//#define HOME_Y_BEFORE_X - -// @section machine - -#define AXIS_RELATIVE_MODES {false, false, false, false} - -// @section machine - -//By default pololu step drivers require an active high signal. However, some high power drivers require an active low signal as step. -#define INVERT_X_STEP_PIN false -#define INVERT_Y_STEP_PIN false -#define INVERT_Z_STEP_PIN false -#define INVERT_E_STEP_PIN false - -// Default stepper release if idle. Set to 0 to deactivate. -#define DEFAULT_STEPPER_DEACTIVE_TIME 60 - -#define DEFAULT_MINIMUMFEEDRATE 0.0 // minimum feedrate -#define DEFAULT_MINTRAVELFEEDRATE 0.0 - -// @section lcd - -#if ENABLED(ULTIPANEL) - #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel - #define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder -#endif - -// @section extras - -// minimum time in microseconds that a movement needs to take if the buffer is emptied. -#define DEFAULT_MINSEGMENTTIME 20000 - -// If defined the movements slow down when the look ahead buffer is only half full -#define SLOWDOWN - -// Frequency limit -// See nophead's blog for more info -// Not working O -//#define XY_FREQUENCY_LIMIT 15 - -// Minimum planner junction speed. Sets the default minimum speed the planner plans for at the end -// of the buffer and all stops. This should not be much greater than zero and should only be changed -// if unwanted behavior is observed on a user's machine when running at very slow speeds. -#define MINIMUM_PLANNER_SPEED 0.05// (mm/sec) - -// Microstep setting (Only functional when stepper driver microstep pins are connected to MCU. -#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16] - -// 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) - -// uncomment to enable an I2C based DIGIPOT like on the Azteeg X3 Pro -//#define DIGIPOT_I2C -// Number of channels available for I2C digipot, For Azteeg X3 Pro we have 8 -#define DIGIPOT_I2C_NUM_CHANNELS 8 -// 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} - -//=========================================================================== -//=============================Additional Features=========================== -//=========================================================================== - -#define ENCODER_RATE_MULTIPLIER // If defined, certain menu edit operations automatically multiply the steps when the encoder is moved quickly -#define ENCODER_10X_STEPS_PER_SEC 75 // If the encoder steps per sec exceeds this value, multiply steps moved x10 to quickly advance the value -#define ENCODER_100X_STEPS_PER_SEC 160 // If the encoder steps per sec exceeds this value, multiply steps moved x100 to really quickly advance the value - -//#define CHDK 4 //Pin for triggering CHDK to take a picture see how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/ -#define CHDK_DELAY 50 //How long in ms the pin should stay HIGH before going LOW again - -// @section lcd - -#if ENABLED(SDSUPPORT) - - // Some RAMPS and other boards don't detect when an SD card is inserted. You can work - // around this by connecting a push button or single throw switch to the pin defined - // as SD_DETECT_PIN in your board's pins definitions. - // This setting should be disabled unless you are using a push button, pulling the pin to ground. - // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER). - #define SD_DETECT_INVERTED - - #define SD_FINISHED_STEPPERRELEASE true //if sd support and the file is finished: disable steppers? - #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place. - - #define SDCARD_RATHERRECENTFIRST //reverse file order of sd card menu display. Its sorted practically after the file system block order. - // if a file is deleted, it frees a block. hence, the order is not purely chronological. To still have auto0.g accessible, there is again the option to do that. - // using: - //#define MENU_ADDAUTOSTART - - // Show a progress bar on HD44780 LCDs for SD printing - //#define LCD_PROGRESS_BAR - - #if ENABLED(LCD_PROGRESS_BAR) - // Amount of time (ms) to show the bar - #define PROGRESS_BAR_BAR_TIME 2000 - // Amount of time (ms) to show the status message - #define PROGRESS_BAR_MSG_TIME 3000 - // Amount of time (ms) to retain the status message (0=forever) - #define PROGRESS_MSG_EXPIRE 0 - // Enable this to show messages for MSG_TIME then hide them - //#define PROGRESS_MSG_ONCE - #endif - - // This allows hosts to request long names for files and folders with M33 - //#define LONG_FILENAME_HOST_SUPPORT - - // This option allows you to abort SD printing when any endstop is triggered. - // This feature must be enabled with "M540 S1" or from the LCD menu. - // To have any effect, endstops must be enabled during SD printing. - // With ENDSTOPS_ONLY_FOR_HOMING you must send "M120" to enable endstops. - //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED - -#endif // SDSUPPORT - -// for dogm lcd displays you can choose some additional fonts: -#if ENABLED(DOGLCD) - // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT - // we don't have a big font for Cyrillic, Kana - //#define USE_BIG_EDIT_FONT - - // If you have spare 2300Byte of progmem and want to use a - // smaller font on the Info-screen uncomment the next line. - //#define USE_SMALL_INFOFONT -#endif // DOGLCD - -// @section more - -// The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation. -//#define USE_WATCHDOG - -#if ENABLED(USE_WATCHDOG) -// If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. -// The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. -// However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. -//#define WATCHDOG_RESET_MANUAL -#endif - -// @section lcd - -// Babystepping enables the user to control the axis in tiny amounts, independently from the normal printing process -// it can e.g. be used to change z-positions in the print startup phase in real-time -// does not respect endstops! -//#define BABYSTEPPING -#if ENABLED(BABYSTEPPING) - #define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions - #define BABYSTEP_INVERT_Z false //true for inverse movements in Z - #define BABYSTEP_MULTIPLICATOR 1 //faster movements -#endif - -// @section extruder - -// extruder advance constant (s2/mm3) -// -// advance (steps) = STEPS_PER_CUBIC_MM_E * EXTRUDER_ADVANCE_K * cubic mm per second ^ 2 -// -// Hooke's law says: force = k * distance -// Bernoulli's principle says: v ^ 2 / 2 + g . h + pressure / density = constant -// so: v ^ 2 is proportional to number of steps we advance the extruder -//#define ADVANCE - -#if ENABLED(ADVANCE) - #define EXTRUDER_ADVANCE_K .0 - #define D_FILAMENT 2.85 - #define STEPS_MM_E 836 -#endif - -// @section extras - -// Arc interpretation settings: -#define MM_PER_ARC_SEGMENT 1 -#define N_ARC_CORRECTION 25 - -const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement - -// @section temperature - -// Control heater 0 and heater 1 in parallel. -//#define HEATERS_PARALLEL - -//=========================================================================== -//================================= Buffers ================================= -//=========================================================================== - -// @section hidden - -// The number of linear motions that can be in the plan at any give time. -// THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering. -#if ENABLED(SDSUPPORT) - #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller -#else - #define BLOCK_BUFFER_SIZE 16 // maximize block buffer -#endif - -// @section more - -//The ASCII buffer for receiving from the serial: -#define MAX_CMD_SIZE 96 -#define BUFSIZE 4 - -// Bad Serial-connections can miss a received command by sending an 'ok' -// Therefore some clients abort after 30 seconds in a timeout. -// Some other clients start sending commands while receiving a 'wait'. -// This "wait" is only sent when the buffer is empty. 1 second is a good value here. -//#define NO_TIMEOUTS 1000 // Milliseconds - -// Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary. -//#define ADVANCED_OK - -// @section fwretract - -// Firmware based and LCD controlled retract -// M207 and M208 can be used to define parameters for the retraction. -// The retraction can be called by the slicer using G10 and G11 -// until then, intended retractions can be detected by moves that only extrude and the direction. -// the moves are than replaced by the firmware controlled ones. - -//#define FWRETRACT //ONLY PARTIALLY TESTED -#if ENABLED(FWRETRACT) - #define MIN_RETRACT 0.1 //minimum extruded mm to accept a automatic gcode retraction attempt - #define RETRACT_LENGTH 3 //default retract length (positive mm) - #define RETRACT_LENGTH_SWAP 13 //default swap retract length (positive mm), for extruder change - #define RETRACT_FEEDRATE 45 //default feedrate for retracting (mm/s) - #define RETRACT_ZLIFT 0 //default retract Z-lift - #define RETRACT_RECOVER_LENGTH 0 //default additional recover length (mm, added to retract length when recovering) - #define RETRACT_RECOVER_LENGTH_SWAP 0 //default additional swap recover length (mm, added to retract length when recovering from extruder change) - #define RETRACT_RECOVER_FEEDRATE 8 //default feedrate for recovering from retraction (mm/s) -#endif - -// Add support for experimental filament exchange support M600; requires display -#if ENABLED(ULTIPANEL) - //#define FILAMENTCHANGEENABLE - #if ENABLED(FILAMENTCHANGEENABLE) - #define FILAMENTCHANGE_XPOS 3 - #define FILAMENTCHANGE_YPOS 3 - #define FILAMENTCHANGE_ZADD 10 - #define FILAMENTCHANGE_FIRSTRETRACT -2 - #define FILAMENTCHANGE_FINALRETRACT -100 - #define AUTO_FILAMENT_CHANGE //This extrude filament until you press the button on LCD - #define AUTO_FILAMENT_CHANGE_LENGTH 0.04 //Extrusion length on automatic extrusion loop - #define AUTO_FILAMENT_CHANGE_FEEDRATE 300 //Extrusion feedrate (mm/min) on automatic extrusion loop - #endif -#endif - -/******************************************************************************\ - * enable this section if you have TMC26X motor drivers. - * you need to import the TMC26XStepper library into the arduino IDE for this - ******************************************************************************/ - -// @section tmc - -//#define HAVE_TMCDRIVER -#if ENABLED(HAVE_TMCDRIVER) - -//#define X_IS_TMC - #define X_MAX_CURRENT 1000 //in mA - #define X_SENSE_RESISTOR 91 //in mOhms - #define X_MICROSTEPS 16 //number of microsteps - -//#define X2_IS_TMC - #define X2_MAX_CURRENT 1000 //in mA - #define X2_SENSE_RESISTOR 91 //in mOhms - #define X2_MICROSTEPS 16 //number of microsteps - -//#define Y_IS_TMC - #define Y_MAX_CURRENT 1000 //in mA - #define Y_SENSE_RESISTOR 91 //in mOhms - #define Y_MICROSTEPS 16 //number of microsteps - -//#define Y2_IS_TMC - #define Y2_MAX_CURRENT 1000 //in mA - #define Y2_SENSE_RESISTOR 91 //in mOhms - #define Y2_MICROSTEPS 16 //number of microsteps - -//#define Z_IS_TMC - #define Z_MAX_CURRENT 1000 //in mA - #define Z_SENSE_RESISTOR 91 //in mOhms - #define Z_MICROSTEPS 16 //number of microsteps - -//#define Z2_IS_TMC - #define Z2_MAX_CURRENT 1000 //in mA - #define Z2_SENSE_RESISTOR 91 //in mOhms - #define Z2_MICROSTEPS 16 //number of microsteps - -//#define E0_IS_TMC - #define E0_MAX_CURRENT 1000 //in mA - #define E0_SENSE_RESISTOR 91 //in mOhms - #define E0_MICROSTEPS 16 //number of microsteps - -//#define E1_IS_TMC - #define E1_MAX_CURRENT 1000 //in mA - #define E1_SENSE_RESISTOR 91 //in mOhms - #define E1_MICROSTEPS 16 //number of microsteps - -//#define E2_IS_TMC - #define E2_MAX_CURRENT 1000 //in mA - #define E2_SENSE_RESISTOR 91 //in mOhms - #define E2_MICROSTEPS 16 //number of microsteps - -//#define E3_IS_TMC - #define E3_MAX_CURRENT 1000 //in mA - #define E3_SENSE_RESISTOR 91 //in mOhms - #define E3_MICROSTEPS 16 //number of microsteps - -#endif - -/******************************************************************************\ - * enable this section if you have L6470 motor drivers. - * you need to import the L6470 library into the arduino IDE for this - ******************************************************************************/ - -// @section l6470 - -//#define HAVE_L6470DRIVER -#if ENABLED(HAVE_L6470DRIVER) - -//#define X_IS_L6470 - #define X_MICROSTEPS 16 //number of microsteps - #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high - #define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off - #define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall - -//#define X2_IS_L6470 - #define X2_MICROSTEPS 16 //number of microsteps - #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high - #define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off - #define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall - -//#define Y_IS_L6470 - #define Y_MICROSTEPS 16 //number of microsteps - #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high - #define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off - #define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall - -//#define Y2_IS_L6470 - #define Y2_MICROSTEPS 16 //number of microsteps - #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high - #define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off - #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall - -//#define Z_IS_L6470 - #define Z_MICROSTEPS 16 //number of microsteps - #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high - #define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off - #define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall - -//#define Z2_IS_L6470 - #define Z2_MICROSTEPS 16 //number of microsteps - #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high - #define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off - #define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall - -//#define E0_IS_L6470 - #define E0_MICROSTEPS 16 //number of microsteps - #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high - #define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off - #define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall - -//#define E1_IS_L6470 - #define E1_MICROSTEPS 16 //number of microsteps - #define E1_MICROSTEPS 16 //number of microsteps - #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high - #define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off - #define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall - -//#define E2_IS_L6470 - #define E2_MICROSTEPS 16 //number of microsteps - #define E2_MICROSTEPS 16 //number of microsteps - #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high - #define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off - #define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall - -//#define E3_IS_L6470 - #define E3_MICROSTEPS 16 //number of microsteps - #define E3_MICROSTEPS 16 //number of microsteps - #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high - #define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off - #define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall - -#endif - -#include "Conditionals.h" -#include "SanityCheck.h" - -#endif //CONFIGURATION_ADV_H diff --git a/Marlin/configurator/config/_htaccess b/Marlin/configurator/config/_htaccess deleted file mode 100644 index f289550940..0000000000 --- a/Marlin/configurator/config/_htaccess +++ /dev/null @@ -1 +0,0 @@ -Header set Access-Control-Allow-Origin "*" diff --git a/Marlin/configurator/config/boards.h b/Marlin/configurator/config/boards.h deleted file mode 100644 index f6bbc9d673..0000000000 --- a/Marlin/configurator/config/boards.h +++ /dev/null @@ -1,64 +0,0 @@ -#ifndef BOARDS_H -#define BOARDS_H - -#define BOARD_UNKNOWN -1 - -#define BOARD_GEN7_CUSTOM 10 // Gen7 custom (Alfons3 Version) "https://github.com/Alfons3/Generation_7_Electronics" -#define BOARD_GEN7_12 11 // Gen7 v1.1, v1.2 -#define BOARD_GEN7_13 12 // Gen7 v1.3 -#define BOARD_GEN7_14 13 // Gen7 v1.4 -#define BOARD_CHEAPTRONIC 2 // Cheaptronic v1.0 -#define BOARD_SETHI 20 // Sethi 3D_1 -#define BOARD_RAMPS_OLD 3 // MEGA/RAMPS up to 1.2 -#define BOARD_RAMPS_13_EFB 33 // RAMPS 1.3 / 1.4 (Power outputs: Extruder, Fan, Bed) -#define BOARD_RAMPS_13_EEB 34 // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Bed) -#define BOARD_RAMPS_13_EFF 35 // RAMPS 1.3 / 1.4 (Power outputs: Extruder, Fan, Fan) -#define BOARD_RAMPS_13_EEF 36 // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Fan) -#define BOARD_RAMPS_13_SF 38 // RAMPS 1.3 / 1.4 (Power outputs: Spindle, Controller Fan) -#define BOARD_FELIX2 37 // Felix 2.0+ Electronics Board (RAMPS like) -#define BOARD_RIGIDBOARD 42 // Invent-A-Part RigidBoard -#define BOARD_GEN6 5 // Gen6 -#define BOARD_GEN6_DELUXE 51 // Gen6 deluxe -#define BOARD_SANGUINOLOLU_11 6 // Sanguinololu < 1.2 -#define BOARD_SANGUINOLOLU_12 62 // Sanguinololu 1.2 and above -#define BOARD_MELZI 63 // Melzi -#define BOARD_STB_11 64 // STB V1.1 -#define BOARD_AZTEEG_X1 65 // Azteeg X1 -#define BOARD_MELZI_MAKR3D 66 // Melzi with ATmega1284 (MaKr3d version) -#define BOARD_AZTEEG_X3 67 // Azteeg X3 -#define BOARD_AZTEEG_X3_PRO 68 // Azteeg X3 Pro -#define BOARD_ULTIMAKER 7 // Ultimaker -#define BOARD_ULTIMAKER_OLD 71 // Ultimaker (Older electronics. Pre 1.5.4. This is rare) -#define BOARD_ULTIMAIN_2 72 // Ultimainboard 2.x (Uses TEMP_SENSOR 20) -#define BOARD_3DRAG 77 // 3Drag Controller -#define BOARD_K8200 78 // Vellemann K8200 Controller (derived from 3Drag Controller) -#define BOARD_TEENSYLU 8 // Teensylu -#define BOARD_RUMBA 80 // Rumba -#define BOARD_PRINTRBOARD 81 // Printrboard (AT90USB1286) -#define BOARD_BRAINWAVE 82 // Brainwave (AT90USB646) -#define BOARD_SAV_MKI 83 // SAV Mk-I (AT90USB1286) -#define BOARD_TEENSY2 84 // Teensy++2.0 (AT90USB1286) - CLI compile: DEFINES=AT90USBxx_TEENSYPP_ASSIGNMENTS HARDWARE_MOTHERBOARD=84 make -#define BOARD_BRAINWAVE_PRO 85 // Brainwave Pro (AT90USB1286) -#define BOARD_GEN3_PLUS 9 // Gen3+ -#define BOARD_GEN3_MONOLITHIC 22 // Gen3 Monolithic Electronics -#define BOARD_MEGATRONICS 70 // Megatronics -#define BOARD_MEGATRONICS_2 701 // Megatronics v2.0 -#define BOARD_MINITRONICS 702 // Minitronics v1.0/1.1 -#define BOARD_MEGATRONICS_3 703 // Megatronics v3.0 -#define BOARD_OMCA_A 90 // Alpha OMCA board -#define BOARD_OMCA 91 // Final OMCA board -#define BOARD_RAMBO 301 // Rambo -#define BOARD_MINIRAMBO 302 // Mini-Rambo -#define BOARD_MEGACONTROLLER 310 // Mega controller -#define BOARD_ELEFU_3 21 // Elefu Ra Board (v3) -#define BOARD_5DPRINT 88 // 5DPrint D8 Driver Board -#define BOARD_LEAPFROG 999 // Leapfrog -#define BOARD_MKS_BASE 40 // MKS BASE 1.0 -#define BOARD_BAM_DICE 401 // 2PrintBeta BAM&DICE with STK drivers -#define BOARD_BAM_DICE_DUE 402 // 2PrintBeta BAM&DICE Due with STK drivers - -#define BOARD_99 99 // This is in pins.h but...? - -#define MB(board) (MOTHERBOARD==BOARD_##board) - -#endif //__BOARDS_H diff --git a/Marlin/configurator/config/language.h b/Marlin/configurator/config/language.h deleted file mode 100644 index 46a306c9a7..0000000000 --- a/Marlin/configurator/config/language.h +++ /dev/null @@ -1,228 +0,0 @@ -#ifndef LANGUAGE_H -#define LANGUAGE_H - -#include "Configuration.h" - -#define LANGUAGE_CONCAT(M) #M -#define GENERATE_LANGUAGE_INCLUDE(M) LANGUAGE_CONCAT(language_##M.h) - - -// NOTE: IF YOU CHANGE LANGUAGE FILES OR MERGE A FILE WITH CHANGES -// -// ==> ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRALCD" / "SDSUPPORT" #define IN "Configuration.h" -// ==> ALSO TRY ALL AVAILABLE LANGUAGE OPTIONS -// See also documentation/LCDLanguageFont.md - -// Languages -// en English -// pl Polish -// fr French -// de German -// es Spanish -// ru Russian -// bg Bulgarian -// it Italian -// pt Portuguese -// pt-br Portuguese (Brazil) -// fi Finnish -// an Aragonese -// nl Dutch -// ca Catalan -// eu Basque-Euskera -// kana Japanese -// kana_utf Japanese -// cn Chinese - -// fallback if no language is set, don't change -#ifndef LANGUAGE_INCLUDE - #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) -#endif - -#if ENABLED(USE_AUTOMATIC_VERSIONING) - #include "_Version.h" -#else - #include "Default_Version.h" -#endif - -#define PROTOCOL_VERSION "1.0" - -#if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2) - #define MACHINE_NAME "Ultimaker" - #define SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin" -#elif MB(RUMBA) - #define MACHINE_NAME "Rumba" -#elif MB(3DRAG) - #define MACHINE_NAME "3Drag" - #define SOURCE_CODE_URL "http://3dprint.elettronicain.it/" -#elif MB(K8200) - #define MACHINE_NAME "K8200" - #define SOURCE_CODE_URL "https://github.com/CONSULitAS/Marlin-K8200" -#elif MB(5DPRINT) - #define MACHINE_NAME "Makibox" -#elif MB(SAV_MKI) - #define MACHINE_NAME "SAV MkI" - #define SOURCE_CODE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config" -#elif !defined(MACHINE_NAME) - #define MACHINE_NAME "3D Printer" -#endif - -#ifdef CUSTOM_MACHINE_NAME - #undef MACHINE_NAME - #define MACHINE_NAME CUSTOM_MACHINE_NAME -#endif - -#ifndef SOURCE_CODE_URL - #define SOURCE_CODE_URL "https://github.com/MarlinFirmware/Marlin" -#endif - -#ifndef DETAILED_BUILD_VERSION - #error BUILD_VERSION Information must be specified -#endif - -#ifndef MACHINE_UUID - #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" -#endif - - -#define STRINGIFY_(n) #n -#define STRINGIFY(n) STRINGIFY_(n) - - -// Common LCD messages - - /* nothing here yet */ - -// Common serial messages -#define MSG_MARLIN "Marlin" - -// Serial Console Messages (do not translate those!) - -#define MSG_Enqueueing "enqueueing \"" -#define MSG_POWERUP "PowerUp" -#define MSG_EXTERNAL_RESET " External Reset" -#define MSG_BROWNOUT_RESET " Brown out Reset" -#define MSG_WATCHDOG_RESET " Watchdog Reset" -#define MSG_SOFTWARE_RESET " Software Reset" -#define MSG_AUTHOR " | Author: " -#define MSG_CONFIGURATION_VER " Last Updated: " -#define MSG_FREE_MEMORY " Free Memory: " -#define MSG_PLANNER_BUFFER_BYTES " PlannerBufferBytes: " -#define MSG_OK "ok" -#define MSG_WAIT "wait" -#define MSG_FILE_SAVED "Done saving file." -#define MSG_ERR_LINE_NO "Line Number is not Last Line Number+1, Last Line: " -#define MSG_ERR_CHECKSUM_MISMATCH "checksum mismatch, Last Line: " -#define MSG_ERR_NO_CHECKSUM "No Checksum with line number, Last Line: " -#define MSG_ERR_NO_LINENUMBER_WITH_CHECKSUM "No Line Number with checksum, Last Line: " -#define MSG_FILE_PRINTED "Done printing file" -#define MSG_BEGIN_FILE_LIST "Begin file list" -#define MSG_END_FILE_LIST "End file list" -#define MSG_INVALID_EXTRUDER "Invalid extruder" -#define MSG_INVALID_SOLENOID "Invalid solenoid" -#define MSG_ERR_NO_THERMISTORS "No thermistors - no temperature" -#define MSG_M115_REPORT "FIRMWARE_NAME:Marlin " DETAILED_BUILD_VERSION " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n" -#define MSG_COUNT_X " Count X: " -#define MSG_ERR_KILLED "Printer halted. kill() called!" -#define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" -#define MSG_RESEND "Resend: " -#define MSG_UNKNOWN_COMMAND "Unknown command: \"" -#define MSG_ACTIVE_EXTRUDER "Active Extruder: " -#define MSG_X_MIN "x_min: " -#define MSG_X_MAX "x_max: " -#define MSG_Y_MIN "y_min: " -#define MSG_Y_MAX "y_max: " -#define MSG_Z_MIN "z_min: " -#define MSG_Z_MAX "z_max: " -#define MSG_Z2_MAX "z2_max: " -#define MSG_Z_PROBE "z_probe: " -#define MSG_ERR_MATERIAL_INDEX "M145 S out of range (0-1)" -#define MSG_ERR_M421_REQUIRES_XYZ "M421 requires XYZ parameters" -#define MSG_ERR_MESH_INDEX_OOB "Mesh XY index is out of bounds" -#define MSG_ERR_M428_TOO_FAR "Too far from reference point" -#define MSG_M119_REPORT "Reporting endstop status" -#define MSG_ENDSTOP_HIT "TRIGGERED" -#define MSG_ENDSTOP_OPEN "open" -#define MSG_HOTEND_OFFSET "Hotend offsets:" - -#define MSG_SD_CANT_OPEN_SUBDIR "Cannot open subdir" -#define MSG_SD_INIT_FAIL "SD init fail" -#define MSG_SD_VOL_INIT_FAIL "volume.init failed" -#define MSG_SD_OPENROOT_FAIL "openRoot failed" -#define MSG_SD_CARD_OK "SD card ok" -#define MSG_SD_WORKDIR_FAIL "workDir open failed" -#define MSG_SD_OPEN_FILE_FAIL "open failed, File: " -#define MSG_SD_FILE_OPENED "File opened: " -#define MSG_SD_SIZE " Size: " -#define MSG_SD_FILE_SELECTED "File selected" -#define MSG_SD_WRITE_TO_FILE "Writing to file: " -#define MSG_SD_PRINTING_BYTE "SD printing byte " -#define MSG_SD_NOT_PRINTING "Not SD printing" -#define MSG_SD_ERR_WRITE_TO_FILE "error writing to file" -#define MSG_SD_CANT_ENTER_SUBDIR "Cannot enter subdir: " - -#define MSG_STEPPER_TOO_HIGH "Steprate too high: " -#define MSG_ENDSTOPS_HIT "endstops hit: " -#define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented" -#define MSG_ERR_LONG_EXTRUDE_STOP " too long extrusion prevented" -#define MSG_TOO_COLD_FOR_M600 "M600 Hotend too cold to change filament" -#define MSG_BABYSTEPPING_X "Babystepping X" -#define MSG_BABYSTEPPING_Y "Babystepping Y" -#define MSG_BABYSTEPPING_Z "Babystepping Z" -#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Error in menu structure" - -#define MSG_ERR_EEPROM_WRITE "Error writing to EEPROM!" - -// temperature.cpp strings -#define MSG_PID_AUTOTUNE "PID Autotune" -#define MSG_PID_AUTOTUNE_START MSG_PID_AUTOTUNE " start" -#define MSG_PID_AUTOTUNE_FAILED MSG_PID_AUTOTUNE " failed!" -#define MSG_PID_BAD_EXTRUDER_NUM MSG_PID_AUTOTUNE_FAILED " Bad extruder number" -#define MSG_PID_TEMP_TOO_HIGH MSG_PID_AUTOTUNE_FAILED " Temperature too high" -#define MSG_PID_TIMEOUT MSG_PID_AUTOTUNE_FAILED " timeout" -#define MSG_BIAS " bias: " -#define MSG_D " d: " -#define MSG_T_MIN " min: " -#define MSG_T_MAX " max: " -#define MSG_KU " Ku: " -#define MSG_TU " Tu: " -#define MSG_CLASSIC_PID " Classic PID " -#define MSG_KP " Kp: " -#define MSG_KI " Ki: " -#define MSG_KD " Kd: " -#define MSG_B "B:" -#define MSG_T "T:" -#define MSG_AT " @:" -#define MSG_PID_AUTOTUNE_FINISHED MSG_PID_AUTOTUNE " finished! Put the last Kp, Ki and Kd constants from below into Configuration.h" -#define MSG_PID_DEBUG " PID_DEBUG " -#define MSG_PID_DEBUG_INPUT ": Input " -#define MSG_PID_DEBUG_OUTPUT " Output " -#define MSG_PID_DEBUG_PTERM " pTerm " -#define MSG_PID_DEBUG_ITERM " iTerm " -#define MSG_PID_DEBUG_DTERM " dTerm " -#define MSG_PID_DEBUG_CTERM " cTerm " -#define MSG_INVALID_EXTRUDER_NUM " - Invalid extruder number !" - -#define MSG_HEATER_BED "bed" -#define MSG_STOPPED_HEATER ", system stopped! Heater_ID: " -#define MSG_REDUNDANCY "Heater switched off. Temperature difference between temp sensors is too high !" -#define MSG_T_HEATING_FAILED "Heating failed" -#define MSG_T_THERMAL_RUNAWAY "Thermal Runaway" -#define MSG_T_MAXTEMP "MAXTEMP triggered" -#define MSG_T_MINTEMP "MINTEMP triggered" - -// Debug -#define MSG_DEBUG_ECHO "DEBUG ECHO ENABLED" -#define MSG_DEBUG_INFO "DEBUG INFO ENABLED" -#define MSG_DEBUG_ERRORS "DEBUG ERRORS ENABLED" -#define MSG_DEBUG_DRYRUN "DEBUG DRYRUN ENABLED" - -// LCD Menu Messages - -#if DISABLED(DISPLAY_CHARSET_HD44780_JAPAN) && DISABLED(DISPLAY_CHARSET_HD44780_WESTERN) && DISABLED(DISPLAY_CHARSET_HD44780_CYRILLIC) - #define DISPLAY_CHARSET_HD44780_JAPAN -#endif - -#include LANGUAGE_INCLUDE -#include "language_en.h" - -#endif //__LANGUAGE_H diff --git a/Marlin/configurator/css/configurator.css b/Marlin/configurator/css/configurator.css deleted file mode 100644 index 88332075fb..0000000000 --- a/Marlin/configurator/css/configurator.css +++ /dev/null @@ -1,344 +0,0 @@ -/* configurator.css */ -/* Styles for Marlin Configurator */ - -.clear { clear: both; } - -/* Prevent selection except PRE tags */ -* { - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - } -pre { - -webkit-touch-callout: text; - -webkit-user-select: text; - -khtml-user-select: text; - -moz-user-select: text; - -ms-user-select: text; - user-select: text; - } - -body { margin: 0; padding: 0; background: #56A; color: #000; font-family: monospace; } -#main { - max-width: 1100px; - margin: 0 auto 10px; - padding: 0 2%; width: 96%; - } - -h1, h2, h3, h4, h5, h6 { clear: both; } - -h1, p.info { font-family: sans-serif; } -h1 { - height: 38px; - margin-bottom: -30px; - color: #FFF; - background: transparent url(logo.png) right top no-repeat; - } -p.info { padding: 0; color: #000; } -p.info span { color: #800; } - -#message { text-align: center; } -#message { width: 80%; margin: 0 auto 0.25em; color: #FF0; } -#message p { padding: 2px 0; font-weight: bold; border-radius: 0.8em; } -#message p.message { color: #080; background: #CFC; } -#message p.error { color: #F00; background: #FF4; } -#message p.warning { color: #FF0; background: #BA4; } -#message p.message span, -#message p.error span, -#message p.warning span { - color: #A00; - background: rgba(255, 255, 255, 1); - border: 1px solid rgba(0,0,0,0.5); - border-radius: 1em; - float: right; - margin-right: 0.5em; - padding: 0 3px; - font-family: sans-serif; - font-size: small; - position: relative; - top: -1px; - } - -#help strong { color: #0DD; } -img { display: none; } - -/* Forms */ - -#config_form { - display: block; - background: #EEE; - padding: 6px 20px 20px; - color: #000; - position: relative; - border-radius: 1.5em; - border-top-left-radius: 0; - } -fieldset { - height: 16.1em; - overflow-y: scroll; - overflow-x: hidden; - margin-top: 10px; - } -label, input, select, textarea { display: block; float: left; margin: 1px 0; } -label.newline, textarea, fieldset { clear: both; } -label { - width: 120px; /* label area */ - height: 1em; - padding: 10px 460px 10px 1em; - margin-right: -450px; - text-align: right; - } -label.blocked, label.added.blocked, label.added.blocked.sublabel { color: #AAA; } - -label.added.sublabel { - width: auto; - margin: 11px -2.5em 0 1em; - padding: 0 3em 0 0; - font-style: italic; - color: #444; - } -label+label.added.sublabel { - margin-left: 0; - } - -input[type="text"], select { margin: 0.75em 0 0; } -input[type="checkbox"], input[type="radio"], input[type="file"] { margin: 1em 0 0; } -input[type="checkbox"].enabler, input[type="radio"].enabler { margin-left: 1em; } - -input:disabled { color: #BBB; } - -#config_form input[type="text"].subitem { width: 4em; } -#config_form input[type="text"].subitem+.subitem { margin-left: 4px; } - -input[type="text"].added { width: 20em; } -label.added { - width: 265px; /* label area */ - height: 1em; - padding: 10px 370px 10px 1em; - margin-right: -360px; - text-align: right; - } - -ul.tabs { padding: 0; list-style: none; } -ul.tabs li { display: inline; } -ul.tabs li a, -ul.tabs li a.active:hover, -ul.tabs li a.active:active { - display: block; - float: left; - background: #1E4059; - color: #CCC; - font-size: 110%; - border-radius: 0.25em 0.25em 0 0; - margin: 0 4px 0 0; - padding: 2px 8px; - text-decoration: none; - font-family: georgia,"times new roman",times; - } -ul.tabs li a.active:link, -ul.tabs li a.active:visited { - background: #DDD; - color: #06F; - cursor: default; - margin-top: -4px; - padding-bottom: 4px; - padding-top: 4px; - } -ul.tabs li a:hover, -ul.tabs li a:active { - background: #000; - color: #FFF; - } - -fieldset { display: none; border: 1px solid #AAA; border-radius: 1em; } -fieldset legend { display: none; } - -.hilightable span { - display: block; - float: left; - width: 100%; - height: 1.3em; - background: rgba(225,255,0,1); - margin: 0 -100% -1em 0; - } - -#serial_stepper { padding-top: 0.75em; display: block; float: left; } -/*#SERIAL_PORT { display: none; }*/ - -/* Tooltips */ - -#tooltip { - display: none; - max-width: 30em; - padding: 8px; - border: 2px solid #73d699; - border-radius: 1em; - position: absolute; - z-index: 999; - font-family: sans-serif; - font-size: 85%; - color: #000; - line-height: 1.1; - background: #e2ff99; /* Old browsers */ - background: -moz-linear-gradient(top, #e2ff99 0%, #73d699 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e2ff99), color-stop(100%,#73d699)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #e2ff99 0%,#73d699 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #e2ff99 0%,#73d699 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #e2ff99 0%,#73d699 100%); /* IE10+ */ - background: linear-gradient(to bottom, #e2ff99 0%,#73d699 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e2ff99', endColorstr='#73d699',GradientType=0 ); /* IE6-9 */ - -webkit-box-shadow: 0px 6px 25px -4px rgba(0,0,0,0.75); - -moz-box-shadow: 0px 6px 25px -4px rgba(0,0,0,0.75); - box-shadow: 0px 6px 25px -4px rgba(0,0,0,0.75); - } -#tooltip>span { - position: absolute; - content: ""; - width: 0; - height: 0; - border-left: 8px solid transparent; - border-right: 8px solid transparent; - border-top: 8px solid #73d699; - z-index: 999; - bottom: -10px; - left: 20px; - } -#tooltip>strong { color: #00B; } - -/* Tooltips Checkbox */ - -#tipson { - width: auto; - height: auto; - padding: 0; - margin-right: 0; - float: right; - font-weight: bold; - font-size: 100%; - font-family: helvetica; - text-align: left; - cursor: pointer; - } -#tipson input { float: none; display: inline; cursor: pointer; } - -/* Config Text */ - -pre.config { - height: 25em; - padding: 10px; - border: 2px solid #888; - border-radius: 5px; - overflow: auto; - clear: both; - background-color: #FFF; - color: #000; - font-family: "Fira Mono", monospace; - font-size: small; - } - -/* Pre Headers */ - -h2 { - width: 100%; - margin: 12px -300px 4px 0; - padding: 0; - float: left; - } - -/* Disclosure Widget */ - -span.disclose, a.download, a.download-all {︎ - display: block; - float: right; - margin-top: 12px; - } - -span.disclose { - margin-right: -10px; /* total width */ - margin-left: 14px; - width: 0; - height: 0; - position: relative; - left: 3px; - top: 3px; - cursor: pointer; - border-left: 8px solid transparent; - border-right: 8px solid transparent; - border-top: 10px solid #000; - } -span.disclose.closed { - margin-right: -8px; /* total width */ - margin-left: 10px; - left: 0; - top: 0; - border-top: 8px solid transparent; - border-bottom: 8px solid transparent; - border-right: 10px solid #000; - } -span.disclose.almost { - -ms-transform: rotate(45deg); /* IE 9 */ - -webkit-transform: rotate(45deg); /* Chrome, Safari, Opera */ - transform: rotate(45deg); - } -span.disclose.closed.almost { - left: 1px; - top: 3px; - -ms-transform: rotate(315deg); /* IE 9 */ - -webkit-transform: rotate(315deg); /* Chrome, Safari, Opera */ - transform: rotate(315deg); - } - -/* Download Button */ - -a.download, a.download-all { - visibility: hidden; - padding: 2px; - border: 1px solid #494; - border-radius: 4px; - margin: 12px 0 0; - background: #FFF; - color: #494; - font-family: sans-serif; - font-size: small; - font-weight: bold; - text-decoration: none; - } -a.download-all { margin: 9px 2em 0; color: #449; border-color: #449; } - -input[type="text"].one_of_2 { max-width: 15%; } -input[type="text"].one_of_3 { max-width: 10%; } -input[type="text"].one_of_4 { max-width: 7%; } - -select.one_of_2 { max-width: 15%; } -select.one_of_3 { max-width: 10%; } -select.one_of_4 { max-width: 14%; } -select.one_of_4+span.label+select.one_of_4+span.label { clear: both; margin-left: 265px; padding-left: 1.75em; } -select.one_of_4+span.label+select.one_of_4+span.label+select.one_of_4+span.label { clear: none; margin-left: 1em; padding-left: 0; } - -@media all and (min-width: 1140px) { - - #main { max-width: 10000px; } - - fieldset { float: left; width: 50%; height: auto; } - - #config_text, #config_adv_text { float: right; clear: right; width: 45%; } - - pre.config { height: 20em; } - - .disclose { display: none; } - - input[type="text"].one_of_2 { max-width: 15%; } - input[type="text"].one_of_3 { max-width: 9%; } - input[type="text"].one_of_4 { max-width: 8%; } - - select.one_of_2 { max-width: 15%; } - select.one_of_3 { max-width: 10%; } - select.one_of_4 { max-width: 16%; } - -} - -/*label.blocked, .blocked { display: none; }*/ - diff --git a/Marlin/configurator/css/logo.png b/Marlin/configurator/css/logo.png deleted file mode 100644 index 0618dc17ae4ab7842475d493592e8184fd9a77e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1266 zcmVU8P*7-ZbZ>KLZ*U+lnSp_Ufq@}0xwybFAi#%#fq@|}KQEO56)-X|e7nZL z$iTqBa9P*U#mSX{G{Bl%P*lRez;J+pfx##xwK$o9f#C}S14DXwNkIt%17i#W1A|CX zc0maP17iUL1A|C*NRTrF17iyV0~1e4YDEbH0|SF|enDkXW_m`6f}y3QrGjHhep0GJ zaAk2xYHqQDXI^rCQ9*uDVo7QW0|Nup4h9AW240u^5(W3f%sd4n162kpgNVo|1qcff zJ_s=cNG>fZg9jx8g8+j9g8_pBLjXe}Lp{R+hNBE`7{wV~7)u#fFy3PlV+vxLz;uCG zm^qSpA@ds+OO_6nTdaDlt*rOhEZL^9ePa)2-_4=K(Z%tFGm-NGmm}8}ZcXk5JW@PU zd4+f<@d@)yL(o<5icqT158+-B6_LH7;i6x}CW#w~Uy-Pgl#@Irl`kzV zeL|*8R$ca%T%Wv){2zs_iiJvgN^h0dsuZZ2sQy$tsNSU!s;Q*;LF<6_B%M@UD?LHI zSNcZ`78uqV#TeU~$eS{ozBIdFzSClfs*^S+dw;4dus<{M;#|MXC)T}S9v!D zcV!QCPhBq)ZyO(X-(bH4|NMaZz==UigLj2o41F2S6d@OB6%`R(5i>J(Puzn9wnW{e zu;hl6HK{k#IWjCVGqdJqU(99Cv(K+6*i`tgSi2;vbXD1#3jNBGs$DgVwO(~o>mN4i zHPtkqZIx>)Y(Ls5-Br|mx>vQYvH$Kwn@O`L|D75??eGkZnfg$5<;Xeg_o%+-I&+-3%01W^SH2RkDT>t<8AY({UO#lFTB>(_`g8%^e z{{R4h=>PzAFaQARU;qF*m;eA5Z<1fdMgRZ-R7pfZRCwC#nZXi+APhv=jQ{`3+e>SU zEwExT0#k1aB9BcrieUOYke@DaZ0n+BfG@n6D53S@jyIo#3Zl)6r_I^s3(a$gHoJ+i z8O9t-4w!>lD)I5aQuq5`YrT4&lOvip zoaVIG{TQOs7N=c(wXgXxo5iy4C)Wy? c%(Cq<0NcG|Qs2|@asU7T07*qoM6N<$f&+;(;s5{u diff --git a/Marlin/configurator/index.html b/Marlin/configurator/index.html deleted file mode 100644 index 385109c9e1..0000000000 --- a/Marlin/configurator/index.html +++ /dev/null @@ -1,129 +0,0 @@ - - - - - Marlin Firmware Configurator - - - - - - - - - - - - -
-

Marlin Configurator

-

Select presets (coming soon), modify, and download.

- -
-
- -
- -
- - - - Download Zip - -
- Info -
- -
- Machine - -
- - - - - - - - - - - - - - - - - - -
- -
- Homing -
- -
- Temperature - - - - - - - - - - -
- -
- Extruder -
- -
- LCD / SD -
- -
- Bed Leveling -
- -
- FW Retract -
- -
- TMC -
- -
- L6470 -
- -
- Extras -
- -
- More… -
- -
-

Configuration.h

- - Download - 

-        

-
-        

-          
Configuration_adv.h

-          
-          Download
-          

-        

-
-        

-      

-    

-  
-
diff --git a/Marlin/configurator/js/FileSaver.min.js b/Marlin/configurator/js/FileSaver.min.js
deleted file mode 100755
index f7319603d7..0000000000
--- a/Marlin/configurator/js/FileSaver.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! @source http://purl.eligrey.com/github/FileSaver.js/blob/master/FileSaver.js */
-var saveAs=saveAs||typeof navigator!=="undefined"&&navigator.msSaveOrOpenBlob&&navigator.msSaveOrOpenBlob.bind(navigator)||function(view){"use strict";if(typeof navigator!=="undefined"&&/MSIE [1-9]\./.test(navigator.userAgent)){return}var doc=view.document,get_URL=function(){return view.URL||view.webkitURL||view},save_link=doc.createElementNS("http://www.w3.org/1999/xhtml","a"),can_use_save_link="download"in save_link,click=function(node){var event=doc.createEvent("MouseEvents");event.initMouseEvent("click",true,false,view,0,0,0,0,0,false,false,false,false,0,null);node.dispatchEvent(event)},webkit_req_fs=view.webkitRequestFileSystem,req_fs=view.requestFileSystem||webkit_req_fs||view.mozRequestFileSystem,throw_outside=function(ex){(view.setImmediate||view.setTimeout)(function(){throw ex},0)},force_saveable_type="application/octet-stream",fs_min_size=0,arbitrary_revoke_timeout=500,revoke=function(file){var revoker=function(){if(typeof file==="string"){get_URL().revokeObjectURL(file)}else{file.remove()}};if(view.chrome){revoker()}else{setTimeout(revoker,arbitrary_revoke_timeout)}},dispatch=function(filesaver,event_types,event){event_types=[].concat(event_types);var i=event_types.length;while(i--){var listener=filesaver["on"+event_types[i]];if(typeof listener==="function"){try{listener.call(filesaver,event||filesaver)}catch(ex){throw_outside(ex)}}}},FileSaver=function(blob,name){var filesaver=this,type=blob.type,blob_changed=false,object_url,target_view,dispatch_all=function(){dispatch(filesaver,"writestart progress write writeend".split(" "))},fs_error=function(){if(blob_changed||!object_url){object_url=get_URL().createObjectURL(blob)}if(target_view){target_view.location.href=object_url}else{var new_tab=view.open(object_url,"_blank");if(new_tab==undefined&&typeof safari!=="undefined"){view.location.href=object_url}}filesaver.readyState=filesaver.DONE;dispatch_all();revoke(object_url)},abortable=function(func){return function(){if(filesaver.readyState!==filesaver.DONE){return func.apply(this,arguments)}}},create_if_not_found={create:true,exclusive:false},slice;filesaver.readyState=filesaver.INIT;if(!name){name="download"}if(can_use_save_link){object_url=get_URL().createObjectURL(blob);save_link.href=object_url;save_link.download=name;click(save_link);filesaver.readyState=filesaver.DONE;dispatch_all();revoke(object_url);return}if(view.chrome&&type&&type!==force_saveable_type){slice=blob.slice||blob.webkitSlice;blob=slice.call(blob,0,blob.size,force_saveable_type);blob_changed=true}if(webkit_req_fs&&name!=="download"){name+=".download"}if(type===force_saveable_type||webkit_req_fs){target_view=view}if(!req_fs){fs_error();return}fs_min_size+=blob.size;req_fs(view.TEMPORARY,fs_min_size,abortable(function(fs){fs.root.getDirectory("saved",create_if_not_found,abortable(function(dir){var save=function(){dir.getFile(name,create_if_not_found,abortable(function(file){file.createWriter(abortable(function(writer){writer.onwriteend=function(event){target_view.location.href=file.toURL();filesaver.readyState=filesaver.DONE;dispatch(filesaver,"writeend",event);revoke(file)};writer.onerror=function(){var error=writer.error;if(error.code!==error.ABORT_ERR){fs_error()}};"writestart progress write abort".split(" ").forEach(function(event){writer["on"+event]=filesaver["on"+event]});writer.write(blob);filesaver.abort=function(){writer.abort();filesaver.readyState=filesaver.DONE};filesaver.readyState=filesaver.WRITING}),fs_error)}),fs_error)};dir.getFile(name,{create:false},abortable(function(file){file.remove();save()}),abortable(function(ex){if(ex.code===ex.NOT_FOUND_ERR){save()}else{fs_error()}}))}),fs_error)}),fs_error)},FS_proto=FileSaver.prototype,saveAs=function(blob,name){return new FileSaver(blob,name)};FS_proto.abort=function(){var filesaver=this;filesaver.readyState=filesaver.DONE;dispatch(filesaver,"abort")};FS_proto.readyState=FS_proto.INIT=0;FS_proto.WRITING=1;FS_proto.DONE=2;FS_proto.error=FS_proto.onwritestart=FS_proto.onprogress=FS_proto.onwrite=FS_proto.onabort=FS_proto.onerror=FS_proto.onwriteend=null;return saveAs}(typeof self!=="undefined"&&self||typeof window!=="undefined"&&window||this.content);if(typeof module!=="undefined"&&module.exports){module.exports.saveAs=saveAs}else if(typeof define!=="undefined"&&define!==null&&define.amd!=null){define([],function(){return saveAs})}
diff --git a/Marlin/configurator/js/binaryfileuploader.js b/Marlin/configurator/js/binaryfileuploader.js
deleted file mode 100644
index 0a1f38f3dc..0000000000
--- a/Marlin/configurator/js/binaryfileuploader.js
+++ /dev/null
@@ -1,79 +0,0 @@
-function BinaryFileUploader(o) {
-	this.options = null;
-
-
-	this._defaultOptions = {
-		element: null, // HTML file element
-		onFileLoad: function(file) {
-			console.log(file.toString());
-		}
-	};
-
-
-	this._init = function(o) {
-		if (!this.hasFileUploaderSupport()) return;
-
-		this._verifyDependencies();
-
-		this.options = this._mergeObjects(this._defaultOptions, o);
-		this._verifyOptions();
-
-		this.addFileChangeListener();
-	}
-
-
-	this.hasFileUploaderSupport = function() {
-		return !!(window.File && window.FileReader && window.FileList && window.Blob);
-	}
-
-	this.addFileChangeListener = function() {
-		this.options.element.addEventListener(
-			'change',
-			this._bind(this, this.onFileChange)
-		);
-	}
-
-	this.onFileChange = function(e) {
-		// TODO accept multiple files
-		var file = e.target.files[0],
-		    reader = new FileReader();
-
-		reader.onload = this._bind(this, this.onFileLoad);
-		reader.readAsBinaryString(file);
-	}
-
-	this.onFileLoad = function(e) {
-		var content = e.target.result,
-		    string  = new BinaryString(content);
-		this.options.onFileLoad(string);
-	}
-
-
-	this._mergeObjects = function(starting, override) {
-		var merged = starting;
-		for (key in override) merged[key] = override[key];
-
-		return merged;
-	}
-
-	this._verifyOptions = function() {
-		if (!(this.options.element && this.options.element.type && this.options.element.type === 'file')) {
-			throw 'Invalid element param in options. Must be a file upload DOM element';
-		}
-
-		if (typeof this.options.onFileLoad !== 'function') {
-			throw 'Invalid onFileLoad param in options. Must be a function';
-		}
-	}
-
-	this._verifyDependencies = function() {
-		if (!window.BinaryString) throw 'BinaryString is missing. Check that you\'ve correctly included it';
-	}
-
-	// helper function for binding methods to objects
-	this._bind = function(object, method) {
-		return function() {return method.apply(object, arguments);};
-	}
-
-	this._init(o);
-}
diff --git a/Marlin/configurator/js/binarystring.js b/Marlin/configurator/js/binarystring.js
deleted file mode 100644
index 06af64fe2a..0000000000
--- a/Marlin/configurator/js/binarystring.js
+++ /dev/null
@@ -1,168 +0,0 @@
-function BinaryString(source) {
-	this._source = null;
-	this._bytes  = [];
-	this._pos    = 0;
-	this._length = 0;
-
-	this._init = function(source) {
-		this._source = source;
-		this._bytes  = this._stringToBytes(this._source);
-		this._length = this._bytes.length;
-	}
-
-	this.current = function() {return this._pos;}
-
-	this.rewind  = function() {return this.jump(0);}
-	this.end     = function() {return this.jump(this.length()  - 1);}
-	this.next    = function() {return this.jump(this.current() + 1);}
-	this.prev    = function() {return this.jump(this.current() - 1);}
-
-	this.jump = function(pos) {
-		if (pos < 0 || pos >= this.length()) return false;
-
-		this._pos = pos;
-		return true;
-	}
-
-	this.readByte = function(pos) {
-		pos = (typeof pos == 'number') ? pos : this.current();
-		return this.readBytes(1, pos)[0];
-	}
-
-	this.readBytes = function(length, pos) {
-		length = length || 1;
-		pos    = (typeof pos == 'number') ? pos : this.current();
-
-		if (pos          >  this.length() ||
-		    pos          <  0             ||
-		    length       <= 0             ||
-		    pos + length >  this.length() ||
-		    pos + length <  0
-		) {
-			return false;
-		}
-
-		var bytes = [];
-		
-		for (var i = pos; i < pos + length; i++) {
-			bytes.push(this._bytes[i]);
-		}
-
-		return bytes;
-	}
-
-	this.length = function() {return this._length;}
-
-	this.toString = function() {
-		var string = '',
-		    length = this.length();
-
-		for (var i = 0; i < length; i++) {
-			string += String.fromCharCode(this.readByte(i));
-		}
-
-		return string;
-	}
-
-	this.toUtf8 = function() {
-		var inc    = 0,
-		    string = '',
-		    length = this.length();
-
-		// determine if first 3 characters are the BOM
-		// then skip them in output if so
-		if (length >= 3               &&
-		    this.readByte(0) === 0xEF &&
-		    this.readByte(1) === 0xBB &&
-		    this.readByte(2) === 0xBF
-		) {
-			inc = 3;
-		}
-
-		for (; inc < length; inc++) {
-			var byte1 = this.readByte(inc),
-			    byte2 = 0,
-			    byte3 = 0,
-			    byte4 = 0,
-			    code1 = 0,
-			    code2 = 0,
-			    point = 0;
-
-			switch (true) {
-				// single byte character; same as ascii
-				case (byte1 < 0x80):
-					code1 = byte1;
-					break;
-
-				// 2 byte character
-				case (byte1 >= 0xC2 && byte1 < 0xE0):
-					byte2 = this.readByte(++inc);
-
-					code1 = ((byte1 & 0x1F) << 6) +
-					         (byte2 & 0x3F);
-					break;
-
-				// 3 byte character
-				case (byte1 >= 0xE0 && byte1 < 0xF0):
-					byte2 = this.readByte(++inc);
-					byte3 = this.readByte(++inc);
-
-					code1 = ((byte1 & 0xFF) << 12) +
-					        ((byte2 & 0x3F) <<  6) +
-					         (byte3 & 0x3F);
-					break;
-
-				// 4 byte character
-				case (byte1 >= 0xF0 && byte1 < 0xF5):
-					byte2 = this.readByte(++inc);
-					byte3 = this.readByte(++inc);
-					byte4 = this.readByte(++inc);
-
-					point = ((byte1 & 0x07) << 18) +
-					        ((byte2 & 0x3F) << 12) +
-					        ((byte3 & 0x3F) <<  6) +
-					         (byte4 & 0x3F)
-					point -= 0x10000;
-
-					code1 = (point >> 10)    + 0xD800;
-					code2 = (point &  0x3FF) + 0xDC00;
-					break;
-
-				default:
-					throw 'Invalid byte ' + this._byteToString(byte1) + ' whilst converting to UTF-8';
-					break;
-			}
-
-			string += (code2) ? String.fromCharCode(code1, code2)
-			                  : String.fromCharCode(code1);
-		}
-
-		return string;
-	}
-
-	this.toArray  = function() {return this.readBytes(this.length() - 1, 0);} 
-
-
-	this._stringToBytes = function(str) {
-		var bytes = [],
-		    chr   = 0;
-
-		for (var i = 0; i < str.length; i++) {
-			chr = str.charCodeAt(i);
-			bytes.push(chr & 0xFF);
-		}
-
-		return bytes;
-	}
-
-	this._byteToString = function(byte) {
-		var asString = byte.toString(16).toUpperCase();
-		while (asString.length < 2) {
-			asString = '0' + asString;
-		}
-
-		return '0x' + asString;
-	}
-
-	this._init(source);
-}
diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js
deleted file mode 100644
index 1a0da92abd..0000000000
--- a/Marlin/configurator/js/configurator.js
+++ /dev/null
@@ -1,1432 +0,0 @@
-/**
- * configurator.js
- *
- * Marlin Configuration Utility
- *    - Web form for entering configuration options
- *    - A reprap calculator to calculate movement values
- *    - Uses HTML5 to generate downloadables in Javascript
- *    - Reads and parses standard configuration files from local folders
- *
- * Supporting functions
- *    - Parser to read Marlin Configuration.h and Configuration_adv.h files
- *    - Utilities to replace values in configuration files
- */
-
-"use strict";
-
-$(function(){
-
-/**
- * Github API useful GET paths. (Start with "https://api.github.com/repos/:owner/:repo/")
- *
- *   contributors                               Get a list of contributors
- *   tags                                       Get a list of tags
- *   contents/[path]?ref=branch/tag/commit      Get the contents of a file
- */
-
- // GitHub
- // Warning! Limited to 60 requests per hour!
-var config = {
-  type:  'github',
-  host:  'https://api.github.com',
-  owner: 'MarlinFirmware',
-  repo:  'Marlin',
-  ref:   'Development',
-  path:  'Marlin/configurator/config'
-};
-/**/
-
-/* // Remote
-var config = {
-  type:  'remote',
-  host:  'http://www.thinkyhead.com',
-  path:  '_marlin/config'
-};
-/**/
-
-/* // Local
-var config = {
-  type:  'local',
-  path:  'config'
-};
-/**/
-
-function github_command(conf, command, path) {
-  var req = conf.host+'/repos/'+conf.owner+'/'+conf.repo+'/'+command;
-  if (path) req += '/' + path;
-  return req;
-}
-function config_path(item) {
-  var path = '', ref = '';
-  switch(config.type) {
-    case 'github':
-      path = github_command(config, 'contents', config.path);
-      if (config.ref !== undefined) ref = '?ref=' + config.ref;
-      break;
-    case 'remote':
-      path = config.host + '/' + config.path + '/';
-      break;
-    case 'local':
-      path = config.path + '/';
-      break;
-  }
-  return path + '/' + item + ref;
-}
-
-// Extend builtins
-String.prototype.lpad = function(len, chr) {
-  if (chr === undefined) { chr = ' '; }
-  var s = this+'', need = len - s.length;
-  if (need > 0) { s = new Array(need+1).join(chr) + s; }
-  return s;
-};
-
-String.prototype.prePad = function(len, chr) { return len ? this.lpad(len, chr) : this; };
-String.prototype.zeroPad = function(len)     { return this.prePad(len, '0'); };
-String.prototype.toHTML = function()         { return jQuery('
').text(this).html(); };
-String.prototype.regEsc = function()         { return this.replace(/[.?*+^$[\]\\(){}|-]/g, "\\$&"); }
-String.prototype.lineCount = function(ind)   { var len = (ind === undefined ? this : this.substr(0,ind*1)).split(/\r?\n|\r/).length; return len > 0 ? len - 1 : 0; };
-String.prototype.line = function(num)        { var arr = this.split(/\r?\n|\r/); return num < arr.length ? arr[1*num] : ''; };
-String.prototype.replaceLine = function(num,txt) { var arr = this.split(/\r?\n|\r/); if (num < arr.length) { arr[num] = txt; return arr.join('\n'); } else return this; }
-String.prototype.toLabel = function()        { return this.replace(/[\[\]]/g, '').replace(/_/g, ' ').toTitleCase(); }
-String.prototype.toTitleCase = function()    { return this.replace(/([A-Z])(\w+)/gi, function(m,p1,p2) { return p1.toUpperCase() + p2.toLowerCase(); }); }
-Number.prototype.limit = function(m1, m2)  {
-  if (m2 == null) return this > m1 ? m1 : this;
-  return this < m1 ? m1 : this > m2 ? m2 : this;
-};
-Date.prototype.fileStamp = function(filename) {
-  var fs = this.getFullYear()
-    + ((this.getMonth()+1)+'').zeroPad(2)
-    + (this.getDate()+'').zeroPad(2)
-    + (this.getHours()+'').zeroPad(2)
-    + (this.getMinutes()+'').zeroPad(2)
-    + (this.getSeconds()+'').zeroPad(2);
-
-  if (filename !== undefined)
-    return filename.replace(/^(.+)(\.\w+)$/g, '$1-['+fs+']$2');
-
-  return fs;
-}
-
-/**
- * selectField.addOptions takes an array or keyed object
- */
-$.fn.extend({
-  addOptions: function(arrObj) {
-    return this.each(function() {
-      var sel = $(this);
-      var isArr = Object.prototype.toString.call(arrObj) == "[object Array]";
-      $.each(arrObj, function(k, v) {
-        sel.append( $('