Merge remote-tracking branch 'refs/remotes/origin/master' into dev

MarlinKimbra/Configuration_Version.h

@@ -2,8 +2,8 @@
   #define CONFIGURATION_VERSION_H
 
   #define BUILD_VERSION "MarlinKimbra 4.2.4 dev"
-  #define SHORT_BUILD_VERSION "4.2.4 dev"
+  #define SHORT_BUILD_VERSION "4.2.4_dev"
   #define STRING_DISTRIBUTION_DATE __DATE__ " " __TIME__    // build date and time
   // It might also be appropriate to define a location where additional information can be found
-  #define SOURCE_CODE_URL  "https://github.com/MagoKimbra/MarlinKimbra"
+  #define FIRMWARE_URL  "https://github.com/MagoKimbra/MarlinKimbra"
 #endif
\ No newline at end of file

MarlinKimbra/language/language.h

@@ -83,7 +83,7 @@
 #define SERIAL_INVALID_EXTRUDER                "Invalid extruder"
 #define SERIAL_INVALID_SOLENOID                "Invalid solenoid"
 #define SERIAL_ERR_NO_THERMISTORS              "No thermistors - no temperature"
-#define SERIAL_M115_REPORT                     "FIRMWARE_NAME:MarlinKimbra " SHORT_BUILD_VERSION " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
+#define SERIAL_M115_REPORT                     "FIRMWARE_NAME:MarlinKimbra_" SHORT_BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
 #define SERIAL_COUNT_X                         " Count X: "
 #define SERIAL_ERR_KILLED                      "Printer halted. kill() called!"
 #define SERIAL_ERR_STOPPED                     "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"