From 7bb7a52940f1303d6462a221294a151a97821dbf Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Mon, 3 Aug 2015 07:35:33 -0500 Subject: [PATCH 1/7] Bring config up-to-date --- Marlin/configurator/config/boards.h | 5 ++++- Marlin/configurator/config/language.h | 14 +++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Marlin/configurator/config/boards.h b/Marlin/configurator/config/boards.h index 5e782125db..f6bbc9d673 100644 --- a/Marlin/configurator/config/boards.h +++ b/Marlin/configurator/config/boards.h @@ -16,6 +16,7 @@ #define BOARD_RAMPS_13_EEF 36 // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Fan) #define BOARD_RAMPS_13_SF 38 // RAMPS 1.3 / 1.4 (Power outputs: Spindle, Controller Fan) #define BOARD_FELIX2 37 // Felix 2.0+ Electronics Board (RAMPS like) +#define BOARD_RIGIDBOARD 42 // Invent-A-Part RigidBoard #define BOARD_GEN6 5 // Gen6 #define BOARD_GEN6_DELUXE 51 // Gen6 deluxe #define BOARD_SANGUINOLOLU_11 6 // Sanguinololu < 1.2 @@ -42,11 +43,13 @@ #define BOARD_GEN3_MONOLITHIC 22 // Gen3 Monolithic Electronics #define BOARD_MEGATRONICS 70 // Megatronics #define BOARD_MEGATRONICS_2 701 // Megatronics v2.0 -#define BOARD_MEGATRONICS_1 702 // Minitronics v1.0 +#define BOARD_MINITRONICS 702 // Minitronics v1.0/1.1 #define BOARD_MEGATRONICS_3 703 // Megatronics v3.0 #define BOARD_OMCA_A 90 // Alpha OMCA board #define BOARD_OMCA 91 // Final OMCA board #define BOARD_RAMBO 301 // Rambo +#define BOARD_MINIRAMBO 302 // Mini-Rambo +#define BOARD_MEGACONTROLLER 310 // Mega controller #define BOARD_ELEFU_3 21 // Elefu Ra Board (v3) #define BOARD_5DPRINT 88 // 5DPrint D8 Driver Board #define BOARD_LEAPFROG 999 // Leapfrog diff --git a/Marlin/configurator/config/language.h b/Marlin/configurator/config/language.h index a13b69e3df..10f012775a 100644 --- a/Marlin/configurator/config/language.h +++ b/Marlin/configurator/config/language.h @@ -20,6 +20,7 @@ // de German // es Spanish // ru Russian +// bg Bulgarian // it Italian // pt Portuguese // pt-br Portuguese (Brazil) @@ -45,7 +46,7 @@ #if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2) #define MACHINE_NAME "Ultimaker" - #define SOURCE_CODE_URL "http://firmware.ultimaker.com" + #define SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin" #elif MB(RUMBA) #define MACHINE_NAME "Rumba" #elif MB(3DRAG) @@ -122,10 +123,6 @@ #define MSG_INVALID_EXTRUDER "Invalid extruder" #define MSG_INVALID_SOLENOID "Invalid solenoid" #define MSG_ERR_NO_THERMISTORS "No thermistors - no temperature" -#define MSG_HEATING "Heating..." -#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 " 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!" @@ -195,6 +192,8 @@ #define MSG_KP " Kp: " #define MSG_KI " Ki: " #define MSG_KD " Kd: " +#define MSG_B "B:" +#define MSG_T "T:" #define MSG_AT " @:" #define MSG_PID_AUTOTUNE_FINISHED MSG_PID_AUTOTUNE " finished! Put the last Kp, Ki and Kd constants from below into Configuration.h" #define MSG_PID_DEBUG " PID_DEBUG " @@ -213,6 +212,11 @@ #define MSG_T_MAXTEMP "MAXTEMP triggered" #define MSG_T_MINTEMP "MINTEMP triggered" +// Debug +#define MSG_DEBUG_ECHO "DEBUG ECHO ENABLED" +#define MSG_DEBUG_INFO "DEBUG INFO ENABLED" +#define MSG_DEBUG_ERRORS "DEBUG ERRORS ENABLED" +#define MSG_DEBUG_DRYRUN "DEBUG DRYRUN ENABLED" // LCD Menu Messages From 5a11d32a855d31ca380628b73f999918ac0baf6a Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Sat, 1 Aug 2015 10:04:57 -0500 Subject: [PATCH 2/7] Move deprecation test to SanityCheck.h --- Marlin/SanityCheck.h | 4 ++++ Marlin/configurator/config/language.h | 5 ----- Marlin/language.h | 5 ----- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index 3a23b63634..d225bc4c27 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -378,4 +378,8 @@ #error BTENABLED has been replaced with BLUETOOTH. Please update your configuration. #endif + #ifdef CUSTOM_MENDEL_NAME + #error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME instead + #endif + #endif //SANITYCHECK_H diff --git a/Marlin/configurator/config/language.h b/Marlin/configurator/config/language.h index 10f012775a..b421dd946f 100644 --- a/Marlin/configurator/config/language.h +++ b/Marlin/configurator/config/language.h @@ -64,11 +64,6 @@ #define MACHINE_NAME "3D Printer" #endif -#ifdef CUSTOM_MENDEL_NAME - #error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME - #define CUSTOM_MACHINE_NAME CUSTOM_MENDEL_NAME -#endif - #ifdef CUSTOM_MACHINE_NAME #undef MACHINE_NAME #define MACHINE_NAME CUSTOM_MACHINE_NAME diff --git a/Marlin/language.h b/Marlin/language.h index 10f012775a..b421dd946f 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -64,11 +64,6 @@ #define MACHINE_NAME "3D Printer" #endif -#ifdef CUSTOM_MENDEL_NAME - #error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME - #define CUSTOM_MACHINE_NAME CUSTOM_MENDEL_NAME -#endif - #ifdef CUSTOM_MACHINE_NAME #undef MACHINE_NAME #define MACHINE_NAME CUSTOM_MACHINE_NAME From a8db0aac32fc7517f0f151e9ccf15152195094c7 Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Sat, 1 Aug 2015 09:48:52 -0500 Subject: [PATCH 3/7] Automatic Versioning was introduced in 1.6.3 --- .../Arduino_1.5.x/hardware/marlin/avr/platform.local.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/ArduinoAddons/Arduino_1.5.x/hardware/marlin/avr/platform.local.txt b/ArduinoAddons/Arduino_1.5.x/hardware/marlin/avr/platform.local.txt index 7516f5065e..e69de29bb2 100644 --- a/ArduinoAddons/Arduino_1.5.x/hardware/marlin/avr/platform.local.txt +++ b/ArduinoAddons/Arduino_1.5.x/hardware/marlin/avr/platform.local.txt @@ -1,2 +0,0 @@ -compiler.cpp.extra_flags=-DHAS_AUTOMATIC_VERSIONING -recipe.hooks.prebuild.pattern=/usr/local/bin/generate_version_header_for_marlin "{build.source.path}" "{build.path}/_Version.h" From 329acc852e50b30f9f3a9f00669fad47ae90b0f5 Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Sat, 1 Aug 2015 09:57:59 -0500 Subject: [PATCH 4/7] Canonize Option flag USE_AUTOMATIC_VERSION --- .../Arduino_1.6.x/hardware/marlin/avr/platform.local.txt | 2 +- Marlin/Configuration.h | 2 +- Marlin/SanityCheck.h | 4 ++++ Marlin/configurator/config/Configuration.h | 2 +- Marlin/configurator/config/language.h | 2 +- Marlin/example_configurations/Felix/Configuration.h | 2 +- Marlin/example_configurations/Felix/Configuration_DUAL.h | 2 +- Marlin/example_configurations/Hephestos/Configuration.h | 2 +- Marlin/example_configurations/K8200/Configuration.h | 2 +- .../RepRapWorld/Megatronics/Configuration.h | 2 +- Marlin/example_configurations/RigidBot/Configuration.h | 2 +- Marlin/example_configurations/SCARA/Configuration.h | 2 +- Marlin/example_configurations/WITBOX/Configuration.h | 2 +- Marlin/example_configurations/adafruit/ST7565/Configuration.h | 2 +- Marlin/example_configurations/delta/biv2.5/Configuration.h | 2 +- Marlin/example_configurations/delta/generic/Configuration.h | 2 +- .../example_configurations/delta/kossel_mini/Configuration.h | 2 +- .../example_configurations/delta/kossel_pro/Configuration.h | 2 +- Marlin/example_configurations/makibox/Configuration.h | 2 +- Marlin/example_configurations/tvrrug/Round2/Configuration.h | 2 +- Marlin/language.h | 2 +- 21 files changed, 24 insertions(+), 20 deletions(-) diff --git a/ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr/platform.local.txt b/ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr/platform.local.txt index 61094db8ed..b496061378 100644 --- a/ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr/platform.local.txt +++ b/ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr/platform.local.txt @@ -1,4 +1,4 @@ -compiler.cpp.extra_flags=-DHAS_AUTOMATIC_VERSIONING +compiler.cpp.extra_flags=-DUSE_AUTOMATIC_VERSIONING build.custom_bin.path.macosx=/usr/local/bin/ build.custom_bin.path.linux= recipe.hooks.prebuild0.pattern={build.custom_bin.path}generate_version_header_for_marlin "{build.source.path}" "{build.path}/_Version.h" diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 71679be041..b6e12ee595 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated: // @section info -#if ENABLED(HAS_AUTOMATIC_VERSIONING) +#if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else #include "Default_Version.h" diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index d225bc4c27..14368839a4 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -382,4 +382,8 @@ #error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME instead #endif + #ifdef HAS_AUTOMATIC_VERSIONING + #error HAS_AUTOMATIC_VERSIONING deprecated - use USE_AUTOMATIC_VERSIONING instead + #endif + #endif //SANITYCHECK_H diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h index 71679be041..b6e12ee595 100644 --- a/Marlin/configurator/config/Configuration.h +++ b/Marlin/configurator/config/Configuration.h @@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated: // @section info -#if ENABLED(HAS_AUTOMATIC_VERSIONING) +#if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else #include "Default_Version.h" diff --git a/Marlin/configurator/config/language.h b/Marlin/configurator/config/language.h index b421dd946f..9d64482c11 100644 --- a/Marlin/configurator/config/language.h +++ b/Marlin/configurator/config/language.h @@ -38,7 +38,7 @@ #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) #endif -#if ENABLED(HAS_AUTOMATIC_VERSIONING) +#if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #endif diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index d54687c970..1d6b8d6fa5 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated: // @section info -#if ENABLED(HAS_AUTOMATIC_VERSIONING) +#if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else #include "Default_Version.h" diff --git a/Marlin/example_configurations/Felix/Configuration_DUAL.h b/Marlin/example_configurations/Felix/Configuration_DUAL.h index 1b57f28217..289a2a41ff 100644 --- a/Marlin/example_configurations/Felix/Configuration_DUAL.h +++ b/Marlin/example_configurations/Felix/Configuration_DUAL.h @@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated: // @section info -#if ENABLED(HAS_AUTOMATIC_VERSIONING) +#if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else #include "Default_Version.h" diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 7d1487bdc1..e988fc7321 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated: // @section info -#if ENABLED(HAS_AUTOMATIC_VERSIONING) +#if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else #include "Default_Version.h" diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 123620ca2d..3755b6e8cb 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -43,7 +43,7 @@ Here are some standard links for getting your machine calibrated: // @section info -#if ENABLED(HAS_AUTOMATIC_VERSIONING) +#if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else #include "Default_Version.h" diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index adb460ff39..dec00d78de 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated: // @section info -#if ENABLED(HAS_AUTOMATIC_VERSIONING) +#if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else #include "Default_Version.h" diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index f48ade2ba6..e7f5d6a052 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated: // @section info -#if ENABLED(HAS_AUTOMATIC_VERSIONING) +#if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else #include "Default_Version.h" diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 957405b467..785beb7032 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -63,7 +63,7 @@ Here are some standard links for getting your machine calibrated: // @section info -#if ENABLED(HAS_AUTOMATIC_VERSIONING) +#if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else #include "Default_Version.h" diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 4523ef9504..1777a553b7 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated: // @section info -#if ENABLED(HAS_AUTOMATIC_VERSIONING) +#if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else #include "Default_Version.h" diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 179b9f2dec..975c6cae96 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated: // @section info -#if ENABLED(HAS_AUTOMATIC_VERSIONING) +#if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else #include "Default_Version.h" diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index cca54a993f..23c704842c 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated: // @section info -#if ENABLED(HAS_AUTOMATIC_VERSIONING) +#if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else #include "Default_Version.h" diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 521cfcae11..8a0448e9d8 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated: // @section info -#if ENABLED(HAS_AUTOMATIC_VERSIONING) +#if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else #include "Default_Version.h" diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 07bedbbb1e..3c34e231a6 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated: // @section info -#if ENABLED(HAS_AUTOMATIC_VERSIONING) +#if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else #include "Default_Version.h" diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 3f88166caf..e62cfbc5ab 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -42,7 +42,7 @@ Here are some standard links for getting your machine calibrated: // @section info -#if ENABLED(HAS_AUTOMATIC_VERSIONING) +#if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else #include "Default_Version.h" diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 7ac1105f90..1b464d6311 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated: // @section info -#if ENABLED(HAS_AUTOMATIC_VERSIONING) +#if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else #include "Default_Version.h" diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 8aba468434..d2acfc0eb5 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated: // @section info -#if ENABLED(HAS_AUTOMATIC_VERSIONING) +#if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #else #include "Default_Version.h" diff --git a/Marlin/language.h b/Marlin/language.h index b421dd946f..9d64482c11 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -38,7 +38,7 @@ #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) #endif -#if ENABLED(HAS_AUTOMATIC_VERSIONING) +#if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" #endif From 4e2f5618c10ada5d5e6ea824e4a5d464df299cc6 Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Sat, 1 Aug 2015 10:08:17 -0500 Subject: [PATCH 5/7] Pick up Default_version when needed --- Marlin/configurator/config/language.h | 2 ++ Marlin/language.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Marlin/configurator/config/language.h b/Marlin/configurator/config/language.h index 9d64482c11..1696c9b6c4 100644 --- a/Marlin/configurator/config/language.h +++ b/Marlin/configurator/config/language.h @@ -40,6 +40,8 @@ #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" +#else + #include "Default_Version.h" #endif #define PROTOCOL_VERSION "1.0" diff --git a/Marlin/language.h b/Marlin/language.h index 9d64482c11..1696c9b6c4 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -40,6 +40,8 @@ #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h" +#else + #include "Default_Version.h" #endif #define PROTOCOL_VERSION "1.0" From cd7828a928def987a7da424a8bb7b06fbb214503 Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Sat, 1 Aug 2015 10:09:42 -0500 Subject: [PATCH 6/7] This will be the 1.1.0 Release rather than 1.0.3 --- Marlin/Default_Version.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Marlin/Default_Version.h b/Marlin/Default_Version.h index 78064c66a9..9c95cc4618 100644 --- a/Marlin/Default_Version.h +++ b/Marlin/Default_Version.h @@ -3,11 +3,12 @@ * It takes the place of an automatically created "_Version.h" which is generated during the build process */ -// #error "You must specify the following parameter related to your distribution" +// #error "You must specify the following parameters related to your distribution" #if true - #define BUILD_VERSION "1.0.3 dev" - #define STRING_DISTRIBUTION_DATE "2015-06-00 12:00" + #define SHORT_BUILD_VERSION "1.1.0 dev" + #define DETAILED_BUILD_VERSION "1.1.0 Development From Archive" + #define STRING_DISTRIBUTION_DATE "2015-08-00 12:00" // It might also be appropriate to define a location where additional information can be found #define SOURCE_CODE_URL "http:// ..." #endif \ No newline at end of file From b227d8c12880e407b28868e9ffcaed507558df9a Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Sat, 1 Aug 2015 10:03:46 -0500 Subject: [PATCH 7/7] Supply a VERSION in a short form for displays The long descriptor will still be available in M115 --- LinuxAddons/bin/generate_version_header_for_marlin | 11 ++++++++--- Marlin/Configuration.h | 2 +- Marlin/Marlin_main.cpp | 2 +- Marlin/configurator/config/Configuration.h | 2 +- Marlin/configurator/config/language.h | 6 +++--- Marlin/example_configurations/Felix/Configuration.h | 2 +- .../example_configurations/Felix/Configuration_DUAL.h | 2 +- .../example_configurations/Hephestos/Configuration.h | 2 +- Marlin/example_configurations/K8200/Configuration.h | 2 +- .../RepRapWorld/Megatronics/Configuration.h | 2 +- .../example_configurations/RigidBot/Configuration.h | 2 +- Marlin/example_configurations/SCARA/Configuration.h | 2 +- Marlin/example_configurations/WITBOX/Configuration.h | 2 +- .../adafruit/ST7565/Configuration.h | 2 +- .../delta/biv2.5/Configuration.h | 2 +- .../delta/generic/Configuration.h | 2 +- .../delta/kossel_mini/Configuration.h | 2 +- .../delta/kossel_pro/Configuration.h | 2 +- Marlin/example_configurations/makibox/Configuration.h | 2 +- .../tvrrug/Round2/Configuration.h | 2 +- Marlin/language.h | 6 +++--- 21 files changed, 32 insertions(+), 27 deletions(-) diff --git a/LinuxAddons/bin/generate_version_header_for_marlin b/LinuxAddons/bin/generate_version_header_for_marlin index 0fa120bde4..a7bef9a5a2 100755 --- a/LinuxAddons/bin/generate_version_header_for_marlin +++ b/LinuxAddons/bin/generate_version_header_for_marlin @@ -21,11 +21,16 @@ echo "#define STRING_DISTRIBUTION_DATE" `date '+"%Y-%m-%d %H:%M"'` >>"$OUTFILE" else BRANCH=" $BRANCH" fi - VERSION=`git describe --tags --first-parent 2>/dev/null` + VERSION=`git describe --tags --first-parent 2>/dev/null` if [ "x$VERSION" != "x" ] ; then - echo "#define BUILD_VERSION \"$VERSION\"" | sed "s/-/$BRANCH-/" >>"$OUTFILE" + echo "#define SHORT_BUILD_VERSION \"$VERSION\"" | sed "s/-.*/$BRANCH\"/" >>"$OUTFILE" + echo "#define DETAILED_BUILD_VERSION \"$VERSION\"" | sed "s/-/$BRANCH-/" >>"$OUTFILE" + else + VERSION=`git describe --tags --first-parent --always 2>/dev/null` + echo "#define SHORT_BUILD_VERSION \"$BRANCH\"" >>"$OUTFILE" + echo "#define DETAILED_BUILD_VERSION \"${BRANCH}-$VERSION\"" >>"$OUTFILE" fi - URL=`git config --local --get remote.origin.url | sed "sx.*github.com:xhttps://github.com/x" | sed "sx\.gitx/x"` + URL=`git config --local --get remote.origin.url | sed "sx.*github.com.xhttps://github.com/x" | sed "sx\.gitx/x"` if [ "x$URL" != "x" ] ; then echo "#define SOURCE_CODE_URL \""$URL"\"" >>"$OUTFILE" echo "// Deprecated URL definition" >>"$OUTFILE" diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index b6e12ee595..32867a9086 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated: // build by the user have been successfully uploaded into firmware. #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. #define SHOW_BOOTSCREEN -#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 //#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 // @section machine diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 0fdbf6eaf8..e702b84bad 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -638,7 +638,7 @@ void setup() { MCUSR = 0; SERIAL_ECHOPGM(MSG_MARLIN); - SERIAL_ECHOLNPGM(" " BUILD_VERSION); + SERIAL_ECHOLNPGM(" " SHORT_BUILD_VERSION); #ifdef STRING_DISTRIBUTION_DATE #ifdef STRING_CONFIG_H_AUTHOR diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h index b6e12ee595..32867a9086 100644 --- a/Marlin/configurator/config/Configuration.h +++ b/Marlin/configurator/config/Configuration.h @@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated: // build by the user have been successfully uploaded into firmware. #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. #define SHOW_BOOTSCREEN -#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 //#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 // @section machine diff --git a/Marlin/configurator/config/language.h b/Marlin/configurator/config/language.h index 1696c9b6c4..53e8b30777 100644 --- a/Marlin/configurator/config/language.h +++ b/Marlin/configurator/config/language.h @@ -75,8 +75,8 @@ #define SOURCE_CODE_URL "https://github.com/MarlinFirmware/Marlin" #endif -#ifndef BUILD_VERSION - #define BUILD_VERSION "V1; Sprinter/grbl mashup for gen6" +#ifndef DETAILED_BUILD_VERSION + #error BUILD_VERSION Information must be specified #endif #ifndef MACHINE_UUID @@ -120,7 +120,7 @@ #define MSG_INVALID_EXTRUDER "Invalid extruder" #define MSG_INVALID_SOLENOID "Invalid solenoid" #define MSG_ERR_NO_THERMISTORS "No thermistors - no temperature" -#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_M115_REPORT "FIRMWARE_NAME:Marlin " DETAILED_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/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index 1d6b8d6fa5..eed4b979cc 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated: // build by the user have been successfully uploaded into firmware. #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. #define SHOW_BOOTSCREEN -#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 //#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 // @section machine diff --git a/Marlin/example_configurations/Felix/Configuration_DUAL.h b/Marlin/example_configurations/Felix/Configuration_DUAL.h index 289a2a41ff..3a6ae8d721 100644 --- a/Marlin/example_configurations/Felix/Configuration_DUAL.h +++ b/Marlin/example_configurations/Felix/Configuration_DUAL.h @@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated: // build by the user have been successfully uploaded into firmware. #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. #define SHOW_BOOTSCREEN -#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 //#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 // @section machine diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index e988fc7321..b6fc265656 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated: // build by the user have been successfully uploaded into firmware. #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. #define SHOW_BOOTSCREEN -#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 //#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 // @section machine diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 3755b6e8cb..f0a766f27c 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -54,7 +54,7 @@ Here are some standard links for getting your machine calibrated: // build by the user have been successfully uploaded into firmware. #define STRING_CONFIG_H_AUTHOR "(K8200, CONSULitAS)" // Who made the changes. #define SHOW_BOOTSCREEN -#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 //#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 // @section machine diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index dec00d78de..6c80e9fb21 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated: // build by the user have been successfully uploaded into firmware. #define STRING_CONFIG_H_AUTHOR "RepRapWorld.com" // Who made the changes. #define SHOW_BOOTSCREEN -#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 //#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 // @section machine diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index e7f5d6a052..d70309e54c 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated: // build by the user have been successfully uploaded into firmware. #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. #define SHOW_BOOTSCREEN -#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 //#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 // @section machine diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 785beb7032..ce57bd9877 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -74,7 +74,7 @@ Here are some standard links for getting your machine calibrated: // build by the user have been successfully uploaded into firmware. #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. #define SHOW_BOOTSCREEN -#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 //#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 // @section machine diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 1777a553b7..718c1518d1 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated: // build by the user have been successfully uploaded into firmware. #define STRING_CONFIG_H_AUTHOR "(bq Witbox)" // Who made the changes. #define SHOW_BOOTSCREEN -#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 //#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 // @section machine diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 975c6cae96..31b8ec589d 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated: // build by the user have been successfully uploaded into firmware. #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. #define SHOW_BOOTSCREEN -#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 //#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 // @section machine diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index 23c704842c..8a9d9395b9 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated: // build by the user have been successfully uploaded into firmware. #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. #define SHOW_BOOTSCREEN -#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 //#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 // @section machine diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 8a0448e9d8..6564673aa1 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated: // build by the user have been successfully uploaded into firmware. #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. #define SHOW_BOOTSCREEN -#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 //#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 // @section machine diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 3c34e231a6..04a1e46840 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated: // build by the user have been successfully uploaded into firmware. #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. #define SHOW_BOOTSCREEN -#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 //#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 // @section machine diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index e62cfbc5ab..d4fbcb326d 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -53,7 +53,7 @@ Here are some standard links for getting your machine calibrated: // build by the user have been successfully uploaded into firmware. #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. #define SHOW_BOOTSCREEN -#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 //#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 // @section machine diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 1b464d6311..2fd0783673 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated: // build by the user have been successfully uploaded into firmware. #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. #define SHOW_BOOTSCREEN -#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 //#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 // @section machine diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index d2acfc0eb5..2067a215ab 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated: // build by the user have been successfully uploaded into firmware. #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. #define SHOW_BOOTSCREEN -#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1 +#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 //#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2 // @section machine diff --git a/Marlin/language.h b/Marlin/language.h index 1696c9b6c4..53e8b30777 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -75,8 +75,8 @@ #define SOURCE_CODE_URL "https://github.com/MarlinFirmware/Marlin" #endif -#ifndef BUILD_VERSION - #define BUILD_VERSION "V1; Sprinter/grbl mashup for gen6" +#ifndef DETAILED_BUILD_VERSION + #error BUILD_VERSION Information must be specified #endif #ifndef MACHINE_UUID @@ -120,7 +120,7 @@ #define MSG_INVALID_EXTRUDER "Invalid extruder" #define MSG_INVALID_SOLENOID "Invalid solenoid" #define MSG_ERR_NO_THERMISTORS "No thermistors - no temperature" -#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_M115_REPORT "FIRMWARE_NAME:Marlin " DETAILED_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)"