Merge branch 'master' into 12864-full

Marlin/AnycubicTFT.cpp

@@ -264,13 +264,14 @@ void AnycubicTFTClass::FilamentChangeResume(){
         HOTEND_LOOP() thermalManager.reset_heater_idle_timer(e); // resume heating if timed out
         wait_for_heatup = false;
         wait_for_user = false; // remove waiting flags
-        // TFTstate=ANYCUBIC_TFT_STATE_SDPRINT;
+        card.startFileprint(); // resume with proper progress state
 #ifdef ANYCUBIC_TFT_DEBUG
         SERIAL_ECHOLNPGM("DEBUG: M108 Resume called");
 #endif
 }
 
 void AnycubicTFTClass::FilamentChangePause(){
+        PausedByFilamentChange=true;
         enqueue_and_echo_commands_P(PSTR("M600"));
         TFTstate=ANYCUBIC_TFT_STATE_SDPAUSE_REQ; // set TFT state to paused
 #ifdef ANYCUBIC_TFT_DEBUG
@@ -329,7 +330,6 @@ void AnycubicTFTClass::HandleSpecialMenu()
                 enqueue_and_echo_commands_P(PSTR("G91\nG1 Z-0.1\nG90"));
         } else if (strcmp(SelectedDirectory, "<filamentchange pause>")==0) {
                 SERIAL_PROTOCOLLNPGM("Special Menu: FilamentChange Pause");
-                PausedByFilamentChange=true;
                 FilamentChangePause();
         } else if (strcmp(SelectedDirectory, "<filamentchange resume>")==0) {
                 SERIAL_PROTOCOLLNPGM("Special Menu: FilamentChange Resume");
@@ -606,7 +606,7 @@ void AnycubicTFTClass::FilamentRunout()
         if(FilamentTestStatus>FilamentTestLastStatus)
         {
                 FilamentRunoutCounter++;
-                if(FilamentRunoutCounter>=15800)
+                if(FilamentRunoutCounter>=31600)
                 {
                         FilamentRunoutCounter=0;
 #ifdef SDSUPPORT

Marlin/Configuration.h

@@ -83,10 +83,10 @@
 // User-specified version info of this build to display in [Pronterface, etc] terminal window during
 // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this
 // build by the user have been successfully uploaded into firmware.
-#define STRING_CONFIG_H_AUTHOR "davidramiro - v1.4.0" // Who made the changes.
+#define STRING_CONFIG_H_AUTHOR "(davidramiro)" // Who made the changes.
 #define SHOW_BOOTSCREEN
-#define STRING_SPLASH_LINE1 SHORT_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 WEBSITE_URL         // will be shown during bootup in line 2
+#define STRING_SPLASH_LINE2 CUSTOM_BUILD_VERSION  // will be shown during bootup in line 2
 
 /**
  * *** VENDORS PLEASE READ ***

Marlin/Marlin_main.cpp

@@ -10992,12 +10992,23 @@ inline void gcode_M502() {
    *  Default values are used for omitted arguments.
    */
   inline void gcode_M600() {
+
     #ifdef SDSUPPORT
-        if ((AnycubicTFT.TFTstate==ANYCUBIC_TFT_STATE_SDPRINT)){
+      if (card.sdprinting) { // are we printing from sd?
-        AnycubicTFT.TFTstate=ANYCUBIC_TFT_STATE_SDPAUSE_REQ;
+        #ifdef ANYCUBIC_TFT_DEBUG
-        AnycubicTFT.PausedByFilamentChange=true;
+            SERIAL_ECHOLNPGM("DEBUG: Enter M600 TFTstate routine");
-        }
+        #endif
+        AnycubicTFT.TFTstate=ANYCUBIC_TFT_STATE_SDPAUSE_REQ; // enter correct display state to show resume button
+        #ifdef ANYCUBIC_TFT_DEBUG
+            SERIAL_ECHOLNPGM("DEBUG: Set TFTstate to SDPAUSE_REQ");
+        #endif
+        AnycubicTFT.PausedByFilamentChange=true; // set flag to ensure correct resume routine gets executed
+        #ifdef ANYCUBIC_TFT_DEBUG
+            SERIAL_ECHOLNPGM("DEBUG: Set filament change flag");
+        #endif
+      }
     #endif
+
     point_t park_point = NOZZLE_PARK_POINT;
 
     if (get_target_extruder_from_command(600)) return;
@@ -15132,6 +15143,9 @@ void setup() {
   SERIAL_ECHOPGM(MSG_MARLIN);
   SERIAL_CHAR(' ');
   SERIAL_ECHOLNPGM(SHORT_BUILD_VERSION);
+  SERIAL_ECHOPGM(MSG_MARLIN_AI3M);
+  SERIAL_CHAR(' ');
+  SERIAL_ECHOLNPGM(CUSTOM_BUILD_VERSION);
   SERIAL_EOL();
 
   #if defined(STRING_DISTRIBUTION_DATE) && defined(STRING_CONFIG_H_AUTHOR)

Marlin/Version.h

@@ -37,18 +37,24 @@
    */
   #define SHORT_BUILD_VERSION "1.1.9"
 
+  /**
+   * Defines the version of the Marlin-AI3M build. Not to be confused with
+   * Marlin's own build number, e.g. 1.1.9.
+   */
+  #define CUSTOM_BUILD_VERSION "v1.4.2"
+
   /**
    * 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, davidramiro)"
+  #define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION "(Github, davidramiro)"
 
   /**
    * 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 "2019-02-18"
+  #define STRING_DISTRIBUTION_DATE "2019-02-24"
 
   /**
    * Required minimum Configuration.h and Configuration_adv.h file versions.
@@ -78,7 +84,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/davidramiro/Marlin-AI3M"
 
   /**
    * Default generic printer UUID.

Marlin/language.h

@@ -137,7 +137,8 @@
 #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 " DETAILED_BUILD_VERSION " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID
+#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 " MARLIN-AI3M_VERSION:" CUSTOM_BUILD_VERSION
+#define MSG_MARLIN_AI3M                     "Marlin-AI3M"
 #define MSG_COUNT_X                         " Count X:"
 #define MSG_COUNT_A                         " Count A:"
 #define MSG_ERR_KILLED                      "Printer halted. kill() called!"