diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 64911ee9e..e33db937e 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -5280,7 +5280,7 @@ void home_all_axes() { gcode_G28(true); } #if DISABLED(PROBE_MANUALLY) home_offset[Z_AXIS] -= probe_pt(dx, dy, stow_after_each, 1, false); // 1st probe to set height #endif - + do { float z_at_pt[13] = { 0.0 }; @@ -5380,7 +5380,7 @@ void home_all_axes() { gcode_G28(true); } #if ENABLED(PROBE_MANUALLY) test_precision = 0.00; // forced end #endif - + switch (probe_points) { case 1: test_precision = 0.00; // forced end @@ -6259,7 +6259,7 @@ inline void gcode_M17() { inline void gcode_M23() { // Simplify3D includes the size, so zero out all spaces (#7227) for (char *fn = parser.string_arg; *fn; ++fn) if (*fn == ' ') *fn = '\0'; - card.openFile(parser.string_arg, true); + card.openFile(parser.string_arg, true); } /** @@ -12877,7 +12877,7 @@ void kill(const char* lcd_msg) { #if defined(ACTION_ON_KILL) SERIAL_ECHOLNPGM("//action:" ACTION_ON_KILL); #endif - + #if HAS_POWER_SWITCH SET_INPUT(PS_ON_PIN); #endif diff --git a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h index ff5c5a7fd..52acb8871 100644 --- a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h +++ b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h @@ -497,7 +497,7 @@ // Horizontal distance bridged by diagonal push rods when effector is centered. #define DELTA_RADIUS 101.0 //mm Get this value from auto calibrate - + // Trim adjustments for individual towers // tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0 // measured in degrees anticlockwise looking from above the printer diff --git a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h index f5d022738..ec2e2b313 100644 --- a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h @@ -497,7 +497,7 @@ // Horizontal distance bridged by diagonal push rods when effector is centered. #define DELTA_RADIUS 101.0 //mm Get this value from auto calibrate - + // Trim adjustments for individual towers // tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0 // measured in degrees anticlockwise looking from above the printer diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 3dcee31c6..f69074b61 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -487,7 +487,7 @@ // Horizontal distance bridged by diagonal push rods when effector is centered. #define DELTA_RADIUS 124.0 //mm Get this value from auto calibrate - + // Trim adjustments for individual towers // tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0 // measured in degrees anticlockwise looking from above the printer diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 1880f5ba9..5118929cd 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -487,7 +487,7 @@ // Horizontal distance bridged by diagonal push rods when effector is centered. #define DELTA_RADIUS 105.2 //mm Get this value from auto calibrate - + // Trim adjustments for individual towers // tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0 // measured in degrees anticlockwise looking from above the printer diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 34ac25c39..383413346 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -473,7 +473,7 @@ // Horizontal distance bridged by diagonal push rods when effector is centered. #define DELTA_RADIUS 152.357 //mm Get this value from auto calibrate - + // Trim adjustments for individual towers // tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0 // measured in degrees anticlockwise looking from above the printer diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index bba2d9d9b..6dfbf7792 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -491,7 +491,7 @@ // Horizontal distance bridged by diagonal push rods when effector is centered. #define DELTA_RADIUS 174.1 //mm Get this value from auto calibrate - + // Trim adjustments for individual towers // tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0 // measured in degrees anticlockwise looking from above the printer diff --git a/Marlin/pins_PRINTRBOARD_REVF.h b/Marlin/pins_PRINTRBOARD_REVF.h index 3adeb1203..0f1772c84 100644 --- a/Marlin/pins_PRINTRBOARD_REVF.h +++ b/Marlin/pins_PRINTRBOARD_REVF.h @@ -32,9 +32,9 @@ * * Teensyduino - http://www.pjrc.com/teensy/teensyduino.html * Installation instructions are at the above URL. - * + * * Select Teensy++ 2.0 in Arduino IDE from the 'Tools -> Boards' menu - * + * * Note: With Teensyduino extension, the Arduino IDE will report 130048 bytes of program storage space available, * but there is actually only 122880 bytes due to the larger DFU bootloader shipped by default on all Printrboard RevF. * @@ -99,8 +99,8 @@ #define DAC_STEPPER_CURRENT // Set default drive strength percents if not already defined - X, Y, Z, E axis -#ifndef DAC_MOTOR_CURRENT_DEFAULT - #define DAC_MOTOR_CURRENT_DEFAULT { 70, 70, 50, 70 } +#ifndef DAC_MOTOR_CURRENT_DEFAULT + #define DAC_MOTOR_CURRENT_DEFAULT { 70, 70, 50, 70 } #endif // Number of channels available for DAC @@ -170,17 +170,17 @@ #if ENABLED(MINIPANEL) #if ENABLED(USE_INTERNAL_SD) - // PIN FASTIO PIN# ATUSB90 PIN# Teensy2.0++ PIN# - #define SDSS 20 // 10 B0 + // PIN FASTIO PIN# ATUSB90 PIN# Teensy2.0++ PIN# + #define SDSS 20 // 10 B0 #define SD_DETECT_PIN -1 // no auto-detect SD insertion on built-in Printrboard SD reader #else - // PIN FASTIO PIN# ATUSB90 PIN# Teensy2.0++ PIN# Printrboard RevF Conn. MKSLCD12864 PIN# + // PIN FASTIO PIN# ATUSB90 PIN# Teensy2.0++ PIN# Printrboard RevF Conn. MKSLCD12864 PIN# #define SDSS 11 // 36 C1 EXP2-13 EXP2-07 #define SD_DETECT_PIN 9 // 34 E1 EXP2-11 EXP2-04 #endif - - // PIN FASTIO PIN# ATUSB90 PIN# Teensy2.0++ PIN# Printrboard RevF Conn. MKSLCD12864 PIN# - #define DOGLCD_A0 4 // 29 D4 EXP2-05 EXP1-04 + + // PIN FASTIO PIN# ATUSB90 PIN# Teensy2.0++ PIN# Printrboard RevF Conn. MKSLCD12864 PIN# + #define DOGLCD_A0 4 // 29 D4 EXP2-05 EXP1-04 #define DOGLCD_CS 5 // 30 D5 EXP2-06 EXP1-05 #define BTN_ENC 6 // 31 D6 EXP2-07 EXP1-09 #define BEEPER_PIN 7 // 32 D7 EXP2-08 EXP1-10 @@ -190,8 +190,8 @@ //#define LCD_BACKLIGHT_PIN 43 // 56 F5 EXP1-12 Not Implemented //#define SCK 21 // 11 B1 ICSP-04 EXP2-09 //#define MOSI 22 // 12 B2 ICSP-03 EXP2-05 - //#define MISO 23 // 13 B3 ICSP-06 EXP2-05 - + //#define MISO 23 // 13 B3 ICSP-06 EXP2-05 + // encoder connections present #define BLEN_A 0 #define BLEN_B 1 diff --git a/buildroot/share/git/mfup b/buildroot/share/git/mfup index cd65c46cc..df2da87b2 100755 --- a/buildroot/share/git/mfup +++ b/buildroot/share/git/mfup @@ -2,10 +2,10 @@ # # mfup # -# - Fetch latest upstream and replace the PR Target branch with +# - Fetch latest upstream and replace the PR Target branch with # - Rebase the (current or specified) branch on the PR Target # - Force-push the branch to 'origin' -# - +# - # [[ $# < 2 ]] || { echo "Usage: `basename $0` [branch]" 1>&2 ; exit 1; }