thomas
/
marlin
Suivre 1
Favoriser 0
Bifurcation 0
Code Tickets 0 Demandes d'ajout 0 Versions 0 Wiki Activité
Parcourir la source

Canonize Option flag USE_AUTOMATIC_VERSION

Richard Wackerbarth il y a 9 ans
Parent
a8db0aac32
révision
329acc852e
21 fichiers modifiés avec 24 ajouts et 20 suppressions
Vue unifiée Afficher les stats Diff
  1. 1
    1
      ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr/platform.local.txt
  2. 1
    1
      Marlin/Configuration.h
  3. 4
    0
      Marlin/SanityCheck.h
  4. 1
    1
      Marlin/configurator/config/Configuration.h
  5. 1
    1
      Marlin/configurator/config/language.h
  6. 1
    1
      Marlin/example_configurations/Felix/Configuration.h
  7. 1
    1
      Marlin/example_configurations/Felix/Configuration_DUAL.h
  8. 1
    1
      Marlin/example_configurations/Hephestos/Configuration.h
  9. 1
    1
      Marlin/example_configurations/K8200/Configuration.h
  10. 1
    1
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  11. 1
    1
      Marlin/example_configurations/RigidBot/Configuration.h
  12. 1
    1
      Marlin/example_configurations/SCARA/Configuration.h
  13. 1
    1
      Marlin/example_configurations/WITBOX/Configuration.h
  14. 1
    1
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  15. 1
    1
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  16. 1
    1
      Marlin/example_configurations/delta/generic/Configuration.h
  17. 1
    1
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  18. 1
    1
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  19. 1
    1
      Marlin/example_configurations/makibox/Configuration.h
  20. 1
    1
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  21. 1
    1
      Marlin/language.h

+ 1
- 1
ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr/platform.local.txt Voir le fichier

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

+ 1
- 1
Marlin/Configuration.h Voir le fichier

38
38
39 
 // @section info
 39 
 // @section info
40
40
41 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41 
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
42 
   #include "_Version.h"
 42 
   #include "_Version.h"
43 
 #else
 43 
 #else
44 
   #include "Default_Version.h"
 44 
   #include "Default_Version.h"

+ 4
- 0
Marlin/SanityCheck.h Voir le fichier

382 
     #error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME instead
 382 
     #error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME instead
383 
   #endif
 383 
   #endif
384
384
385 
+  #ifdef HAS_AUTOMATIC_VERSIONING
386 
+    #error HAS_AUTOMATIC_VERSIONING deprecated - use USE_AUTOMATIC_VERSIONING instead
387 
+  #endif
388 
+
385 
 #endif //SANITYCHECK_H
 389 
 #endif //SANITYCHECK_H

+ 1
- 1
Marlin/configurator/config/Configuration.h Voir le fichier

38
38
39 
 // @section info
 39 
 // @section info
40
40
41 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41 
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
42 
   #include "_Version.h"
 42 
   #include "_Version.h"
43 
 #else
 43 
 #else
44 
   #include "Default_Version.h"
 44 
   #include "Default_Version.h"

+ 1
- 1
Marlin/configurator/config/language.h Voir le fichier

38 
   #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
 38 
   #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
39 
 #endif
 39 
 #endif
40
40
41 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41 
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
42 
   #include "_Version.h"
 42 
   #include "_Version.h"
43 
 #endif
 43 
 #endif
44
44

+ 1
- 1
Marlin/example_configurations/Felix/Configuration.h Voir le fichier

38
38
39 
 // @section info
 39 
 // @section info
40
40
41 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41 
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
42 
   #include "_Version.h"
 42 
   #include "_Version.h"
43 
 #else
 43 
 #else
44 
   #include "Default_Version.h"
 44 
   #include "Default_Version.h"

+ 1
- 1
Marlin/example_configurations/Felix/Configuration_DUAL.h Voir le fichier

38
38
39 
 // @section info
 39 
 // @section info
40
40
41 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41 
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
42 
   #include "_Version.h"
 42 
   #include "_Version.h"
43 
 #else
 43 
 #else
44 
   #include "Default_Version.h"
 44 
   #include "Default_Version.h"

+ 1
- 1
Marlin/example_configurations/Hephestos/Configuration.h Voir le fichier

38
38
39 
 // @section info
 39 
 // @section info
40
40
41 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41 
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
42 
   #include "_Version.h"
 42 
   #include "_Version.h"
43 
 #else
 43 
 #else
44 
   #include "Default_Version.h"
 44 
   #include "Default_Version.h"

+ 1
- 1
Marlin/example_configurations/K8200/Configuration.h Voir le fichier

43
43
44 
 // @section info
 44 
 // @section info
45
45
46 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
46 
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
47 
   #include "_Version.h"
 47 
   #include "_Version.h"
48 
 #else
 48 
 #else
49 
   #include "Default_Version.h"
 49 
   #include "Default_Version.h"

+ 1
- 1
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h Voir le fichier

38
38
39 
 // @section info
 39 
 // @section info
40
40
41 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41 
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
42 
   #include "_Version.h"
 42 
   #include "_Version.h"
43 
 #else
 43 
 #else
44 
   #include "Default_Version.h"
 44 
   #include "Default_Version.h"

+ 1
- 1
Marlin/example_configurations/RigidBot/Configuration.h Voir le fichier

38
38
39 
 // @section info
 39 
 // @section info
40
40
41 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41 
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
42 
   #include "_Version.h"
 42 
   #include "_Version.h"
43 
 #else
 43 
 #else
44 
   #include "Default_Version.h"
 44 
   #include "Default_Version.h"

+ 1
- 1
Marlin/example_configurations/SCARA/Configuration.h Voir le fichier

63
63
64 
 // @section info
 64 
 // @section info
65
65
66 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
66 
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
67 
   #include "_Version.h"
 67 
   #include "_Version.h"
68 
 #else
 68 
 #else
69 
   #include "Default_Version.h"
 69 
   #include "Default_Version.h"

+ 1
- 1
Marlin/example_configurations/WITBOX/Configuration.h Voir le fichier

38
38
39 
 // @section info
 39 
 // @section info
40
40
41 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41 
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
42 
   #include "_Version.h"
 42 
   #include "_Version.h"
43 
 #else
 43 
 #else
44 
   #include "Default_Version.h"
 44 
   #include "Default_Version.h"

+ 1
- 1
Marlin/example_configurations/adafruit/ST7565/Configuration.h Voir le fichier

38
38
39 
 // @section info
 39 
 // @section info
40
40
41 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41 
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
42 
   #include "_Version.h"
 42 
   #include "_Version.h"
43 
 #else
 43 
 #else
44 
   #include "Default_Version.h"
 44 
   #include "Default_Version.h"

+ 1
- 1
Marlin/example_configurations/delta/biv2.5/Configuration.h Voir le fichier

38
38
39 
 // @section info
 39 
 // @section info
40
40
41 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41 
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
42 
   #include "_Version.h"
 42 
   #include "_Version.h"
43 
 #else
 43 
 #else
44 
   #include "Default_Version.h"
 44 
   #include "Default_Version.h"

+ 1
- 1
Marlin/example_configurations/delta/generic/Configuration.h Voir le fichier

38
38
39 
 // @section info
 39 
 // @section info
40
40
41 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41 
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
42 
   #include "_Version.h"
 42 
   #include "_Version.h"
43 
 #else
 43 
 #else
44 
   #include "Default_Version.h"
 44 
   #include "Default_Version.h"

+ 1
- 1
Marlin/example_configurations/delta/kossel_mini/Configuration.h Voir le fichier

38
38
39 
 // @section info
 39 
 // @section info
40
40
41 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41 
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
42 
   #include "_Version.h"
 42 
   #include "_Version.h"
43 
 #else
 43 
 #else
44 
   #include "Default_Version.h"
 44 
   #include "Default_Version.h"

+ 1
- 1
Marlin/example_configurations/delta/kossel_pro/Configuration.h Voir le fichier

42
42
43 
 // @section info
 43 
 // @section info
44
44
45 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
45 
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
46 
   #include "_Version.h"
 46 
   #include "_Version.h"
47 
 #else
 47 
 #else
48 
   #include "Default_Version.h"
 48 
   #include "Default_Version.h"

+ 1
- 1
Marlin/example_configurations/makibox/Configuration.h Voir le fichier

38
38
39 
 // @section info
 39 
 // @section info
40
40
41 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41 
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
42 
   #include "_Version.h"
 42 
   #include "_Version.h"
43 
 #else
 43 
 #else
44 
   #include "Default_Version.h"
 44 
   #include "Default_Version.h"

+ 1
- 1
Marlin/example_configurations/tvrrug/Round2/Configuration.h Voir le fichier

38
38
39 
 // @section info
 39 
 // @section info
40
40
41 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41 
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
42 
   #include "_Version.h"
 42 
   #include "_Version.h"
43 
 #else
 43 
 #else
44 
   #include "Default_Version.h"
 44 
   #include "Default_Version.h"

+ 1
- 1
Marlin/language.h Voir le fichier

38 
   #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
 38 
   #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
39 
 #endif
 39 
 #endif
40
40
41 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41 
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
42 
   #include "_Version.h"
 42 
   #include "_Version.h"
43 
 #endif
 43 
 #endif
44
44

Écrire Aperçu
Chargement…
Annuler
Enregistrer