3DPrinting/MarlinFirmware
0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-02-27 19:36:58 +00:00
Code Issues Releases Wiki Activity

📝 Describe G34, spellcheck

Browse source
This commit is contained in:
Scott Lahteine 2023-04-10 23:22:30 -05:00
parent c4aa39dc86
commit 832f769b46
3 changed files with 35 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Marlin/Configuration.h
View file

@ -2519,7 +2519,7 @@
#define PASSWORD_ON_STARTUP #define PASSWORD_ON_STARTUP
#define PASSWORD_UNLOCK_GCODE // Unlock with the M511 P<password> command. Disable to prevent brute-force attack. #define PASSWORD_UNLOCK_GCODE // Unlock with the M511 P<password> command. Disable to prevent brute-force attack.
#define PASSWORD_CHANGE_GCODE // Change the password with M512 P<old> S<new>. #define PASSWORD_CHANGE_GCODE // Change the password with M512 P<old> S<new>.
//#define PASSWORD_ON_SD_PRINT_MENU // This does not prevent gcodes from running //#define PASSWORD_ON_SD_PRINT_MENU // This does not prevent G-codes from running
//#define PASSWORD_AFTER_SD_PRINT_END //#define PASSWORD_AFTER_SD_PRINT_END
//#define PASSWORD_AFTER_SD_PRINT_ABORT //#define PASSWORD_AFTER_SD_PRINT_ABORT
//#include "Configuration_Secure.h" // External file with PASSWORD_DEFAULT_VALUE //#include "Configuration_Secure.h" // External file with PASSWORD_DEFAULT_VALUE
@ -3268,9 +3268,9 @@
/** /**
* TFT Font for Color_UI. Choose one of the following: * TFT Font for Color_UI. Choose one of the following:
* *
* NOTOSANS - Default font with antialiasing. Supports Latin Extended and non-Latin characters. * NOTOSANS - Default font with anti-aliasing. Supports Latin Extended and non-Latin characters.
* UNIFONT - Lightweight font, no antialiasing. Supports Latin Extended and non-Latin characters. * UNIFONT - Lightweight font, no anti-aliasing. Supports Latin Extended and non-Latin characters.
* HELVETICA - Lightweight font, no antialiasing. Supports Basic Latin (0x0020-0x007F) and Latin-1 Supplement (0x0080-0x00FF) characters only. * HELVETICA - Lightweight font, no anti-aliasing. Supports Basic Latin (0x0020-0x007F) and Latin-1 Supplement (0x0080-0x00FF) characters only.
*/ */
#define TFT_FONT NOTOSANS #define TFT_FONT NOTOSANS

28
Marlin/Configuration_adv.h
View file

@ -372,7 +372,7 @@
* Thermal Protection Variance Monitor - EXPERIMENTAL * Thermal Protection Variance Monitor - EXPERIMENTAL
* Kill the machine on a stuck temperature sensor. * Kill the machine on a stuck temperature sensor.
* *
* This feature may cause some thermally-stable systems to halt. Be sure to test it throughly under * This feature may cause some thermally-stable systems to halt. Be sure to test it thoroughly under
* a variety of conditions. Disable if you get false positives. * a variety of conditions. Disable if you get false positives.
* *
* This feature ensures that temperature sensors are updating regularly. If sensors die or get "stuck", * This feature ensures that temperature sensors are updating regularly. If sensors die or get "stuck",
@ -415,7 +415,7 @@
* You can either just add a constant compensation with the DEFAULT_Kf value * You can either just add a constant compensation with the DEFAULT_Kf value
* or follow the instruction below to get speed-dependent compensation. * or follow the instruction below to get speed-dependent compensation.
* *
* Constant compensation (use only with fanspeeds of 0% and 100%) * Constant compensation (use only with fan speeds of 0% and 100%)
* --------------------------------------------------------------------- * ---------------------------------------------------------------------
* A good starting point for the Kf-value comes from the calculation: * A good starting point for the Kf-value comes from the calculation:
* kf = (power_fan * eff_fan) / power_heater * 255 * kf = (power_fan * eff_fan) / power_heater * 255
@ -442,7 +442,7 @@
//#define PID_FAN_SCALING_ALTERNATIVE_DEFINITION //#define PID_FAN_SCALING_ALTERNATIVE_DEFINITION
#if ENABLED(PID_FAN_SCALING_ALTERNATIVE_DEFINITION) #if ENABLED(PID_FAN_SCALING_ALTERNATIVE_DEFINITION)
// The alternative definition is used for an easier configuration. // The alternative definition is used for an easier configuration.
// Just figure out Kf at fullspeed (255) and PID_FAN_SCALING_MIN_SPEED. // Just figure out Kf at full speed (255) and PID_FAN_SCALING_MIN_SPEED.
// DEFAULT_Kf and PID_FAN_SCALING_LIN_FACTOR are calculated accordingly. // DEFAULT_Kf and PID_FAN_SCALING_LIN_FACTOR are calculated accordingly.
#define PID_FAN_SCALING_AT_FULL_SPEED 13.0 //=PID_FAN_SCALING_LIN_FACTOR*255+DEFAULT_Kf #define PID_FAN_SCALING_AT_FULL_SPEED 13.0 //=PID_FAN_SCALING_LIN_FACTOR*255+DEFAULT_Kf
@ -621,7 +621,7 @@
* FAST_PWM_FAN_FREQUENCY * FAST_PWM_FAN_FREQUENCY
* Set this to your desired frequency. * Set this to your desired frequency.
* For AVR, if left undefined this defaults to F = F_CPU/(2*255*1) * For AVR, if left undefined this defaults to F = F_CPU/(2*255*1)
* i.e., F = 31.4kHz on 16MHz microcontrollers or F = 39.2kHz on 20MHz microcontrollers. * i.e., F = 31.4kHz on 16MHz micro-controllers or F = 39.2kHz on 20MHz micro-controllers.
* For non AVR, if left undefined this defaults to F = 1Khz. * For non AVR, if left undefined this defaults to F = 1Khz.
* This F value is only to protect the hardware from an absence of configuration * This F value is only to protect the hardware from an absence of configuration
* and not to complete it when users are not aware that the frequency must be specifically set to support the target board. * and not to complete it when users are not aware that the frequency must be specifically set to support the target board.
@ -960,9 +960,9 @@
* Danger: Don't activate 5V mode unless attached to a 5V-tolerant controller! * Danger: Don't activate 5V mode unless attached to a 5V-tolerant controller!
* V3.0 or 3.1: Set default mode to 5V mode at Marlin startup. * V3.0 or 3.1: Set default mode to 5V mode at Marlin startup.
* If disabled, OD mode is the hard-coded default on 3.0 * If disabled, OD mode is the hard-coded default on 3.0
* On startup, Marlin will compare its eeprom to this value. If the selected mode * On startup, Marlin will compare its EEPROM to this value. If the selected mode
* differs, a mode set eeprom write will be completed at initialization. * differs, a mode set EEPROM write will be completed at initialization.
* Use the option below to force an eeprom write to a V3.1 probe regardless. * Use the option below to force an EEPROM write to a V3.1 probe regardless.
*/ */
//#define BLTOUCH_SET_5V_MODE //#define BLTOUCH_SET_5V_MODE
@ -1328,7 +1328,7 @@
//#define CALIBRATION_MEASURE_WMAX //#define CALIBRATION_MEASURE_WMAX
// Probing at the exact top center only works if the center is flat. If // Probing at the exact top center only works if the center is flat. If
// probing on a screwhead or hollow washer, probe near the edges. // probing on a screw head or hollow washer, probe near the edges.
//#define CALIBRATION_MEASURE_AT_TOP_EDGES //#define CALIBRATION_MEASURE_AT_TOP_EDGES
// Define the pin to read during calibration // Define the pin to read during calibration
@ -1923,7 +1923,7 @@
#endif #endif
/** /**
* Status (Info) Screen customizations * Status (Info) Screen customization
* These options may affect code size and screen render time. * These options may affect code size and screen render time.
* Custom status screens can forcibly override these settings. * Custom status screens can forcibly override these settings.
*/ */
@ -2176,7 +2176,7 @@
#if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING) #if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING)
#define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds. #define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
// Note: Extra time may be added to mitigate controller latency. // Note: Extra time may be added to mitigate controller latency.
//#define MOVE_Z_WHEN_IDLE // Jump to the move Z menu on doubleclick when printer is idle. //#define MOVE_Z_WHEN_IDLE // Jump to the move Z menu on double-click when printer is idle.
#if ENABLED(MOVE_Z_WHEN_IDLE) #if ENABLED(MOVE_Z_WHEN_IDLE)
#define MOVE_Z_IDLE_MULTIPLICATOR 1 // Multiply 1mm by this factor for the move step size. #define MOVE_Z_IDLE_MULTIPLICATOR 1 // Multiply 1mm by this factor for the move step size.
#endif #endif
@ -3536,7 +3536,7 @@
* Feed rates are set by the F parameter of a move command e.g. G1 X0 Y10 F6000 * Feed rates are set by the F parameter of a move command e.g. G1 X0 Y10 F6000
* Laser power would be calculated by bit shifting off 8 LSB's. In binary this is div 256. * Laser power would be calculated by bit shifting off 8 LSB's. In binary this is div 256.
* The calculation gives us ocr values from 0 to 255, values over F65535 will be set as 255 . * The calculation gives us ocr values from 0 to 255, values over F65535 will be set as 255 .
* More refined power control such as compesation for accell/decell will be addressed in future releases. * More refined power control such as compensation for accel/decel will be addressed in future releases.
* *
* M5 I clears inline mode and set power to 0, M5 sets the power output to 0 but leaves inline mode on. * M5 I clears inline mode and set power to 0, M5 sets the power output to 0 but leaves inline mode on.
*/ */
@ -3544,8 +3544,8 @@
/** /**
* Enable M3 commands for laser mode inline power planner syncing. * Enable M3 commands for laser mode inline power planner syncing.
* This feature enables any M3 S-value to be injected into the block buffers while in * This feature enables any M3 S-value to be injected into the block buffers while in
* CUTTER_MODE_CONTINUOUS. The option allows M3 laser power to be commited without waiting * CUTTER_MODE_CONTINUOUS. The option allows M3 laser power to be committed without waiting
* for a planner syncronization * for a planner synchronization
*/ */
//#define LASER_POWER_SYNC //#define LASER_POWER_SYNC
@ -4144,7 +4144,7 @@
#define MAX7219_DEBUG_PROFILE 6 // Display the fraction of CPU time spent in profiled code on this LED matrix #define MAX7219_DEBUG_PROFILE 6 // Display the fraction of CPU time spent in profiled code on this LED matrix
// row. By default idle() is profiled so this shows how "idle" the processor is. // row. By default idle() is profiled so this shows how "idle" the processor is.
// See class CodeProfiler. // See class CodeProfiler.
//#define MAX7219_DEBUG_MULTISTEPPING 6 // Show multistepping 1 to 128 on this LED matrix row. //#define MAX7219_DEBUG_MULTISTEPPING 6 // Show multi-stepping 1 to 128 on this LED matrix row.
#endif #endif
/** /**

17
Marlin/src/gcode/calibrate/G34.cpp
View file

@ -39,6 +39,23 @@
#define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE) #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
#include "../../core/debug_out.h" #include "../../core/debug_out.h"
/**
* G34 - Align the ends of the X gantry. See https://youtu.be/3jAFQdTk8iw
*
* - The carriage moves to GANTRY_CALIBRATION_SAFE_POSITION, also called the “pounce” position.
* - If possible, the Z stepper current is reduced to the value specified by 'S'
* (or GANTRY_CALIBRATION_CURRENT) to prevent damage to steppers and other parts.
* The reduced current should be just high enough to move the Z axis when not blocked.
* - The Z axis is jogged past the Z limit, only as far as the specified Z distance
* (or GANTRY_CALIBRATION_EXTRA_HEIGHT) at the GANTRY_CALIBRATION_FEEDRATE.
* - The Z axis is moved back to the working area (also at GANTRY_CALIBRATION_FEEDRATE).
* - Stepper current is restored back to normal.
* - The machine is re-homed, according to GANTRY_CALIBRATION_COMMANDS_POST.
*
* Parameters:
* [S<mA>] - Current value to use for the raise move. (Default: GANTRY_CALIBRATION_CURRENT)
* [Z<linear>] - Extra distance past Z_MAX_POS to move the Z axis. (Default: GANTRY_CALIBRATION_EXTRA_HEIGHT)
*/
void GcodeSuite::G34() { void GcodeSuite::G34() {
// Home before the alignment procedure // Home before the alignment procedure