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

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.
pull/1/head
Scott Lahteine 8 years ago
parent
ef68c1910c
commit
45bcc43e48
2 changed files with 17 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Marlin/Default_Version.h
  2. 30
      Marlin/language.h

2
Marlin/Default_Version.h
View File

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

30
Marlin/language.h
View File

@ -49,32 +49,34 @@
#define PROTOCOL_VERSION "1.0" #define PROTOCOL_VERSION "1.0"
#if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2) #if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2)
#define MACHINE_NAME "Ultimaker" #define DEFAULT_MACHINE_NAME "Ultimaker"
#define SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin" #define DEFAULT_SOURCE_URL "https://github.com/Ultimaker/Marlin"
#elif MB(RUMBA) #elif MB(RUMBA)
#define MACHINE_NAME "Rumba" #define DEFAULT_MACHINE_NAME "Rumba"
#elif MB(3DRAG) #elif MB(3DRAG)
#define MACHINE_NAME "3Drag" #define DEFAULT_MACHINE_NAME "3Drag"
#define SOURCE_CODE_URL "http://3dprint.elettronicain.it/" #define DEFAULT_SOURCE_URL "http://3dprint.elettronicain.it/"
#elif MB(K8200) #elif MB(K8200)
#define MACHINE_NAME "K8200" #define DEFAULT_MACHINE_NAME "K8200"
#define SOURCE_CODE_URL "https://github.com/CONSULitAS/Marlin-K8200" #define DEFAULT_SOURCE_URL "https://github.com/CONSULitAS/Marlin-K8200"
#elif MB(5DPRINT) #elif MB(5DPRINT)
#define MACHINE_NAME "Makibox" #define DEFAULT_MACHINE_NAME "Makibox"
#elif MB(SAV_MKI) #elif MB(SAV_MKI)
#define MACHINE_NAME "SAV MkI" #define DEFAULT_MACHINE_NAME "SAV MkI"
#define SOURCE_CODE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config" #define DEFAULT_SOURCE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config"
#elif !defined(MACHINE_NAME) #else
#define MACHINE_NAME "3D Printer" #define DEFAULT_MACHINE_NAME "3D Printer"
#define DEFAULT_SOURCE_URL "https://github.com/MarlinFirmware/Marlin"
#endif #endif
#ifdef CUSTOM_MACHINE_NAME #ifdef CUSTOM_MACHINE_NAME
#undef MACHINE_NAME
#define MACHINE_NAME CUSTOM_MACHINE_NAME #define MACHINE_NAME CUSTOM_MACHINE_NAME
#else
#define MACHINE_NAME DEFAULT_MACHINE_NAME
#endif #endif
#ifndef SOURCE_CODE_URL #ifndef SOURCE_CODE_URL
#define SOURCE_CODE_URL "https://github.com/MarlinFirmware/Marlin" #define SOURCE_CODE_URL DEFAULT_SOURCE_URL
#endif #endif
#ifndef DETAILED_BUILD_VERSION #ifndef DETAILED_BUILD_VERSION

Write Preview
Loading…
Cancel
Save