Merge pull request #2146 from Wackerbarth/Versioning

Versioning
This commit is contained in:
AnHardt
2015-06-02 18:31:21 +02:00
19 changed files with 215 additions and 88 deletions

View File

@ -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