Merge branch 'TM_CR10' into bugfix-1.1.x

Marlin/Configuration.h

@@ -90,6 +90,43 @@
  * respecfully request that you retain the unmodified Marlin boot screen.
  */
 
+//#define MeshFast
+//#define MeshStd
+#define MeshFine
+//#define MeshExtreme
+
+//#define BoardRev2
+
+
+#if(!ENABLED(MachineCR10Orig))
+#define CUSTOM_STATUS_SCREEN_IMAGE
+#endif
+
+#if(ENABLED(MachineMini))
+#define CUSTOM_MACHINE_NAME "Mini SuPeR"
+#elif(ENABLED(MachineCR10Orig))
+#define CUSTOM_MACHINE_NAME "SuPeR CR-10"
+#elif(ENABLED(MachineCR10S))
+#define CUSTOM_MACHINE_NAME "300 SuPeR"
+#elif(ENABLED(MachineS4))
+#define CUSTOM_MACHINE_NAME "400 SuPeR"
+#elif(ENABLED(MachineS5))
+#define CUSTOM_MACHINE_NAME "500 SuPeR"
+#endif
+
+#if(ENABLED(MachineMini))
+#define VerChar1 "M"
+#elif(ENABLED(MachineCR10Orig))
+#define VerChar1 "O"
+#elif(ENABLED(MachineCR10S))
+#define VerChar1 "S"
+#elif(ENABLED(MachineS4))
+#define VerChar1 "4"
+#elif(ENABLED(MachineS5))
+#define VerChar1 "5"
+#endif
+
+
 // Enable to show the bitmap in Marlin/_Bootscreen.h on startup.
 //#define SHOW_CUSTOM_BOOTSCREEN
 

Marlin/Version.h

@@ -35,7 +35,9 @@
   /**
    * Marlin release version identifier
    */
-  #define SHORT_BUILD_VERSION "bugfix-1.1.x"
+
+  #define SHORT_BUILD_VERSION "1.1.8_B9"
+
 
   /**
    * Verbose version identifier which should contain a reference to the location
@@ -48,7 +50,9 @@
    * here we define this default string as the date where the latest release
    * version was tagged.
    */
-  #define STRING_DISTRIBUTION_DATE "2018-01-20"
+
+  #define STRING_DISTRIBUTION_DATE "2018-05-09"
+
 
   /**
    * Required minimum Configuration.h and Configuration_adv.h file versions.