Skip to content

M
MarlinKimbra
Commit 200bcf80 authored by MagoKimbra's avatar MagoKimbra
Browse files
Options

Merge remote-tracking branch 'refs/remotes/origin/master' into dev

parents 5c644442 e16d723c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 136 deletions
MarlinKimbra/Marlin_main.cpp
View file @ 200bcf80
...@@ -834,7 +834,7 @@ void setup() { ...@@ -834,7 +834,7 @@ void setup() {
if (mcu & 32) ECHO_EM(SERIAL_SOFTWARE_RESET); if (mcu & 32) ECHO_EM(SERIAL_SOFTWARE_RESET);
MCUSR = 0; MCUSR = 0;
ECHO_LM(DB, MSG_MARLIN " " BUILD_VERSION); ECHO_LM(DB, BUILD_VERSION);
#if ENABLED(STRING_DISTRIBUTION_DATE) && ENABLED(STRING_CONFIG_H_AUTHOR) #if ENABLED(STRING_DISTRIBUTION_DATE) && ENABLED(STRING_CONFIG_H_AUTHOR)
ECHO_LM(DB, SERIAL_CONFIGURATION_VER STRING_DISTRIBUTION_DATE SERIAL_AUTHOR STRING_CONFIG_H_AUTHOR); ECHO_LM(DB, SERIAL_CONFIGURATION_VER STRING_DISTRIBUTION_DATE SERIAL_AUTHOR STRING_CONFIG_H_AUTHOR);
......
MarlinKimbra/language/language.h
View file @ 200bcf80
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment