X-Git-Url: http://git.hcoop.net/clinton/Smoothieware.git/blobdiff_plain/ed5e53ced390fc19380a48070cb7a5566746cebc..27fdf0205958dcbc13241679f16587d79842c879:/src/modules/communication/GcodeDispatch.cpp

diff --git a/src/modules/communication/GcodeDispatch.cpp b/src/modules/communication/GcodeDispatch.cpp
index f252ec13..708628a9 100644
--- a/src/modules/communication/GcodeDispatch.cpp
+++ b/src/modules/communication/GcodeDispatch.cpp
@@ -25,6 +25,7 @@
 #include "SimpleShell.h"
 #include "utils.h"
 #include "LPC17xx.h"
+#include "version.h"
 
 #define panel_display_message_checksum CHECKSUM("display_message")
 #define panel_checksum             CHECKSUM("panel")
@@ -108,7 +109,7 @@ try_again:
                 cs &= 0xff;  // Defensive programming...
                 cs -= chksum;
 			}
-			
+
             //Strip line number value from possible_command
 			size_t lnsize = possible_command.find_first_not_of("N0123456789.,- ");
 			if(lnsize != string::npos) {
@@ -259,6 +260,26 @@ try_again:
                                 delete gcode;
                                 return;
 
+                            case 115: // M115 Get firmware version and capabilities
+                                Version vers;
+
+                                new_message.stream->printf("FIRMWARE_NAME:Smoothieware, FIRMWARE_URL:http%%3A//smoothieware.org, X-SOURCE_CODE_URL:https://github.com/Smoothieware/Smoothieware, FIRMWARE_VERSION:%s, X-FIRMWARE_BUILD_DATE:%s, X-SYSTEM_CLOCK:%ldMHz, X-AXES:%d", vers.get_build(), vers.get_build_date(), SystemCoreClock / 1000000, MAX_ROBOT_ACTUATORS);
+
+                                #ifdef CNC
+                                new_message.stream->printf(", X-CNC:1");
+                                #else
+                                new_message.stream->printf(", X-CNC:0");
+                                #endif
+
+                                #ifdef DISABLEMSD
+                                new_message.stream->printf(", X-MSD:0");
+                                #else
+                                new_message.stream->printf(", X-MSD:1");
+                                #endif
+
+                                new_message.stream->printf("\nok\n");
+                                return;
+
                             case 117: // M117 is a special non compliant Gcode as it allows arbitrary text on the line following the command
                             {    // concatenate the command again and send to panel if enabled
                                 string str= single_command.substr(4) + possible_command;