소스 검색

Use SOURCE_CODE_URL rather than FIRMWARE_URL

Richard Wackerbarth 10 년 전
부모
커밋
b5743d6927

+ 1
- 1
Marlin/Default_Version.h 파일 보기

8
   #define BUILD_VERSION "1.1.0 dev"
8
   #define BUILD_VERSION "1.1.0 dev"
9
   #define STRING_DISTRIBUTION_DATE "2015-06-00 12:00"
9
   #define STRING_DISTRIBUTION_DATE "2015-06-00 12:00"
10
   // It might also be appropriate to define a location where additional information can be found
10
   // It might also be appropriate to define a location where additional information can be found
11
-  #define FIRMWARE_URL  "http:// ..."
11
+  #define SOURCE_CODE_URL  "http:// ..."
12
 #endif
12
 #endif

+ 7
- 7
Marlin/configurator/config/language.h 파일 보기

45
 
45
 
46
 #if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2)
46
 #if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2)
47
   #define MACHINE_NAME "Ultimaker"
47
   #define MACHINE_NAME "Ultimaker"
48
-  #define FIRMWARE_URL "http://firmware.ultimaker.com"
48
+  #define SOURCE_CODE_URL "http://firmware.ultimaker.com"
49
 #elif MB(RUMBA)
49
 #elif MB(RUMBA)
50
   #define MACHINE_NAME "Rumba"
50
   #define MACHINE_NAME "Rumba"
51
 #elif MB(3DRAG)
51
 #elif MB(3DRAG)
52
   #define MACHINE_NAME "3Drag"
52
   #define MACHINE_NAME "3Drag"
53
-  #define FIRMWARE_URL "http://3dprint.elettronicain.it/"
53
+  #define SOURCE_CODE_URL "http://3dprint.elettronicain.it/"
54
 #elif MB(K8200)
54
 #elif MB(K8200)
55
   #define MACHINE_NAME "K8200"
55
   #define MACHINE_NAME "K8200"
56
-  #define FIRMWARE_URL "https://github.com/CONSULitAS/Marlin-K8200"
56
+  #define SOURCE_CODE_URL "https://github.com/CONSULitAS/Marlin-K8200"
57
 #elif MB(5DPRINT)
57
 #elif MB(5DPRINT)
58
   #define MACHINE_NAME "Makibox"
58
   #define MACHINE_NAME "Makibox"
59
 #elif MB(SAV_MKI)
59
 #elif MB(SAV_MKI)
60
   #define MACHINE_NAME "SAV MkI"
60
   #define MACHINE_NAME "SAV MkI"
61
-  #define FIRMWARE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config"
61
+  #define SOURCE_CODE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config"
62
 #elif !defined(MACHINE_NAME)
62
 #elif !defined(MACHINE_NAME)
63
   #define MACHINE_NAME "3D Printer"
63
   #define MACHINE_NAME "3D Printer"
64
 #endif
64
 #endif
73
   #define MACHINE_NAME CUSTOM_MACHINE_NAME
73
   #define MACHINE_NAME CUSTOM_MACHINE_NAME
74
 #endif
74
 #endif
75
 
75
 
76
-#ifndef FIRMWARE_URL
77
-  #define FIRMWARE_URL "https://github.com/MarlinFirmware/Marlin"
76
+#ifndef SOURCE_CODE_URL
77
+  #define SOURCE_CODE_URL "https://github.com/MarlinFirmware/Marlin"
78
 #endif
78
 #endif
79
 
79
 
80
 #ifndef BUILD_VERSION
80
 #ifndef BUILD_VERSION
132
 #define MSG_HEATING_COMPLETE                "Heating done."
132
 #define MSG_HEATING_COMPLETE                "Heating done."
133
 #define MSG_BED_HEATING                     "Bed Heating."
133
 #define MSG_BED_HEATING                     "Bed Heating."
134
 #define MSG_BED_DONE                        "Bed done."
134
 #define MSG_BED_DONE                        "Bed done."
135
-#define MSG_M115_REPORT                     "FIRMWARE_NAME:Marlin " BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
135
+#define MSG_M115_REPORT                     "FIRMWARE_NAME:Marlin " BUILD_VERSION " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
136
 #define MSG_COUNT_X                         " Count X: "
136
 #define MSG_COUNT_X                         " Count X: "
137
 #define MSG_ERR_KILLED                      "Printer halted. kill() called!"
137
 #define MSG_ERR_KILLED                      "Printer halted. kill() called!"
138
 #define MSG_ERR_STOPPED                     "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
138
 #define MSG_ERR_STOPPED                     "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"

+ 1
- 1
Marlin/example_configurations/Hephestos/Configuration.h 파일 보기

73
 #define CUSTOM_MACHINE_NAME "HEPHESTOS"
73
 #define CUSTOM_MACHINE_NAME "HEPHESTOS"
74
 
74
 
75
 // Added for BQ
75
 // Added for BQ
76
-#define FIRMWARE_URL "http://www.bq.com/gb/downloads-prusa-i3-hephestos.html"
76
+#define SOURCE_CODE_URL "http://www.bq.com/gb/downloads-prusa-i3-hephestos.html"
77
  
77
  
78
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
78
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
79
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
79
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

+ 1
- 1
Marlin/example_configurations/WITBOX/Configuration.h 파일 보기

73
 #define CUSTOM_MACHINE_NAME "WITBOX"
73
 #define CUSTOM_MACHINE_NAME "WITBOX"
74
 
74
 
75
 // Added for BQ
75
 // Added for BQ
76
-#define FIRMWARE_URL "http://www.bq.com/gb/downloads-witbox.html"
76
+#define SOURCE_CODE_URL "http://www.bq.com/gb/downloads-witbox.html"
77
 
77
 
78
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
78
 // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
79
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
79
 // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)

+ 7
- 7
Marlin/language.h 파일 보기

46
 
46
 
47
 #if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2)
47
 #if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2)
48
   #define MACHINE_NAME "Ultimaker"
48
   #define MACHINE_NAME "Ultimaker"
49
-  #define FIRMWARE_URL "http://firmware.ultimaker.com"
49
+  #define SOURCE_CODE_URL "http://firmware.ultimaker.com"
50
 #elif MB(RUMBA)
50
 #elif MB(RUMBA)
51
   #define MACHINE_NAME "Rumba"
51
   #define MACHINE_NAME "Rumba"
52
 #elif MB(3DRAG)
52
 #elif MB(3DRAG)
53
   #define MACHINE_NAME "3Drag"
53
   #define MACHINE_NAME "3Drag"
54
-  #define FIRMWARE_URL "http://3dprint.elettronicain.it/"
54
+  #define SOURCE_CODE_URL "http://3dprint.elettronicain.it/"
55
 #elif MB(K8200)
55
 #elif MB(K8200)
56
   #define MACHINE_NAME "K8200"
56
   #define MACHINE_NAME "K8200"
57
-  #define FIRMWARE_URL "https://github.com/CONSULitAS/Marlin-K8200"
57
+  #define SOURCE_CODE_URL "https://github.com/CONSULitAS/Marlin-K8200"
58
 #elif MB(5DPRINT)
58
 #elif MB(5DPRINT)
59
   #define MACHINE_NAME "Makibox"
59
   #define MACHINE_NAME "Makibox"
60
 #elif MB(SAV_MKI)
60
 #elif MB(SAV_MKI)
61
   #define MACHINE_NAME "SAV MkI"
61
   #define MACHINE_NAME "SAV MkI"
62
-  #define FIRMWARE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config"
62
+  #define SOURCE_CODE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config"
63
 #elif !defined(MACHINE_NAME)
63
 #elif !defined(MACHINE_NAME)
64
   #define MACHINE_NAME "3D Printer"
64
   #define MACHINE_NAME "3D Printer"
65
 #endif
65
 #endif
74
   #define MACHINE_NAME CUSTOM_MACHINE_NAME
74
   #define MACHINE_NAME CUSTOM_MACHINE_NAME
75
 #endif
75
 #endif
76
 
76
 
77
-#ifndef FIRMWARE_URL
78
-  #define FIRMWARE_URL "https://github.com/MarlinFirmware/Marlin"
77
+#ifndef SOURCE_CODE_URL
78
+  #define SOURCE_CODE_URL "https://github.com/MarlinFirmware/Marlin"
79
 #endif
79
 #endif
80
 
80
 
81
 #ifndef BUILD_VERSION
81
 #ifndef BUILD_VERSION
133
 #define MSG_HEATING_COMPLETE                "Heating done."
133
 #define MSG_HEATING_COMPLETE                "Heating done."
134
 #define MSG_BED_HEATING                     "Bed Heating."
134
 #define MSG_BED_HEATING                     "Bed Heating."
135
 #define MSG_BED_DONE                        "Bed done."
135
 #define MSG_BED_DONE                        "Bed done."
136
-#define MSG_M115_REPORT                     "FIRMWARE_NAME:Marlin " BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
136
+#define MSG_M115_REPORT                     "FIRMWARE_NAME:Marlin " BUILD_VERSION " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
137
 #define MSG_COUNT_X                         " Count X: "
137
 #define MSG_COUNT_X                         " Count X: "
138
 #define MSG_ERR_KILLED                      "Printer halted. kill() called!"
138
 #define MSG_ERR_KILLED                      "Printer halted. kill() called!"
139
 #define MSG_ERR_STOPPED                     "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
139
 #define MSG_ERR_STOPPED                     "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"

Loading…
취소
저장