Kaynağa Gözat

Don't override SOURCE_CODE_URL in Default_Version.h

- Defining `SOURCE_CODE_URL` in `Default_Version.h` overrides it
elsewhere. So don’t define it there.
- Also fix up `language.h` so no `#undef` will be needed.
Scott Lahteine 8 yıl önce
ebeveyn
işleme
45bcc43e48
2 değiştirilmiş dosya ile 17 ekleme ve 15 silme
  1. 1
    1
      Marlin/Default_Version.h
  2. 16
    14
      Marlin/language.h

+ 1
- 1
Marlin/Default_Version.h Dosyayı Görüntüle

@@ -10,5 +10,5 @@
10 10
 #define DETAILED_BUILD_VERSION "1.1.0-RC3 From Archive"
11 11
 #define STRING_DISTRIBUTION_DATE "2015-12-01 12:00"
12 12
 // It might also be appropriate to define a location where additional information can be found
13
-#define SOURCE_CODE_URL  "http:// ..."
13
+// #define SOURCE_CODE_URL  "http:// ..."
14 14
 #endif

+ 16
- 14
Marlin/language.h Dosyayı Görüntüle

@@ -49,32 +49,34 @@
49 49
 #define PROTOCOL_VERSION "1.0"
50 50
 
51 51
 #if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2)
52
-  #define MACHINE_NAME "Ultimaker"
53
-  #define SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"
52
+  #define DEFAULT_MACHINE_NAME "Ultimaker"
53
+  #define DEFAULT_SOURCE_URL "https://github.com/Ultimaker/Marlin"
54 54
 #elif MB(RUMBA)
55
-  #define MACHINE_NAME "Rumba"
55
+  #define DEFAULT_MACHINE_NAME "Rumba"
56 56
 #elif MB(3DRAG)
57
-  #define MACHINE_NAME "3Drag"
58
-  #define SOURCE_CODE_URL "http://3dprint.elettronicain.it/"
57
+  #define DEFAULT_MACHINE_NAME "3Drag"
58
+  #define DEFAULT_SOURCE_URL "http://3dprint.elettronicain.it/"
59 59
 #elif MB(K8200)
60
-  #define MACHINE_NAME "K8200"
61
-  #define SOURCE_CODE_URL "https://github.com/CONSULitAS/Marlin-K8200"
60
+  #define DEFAULT_MACHINE_NAME "K8200"
61
+  #define DEFAULT_SOURCE_URL "https://github.com/CONSULitAS/Marlin-K8200"
62 62
 #elif MB(5DPRINT)
63
-  #define MACHINE_NAME "Makibox"
63
+  #define DEFAULT_MACHINE_NAME "Makibox"
64 64
 #elif MB(SAV_MKI)
65
-  #define MACHINE_NAME "SAV MkI"
66
-  #define SOURCE_CODE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config"
67
-#elif !defined(MACHINE_NAME)
68
-  #define MACHINE_NAME "3D Printer"
65
+  #define DEFAULT_MACHINE_NAME "SAV MkI"
66
+  #define DEFAULT_SOURCE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config"
67
+#else
68
+  #define DEFAULT_MACHINE_NAME "3D Printer"
69
+  #define DEFAULT_SOURCE_URL "https://github.com/MarlinFirmware/Marlin"
69 70
 #endif
70 71
 
71 72
 #ifdef CUSTOM_MACHINE_NAME
72
-  #undef MACHINE_NAME
73 73
   #define MACHINE_NAME CUSTOM_MACHINE_NAME
74
+#else
75
+  #define MACHINE_NAME DEFAULT_MACHINE_NAME
74 76
 #endif
75 77
 
76 78
 #ifndef SOURCE_CODE_URL
77
-  #define SOURCE_CODE_URL "https://github.com/MarlinFirmware/Marlin"
79
+  #define SOURCE_CODE_URL DEFAULT_SOURCE_URL
78 80
 #endif
79 81
 
80 82
 #ifndef DETAILED_BUILD_VERSION

Loading…
İptal
Kaydet