TuningFor FSensor Recovery

Rarely the FSensor becomes unresponsive, at this time it should now re-init sensor and continue. MMU Paused for User messages modified to enable forced filament sensed if in a fail state, not sensing current filament.

Firmware/Marlin_main.cpp

@@ -1683,8 +1683,10 @@ void host_keepalive() {
      switch (busy_state) {
       case IN_HANDLER:
       case IN_PROCESS:
-        SERIAL_ECHO_START;
+        SERIAL_ECHO_START;  // RMM : TODO Working on finding why recover doesn't work after a long period waiting
-        SERIAL_ECHOLNPGM("busy: processing");
+        if ((mmu_state == 1) && fsensor_enabled && mmuFSensorLoading && fsensor_autoload_enabled) SERIAL_ECHOLNPGM ("busy: MK3 Sensing Load for MMU");
+        if (mmu_state == -1) SERIAL_ECHOLNPGM("busy: MMU Reinited");
+        else SERIAL_ECHOLNPGM("busy: processing");
         break;
       case PAUSED_FOR_USER:
         SERIAL_ECHO_START;

Firmware/fsensor.cpp

@@ -177,7 +177,7 @@ bool fsensor_enable(void)
             fsensor_not_responding = false;
         else
             fsensor_not_responding = true;
-        fsensor_enabled = true;
+        fsensor_enabled = pat9125 ? true : false;
         fsensor_autoload_set(true);
         fsensor_autoload_enabled = false;
         fsensor_oq_meassure = false;
@@ -291,12 +291,13 @@ bool fsensor_check_autoload(void)
     if (fsensor_autoload_c != fsensor_autoload_c_old)
         printf_P(PSTR("fsensor_check_autoload dy=%d c=%d sum=%d\n"), dy, fsensor_autoload_c, fsensor_autoload_sum);
 #endif
-//  if ((fsensor_autoload_c >= 15) && (fsensor_autoload_sum > 30))
     if ((fsensor_autoload_c >= 12) && (fsensor_autoload_sum > 20))
     {
-        if (mmu_enabled) mmu_command(MMU_CMD_FS);
+        if (mmu_enabled) {
-        fsensor_autoload_check_stop();
+          mmu_command(MMU_CMD_FS);
-        fsensor_autoload_enabled = false;
+          fsensor_autoload_check_stop();
+          fsensor_autoload_enabled = false;
+        }
         return true;
     }
     return false;

Firmware/mmu.cpp

@@ -22,7 +22,7 @@
 
 #define MMU_TODELAY 100
 #define MMU_TIMEOUT 10
-#define MMU_CMD_TIMEOUT 300000ul //5min timeout for mmu commands (except P0)
+#define MMU_CMD_TIMEOUT 30000ul  //300000ul //5min timeout for mmu commands (except P0)
 #define MMU_P0_TIMEOUT 3000ul //timeout for P0 command: 3seconds
 
 #ifdef MMU_HWRESET
@@ -34,6 +34,7 @@ bool mmu_enabled = false;
 bool mmu_ready = false;
 
 bool mmuFSensorLoading = false;
+bool alreadyLcdClicked = false;
 int lastLoadedFilament = -10;
 
 int8_t mmu_state = 0;
@@ -160,14 +161,6 @@ int8_t mmu_rx_ok(void)
     return res;
 }
 
-//check 'nk' response
-int8_t mmu_rx_not_ok(void)
-{
-    int8_t res = uart2_rx_str_P(PSTR("nk\n"));
-    if (res == 1) mmu_last_response = millis();
-    return res;
-}
-
 //check 'MK3 FSensor requested to look for load' response
 int8_t mmu_rx_fsensorLook(void)
 {
@@ -210,7 +203,6 @@ void mmu_init(void)
  *  2 >>  1 MMURX ok, Finda State
  *  3 >>  1 MMURX ok, mmu commands response
  * 10 >>  3 MMUECHO, confirm receipt of cmd (timeout 500ms to resend)
- * 20 >>  1 not_ok
  */
 
 void mmu_loop(void)
@@ -429,13 +421,14 @@ void mmu_loop(void)
         {
             mmu_puts_P(PSTR("P0\n")); //send 'read finda' request
             mmu_state = 2;
+        } else if (((mmu_last_response + 500) < millis()) && mmuFSensorLoading) {
+          if (!fsensor_enabled) fsensor_enable();
         }
         return;
     case 2: //response to command P0
         if (mmu_rx_ok() > 0)
         {
             fscanf_P(uart2io, PSTR("%hhu"), &mmu_finda); //scan finda from buffer
-            //printf_P(PSTR("MMU => '%dok'\n"), mmu_finda);
             if (!mmu_finda && CHECK_FINDA && fsensor_enabled) {
               fsensor_stop_and_save_print();
               enquecommand_front_P(PSTR("FSENSOR_RECOVER")); //then recover
@@ -467,17 +460,6 @@ void mmu_loop(void)
             printf_P(PSTR("MMU => 'ok'\n"));
             mmu_ready = true;
             mmu_state = 1;
-        } else if(mmu_rx_not_ok() > 0)
-        {
-            printf_P(PSTR("MMU => 'fixTheProblem!!'\n"));
-            mmu_ready = false;
-            mmu_state = 20;
-        }
-        else if ((mmu_last_request + MMU_CMD_TIMEOUT) < millis())
-        {   //resend request after timeout (5 min)
-            printf_P(PSTR("MMU => 'Erro 5m Timeout'\n"));
-            mmu_ready = false;
-            mmu_state = 20;
         }
         return;
     case 10: //echo response, comms confirmation
@@ -491,13 +473,6 @@ void mmu_loop(void)
             mmu_state = 1;
         }
         return;
-    case 20: // MMU in fixTheProblem mode, we're waiting for an all good from it to continue.
-        if (mmu_rx_ok() > 0)
-        {
-            //if ok received then go back to ready
-            mmu_state = 1;
-            mmu_ready = true;
-        }
     }
 }
 
@@ -548,7 +523,7 @@ bool mmu_get_response(void)
     }
     while (!mmu_ready)
     {
-        if ((mmu_state == 3) || (mmu_state == 10) || ((mmuFSensorLoading) && ((mmu_last_request + MMU_CMD_TIMEOUT) > millis()))) {
+        if (((mmu_state == 3) || (mmu_state == 10) || (mmuFSensorLoading)) && ((mmu_last_request + MMU_CMD_TIMEOUT) > millis())) {
             delay_keep_alive(100);
         } else {
             break;
@@ -581,6 +556,7 @@ void manage_response(bool move_axes, bool turn_off_nozzle)
           }
           st_synchronize();
           mmu_print_saved = true;
+          SERIAL_ECHOLNPGM("// action:pause"); //for octoprint
           printf_P(PSTR("MMU not responding\n"));
           hotend_temp_bckp = degTargetHotend(active_extruder);
           if (move_axes) {
@@ -611,8 +587,17 @@ void manage_response(bool move_axes, bool turn_off_nozzle)
           lcd_display_message_fullscreen_P(_i("MMU needs user attention."));
           screen++;
         }
-        else {  //screen 1
+        else if (screen == 1) {  //screen 1
-          if((degTargetHotend(active_extruder) == 0) && turn_off_nozzle) lcd_display_message_fullscreen_P(_i("Press the knob to resume nozzle temperature."));
+          if((degTargetHotend(active_extruder) == 0) && turn_off_nozzle) {
+            lcd_display_message_fullscreen_P(_i("Press the knob to resume nozzle temperature."));
+            screen = 0;
+          } else {
+            lcd_display_message_fullscreen_P(_i("Fix the issue and then press button on MMU unit."));
+            screen++;
+          }
+        } if (screen == 2) {  //screen 1
+          if(alreadyLcdClicked) lcd_display_message_fullscreen_P(_i("Press the knob, Manual Filament Sense to MMU."));
+          else if (!fsensor_enabled) lcd_display_message_fullscreen_P(_i("Fix the issue, MMU Button. FSensor Off :("));
           else lcd_display_message_fullscreen_P(_i("Fix the issue and then press button on MMU unit."));
           screen=0;
         }
@@ -626,14 +611,26 @@ void manage_response(bool move_axes, bool turn_off_nozzle)
 
         //5 seconds delay
         for (uint8_t i = 0; i < 50; i++) {
-          if (lcd_clicked()) {
+          if (lcd_clicked() && !alreadyLcdClicked) {
             setTargetHotend(hotend_temp_bckp, active_extruder);
+            alreadyLcdClicked = true;
+            if (mmuFSensorLoading) {
+              if (!fsensor_enabled) fsensor_enable(); 
+              if (!fsensor_autoload_enabled) fsensor_autoload_enabled  = true;
+              fsensor_autoload_check_stop();
+            } else if (lcd_clicked() && alreadyLcdClicked) {
+              mmu_command(MMU_CMD_FS); // manually tell MMU that filament is loaded
+              fsensor_autoload_check_stop();
+              fsensor_autoload_enabled = false;
+              alreadyLcdClicked = false;
+            }
             break;
           }
           delay_keep_alive(100);
         }
       }
       else if (mmu_print_saved) {
+        SERIAL_ECHOLNPGM("// action:resume"); //for octoprint
         printf_P(PSTR("MMU starts responding\n"));
         if (turn_off_nozzle) 
         {

Firmware/mmu.h

@@ -47,15 +47,12 @@ extern int8_t mmu_rx_echo(void);
 
 extern int8_t mmu_rx_ok(void);
 
-extern int8_t mmu_rx_not_ok(void);
-
 extern int8_t mmu_rx_sensFilatBoot(void);
 
 extern void mmu_init(void);
 
 extern void mmu_loop(void);
 
-
 extern void mmu_reset(void);
 
 extern int8_t mmu_set_filament_type(uint8_t extruder, uint8_t filament);

Firmware/pat9125.c

@@ -33,6 +33,7 @@
 #include "swi2c.h"
 #endif //PAT9125_SWI2C
 
+#define PAT9125_NEW_INIT
 
 uint8_t pat9125_PID1 = 0;
 uint8_t pat9125_PID2 = 0;