From b5743d6927a0c6e82d5373efcf867275457bfdc9 Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Fri, 22 May 2015 20:27:26 -0500 Subject: [PATCH] Use SOURCE_CODE_URL rather than FIRMWARE_URL --- Marlin/Default_Version.h | 2 +- Marlin/configurator/config/language.h | 14 +++++++------- .../Hephestos/Configuration.h | 2 +- .../example_configurations/WITBOX/Configuration.h | 2 +- Marlin/language.h | 14 +++++++------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Marlin/Default_Version.h b/Marlin/Default_Version.h index c9b5abacba..56a38bc559 100644 --- a/Marlin/Default_Version.h +++ b/Marlin/Default_Version.h @@ -8,5 +8,5 @@ #define BUILD_VERSION "1.1.0 dev" #define STRING_DISTRIBUTION_DATE "2015-06-00 12:00" // It might also be appropriate to define a location where additional information can be found - #define FIRMWARE_URL "http:// ..." + #define SOURCE_CODE_URL "http:// ..." #endif \ No newline at end of file diff --git a/Marlin/configurator/config/language.h b/Marlin/configurator/config/language.h index 856bd58db5..5d3d33155d 100644 --- a/Marlin/configurator/config/language.h +++ b/Marlin/configurator/config/language.h @@ -45,20 +45,20 @@ #if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2) #define MACHINE_NAME "Ultimaker" - #define FIRMWARE_URL "http://firmware.ultimaker.com" + #define SOURCE_CODE_URL "http://firmware.ultimaker.com" #elif MB(RUMBA) #define MACHINE_NAME "Rumba" #elif MB(3DRAG) #define MACHINE_NAME "3Drag" - #define FIRMWARE_URL "http://3dprint.elettronicain.it/" + #define SOURCE_CODE_URL "http://3dprint.elettronicain.it/" #elif MB(K8200) #define MACHINE_NAME "K8200" - #define FIRMWARE_URL "https://github.com/CONSULitAS/Marlin-K8200" + #define SOURCE_CODE_URL "https://github.com/CONSULitAS/Marlin-K8200" #elif MB(5DPRINT) #define MACHINE_NAME "Makibox" #elif MB(SAV_MKI) #define MACHINE_NAME "SAV MkI" - #define FIRMWARE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config" + #define SOURCE_CODE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config" #elif !defined(MACHINE_NAME) #define MACHINE_NAME "3D Printer" #endif @@ -73,8 +73,8 @@ #define MACHINE_NAME CUSTOM_MACHINE_NAME #endif -#ifndef FIRMWARE_URL - #define FIRMWARE_URL "https://github.com/MarlinFirmware/Marlin" +#ifndef SOURCE_CODE_URL + #define SOURCE_CODE_URL "https://github.com/MarlinFirmware/Marlin" #endif #ifndef BUILD_VERSION @@ -132,7 +132,7 @@ #define MSG_HEATING_COMPLETE "Heating done." #define MSG_BED_HEATING "Bed Heating." #define MSG_BED_DONE "Bed done." -#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" +#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" #define MSG_COUNT_X " Count X: " #define MSG_ERR_KILLED "Printer halted. kill() called!" #define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index bbbb1f4213..d8ee933962 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -73,7 +73,7 @@ Here are some standard links for getting your machine calibrated: #define CUSTOM_MACHINE_NAME "HEPHESTOS" // Added for BQ -#define FIRMWARE_URL "http://www.bq.com/gb/downloads-prusa-i3-hephestos.html" +#define SOURCE_CODE_URL "http://www.bq.com/gb/downloads-prusa-i3-hephestos.html" // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index c6ecb4d10a..5d5f68532d 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -73,7 +73,7 @@ Here are some standard links for getting your machine calibrated: #define CUSTOM_MACHINE_NAME "WITBOX" // Added for BQ -#define FIRMWARE_URL "http://www.bq.com/gb/downloads-witbox.html" +#define SOURCE_CODE_URL "http://www.bq.com/gb/downloads-witbox.html" // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) diff --git a/Marlin/language.h b/Marlin/language.h index 22e1131174..d5e51e1285 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -46,20 +46,20 @@ #if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2) #define MACHINE_NAME "Ultimaker" - #define FIRMWARE_URL "http://firmware.ultimaker.com" + #define SOURCE_CODE_URL "http://firmware.ultimaker.com" #elif MB(RUMBA) #define MACHINE_NAME "Rumba" #elif MB(3DRAG) #define MACHINE_NAME "3Drag" - #define FIRMWARE_URL "http://3dprint.elettronicain.it/" + #define SOURCE_CODE_URL "http://3dprint.elettronicain.it/" #elif MB(K8200) #define MACHINE_NAME "K8200" - #define FIRMWARE_URL "https://github.com/CONSULitAS/Marlin-K8200" + #define SOURCE_CODE_URL "https://github.com/CONSULitAS/Marlin-K8200" #elif MB(5DPRINT) #define MACHINE_NAME "Makibox" #elif MB(SAV_MKI) #define MACHINE_NAME "SAV MkI" - #define FIRMWARE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config" + #define SOURCE_CODE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config" #elif !defined(MACHINE_NAME) #define MACHINE_NAME "3D Printer" #endif @@ -74,8 +74,8 @@ #define MACHINE_NAME CUSTOM_MACHINE_NAME #endif -#ifndef FIRMWARE_URL - #define FIRMWARE_URL "https://github.com/MarlinFirmware/Marlin" +#ifndef SOURCE_CODE_URL + #define SOURCE_CODE_URL "https://github.com/MarlinFirmware/Marlin" #endif #ifndef BUILD_VERSION @@ -133,7 +133,7 @@ #define MSG_HEATING_COMPLETE "Heating done." #define MSG_BED_HEATING "Bed Heating." #define MSG_BED_DONE "Bed done." -#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" +#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" #define MSG_COUNT_X " Count X: " #define MSG_ERR_KILLED "Printer halted. kill() called!" #define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"