Filament runout acoustic warning (#1428)

bigtreetech · Dec 24, 2020 · 6d87753 · 6d87753
1 parent 43a9f40
commit 6d87753
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 12 deletions.
diff --git a/Copy to SD Card root directory to update/Language Packs/language_cn.ini b/Copy to SD Card root directory to update/Language Packs/language_cn.ini
@@ -66,7 +66,7 @@ label_save:保存参数
 label_restore:恢复
 label_reset:重置
 label_default:默认
-label_clear:清楚
+label_clear:清除
 label_next:下一个
 label_distance:距离
 label_invalid_value:没有有效的条件!

diff --git a/Copy to SD Card root directory to update/Language Packs/language_en.ini b/Copy to SD Card root directory to update/Language Packs/language_en.ini
@@ -176,7 +176,7 @@ label_u_disk_removed:U Disk removed!
 label_onboardsd:OnboardSD
 label_read_onboardsd_error:Read Onboard SD card error!
 label_filament_sensor:Filament sensor
-label_filament_runout:filament runout!
+label_filament_runout:Filament runout!
 label_preheat:Preheat
 label_preheat_both:Both
 label_is_pause:Unable to extrude when\nprinting.\nPause printing?

diff --git a/TFT/src/User/API/Language/language_en.h b/TFT/src/User/API/Language/language_en.h
@@ -174,7 +174,7 @@
     #define STRING_ONBOARDSD              "OnboardSD"
     #define STRING_READ_ONBOARDSD_ERROR   "Read Onboard SD card error!"
     #define STRING_FILAMENT_SENSOR        "Filament sensor"
-    #define STRING_FILAMENT_RUNOUT        "filament runout!"
+    #define STRING_FILAMENT_RUNOUT        "Filament runout!"
     #define STRING_PREHEAT                "Preheat"
     #define STRING_PREHEAT_BOTH           "Both"
     #define STRING_IS_PAUSE               "Unable to extrude when\nprinting.\nPause printing?"

diff --git a/TFT/src/User/API/Printing.c b/TFT/src/User/API/Printing.c
@@ -4,6 +4,8 @@
 
 PRINTING infoPrinting;
 
+bool filamentRunoutAlarm;
+
 static bool updateM27_waiting = false;
 static float last_E_pos;
 
@@ -86,6 +88,21 @@ void setPrintRunout(bool runout)
   infoPrinting.runout = runout;
 }
 
+void setRunoutAlarmTrue(void)
+{
+  filamentRunoutAlarm = true;
+}
+
+void setRunoutAlarmFalse(void)
+{
+  filamentRunoutAlarm = false;
+}
+
+bool getRunoutAlarm(void)
+{
+  return filamentRunoutAlarm;
+}
+
 void setPrintModelIcon(bool exist)
 {
   infoPrinting.model_icon = exist;
@@ -171,8 +188,12 @@ bool setPrintPause(bool is_pause, bool is_m0pause)
     case TFT_UDISK:
     case TFT_SD:
       infoPrinting.pause = is_pause;
-      if(infoPrinting.pause == true && is_m0pause == false){
-      while (infoCmd.count != 0) {loopProcess();}
+      if(infoPrinting.pause == true && is_m0pause == false)
+      {
+        while (infoCmd.count != 0)
+        {
+            loopProcess();
+        }
       }
 
       bool isCoorRelative = coorGetRelative();
@@ -404,17 +425,20 @@ void getGcodeFromFile(void)
 
 void breakAndContinue(void)
 {
-   Serial_Puts(SERIAL_PORT, "M108\n");
+  setRunoutAlarmFalse();
+  Serial_Puts(SERIAL_PORT, "M108\n");
 }
 
 void resumeAndPurge(void)
 {
-   Serial_Puts(SERIAL_PORT, "M876 S0\n");
+  setRunoutAlarmFalse();
+  Serial_Puts(SERIAL_PORT, "M876 S0\n");
 }
 
 void resumeAndContinue(void)
 {
-   Serial_Puts(SERIAL_PORT, "M876 S1\n");
+  setRunoutAlarmFalse();
+  Serial_Puts(SERIAL_PORT, "M876 S1\n");
 }
 
 bool hasPrintingMenu(void)

diff --git a/TFT/src/User/API/Printing.h b/TFT/src/User/API/Printing.h
@@ -67,6 +67,9 @@ uint32_t getPrintSize(void);
 uint32_t getPrintCur(void);
 bool getPrintRunout(void);
 void setPrintRunout(bool runout);
+void setRunoutAlarmFalse(void);
+void setRunoutAlarmTrue(void);
+bool getRunoutAlarm(void);
 void setPrintModelIcon(bool exist);
 bool getPrintModelIcon(void);
 

diff --git a/TFT/src/User/API/extend.c b/TFT/src/User/API/extend.c
@@ -209,12 +209,22 @@ void loopBackEndFILRunoutDetect(void)
 
 void loopFrontEndFILRunoutDetect(void)
 {
-  if (!getPrintRunout()) return;
+  static uint32_t nextTime = 0;
+  #define ALARM_REMINDER_TIME 10000
+  if (!getPrintRunout() && !getRunoutAlarm()) return;
 
-  if (setPrintPause(true,false))
+  if (setPrintPause(true,false) && !getRunoutAlarm())
   {
     setPrintRunout(false);
-    popupReminder(DIALOG_TYPE_ERROR, LABEL_WARNING, LABEL_FILAMENT_RUNOUT);
+    setRunoutAlarmTrue();
+    setDialogText(LABEL_WARNING, LABEL_FILAMENT_RUNOUT, LABEL_CONFIRM, LABEL_BACKGROUND);
+    showDialog(DIALOG_TYPE_ALERT, setRunoutAlarmFalse, NULL, NULL);
+  } 
+
+  if ((OS_GetTimeMs() > nextTime) && (getRunoutAlarm() == true))
+  {
+    BUZZER_PLAY(sound_error);
+    nextTime = OS_GetTimeMs() + ALARM_REMINDER_TIME;
   }
 }
 

diff --git a/TFT/src/User/API/parseACK.c b/TFT/src/User/API/parseACK.c
@@ -237,7 +237,8 @@ void hostActionCommands(void)
     {
       case 0:
         BUZZER_PLAY(sound_notify);
-        popupReminder(DIALOG_TYPE_ALERT,(u8 *)"Message", (u8 *)hostAction.prompt_begin);
+        setDialogText((uint8_t *)"Message", (uint8_t *)hostAction.prompt_begin, LABEL_CONFIRM, LABEL_BACKGROUND);
+        showDialog(DIALOG_TYPE_ALERT, setRunoutAlarmFalse, NULL, NULL);
         break;
       case 1:
         BUZZER_PLAY(sound_notify);
@@ -255,6 +256,10 @@ void hostActionCommands(void)
   if (ack_seen("paused") || ack_seen("pause"))
   {
     infoPrinting.pause = true;
+    if (ack_seen ("filament_runout"))
+    {
+      setRunoutAlarmTrue();
+    }
   }
   else if (ack_seen("cancel"))  //To be added to Marlin abortprint routine
   {