From 2877dc9794e8ecef454434574f7e701f563b90a1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 10 Sep 2020 22:02:18 -0500
Subject: [PATCH] M115 strings
---
Marlin/src/core/language.h | 1 -
Marlin/src/gcode/host/M115.cpp | 12 ++++++++++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
index 0f932f9d3ff..0bcf799ac31 100644
--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@@ -125,7 +125,6 @@
#define STR_INVALID_E_STEPPER "Invalid E stepper"
#define STR_E_STEPPER_NOT_SPECIFIED "E stepper not specified"
#define STR_INVALID_SOLENOID "Invalid solenoid"
-#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
#define STR_COUNT_X " Count X:"
#define STR_COUNT_A " Count A:"
#define STR_WATCHDOG_FIRED "Watchdog timeout. Reset required."
diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index cd64c563f9f..53c5163bbaf 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -42,8 +42,16 @@
* the capability is not present.
*/
void GcodeSuite::M115() {
-
- SERIAL_ECHOLNPGM(STR_M115_REPORT);
+ SERIAL_ECHOLNPGM(
+ "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) " "
+ #ifdef MACHINE_UUID
+ "UUID:" MACHINE_UUID
+ #endif
+ );
#if ENABLED(EXTENDED_CAPABILITIES_REPORT)