Merge remote-tracking branch 'refs/remotes/origin/master' into dev

Documentation/changelog.md

+### Version 4.2.81
+* Fix serial protocol for Repetier Host
+* Bug fix
+
 ### Version 4.2.8
 * Add board folder with files of various board containing the pins
 * Add End time on Graphics display when SD print

MK/Configuration_Store.cpp

-#include "base.h"
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
 /**
  * configuration_store.cpp
@@ -16,6 +36,8 @@
  *
  */
 
+#include "base.h"
+
 #define EEPROM_VERSION "MKV428"
 
 /**

MK/Configuration_Store.h

+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program 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.
+ *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #ifndef CONFIGURATION_STORE_H
-#define CONFIGURATION_STORE_H
+  #define CONFIGURATION_STORE_H
 
-void Config_ResetDefault();
-void ConfigSD_ResetDefault();
+  void Config_ResetDefault();
+  void ConfigSD_ResetDefault();
 
-#if DISABLED(DISABLE_M503)
-void Config_PrintSettings(bool forReplay = false);
-void ConfigSD_PrintSettings(bool forReplay = false);
-#else
-FORCE_INLINE void Config_PrintSettings(bool forReplay = false) {}
-FORCE_INLINE void ConfigSD_PrintSettings(bool forReplay = false) {}
-#endif
+  #if DISABLED(DISABLE_M503)
+    void Config_PrintSettings(bool forReplay = false);
+    void ConfigSD_PrintSettings(bool forReplay = false);
+  #else
+    FORCE_INLINE void Config_PrintSettings(bool forReplay = false) {}
+    FORCE_INLINE void ConfigSD_PrintSettings(bool forReplay = false) {}
+  #endif
 
-#if ENABLED(EEPROM_SETTINGS)
-void Config_StoreSettings();
-void Config_RetrieveSettings();
-#else
-FORCE_INLINE void Config_StoreSettings() {}
-FORCE_INLINE void Config_RetrieveSettings() { Config_ResetDefault(); Config_PrintSettings(); }
-#endif
+  #if ENABLED(EEPROM_SETTINGS)
+    void Config_StoreSettings();
+    void Config_RetrieveSettings();
+  #else
+    FORCE_INLINE void Config_StoreSettings() {}
+    FORCE_INLINE void Config_RetrieveSettings() { Config_ResetDefault(); Config_PrintSettings(); }
+  #endif
 
-#if ENABLED(SDSUPPORT) && ENABLED(SD_SETTINGS)
-#define CFG_SD_MAX_KEY_LEN    3+1         // icrease this if you add key name longer than the actual value.
-#define CFG_SD_MAX_VALUE_LEN  10+1        // this should be enought for int, long and float if you need to retrive strings increase this carefully
-//(11 = strlen("4294967295")+1) (4294967295 = (2^32)-1) (32 = the num of bits of the bigger basic data scructor used)
-//If yuou need to save string increase this to strlen("YOUR LONGER STRING")+1
-void ConfigSD_StoreSettings();
-void ConfigSD_RetrieveSettings(bool addValue = false);
-int ConfigSD_KeyIndex(char *key);
-#else
-FORCE_INLINE void ConfigSD_RetrieveSettings() {  ConfigSD_ResetDefault(); }
-#endif
+  #if ENABLED(SDSUPPORT) && ENABLED(SD_SETTINGS)
+    #define CFG_SD_MAX_KEY_LEN    3+1         // icrease this if you add key name longer than the actual value.
+    #define CFG_SD_MAX_VALUE_LEN  10+1        // this should be enought for int, long and float if you need to retrive strings increase this carefully
+    //(11 = strlen("4294967295")+1) (4294967295 = (2^32)-1) (32 = the num of bits of the bigger basic data scructor used)
+    //If yuou need to save string increase this to strlen("YOUR LONGER STRING")+1
+    void ConfigSD_StoreSettings();
+    void ConfigSD_RetrieveSettings(bool addValue = false);
+    int ConfigSD_KeyIndex(char *key);
+  #else
+    FORCE_INLINE void ConfigSD_RetrieveSettings() {  ConfigSD_ResetDefault(); }
+  #endif
 
 #endif //CONFIGURATION_STORE_H

MK/Configuration_Version.h

+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program 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.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 #ifndef CONFIGURATION_VERSION_H
   #define CONFIGURATION_VERSION_H
 
   #define FIRMWARE_NAME "MK"
-  #define SHORT_BUILD_VERSION "4.2.8_dev"
+  #define SHORT_BUILD_VERSION "4.2.81_dev"
   #define BUILD_VERSION FIRMWARE_NAME "_" SHORT_BUILD_VERSION
   #define STRING_DISTRIBUTION_DATE __DATE__ " " __TIME__    // build date and time
   // It might also be appropriate to define a location where additional information can be found

README.md

 <img align="right" src="Documentation/Logo/MarlinKimbra%20Logo%20GitHub.png" />
 # MarlinKimbra 3D Printer Firmware for Arduino
-## Version 4.2.8 dev
+## Version 4.2.81 dev
 
 ### Special thanks
 * all Marlin8bit-developers.