bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge pull request #6210 from thinkyhead/rc_gitattributes

Browse Source 
Add .gitattributes to normalize line endings
This commit is contained in:
Scott Lahteine 2017-04-02 08:56:51 -05:00 committed by GitHub
commit 9faa8c4704
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.gitattributes vendored Normal file
View File

@ -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

16
Marlin/Marlin_main.cpp
View File

@ -778,13 +778,6 @@ extern "C" {
extern void digipot_i2c_init(); extern void digipot_i2c_init();
#endif #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. * Inject the next "immediate" command, when possible, onto the front of the queue.
* Return true if any immediate commands remain to inject. * 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*/) { bool enqueue_and_echo_command(const char* cmd, bool say_ok/*=false*/) {
if (_enqueuecommand(cmd, say_ok)) { if (_enqueuecommand(cmd, say_ok)) {
echo_command(cmd); SERIAL_ECHO_START;
SERIAL_ECHOPAIR(MSG_ENQUEUEING, cmd);
SERIAL_CHAR('"');
SERIAL_EOL;
return true; return true;
} }
return false; return false;
@ -3639,11 +3635,11 @@ inline void gcode_G28() {
do_blocking_move_to_z(delta_clip_start_height); do_blocking_move_to_z(delta_clip_start_height);
#endif #endif
// Enable mesh leveling again
#if ENABLED(AUTO_BED_LEVELING_UBL) #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 #endif
// Enable mesh leveling again
#if ENABLED(MESH_BED_LEVELING) #if ENABLED(MESH_BED_LEVELING)
if (mbl.reactivate()) { if (mbl.reactivate()) {
set_bed_leveling_enabled(true); set_bed_leveling_enabled(true);