Fix

MarlinKimbra/ConfigurationStore.cpp

@@ -147,9 +147,9 @@ void Config_PrintSettings()
 #endif
   SERIAL_ECHOLNPGM("Maximum feedrates (mm/s):");
   SERIAL_ECHO_START;
-  SERIAL_ECHOPAIR("  M203 X",max_feedrate[0]);
-  SERIAL_ECHOPAIR(" Y",max_feedrate[1] ); 
-  SERIAL_ECHOPAIR(" Z", max_feedrate[2] ); 
+  SERIAL_ECHOPAIR("  M203 X ",max_feedrate[0]);
+  SERIAL_ECHOPAIR(" Y ",max_feedrate[1] ); 
+  SERIAL_ECHOPAIR(" Z ", max_feedrate[2] ); 
   SERIAL_ECHOPAIR(" E0 ", max_feedrate[3]);
   SERIAL_ECHOPAIR(" E1 ", max_feedrate[4]);
   SERIAL_ECHOPAIR(" E2 ", max_feedrate[5]);
@@ -168,13 +168,13 @@ void Config_PrintSettings()
   SERIAL_ECHO_START;
   SERIAL_ECHOLNPGM("Maximum Acceleration (mm/s2):");
   SERIAL_ECHO_START;
-  SERIAL_ECHOPAIR("  M201 X" ,max_acceleration_units_per_sq_second[0] ); 
-  SERIAL_ECHOPAIR(" Y" , max_acceleration_units_per_sq_second[1] ); 
-  SERIAL_ECHOPAIR(" Z" ,max_acceleration_units_per_sq_second[2] );
-  SERIAL_ECHOPAIR(" E0" ,max_acceleration_units_per_sq_second[3]);
-  SERIAL_ECHOPAIR(" E1" ,max_acceleration_units_per_sq_second[4]);
-  SERIAL_ECHOPAIR(" E2" ,max_acceleration_units_per_sq_second[5]);
-  SERIAL_ECHOPAIR(" E3" ,max_acceleration_units_per_sq_second[6]);
+  SERIAL_ECHOPAIR("  M201 X " ,max_acceleration_units_per_sq_second[0] ); 
+  SERIAL_ECHOPAIR(" Y " , max_acceleration_units_per_sq_second[1] ); 
+  SERIAL_ECHOPAIR(" Z " ,max_acceleration_units_per_sq_second[2] );
+  SERIAL_ECHOPAIR(" E0 " ,max_acceleration_units_per_sq_second[3]);
+  SERIAL_ECHOPAIR(" E1 " ,max_acceleration_units_per_sq_second[4]);
+  SERIAL_ECHOPAIR(" E2 " ,max_acceleration_units_per_sq_second[5]);
+  SERIAL_ECHOPAIR(" E3 " ,max_acceleration_units_per_sq_second[6]);
   SERIAL_ECHOLN("");
   
   SERIAL_ECHO_START;

MarlinKimbra/Configuration_Cartesian.h

@@ -143,9 +143,9 @@ const bool Z_MAX_ENDSTOP_INVERTING = false;      // set to true to invert the lo
 // these are the offsets to the probe relative to the extruder tip (Hotend - Probe)
 #define X_PROBE_OFFSET_FROM_EXTRUDER 0
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 20
-#define Z_PROBE_OFFSET_FROM_EXTRUDER -3.70
+#define Z_PROBE_OFFSET_FROM_EXTRUDER -3.75
 
-#define Z_RAISE_BEFORE_HOMING 10       // (in mm) Raise Z before homing (G28) for Probe Clearance.
+#define Z_RAISE_BEFORE_HOMING 10      // (in mm) Raise Z before homing (G28) for Probe Clearance.
 // Be sure you have this distance over your Z_MAX_POS in case
 
 #define Z_RAISE_BEFORE_PROBING 10    //How much the extruder will be raised before traveling to the first probing point.

MarlinKimbra/Marlin_main.cpp

@@ -826,13 +826,7 @@ void get_command()
           case 1:
           case 2:
           case 3:
-            if(Stopped == false) { // If printer is stopped by an error the G[0-3] codes are ignored.
-#ifdef SDSUPPORT
-              if(card.saving) break;
-#endif //SDSUPPORT
-              SERIAL_PROTOCOLLNPGM(MSG_OK);
-            }
-            else {
+            if (Stopped == true) {
               SERIAL_ERRORLNPGM(MSG_ERR_STOPPED);
               LCD_MESSAGEPGM(MSG_STOPPED);
             }
@@ -846,7 +840,7 @@ void get_command()
         //If command was e-stop process now
         if(strcmp(cmdbuffer[bufindw], "M112") == 0)
           kill();
-
+        
         bufindw = (bufindw + 1)%BUFSIZE;
         buflen += 1;
       }
@@ -1900,7 +1894,6 @@ void process_commands()
 #endif //FWRETRACT
         prepare_move();
         //ClearToSend();
-        return;
       }
       break;
 
@@ -1909,14 +1902,12 @@ void process_commands()
       if(Stopped == false) {
         get_arc_coordinates();
         prepare_arc_move(true);
-        return;
       }
       break;
     case 3: // G3  - CCW ARC
       if(Stopped == false) {
         get_arc_coordinates();
         prepare_arc_move(false);
-        return;
       }
       break;
 #endif // no SCARA

MarlinKimbra/temperature.h

 /*
   temperature.h - temperature controller
- Part of Marlin
- 
- Copyright (c) 2011 Erik van der Zalm
- 
- Grbl is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- 
- Grbl is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with Grbl.  If not, see <http://www.gnu.org/licenses/>.
- */
+  Part of Marlin
+
+  Copyright (c) 2011 Erik van der Zalm
+
+  Grbl is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  Grbl is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Grbl.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #ifndef temperature_h
 #define temperature_h 
@@ -31,6 +31,14 @@
 void tp_init();  //initialize the heating
 void manage_heater(); //it is critical that this is called periodically.
 
+#ifdef FILAMENT_SENSOR
+// For converting raw Filament Width to milimeters 
+ float analog2widthFil(); 
+ 
+// For converting raw Filament Width to an extrusion ratio 
+ int widthFil_to_size_ratio();
+#endif
+
 // low level conversion routines
 // do not use these routines and variables outside of temperature.cpp
 #ifndef SINGLENOZZLE

MarlinKimbra/ultralcd.h

@@ -109,7 +109,8 @@
 
   #define LCD_MESSAGEPGM(x) 
   #define LCD_ALERTMESSAGEPGM(x) 
-#endif 
+
+#endif //ULTRA_LCD
 
 char *itostr2(const uint8_t &x);
 char *itostr31(const int &xx);
@@ -130,4 +131,4 @@ char *ftostr5(const float &x);
 char *ftostr51(const float &x);
 char *ftostr52(const float &x);
 
-#endif //ULTRALCD
+#endif //ULTRALCD_H