From 170f7e8a4569f30dcbf423f39b858a015da2c1f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= Date: Fri, 22 Apr 2016 16:07:26 +0100 Subject: [PATCH 1/4] Rework Marlin's versioning system --- .../bin/generate_version_header_for_marlin | 10 ++- Marlin/Configuration.h | 2 +- Marlin/Default_Version.h | 36 --------- Marlin/SanityCheck.h | 35 +++++++++ Marlin/Version.h | 74 +++++++++++++++++++ Marlin/language.h | 39 ++++------ 6 files changed, 132 insertions(+), 64 deletions(-) delete mode 100644 Marlin/Default_Version.h create mode 100644 Marlin/Version.h diff --git a/LinuxAddons/bin/generate_version_header_for_marlin b/LinuxAddons/bin/generate_version_header_for_marlin index a7bef9a5a..7160b7778 100755 --- a/LinuxAddons/bin/generate_version_header_for_marlin +++ b/LinuxAddons/bin/generate_version_header_for_marlin @@ -9,8 +9,16 @@ echo " * It does not get committed to the repository" >>"$OUTFILE" echo " */" >>"$OUTFILE" echo "" >>"$OUTFILE" +echo "#define PROTOCOL_VERSION \"1.0\"" >>"$OUTFILE" +echo "#define DEFAULT_SOURCE_URL \"https://github.com/MarlinFirmware/Marlin\"" >>"$OUTFILE" +echo "#define DEFAULT_MACHINE_NAME \"Travis 3D Printer\"" >>"$OUTFILE" +echo "#define DEFAULT_MACHINE_UUID \"3442baa1-08ee-435b-8a10-99d185bd43b8\"" >>"$OUTFILE" +echo "" >>"$OUTFILE" + echo "#define BUILD_UNIX_DATETIME" `date +%s` >>"$OUTFILE" echo "#define STRING_DISTRIBUTION_DATE" `date '+"%Y-%m-%d %H:%M"'` >>"$OUTFILE" +echo "" >>"$OUTFILE" + ( set +e cd "$DIR" BRANCH=`git symbolic-ref -q --short HEAD` @@ -33,7 +41,5 @@ echo "#define STRING_DISTRIBUTION_DATE" `date '+"%Y-%m-%d %H:%M"'` >>"$OUTFILE" URL=`git config --local --get remote.origin.url | sed "sx.*github.com.xhttps://github.com/x" | sed "sx\.gitx/x"` if [ "x$URL" != "x" ] ; then echo "#define SOURCE_CODE_URL \""$URL"\"" >>"$OUTFILE" - echo "// Deprecated URL definition" >>"$OUTFILE" - echo "#define FIRMWARE_URL \""$URL"\"" >>"$OUTFILE" fi ) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 97add8a21..edbeb44ab 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -76,7 +76,7 @@ #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else - #include "Default_Version.h" + #include "Version.h" #endif // User-specified version info of this build to display in [Pronterface, etc] terminal window during diff --git a/Marlin/Default_Version.h b/Marlin/Default_Version.h deleted file mode 100644 index 95f37f255..000000000 --- a/Marlin/Default_Version.h +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Marlin 3D Printer Firmware - * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] - * - * Based on Sprinter and grbl. - * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * 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 parameters related to your distribution" - -#if true -#define SHORT_BUILD_VERSION "1.1.0-RCBugFix" -#define DETAILED_BUILD_VERSION "1.1.0-RCBugFix From Archive" -#define STRING_DISTRIBUTION_DATE "2016-04-16 12:00" -// It might also be appropriate to define a location where additional information can be found -// #define SOURCE_CODE_URL "http:// ..." -#endif diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index 221c42eb5..89b77578a 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -38,6 +38,41 @@ #error Versions of Arduino IDE prior to 1.6.0 are no longer supported, please update your toolkit. #endif +/** + * Marlin release, version and default string + */ +#ifndef SHORT_BUILD_VERSION + #error SHORT_BUILD_VERSION Information must be specified +#endif + +#ifndef DETAILED_BUILD_VERSION + #error BUILD_VERSION Information must be specified +#endif + +#ifndef STRING_DISTRIBUTION_DATE + #error STRING_DISTRIBUTION_DATE Information must be specified +#endif + +#ifndef PROTOCOL_VERSION + #error PROTOCOL_VERSION Information must be specified +#endif + +#ifndef MACHINE_NAME + #error MACHINE_NAME Information must be specified +#endif + +#ifndef SOURCE_CODE_URL + #error SOURCE_CODE_URL Information must be specified +#endif + +#ifndef DEFAULT_MACHINE_UUID + #error DEFAULT_MACHINE_UUID Information must be specified +#endif + +#ifndef WEBSITE_URL + #error WEBSITE_URL Information must be specified +#endif + /** * Dual Stepper Drivers */ diff --git a/Marlin/Version.h b/Marlin/Version.h new file mode 100644 index 000000000..d8926d5cf --- /dev/null +++ b/Marlin/Version.h @@ -0,0 +1,74 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] + * + * Based on Sprinter and grbl. + * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +/** + * This file is the standard Marlin version identifier file, all fields can be + * overriden by the ones defined on _Version.h by using the Configuration.h + * directive USE_AUTOMATIC_VERSIONING. + */ + +/** + * Marlin release version identifier + */ +#define SHORT_BUILD_VERSION "1.1.0-RCBugFix" + +/** + * 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)" + +/** + * 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 "2016-04-16 12:00" + +/** + * @todo: Missing documentation block + */ +#define PROTOCOL_VERSION "1.0" + +/** + * Defines a generic printer name to be output to the LCD after booting Marlin. + */ +#define MACHINE_NAME "3D Printer" + +/** + * The SOURCE_CODE_URL is the location where users will find the Marlin Source + * Code which is installed on the device. In most cases —unless the manufacturer + * 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" + +/** + * Default generic printer UUID. + */ +#define DEFAULT_MACHINE_UUID "cede2a2f-41a2-4748-9b12-c55c62f367ff" + +/** + * The WEBSITE_URL is the location where users can get more information such as + * documentation about a specific Marlin release. + */ +#define WEBSITE_URL "http://marlinfw.org" diff --git a/Marlin/language.h b/Marlin/language.h index 0bbae448b..e9a30a2d7 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -66,43 +66,32 @@ #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else - #include "Default_Version.h" + #include "Version.h" #endif -#define PROTOCOL_VERSION "1.0" - -#ifndef DEFAULT_MACHINE_NAME - #define DEFAULT_MACHINE_NAME "3D Printer" +#ifdef DEFAULT_SOURCE_CODE_URL + #undef SOURCE_CODE_URL + #define SOURCE_CODE_URL DEFAULT_SOURCE_CODE_URL #endif #ifdef CUSTOM_MACHINE_NAME + #undef MACHINE_NAME #define MACHINE_NAME CUSTOM_MACHINE_NAME #else - #define MACHINE_NAME DEFAULT_MACHINE_NAME -#endif - -#ifndef DEFAULT_SOURCE_URL - /** - * The SOURCE_CODE_URL is the location where users will find the Marlin Source - * Code which is installed on the device. In most cases —unless the manufacturer - * has a distinct Github fork— the Source Code URL should just be the main - * Marlin repository. - */ - #define DEFAULT_SOURCE_URL "https://github.com/MarlinFirmware/Marlin" -#endif - -#ifndef SOURCE_CODE_URL - #define SOURCE_CODE_URL DEFAULT_SOURCE_URL -#endif - -#ifndef DETAILED_BUILD_VERSION - #error BUILD_VERSION Information must be specified + #ifdef DEFAULT_MACHINE_NAME + #undef MACHINE_NAME + #define MACHINE_NAME DEFAULT_MACHINE_NAME + #endif #endif #ifndef MACHINE_UUID - #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" + #define MACHINE_UUID DEFAULT_MACHINE_UUID #endif +#ifdef DEFAULT_WEBSITE_URL + #undef WEBSITE_URL + #define WEBSITE_URL DEFAULT_WEBSITE_URL +#endif // Common LCD messages From 3b6f75511f1ddda77ed3143cb883587e215dbf42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= Date: Sun, 24 Apr 2016 05:19:51 +0100 Subject: [PATCH 2/4] Updated multiple pins files --- Marlin/pins_3DRAG.h | 4 ++-- Marlin/pins_K8200.h | 8 ++++---- Marlin/pins_SAV_MKI.h | 4 ++-- Marlin/pins_ULTIMAIN_2.h | 4 ++-- Marlin/pins_ULTIMAKER.h | 4 ++-- Marlin/pins_ULTIMAKER_OLD.h | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Marlin/pins_3DRAG.h b/Marlin/pins_3DRAG.h index 969f4055e..9de52e389 100644 --- a/Marlin/pins_3DRAG.h +++ b/Marlin/pins_3DRAG.h @@ -26,8 +26,8 @@ #include "pins_RAMPS_14.h" -#define DEFAULT_MACHINE_NAME "3Drag" -#define DEFAULT_SOURCE_URL "http://3dprint.elettronicain.it/" +#define DEFAULT_MACHINE_NAME "3Drag" +#define DEFAULT_SOURCE_CODE_URL "http://3dprint.elettronicain.it/" #undef Z_ENABLE_PIN #define Z_ENABLE_PIN 63 diff --git a/Marlin/pins_K8200.h b/Marlin/pins_K8200.h index f02300dc8..ac65297eb 100644 --- a/Marlin/pins_K8200.h +++ b/Marlin/pins_K8200.h @@ -27,8 +27,8 @@ #include "pins_3DRAG.h" -#undef DEFAULT_MACHINE_NAME -#define DEFAULT_MACHINE_NAME "K8200" +#undef DEFAULT_MACHINE_NAME +#define DEFAULT_MACHINE_NAME "K8200" -#undef DEFAULT_SOURCE_URL -#define DEFAULT_SOURCE_URL "https://github.com/CONSULitAS/Marlin-K8200" +#undef DEFAULT_SOURCE_CODE_URL +#define DEFAULT_SOURCE_CODE_URL "https://github.com/CONSULitAS/Marlin-K8200" diff --git a/Marlin/pins_SAV_MKI.h b/Marlin/pins_SAV_MKI.h index eb033fb28..579d653e0 100644 --- a/Marlin/pins_SAV_MKI.h +++ b/Marlin/pins_SAV_MKI.h @@ -31,8 +31,8 @@ #error Oops! Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu. #endif -#define DEFAULT_MACHINE_NAME "SAV MkI" -#define DEFAULT_SOURCE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config" +#define DEFAULT_MACHINE_NAME "SAV MkI" +#define DEFAULT_SOURCE_CODE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config" #define LARGE_FLASH true diff --git a/Marlin/pins_ULTIMAIN_2.h b/Marlin/pins_ULTIMAIN_2.h index 6da36661a..8682a54fc 100644 --- a/Marlin/pins_ULTIMAIN_2.h +++ b/Marlin/pins_ULTIMAIN_2.h @@ -28,8 +28,8 @@ #error Oops! Make sure you have 'Arduino Mega 2560' selected from the 'Tools -> Boards' menu. #endif -#define DEFAULT_MACHINE_NAME "Ultimaker" -#define DEFAULT_SOURCE_URL "https://github.com/Ultimaker/Marlin" +#define DEFAULT_MACHINE_NAME "Ultimaker" +#define DEFAULT_SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin" #define X_STEP_PIN 25 #define X_DIR_PIN 23 diff --git a/Marlin/pins_ULTIMAKER.h b/Marlin/pins_ULTIMAKER.h index b5a10057c..ab7a5da83 100644 --- a/Marlin/pins_ULTIMAKER.h +++ b/Marlin/pins_ULTIMAKER.h @@ -28,8 +28,8 @@ #error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu. #endif -#define DEFAULT_MACHINE_NAME "Ultimaker" -#define DEFAULT_SOURCE_URL "https://github.com/Ultimaker/Marlin" +#define DEFAULT_MACHINE_NAME "Ultimaker" +#define DEFAULT_SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin" #define LARGE_FLASH true diff --git a/Marlin/pins_ULTIMAKER_OLD.h b/Marlin/pins_ULTIMAKER_OLD.h index 4f015f7e7..e2d48e67d 100644 --- a/Marlin/pins_ULTIMAKER_OLD.h +++ b/Marlin/pins_ULTIMAKER_OLD.h @@ -28,8 +28,8 @@ #error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu. #endif -#define DEFAULT_MACHINE_NAME "Ultimaker" -#define DEFAULT_SOURCE_URL "https://github.com/Ultimaker/Marlin" +#define DEFAULT_MACHINE_NAME "Ultimaker" +#define DEFAULT_SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin" #define LARGE_FLASH true From 7de0161204171eecac6a39e2f54cf540282930e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= Date: Sun, 24 Apr 2016 05:20:17 +0100 Subject: [PATCH 3/4] Updated example config files --- Marlin/example_configurations/Felix/Configuration.h | 4 ++-- Marlin/example_configurations/Felix/Configuration_DUAL.h | 4 ++-- Marlin/example_configurations/Hephestos/Configuration.h | 4 ++-- Marlin/example_configurations/Hephestos_2/Configuration.h | 4 ++-- Marlin/example_configurations/K8200/Configuration.h | 4 ++-- .../RepRapWorld/Megatronics/Configuration.h | 4 ++-- Marlin/example_configurations/RigidBot/Configuration.h | 4 ++-- Marlin/example_configurations/SCARA/Configuration.h | 4 ++-- Marlin/example_configurations/TAZ4/Configuration.h | 4 ++-- Marlin/example_configurations/WITBOX/Configuration.h | 4 ++-- Marlin/example_configurations/adafruit/ST7565/Configuration.h | 4 ++-- Marlin/example_configurations/delta/biv2.5/Configuration.h | 4 ++-- Marlin/example_configurations/delta/generic/Configuration.h | 4 ++-- .../example_configurations/delta/kossel_mini/Configuration.h | 4 ++-- .../example_configurations/delta/kossel_pro/Configuration.h | 2 +- Marlin/example_configurations/delta/kossel_xl/Configuration.h | 2 +- Marlin/example_configurations/makibox/Configuration.h | 4 ++-- Marlin/example_configurations/tvrrug/Round2/Configuration.h | 4 ++-- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index 11488685e..1cdefc2bc 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -76,7 +76,7 @@ #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else - #include "Default_Version.h" + #include "Version.h" #endif // User-specified version info of this build to display in [Pronterface, etc] terminal window during @@ -586,7 +586,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // O-- FRONT --+ // (0,0) #define X_PROBE_OFFSET_FROM_EXTRUDER -25 // X offset: -left +right [of the nozzle] - #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] + #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle] #define XY_TRAVEL_SPEED 8000 // X and Y axis travel speed between probes, in mm/min. diff --git a/Marlin/example_configurations/Felix/Configuration_DUAL.h b/Marlin/example_configurations/Felix/Configuration_DUAL.h index c5113004c..3707f72a4 100644 --- a/Marlin/example_configurations/Felix/Configuration_DUAL.h +++ b/Marlin/example_configurations/Felix/Configuration_DUAL.h @@ -76,7 +76,7 @@ #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else - #include "Default_Version.h" + #include "Version.h" #endif // User-specified version info of this build to display in [Pronterface, etc] terminal window during @@ -583,7 +583,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // O-- FRONT --+ // (0,0) #define X_PROBE_OFFSET_FROM_EXTRUDER -25 // X offset: -left +right [of the nozzle] - #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] + #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle] #define XY_TRAVEL_SPEED 8000 // X and Y axis travel speed between probes, in mm/min. diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index adf056e6a..395bb8e76 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -76,7 +76,7 @@ #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else - #include "Default_Version.h" + #include "Version.h" #endif // User-specified version info of this build to display in [Pronterface, etc] terminal window during @@ -596,7 +596,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // O-- FRONT --+ // (0,0) #define X_PROBE_OFFSET_FROM_EXTRUDER -25 // X offset: -left +right [of the nozzle] - #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] + #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle] #define XY_TRAVEL_SPEED 8000 // X and Y axis travel speed between probes, in mm/min. diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h index 866556d6a..0dbb1d763 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration.h @@ -76,7 +76,7 @@ #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else - #include "Default_Version.h" + #include "Version.h" #endif // User-specified version info of this build to display in [Pronterface, etc] terminal window during @@ -598,7 +598,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // O-- FRONT --+ // (0,0) #define X_PROBE_OFFSET_FROM_EXTRUDER 34 // X offset: -left +right [of the nozzle] - #define Y_PROBE_OFFSET_FROM_EXTRUDER 15 // Y offset: -front +behind [the nozzle] + #define Y_PROBE_OFFSET_FROM_EXTRUDER 15 // Y offset: -front +behind [the nozzle] #define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle] #define XY_TRAVEL_SPEED 8000 // X and Y axis travel speed between probes, in mm/min. diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 4480757fe..e7ceafeff 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -83,7 +83,7 @@ #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else - #include "Default_Version.h" + #include "Version.h" #endif // User-specified version info of this build to display in [Pronterface, etc] terminal window during @@ -621,7 +621,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // O-- FRONT --+ // (0,0) #define X_PROBE_OFFSET_FROM_EXTRUDER -25 // X offset: -left +right [of the nozzle] - #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] + #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle] #define XY_TRAVEL_SPEED 8000 // X and Y axis travel speed between probes, in mm/min. diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index b8bbfe459..3f6208345 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -76,7 +76,7 @@ #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else - #include "Default_Version.h" + #include "Version.h" #endif // User-specified version info of this build to display in [Pronterface, etc] terminal window during @@ -604,7 +604,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // O-- FRONT --+ // (0,0) #define X_PROBE_OFFSET_FROM_EXTRUDER -25 // X offset: -left +right [of the nozzle] - #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] + #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle] #define XY_TRAVEL_SPEED 8000 // X and Y axis travel speed between probes, in mm/min. diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index f147f7caf..82b66ef9d 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -76,7 +76,7 @@ #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else - #include "Default_Version.h" + #include "Version.h" #endif // User-specified version info of this build to display in [Pronterface, etc] terminal window during @@ -598,7 +598,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // O-- FRONT --+ // (0,0) #define X_PROBE_OFFSET_FROM_EXTRUDER -25 // X offset: -left +right [of the nozzle] - #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] + #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle] #define XY_TRAVEL_SPEED 8000 // X and Y axis travel speed between probes, in mm/min. diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 8fc4e22cc..808bf7e62 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -101,7 +101,7 @@ #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else - #include "Default_Version.h" + #include "Version.h" #endif // User-specified version info of this build to display in [Pronterface, etc] terminal window during @@ -612,7 +612,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // O-- FRONT --+ // (0,0) #define X_PROBE_OFFSET_FROM_EXTRUDER -25 // X offset: -left +right [of the nozzle] - #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] + #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle] #define XY_TRAVEL_SPEED 8000 // X and Y axis travel speed between probes, in mm/min. diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index 3f68ad16b..6c8165ea0 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -76,7 +76,7 @@ #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else - #include "Default_Version.h" + #include "Version.h" #endif // User-specified version info of this build to display in [Pronterface, etc] terminal window during @@ -625,7 +625,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // O-- FRONT --+ // (0,0) #define X_PROBE_OFFSET_FROM_EXTRUDER -25 // X offset: -left +right [of the nozzle] - #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] + #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle] #define XY_TRAVEL_SPEED 8000 // X and Y axis travel speed between probes, in mm/min. diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 79469c788..434143e38 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -76,7 +76,7 @@ #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else - #include "Default_Version.h" + #include "Version.h" #endif // User-specified version info of this build to display in [Pronterface, etc] terminal window during @@ -596,7 +596,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // O-- FRONT --+ // (0,0) #define X_PROBE_OFFSET_FROM_EXTRUDER -25 // X offset: -left +right [of the nozzle] - #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] + #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle] #define XY_TRAVEL_SPEED 8000 // X and Y axis travel speed between probes, in mm/min. diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 34933b774..f941bb0d1 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -76,7 +76,7 @@ #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else - #include "Default_Version.h" + #include "Version.h" #endif // User-specified version info of this build to display in [Pronterface, etc] terminal window during @@ -604,7 +604,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // O-- FRONT --+ // (0,0) #define X_PROBE_OFFSET_FROM_EXTRUDER -25 // X offset: -left +right [of the nozzle] - #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] + #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle] #define XY_TRAVEL_SPEED 8000 // X and Y axis travel speed between probes, in mm/min. diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index 561b0acdf..40d6e9af8 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -76,7 +76,7 @@ #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else - #include "Default_Version.h" + #include "Version.h" #endif // User-specified version info of this build to display in [Pronterface, etc] terminal window during @@ -650,7 +650,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // O-- FRONT --+ // (0,0) #define X_PROBE_OFFSET_FROM_EXTRUDER 0 // X offset: -left +right [of the nozzle] - #define Y_PROBE_OFFSET_FROM_EXTRUDER -10 // Y offset: -front +behind [the nozzle] + #define Y_PROBE_OFFSET_FROM_EXTRUDER -10 // Y offset: -front +behind [the nozzle] #define Z_PROBE_OFFSET_FROM_EXTRUDER -3.5 // Z offset: -below +above [the nozzle] #define XY_TRAVEL_SPEED 4000 // X and Y axis travel speed between probes, in mm/min. diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 1ccee086b..c492573f5 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -76,7 +76,7 @@ #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else - #include "Default_Version.h" + #include "Version.h" #endif // User-specified version info of this build to display in [Pronterface, etc] terminal window during @@ -650,7 +650,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // O-- FRONT --+ // (0,0) #define X_PROBE_OFFSET_FROM_EXTRUDER 0 // X offset: -left +right [of the nozzle] - #define Y_PROBE_OFFSET_FROM_EXTRUDER -10 // Y offset: -front +behind [the nozzle] + #define Y_PROBE_OFFSET_FROM_EXTRUDER -10 // Y offset: -front +behind [the nozzle] #define Z_PROBE_OFFSET_FROM_EXTRUDER -3.5 // Z offset: -below +above [the nozzle] #define XY_TRAVEL_SPEED 4000 // X and Y axis travel speed between probes, in mm/min. diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index c3e3e3c40..e77eb3379 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -76,7 +76,7 @@ #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else - #include "Default_Version.h" + #include "Version.h" #endif // User-specified version info of this build to display in [Pronterface, etc] terminal window during @@ -650,7 +650,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // O-- FRONT --+ // (0,0) #define X_PROBE_OFFSET_FROM_EXTRUDER 0 // X offset: -left +right [of the nozzle] - #define Y_PROBE_OFFSET_FROM_EXTRUDER -10 // Y offset: -front +behind [the nozzle] + #define Y_PROBE_OFFSET_FROM_EXTRUDER -10 // Y offset: -front +behind [the nozzle] #define Z_PROBE_OFFSET_FROM_EXTRUDER -3.5 // Z offset: -below +above [the nozzle] #define XY_TRAVEL_SPEED 4000 // X and Y axis travel speed between probes, in mm/min. diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 372183972..b5c9c76c6 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -82,7 +82,7 @@ #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else - #include "Default_Version.h" + #include "Version.h" #endif // User-specified version info of this build to display in [Pronterface, etc] terminal window during diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index 483aa78a8..943443fb4 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -69,7 +69,7 @@ #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else - #include "Default_Version.h" + #include "Version.h" #endif // User-specified version info of this build to display in [Pronterface, etc] terminal window during diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 2f5cfce4f..2b414100f 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -76,7 +76,7 @@ #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else - #include "Default_Version.h" + #include "Version.h" #endif // User-specified version info of this build to display in [Pronterface, etc] terminal window during @@ -607,7 +607,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // O-- FRONT --+ // (0,0) #define X_PROBE_OFFSET_FROM_EXTRUDER -25 // X offset: -left +right [of the nozzle] - #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] + #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle] #define XY_TRAVEL_SPEED 8000 // X and Y axis travel speed between probes, in mm/min. diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 514fbef33..59cfe714d 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -76,7 +76,7 @@ #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else - #include "Default_Version.h" + #include "Version.h" #endif // User-specified version info of this build to display in [Pronterface, etc] terminal window during @@ -594,7 +594,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // O-- FRONT --+ // (0,0) #define X_PROBE_OFFSET_FROM_EXTRUDER -25 // X offset: -left +right [of the nozzle] - #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] + #define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle] #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle] #define XY_TRAVEL_SPEED 8000 // X and Y axis travel speed between probes, in mm/min. From aa7a65e613e6339b07b29fbd65dec77d31eaf145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= Date: Sun, 24 Apr 2016 05:43:29 +0100 Subject: [PATCH 4/4] Updated travis config --- .../bin/generate_version_header_for_marlin | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/LinuxAddons/bin/generate_version_header_for_marlin b/LinuxAddons/bin/generate_version_header_for_marlin index 7160b7778..539a3fe5a 100755 --- a/LinuxAddons/bin/generate_version_header_for_marlin +++ b/LinuxAddons/bin/generate_version_header_for_marlin @@ -3,24 +3,29 @@ DIR="$1" export DIR OUTFILE="$2" export OUTFILE -echo "/* This file is automatically generated by an Arduino hook" >"$OUTFILE" -echo " * Do not manually edit it" >>"$OUTFILE" -echo " * It does not get committed to the repository" >>"$OUTFILE" -echo " */" >>"$OUTFILE" -echo "" >>"$OUTFILE" - -echo "#define PROTOCOL_VERSION \"1.0\"" >>"$OUTFILE" -echo "#define DEFAULT_SOURCE_URL \"https://github.com/MarlinFirmware/Marlin\"" >>"$OUTFILE" -echo "#define DEFAULT_MACHINE_NAME \"Travis 3D Printer\"" >>"$OUTFILE" -echo "#define DEFAULT_MACHINE_UUID \"3442baa1-08ee-435b-8a10-99d185bd43b8\"" >>"$OUTFILE" -echo "" >>"$OUTFILE" - -echo "#define BUILD_UNIX_DATETIME" `date +%s` >>"$OUTFILE" -echo "#define STRING_DISTRIBUTION_DATE" `date '+"%Y-%m-%d %H:%M"'` >>"$OUTFILE" -echo "" >>"$OUTFILE" + +BUILDATE=$(date '+"%s"') +DISTDATE=$(date '+"%Y-%m-%d %H:%M"') + + +cat > "$OUTFILE" <>"$OUTFILE" else BRANCH=" $BRANCH" fi + VERSION=`git describe --tags --first-parent 2>/dev/null` if [ "x$VERSION" != "x" ] ; then echo "#define SHORT_BUILD_VERSION \"$VERSION\"" | sed "s/-.*/$BRANCH\"/" >>"$OUTFILE" @@ -38,8 +44,4 @@ echo "" >>"$OUTFILE" echo "#define SHORT_BUILD_VERSION \"$BRANCH\"" >>"$OUTFILE" echo "#define DETAILED_BUILD_VERSION \"${BRANCH}-$VERSION\"" >>"$OUTFILE" fi - URL=`git config --local --get remote.origin.url | sed "sx.*github.com.xhttps://github.com/x" | sed "sx\.gitx/x"` - if [ "x$URL" != "x" ] ; then - echo "#define SOURCE_CODE_URL \""$URL"\"" >>"$OUTFILE" - fi )