Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-09-21 18:56:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup after very messy merge

Browse Source
This commit is contained in:
Alden Hart
2017-03-23 11:50:18 -04:00
parent c60dc581f7
commit 693cb04d1a
8 changed files with 25 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files
g2core/controller.cpp
+2 -2
View File
@@ -288,8 +288,8 @@ static void _dispatch_kernel(const devflags_t flags)
#endif
#if MARLIN_COMPAT_ENABLED == true
else if (js.json_mode == MARLIN_COMM_MODE) { // handle marlin-specific protocol gcode
cs.comm_request_mode = MARLIN_COMM_MODE; // mode of this command
else if (js.json_mode == MARLIN_COMM_MODE) { // handle marlin-specific protocol gcode
cs.comm_request_mode = MARLIN_COMM_MODE; // mode of this command
marlin_response(gcode_parser(cs.bufp), cs.saved_buf);
}
#endif