소스 검색

Merge pull request #4252 from thinkyhead/rc_rename_hpb

Replace PLA/ABS preheating with generic
Scott Lahteine 9 년 전
부모
커밋
a8b6b6a128
52개의 변경된 파일490개의 추가작업 그리고 483개의 파일을 삭제
  1. 6
    6
      Marlin/Configuration.h
  2. 6
    6
      Marlin/Marlin_main.cpp
  3. 12
    0
      Marlin/SanityCheck.h
  4. 34
    34
      Marlin/configuration_store.cpp
  5. 6
    6
      Marlin/example_configurations/Cartesio/Configuration.h
  6. 6
    6
      Marlin/example_configurations/Felix/Configuration.h
  7. 6
    6
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  8. 6
    6
      Marlin/example_configurations/Hephestos/Configuration.h
  9. 6
    6
      Marlin/example_configurations/Hephestos_2/Configuration.h
  10. 6
    6
      Marlin/example_configurations/K8200/Configuration.h
  11. 6
    6
      Marlin/example_configurations/K8400/Configuration.h
  12. 6
    6
      Marlin/example_configurations/K8400/Dual Heads/Configuration.h
  13. 6
    6
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  14. 6
    6
      Marlin/example_configurations/RigidBot/Configuration.h
  15. 6
    6
      Marlin/example_configurations/SCARA/Configuration.h
  16. 6
    6
      Marlin/example_configurations/TAZ4/Configuration.h
  17. 6
    6
      Marlin/example_configurations/WITBOX/Configuration.h
  18. 6
    6
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  19. 6
    6
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  20. 6
    6
      Marlin/example_configurations/delta/generic/Configuration.h
  21. 6
    6
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  22. 6
    6
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  23. 6
    6
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  24. 6
    6
      Marlin/example_configurations/makibox/Configuration.h
  25. 6
    6
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  26. 10
    10
      Marlin/language_an.h
  27. 10
    10
      Marlin/language_bg.h
  28. 10
    10
      Marlin/language_ca.h
  29. 10
    10
      Marlin/language_cn.h
  30. 10
    10
      Marlin/language_cz.h
  31. 10
    10
      Marlin/language_da.h
  32. 10
    10
      Marlin/language_de.h
  33. 20
    20
      Marlin/language_en.h
  34. 10
    10
      Marlin/language_es.h
  35. 10
    10
      Marlin/language_eu.h
  36. 10
    10
      Marlin/language_fi.h
  37. 10
    10
      Marlin/language_fr.h
  38. 10
    10
      Marlin/language_gl.h
  39. 10
    10
      Marlin/language_hr.h
  40. 10
    10
      Marlin/language_it.h
  41. 10
    10
      Marlin/language_kana.h
  42. 10
    10
      Marlin/language_kana_utf8.h
  43. 10
    10
      Marlin/language_nl.h
  44. 10
    10
      Marlin/language_pl.h
  45. 10
    10
      Marlin/language_pt-br.h
  46. 10
    10
      Marlin/language_pt-br_utf8.h
  47. 10
    10
      Marlin/language_pt.h
  48. 10
    10
      Marlin/language_pt_utf8.h
  49. 10
    10
      Marlin/language_ru.h
  50. 6
    6
      Marlin/language_test.h
  51. 44
    49
      Marlin/ultralcd.cpp
  52. 6
    6
      Marlin/ultralcd.h

+ 6
- 6
Marlin/Configuration.h 파일 보기

779
 // @section temperature
779
 // @section temperature
780
 
780
 
781
 // Preheat Constants
781
 // Preheat Constants
782
-#define PLA_PREHEAT_HOTEND_TEMP 180
783
-#define PLA_PREHEAT_HPB_TEMP 70
784
-#define PLA_PREHEAT_FAN_SPEED 0   // Insert Value between 0 and 255
782
+#define PREHEAT_1_TEMP_HOTEND 180
783
+#define PREHEAT_1_TEMP_BED     70
784
+#define PREHEAT_1_FAN_SPEED     0 // Value from 0 to 255
785
 
785
 
786
-#define ABS_PREHEAT_HOTEND_TEMP 240
787
-#define ABS_PREHEAT_HPB_TEMP 110
788
-#define ABS_PREHEAT_FAN_SPEED 0   // Insert Value between 0 and 255
786
+#define PREHEAT_2_TEMP_HOTEND 240
787
+#define PREHEAT_2_TEMP_BED    110
788
+#define PREHEAT_2_FAN_SPEED     0 // Value from 0 to 255
789
 
789
 
790
 //
790
 //
791
 // Print job timer
791
 // Print job timer

+ 6
- 6
Marlin/Marlin_main.cpp 파일 보기

4862
         case 0:
4862
         case 0:
4863
           if (code_seen('H')) {
4863
           if (code_seen('H')) {
4864
             v = code_value_int();
4864
             v = code_value_int();
4865
-            plaPreheatHotendTemp = constrain(v, EXTRUDE_MINTEMP, HEATER_0_MAXTEMP - 15);
4865
+            preheatHotendTemp1 = constrain(v, EXTRUDE_MINTEMP, HEATER_0_MAXTEMP - 15);
4866
           }
4866
           }
4867
           if (code_seen('F')) {
4867
           if (code_seen('F')) {
4868
             v = code_value_int();
4868
             v = code_value_int();
4869
-            plaPreheatFanSpeed = constrain(v, 0, 255);
4869
+            preheatFanSpeed1 = constrain(v, 0, 255);
4870
           }
4870
           }
4871
           #if TEMP_SENSOR_BED != 0
4871
           #if TEMP_SENSOR_BED != 0
4872
             if (code_seen('B')) {
4872
             if (code_seen('B')) {
4873
               v = code_value_int();
4873
               v = code_value_int();
4874
-              plaPreheatHPBTemp = constrain(v, BED_MINTEMP, BED_MAXTEMP - 15);
4874
+              preheatBedTemp1 = constrain(v, BED_MINTEMP, BED_MAXTEMP - 15);
4875
             }
4875
             }
4876
           #endif
4876
           #endif
4877
           break;
4877
           break;
4878
         case 1:
4878
         case 1:
4879
           if (code_seen('H')) {
4879
           if (code_seen('H')) {
4880
             v = code_value_int();
4880
             v = code_value_int();
4881
-            absPreheatHotendTemp = constrain(v, EXTRUDE_MINTEMP, HEATER_0_MAXTEMP - 15);
4881
+            preheatHotendTemp2 = constrain(v, EXTRUDE_MINTEMP, HEATER_0_MAXTEMP - 15);
4882
           }
4882
           }
4883
           if (code_seen('F')) {
4883
           if (code_seen('F')) {
4884
             v = code_value_int();
4884
             v = code_value_int();
4885
-            absPreheatFanSpeed = constrain(v, 0, 255);
4885
+            preheatFanSpeed2 = constrain(v, 0, 255);
4886
           }
4886
           }
4887
           #if TEMP_SENSOR_BED != 0
4887
           #if TEMP_SENSOR_BED != 0
4888
             if (code_seen('B')) {
4888
             if (code_seen('B')) {
4889
               v = code_value_int();
4889
               v = code_value_int();
4890
-              absPreheatHPBTemp = constrain(v, BED_MINTEMP, BED_MAXTEMP - 15);
4890
+              preheatBedTemp2 = constrain(v, BED_MINTEMP, BED_MAXTEMP - 15);
4891
             }
4891
             }
4892
           #endif
4892
           #endif
4893
           break;
4893
           break;

+ 12
- 0
Marlin/SanityCheck.h 파일 보기

632
   #error "SERVO_DEACTIVATION_DELAY is deprecated. Use SERVO_DELAY instead."
632
   #error "SERVO_DEACTIVATION_DELAY is deprecated. Use SERVO_DELAY instead."
633
 #elif ENABLED(FILAMENTCHANGEENABLE)
633
 #elif ENABLED(FILAMENTCHANGEENABLE)
634
   #error "FILAMENTCHANGEENABLE is now FILAMENT_CHANGE_FEATURE. Please update your configuration."
634
   #error "FILAMENTCHANGEENABLE is now FILAMENT_CHANGE_FEATURE. Please update your configuration."
635
+#elif defined(PLA_PREHEAT_HOTEND_TEMP)
636
+  #error "PLA_PREHEAT_HOTEND_TEMP is now PREHEAT_1_TEMP_HOTEND. Please update your configuration."
637
+#elif defined(PLA_PREHEAT_HPB_TEMP)
638
+  #error "PLA_PREHEAT_HPB_TEMP is now PREHEAT_1_TEMP_BED. Please update your configuration."
639
+#elif defined(PLA_PREHEAT_FAN_SPEED)
640
+  #error "PLA_PREHEAT_FAN_SPEED is now PREHEAT_1_FAN_SPEED. Please update your configuration."
641
+#elif defined(ABS_PREHEAT_HOTEND_TEMP)
642
+  #error "ABS_PREHEAT_HOTEND_TEMP is now PREHEAT_2_TEMP_HOTEND. Please update your configuration."
643
+#elif defined(ABS_PREHEAT_HPB_TEMP)
644
+  #error "ABS_PREHEAT_HPB_TEMP is now PREHEAT_2_TEMP_BED. Please update your configuration."
645
+#elif defined(ABS_PREHEAT_FAN_SPEED)
646
+  #error "ABS_PREHEAT_FAN_SPEED is now PREHEAT_2_FAN_SPEED. Please update your configuration."
635
 #endif
647
 #endif
636
 
648
 
637
 #endif //SANITYCHECK_H
649
 #endif //SANITYCHECK_H

+ 34
- 34
Marlin/configuration_store.cpp 파일 보기

85
  *  285  M666 Z    z_endstop_adj (float)
85
  *  285  M666 Z    z_endstop_adj (float)
86
  *
86
  *
87
  * ULTIPANEL:
87
  * ULTIPANEL:
88
- *  289  M145 S0 H plaPreheatHotendTemp (int)
89
- *  291  M145 S0 B plaPreheatHPBTemp (int)
90
- *  293  M145 S0 F plaPreheatFanSpeed (int)
91
- *  295  M145 S1 H absPreheatHotendTemp (int)
92
- *  297  M145 S1 B absPreheatHPBTemp (int)
93
- *  299  M145 S1 F absPreheatFanSpeed (int)
88
+ *  289  M145 S0 H preheatHotendTemp1 (int)
89
+ *  291  M145 S0 B preheatBedTemp1 (int)
90
+ *  293  M145 S0 F preheatFanSpeed1 (int)
91
+ *  295  M145 S1 H preheatHotendTemp2 (int)
92
+ *  297  M145 S1 B preheatBedTemp2 (int)
93
+ *  299  M145 S1 F preheatFanSpeed2 (int)
94
  *
94
  *
95
  * PIDTEMP:
95
  * PIDTEMP:
96
  *  301  M301 E0 PIDC  Kp[0], Ki[0], Kd[0], Kc[0] (float x4)
96
  *  301  M301 E0 PIDC  Kp[0], Ki[0], Kd[0], Kc[0] (float x4)
262
   #endif
262
   #endif
263
 
263
 
264
   #if DISABLED(ULTIPANEL)
264
   #if DISABLED(ULTIPANEL)
265
-    int plaPreheatHotendTemp = PLA_PREHEAT_HOTEND_TEMP, plaPreheatHPBTemp = PLA_PREHEAT_HPB_TEMP, plaPreheatFanSpeed = PLA_PREHEAT_FAN_SPEED,
266
-        absPreheatHotendTemp = ABS_PREHEAT_HOTEND_TEMP, absPreheatHPBTemp = ABS_PREHEAT_HPB_TEMP, absPreheatFanSpeed = ABS_PREHEAT_FAN_SPEED;
265
+    int preheatHotendTemp1 = PREHEAT_1_TEMP_HOTEND, preheatBedTemp1 = PREHEAT_1_TEMP_BED, preheatFanSpeed1 = PREHEAT_1_FAN_SPEED,
266
+        preheatHotendTemp2 = PREHEAT_2_TEMP_HOTEND, preheatBedTemp2 = PREHEAT_2_TEMP_BED, preheatFanSpeed2 = PREHEAT_2_FAN_SPEED;
267
   #endif // !ULTIPANEL
267
   #endif // !ULTIPANEL
268
 
268
 
269
-  EEPROM_WRITE_VAR(i, plaPreheatHotendTemp);
270
-  EEPROM_WRITE_VAR(i, plaPreheatHPBTemp);
271
-  EEPROM_WRITE_VAR(i, plaPreheatFanSpeed);
272
-  EEPROM_WRITE_VAR(i, absPreheatHotendTemp);
273
-  EEPROM_WRITE_VAR(i, absPreheatHPBTemp);
274
-  EEPROM_WRITE_VAR(i, absPreheatFanSpeed);
269
+  EEPROM_WRITE_VAR(i, preheatHotendTemp1);
270
+  EEPROM_WRITE_VAR(i, preheatBedTemp1);
271
+  EEPROM_WRITE_VAR(i, preheatFanSpeed1);
272
+  EEPROM_WRITE_VAR(i, preheatHotendTemp2);
273
+  EEPROM_WRITE_VAR(i, preheatBedTemp2);
274
+  EEPROM_WRITE_VAR(i, preheatFanSpeed2);
275
 
275
 
276
   for (uint8_t e = 0; e < MAX_EXTRUDERS; e++) {
276
   for (uint8_t e = 0; e < MAX_EXTRUDERS; e++) {
277
 
277
 
447
     #endif
447
     #endif
448
 
448
 
449
     #if DISABLED(ULTIPANEL)
449
     #if DISABLED(ULTIPANEL)
450
-      int plaPreheatHotendTemp, plaPreheatHPBTemp, plaPreheatFanSpeed,
451
-          absPreheatHotendTemp, absPreheatHPBTemp, absPreheatFanSpeed;
450
+      int preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1,
451
+          preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2;
452
     #endif
452
     #endif
453
 
453
 
454
-    EEPROM_READ_VAR(i, plaPreheatHotendTemp);
455
-    EEPROM_READ_VAR(i, plaPreheatHPBTemp);
456
-    EEPROM_READ_VAR(i, plaPreheatFanSpeed);
457
-    EEPROM_READ_VAR(i, absPreheatHotendTemp);
458
-    EEPROM_READ_VAR(i, absPreheatHPBTemp);
459
-    EEPROM_READ_VAR(i, absPreheatFanSpeed);
454
+    EEPROM_READ_VAR(i, preheatHotendTemp1);
455
+    EEPROM_READ_VAR(i, preheatBedTemp1);
456
+    EEPROM_READ_VAR(i, preheatFanSpeed1);
457
+    EEPROM_READ_VAR(i, preheatHotendTemp2);
458
+    EEPROM_READ_VAR(i, preheatBedTemp2);
459
+    EEPROM_READ_VAR(i, preheatFanSpeed2);
460
 
460
 
461
     #if ENABLED(PIDTEMP)
461
     #if ENABLED(PIDTEMP)
462
       for (uint8_t e = 0; e < MAX_EXTRUDERS; e++) {
462
       for (uint8_t e = 0; e < MAX_EXTRUDERS; e++) {
604
   #endif
604
   #endif
605
 
605
 
606
   #if ENABLED(ULTIPANEL)
606
   #if ENABLED(ULTIPANEL)
607
-    plaPreheatHotendTemp = PLA_PREHEAT_HOTEND_TEMP;
608
-    plaPreheatHPBTemp = PLA_PREHEAT_HPB_TEMP;
609
-    plaPreheatFanSpeed = PLA_PREHEAT_FAN_SPEED;
610
-    absPreheatHotendTemp = ABS_PREHEAT_HOTEND_TEMP;
611
-    absPreheatHPBTemp = ABS_PREHEAT_HPB_TEMP;
612
-    absPreheatFanSpeed = ABS_PREHEAT_FAN_SPEED;
607
+    preheatHotendTemp1 = PREHEAT_1_TEMP_HOTEND;
608
+    preheatBedTemp1 = PREHEAT_1_TEMP_BED;
609
+    preheatFanSpeed1 = PREHEAT_1_FAN_SPEED;
610
+    preheatHotendTemp2 = PREHEAT_2_TEMP_HOTEND;
611
+    preheatBedTemp2 = PREHEAT_2_TEMP_BED;
612
+    preheatFanSpeed2 = PREHEAT_2_FAN_SPEED;
613
   #endif
613
   #endif
614
 
614
 
615
   #if HAS_LCD_CONTRAST
615
   #if HAS_LCD_CONTRAST
814
       SERIAL_ECHOLNPGM("Material heatup parameters:");
814
       SERIAL_ECHOLNPGM("Material heatup parameters:");
815
       CONFIG_ECHO_START;
815
       CONFIG_ECHO_START;
816
     }
816
     }
817
-    SERIAL_ECHOPAIR("  M145 S0 H", plaPreheatHotendTemp);
818
-    SERIAL_ECHOPAIR(" B", plaPreheatHPBTemp);
819
-    SERIAL_ECHOPAIR(" F", plaPreheatFanSpeed);
817
+    SERIAL_ECHOPAIR("  M145 S0 H", preheatHotendTemp1);
818
+    SERIAL_ECHOPAIR(" B", preheatBedTemp1);
819
+    SERIAL_ECHOPAIR(" F", preheatFanSpeed1);
820
     SERIAL_EOL;
820
     SERIAL_EOL;
821
     CONFIG_ECHO_START;
821
     CONFIG_ECHO_START;
822
-    SERIAL_ECHOPAIR("  M145 S1 H", absPreheatHotendTemp);
823
-    SERIAL_ECHOPAIR(" B", absPreheatHPBTemp);
824
-    SERIAL_ECHOPAIR(" F", absPreheatFanSpeed);
822
+    SERIAL_ECHOPAIR("  M145 S1 H", preheatHotendTemp2);
823
+    SERIAL_ECHOPAIR(" B", preheatBedTemp2);
824
+    SERIAL_ECHOPAIR(" F", preheatFanSpeed2);
825
     SERIAL_EOL;
825
     SERIAL_EOL;
826
   #endif // ULTIPANEL
826
   #endif // ULTIPANEL
827
 
827
 

+ 6
- 6
Marlin/example_configurations/Cartesio/Configuration.h 파일 보기

778
 // @section temperature
778
 // @section temperature
779
 
779
 
780
 // Preheat Constants
780
 // Preheat Constants
781
-#define PLA_PREHEAT_HOTEND_TEMP 190
782
-#define PLA_PREHEAT_HPB_TEMP 50
783
-#define PLA_PREHEAT_FAN_SPEED 0   // Insert Value between 0 and 255
781
+#define PREHEAT_1_TEMP_HOTEND 190
782
+#define PREHEAT_1_TEMP_BED     50
783
+#define PREHEAT_1_FAN_SPEED     0 // Value from 0 to 255
784
 
784
 
785
-#define ABS_PREHEAT_HOTEND_TEMP 240
786
-#define ABS_PREHEAT_HPB_TEMP 110
787
-#define ABS_PREHEAT_FAN_SPEED 0   // Insert Value between 0 and 255
785
+#define PREHEAT_2_TEMP_HOTEND 240
786
+#define PREHEAT_2_TEMP_BED    110
787
+#define PREHEAT_2_FAN_SPEED     0 // Value from 0 to 255
788
 
788
 
789
 //
789
 //
790
 // Print job timer
790
 // Print job timer

+ 6
- 6
Marlin/example_configurations/Felix/Configuration.h 파일 보기

762
 // @section temperature
762
 // @section temperature
763
 
763
 
764
 // Preheat Constants
764
 // Preheat Constants
765
-#define PLA_PREHEAT_HOTEND_TEMP 180
766
-#define PLA_PREHEAT_HPB_TEMP 70
767
-#define PLA_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
765
+#define PREHEAT_1_TEMP_HOTEND 180
766
+#define PREHEAT_1_TEMP_BED     70
767
+#define PREHEAT_1_FAN_SPEED   255 // Value from 0 to 255
768
 
768
 
769
-#define ABS_PREHEAT_HOTEND_TEMP 240
770
-#define ABS_PREHEAT_HPB_TEMP 100
771
-#define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
769
+#define PREHEAT_2_TEMP_HOTEND 240
770
+#define PREHEAT_2_TEMP_BED    100
771
+#define PREHEAT_2_FAN_SPEED   255 // Value from 0 to 255
772
 
772
 
773
 //
773
 //
774
 // Print job timer
774
 // Print job timer

+ 6
- 6
Marlin/example_configurations/Felix/DUAL/Configuration.h 파일 보기

760
 // @section temperature
760
 // @section temperature
761
 
761
 
762
 // Preheat Constants
762
 // Preheat Constants
763
-#define PLA_PREHEAT_HOTEND_TEMP 180
764
-#define PLA_PREHEAT_HPB_TEMP 70
765
-#define PLA_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
763
+#define PREHEAT_1_TEMP_HOTEND 180
764
+#define PREHEAT_1_TEMP_BED     70
765
+#define PREHEAT_1_FAN_SPEED   255 // Value from 0 to 255
766
 
766
 
767
-#define ABS_PREHEAT_HOTEND_TEMP 240
768
-#define ABS_PREHEAT_HPB_TEMP 100
769
-#define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
767
+#define PREHEAT_2_TEMP_HOTEND 240
768
+#define PREHEAT_2_TEMP_BED    100
769
+#define PREHEAT_2_FAN_SPEED   255 // Value from 0 to 255
770
 
770
 
771
 //
771
 //
772
 // Print job timer
772
 // Print job timer

+ 6
- 6
Marlin/example_configurations/Hephestos/Configuration.h 파일 보기

771
 // @section temperature
771
 // @section temperature
772
 
772
 
773
 // Preheat Constants
773
 // Preheat Constants
774
-#define PLA_PREHEAT_HOTEND_TEMP 200
775
-#define PLA_PREHEAT_HPB_TEMP 0
776
-#define PLA_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
774
+#define PREHEAT_1_TEMP_HOTEND 200
775
+#define PREHEAT_1_TEMP_BED      0
776
+#define PREHEAT_1_FAN_SPEED   255 // Value from 0 to 255
777
 
777
 
778
-#define ABS_PREHEAT_HOTEND_TEMP 220
779
-#define ABS_PREHEAT_HPB_TEMP 100
780
-#define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
778
+#define PREHEAT_2_TEMP_HOTEND 220
779
+#define PREHEAT_2_TEMP_BED    100
780
+#define PREHEAT_2_FAN_SPEED   255 // Value from 0 to 255
781
 
781
 
782
 //
782
 //
783
 // Print job timer
783
 // Print job timer

+ 6
- 6
Marlin/example_configurations/Hephestos_2/Configuration.h 파일 보기

773
 // @section temperature
773
 // @section temperature
774
 
774
 
775
 // Preheat Constants
775
 // Preheat Constants
776
-#define PLA_PREHEAT_HOTEND_TEMP 210
777
-#define PLA_PREHEAT_HPB_TEMP    70
778
-#define PLA_PREHEAT_FAN_SPEED   0   // Insert Value between 0 and 255
776
+#define PREHEAT_1_TEMP_HOTEND 210
777
+#define PREHEAT_1_TEMP_BED     70
778
+#define PREHEAT_1_FAN_SPEED     0 // Value from 0 to 255
779
 
779
 
780
-#define ABS_PREHEAT_HOTEND_TEMP 240
781
-#define ABS_PREHEAT_HPB_TEMP    110
782
-#define ABS_PREHEAT_FAN_SPEED   0   // Insert Value between 0 and 255
780
+#define PREHEAT_2_TEMP_HOTEND 240
781
+#define PREHEAT_2_TEMP_BED    110
782
+#define PREHEAT_2_FAN_SPEED     0 // Value from 0 to 255
783
 
783
 
784
 //
784
 //
785
 // Print job timer
785
 // Print job timer

+ 6
- 6
Marlin/example_configurations/K8200/Configuration.h 파일 보기

796
 // @section temperature
796
 // @section temperature
797
 
797
 
798
 // Preheat Constants
798
 // Preheat Constants
799
-#define PLA_PREHEAT_HOTEND_TEMP 190
800
-#define PLA_PREHEAT_HPB_TEMP 50 // K8200: set back to 70 if you have an upgraded heatbed power supply
801
-#define PLA_PREHEAT_FAN_SPEED 0   // Insert Value between 0 and 255
799
+#define PREHEAT_1_TEMP_HOTEND 190
800
+#define PREHEAT_1_TEMP_BED     50 // K8200: set back to 70 if you have an upgraded heatbed power supply
801
+#define PREHEAT_1_FAN_SPEED     0 // Value from 0 to 255
802
 
802
 
803
-#define ABS_PREHEAT_HOTEND_TEMP 240
804
-#define ABS_PREHEAT_HPB_TEMP 60 // K8200: set back to 110 if you have an upgraded heatbed power supply
805
-#define ABS_PREHEAT_FAN_SPEED 0   // Insert Value between 0 and 255
803
+#define PREHEAT_2_TEMP_HOTEND 240
804
+#define PREHEAT_2_TEMP_BED     60 // K8200: set back to 110 if you have an upgraded heatbed power supply
805
+#define PREHEAT_2_FAN_SPEED     0 // Value from 0 to 255
806
 
806
 
807
 //
807
 //
808
 // Print job timer
808
 // Print job timer

+ 6
- 6
Marlin/example_configurations/K8400/Configuration.h 파일 보기

779
 // @section temperature
779
 // @section temperature
780
 
780
 
781
 // Preheat Constants
781
 // Preheat Constants
782
-#define PLA_PREHEAT_HOTEND_TEMP 210
783
-#define PLA_PREHEAT_HPB_TEMP 0
784
-#define PLA_PREHEAT_FAN_SPEED 165   // Insert Value between 0 and 255
782
+#define PREHEAT_1_TEMP_HOTEND 210
783
+#define PREHEAT_1_TEMP_BED      0
784
+#define PREHEAT_1_FAN_SPEED   165 // Value from 0 to 255
785
 
785
 
786
-#define ABS_PREHEAT_HOTEND_TEMP 245
787
-#define ABS_PREHEAT_HPB_TEMP 0
788
-#define ABS_PREHEAT_FAN_SPEED 165   // Insert Value between 0 and 255
786
+#define PREHEAT_2_TEMP_HOTEND 245
787
+#define PREHEAT_2_TEMP_BED      0
788
+#define PREHEAT_2_FAN_SPEED   165 // Value from 0 to 255
789
 
789
 
790
 //
790
 //
791
 // Print job timer
791
 // Print job timer

+ 6
- 6
Marlin/example_configurations/K8400/Dual Heads/Configuration.h 파일 보기

779
 // @section temperature
779
 // @section temperature
780
 
780
 
781
 // Preheat Constants
781
 // Preheat Constants
782
-#define PLA_PREHEAT_HOTEND_TEMP 210
783
-#define PLA_PREHEAT_HPB_TEMP 0
784
-#define PLA_PREHEAT_FAN_SPEED 165   // Insert Value between 0 and 255
782
+#define PREHEAT_1_TEMP_HOTEND 210
783
+#define PREHEAT_1_TEMP_BED      0
784
+#define PREHEAT_1_FAN_SPEED   165 // Value from 0 to 255
785
 
785
 
786
-#define ABS_PREHEAT_HOTEND_TEMP 245
787
-#define ABS_PREHEAT_HPB_TEMP 0
788
-#define ABS_PREHEAT_FAN_SPEED 165   // Insert Value between 0 and 255
786
+#define PREHEAT_2_TEMP_HOTEND 245
787
+#define PREHEAT_2_TEMP_BED      0
788
+#define PREHEAT_2_FAN_SPEED   165 // Value from 0 to 255
789
 
789
 
790
 //
790
 //
791
 // Print job timer
791
 // Print job timer

+ 6
- 6
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h 파일 보기

779
 // @section temperature
779
 // @section temperature
780
 
780
 
781
 // Preheat Constants
781
 // Preheat Constants
782
-#define PLA_PREHEAT_HOTEND_TEMP 180
783
-#define PLA_PREHEAT_HPB_TEMP 70
784
-#define PLA_PREHEAT_FAN_SPEED 0   // Insert Value between 0 and 255
782
+#define PREHEAT_1_TEMP_HOTEND 180
783
+#define PREHEAT_1_TEMP_BED     70
784
+#define PREHEAT_1_FAN_SPEED     0 // Value from 0 to 255
785
 
785
 
786
-#define ABS_PREHEAT_HOTEND_TEMP 240
787
-#define ABS_PREHEAT_HPB_TEMP 110
788
-#define ABS_PREHEAT_FAN_SPEED 0   // Insert Value between 0 and 255
786
+#define PREHEAT_2_TEMP_HOTEND 240
787
+#define PREHEAT_2_TEMP_BED    110
788
+#define PREHEAT_2_FAN_SPEED     0 // Value from 0 to 255
789
 
789
 
790
 //
790
 //
791
 // Print job timer
791
 // Print job timer

+ 6
- 6
Marlin/example_configurations/RigidBot/Configuration.h 파일 보기

777
 // @section temperature
777
 // @section temperature
778
 
778
 
779
 // Preheat Constants
779
 // Preheat Constants
780
-#define PLA_PREHEAT_HOTEND_TEMP 180
781
-#define PLA_PREHEAT_HPB_TEMP 70
782
-#define PLA_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
780
+#define PREHEAT_1_TEMP_HOTEND 180
781
+#define PREHEAT_1_TEMP_BED     70
782
+#define PREHEAT_1_FAN_SPEED   255 // Value from 0 to 255
783
 
783
 
784
-#define ABS_PREHEAT_HOTEND_TEMP 240
785
-#define ABS_PREHEAT_HPB_TEMP 110
786
-#define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
784
+#define PREHEAT_2_TEMP_HOTEND 240
785
+#define PREHEAT_2_TEMP_BED    110
786
+#define PREHEAT_2_FAN_SPEED   255 // Value from 0 to 255
787
 
787
 
788
 //
788
 //
789
 // Print job timer
789
 // Print job timer

+ 6
- 6
Marlin/example_configurations/SCARA/Configuration.h 파일 보기

787
 // @section temperature
787
 // @section temperature
788
 
788
 
789
 // Preheat Constants
789
 // Preheat Constants
790
-#define PLA_PREHEAT_HOTEND_TEMP 180
791
-#define PLA_PREHEAT_HPB_TEMP 70
792
-#define PLA_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
790
+#define PREHEAT_1_TEMP_HOTEND 180
791
+#define PREHEAT_1_TEMP_BED     70
792
+#define PREHEAT_1_FAN_SPEED   255 // Value from 0 to 255
793
 
793
 
794
-#define ABS_PREHEAT_HOTEND_TEMP 240
795
-#define ABS_PREHEAT_HPB_TEMP 100
796
-#define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
794
+#define PREHEAT_2_TEMP_HOTEND 240
795
+#define PREHEAT_2_TEMP_BED    100
796
+#define PREHEAT_2_FAN_SPEED   255 // Value from 0 to 255
797
 
797
 
798
 //
798
 //
799
 // Print job timer
799
 // Print job timer

+ 6
- 6
Marlin/example_configurations/TAZ4/Configuration.h 파일 보기

800
 // @section temperature
800
 // @section temperature
801
 
801
 
802
 // Preheat Constants
802
 // Preheat Constants
803
-#define PLA_PREHEAT_HOTEND_TEMP 180
804
-#define PLA_PREHEAT_HPB_TEMP 70
805
-#define PLA_PREHEAT_FAN_SPEED 0   // Insert Value between 0 and 255
803
+#define PREHEAT_1_TEMP_HOTEND 180
804
+#define PREHEAT_1_TEMP_BED     70
805
+#define PREHEAT_1_FAN_SPEED     0 // Value from 0 to 255
806
 
806
 
807
-#define ABS_PREHEAT_HOTEND_TEMP 230
808
-#define ABS_PREHEAT_HPB_TEMP 110
809
-#define ABS_PREHEAT_FAN_SPEED 0   // Insert Value between 0 and 255
807
+#define PREHEAT_2_TEMP_HOTEND 230
808
+#define PREHEAT_2_TEMP_BED    110
809
+#define PREHEAT_2_FAN_SPEED     0 // Value from 0 to 255
810
 
810
 
811
 //
811
 //
812
 // Print job timer
812
 // Print job timer

+ 6
- 6
Marlin/example_configurations/WITBOX/Configuration.h 파일 보기

771
 // @section temperature
771
 // @section temperature
772
 
772
 
773
 // Preheat Constants
773
 // Preheat Constants
774
-#define PLA_PREHEAT_HOTEND_TEMP 200
775
-#define PLA_PREHEAT_HPB_TEMP 0
776
-#define PLA_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
774
+#define PREHEAT_1_TEMP_HOTEND 200
775
+#define PREHEAT_1_TEMP_BED      0
776
+#define PREHEAT_1_FAN_SPEED   255 // Value from 0 to 255
777
 
777
 
778
-#define ABS_PREHEAT_HOTEND_TEMP 220
779
-#define ABS_PREHEAT_HPB_TEMP 100
780
-#define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
778
+#define PREHEAT_2_TEMP_HOTEND 220
779
+#define PREHEAT_2_TEMP_BED    100
780
+#define PREHEAT_2_FAN_SPEED   255 // Value from 0 to 255
781
 
781
 
782
 //
782
 //
783
 // Print job timer
783
 // Print job timer

+ 6
- 6
Marlin/example_configurations/adafruit/ST7565/Configuration.h 파일 보기

779
 // @section temperature
779
 // @section temperature
780
 
780
 
781
 // Preheat Constants
781
 // Preheat Constants
782
-#define PLA_PREHEAT_HOTEND_TEMP 180
783
-#define PLA_PREHEAT_HPB_TEMP 70
784
-#define PLA_PREHEAT_FAN_SPEED 0   // Insert Value between 0 and 255
782
+#define PREHEAT_1_TEMP_HOTEND 180
783
+#define PREHEAT_1_TEMP_BED     70
784
+#define PREHEAT_1_FAN_SPEED     0 // Value from 0 to 255
785
 
785
 
786
-#define ABS_PREHEAT_HOTEND_TEMP 240
787
-#define ABS_PREHEAT_HPB_TEMP 110
788
-#define ABS_PREHEAT_FAN_SPEED 0   // Insert Value between 0 and 255
786
+#define PREHEAT_2_TEMP_HOTEND 240
787
+#define PREHEAT_2_TEMP_BED    110
788
+#define PREHEAT_2_FAN_SPEED     0 // Value from 0 to 255
789
 
789
 
790
 //
790
 //
791
 // Print job timer
791
 // Print job timer

+ 6
- 6
Marlin/example_configurations/delta/biv2.5/Configuration.h 파일 보기

874
 // @section temperature
874
 // @section temperature
875
 
875
 
876
 // Preheat Constants
876
 // Preheat Constants
877
-#define PLA_PREHEAT_HOTEND_TEMP 180
878
-#define PLA_PREHEAT_HPB_TEMP 70
879
-#define PLA_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
877
+#define PREHEAT_1_TEMP_HOTEND 180
878
+#define PREHEAT_1_TEMP_BED     70
879
+#define PREHEAT_1_FAN_SPEED   255 // Value from 0 to 255
880
 
880
 
881
-#define ABS_PREHEAT_HOTEND_TEMP 240
882
-#define ABS_PREHEAT_HPB_TEMP 100
883
-#define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
881
+#define PREHEAT_2_TEMP_HOTEND 240
882
+#define PREHEAT_2_TEMP_BED    100
883
+#define PREHEAT_2_FAN_SPEED   255 // Value from 0 to 255
884
 
884
 
885
 //
885
 //
886
 // Print job timer
886
 // Print job timer

+ 6
- 6
Marlin/example_configurations/delta/generic/Configuration.h 파일 보기

868
 // @section temperature
868
 // @section temperature
869
 
869
 
870
 // Preheat Constants
870
 // Preheat Constants
871
-#define PLA_PREHEAT_HOTEND_TEMP 180
872
-#define PLA_PREHEAT_HPB_TEMP 70
873
-#define PLA_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
871
+#define PREHEAT_1_TEMP_HOTEND 180
872
+#define PREHEAT_1_TEMP_BED     70
873
+#define PREHEAT_1_FAN_SPEED   255 // Value from 0 to 255
874
 
874
 
875
-#define ABS_PREHEAT_HOTEND_TEMP 240
876
-#define ABS_PREHEAT_HPB_TEMP 100
877
-#define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
875
+#define PREHEAT_2_TEMP_HOTEND 240
876
+#define PREHEAT_2_TEMP_BED    100
877
+#define PREHEAT_2_FAN_SPEED   255 // Value from 0 to 255
878
 
878
 
879
 //
879
 //
880
 // Print job timer
880
 // Print job timer

+ 6
- 6
Marlin/example_configurations/delta/kossel_mini/Configuration.h 파일 보기

871
 // @section temperature
871
 // @section temperature
872
 
872
 
873
 // Preheat Constants
873
 // Preheat Constants
874
-#define PLA_PREHEAT_HOTEND_TEMP 180
875
-#define PLA_PREHEAT_HPB_TEMP 70
876
-#define PLA_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
874
+#define PREHEAT_1_TEMP_HOTEND 180
875
+#define PREHEAT_1_TEMP_BED     70
876
+#define PREHEAT_1_FAN_SPEED   255 // Value from 0 to 255
877
 
877
 
878
-#define ABS_PREHEAT_HOTEND_TEMP 240
879
-#define ABS_PREHEAT_HPB_TEMP 100
880
-#define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
878
+#define PREHEAT_2_TEMP_HOTEND 240
879
+#define PREHEAT_2_TEMP_BED    100
880
+#define PREHEAT_2_FAN_SPEED   255 // Value from 0 to 255
881
 
881
 
882
 //
882
 //
883
 // Print job timer
883
 // Print job timer

+ 6
- 6
Marlin/example_configurations/delta/kossel_pro/Configuration.h 파일 보기

871
 // @section temperature
871
 // @section temperature
872
 
872
 
873
 // Preheat Constants
873
 // Preheat Constants
874
-#define PLA_PREHEAT_HOTEND_TEMP 180
875
-#define PLA_PREHEAT_HPB_TEMP 70
876
-#define PLA_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
874
+#define PREHEAT_1_TEMP_HOTEND 180
875
+#define PREHEAT_1_TEMP_BED     70
876
+#define PREHEAT_1_FAN_SPEED   255 // Value from 0 to 255
877
 
877
 
878
-#define ABS_PREHEAT_HOTEND_TEMP 240
879
-#define ABS_PREHEAT_HPB_TEMP 100
880
-#define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
878
+#define PREHEAT_2_TEMP_HOTEND 240
879
+#define PREHEAT_2_TEMP_BED    100
880
+#define PREHEAT_2_FAN_SPEED   255 // Value from 0 to 255
881
 
881
 
882
 //
882
 //
883
 // Print job timer
883
 // Print job timer

+ 6
- 6
Marlin/example_configurations/delta/kossel_xl/Configuration.h 파일 보기

873
 // @section temperature
873
 // @section temperature
874
 
874
 
875
 // Preheat Constants
875
 // Preheat Constants
876
-#define PLA_PREHEAT_HOTEND_TEMP 180
877
-#define PLA_PREHEAT_HPB_TEMP 70
878
-#define PLA_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
876
+#define PREHEAT_1_TEMP_HOTEND 180
877
+#define PREHEAT_1_TEMP_BED     70
878
+#define PREHEAT_1_FAN_SPEED   255 // Value from 0 to 255
879
 
879
 
880
-#define ABS_PREHEAT_HOTEND_TEMP 240
881
-#define ABS_PREHEAT_HPB_TEMP 100
882
-#define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
880
+#define PREHEAT_2_TEMP_HOTEND 240
881
+#define PREHEAT_2_TEMP_BED    100
882
+#define PREHEAT_2_FAN_SPEED   255 // Value from 0 to 255
883
 
883
 
884
 //
884
 //
885
 // Print job timer
885
 // Print job timer

+ 6
- 6
Marlin/example_configurations/makibox/Configuration.h 파일 보기

782
 // @section temperature
782
 // @section temperature
783
 
783
 
784
 // Preheat Constants
784
 // Preheat Constants
785
-#define PLA_PREHEAT_HOTEND_TEMP 180
786
-#define PLA_PREHEAT_HPB_TEMP 70
787
-#define PLA_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
785
+#define PREHEAT_1_TEMP_HOTEND 180
786
+#define PREHEAT_1_TEMP_BED     70
787
+#define PREHEAT_1_FAN_SPEED   255 // Value from 0 to 255
788
 
788
 
789
-#define ABS_PREHEAT_HOTEND_TEMP 240
790
-#define ABS_PREHEAT_HPB_TEMP 100
791
-#define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
789
+#define PREHEAT_2_TEMP_HOTEND 240
790
+#define PREHEAT_2_TEMP_BED    100
791
+#define PREHEAT_2_FAN_SPEED   255 // Value from 0 to 255
792
 
792
 
793
 //
793
 //
794
 // Print job timer
794
 // Print job timer

+ 6
- 6
Marlin/example_configurations/tvrrug/Round2/Configuration.h 파일 보기

773
 // @section temperature
773
 // @section temperature
774
 
774
 
775
 // Preheat Constants
775
 // Preheat Constants
776
-#define PLA_PREHEAT_HOTEND_TEMP 180
777
-#define PLA_PREHEAT_HPB_TEMP 70
778
-#define PLA_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
776
+#define PREHEAT_1_TEMP_HOTEND 180
777
+#define PREHEAT_1_TEMP_BED     70
778
+#define PREHEAT_1_FAN_SPEED   255 // Value from 0 to 255
779
 
779
 
780
-#define ABS_PREHEAT_HOTEND_TEMP 240
781
-#define ABS_PREHEAT_HPB_TEMP 100
782
-#define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
780
+#define PREHEAT_2_TEMP_HOTEND 240
781
+#define PREHEAT_2_TEMP_BED    100
782
+#define PREHEAT_2_FAN_SPEED   255 // Value from 0 to 255
783
 
783
 
784
 //
784
 //
785
 // Print job timer
785
 // Print job timer

+ 10
- 10
Marlin/language_an.h 파일 보기

48
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
48
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
49
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
49
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
50
 #define MSG_SET_ORIGIN                      "Establir zero"
50
 #define MSG_SET_ORIGIN                      "Establir zero"
51
-#define MSG_PREHEAT_PLA                     "Precalentar PLA"
52
-#define MSG_PREHEAT_PLA_N                   "Precalentar PLA "
53
-#define MSG_PREHEAT_PLA_ALL                 "Precalentar PLA a"
54
-#define MSG_PREHEAT_PLA_BEDONLY             "Prec. PLA Base"
55
-#define MSG_PREHEAT_PLA_SETTINGS            "Achustar tem. PLA"
56
-#define MSG_PREHEAT_ABS                     "Precalentar ABS"
57
-#define MSG_PREHEAT_ABS_N                   "Precalentar ABS "
58
-#define MSG_PREHEAT_ABS_ALL                 "Precalentar ABS a"
59
-#define MSG_PREHEAT_ABS_BEDONLY             "Prec. ABS Base"
60
-#define MSG_PREHEAT_ABS_SETTINGS            "Achustar tem. ABS"
51
+#define MSG_PREHEAT_1                       "Precalentar PLA"
52
+#define MSG_PREHEAT_1_N                     "Precalentar PLA "
53
+#define MSG_PREHEAT_1_ALL                   "Precalentar PLA a"
54
+#define MSG_PREHEAT_1_BEDONLY               "Prec. PLA Base"
55
+#define MSG_PREHEAT_1_SETTINGS              "Achustar tem. PLA"
56
+#define MSG_PREHEAT_2                       "Precalentar ABS"
57
+#define MSG_PREHEAT_2_N                     "Precalentar ABS "
58
+#define MSG_PREHEAT_2_ALL                   "Precalentar ABS a"
59
+#define MSG_PREHEAT_2_BEDONLY               "Prec. ABS Base"
60
+#define MSG_PREHEAT_2_SETTINGS              "Achustar tem. ABS"
61
 #define MSG_COOLDOWN                        "Enfriar"
61
 #define MSG_COOLDOWN                        "Enfriar"
62
 #define MSG_SWITCH_PS_ON                    "Enchegar Fuent"
62
 #define MSG_SWITCH_PS_ON                    "Enchegar Fuent"
63
 #define MSG_SWITCH_PS_OFF                   "Desenchegar Fuent"
63
 #define MSG_SWITCH_PS_OFF                   "Desenchegar Fuent"

+ 10
- 10
Marlin/language_bg.h 파일 보기

49
 #define MSG_SET_HOME_OFFSETS                "Задай Начало"
49
 #define MSG_SET_HOME_OFFSETS                "Задай Начало"
50
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
50
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
51
 #define MSG_SET_ORIGIN                      "Изходна точка"
51
 #define MSG_SET_ORIGIN                      "Изходна точка"
52
-#define MSG_PREHEAT_PLA                     "Подгряване PLA"
53
-#define MSG_PREHEAT_PLA_N                   "Подгряване PLA"
54
-#define MSG_PREHEAT_PLA_ALL                 "Подгр. PLA Всички"
55
-#define MSG_PREHEAT_PLA_BEDONLY             "Подгр. PLA Легло"
56
-#define MSG_PREHEAT_PLA_SETTINGS            "Настройки PLA"
57
-#define MSG_PREHEAT_ABS                     "Подгряване ABS"
58
-#define MSG_PREHEAT_ABS_N                   "Подгряване ABS"
59
-#define MSG_PREHEAT_ABS_ALL                 "Подгр. ABS Всички"
60
-#define MSG_PREHEAT_ABS_BEDONLY             "Подгр. ABS Легло"
61
-#define MSG_PREHEAT_ABS_SETTINGS            "Настройки ABS"
52
+#define MSG_PREHEAT_1                       "Подгряване PLA"
53
+#define MSG_PREHEAT_1_N                     "Подгряване PLA"
54
+#define MSG_PREHEAT_1_ALL                   "Подгр. PLA Всички"
55
+#define MSG_PREHEAT_1_BEDONLY               "Подгр. PLA Легло"
56
+#define MSG_PREHEAT_1_SETTINGS              "Настройки PLA"
57
+#define MSG_PREHEAT_2                       "Подгряване ABS"
58
+#define MSG_PREHEAT_2_N                     "Подгряване ABS"
59
+#define MSG_PREHEAT_2_ALL                   "Подгр. ABS Всички"
60
+#define MSG_PREHEAT_2_BEDONLY               "Подгр. ABS Легло"
61
+#define MSG_PREHEAT_2_SETTINGS              "Настройки ABS"
62
 #define MSG_COOLDOWN                        "Охлаждане"
62
 #define MSG_COOLDOWN                        "Охлаждане"
63
 #define MSG_SWITCH_PS_ON                    "Вкл. захранване"
63
 #define MSG_SWITCH_PS_ON                    "Вкл. захранване"
64
 #define MSG_SWITCH_PS_OFF                   "Изкл. захранване"
64
 #define MSG_SWITCH_PS_OFF                   "Изкл. захранване"

+ 10
- 10
Marlin/language_ca.h 파일 보기

49
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
49
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
50
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
50
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
51
 #define MSG_SET_ORIGIN                      "Establir origen"
51
 #define MSG_SET_ORIGIN                      "Establir origen"
52
-#define MSG_PREHEAT_PLA                     "Preescalfar PLA"
53
-#define MSG_PREHEAT_PLA_N                   "Preescalfar PLA "
54
-#define MSG_PREHEAT_PLA_ALL                 "Preesc. tot PLA"
55
-#define MSG_PREHEAT_PLA_BEDONLY             "Preesc. llit PLA"
56
-#define MSG_PREHEAT_PLA_SETTINGS            "Configuració PLA"
57
-#define MSG_PREHEAT_ABS                     "Preescalfar ABS"
58
-#define MSG_PREHEAT_ABS_N                   "Preescalfar ABS "
59
-#define MSG_PREHEAT_ABS_ALL                 "Preesc. tot ABS"
60
-#define MSG_PREHEAT_ABS_BEDONLY             "Preesc. llit ABS"
61
-#define MSG_PREHEAT_ABS_SETTINGS            "Configuració ABS"
52
+#define MSG_PREHEAT_1                       "Preescalfar PLA"
53
+#define MSG_PREHEAT_1_N                     "Preescalfar PLA "
54
+#define MSG_PREHEAT_1_ALL                   "Preesc. tot PLA"
55
+#define MSG_PREHEAT_1_BEDONLY               "Preesc. llit PLA"
56
+#define MSG_PREHEAT_1_SETTINGS              "Configuració PLA"
57
+#define MSG_PREHEAT_2                       "Preescalfar ABS"
58
+#define MSG_PREHEAT_2_N                     "Preescalfar ABS "
59
+#define MSG_PREHEAT_2_ALL                   "Preesc. tot ABS"
60
+#define MSG_PREHEAT_2_BEDONLY               "Preesc. llit ABS"
61
+#define MSG_PREHEAT_2_SETTINGS              "Configuració ABS"
62
 #define MSG_COOLDOWN                        "Refredar"
62
 #define MSG_COOLDOWN                        "Refredar"
63
 #define MSG_SWITCH_PS_ON                    "Switch power on"
63
 #define MSG_SWITCH_PS_ON                    "Switch power on"
64
 #define MSG_SWITCH_PS_OFF                   "Switch power off"
64
 #define MSG_SWITCH_PS_OFF                   "Switch power off"

+ 10
- 10
Marlin/language_cn.h 파일 보기

45
 #define MSG_SET_HOME_OFFSETS                "\xbe\xbf\xbb\xbc\xbd\xc0\xc1"
45
 #define MSG_SET_HOME_OFFSETS                "\xbe\xbf\xbb\xbc\xbd\xc0\xc1"
46
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
46
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
47
 #define MSG_SET_ORIGIN                      "\xbe\xbf\xbc\xbd"
47
 #define MSG_SET_ORIGIN                      "\xbe\xbf\xbc\xbd"
48
-#define MSG_PREHEAT_PLA                     "\xc3\xc4 PLA"
49
-#define MSG_PREHEAT_PLA_N                   MSG_PREHEAT_PLA " "
50
-#define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " \xc5\xc6"
51
-#define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " \xc4\xc7"
52
-#define MSG_PREHEAT_PLA_SETTINGS            MSG_PREHEAT_PLA " \xbe\xbf"
53
-#define MSG_PREHEAT_ABS                     "\xc3\xc4 ABS"
54
-#define MSG_PREHEAT_ABS_N                   MSG_PREHEAT_ABS " "
55
-#define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " \xc5\xc6"
56
-#define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " \xbe\xc6"
57
-#define MSG_PREHEAT_ABS_SETTINGS            MSG_PREHEAT_ABS " \xbe\xbf"
48
+#define MSG_PREHEAT_1                       "\xc3\xc4 PLA"
49
+#define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 " "
50
+#define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 " \xc5\xc6"
51
+#define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 " \xc4\xc7"
52
+#define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 " \xbe\xbf"
53
+#define MSG_PREHEAT_2                       "\xc3\xc4 ABS"
54
+#define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 " "
55
+#define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 " \xc5\xc6"
56
+#define MSG_PREHEAT_2_BEDONLY               MSG_PREHEAT_2 " \xbe\xc6"
57
+#define MSG_PREHEAT_2_SETTINGS              MSG_PREHEAT_2 " \xbe\xbf"
58
 #define MSG_COOLDOWN                        "\xc8\xc9"
58
 #define MSG_COOLDOWN                        "\xc8\xc9"
59
 #define MSG_SWITCH_PS_ON                    "\xb9\xcb\xca\xb3"
59
 #define MSG_SWITCH_PS_ON                    "\xb9\xcb\xca\xb3"
60
 #define MSG_SWITCH_PS_OFF                   "\xb9\xcb\xb5\xb6"
60
 #define MSG_SWITCH_PS_OFF                   "\xb9\xcb\xb5\xb6"

+ 10
- 10
Marlin/language_cz.h 파일 보기

57
 #define MSG_SET_HOME_OFFSETS                "Nastavit ofsety"
57
 #define MSG_SET_HOME_OFFSETS                "Nastavit ofsety"
58
 #define MSG_HOME_OFFSETS_APPLIED            "Ofsety nastaveny"
58
 #define MSG_HOME_OFFSETS_APPLIED            "Ofsety nastaveny"
59
 #define MSG_SET_ORIGIN                      "Nastavit pocatek"
59
 #define MSG_SET_ORIGIN                      "Nastavit pocatek"
60
-#define MSG_PREHEAT_PLA                     "Zahrat PLA"
61
-#define MSG_PREHEAT_PLA_N                   MSG_PREHEAT_PLA " "
62
-#define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " Vse"
63
-#define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " Podloz"
64
-#define MSG_PREHEAT_PLA_SETTINGS            MSG_PREHEAT_PLA " Nast"
65
-#define MSG_PREHEAT_ABS                     "Zahrat ABS"
66
-#define MSG_PREHEAT_ABS_N                   MSG_PREHEAT_ABS " "
67
-#define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " Vse"
68
-#define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " Podloz"
69
-#define MSG_PREHEAT_ABS_SETTINGS            MSG_PREHEAT_ABS " Nast"
60
+#define MSG_PREHEAT_1                       "Zahrat PLA"
61
+#define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 " "
62
+#define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 " Vse"
63
+#define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 " Podloz"
64
+#define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 " Nast"
65
+#define MSG_PREHEAT_2                       "Zahrat ABS"
66
+#define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 " "
67
+#define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 " Vse"
68
+#define MSG_PREHEAT_2_BEDONLY               MSG_PREHEAT_2 " Podloz"
69
+#define MSG_PREHEAT_2_SETTINGS              MSG_PREHEAT_2 " Nast"
70
 #define MSG_H1                              "1"
70
 #define MSG_H1                              "1"
71
 #define MSG_H2                              "2"
71
 #define MSG_H2                              "2"
72
 #define MSG_H3                              "3"
72
 #define MSG_H3                              "3"

+ 10
- 10
Marlin/language_da.h 파일 보기

54
 #define MSG_SET_HOME_OFFSETS                "Sæt forskyding af home"
54
 #define MSG_SET_HOME_OFFSETS                "Sæt forskyding af home"
55
 #define MSG_HOME_OFFSETS_APPLIED            "Forskydninger af home pos. er tilføjet"
55
 #define MSG_HOME_OFFSETS_APPLIED            "Forskydninger af home pos. er tilføjet"
56
 #define MSG_SET_ORIGIN                      "Sæt origin"
56
 #define MSG_SET_ORIGIN                      "Sæt origin"
57
-#define MSG_PREHEAT_PLA                     "Forvarm PLA"
58
-#define MSG_PREHEAT_PLA_N                   "Forvarm PLA "
59
-#define MSG_PREHEAT_PLA_ALL                 "Forvarm PLA Alle"
60
-#define MSG_PREHEAT_PLA_BEDONLY             "Forvarm PLA Bed"
61
-#define MSG_PREHEAT_PLA_SETTINGS            "Forvarm PLA conf"
62
-#define MSG_PREHEAT_ABS                     "Forvarm ABS"
63
-#define MSG_PREHEAT_ABS_N                   "Forvarm ABS "
64
-#define MSG_PREHEAT_ABS_ALL                 "Forvarm ABS Alle"
65
-#define MSG_PREHEAT_ABS_BEDONLY             "Forvarm ABS Bed"
66
-#define MSG_PREHEAT_ABS_SETTINGS            "Forvarm ABS conf"
57
+#define MSG_PREHEAT_1                       "Forvarm PLA"
58
+#define MSG_PREHEAT_1_N                     "Forvarm PLA "
59
+#define MSG_PREHEAT_1_ALL                   "Forvarm PLA Alle"
60
+#define MSG_PREHEAT_1_BEDONLY               "Forvarm PLA Bed"
61
+#define MSG_PREHEAT_1_SETTINGS              "Forvarm PLA conf"
62
+#define MSG_PREHEAT_2                       "Forvarm ABS"
63
+#define MSG_PREHEAT_2_N                     "Forvarm ABS "
64
+#define MSG_PREHEAT_2_ALL                   "Forvarm ABS Alle"
65
+#define MSG_PREHEAT_2_BEDONLY               "Forvarm ABS Bed"
66
+#define MSG_PREHEAT_2_SETTINGS              "Forvarm ABS conf"
67
 #define MSG_H1                              "1"
67
 #define MSG_H1                              "1"
68
 #define MSG_H2                              "2"
68
 #define MSG_H2                              "2"
69
 #define MSG_H3                              "3"
69
 #define MSG_H3                              "3"

+ 10
- 10
Marlin/language_de.h 파일 보기

49
 #define MSG_SET_HOME_OFFSETS                "Setze Homeoffsets"
49
 #define MSG_SET_HOME_OFFSETS                "Setze Homeoffsets"
50
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets aktiv"
50
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets aktiv"
51
 #define MSG_SET_ORIGIN                      "Setze Nullpunkt" //"G92 X0 Y0 Z0" commented out in ultralcd.cpp
51
 #define MSG_SET_ORIGIN                      "Setze Nullpunkt" //"G92 X0 Y0 Z0" commented out in ultralcd.cpp
52
-#define MSG_PREHEAT_PLA                     "Vorwärmen PLA"
53
-#define MSG_PREHEAT_PLA_N                   "Vorwärmen PLA "
54
-#define MSG_PREHEAT_PLA_ALL                 "Vorw. PLA Alle"
55
-#define MSG_PREHEAT_PLA_BEDONLY             "Vorw. PLA Bett"
56
-#define MSG_PREHEAT_PLA_SETTINGS            "Vorw. PLA Einst."
57
-#define MSG_PREHEAT_ABS                     "Vorwärmen ABS"
58
-#define MSG_PREHEAT_ABS_N                   "Vorwärmen ABS "
59
-#define MSG_PREHEAT_ABS_ALL                 "Vorw. ABS Alle"
60
-#define MSG_PREHEAT_ABS_BEDONLY             "Vorw. ABS Bett"
61
-#define MSG_PREHEAT_ABS_SETTINGS            "Vorw. ABS Einst."
52
+#define MSG_PREHEAT_1                       "Vorwärmen PLA"
53
+#define MSG_PREHEAT_1_N                     "Vorwärmen PLA "
54
+#define MSG_PREHEAT_1_ALL                   "Vorw. PLA Alle"
55
+#define MSG_PREHEAT_1_BEDONLY               "Vorw. PLA Bett"
56
+#define MSG_PREHEAT_1_SETTINGS              "Vorw. PLA Einst."
57
+#define MSG_PREHEAT_2                       "Vorwärmen ABS"
58
+#define MSG_PREHEAT_2_N                     "Vorwärmen ABS "
59
+#define MSG_PREHEAT_2_ALL                   "Vorw. ABS Alle"
60
+#define MSG_PREHEAT_2_BEDONLY               "Vorw. ABS Bett"
61
+#define MSG_PREHEAT_2_SETTINGS              "Vorw. ABS Einst."
62
 #define MSG_COOLDOWN                        "Abkühlen"
62
 #define MSG_COOLDOWN                        "Abkühlen"
63
 #define MSG_SWITCH_PS_ON                    "Netzteil ein"
63
 #define MSG_SWITCH_PS_ON                    "Netzteil ein"
64
 #define MSG_SWITCH_PS_OFF                   "Netzteil aus"
64
 #define MSG_SWITCH_PS_OFF                   "Netzteil aus"

+ 20
- 20
Marlin/language_en.h 파일 보기

92
 #ifndef MSG_SET_ORIGIN
92
 #ifndef MSG_SET_ORIGIN
93
   #define MSG_SET_ORIGIN                      "Set origin"
93
   #define MSG_SET_ORIGIN                      "Set origin"
94
 #endif
94
 #endif
95
-#ifndef MSG_PREHEAT_PLA
96
-  #define MSG_PREHEAT_PLA                     "Preheat PLA"
95
+#ifndef MSG_PREHEAT_1
96
+  #define MSG_PREHEAT_1                       "Preheat PLA"
97
 #endif
97
 #endif
98
-#ifndef MSG_PREHEAT_PLA_N
99
-  #define MSG_PREHEAT_PLA_N                   MSG_PREHEAT_PLA " "
98
+#ifndef MSG_PREHEAT_1_N
99
+  #define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 " "
100
 #endif
100
 #endif
101
-#ifndef MSG_PREHEAT_PLA_ALL
102
-  #define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " All"
101
+#ifndef MSG_PREHEAT_1_ALL
102
+  #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 " All"
103
 #endif
103
 #endif
104
-#ifndef MSG_PREHEAT_PLA_BEDONLY
105
-  #define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " Bed"
104
+#ifndef MSG_PREHEAT_1_BEDONLY
105
+  #define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 " Bed"
106
 #endif
106
 #endif
107
-#ifndef MSG_PREHEAT_PLA_SETTINGS
108
-  #define MSG_PREHEAT_PLA_SETTINGS            MSG_PREHEAT_PLA " conf"
107
+#ifndef MSG_PREHEAT_1_SETTINGS
108
+  #define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 " conf"
109
 #endif
109
 #endif
110
-#ifndef MSG_PREHEAT_ABS
111
-  #define MSG_PREHEAT_ABS                     "Preheat ABS"
110
+#ifndef MSG_PREHEAT_2
111
+  #define MSG_PREHEAT_2                       "Preheat ABS"
112
 #endif
112
 #endif
113
-#ifndef MSG_PREHEAT_ABS_N
114
-  #define MSG_PREHEAT_ABS_N                   MSG_PREHEAT_ABS " "
113
+#ifndef MSG_PREHEAT_2_N
114
+  #define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 " "
115
 #endif
115
 #endif
116
-#ifndef MSG_PREHEAT_ABS_ALL
117
-  #define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " All"
116
+#ifndef MSG_PREHEAT_2_ALL
117
+  #define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 " All"
118
 #endif
118
 #endif
119
-#ifndef MSG_PREHEAT_ABS_BEDONLY
120
-  #define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " Bed"
119
+#ifndef MSG_PREHEAT_2_BEDONLY
120
+  #define MSG_PREHEAT_2_BEDONLY               MSG_PREHEAT_2 " Bed"
121
 #endif
121
 #endif
122
-#ifndef MSG_PREHEAT_ABS_SETTINGS
123
-  #define MSG_PREHEAT_ABS_SETTINGS            MSG_PREHEAT_ABS " conf"
122
+#ifndef MSG_PREHEAT_2_SETTINGS
123
+  #define MSG_PREHEAT_2_SETTINGS              MSG_PREHEAT_2 " conf"
124
 #endif
124
 #endif
125
 #ifndef MSG_H1
125
 #ifndef MSG_H1
126
   #define MSG_H1                              "1"
126
   #define MSG_H1                              "1"

+ 10
- 10
Marlin/language_es.h 파일 보기

52
 #define MSG_SET_HOME_OFFSETS                "Ajustar desfases"
52
 #define MSG_SET_HOME_OFFSETS                "Ajustar desfases"
53
 #define MSG_HOME_OFFSETS_APPLIED            "Desfase aplicado"
53
 #define MSG_HOME_OFFSETS_APPLIED            "Desfase aplicado"
54
 #define MSG_SET_ORIGIN                      "Establecer origen"
54
 #define MSG_SET_ORIGIN                      "Establecer origen"
55
-#define MSG_PREHEAT_PLA                     "Precalentar PLA"
56
-#define MSG_PREHEAT_PLA_N                   MSG_PREHEAT_PLA " "
57
-#define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA "Todo"
58
-#define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA"Plataforma"
59
-#define MSG_PREHEAT_PLA_SETTINGS            MSG_PREHEAT_PLA "Config"
60
-#define MSG_PREHEAT_ABS                     "Precalentar ABS"
61
-#define MSG_PREHEAT_ABS_N                   MSG_PREHEAT_ABS " "
62
-#define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS "Todo"
63
-#define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS "Plataforma"
64
-#define MSG_PREHEAT_ABS_SETTINGS            MSG_PREHEAT_ABS "Config"
55
+#define MSG_PREHEAT_1                       "Precalentar PLA"
56
+#define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 " "
57
+#define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 "Todo"
58
+#define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1"Plataforma"
59
+#define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 "Config"
60
+#define MSG_PREHEAT_2                       "Precalentar ABS"
61
+#define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 " "
62
+#define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 "Todo"
63
+#define MSG_PREHEAT_2_BEDONLY               MSG_PREHEAT_2 "Plataforma"
64
+#define MSG_PREHEAT_2_SETTINGS              MSG_PREHEAT_2 "Config"
65
 #define MSG_H1                              "1"
65
 #define MSG_H1                              "1"
66
 #define MSG_H2                              "2"
66
 #define MSG_H2                              "2"
67
 #define MSG_H3                              "3"
67
 #define MSG_H3                              "3"

+ 10
- 10
Marlin/language_eu.h 파일 보기

48
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
48
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
49
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
49
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
50
 #define MSG_SET_ORIGIN                      "Hasiera ipini"
50
 #define MSG_SET_ORIGIN                      "Hasiera ipini"
51
-#define MSG_PREHEAT_PLA                     "Aurreberotu PLA"
52
-#define MSG_PREHEAT_PLA_N                   "Aurreberotu PLA "
53
-#define MSG_PREHEAT_PLA_ALL                 "Berotu PLA Guztia"
54
-#define MSG_PREHEAT_PLA_BEDONLY             "Berotu PLA Ohea"
55
-#define MSG_PREHEAT_PLA_SETTINGS            "Berotu PLA Konfig"
56
-#define MSG_PREHEAT_ABS                     "Aurreberotu ABS"
57
-#define MSG_PREHEAT_ABS_N                   "Aurreberotu ABS "
58
-#define MSG_PREHEAT_ABS_ALL                 "Berotu ABS Guztia"
59
-#define MSG_PREHEAT_ABS_BEDONLY             "Berotu ABS Ohea"
60
-#define MSG_PREHEAT_ABS_SETTINGS            "Berotu ABS Konfig"
51
+#define MSG_PREHEAT_1                       "Aurreberotu PLA"
52
+#define MSG_PREHEAT_1_N                     "Aurreberotu PLA "
53
+#define MSG_PREHEAT_1_ALL                   "Berotu PLA Guztia"
54
+#define MSG_PREHEAT_1_BEDONLY               "Berotu PLA Ohea"
55
+#define MSG_PREHEAT_1_SETTINGS              "Berotu PLA Konfig"
56
+#define MSG_PREHEAT_2                       "Aurreberotu ABS"
57
+#define MSG_PREHEAT_2_N                     "Aurreberotu ABS "
58
+#define MSG_PREHEAT_2_ALL                   "Berotu ABS Guztia"
59
+#define MSG_PREHEAT_2_BEDONLY               "Berotu ABS Ohea"
60
+#define MSG_PREHEAT_2_SETTINGS              "Berotu ABS Konfig"
61
 #define MSG_COOLDOWN                        "Hoztu"
61
 #define MSG_COOLDOWN                        "Hoztu"
62
 #define MSG_SWITCH_PS_ON                    "Energia piztu"
62
 #define MSG_SWITCH_PS_ON                    "Energia piztu"
63
 #define MSG_SWITCH_PS_OFF                   "Energia itzali"
63
 #define MSG_SWITCH_PS_OFF                   "Energia itzali"

+ 10
- 10
Marlin/language_fi.h 파일 보기

49
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
49
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
50
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
50
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
51
 #define MSG_SET_ORIGIN                      "Aseta origo"
51
 #define MSG_SET_ORIGIN                      "Aseta origo"
52
-#define MSG_PREHEAT_PLA                     "Esilämmitä PLA"
53
-#define MSG_PREHEAT_PLA_N                   "Esilämmitä PLA "
54
-#define MSG_PREHEAT_PLA_ALL                 "Esilä. PLA Kaikki"
55
-#define MSG_PREHEAT_PLA_BEDONLY             "Esilä. PLA Alusta"
56
-#define MSG_PREHEAT_PLA_SETTINGS            "Esilämm. PLA konf"
57
-#define MSG_PREHEAT_ABS                     "Esilämmitä ABS"
58
-#define MSG_PREHEAT_ABS_N                   "Esilämmitä ABS "
59
-#define MSG_PREHEAT_ABS_ALL                 "Esilä. ABS Kaikki"
60
-#define MSG_PREHEAT_ABS_BEDONLY             "Esilä. ABS Alusta"
61
-#define MSG_PREHEAT_ABS_SETTINGS            "Esilämm. ABS konf"
52
+#define MSG_PREHEAT_1                       "Esilämmitä PLA"
53
+#define MSG_PREHEAT_1_N                     "Esilämmitä PLA "
54
+#define MSG_PREHEAT_1_ALL                   "Esilä. PLA Kaikki"
55
+#define MSG_PREHEAT_1_BEDONLY               "Esilä. PLA Alusta"
56
+#define MSG_PREHEAT_1_SETTINGS              "Esilämm. PLA konf"
57
+#define MSG_PREHEAT_2                       "Esilämmitä ABS"
58
+#define MSG_PREHEAT_2_N                     "Esilämmitä ABS "
59
+#define MSG_PREHEAT_2_ALL                   "Esilä. ABS Kaikki"
60
+#define MSG_PREHEAT_2_BEDONLY               "Esilä. ABS Alusta"
61
+#define MSG_PREHEAT_2_SETTINGS              "Esilämm. ABS konf"
62
 #define MSG_COOLDOWN                        "Jäähdytä"
62
 #define MSG_COOLDOWN                        "Jäähdytä"
63
 #define MSG_SWITCH_PS_ON                    "Virta päälle"
63
 #define MSG_SWITCH_PS_ON                    "Virta päälle"
64
 #define MSG_SWITCH_PS_OFF                   "Virta pois"
64
 #define MSG_SWITCH_PS_OFF                   "Virta pois"

+ 10
- 10
Marlin/language_fr.h 파일 보기

48
 #define MSG_SET_HOME_OFFSETS                "Regler decal. origine"
48
 #define MSG_SET_HOME_OFFSETS                "Regler decal. origine"
49
 #define MSG_HOME_OFFSETS_APPLIED            "Decalages appliques"
49
 #define MSG_HOME_OFFSETS_APPLIED            "Decalages appliques"
50
 #define MSG_SET_ORIGIN                      "Regler origine"
50
 #define MSG_SET_ORIGIN                      "Regler origine"
51
-#define MSG_PREHEAT_PLA                     "Prechauffage PLA"
52
-#define MSG_PREHEAT_PLA_N                   "Prechauff. PLA "
53
-#define MSG_PREHEAT_PLA_ALL                 "Prech. PLA Tout"
54
-#define MSG_PREHEAT_PLA_BEDONLY             "Prech. PLA Plateau"
55
-#define MSG_PREHEAT_PLA_SETTINGS            "Regl. prech. PLA"
56
-#define MSG_PREHEAT_ABS                     "Prechauffage ABS"
57
-#define MSG_PREHEAT_ABS_N                   "Prechauff. ABS "
58
-#define MSG_PREHEAT_ABS_ALL                 "Prech. ABS Tout"
59
-#define MSG_PREHEAT_ABS_BEDONLY             "Prech. ABS Plateau"
60
-#define MSG_PREHEAT_ABS_SETTINGS            "Regl. prech. ABS"
51
+#define MSG_PREHEAT_1                       "Prechauffage PLA"
52
+#define MSG_PREHEAT_1_N                     "Prechauff. PLA "
53
+#define MSG_PREHEAT_1_ALL                   "Prech. PLA Tout"
54
+#define MSG_PREHEAT_1_BEDONLY               "Prech. PLA Plateau"
55
+#define MSG_PREHEAT_1_SETTINGS              "Regl. prech. PLA"
56
+#define MSG_PREHEAT_2                       "Prechauffage ABS"
57
+#define MSG_PREHEAT_2_N                     "Prechauff. ABS "
58
+#define MSG_PREHEAT_2_ALL                   "Prech. ABS Tout"
59
+#define MSG_PREHEAT_2_BEDONLY               "Prech. ABS Plateau"
60
+#define MSG_PREHEAT_2_SETTINGS              "Regl. prech. ABS"
61
 #define MSG_COOLDOWN                        "Refroidir"
61
 #define MSG_COOLDOWN                        "Refroidir"
62
 #define MSG_SWITCH_PS_ON                    "Allumer alim."
62
 #define MSG_SWITCH_PS_ON                    "Allumer alim."
63
 #define MSG_SWITCH_PS_OFF                   "Eteindre alim."
63
 #define MSG_SWITCH_PS_OFF                   "Eteindre alim."

+ 10
- 10
Marlin/language_gl.h 파일 보기

54
 #define MSG_SET_HOME_OFFSETS                "Offsets na orixe"
54
 #define MSG_SET_HOME_OFFSETS                "Offsets na orixe"
55
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets fixados"
55
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets fixados"
56
 #define MSG_SET_ORIGIN                      "Fixar orixe"
56
 #define MSG_SET_ORIGIN                      "Fixar orixe"
57
-#define MSG_PREHEAT_PLA                     "Prequentar PLA"
58
-#define MSG_PREHEAT_PLA_N                   "Prequentar PLA "
59
-#define MSG_PREHEAT_PLA_ALL                 "Preque. PLA Todo"
60
-#define MSG_PREHEAT_PLA_BEDONLY             "Preque. PLA Cama"
61
-#define MSG_PREHEAT_PLA_SETTINGS            "Preque. PLA conf"
62
-#define MSG_PREHEAT_ABS                     "Prequentar ABS"
63
-#define MSG_PREHEAT_ABS_N                   "Prequentar ABS "
64
-#define MSG_PREHEAT_ABS_ALL                 "Preque. ABS Todo"
65
-#define MSG_PREHEAT_ABS_BEDONLY             "Preque. ABS Cama"
66
-#define MSG_PREHEAT_ABS_SETTINGS            "Preque. ABS conf"
57
+#define MSG_PREHEAT_1                       "Prequentar PLA"
58
+#define MSG_PREHEAT_1_N                     "Prequentar PLA "
59
+#define MSG_PREHEAT_1_ALL                   "Preque. PLA Todo"
60
+#define MSG_PREHEAT_1_BEDONLY               "Preque. PLA Cama"
61
+#define MSG_PREHEAT_1_SETTINGS              "Preque. PLA conf"
62
+#define MSG_PREHEAT_2                       "Prequentar ABS"
63
+#define MSG_PREHEAT_2_N                     "Prequentar ABS "
64
+#define MSG_PREHEAT_2_ALL                   "Preque. ABS Todo"
65
+#define MSG_PREHEAT_2_BEDONLY               "Preque. ABS Cama"
66
+#define MSG_PREHEAT_2_SETTINGS              "Preque. ABS conf"
67
 #define MSG_H1                              "1"
67
 #define MSG_H1                              "1"
68
 #define MSG_H2                              "2"
68
 #define MSG_H2                              "2"
69
 #define MSG_H3                              "3"
69
 #define MSG_H3                              "3"

+ 10
- 10
Marlin/language_hr.h 파일 보기

54
 #define MSG_SET_HOME_OFFSETS                "Postavi home offsete"
54
 #define MSG_SET_HOME_OFFSETS                "Postavi home offsete"
55
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets postavljeni"
55
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets postavljeni"
56
 #define MSG_SET_ORIGIN                      "Postavi ishodište"
56
 #define MSG_SET_ORIGIN                      "Postavi ishodište"
57
-#define MSG_PREHEAT_PLA                     "Predgrij PLA"
58
-#define MSG_PREHEAT_PLA_N                   MSG_PREHEAT_PLA " "
59
-#define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " Sve"
60
-#define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " Bed"
61
-#define MSG_PREHEAT_PLA_SETTINGS            MSG_PREHEAT_PLA " conf"
62
-#define MSG_PREHEAT_ABS                     "Predgrij ABS"
63
-#define MSG_PREHEAT_ABS_N                   MSG_PREHEAT_ABS " "
64
-#define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " Sve"
65
-#define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " Bed"
66
-#define MSG_PREHEAT_ABS_SETTINGS            MSG_PREHEAT_ABS " conf"
57
+#define MSG_PREHEAT_1                       "Predgrij PLA"
58
+#define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 " "
59
+#define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 " Sve"
60
+#define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 " Bed"
61
+#define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 " conf"
62
+#define MSG_PREHEAT_2                       "Predgrij ABS"
63
+#define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 " "
64
+#define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 " Sve"
65
+#define MSG_PREHEAT_2_BEDONLY               MSG_PREHEAT_2 " Bed"
66
+#define MSG_PREHEAT_2_SETTINGS              MSG_PREHEAT_2 " conf"
67
 #define MSG_H1                              "1"
67
 #define MSG_H1                              "1"
68
 #define MSG_H2                              "2"
68
 #define MSG_H2                              "2"
69
 #define MSG_H3                              "3"
69
 #define MSG_H3                              "3"

+ 10
- 10
Marlin/language_it.h 파일 보기

53
 #define MSG_SET_HOME_OFFSETS                "Imp. offset home"
53
 #define MSG_SET_HOME_OFFSETS                "Imp. offset home"
54
 #define MSG_HOME_OFFSETS_APPLIED            "Offset applicato"
54
 #define MSG_HOME_OFFSETS_APPLIED            "Offset applicato"
55
 #define MSG_SET_ORIGIN                      "Imposta Origine"
55
 #define MSG_SET_ORIGIN                      "Imposta Origine"
56
-#define MSG_PREHEAT_PLA                     "Preriscalda PLA"
57
-#define MSG_PREHEAT_PLA_N                   MSG_PREHEAT_PLA " "
58
-#define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " Tutto"
59
-#define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " Piatto"
60
-#define MSG_PREHEAT_PLA_SETTINGS            MSG_PREHEAT_PLA " conf"
61
-#define MSG_PREHEAT_ABS                     "Preriscalda ABS"
62
-#define MSG_PREHEAT_ABS_N                   MSG_PREHEAT_ABS " "
63
-#define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " Tutto"
64
-#define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " Piatto"
65
-#define MSG_PREHEAT_ABS_SETTINGS            MSG_PREHEAT_ABS " conf"
56
+#define MSG_PREHEAT_1                       "Preriscalda PLA"
57
+#define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 " "
58
+#define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 " Tutto"
59
+#define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 " Piatto"
60
+#define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 " conf"
61
+#define MSG_PREHEAT_2                       "Preriscalda ABS"
62
+#define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 " "
63
+#define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 " Tutto"
64
+#define MSG_PREHEAT_2_BEDONLY               MSG_PREHEAT_2 " Piatto"
65
+#define MSG_PREHEAT_2_SETTINGS              MSG_PREHEAT_2 " conf"
66
 #define MSG_COOLDOWN                        "Raffredda"
66
 #define MSG_COOLDOWN                        "Raffredda"
67
 #define MSG_SWITCH_PS_ON                    "Accendi aliment."
67
 #define MSG_SWITCH_PS_ON                    "Accendi aliment."
68
 #define MSG_SWITCH_PS_OFF                   "Spegni aliment."
68
 #define MSG_SWITCH_PS_OFF                   "Spegni aliment."

+ 10
- 10
Marlin/language_kana.h 파일 보기

55
 #define MSG_SET_HOME_OFFSETS                "\xb7\xbc\xde\xad\xdd\xb5\xcc\xbe\xaf\xc4\xbe\xaf\xc3\xb2"         // "キジュンオフセットセッテイ" ("Set home offsets")
55
 #define MSG_SET_HOME_OFFSETS                "\xb7\xbc\xde\xad\xdd\xb5\xcc\xbe\xaf\xc4\xbe\xaf\xc3\xb2"         // "キジュンオフセットセッテイ" ("Set home offsets")
56
 #define MSG_HOME_OFFSETS_APPLIED            "\xb5\xcc\xbe\xaf\xc4\xb6\xde\xc3\xb7\xd6\xb3\xbb\xda\xcf\xbc\xc0" // "オフセットガテキヨウサレマシタ" ("Offsets applied")
56
 #define MSG_HOME_OFFSETS_APPLIED            "\xb5\xcc\xbe\xaf\xc4\xb6\xde\xc3\xb7\xd6\xb3\xbb\xda\xcf\xbc\xc0" // "オフセットガテキヨウサレマシタ" ("Offsets applied")
57
 #define MSG_SET_ORIGIN                      "\xb7\xbc\xde\xad\xdd\xbe\xaf\xc4"                                 // "キジュンセット" ("Set origin")
57
 #define MSG_SET_ORIGIN                      "\xb7\xbc\xde\xad\xdd\xbe\xaf\xc4"                                 // "キジュンセット" ("Set origin")
58
-#define MSG_PREHEAT_PLA                     "PLA \xd6\xc8\xc2"                                                 // "PLA ヨネツ" ("Preheat PLA")
59
-#define MSG_PREHEAT_PLA_N                   MSG_PREHEAT_PLA " "
60
-#define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " \xbd\xcd\xde\xc3"                                // " スベテ" (" All")
61
-#define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " \xcd\xde\xaf\xc4\xde"                            // " ベッド" (" Bed")
62
-#define MSG_PREHEAT_PLA_SETTINGS            MSG_PREHEAT_PLA " \xbe\xaf\xc3\xb2"                                // " セッテイ" (" conf")
63
-#define MSG_PREHEAT_ABS                     "ABS \xd6\xc8\xc2"                                                 // "ABS ヨネツ" ("Preheat ABS")
64
-#define MSG_PREHEAT_ABS_N                   MSG_PREHEAT_ABS " "
65
-#define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " \xbd\xcd\xde\xc3"                                // " スベテ" (" All")
66
-#define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " \xcd\xde\xaf\xc4\xde"                            // " ベッド" (" Bed")
67
-#define MSG_PREHEAT_ABS_SETTINGS            MSG_PREHEAT_ABS " \xbe\xaf\xc3\xb2"                                // " セッテイ" (" conf")
58
+#define MSG_PREHEAT_1                       "PLA \xd6\xc8\xc2"                                                 // "PLA ヨネツ" ("Preheat PLA")
59
+#define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 " "
60
+#define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 " \xbd\xcd\xde\xc3"                                // " スベテ" (" All")
61
+#define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 " \xcd\xde\xaf\xc4\xde"                            // " ベッド" (" Bed")
62
+#define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 " \xbe\xaf\xc3\xb2"                                // " セッテイ" (" conf")
63
+#define MSG_PREHEAT_2                       "ABS \xd6\xc8\xc2"                                                 // "ABS ヨネツ" ("Preheat ABS")
64
+#define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 " "
65
+#define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 " \xbd\xcd\xde\xc3"                                // " スベテ" (" All")
66
+#define MSG_PREHEAT_2_BEDONLY               MSG_PREHEAT_2 " \xcd\xde\xaf\xc4\xde"                            // " ベッド" (" Bed")
67
+#define MSG_PREHEAT_2_SETTINGS              MSG_PREHEAT_2 " \xbe\xaf\xc3\xb2"                                // " セッテイ" (" conf")
68
 #define MSG_COOLDOWN                        "\xb6\xc8\xc2\xc3\xb2\xbc"                                         // "カネツテイシ" ("Cooldown")
68
 #define MSG_COOLDOWN                        "\xb6\xc8\xc2\xc3\xb2\xbc"                                         // "カネツテイシ" ("Cooldown")
69
 #define MSG_SWITCH_PS_ON                    "\xc3\xde\xdd\xb9\xde\xdd\x20\xb5\xdd"                             // "デンゲン オン" ("Switch power on")
69
 #define MSG_SWITCH_PS_ON                    "\xc3\xde\xdd\xb9\xde\xdd\x20\xb5\xdd"                             // "デンゲン オン" ("Switch power on")
70
 #define MSG_SWITCH_PS_OFF                   "\xc3\xde\xdd\xb9\xde\xdd\x20\xb5\xcc"                             // "デンゲン オフ" ("Switch power off")
70
 #define MSG_SWITCH_PS_OFF                   "\xc3\xde\xdd\xb9\xde\xdd\x20\xb5\xcc"                             // "デンゲン オフ" ("Switch power off")

+ 10
- 10
Marlin/language_kana_utf8.h 파일 보기

59
 #define MSG_SET_HOME_OFFSETS                "キジュンオフセットセッテイ"         // "Set home offsets"
59
 #define MSG_SET_HOME_OFFSETS                "キジュンオフセットセッテイ"         // "Set home offsets"
60
 #define MSG_HOME_OFFSETS_APPLIED            "オフセットガテキヨウサレマシタ"       // "Offsets applied"
60
 #define MSG_HOME_OFFSETS_APPLIED            "オフセットガテキヨウサレマシタ"       // "Offsets applied"
61
 #define MSG_SET_ORIGIN                      "キジュンセット"                 // "Set origin"
61
 #define MSG_SET_ORIGIN                      "キジュンセット"                 // "Set origin"
62
-#define MSG_PREHEAT_PLA                     "PLA ヨネツ"                   // "Preheat PLA"
63
-#define MSG_PREHEAT_PLA_N                   MSG_PREHEAT_PLA " "
64
-#define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " スベテ"     // " All"
65
-#define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " ベッド"     // " Bed"
66
-#define MSG_PREHEAT_PLA_SETTINGS            MSG_PREHEAT_PLA " セッテイ"    // " conf"
67
-#define MSG_PREHEAT_ABS                     "ABS ヨネツ"                  // "Preheat ABS"
68
-#define MSG_PREHEAT_ABS_N                   MSG_PREHEAT_ABS " "
69
-#define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " スベテ"     // " All"
70
-#define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " ベッド"     // " Bed"
71
-#define MSG_PREHEAT_ABS_SETTINGS            MSG_PREHEAT_ABS " セッテイ"    // " conf"
62
+#define MSG_PREHEAT_1                       "PLA ヨネツ"                   // "Preheat PLA"
63
+#define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 " "
64
+#define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 " スベテ"     // " All"
65
+#define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 " ベッド"     // " Bed"
66
+#define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 " セッテイ"    // " conf"
67
+#define MSG_PREHEAT_2                       "ABS ヨネツ"                  // "Preheat ABS"
68
+#define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 " "
69
+#define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 " スベテ"     // " All"
70
+#define MSG_PREHEAT_2_BEDONLY               MSG_PREHEAT_2 " ベッド"     // " Bed"
71
+#define MSG_PREHEAT_2_SETTINGS              MSG_PREHEAT_2 " セッテイ"    // " conf"
72
 #define MSG_COOLDOWN                        "カネツテイシ"                  // "Cooldown"
72
 #define MSG_COOLDOWN                        "カネツテイシ"                  // "Cooldown"
73
 #define MSG_SWITCH_PS_ON                    "デンゲン オン"                 // "Switch power on"
73
 #define MSG_SWITCH_PS_ON                    "デンゲン オン"                 // "Switch power on"
74
 #define MSG_SWITCH_PS_OFF                   "デンゲン オフ"                 // "Switch power off"
74
 #define MSG_SWITCH_PS_OFF                   "デンゲン オフ"                 // "Switch power off"

+ 10
- 10
Marlin/language_nl.h 파일 보기

48
 #define MSG_SET_HOME_OFFSETS                "Zet home offsets"
48
 #define MSG_SET_HOME_OFFSETS                "Zet home offsets"
49
 #define MSG_HOME_OFFSETS_APPLIED            "H offset toegep."
49
 #define MSG_HOME_OFFSETS_APPLIED            "H offset toegep."
50
 #define MSG_SET_ORIGIN                      "Nulpunt instellen"
50
 #define MSG_SET_ORIGIN                      "Nulpunt instellen"
51
-#define MSG_PREHEAT_PLA                     "PLA voorverwarmen"
52
-#define MSG_PREHEAT_PLA_N                   "PLA voorverw. "
53
-#define MSG_PREHEAT_PLA_ALL                 "PLA voorverw. aan"
54
-#define MSG_PREHEAT_PLA_BEDONLY             "PLA voorverw. Bed"
55
-#define MSG_PREHEAT_PLA_SETTINGS            "PLA verw. conf"
56
-#define MSG_PREHEAT_ABS                     "ABS voorverwarmen"
57
-#define MSG_PREHEAT_ABS_N                   "ABS voorverw. "
58
-#define MSG_PREHEAT_ABS_ALL                 "ABS voorverw. aan"
59
-#define MSG_PREHEAT_ABS_BEDONLY             "ABS voorverw. Bed"
60
-#define MSG_PREHEAT_ABS_SETTINGS            "ABS verw. conf"
51
+#define MSG_PREHEAT_1                       "PLA voorverwarmen"
52
+#define MSG_PREHEAT_1_N                     "PLA voorverw. "
53
+#define MSG_PREHEAT_1_ALL                   "PLA voorverw. aan"
54
+#define MSG_PREHEAT_1_BEDONLY               "PLA voorverw. Bed"
55
+#define MSG_PREHEAT_1_SETTINGS              "PLA verw. conf"
56
+#define MSG_PREHEAT_2                       "ABS voorverwarmen"
57
+#define MSG_PREHEAT_2_N                     "ABS voorverw. "
58
+#define MSG_PREHEAT_2_ALL                   "ABS voorverw. aan"
59
+#define MSG_PREHEAT_2_BEDONLY               "ABS voorverw. Bed"
60
+#define MSG_PREHEAT_2_SETTINGS              "ABS verw. conf"
61
 #define MSG_COOLDOWN                        "Afkoelen"
61
 #define MSG_COOLDOWN                        "Afkoelen"
62
 #define MSG_SWITCH_PS_ON                    "Stroom aan"
62
 #define MSG_SWITCH_PS_ON                    "Stroom aan"
63
 #define MSG_SWITCH_PS_OFF                   "Stroom uit"
63
 #define MSG_SWITCH_PS_OFF                   "Stroom uit"

+ 10
- 10
Marlin/language_pl.h 파일 보기

50
 #define MSG_SET_HOME_OFFSETS                "Ust. poz. zer."
50
 #define MSG_SET_HOME_OFFSETS                "Ust. poz. zer."
51
 #define MSG_HOME_OFFSETS_APPLIED            "Poz. zerowa ust."
51
 #define MSG_HOME_OFFSETS_APPLIED            "Poz. zerowa ust."
52
 #define MSG_SET_ORIGIN                      "Ustaw punkt zero"
52
 #define MSG_SET_ORIGIN                      "Ustaw punkt zero"
53
-#define MSG_PREHEAT_PLA                     "Rozgrzej PLA"
54
-#define MSG_PREHEAT_PLA_N                   "Rozgrzej PLA "
55
-#define MSG_PREHEAT_PLA_ALL                 "Roz. PLA Wszystko"
56
-#define MSG_PREHEAT_PLA_BEDONLY             "Rozgrzej PLA Loze"
57
-#define MSG_PREHEAT_PLA_SETTINGS            "Ustaw. rozg. PLA"
58
-#define MSG_PREHEAT_ABS                     "Rozgrzej ABS"
59
-#define MSG_PREHEAT_ABS_N                   "Rozgrzej ABS "
60
-#define MSG_PREHEAT_ABS_ALL                 "Roz. ABS Wszystko"
61
-#define MSG_PREHEAT_ABS_BEDONLY             "Rozgrzej ABS Loze"
62
-#define MSG_PREHEAT_ABS_SETTINGS            "Ustaw. rozg. ABS"
53
+#define MSG_PREHEAT_1                       "Rozgrzej PLA"
54
+#define MSG_PREHEAT_1_N                     "Rozgrzej PLA "
55
+#define MSG_PREHEAT_1_ALL                   "Roz. PLA Wszystko"
56
+#define MSG_PREHEAT_1_BEDONLY               "Rozgrzej PLA Loze"
57
+#define MSG_PREHEAT_1_SETTINGS              "Ustaw. rozg. PLA"
58
+#define MSG_PREHEAT_2                       "Rozgrzej ABS"
59
+#define MSG_PREHEAT_2_N                     "Rozgrzej ABS "
60
+#define MSG_PREHEAT_2_ALL                   "Roz. ABS Wszystko"
61
+#define MSG_PREHEAT_2_BEDONLY               "Rozgrzej ABS Loze"
62
+#define MSG_PREHEAT_2_SETTINGS              "Ustaw. rozg. ABS"
63
 #define MSG_H1                              "1"
63
 #define MSG_H1                              "1"
64
 #define MSG_H2                              "2"
64
 #define MSG_H2                              "2"
65
 #define MSG_H3                              "3"
65
 #define MSG_H3                              "3"

+ 10
- 10
Marlin/language_pt-br.h 파일 보기

48
 #define MSG_SET_HOME_OFFSETS                "Ajustar Jogo"
48
 #define MSG_SET_HOME_OFFSETS                "Ajustar Jogo"
49
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
49
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
50
 #define MSG_SET_ORIGIN                      "Ajustar orig."
50
 #define MSG_SET_ORIGIN                      "Ajustar orig."
51
-#define MSG_PREHEAT_PLA                     "Pre-aquecer PLA"
52
-#define MSG_PREHEAT_PLA_N                   "Pre-aquecer PLA"
53
-#define MSG_PREHEAT_PLA_ALL                 "Pre-aq.Todo PLA"
54
-#define MSG_PREHEAT_PLA_BEDONLY             "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
55
-#define MSG_PREHEAT_PLA_SETTINGS            "Ajustar PLA"
56
-#define MSG_PREHEAT_ABS                     "Pre-aquecer ABS"
57
-#define MSG_PREHEAT_ABS_N                   "Pre-aquecer ABS"
58
-#define MSG_PREHEAT_ABS_ALL                 "Pre-aq.Todo ABS"
59
-#define MSG_PREHEAT_ABS_BEDONLY             "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
60
-#define MSG_PREHEAT_ABS_SETTINGS            "Ajustar ABS"
51
+#define MSG_PREHEAT_1                       "Pre-aquecer PLA"
52
+#define MSG_PREHEAT_1_N                     "Pre-aquecer PLA"
53
+#define MSG_PREHEAT_1_ALL                   "Pre-aq.Todo PLA"
54
+#define MSG_PREHEAT_1_BEDONLY               "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
55
+#define MSG_PREHEAT_1_SETTINGS              "Ajustar PLA"
56
+#define MSG_PREHEAT_2                       "Pre-aquecer ABS"
57
+#define MSG_PREHEAT_2_N                     "Pre-aquecer ABS"
58
+#define MSG_PREHEAT_2_ALL                   "Pre-aq.Todo ABS"
59
+#define MSG_PREHEAT_2_BEDONLY               "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
60
+#define MSG_PREHEAT_2_SETTINGS              "Ajustar ABS"
61
 #define MSG_COOLDOWN                        "Esfriar"
61
 #define MSG_COOLDOWN                        "Esfriar"
62
 #define MSG_SWITCH_PS_ON                    "Ligar"
62
 #define MSG_SWITCH_PS_ON                    "Ligar"
63
 #define MSG_SWITCH_PS_OFF                   "Desligar"
63
 #define MSG_SWITCH_PS_OFF                   "Desligar"

+ 10
- 10
Marlin/language_pt-br_utf8.h 파일 보기

48
 #define MSG_SET_HOME_OFFSETS                "Ajustar Jogo"
48
 #define MSG_SET_HOME_OFFSETS                "Ajustar Jogo"
49
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
49
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
50
 #define MSG_SET_ORIGIN                      "Ajustar orig."
50
 #define MSG_SET_ORIGIN                      "Ajustar orig."
51
-#define MSG_PREHEAT_PLA                     "Pre-aquecer PLA"
52
-#define MSG_PREHEAT_PLA_N                   "Pre-aquecer PLA"
53
-#define MSG_PREHEAT_PLA_ALL                 "Pre-aq.Todo PLA"
54
-#define MSG_PREHEAT_PLA_BEDONLY             "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
55
-#define MSG_PREHEAT_PLA_SETTINGS            "Ajustar PLA"
56
-#define MSG_PREHEAT_ABS                     "Pre-aquecer ABS"
57
-#define MSG_PREHEAT_ABS_N                   "Pre-aquecer ABS"
58
-#define MSG_PREHEAT_ABS_ALL                 "Pre-aq.Todo ABS"
59
-#define MSG_PREHEAT_ABS_BEDONLY             "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
60
-#define MSG_PREHEAT_ABS_SETTINGS            "Ajustar ABS"
51
+#define MSG_PREHEAT_1                       "Pre-aquecer PLA"
52
+#define MSG_PREHEAT_1_N                     "Pre-aquecer PLA"
53
+#define MSG_PREHEAT_1_ALL                   "Pre-aq.Todo PLA"
54
+#define MSG_PREHEAT_1_BEDONLY               "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
55
+#define MSG_PREHEAT_1_SETTINGS              "Ajustar PLA"
56
+#define MSG_PREHEAT_2                       "Pre-aquecer ABS"
57
+#define MSG_PREHEAT_2_N                     "Pre-aquecer ABS"
58
+#define MSG_PREHEAT_2_ALL                   "Pre-aq.Todo ABS"
59
+#define MSG_PREHEAT_2_BEDONLY               "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
60
+#define MSG_PREHEAT_2_SETTINGS              "Ajustar ABS"
61
 #define MSG_COOLDOWN                        "Esfriar"
61
 #define MSG_COOLDOWN                        "Esfriar"
62
 #define MSG_SWITCH_PS_ON                    "Ligar"
62
 #define MSG_SWITCH_PS_ON                    "Ligar"
63
 #define MSG_SWITCH_PS_OFF                   "Desligar"
63
 #define MSG_SWITCH_PS_OFF                   "Desligar"

+ 10
- 10
Marlin/language_pt.h 파일 보기

52
 #define MSG_SET_HOME_OFFSETS                "Definir desvio"
52
 #define MSG_SET_HOME_OFFSETS                "Definir desvio"
53
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
53
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
54
 #define MSG_SET_ORIGIN                      "Definir origem"
54
 #define MSG_SET_ORIGIN                      "Definir origem"
55
-#define MSG_PREHEAT_PLA                     "Pre-aquecer PLA"
56
-#define MSG_PREHEAT_PLA_N                   "Pre-aquecer PLA"
57
-#define MSG_PREHEAT_PLA_ALL                 "Pre-aq. PLA Tudo"
58
-#define MSG_PREHEAT_PLA_BEDONLY             "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
59
-#define MSG_PREHEAT_PLA_SETTINGS            "Definicoes PLA"
60
-#define MSG_PREHEAT_ABS                     "Pre-aquecer ABS"
61
-#define MSG_PREHEAT_ABS_N                   "Pre-aquecer ABS "
62
-#define MSG_PREHEAT_ABS_ALL                 "Pre-aq. ABS Tudo"
63
-#define MSG_PREHEAT_ABS_BEDONLY             "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
64
-#define MSG_PREHEAT_ABS_SETTINGS            "Definicoes ABS"
55
+#define MSG_PREHEAT_1                       "Pre-aquecer PLA"
56
+#define MSG_PREHEAT_1_N                     "Pre-aquecer PLA"
57
+#define MSG_PREHEAT_1_ALL                   "Pre-aq. PLA Tudo"
58
+#define MSG_PREHEAT_1_BEDONLY               "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
59
+#define MSG_PREHEAT_1_SETTINGS              "Definicoes PLA"
60
+#define MSG_PREHEAT_2                       "Pre-aquecer ABS"
61
+#define MSG_PREHEAT_2_N                     "Pre-aquecer ABS "
62
+#define MSG_PREHEAT_2_ALL                   "Pre-aq. ABS Tudo"
63
+#define MSG_PREHEAT_2_BEDONLY               "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
64
+#define MSG_PREHEAT_2_SETTINGS              "Definicoes ABS"
65
 #define MSG_COOLDOWN                        "Arrefecer"
65
 #define MSG_COOLDOWN                        "Arrefecer"
66
 #define MSG_SWITCH_PS_ON                    "Ligar"
66
 #define MSG_SWITCH_PS_ON                    "Ligar"
67
 #define MSG_SWITCH_PS_OFF                   "Desligar"
67
 #define MSG_SWITCH_PS_OFF                   "Desligar"

+ 10
- 10
Marlin/language_pt_utf8.h 파일 보기

52
 #define MSG_SET_HOME_OFFSETS                "Definir desvio"
52
 #define MSG_SET_HOME_OFFSETS                "Definir desvio"
53
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets aplicados"
53
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets aplicados"
54
 #define MSG_SET_ORIGIN                      "Definir origem"
54
 #define MSG_SET_ORIGIN                      "Definir origem"
55
-#define MSG_PREHEAT_PLA                     "Pre-aquecer PLA"
56
-#define MSG_PREHEAT_PLA_N                   "Pre-aquecer PLA"
57
-#define MSG_PREHEAT_PLA_ALL                 "Pre-aq. PLA Tudo"
58
-#define MSG_PREHEAT_PLA_BEDONLY             "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
59
-#define MSG_PREHEAT_PLA_SETTINGS            "Definições PLA"
60
-#define MSG_PREHEAT_ABS                     "Pre-aquecer ABS"
61
-#define MSG_PREHEAT_ABS_N                   "Pre-aquecer ABS "
62
-#define MSG_PREHEAT_ABS_ALL                 "Pre-aq. ABS Tudo"
63
-#define MSG_PREHEAT_ABS_BEDONLY             "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
64
-#define MSG_PREHEAT_ABS_SETTINGS            "Definições ABS"
55
+#define MSG_PREHEAT_1                       "Pre-aquecer PLA"
56
+#define MSG_PREHEAT_1_N                     "Pre-aquecer PLA"
57
+#define MSG_PREHEAT_1_ALL                   "Pre-aq. PLA Tudo"
58
+#define MSG_PREHEAT_1_BEDONLY               "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
59
+#define MSG_PREHEAT_1_SETTINGS              "Definições PLA"
60
+#define MSG_PREHEAT_2                       "Pre-aquecer ABS"
61
+#define MSG_PREHEAT_2_N                     "Pre-aquecer ABS "
62
+#define MSG_PREHEAT_2_ALL                   "Pre-aq. ABS Tudo"
63
+#define MSG_PREHEAT_2_BEDONLY               "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
64
+#define MSG_PREHEAT_2_SETTINGS              "Definições ABS"
65
 #define MSG_COOLDOWN                        "Arrefecer"
65
 #define MSG_COOLDOWN                        "Arrefecer"
66
 #define MSG_SWITCH_PS_ON                    "Ligar"
66
 #define MSG_SWITCH_PS_ON                    "Ligar"
67
 #define MSG_SWITCH_PS_OFF                   "Desligar"
67
 #define MSG_SWITCH_PS_OFF                   "Desligar"

+ 10
- 10
Marlin/language_ru.h 파일 보기

49
 #define MSG_SET_HOME_OFFSETS                "Запомнить парковку"
49
 #define MSG_SET_HOME_OFFSETS                "Запомнить парковку"
50
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
50
 #define MSG_HOME_OFFSETS_APPLIED            "Offsets applied"
51
 #define MSG_SET_ORIGIN                      "Запомнить ноль"
51
 #define MSG_SET_ORIGIN                      "Запомнить ноль"
52
-#define MSG_PREHEAT_PLA                     "Преднагрев PLA"
53
-#define MSG_PREHEAT_PLA_N                   "Греть PLA Сопло "
54
-#define MSG_PREHEAT_PLA_ALL                 "Греть PLA Все"
55
-#define MSG_PREHEAT_PLA_BEDONLY             "Греть PLA Стол"
56
-#define MSG_PREHEAT_PLA_SETTINGS            "Настройки PLA"
57
-#define MSG_PREHEAT_ABS                     "Преднагрев ABS"
58
-#define MSG_PREHEAT_ABS_N                   "Греть ABS Сопло "
59
-#define MSG_PREHEAT_ABS_ALL                 "Греть ABS Все"
60
-#define MSG_PREHEAT_ABS_BEDONLY             "Греть ABS Стол"
61
-#define MSG_PREHEAT_ABS_SETTINGS            "Настройки ABS"
52
+#define MSG_PREHEAT_1                       "Преднагрев PLA"
53
+#define MSG_PREHEAT_1_N                     "Греть PLA Сопло "
54
+#define MSG_PREHEAT_1_ALL                   "Греть PLA Все"
55
+#define MSG_PREHEAT_1_BEDONLY               "Греть PLA Стол"
56
+#define MSG_PREHEAT_1_SETTINGS              "Настройки PLA"
57
+#define MSG_PREHEAT_2                       "Преднагрев ABS"
58
+#define MSG_PREHEAT_2_N                     "Греть ABS Сопло "
59
+#define MSG_PREHEAT_2_ALL                   "Греть ABS Все"
60
+#define MSG_PREHEAT_2_BEDONLY               "Греть ABS Стол"
61
+#define MSG_PREHEAT_2_SETTINGS              "Настройки ABS"
62
 #define MSG_COOLDOWN                        "Охлаждение"
62
 #define MSG_COOLDOWN                        "Охлаждение"
63
 #define MSG_SWITCH_PS_ON                    "Включить Питание"
63
 #define MSG_SWITCH_PS_ON                    "Включить Питание"
64
 #define MSG_SWITCH_PS_OFF                   "Отключить Питание"
64
 #define MSG_SWITCH_PS_OFF                   "Отключить Питание"

+ 6
- 6
Marlin/language_test.h 파일 보기

141
   #define MSG_DISABLE_STEPPERS                STRG_C2_8
141
   #define MSG_DISABLE_STEPPERS                STRG_C2_8
142
   #define MSG_AUTO_HOME                       STRG_C2_9
142
   #define MSG_AUTO_HOME                       STRG_C2_9
143
   #define MSG_SET_HOME_OFFSETS                STRG_C2_a
143
   #define MSG_SET_HOME_OFFSETS                STRG_C2_a
144
-  #define MSG_PREHEAT_PLA                     STRG_C2_b
145
-  #define MSG_PREHEAT_ABS                     STRG_C3_8
144
+  #define MSG_PREHEAT_1                       STRG_C2_b
145
+  #define MSG_PREHEAT_2                       STRG_C3_8
146
   #define MSG_COOLDOWN                        STRG_C3_9
146
   #define MSG_COOLDOWN                        STRG_C3_9
147
   #define MSG_SWITCH_PS_OFF                   STRG_C3_a
147
   #define MSG_SWITCH_PS_OFF                   STRG_C3_a
148
   #define MSG_MOVE_AXIS                       STRG_C3_b
148
   #define MSG_MOVE_AXIS                       STRG_C3_b
176
   #define MSG_DISABLE_STEPPERS                STRG_D0_8
176
   #define MSG_DISABLE_STEPPERS                STRG_D0_8
177
   #define MSG_AUTO_HOME                       STRG_D0_9
177
   #define MSG_AUTO_HOME                       STRG_D0_9
178
   #define MSG_SET_HOME_OFFSETS                STRG_D0_a
178
   #define MSG_SET_HOME_OFFSETS                STRG_D0_a
179
-  #define MSG_PREHEAT_PLA                     STRG_D0_b
180
-  #define MSG_PREHEAT_ABS                     STRG_D1_8
179
+  #define MSG_PREHEAT_1                       STRG_D0_b
180
+  #define MSG_PREHEAT_2                       STRG_D1_8
181
   #define MSG_COOLDOWN                        STRG_D1_9
181
   #define MSG_COOLDOWN                        STRG_D1_9
182
   #define MSG_SWITCH_PS_OFF                   STRG_D1_a
182
   #define MSG_SWITCH_PS_OFF                   STRG_D1_a
183
   #define MSG_MOVE_AXIS                       STRG_D1_b
183
   #define MSG_MOVE_AXIS                       STRG_D1_b
211
   #define MSG_DISABLE_STEPPERS                STRG_E382_8
211
   #define MSG_DISABLE_STEPPERS                STRG_E382_8
212
   #define MSG_AUTO_HOME                       STRG_E382_9
212
   #define MSG_AUTO_HOME                       STRG_E382_9
213
   #define MSG_SET_HOME_OFFSETS                STRG_E382_a
213
   #define MSG_SET_HOME_OFFSETS                STRG_E382_a
214
-  #define MSG_PREHEAT_PLA                     STRG_E382_b
215
-  #define MSG_PREHEAT_ABS                     STRG_E383_8
214
+  #define MSG_PREHEAT_1                       STRG_E382_b
215
+  #define MSG_PREHEAT_2                       STRG_E383_8
216
   #define MSG_COOLDOWN                        STRG_E383_9
216
   #define MSG_COOLDOWN                        STRG_E383_9
217
   #define MSG_SWITCH_PS_OFF                   STRG_E383_a
217
   #define MSG_SWITCH_PS_OFF                   STRG_E383_a
218
   #define MSG_MOVE_AXIS                       STRG_E383_b
218
   #define MSG_MOVE_AXIS                       STRG_E383_b

+ 44
- 49
Marlin/ultralcd.cpp 파일 보기

33
   #include "printcounter.h"
33
   #include "printcounter.h"
34
 #endif
34
 #endif
35
 
35
 
36
-int plaPreheatHotendTemp;
37
-int plaPreheatHPBTemp;
38
-int plaPreheatFanSpeed;
39
-
40
-int absPreheatHotendTemp;
41
-int absPreheatHPBTemp;
42
-int absPreheatFanSpeed;
36
+int preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1,
37
+    preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2;
43
 
38
 
44
 #if ENABLED(FILAMENT_LCD_DISPLAY)
39
 #if ENABLED(FILAMENT_LCD_DISPLAY)
45
   millis_t previous_lcd_status_ms = 0;
40
   millis_t previous_lcd_status_ms = 0;
885
   }
880
   }
886
 
881
 
887
   #if TEMP_SENSOR_0 != 0
882
   #if TEMP_SENSOR_0 != 0
888
-    void lcd_preheat_pla0() { _lcd_preheat(0, plaPreheatHotendTemp, plaPreheatHPBTemp, plaPreheatFanSpeed); }
889
-    void lcd_preheat_abs0() { _lcd_preheat(0, absPreheatHotendTemp, absPreheatHPBTemp, absPreheatFanSpeed); }
883
+    void lcd_preheat_pla0() { _lcd_preheat(0, preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1); }
884
+    void lcd_preheat_abs0() { _lcd_preheat(0, preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2); }
890
   #endif
885
   #endif
891
 
886
 
892
   #if HOTENDS > 1
887
   #if HOTENDS > 1
893
-    void lcd_preheat_pla1() { _lcd_preheat(1, plaPreheatHotendTemp, plaPreheatHPBTemp, plaPreheatFanSpeed); }
894
-    void lcd_preheat_abs1() { _lcd_preheat(1, absPreheatHotendTemp, absPreheatHPBTemp, absPreheatFanSpeed); }
888
+    void lcd_preheat_pla1() { _lcd_preheat(1, preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1); }
889
+    void lcd_preheat_abs1() { _lcd_preheat(1, preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2); }
895
     #if HOTENDS > 2
890
     #if HOTENDS > 2
896
-      void lcd_preheat_pla2() { _lcd_preheat(2, plaPreheatHotendTemp, plaPreheatHPBTemp, plaPreheatFanSpeed); }
897
-      void lcd_preheat_abs2() { _lcd_preheat(2, absPreheatHotendTemp, absPreheatHPBTemp, absPreheatFanSpeed); }
891
+      void lcd_preheat_pla2() { _lcd_preheat(2, preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1); }
892
+      void lcd_preheat_abs2() { _lcd_preheat(2, preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2); }
898
       #if HOTENDS > 3
893
       #if HOTENDS > 3
899
-        void lcd_preheat_pla3() { _lcd_preheat(3, plaPreheatHotendTemp, plaPreheatHPBTemp, plaPreheatFanSpeed); }
900
-        void lcd_preheat_abs3() { _lcd_preheat(3, absPreheatHotendTemp, absPreheatHPBTemp, absPreheatFanSpeed); }
894
+        void lcd_preheat_pla3() { _lcd_preheat(3, preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1); }
895
+        void lcd_preheat_abs3() { _lcd_preheat(3, preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2); }
901
       #endif
896
       #endif
902
     #endif
897
     #endif
903
 
898
 
904
     void lcd_preheat_pla0123() {
899
     void lcd_preheat_pla0123() {
905
       #if HOTENDS > 1
900
       #if HOTENDS > 1
906
-        thermalManager.setTargetHotend(plaPreheatHotendTemp, 1);
901
+        thermalManager.setTargetHotend(preheatHotendTemp1, 1);
907
         #if HOTENDS > 2
902
         #if HOTENDS > 2
908
-          thermalManager.setTargetHotend(plaPreheatHotendTemp, 2);
903
+          thermalManager.setTargetHotend(preheatHotendTemp1, 2);
909
           #if HOTENDS > 3
904
           #if HOTENDS > 3
910
-            thermalManager.setTargetHotend(plaPreheatHotendTemp, 3);
905
+            thermalManager.setTargetHotend(preheatHotendTemp1, 3);
911
           #endif
906
           #endif
912
         #endif
907
         #endif
913
       #endif
908
       #endif
915
     }
910
     }
916
     void lcd_preheat_abs0123() {
911
     void lcd_preheat_abs0123() {
917
       #if HOTENDS > 1
912
       #if HOTENDS > 1
918
-        thermalManager.setTargetHotend(absPreheatHotendTemp, 1);
913
+        thermalManager.setTargetHotend(preheatHotendTemp2, 1);
919
         #if HOTENDS > 2
914
         #if HOTENDS > 2
920
-          thermalManager.setTargetHotend(absPreheatHotendTemp, 2);
915
+          thermalManager.setTargetHotend(preheatHotendTemp2, 2);
921
           #if HOTENDS > 3
916
           #if HOTENDS > 3
922
-            thermalManager.setTargetHotend(absPreheatHotendTemp, 3);
917
+            thermalManager.setTargetHotend(preheatHotendTemp2, 3);
923
           #endif
918
           #endif
924
         #endif
919
         #endif
925
       #endif
920
       #endif
929
   #endif // HOTENDS > 1
924
   #endif // HOTENDS > 1
930
 
925
 
931
   #if TEMP_SENSOR_BED != 0
926
   #if TEMP_SENSOR_BED != 0
932
-    void lcd_preheat_pla_bedonly() { _lcd_preheat(0, 0, plaPreheatHPBTemp, plaPreheatFanSpeed); }
933
-    void lcd_preheat_abs_bedonly() { _lcd_preheat(0, 0, absPreheatHPBTemp, absPreheatFanSpeed); }
927
+    void lcd_preheat_pla_bedonly() { _lcd_preheat(0, 0, preheatBedTemp1, preheatFanSpeed1); }
928
+    void lcd_preheat_abs_bedonly() { _lcd_preheat(0, 0, preheatBedTemp2, preheatFanSpeed2); }
934
   #endif
929
   #endif
935
 
930
 
936
   #if TEMP_SENSOR_0 != 0 && (TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_BED != 0)
931
   #if TEMP_SENSOR_0 != 0 && (TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_BED != 0)
939
       START_MENU();
934
       START_MENU();
940
       MENU_ITEM(back, MSG_PREPARE);
935
       MENU_ITEM(back, MSG_PREPARE);
941
       #if HOTENDS == 1
936
       #if HOTENDS == 1
942
-        MENU_ITEM(function, MSG_PREHEAT_PLA, lcd_preheat_pla0);
937
+        MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_pla0);
943
       #else
938
       #else
944
-        MENU_ITEM(function, MSG_PREHEAT_PLA_N MSG_H1, lcd_preheat_pla0);
945
-        MENU_ITEM(function, MSG_PREHEAT_PLA_N MSG_H2, lcd_preheat_pla1);
939
+        MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H1, lcd_preheat_pla0);
940
+        MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H2, lcd_preheat_pla1);
946
         #if HOTENDS > 2
941
         #if HOTENDS > 2
947
-          MENU_ITEM(function, MSG_PREHEAT_PLA_N MSG_H3, lcd_preheat_pla2);
942
+          MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H3, lcd_preheat_pla2);
948
           #if HOTENDS > 3
943
           #if HOTENDS > 3
949
-            MENU_ITEM(function, MSG_PREHEAT_PLA_N MSG_H4, lcd_preheat_pla3);
944
+            MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H4, lcd_preheat_pla3);
950
           #endif
945
           #endif
951
         #endif
946
         #endif
952
-        MENU_ITEM(function, MSG_PREHEAT_PLA_ALL, lcd_preheat_pla0123);
947
+        MENU_ITEM(function, MSG_PREHEAT_1_ALL, lcd_preheat_pla0123);
953
       #endif
948
       #endif
954
       #if TEMP_SENSOR_BED != 0
949
       #if TEMP_SENSOR_BED != 0
955
-        MENU_ITEM(function, MSG_PREHEAT_PLA_BEDONLY, lcd_preheat_pla_bedonly);
950
+        MENU_ITEM(function, MSG_PREHEAT_1_BEDONLY, lcd_preheat_pla_bedonly);
956
       #endif
951
       #endif
957
       END_MENU();
952
       END_MENU();
958
     }
953
     }
961
       START_MENU();
956
       START_MENU();
962
       MENU_ITEM(back, MSG_PREPARE);
957
       MENU_ITEM(back, MSG_PREPARE);
963
       #if HOTENDS == 1
958
       #if HOTENDS == 1
964
-        MENU_ITEM(function, MSG_PREHEAT_ABS, lcd_preheat_abs0);
959
+        MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_abs0);
965
       #else
960
       #else
966
-        MENU_ITEM(function, MSG_PREHEAT_ABS_N MSG_H1, lcd_preheat_abs0);
967
-        MENU_ITEM(function, MSG_PREHEAT_ABS_N MSG_H2, lcd_preheat_abs1);
961
+        MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H1, lcd_preheat_abs0);
962
+        MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H2, lcd_preheat_abs1);
968
         #if HOTENDS > 2
963
         #if HOTENDS > 2
969
-          MENU_ITEM(function, MSG_PREHEAT_ABS_N MSG_H3, lcd_preheat_abs2);
964
+          MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H3, lcd_preheat_abs2);
970
           #if HOTENDS > 3
965
           #if HOTENDS > 3
971
-            MENU_ITEM(function, MSG_PREHEAT_ABS_N MSG_H4, lcd_preheat_abs3);
966
+            MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H4, lcd_preheat_abs3);
972
           #endif
967
           #endif
973
         #endif
968
         #endif
974
-        MENU_ITEM(function, MSG_PREHEAT_ABS_ALL, lcd_preheat_abs0123);
969
+        MENU_ITEM(function, MSG_PREHEAT_2_ALL, lcd_preheat_abs0123);
975
       #endif
970
       #endif
976
       #if TEMP_SENSOR_BED != 0
971
       #if TEMP_SENSOR_BED != 0
977
-        MENU_ITEM(function, MSG_PREHEAT_ABS_BEDONLY, lcd_preheat_abs_bedonly);
972
+        MENU_ITEM(function, MSG_PREHEAT_2_BEDONLY, lcd_preheat_abs_bedonly);
978
       #endif
973
       #endif
979
       END_MENU();
974
       END_MENU();
980
     }
975
     }
1250
     //
1245
     //
1251
     #if TEMP_SENSOR_0 != 0
1246
     #if TEMP_SENSOR_0 != 0
1252
       #if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_BED != 0
1247
       #if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_BED != 0
1253
-        MENU_ITEM(submenu, MSG_PREHEAT_PLA, lcd_preheat_pla_menu);
1254
-        MENU_ITEM(submenu, MSG_PREHEAT_ABS, lcd_preheat_abs_menu);
1248
+        MENU_ITEM(submenu, MSG_PREHEAT_1, lcd_preheat_pla_menu);
1249
+        MENU_ITEM(submenu, MSG_PREHEAT_2, lcd_preheat_abs_menu);
1255
       #else
1250
       #else
1256
-        MENU_ITEM(function, MSG_PREHEAT_PLA, lcd_preheat_pla0);
1257
-        MENU_ITEM(function, MSG_PREHEAT_ABS, lcd_preheat_abs0);
1251
+        MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_pla0);
1252
+        MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_abs0);
1258
       #endif
1253
       #endif
1259
     #endif
1254
     #endif
1260
 
1255
 
1713
     //
1708
     //
1714
     // Preheat PLA conf
1709
     // Preheat PLA conf
1715
     //
1710
     //
1716
-    MENU_ITEM(submenu, MSG_PREHEAT_PLA_SETTINGS, lcd_control_temperature_preheat_pla_settings_menu);
1711
+    MENU_ITEM(submenu, MSG_PREHEAT_1_SETTINGS, lcd_control_temperature_preheat_pla_settings_menu);
1717
 
1712
 
1718
     //
1713
     //
1719
     // Preheat ABS conf
1714
     // Preheat ABS conf
1720
     //
1715
     //
1721
-    MENU_ITEM(submenu, MSG_PREHEAT_ABS_SETTINGS, lcd_control_temperature_preheat_abs_settings_menu);
1716
+    MENU_ITEM(submenu, MSG_PREHEAT_2_SETTINGS, lcd_control_temperature_preheat_abs_settings_menu);
1722
     END_MENU();
1717
     END_MENU();
1723
   }
1718
   }
1724
 
1719
 
1730
   static void lcd_control_temperature_preheat_pla_settings_menu() {
1725
   static void lcd_control_temperature_preheat_pla_settings_menu() {
1731
     START_MENU();
1726
     START_MENU();
1732
     MENU_ITEM(back, MSG_TEMPERATURE);
1727
     MENU_ITEM(back, MSG_TEMPERATURE);
1733
-    MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &plaPreheatFanSpeed, 0, 255);
1728
+    MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &preheatFanSpeed1, 0, 255);
1734
     #if TEMP_SENSOR_0 != 0
1729
     #if TEMP_SENSOR_0 != 0
1735
-      MENU_ITEM_EDIT(int3, MSG_NOZZLE, &plaPreheatHotendTemp, HEATER_0_MINTEMP, HEATER_0_MAXTEMP - 15);
1730
+      MENU_ITEM_EDIT(int3, MSG_NOZZLE, &preheatHotendTemp1, HEATER_0_MINTEMP, HEATER_0_MAXTEMP - 15);
1736
     #endif
1731
     #endif
1737
     #if TEMP_SENSOR_BED != 0
1732
     #if TEMP_SENSOR_BED != 0
1738
-      MENU_ITEM_EDIT(int3, MSG_BED, &plaPreheatHPBTemp, BED_MINTEMP, BED_MAXTEMP - 15);
1733
+      MENU_ITEM_EDIT(int3, MSG_BED, &preheatBedTemp1, BED_MINTEMP, BED_MAXTEMP - 15);
1739
     #endif
1734
     #endif
1740
     #if ENABLED(EEPROM_SETTINGS)
1735
     #if ENABLED(EEPROM_SETTINGS)
1741
       MENU_ITEM(function, MSG_STORE_EPROM, Config_StoreSettings);
1736
       MENU_ITEM(function, MSG_STORE_EPROM, Config_StoreSettings);
1751
   static void lcd_control_temperature_preheat_abs_settings_menu() {
1746
   static void lcd_control_temperature_preheat_abs_settings_menu() {
1752
     START_MENU();
1747
     START_MENU();
1753
     MENU_ITEM(back, MSG_TEMPERATURE);
1748
     MENU_ITEM(back, MSG_TEMPERATURE);
1754
-    MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &absPreheatFanSpeed, 0, 255);
1749
+    MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &preheatFanSpeed2, 0, 255);
1755
     #if TEMP_SENSOR_0 != 0
1750
     #if TEMP_SENSOR_0 != 0
1756
-      MENU_ITEM_EDIT(int3, MSG_NOZZLE, &absPreheatHotendTemp, HEATER_0_MINTEMP, HEATER_0_MAXTEMP - 15);
1751
+      MENU_ITEM_EDIT(int3, MSG_NOZZLE, &preheatHotendTemp2, HEATER_0_MINTEMP, HEATER_0_MAXTEMP - 15);
1757
     #endif
1752
     #endif
1758
     #if TEMP_SENSOR_BED != 0
1753
     #if TEMP_SENSOR_BED != 0
1759
-      MENU_ITEM_EDIT(int3, MSG_BED, &absPreheatHPBTemp, BED_MINTEMP, BED_MAXTEMP - 15);
1754
+      MENU_ITEM_EDIT(int3, MSG_BED, &preheatBedTemp2, BED_MINTEMP, BED_MAXTEMP - 15);
1760
     #endif
1755
     #endif
1761
     #if ENABLED(EEPROM_SETTINGS)
1756
     #if ENABLED(EEPROM_SETTINGS)
1762
       MENU_ITEM(function, MSG_STORE_EPROM, Config_StoreSettings);
1757
       MENU_ITEM(function, MSG_STORE_EPROM, Config_StoreSettings);

+ 6
- 6
Marlin/ultralcd.h 파일 보기

90
     FORCE_INLINE void lcd_buttons_update() {}
90
     FORCE_INLINE void lcd_buttons_update() {}
91
   #endif
91
   #endif
92
 
92
 
93
-  extern int plaPreheatHotendTemp;
94
-  extern int plaPreheatHPBTemp;
95
-  extern int plaPreheatFanSpeed;
96
-  extern int absPreheatHotendTemp;
97
-  extern int absPreheatHPBTemp;
98
-  extern int absPreheatFanSpeed;
93
+  extern int preheatHotendTemp1;
94
+  extern int preheatBedTemp1;
95
+  extern int preheatFanSpeed1;
96
+  extern int preheatHotendTemp2;
97
+  extern int preheatBedTemp2;
98
+  extern int preheatFanSpeed2;
99
 
99
 
100
   #if ENABLED(FILAMENT_LCD_DISPLAY)
100
   #if ENABLED(FILAMENT_LCD_DISPLAY)
101
     extern millis_t previous_lcd_status_ms;
101
     extern millis_t previous_lcd_status_ms;

Loading…
취소
저장