forksand
/
marlin-lulzbot-laser
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Canonize Option flag USE_AUTOMATIC_VERSION

Browse Source
master
Richard Wackerbarth 9 years ago
parent a8db0aac32
commit 329acc852e
21 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File

2
ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr/platform.local.txt
Unescape View File

@ -1,4 +1,4 @@
compiler.cpp.extra_flags=-DHAS_AUTOMATIC_VERSIONING compiler.cpp.extra_flags=-DUSE_AUTOMATIC_VERSIONING
build.custom_bin.path.macosx=/usr/local/bin/ build.custom_bin.path.macosx=/usr/local/bin/
build.custom_bin.path.linux= build.custom_bin.path.linux=
recipe.hooks.prebuild0.pattern={build.custom_bin.path}generate_version_header_for_marlin "{build.source.path}" "{build.path}/_Version.h" recipe.hooks.prebuild0.pattern={build.custom_bin.path}generate_version_header_for_marlin "{build.source.path}" "{build.path}/_Version.h"

2
Marlin/Configuration.h
Unescape View File

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

4
Marlin/SanityCheck.h
Unescape View File

@ -382,4 +382,8 @@
#error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME instead #error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME instead
#endif #endif
#ifdef HAS_AUTOMATIC_VERSIONING
#error HAS_AUTOMATIC_VERSIONING deprecated - use USE_AUTOMATIC_VERSIONING instead
#endif
#endif //SANITYCHECK_H #endif //SANITYCHECK_H

2
Marlin/configurator/config/Configuration.h
Unescape View File

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

2
Marlin/configurator/config/language.h
Unescape View File

@ -38,7 +38,7 @@
#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
#endif #endif
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#endif #endif

2
Marlin/example_configurations/Felix/Configuration.h
Unescape View File

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

2
Marlin/example_configurations/Felix/Configuration_DUAL.h
Unescape View File

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

2
Marlin/example_configurations/Hephestos/Configuration.h
Unescape View File

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

2
Marlin/example_configurations/K8200/Configuration.h
Unescape View File

@ -43,7 +43,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

2
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
Unescape View File

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

2
Marlin/example_configurations/RigidBot/Configuration.h
Unescape View File

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

2
Marlin/example_configurations/SCARA/Configuration.h
Unescape View File

@ -63,7 +63,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

2
Marlin/example_configurations/WITBOX/Configuration.h
Unescape View File

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

2
Marlin/example_configurations/adafruit/ST7565/Configuration.h
Unescape View File

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

2
Marlin/example_configurations/delta/biv2.5/Configuration.h
Unescape View File

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

2
Marlin/example_configurations/delta/generic/Configuration.h
Unescape View File

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

2
Marlin/example_configurations/delta/kossel_mini/Configuration.h
Unescape View File

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

2
Marlin/example_configurations/delta/kossel_pro/Configuration.h
Unescape View File

@ -42,7 +42,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

2
Marlin/example_configurations/makibox/Configuration.h
Unescape View File

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

2
Marlin/example_configurations/tvrrug/Round2/Configuration.h
Unescape View File

@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
// @section info // @section info
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#else #else
#include "Default_Version.h" #include "Default_Version.h"

2
Marlin/language.h
Unescape View File

@ -38,7 +38,7 @@
#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
#endif #endif
#if ENABLED(HAS_AUTOMATIC_VERSIONING) #if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h" #include "_Version.h"
#endif #endif

Write Preview
Loading…
Cancel
Save