Merge remote-tracking branch 'upstream/edge' into features/laser-panel

diff --git a/FirmwareBin/firmware-cnc.bin b/FirmwareBin/firmware-cnc.bin
index 94c8c51..a410200 100755 (executable)
Binary files a/FirmwareBin/firmware-cnc.bin and b/FirmwareBin/firmware-cnc.bin differ

diff --git a/FirmwareBin/firmware-disablemsd.bin b/FirmwareBin/firmware-disablemsd.bin
index d444761..8766b78 100755 (executable)
Binary files a/FirmwareBin/firmware-disablemsd.bin and b/FirmwareBin/firmware-disablemsd.bin differ

diff --git a/FirmwareBin/firmware.bin b/FirmwareBin/firmware.bin
index 6935cbc..6abc236 100755 (executable)
Binary files a/FirmwareBin/firmware.bin and b/FirmwareBin/firmware.bin differ

diff --git a/FirmwareBin/firmware.bin.md5sum b/FirmwareBin/firmware.bin.md5sum
index 3156beb..584715a 100644 (file)
--- a/FirmwareBin/firmware.bin.md5sum
+++ b/FirmwareBin/firmware.bin.md5sum
@@ -1 +1 @@
-de7e39893b1c06aca31376b12d7aad94  FirmwareBin/firmware.bin
+95485cdc47323220df65ccca46e519d4  FirmwareBin/firmware.bin

diff --git a/src/modules/utils/simpleshell/SimpleShell.cpp b/src/modules/utils/simpleshell/SimpleShell.cpp
index aecde68..36859eb 100644 (file)
--- a/src/modules/utils/simpleshell/SimpleShell.cpp
+++ b/src/modules/utils/simpleshell/SimpleShell.cpp
@@ -238,6 +238,7 @@ void SimpleShell::on_console_line_received( void *argument )
                     Gcode gcode("G28", new_message.stream);
                     THEKERNEL->call_event(ON_GCODE_RECEIVED, &gcode);
                 }
+                new_message.stream->printf("ok\n");
                 break;
 
             default: