Clean up whitespace

This commit is contained in:
Scott Lahteine 2018-10-16 02:02:20 -05:00
parent 06e2afe8e0
commit 84b59d58fb
58 changed files with 65 additions and 63 deletions

View File

@ -1621,7 +1621,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1621,7 +1621,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1628,7 +1628,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1623,7 +1623,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1622,7 +1622,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1624,7 +1624,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1625,7 +1625,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1628,7 +1628,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1633,7 +1633,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1622,7 +1622,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -25,8 +25,10 @@
*/
// normal size or plus?
//#define ANYCUBIC_KOSSEL_PLUS
// Anycubic Probe version 1 or 2 see README.md; 0 for no probe
#define ANYCUBIC_PROBE_VERSION 0
// Heated Bed:
// 0 ... no heated bed
// 1 ... aluminium heated bed with "BuildTak-like" sticker
@ -992,11 +994,11 @@
#define Y_PROBE_OFFSET_FROM_EXTRUDER 0 // Y offset: -front +behind [the nozzle]
#if ANYCUBIC_PROBE_VERSION == 2
#define Z_PROBE_OFFSET_FROM_EXTRUDER -16.8 // Z offset: -below +above [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER -16.8 // Z offset: -below +above [the nozzle]
#elif ANYCUBIC_PROBE_VERSION == 1
#define Z_PROBE_OFFSET_FROM_EXTRUDER -19.0 // Z offset: -below +above [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER -19.0 // Z offset: -below +above [the nozzle]
#else
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
#endif
// Certain types of probes need to stay away from edges

View File

@ -1622,7 +1622,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1622,7 +1622,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1622,7 +1622,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1622,7 +1622,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1622,7 +1622,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1622,7 +1622,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1622,7 +1622,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1620,7 +1620,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -1621,7 +1621,7 @@
//#define G0_FEEDRATE // Add a G0-specific sticky feedrate, applied to all subsequent G0 moves.
#if ENABLED(G0_FEEDRATE)
#define DEFAULT_G0_FEEDRATE 3000 // (mm/m)
#endif
#endif
/**
* User-defined menu items that execute custom GCode

View File

@ -58,9 +58,9 @@ void GcodeSuite::G0_G1(
#if ENABLED(G0_FEEDRATE)
float saved_g1_feedrate_mm_s;
#endif
if (IsRunning() && G0_G1_CONDITION) {
#if ENABLED(G0_FEEDRATE)
if (fast_move) {
// Save standard feedrate before setting feedrate to fast/g0
@ -95,13 +95,13 @@ void GcodeSuite::G0_G1(
#endif
#if ENABLED(G0_FEEDRATE)
// save G0 feedrate, and restore standard feedrate as soon as possible
// save G0 feedrate, and restore standard feedrate as soon as possible
if (fast_move) {
saved_g0_feedrate_mm_s = feedrate_mm_s;
feedrate_mm_s = saved_g1_feedrate_mm_s;
}
#endif
#if ENABLED(NANODLP_Z_SYNC)
#if ENABLED(NANODLP_ALL_AXIS)
#define _MOVE_SYNC parser.seenval('X') || parser.seenval('Y') || parser.seenval('Z') // For any move wait and output sync message