From 5ea139fd79b5fc16de77ae2b167a2ec62aecaeb5 Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Thu, 14 May 2015 16:56:04 -0500 Subject: [PATCH 1/3] Revised Versioning mechanism --- Marlin/Configuration.h | 12 ++++++---- Marlin/Default_Version.h | 12 ++++++++++ Marlin/Marlin_main.cpp | 8 +++---- Marlin/configurator/config/Configuration.h | 12 ++++++---- .../Felix/Configuration.h | 19 +++++++++++---- .../Felix/Configuration_DUAL.h | 19 +++++++++++---- .../Hephestos/Configuration.h | 21 +++++++++++----- .../K8200/Configuration.h | 12 ++++++---- .../RepRapWorld/Megatronics/Configuration.h | 12 ++++++---- .../SCARA/Configuration.h | 24 +++++++++++++++---- .../WITBOX/Configuration.h | 19 +++++++++++---- .../delta/biv2.5/Configuration.h | 19 +++++++++++---- .../delta/generic/Configuration.h | 19 +++++++++++---- .../delta/kossel_mini/Configuration.h | 19 +++++++++++---- .../delta/kossel_pro/Configuration.h | 5 ++-- .../makibox/Configuration.h | 19 +++++++++++---- .../tvrrug/Round2/Configuration.h | 19 +++++++++++---- 17 files changed, 198 insertions(+), 72 deletions(-) create mode 100644 Marlin/Default_Version.h diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index d9d9aa8b23..1d8355d501 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -37,14 +37,18 @@ Here are some standard links for getting your machine calibrated: // @section info +#ifdef HAS_AUTOMATIC_VERSIONING + #include "_Version.h" +#else + #include "Default_Version.h" +#endif + // 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_VERSION "1.0.3 dev" -#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. -#define STRING_SPLASH_LINE1 "v" STRING_VERSION // will be shown during bootup in line 1 -//#define STRING_SPLASH_LINE2 STRING_VERSION_CONFIG_H // will be shown during bootup in line2 +#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 // @section machine diff --git a/Marlin/Default_Version.h b/Marlin/Default_Version.h new file mode 100644 index 0000000000..c9b5abacba --- /dev/null +++ b/Marlin/Default_Version.h @@ -0,0 +1,12 @@ +/* + * This file is a placeholder for a file which could be distributed in an archive + * It takes the place of an automatically created "_Version.h" which is generated during the build process + */ +#error "You must specify the following parameter related to your distribution" + +#if false + #define BUILD_VERSION "1.1.0 dev" + #define STRING_DISTRIBUTION_DATE "2015-06-00 12:00" + // It might also be appropriate to define a location where additional information can be found + #define FIRMWARE_URL "http:// ..." +#endif \ No newline at end of file diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 2a8d954bc6..04d244b091 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -614,19 +614,19 @@ void setup() { MCUSR = 0; SERIAL_ECHOPGM(MSG_MARLIN); - SERIAL_ECHOLNPGM(" " STRING_VERSION); + SERIAL_ECHOLNPGM(" " BUILD_VERSION); - #ifdef STRING_VERSION_CONFIG_H + #ifdef STRING_DISTRIBUTION_DATE #ifdef STRING_CONFIG_H_AUTHOR SERIAL_ECHO_START; SERIAL_ECHOPGM(MSG_CONFIGURATION_VER); - SERIAL_ECHOPGM(STRING_VERSION_CONFIG_H); + SERIAL_ECHOPGM(STRING_DISTRIBUTION_DATE); SERIAL_ECHOPGM(MSG_AUTHOR); SERIAL_ECHOLNPGM(STRING_CONFIG_H_AUTHOR); SERIAL_ECHOPGM("Compiled: "); SERIAL_ECHOLNPGM(__DATE__); #endif // STRING_CONFIG_H_AUTHOR - #endif // STRING_VERSION_CONFIG_H + #endif // STRING_DISTRIBUTION_DATE SERIAL_ECHO_START; SERIAL_ECHOPGM(MSG_FREE_MEMORY); diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h index 9b19e24193..2c087eb4cc 100644 --- a/Marlin/configurator/config/Configuration.h +++ b/Marlin/configurator/config/Configuration.h @@ -37,14 +37,18 @@ Here are some standard links for getting your machine calibrated: // @section info +#ifdef HAS_AUTOMATIC_VERSIONING + #include "_Version.h" +#else + #include "Default_Version.h" +#endif + // 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_VERSION "1.0.3 dev" -#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. -#define STRING_SPLASH_LINE1 "v" STRING_VERSION // will be shown during bootup in line 1 -//#define STRING_SPLASH_LINE2 STRING_VERSION_CONFIG_H // will be shown during bootup in line2 +#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 // @section machine diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index 5352bc5e11..665af5e190 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -31,22 +31,31 @@ Here are some standard links for getting your machine calibrated: //=========================================================================== //============================= SCARA Printer =============================== //=========================================================================== -// For a Delta printer replace the configuration files with the files in the +// For a Scara printer replace the configuration files with the files in the // example_configurations/SCARA directory. // +// @section info + +#ifdef HAS_AUTOMATIC_VERSIONING + #include "_Version.h" +#else + #include "Default_Version.h" +#endif + // 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_VERSION "1.0.3 dev" -#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. -#define STRING_SPLASH_LINE1 "v" STRING_VERSION // will be shown during bootup in line 1 -//#define STRING_SPLASH_LINE2 STRING_VERSION_CONFIG_H // will be shown during bootup in line2 +#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 + +// @section machine // SERIAL_PORT selects which serial port should be used for communication with the host. // This allows the connection of wireless adapters (for instance) to non-default port pins. // Serial port 0 is still used by the Arduino bootloader regardless of this setting. +// :[0,1,2,3,4,5,6,7] #define SERIAL_PORT 0 // This determines the communication speed of the printer diff --git a/Marlin/example_configurations/Felix/Configuration_DUAL.h b/Marlin/example_configurations/Felix/Configuration_DUAL.h index 681c954c35..6f91f8c8b7 100644 --- a/Marlin/example_configurations/Felix/Configuration_DUAL.h +++ b/Marlin/example_configurations/Felix/Configuration_DUAL.h @@ -31,22 +31,31 @@ Here are some standard links for getting your machine calibrated: //=========================================================================== //============================= SCARA Printer =============================== //=========================================================================== -// For a Delta printer replace the configuration files with the files in the +// For a Scara printer replace the configuration files with the files in the // example_configurations/SCARA directory. // +// @section info + +#ifdef HAS_AUTOMATIC_VERSIONING + #include "_Version.h" +#else + #include "Default_Version.h" +#endif + // 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_VERSION "1.0.3 dev" -#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. -#define STRING_SPLASH_LINE1 "v" STRING_VERSION // will be shown during bootup in line 1 -//#define STRING_SPLASH_LINE2 STRING_VERSION_CONFIG_H // will be shown during bootup in line2 +#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 + +// @section machine // SERIAL_PORT selects which serial port should be used for communication with the host. // This allows the connection of wireless adapters (for instance) to non-default port pins. // Serial port 0 is still used by the Arduino bootloader regardless of this setting. +// :[0,1,2,3,4,5,6,7] #define SERIAL_PORT 0 // This determines the communication speed of the printer diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 0b437d107f..bbbb1f4213 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -31,22 +31,31 @@ Here are some standard links for getting your machine calibrated: //=========================================================================== //============================= SCARA Printer =============================== //=========================================================================== -// For a Delta printer replace the configuration files with the files in the +// For a Scara printer replace the configuration files with the files in the // example_configurations/SCARA directory. // +// @section info + +#ifdef HAS_AUTOMATIC_VERSIONING + #include "_Version.h" +#else + #include "Default_Version.h" +#endif + // 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_VERSION "1.0.3 dev" -#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time -#define STRING_CONFIG_H_AUTHOR "(bq Hephestos)" // Who made the changes. -#define STRING_SPLASH_LINE1 "v" STRING_VERSION // will be shown during bootup in line 1 -//#define STRING_SPLASH_LINE2 STRING_VERSION_CONFIG_H // will be shown during bootup in line2 +#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. +#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 + +// @section machine // SERIAL_PORT selects which serial port should be used for communication with the host. // This allows the connection of wireless adapters (for instance) to non-default port pins. // Serial port 0 is still used by the Arduino bootloader regardless of this setting. +// :[0,1,2,3,4,5,6,7] #define SERIAL_PORT 0 // This determines the communication speed of the printer diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 6061e739f8..452d82a755 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -42,14 +42,18 @@ Here are some standard links for getting your machine calibrated: // @section info +#ifdef HAS_AUTOMATIC_VERSIONING + #include "_Version.h" +#else + #include "Default_Version.h" +#endif + // 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_VERSION "1.0.3 dev" -#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #define STRING_CONFIG_H_AUTHOR "(K8200, CONSULitAS)" // Who made the changes. -#define STRING_SPLASH_LINE1 "v" STRING_VERSION // will be shown during bootup in line 1 -//#define STRING_SPLASH_LINE2 STRING_VERSION_CONFIG_H // will be shown during bootup in line2 +#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 // @section machine diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index b98c72437a..c8e6531ef9 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -37,14 +37,18 @@ Here are some standard links for getting your machine calibrated: // @section info +#ifdef HAS_AUTOMATIC_VERSIONING + #include "_Version.h" +#else + #include "Default_Version.h" +#endif + // 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_VERSION "1.0.3 dev" -#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #define STRING_CONFIG_H_AUTHOR "RepRapWorld.com" // Who made the changes. -#define STRING_SPLASH_LINE1 "v" STRING_VERSION // will be shown during bootup in line 1 -//#define STRING_SPLASH_LINE2 STRING_VERSION_CONFIG_H // will be shown during bootup in line2 +#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 // @section machine diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 1d85ac56c3..dfd077adc2 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -21,6 +21,13 @@ Here are some standard links for getting your machine calibrated: // Advanced settings can be found in Configuration_adv.h // BASIC SETTINGS: select your board type, temperature sensor type, axis scaling, and endstop configuration +//=========================================================================== +//============================= DELTA Printer =============================== +//=========================================================================== +// For a Delta printer replace the configuration files with the files in the +// example_configurations/delta directory. +// + //=========================================================================== //========================= SCARA Settings ================================== //=========================================================================== @@ -53,18 +60,27 @@ Here are some standard links for getting your machine calibrated: //========================= SCARA Settings end ============================== //=========================================================================== +// @section info + +#ifdef HAS_AUTOMATIC_VERSIONING + #include "_Version.h" +#else + #include "Default_Version.h" +#endif + // 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_VERSION "1.0.3 dev" -#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. -#define STRING_SPLASH_LINE1 "v" STRING_VERSION // will be shown during bootup in line 1 -//#define STRING_SPLASH_LINE2 STRING_VERSION_CONFIG_H // will be shown during bootup in line2 +#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 + +// @section machine // SERIAL_PORT selects which serial port should be used for communication with the host. // This allows the connection of wireless adapters (for instance) to non-default port pins. // Serial port 0 is still used by the Arduino bootloader regardless of this setting. +// :[0,1,2,3,4,5,6,7] #define SERIAL_PORT 0 // This determines the communication speed of the printer diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 53ce0bad39..c6ecb4d10a 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -31,22 +31,31 @@ Here are some standard links for getting your machine calibrated: //=========================================================================== //============================= SCARA Printer =============================== //=========================================================================== -// For a Delta printer replace the configuration files with the files in the +// For a Scara printer replace the configuration files with the files in the // example_configurations/SCARA directory. // +// @section info + +#ifdef HAS_AUTOMATIC_VERSIONING + #include "_Version.h" +#else + #include "Default_Version.h" +#endif + // 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_VERSION "1.0.3 dev" -#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #define STRING_CONFIG_H_AUTHOR "(bq Witbox)" // Who made the changes. -#define STRING_SPLASH_LINE1 "v" STRING_VERSION // will be shown during bootup in line 1 -//#define STRING_SPLASH_LINE2 STRING_VERSION_CONFIG_H // will be shown during bootup in line2 +#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 + +// @section machine // SERIAL_PORT selects which serial port should be used for communication with the host. // This allows the connection of wireless adapters (for instance) to non-default port pins. // Serial port 0 is still used by the Arduino bootloader regardless of this setting. +// :[0,1,2,3,4,5,6,7] #define SERIAL_PORT 0 // This determines the communication speed of the printer diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index f86b2da382..7a765d133f 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -31,22 +31,31 @@ Here are some standard links for getting your machine calibrated: //=========================================================================== //============================= SCARA Printer =============================== //=========================================================================== -// For a Delta printer replace the configuration files with the files in the +// For a Scara printer replace the configuration files with the files in the // example_configurations/SCARA directory. // +// @section info + +#ifdef HAS_AUTOMATIC_VERSIONING + #include "_Version.h" +#else + #include "Default_Version.h" +#endif + // 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_VERSION "1.0.3 dev" -#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. -#define STRING_SPLASH_LINE1 "v" STRING_VERSION // will be shown during bootup in line 1 -//#define STRING_SPLASH_LINE2 STRING_VERSION_CONFIG_H // will be shown during bootup in line2 +#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 + +// @section machine // SERIAL_PORT selects which serial port should be used for communication with the host. // This allows the connection of wireless adapters (for instance) to non-default port pins. // Serial port 0 is still used by the Arduino bootloader regardless of this setting. +// :[0,1,2,3,4,5,6,7] #define SERIAL_PORT 0 // This determines the communication speed of the printer diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 4820f58909..73d2aae4b1 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -31,22 +31,31 @@ Here are some standard links for getting your machine calibrated: //=========================================================================== //============================= SCARA Printer =============================== //=========================================================================== -// For a Delta printer replace the configuration files with the files in the +// For a Scara printer replace the configuration files with the files in the // example_configurations/SCARA directory. // +// @section info + +#ifdef HAS_AUTOMATIC_VERSIONING + #include "_Version.h" +#else + #include "Default_Version.h" +#endif + // 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_VERSION "1.0.3 dev" -#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. -#define STRING_SPLASH_LINE1 "v" STRING_VERSION // will be shown during bootup in line 1 -//#define STRING_SPLASH_LINE2 STRING_VERSION_CONFIG_H // will be shown during bootup in line2 +#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 + +// @section machine // SERIAL_PORT selects which serial port should be used for communication with the host. // This allows the connection of wireless adapters (for instance) to non-default port pins. // Serial port 0 is still used by the Arduino bootloader regardless of this setting. +// :[0,1,2,3,4,5,6,7] #define SERIAL_PORT 0 // This determines the communication speed of the printer diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index cf8cd0b9d0..e36f71222f 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -31,22 +31,31 @@ Here are some standard links for getting your machine calibrated: //=========================================================================== //============================= SCARA Printer =============================== //=========================================================================== -// For a Delta printer replace the configuration files with the files in the +// For a Scara printer replace the configuration files with the files in the // example_configurations/SCARA directory. // +// @section info + +#ifdef HAS_AUTOMATIC_VERSIONING + #include "_Version.h" +#else + #include "Default_Version.h" +#endif + // 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_VERSION "1.0.3 dev" -#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. -#define STRING_SPLASH_LINE1 "v" STRING_VERSION // will be shown during bootup in line 1 -//#define STRING_SPLASH_LINE2 STRING_VERSION_CONFIG_H // will be shown during bootup in line2 +#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 + +// @section machine // SERIAL_PORT selects which serial port should be used for communication with the host. // This allows the connection of wireless adapters (for instance) to non-default port pins. // Serial port 0 is still used by the Arduino bootloader regardless of this setting. +// :[0,1,2,3,4,5,6,7] #define SERIAL_PORT 0 // This determines the communication speed of the printer diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 3472a46e98..55cb29b25d 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -38,14 +38,15 @@ Here are some standard links for getting your machine calibrated: // For a Scara printer replace the configuration files with the files in the // example_configurations/SCARA directory. // + +// @section info + #ifdef HAS_AUTOMATIC_VERSIONING #include "_Version.h" #else #include "Default_Version.h" #endif -// @section info - // 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. diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index a5f04cf481..d64df72a93 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -31,22 +31,31 @@ Here are some standard links for getting your machine calibrated: //=========================================================================== //============================= SCARA Printer =============================== //=========================================================================== -// For a Delta printer replace the configuration files with the files in the +// For a Scara printer replace the configuration files with the files in the // example_configurations/SCARA directory. // +// @section info + +#ifdef HAS_AUTOMATIC_VERSIONING + #include "_Version.h" +#else + #include "Default_Version.h" +#endif + // 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_VERSION "1.0.3 dev" -#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. -#define STRING_SPLASH_LINE1 "v" STRING_VERSION // will be shown during bootup in line 1 -//#define STRING_SPLASH_LINE2 STRING_VERSION_CONFIG_H // will be shown during bootup in line2 +#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 + +// @section machine // SERIAL_PORT selects which serial port should be used for communication with the host. // This allows the connection of wireless adapters (for instance) to non-default port pins. // Serial port 0 is still used by the Arduino bootloader regardless of this setting. +// :[0,1,2,3,4,5,6,7] #define SERIAL_PORT 0 // This determines the communication speed of the printer diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 92ed23f2f1..63d8b61c5c 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -31,22 +31,31 @@ Here are some standard links for getting your machine calibrated: //=========================================================================== //============================= SCARA Printer =============================== //=========================================================================== -// For a Delta printer replace the configuration files with the files in the +// For a Scara printer replace the configuration files with the files in the // example_configurations/SCARA directory. // +// @section info + +#ifdef HAS_AUTOMATIC_VERSIONING + #include "_Version.h" +#else + #include "Default_Version.h" +#endif + // 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_VERSION "1.0.3 dev" -#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. -#define STRING_SPLASH_LINE1 "v" STRING_VERSION // will be shown during bootup in line 1 -//#define STRING_SPLASH_LINE2 STRING_VERSION_CONFIG_H // will be shown during bootup in line2 +#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 + +// @section machine // SERIAL_PORT selects which serial port should be used for communication with the host. // This allows the connection of wireless adapters (for instance) to non-default port pins. // Serial port 0 is still used by the Arduino bootloader regardless of this setting. +// :[0,1,2,3,4,5,6,7] #define SERIAL_PORT 0 // This determines the communication speed of the printer From b5743d6927a0c6e82d5373efcf867275457bfdc9 Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Fri, 22 May 2015 20:27:26 -0500 Subject: [PATCH 2/3] Use SOURCE_CODE_URL rather than FIRMWARE_URL --- Marlin/Default_Version.h | 2 +- Marlin/configurator/config/language.h | 14 +++++++------- .../Hephestos/Configuration.h | 2 +- .../example_configurations/WITBOX/Configuration.h | 2 +- Marlin/language.h | 14 +++++++------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Marlin/Default_Version.h b/Marlin/Default_Version.h index c9b5abacba..56a38bc559 100644 --- a/Marlin/Default_Version.h +++ b/Marlin/Default_Version.h @@ -8,5 +8,5 @@ #define BUILD_VERSION "1.1.0 dev" #define STRING_DISTRIBUTION_DATE "2015-06-00 12:00" // It might also be appropriate to define a location where additional information can be found - #define FIRMWARE_URL "http:// ..." + #define SOURCE_CODE_URL "http:// ..." #endif \ No newline at end of file diff --git a/Marlin/configurator/config/language.h b/Marlin/configurator/config/language.h index 856bd58db5..5d3d33155d 100644 --- a/Marlin/configurator/config/language.h +++ b/Marlin/configurator/config/language.h @@ -45,20 +45,20 @@ #if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2) #define MACHINE_NAME "Ultimaker" - #define FIRMWARE_URL "http://firmware.ultimaker.com" + #define SOURCE_CODE_URL "http://firmware.ultimaker.com" #elif MB(RUMBA) #define MACHINE_NAME "Rumba" #elif MB(3DRAG) #define MACHINE_NAME "3Drag" - #define FIRMWARE_URL "http://3dprint.elettronicain.it/" + #define SOURCE_CODE_URL "http://3dprint.elettronicain.it/" #elif MB(K8200) #define MACHINE_NAME "K8200" - #define FIRMWARE_URL "https://github.com/CONSULitAS/Marlin-K8200" + #define SOURCE_CODE_URL "https://github.com/CONSULitAS/Marlin-K8200" #elif MB(5DPRINT) #define MACHINE_NAME "Makibox" #elif MB(SAV_MKI) #define MACHINE_NAME "SAV MkI" - #define FIRMWARE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config" + #define SOURCE_CODE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config" #elif !defined(MACHINE_NAME) #define MACHINE_NAME "3D Printer" #endif @@ -73,8 +73,8 @@ #define MACHINE_NAME CUSTOM_MACHINE_NAME #endif -#ifndef FIRMWARE_URL - #define FIRMWARE_URL "https://github.com/MarlinFirmware/Marlin" +#ifndef SOURCE_CODE_URL + #define SOURCE_CODE_URL "https://github.com/MarlinFirmware/Marlin" #endif #ifndef BUILD_VERSION @@ -132,7 +132,7 @@ #define MSG_HEATING_COMPLETE "Heating done." #define MSG_BED_HEATING "Bed Heating." #define MSG_BED_DONE "Bed done." -#define MSG_M115_REPORT "FIRMWARE_NAME:Marlin " BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n" +#define MSG_M115_REPORT "FIRMWARE_NAME:Marlin " 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 MSG_COUNT_X " Count X: " #define MSG_ERR_KILLED "Printer halted. kill() called!" #define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index bbbb1f4213..d8ee933962 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -73,7 +73,7 @@ Here are some standard links for getting your machine calibrated: #define CUSTOM_MACHINE_NAME "HEPHESTOS" // Added for BQ -#define FIRMWARE_URL "http://www.bq.com/gb/downloads-prusa-i3-hephestos.html" +#define SOURCE_CODE_URL "http://www.bq.com/gb/downloads-prusa-i3-hephestos.html" // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index c6ecb4d10a..5d5f68532d 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -73,7 +73,7 @@ Here are some standard links for getting your machine calibrated: #define CUSTOM_MACHINE_NAME "WITBOX" // Added for BQ -#define FIRMWARE_URL "http://www.bq.com/gb/downloads-witbox.html" +#define SOURCE_CODE_URL "http://www.bq.com/gb/downloads-witbox.html" // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) diff --git a/Marlin/language.h b/Marlin/language.h index 22e1131174..d5e51e1285 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -46,20 +46,20 @@ #if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2) #define MACHINE_NAME "Ultimaker" - #define FIRMWARE_URL "http://firmware.ultimaker.com" + #define SOURCE_CODE_URL "http://firmware.ultimaker.com" #elif MB(RUMBA) #define MACHINE_NAME "Rumba" #elif MB(3DRAG) #define MACHINE_NAME "3Drag" - #define FIRMWARE_URL "http://3dprint.elettronicain.it/" + #define SOURCE_CODE_URL "http://3dprint.elettronicain.it/" #elif MB(K8200) #define MACHINE_NAME "K8200" - #define FIRMWARE_URL "https://github.com/CONSULitAS/Marlin-K8200" + #define SOURCE_CODE_URL "https://github.com/CONSULitAS/Marlin-K8200" #elif MB(5DPRINT) #define MACHINE_NAME "Makibox" #elif MB(SAV_MKI) #define MACHINE_NAME "SAV MkI" - #define FIRMWARE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config" + #define SOURCE_CODE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config" #elif !defined(MACHINE_NAME) #define MACHINE_NAME "3D Printer" #endif @@ -74,8 +74,8 @@ #define MACHINE_NAME CUSTOM_MACHINE_NAME #endif -#ifndef FIRMWARE_URL - #define FIRMWARE_URL "https://github.com/MarlinFirmware/Marlin" +#ifndef SOURCE_CODE_URL + #define SOURCE_CODE_URL "https://github.com/MarlinFirmware/Marlin" #endif #ifndef BUILD_VERSION @@ -133,7 +133,7 @@ #define MSG_HEATING_COMPLETE "Heating done." #define MSG_BED_HEATING "Bed Heating." #define MSG_BED_DONE "Bed done." -#define MSG_M115_REPORT "FIRMWARE_NAME:Marlin " BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n" +#define MSG_M115_REPORT "FIRMWARE_NAME:Marlin " 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 MSG_COUNT_X " Count X: " #define MSG_ERR_KILLED "Printer halted. kill() called!" #define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" From 2deb5a8ac5c946132f92c86ca428ab7f7e1d7122 Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Fri, 22 May 2015 20:58:37 -0500 Subject: [PATCH 3/3] Temporary Hack REVERT THIS CHANGE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In proper use, we want to force the vendor to update this file to reflect distribution parameters However, until most users have converted to automatic versioning, we “grant them a pass” --- Marlin/Default_Version.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Marlin/Default_Version.h b/Marlin/Default_Version.h index 56a38bc559..c7508d215e 100644 --- a/Marlin/Default_Version.h +++ b/Marlin/Default_Version.h @@ -2,9 +2,10 @@ * This file is a placeholder for a file which could be distributed in an archive * It takes the place of an automatically created "_Version.h" which is generated during the build process */ -#error "You must specify the following parameter related to your distribution" -#if false +// #error "You must specify the following parameter related to your distribution" + +#if true #define BUILD_VERSION "1.1.0 dev" #define STRING_DISTRIBUTION_DATE "2015-06-00 12:00" // It might also be appropriate to define a location where additional information can be found