浏览代码

Add MSG_THERMAL_RUNAWAY_BED (#9691)

Scott Lahteine 7 年前
父节点
当前提交
83d7e95de0
没有帐户链接到提交者的电子邮件
共有 2 个文件被更改,包括 9 次插入2 次删除
  1. 3
    0
      Marlin/src/lcd/language/language_en.h
  2. 6
    2
      Marlin/src/module/temperature.cpp

+ 3
- 0
Marlin/src/lcd/language/language_en.h 查看文件

789
 #ifndef MSG_THERMAL_RUNAWAY
789
 #ifndef MSG_THERMAL_RUNAWAY
790
   #define MSG_THERMAL_RUNAWAY                 _UxGT("THERMAL RUNAWAY")
790
   #define MSG_THERMAL_RUNAWAY                 _UxGT("THERMAL RUNAWAY")
791
 #endif
791
 #endif
792
+#ifndef MSG_THERMAL_RUNAWAY_BED
793
+  #define MSG_THERMAL_RUNAWAY_BED             _UxGT("BED THERMAL RUNAWAY")
794
+#endif
792
 #ifndef MSG_ERR_MAXTEMP
795
 #ifndef MSG_ERR_MAXTEMP
793
   #define MSG_ERR_MAXTEMP                     _UxGT("Err: MAXTEMP")
796
   #define MSG_ERR_MAXTEMP                     _UxGT("Err: MAXTEMP")
794
 #endif
797
 #endif

+ 6
- 2
Marlin/src/module/temperature.cpp 查看文件

435
               _temp_error(hotend, PSTR(MSG_T_HEATING_FAILED), PSTR(MSG_HEATING_FAILED_LCD));
435
               _temp_error(hotend, PSTR(MSG_T_HEATING_FAILED), PSTR(MSG_HEATING_FAILED_LCD));
436
           }
436
           }
437
           else if (current < target - (MAX_OVERSHOOT_PID_AUTOTUNE)) // Heated, then temperature fell too far?
437
           else if (current < target - (MAX_OVERSHOOT_PID_AUTOTUNE)) // Heated, then temperature fell too far?
438
-            _temp_error(hotend, PSTR(MSG_T_THERMAL_RUNAWAY), PSTR(MSG_THERMAL_RUNAWAY));
438
+            _temp_error(hotend, PSTR(MSG_T_THERMAL_RUNAWAY),
439
+              hotend >= 0 ? PSTR(MSG_THERMAL_RUNAWAY) : PSTR(MSG_THERMAL_RUNAWAY_BED)
440
+            );
439
         #endif
441
         #endif
440
       } // every 2 seconds
442
       } // every 2 seconds
441
 
443
 
1414
         else if (PENDING(millis(), *timer)) break;
1416
         else if (PENDING(millis(), *timer)) break;
1415
         *state = TRRunaway;
1417
         *state = TRRunaway;
1416
       case TRRunaway:
1418
       case TRRunaway:
1417
-        _temp_error(heater_id, PSTR(MSG_T_THERMAL_RUNAWAY), PSTR(MSG_THERMAL_RUNAWAY));
1419
+        _temp_error(heater_id, PSTR(MSG_T_THERMAL_RUNAWAY),
1420
+          heater_id >= 0 ? PSTR(MSG_THERMAL_RUNAWAY) : PSTR(MSG_THERMAL_RUNAWAY_BED)
1421
+        );
1418
     }
1422
     }
1419
   }
1423
   }
1420
 
1424
 

正在加载...
取消
保存