andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Canonize Option flag USE_AUTOMATIC_VERSION

pull/1/head
Richard Wackerbarth 9 years ago
parent
a8db0aac32
commit
329acc852e
21 changed files with 24 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr/platform.local.txt
  2. 2
      Marlin/Configuration.h
  3. 4
      Marlin/SanityCheck.h
  4. 2
      Marlin/configurator/config/Configuration.h
  5. 2
      Marlin/configurator/config/language.h
  6. 2
      Marlin/example_configurations/Felix/Configuration.h
  7. 2
      Marlin/example_configurations/Felix/Configuration_DUAL.h
  8. 2
      Marlin/example_configurations/Hephestos/Configuration.h
  9. 2
      Marlin/example_configurations/K8200/Configuration.h
  10. 2
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  11. 2
      Marlin/example_configurations/RigidBot/Configuration.h
  12. 2
      Marlin/example_configurations/SCARA/Configuration.h
  13. 2
      Marlin/example_configurations/WITBOX/Configuration.h
  14. 2
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  15. 2
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  16. 2
      Marlin/example_configurations/delta/generic/Configuration.h
  17. 2
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  18. 2
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  19. 2
      Marlin/example_configurations/makibox/Configuration.h
  20. 2
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  21. 2
      Marlin/language.h

2
ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr/platform.local.txt
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.linux=
recipe.hooks.prebuild0.pattern={build.custom_bin.path}generate_version_header_for_marlin "{build.source.path}" "{build.path}/_Version.h"

2
Marlin/Configuration.h
View File

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

4
Marlin/SanityCheck.h
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

2
Marlin/language.h
View File

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

Write Preview
Loading…
Cancel
Save