diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..bc2df2da35 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,19 @@ +# Set the default behavior, in case people don't have core.autocrlf set. +* text=auto + +# Files with Unix line endings +*.c text eol=lf +*.cpp text eol=lf +*.h text eol=lf +*.ino text eol=lf +*.py text eol=lf +*.sh text eol=lf + +# Files with native line endings +# *.sln text + +# Binary files +*.png binary +*.jpg binary +*.fon binary + diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 79771ae06b..6ab20af4e4 100755 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -778,13 +778,6 @@ extern "C" { extern void digipot_i2c_init(); #endif -inline void echo_command(const char* cmd) { - SERIAL_ECHO_START; - SERIAL_ECHOPAIR(MSG_ENQUEUEING, cmd); - SERIAL_CHAR('"'); - SERIAL_EOL; -} - /** * Inject the next "immediate" command, when possible, onto the front of the queue. * Return true if any immediate commands remain to inject. @@ -847,7 +840,10 @@ inline bool _enqueuecommand(const char* cmd, bool say_ok=false) { */ bool enqueue_and_echo_command(const char* cmd, bool say_ok/*=false*/) { if (_enqueuecommand(cmd, say_ok)) { - echo_command(cmd); + SERIAL_ECHO_START; + SERIAL_ECHOPAIR(MSG_ENQUEUEING, cmd); + SERIAL_CHAR('"'); + SERIAL_EOL; return true; } return false; @@ -3639,11 +3635,11 @@ inline void gcode_G28() { do_blocking_move_to_z(delta_clip_start_height); #endif - // Enable mesh leveling again #if ENABLED(AUTO_BED_LEVELING_UBL) - set_bed_leveling_enabled(bed_leveling_state_at_entry); + set_bed_leveling_enabled(bed_leveling_state_at_entry); #endif + // Enable mesh leveling again #if ENABLED(MESH_BED_LEVELING) if (mbl.reactivate()) { set_bed_leveling_enabled(true);