diff --git a/Marlin/Version.h b/Marlin/Version.h index 48dcbc9c71..7112ae6f8b 100644 --- a/Marlin/Version.h +++ b/Marlin/Version.h @@ -35,20 +35,20 @@ /** * Marlin release version identifier */ - #define SHORT_BUILD_VERSION "bugfix-1.1.x" + #define SHORT_BUILD_VERSION "M119 Trex B3" /** * Verbose version identifier which should contain a reference to the location * from where the binary was downloaded or the source code was compiled. */ - #define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " (Github)" + #define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " TM3D" /** * The STRING_DISTRIBUTION_DATE represents when the binary file was built, * here we define this default string as the date where the latest release * version was tagged. */ - #define STRING_DISTRIBUTION_DATE "2018-07-31" + #define STRING_DISTRIBUTION_DATE "2019-06-22" /** * Required minimum Configuration.h and Configuration_adv.h file versions. @@ -70,7 +70,7 @@ /** * Defines a generic printer name to be output to the LCD after booting Marlin. */ - #define MACHINE_NAME "3D Printer" + #define MACHINE_NAME "TM3DTrex" /** * The SOURCE_CODE_URL is the location where users will find the Marlin Source @@ -78,7 +78,7 @@ * has a distinct Github fork— the Source Code URL should just be the main * Marlin repository. */ - #define SOURCE_CODE_URL "https://github.com/MarlinFirmware/Marlin" + #define SOURCE_CODE_URL "https://github.com/InsanityAutomation/Marlin/tree/Trex3_1.1.9" /** * Default generic printer UUID. @@ -89,6 +89,6 @@ * The WEBSITE_URL is the location where users can get more information such as * documentation about a specific Marlin release. */ - #define WEBSITE_URL "http://marlinfw.org" + #define WEBSITE_URL "https://tinymachines3d.com" #endif // USE_AUTOMATIC_VERSIONING diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index dec7f9ee78..0f30b61261 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -505,7 +505,7 @@ uint16_t max_display_update_time = 0; if (currentScreen == lcd_status_screen) doubleclick_expire_ms = millis() + DOUBLECLICK_MAX_INTERVAL; } - else if (screen == lcd_status_screen && currentScreen == lcd_main_menu && PENDING(millis(), doubleclick_expire_ms) && (planner.movesplanned() || IS_SD_PRINTING())) + else if (screen == lcd_status_screen && currentScreen == lcd_main_menu && PENDING(millis(), doubleclick_expire_ms) && all_axes_known()) screen = #if ENABLED(BABYSTEP_ZPROBE_OFFSET) lcd_babystep_zoffset