From 350f239d841a8b0165ab1fd85b875a29bb859090 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 22 May 2015 17:31:24 -0700 Subject: [PATCH 1/6] Indent G0/G1 --- Marlin/Marlin_main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 478172ee8c..f747b13092 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -5227,11 +5227,11 @@ void process_next_command() { switch(command_code) { case 'G': switch (codenum) { - // G0, G1 - case 0: - case 1: - gcode_G0_G1(); - break; + // G0, G1 + case 0: + case 1: + gcode_G0_G1(); + break; // G2, G3 #ifndef SCARA From 47d7a9cb5ee526f277c978de929a0612b4d3ee5d Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 22 May 2015 17:31:38 -0700 Subject: [PATCH 2/6] Indent G2/G3 --- Marlin/Marlin_main.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index f747b13092..57a077f3a7 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -5233,13 +5233,13 @@ void process_next_command() { gcode_G0_G1(); break; - // G2, G3 - #ifndef SCARA - case 2: // G2 - CW ARC - case 3: // G3 - CCW ARC - gcode_G2_G3(codenum == 2); - break; - #endif + // G2, G3 + #ifndef SCARA + case 2: // G2 - CW ARC + case 3: // G3 - CCW ARC + gcode_G2_G3(codenum == 2); + break; + #endif // G4 Dwell case 4: From 86083badc2e1ee48874028adcab9e9df4ed18d28 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 22 May 2015 17:32:27 -0700 Subject: [PATCH 3/6] Indent G4, G10/G11, G28 --- Marlin/Marlin_main.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 57a077f3a7..039fe46381 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -5241,23 +5241,23 @@ void process_next_command() { break; #endif - // G4 Dwell - case 4: - gcode_G4(); - break; - - #ifdef FWRETRACT - - case 10: // G10: retract - case 11: // G11: retract_recover - gcode_G10_G11(codenum == 10); + // G4 Dwell + case 4: + gcode_G4(); break; - #endif //FWRETRACT + #ifdef FWRETRACT - case 28: // G28: Home all axes, one at a time - gcode_G28(); - break; + case 10: // G10: retract + case 11: // G11: retract_recover + gcode_G10_G11(codenum == 10); + break; + + #endif //FWRETRACT + + case 28: // G28: Home all axes, one at a time + gcode_G28(); + break; #if defined(ENABLE_AUTO_BED_LEVELING) || defined(MESH_BED_LEVELING) case 29: // G29 Detailed Z-Probe, probes the bed at 3 or more points. From ffe27a62251caa74e9f566a6d297d78e1c8199e3 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 22 May 2015 17:32:46 -0700 Subject: [PATCH 4/6] Indent G29 --- Marlin/Marlin_main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 039fe46381..ef9683fc44 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -5259,11 +5259,11 @@ void process_next_command() { gcode_G28(); break; - #if defined(ENABLE_AUTO_BED_LEVELING) || defined(MESH_BED_LEVELING) - case 29: // G29 Detailed Z-Probe, probes the bed at 3 or more points. - gcode_G29(); - break; - #endif + #if defined(ENABLE_AUTO_BED_LEVELING) || defined(MESH_BED_LEVELING) + case 29: // G29 Detailed Z-Probe, probes the bed at 3 or more points. + gcode_G29(); + break; + #endif #ifdef ENABLE_AUTO_BED_LEVELING From b0d520b1098d9d648f94f425e34bbd38c6bd873f Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 22 May 2015 17:33:17 -0700 Subject: [PATCH 5/6] Indent G30, G31/G32 --- Marlin/Marlin_main.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index ef9683fc44..3f1ddd5adb 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -5265,24 +5265,24 @@ void process_next_command() { break; #endif - #ifdef ENABLE_AUTO_BED_LEVELING + #ifdef ENABLE_AUTO_BED_LEVELING - #ifndef Z_PROBE_SLED + #ifndef Z_PROBE_SLED - case 30: // G30 Single Z Probe - gcode_G30(); - break; - - #else // Z_PROBE_SLED - - case 31: // G31: dock the sled - case 32: // G32: undock the sled - dock_sled(codenum == 31); + case 30: // G30 Single Z Probe + gcode_G30(); break; - #endif // Z_PROBE_SLED + #else // Z_PROBE_SLED - #endif // ENABLE_AUTO_BED_LEVELING + case 31: // G31: dock the sled + case 32: // G32: undock the sled + dock_sled(codenum == 31); + break; + + #endif // Z_PROBE_SLED + + #endif // ENABLE_AUTO_BED_LEVELING case 90: // G90 relative_mode = false; From b55f8718c39f3e295621addc775570680706c643 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 22 May 2015 17:34:08 -0700 Subject: [PATCH 6/6] Indent G90/G91, G92 --- Marlin/Marlin_main.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 3f1ddd5adb..e164618fee 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -5284,18 +5284,18 @@ void process_next_command() { #endif // ENABLE_AUTO_BED_LEVELING - case 90: // G90 - relative_mode = false; - break; - case 91: // G91 - relative_mode = true; - break; + case 90: // G90 + relative_mode = false; + break; + case 91: // G91 + relative_mode = true; + break; - case 92: // G92 - gcode_G92(); - break; + case 92: // G92 + gcode_G92(); + break; - default: code_is_good = false; + default: code_is_good = false; } break;