From 678914be25d8e0c39caae0c02f98fe8cb946dd03 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 6 Jul 2017 14:00:58 -0500
Subject: [PATCH 1/3] Patch M23 to work around Simplify3D bug

Addressing #7227
---
 Marlin/Marlin_main.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 6f52f208d..a2bd4a384 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -6256,7 +6256,11 @@ inline void gcode_M17() {
   /**
    * M23: Open a file
    */
-  inline void gcode_M23() { card.openFile(parser.string_arg, true); }
+  inline void gcode_M23() {
+    // Simplify3D includes the size, so zero out all spaces (#7227)
+    for (char *fn = parser.string_arg; *fn; ++fn) if (*fn == ' ') *fn = '\0';
+    card.openFile(parser.string_arg, true); 
+  }
 
   /**
    * M24: Start or Resume SD Print

From 11c589c3ec0cd996f2a58ec07421d086aad30991 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 6 Jul 2017 14:06:39 -0500
Subject: [PATCH 2/3] Fix compile issue with G38

Fixes #7250
---
 .travis.yml            | 2 +-
 Marlin/Marlin_main.cpp | 4 ++--
 Marlin/gcode.cpp       | 2 +-
 Marlin/gcode.h         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f12b1e891..f3ccc3247 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -109,7 +109,7 @@ script:
   - restore_configs
   - opt_enable NUM_SERVOS Z_ENDSTOP_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE
   - opt_enable AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT
-  - opt_enable_adv EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP
+  - opt_enable_adv EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET
   - build_marlin
   #
   # Test MESH_BED_LEVELING feature, with LCD
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index a2bd4a384..9fba4e1d2 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -10528,8 +10528,8 @@ void process_next_command() {
 
       #if ENABLED(G38_PROBE_TARGET)
         case 38: // G38.2 & G38.3
-          if (subcode == 2 || subcode == 3)
-            gcode_G38(subcode == 2);
+          if (parser.subcode == 2 || parser.subcode == 3)
+            gcode_G38(parser.subcode == 2);
           break;
       #endif
 
diff --git a/Marlin/gcode.cpp b/Marlin/gcode.cpp
index 85b3a194c..edeb00e22 100644
--- a/Marlin/gcode.cpp
+++ b/Marlin/gcode.cpp
@@ -46,7 +46,7 @@ char *GCodeParser::command_ptr,
 char GCodeParser::command_letter;
 int GCodeParser::codenum;
 #if USE_GCODE_SUBCODES
-  int GCodeParser::subcode;
+  uint8_t GCodeParser::subcode;
 #endif
 
 #if ENABLED(FASTER_GCODE_PARSER)
diff --git a/Marlin/gcode.h b/Marlin/gcode.h
index 7b5857640..ace84d8de 100644
--- a/Marlin/gcode.h
+++ b/Marlin/gcode.h
@@ -91,7 +91,7 @@ public:
   static char command_letter;             // G, M, or T
   static int codenum;                     // 123
   #if USE_GCODE_SUBCODES
-    static int subcode;                   // .1
+    static uint8_t subcode;               // .1
   #endif
 
   #if ENABLED(DEBUG_GCODE_PARSER)

From c6d430670aa338b500cc79c341a6cbf540f3c82d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 6 Jul 2017 14:17:54 -0500
Subject: [PATCH 3/3] Clear SHOW_BOOTSCREEN with no LCD

---
 Marlin/Conditionals_LCD.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Marlin/Conditionals_LCD.h b/Marlin/Conditionals_LCD.h
index deb89fb51..4dcda59cd 100644
--- a/Marlin/Conditionals_LCD.h
+++ b/Marlin/Conditionals_LCD.h
@@ -307,7 +307,10 @@
     #endif
   #endif
 
-  #ifndef BOOTSCREEN_TIMEOUT
+  // Boot screens
+  #if DISABLED(ULTRA_LCD)
+    #undef SHOW_BOOTSCREEN
+  #elif !defined(BOOTSCREEN_TIMEOUT)
     #define BOOTSCREEN_TIMEOUT 2500
   #endif