diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 27fd0d8..995eeb8 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -81,10 +81,10 @@ // User-specified version info of this build to display in [Pronterface, etc] terminal window during // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this // build by the user have been successfully uploaded into firmware. -#define STRING_CONFIG_H_AUTHOR "davidramiro - v1.4.0" // Who made the changes. +#define STRING_CONFIG_H_AUTHOR "(davidramiro)" // Who made the changes. #define SHOW_BOOTSCREEN -#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 -#define STRING_SPLASH_LINE2 WEBSITE_URL // will be shown during bootup in line 2 +#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 +#define STRING_SPLASH_LINE2 CUSTOM_BUILD_VERSION // will be shown during bootup in line 2 /** * *** VENDORS PLEASE READ *** diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 3db125f..00e7a58 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -15132,6 +15132,10 @@ void setup() { SERIAL_ECHOPGM(MSG_MARLIN); SERIAL_CHAR(' '); SERIAL_ECHOLNPGM(SHORT_BUILD_VERSION); + SERIAL_CHAR(' '); + SERIAL_ECHOPGM(MSG_MARLIN_AI3M); + SERIAL_CHAR(' '); + SERIAL_ECHOLNPGM(CUSTOM_BUILD_VERSION); SERIAL_EOL(); #if defined(STRING_DISTRIBUTION_DATE) && defined(STRING_CONFIG_H_AUTHOR) diff --git a/Marlin/Version.h b/Marlin/Version.h index 29669ef..2a79e7e 100644 --- a/Marlin/Version.h +++ b/Marlin/Version.h @@ -37,18 +37,24 @@ */ #define SHORT_BUILD_VERSION "1.1.9" + /** + * Defines the version of the Marlin-AI3M build. Not to be confused with + * Marlin's own build number, e.g. 1.1.9. + */ + #define CUSTOM_BUILD_VERSION "v1.4.0" + /** * Verbose version identifier which should contain a reference to the location * from where the binary was downloaded or the source code was compiled. */ - #define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " (Github, davidramiro)" + #define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION "(Github, davidramiro)" /** * The STRING_DISTRIBUTION_DATE represents when the binary file was built, * here we define this default string as the date where the latest release * version was tagged. */ - #define STRING_DISTRIBUTION_DATE "2019-02-18" + #define STRING_DISTRIBUTION_DATE "2019-02-23" /** * Required minimum Configuration.h and Configuration_adv.h file versions. @@ -78,7 +84,7 @@ * has a distinct Github fork— the Source Code URL should just be the main * Marlin repository. */ - #define SOURCE_CODE_URL "https://github.com/MarlinFirmware/Marlin" + #define SOURCE_CODE_URL "https://github.com/davidramiro/Marlin-AI3M" /** * Default generic printer UUID. diff --git a/Marlin/language.h b/Marlin/language.h index d0eea74..8530ee9 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -137,7 +137,8 @@ #define MSG_INVALID_EXTRUDER "Invalid extruder" #define MSG_INVALID_SOLENOID "Invalid solenoid" #define MSG_ERR_NO_THERMISTORS "No thermistors - no temperature" -#define MSG_M115_REPORT "FIRMWARE_NAME:Marlin " DETAILED_BUILD_VERSION " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID +#define MSG_M115_REPORT "FIRMWARE_NAME:Marlin " DETAILED_BUILD_VERSION " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID " MARLIN-AI3M_VERSION:" CUSTOM_BUILD_VERSION +#define MSG_MARLIN_AI3M "Marlin-AI3M" #define MSG_COUNT_X " Count X:" #define MSG_COUNT_A " Count A:" #define MSG_ERR_KILLED "Printer halted. kill() called!"