Browse Source

M115 strings

Scott Lahteine 3 years ago
parent
commit
0473f7ee58
2 changed files with 10 additions and 3 deletions
  1. 0
    1
      Marlin/src/core/language.h
  2. 10
    2
      Marlin/src/gcode/host/M115.cpp

+ 0
- 1
Marlin/src/core/language.h View File

125
 #define STR_INVALID_E_STEPPER               "Invalid E stepper"
125
 #define STR_INVALID_E_STEPPER               "Invalid E stepper"
126
 #define STR_E_STEPPER_NOT_SPECIFIED         "E stepper not specified"
126
 #define STR_E_STEPPER_NOT_SPECIFIED         "E stepper not specified"
127
 #define STR_INVALID_SOLENOID                "Invalid solenoid"
127
 #define STR_INVALID_SOLENOID                "Invalid solenoid"
128
-#define STR_M115_REPORT                     "FIRMWARE_NAME:Marlin " DETAILED_BUILD_VERSION " (" __DATE__ " " __TIME__ ") SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID
129
 #define STR_COUNT_X                         " Count X:"
128
 #define STR_COUNT_X                         " Count X:"
130
 #define STR_COUNT_A                         " Count A:"
129
 #define STR_COUNT_A                         " Count A:"
131
 #define STR_WATCHDOG_FIRED                  "Watchdog timeout. Reset required."
130
 #define STR_WATCHDOG_FIRED                  "Watchdog timeout. Reset required."

+ 10
- 2
Marlin/src/gcode/host/M115.cpp View File

42
  *       the capability is not present.
42
  *       the capability is not present.
43
  */
43
  */
44
 void GcodeSuite::M115() {
44
 void GcodeSuite::M115() {
45
-
46
-  SERIAL_ECHOLNPGM(STR_M115_REPORT);
45
+  SERIAL_ECHOLNPGM(
46
+    "FIRMWARE_NAME:Marlin " DETAILED_BUILD_VERSION " (" __DATE__ " " __TIME__ ") "
47
+    "SOURCE_CODE_URL:" SOURCE_CODE_URL " "
48
+    "PROTOCOL_VERSION:" PROTOCOL_VERSION " "
49
+    "MACHINE_TYPE:" MACHINE_NAME " "
50
+    "EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " "
51
+    #ifdef MACHINE_UUID
52
+      "UUID:" MACHINE_UUID
53
+    #endif
54
+  );
47
 
55
 
48
   #if ENABLED(EXTENDED_CAPABILITIES_REPORT)
56
   #if ENABLED(EXTENDED_CAPABILITIES_REPORT)
49
 
57
 

Loading…
Cancel
Save