MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request #7251 from thinkyhead/bf_simplify3d_workaround

Browse Source 
Patch M23 to work around Simplify3D bug
This commit is contained in:
Scott Lahteine 2017-07-06 14:45:04 -05:00 committed by GitHub
commit 504d26341a
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -109,7 +109,7 @@ script:
- restore_configs - restore_configs
- opt_enable NUM_SERVOS Z_ENDSTOP_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE - 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 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 - build_marlin
# #
# Test MESH_BED_LEVELING feature, with LCD # Test MESH_BED_LEVELING feature, with LCD

5
Marlin/Conditionals_LCD.h
View File

@ -307,7 +307,10 @@
#endif #endif
#endif #endif
#ifndef BOOTSCREEN_TIMEOUT // Boot screens
#if DISABLED(ULTRA_LCD)
#undef SHOW_BOOTSCREEN
#elif !defined(BOOTSCREEN_TIMEOUT)
#define BOOTSCREEN_TIMEOUT 2500 #define BOOTSCREEN_TIMEOUT 2500
#endif #endif

10
Marlin/Marlin_main.cpp
View File

@ -6256,7 +6256,11 @@ inline void gcode_M17() {
/** /**
* M23: Open a file * 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 * M24: Start or Resume SD Print
@ -10524,8 +10528,8 @@ void process_next_command() {
#if ENABLED(G38_PROBE_TARGET) #if ENABLED(G38_PROBE_TARGET)
case 38: // G38.2 & G38.3 case 38: // G38.2 & G38.3
if (subcode == 2 || subcode == 3) if (parser.subcode == 2 || parser.subcode == 3)
gcode_G38(subcode == 2); gcode_G38(parser.subcode == 2);
break; break;
#endif #endif

2
Marlin/gcode.cpp
View File

@ -46,7 +46,7 @@ char *GCodeParser::command_ptr,
char GCodeParser::command_letter; char GCodeParser::command_letter;
int GCodeParser::codenum; int GCodeParser::codenum;
#if USE_GCODE_SUBCODES #if USE_GCODE_SUBCODES
int GCodeParser::subcode; uint8_t GCodeParser::subcode;
#endif #endif
#if ENABLED(FASTER_GCODE_PARSER) #if ENABLED(FASTER_GCODE_PARSER)

2
Marlin/gcode.h
View File

@ -91,7 +91,7 @@ public:
static char command_letter; // G, M, or T static char command_letter; // G, M, or T
static int codenum; // 123 static int codenum; // 123
#if USE_GCODE_SUBCODES #if USE_GCODE_SUBCODES
static int subcode; // .1 static uint8_t subcode; // .1
#endif #endif
#if ENABLED(DEBUG_GCODE_PARSER) #if ENABLED(DEBUG_GCODE_PARSER)