diff --git a/qdt/i18n/QIDIStudio.pot b/qdt/i18n/QIDIStudio.pot index d85b9f8..c0bbaec 100644 --- a/qdt/i18n/QIDIStudio.pot +++ b/qdt/i18n/QIDIStudio.pot @@ -12950,3 +12950,66 @@ msgstr "" msgid "Switch to Device tab" msgstr "" + +msgid "Synchronize filament list from BOX." +msgstr "" + +msgid "Sync Box information" +msgstr "" + +msgid "Please select the printer in the list to get box info." +msgstr "" + +msgid "Sync" +msgstr "" + +msgid "Synchronize Box Filament Information" +msgstr "" + +msgid "Add unused Box filaments to filaments list." +msgstr "" + +msgid "Only synchronize filament type and color, not including Box slot information." +msgstr "" + +msgid "Are you sure to synchronize the filaments from Box?" +msgstr "" + +msgid "Box not connected. Please check the printer and box connect." +msgstr "" + +msgid "Successfully sent. Will automatically jump to the device page in %s s." +msgstr "" + +msgid "Successfully sent. Close current page in %s s." +msgstr "" + +msgid "The selected printer is not connect box, please check." +msgstr "" + +msgid "Failed to set the box printing slot..." +msgstr "" + +msgid "This Printer has not connect the box, please check." +msgstr "" + +msgid "Upper half area: Original\nLower half area: Filament in Box\nAnd you can click it to modify" +msgstr "" + +msgid "Upper half area: Original\nLower half area: Filament in Box\nAnd you cannot click it to modify" +msgstr "" + +msgid "BOX Slots" +msgstr "" + +msgid "Use BOX" +msgstr "" + +msgid "The filament information in the BOX has changed. Please resynchronize it." +msgstr "" + +msgid "BOX message has change" +msgstr "" + +msgid "Flushing" +msgstr "" \ No newline at end of file diff --git a/qdt/i18n/cs/QIDIStudio_cs.po b/qdt/i18n/cs/QIDIStudio_cs.po index 75808f8..00c578e 100644 --- a/qdt/i18n/cs/QIDIStudio_cs.po +++ b/qdt/i18n/cs/QIDIStudio_cs.po @@ -14644,4 +14644,7 @@ msgid "The filament information in the BOX has changed. Please resynchronize it. msgstr "Informace o filamentu v BOXu se změnily. Prosím, proveďte jejich resynchronizaci." msgid "BOX message has change" -msgstr "Zpráva v BOXu byla změněna." \ No newline at end of file +msgstr "Zpráva v BOXu byla změněna." + +msgid "Flushing" +msgstr "Čistící" \ No newline at end of file diff --git a/qdt/i18n/de/QIDIStudio_de.po b/qdt/i18n/de/QIDIStudio_de.po index a71a912..9c74dae 100644 --- a/qdt/i18n/de/QIDIStudio_de.po +++ b/qdt/i18n/de/QIDIStudio_de.po @@ -16225,4 +16225,7 @@ msgid "The filament information in the BOX has changed. Please resynchronize it. msgstr "Die Filamentinformationen in der BOX haben sich geändert. Bitte synchronisieren Sie sie erneut." msgid "BOX message has change" -msgstr "BOX-Nachricht wurde geändert" \ No newline at end of file +msgstr "BOX-Nachricht wurde geändert" + +msgid "Flushing" +msgstr "Spülen" \ No newline at end of file diff --git a/qdt/i18n/en/QIDIStudio_en.po b/qdt/i18n/en/QIDIStudio_en.po index 2503fb4..fd17706 100644 --- a/qdt/i18n/en/QIDIStudio_en.po +++ b/qdt/i18n/en/QIDIStudio_en.po @@ -16053,3 +16053,6 @@ msgstr "" msgid "BOX message has change" msgstr "" + +msgid "Flushing" +msgstr "" diff --git a/qdt/i18n/es/QIDIStudio_es.po b/qdt/i18n/es/QIDIStudio_es.po index 8d0f2a9..4026e1f 100644 --- a/qdt/i18n/es/QIDIStudio_es.po +++ b/qdt/i18n/es/QIDIStudio_es.po @@ -16235,4 +16235,7 @@ msgid "The filament information in the BOX has changed. Please resynchronize it. msgstr "La información del filamento en la BOX ha cambiado. Por favor, resincronícela." msgid "BOX message has change" -msgstr "El mensaje de la BOX ha cambiado" \ No newline at end of file +msgstr "El mensaje de la BOX ha cambiado" + +msgid "Flushing" +msgstr "Lavado" \ No newline at end of file diff --git a/qdt/i18n/fr/QIDIStudio_fr.po b/qdt/i18n/fr/QIDIStudio_fr.po index b46b8bc..df9816b 100644 --- a/qdt/i18n/fr/QIDIStudio_fr.po +++ b/qdt/i18n/fr/QIDIStudio_fr.po @@ -16187,4 +16187,7 @@ msgid "The filament information in the BOX has changed. Please resynchronize it. msgstr "Les informations du filament dans la BOX ont été modifiées. Veuillez les resynchroniser." msgid "BOX message has change" -msgstr "Le message de la BOX a été modifié" \ No newline at end of file +msgstr "Le message de la BOX a été modifié" + +msgid "Flushing" +msgstr "Rinçage" \ No newline at end of file diff --git a/qdt/i18n/hu/QIDIStudio_hu.po b/qdt/i18n/hu/QIDIStudio_hu.po index 9df0ddf..11fb5c6 100644 --- a/qdt/i18n/hu/QIDIStudio_hu.po +++ b/qdt/i18n/hu/QIDIStudio_hu.po @@ -16229,4 +16229,7 @@ msgid "The filament information in the BOX has changed. Please resynchronize it. msgstr "A BOX-ban lévő filament információ megváltozott. Kérjük, szinkronizálja újra." msgid "BOX message has change" -msgstr "A BOX üzenet megváltozott" \ No newline at end of file +msgstr "A BOX üzenet megváltozott" + +msgid "Flushing" +msgstr "Öblítés" \ No newline at end of file diff --git a/qdt/i18n/it/QIDIStudio_it.po b/qdt/i18n/it/QIDIStudio_it.po index 5734745..998175b 100644 --- a/qdt/i18n/it/QIDIStudio_it.po +++ b/qdt/i18n/it/QIDIStudio_it.po @@ -16234,4 +16234,7 @@ msgid "The filament information in the BOX has changed. Please resynchronize it. msgstr "Le informazioni sul filamento nella BOX sono cambiate. Si prega di risincronizzarle." msgid "BOX message has change" -msgstr "Il messaggio della BOX è cambiato" \ No newline at end of file +msgstr "Il messaggio della BOX è cambiato" + +msgid "Flushing" +msgstr "Pulizia" \ No newline at end of file diff --git a/qdt/i18n/ja/QIDIStudio_ja.po b/qdt/i18n/ja/QIDIStudio_ja.po index c2f5fde..8320a6f 100644 --- a/qdt/i18n/ja/QIDIStudio_ja.po +++ b/qdt/i18n/ja/QIDIStudio_ja.po @@ -16166,4 +16166,7 @@ msgid "The filament information in the BOX has changed. Please resynchronize it. msgstr "BOX内のフィラメント情報が変更されました。再同期してください。" msgid "BOX message has change" -msgstr "BOXメッセージが変更されました" \ No newline at end of file +msgstr "BOXメッセージが変更されました" + +msgid "Flushing" +msgstr "フラッシング" \ No newline at end of file diff --git a/qdt/i18n/ko/QIDIStudio_ko.po b/qdt/i18n/ko/QIDIStudio_ko.po index be830d5..c5b266a 100644 --- a/qdt/i18n/ko/QIDIStudio_ko.po +++ b/qdt/i18n/ko/QIDIStudio_ko.po @@ -14110,4 +14110,7 @@ msgid "The filament information in the BOX has changed. Please resynchronize it. msgstr "BOX 내 필라멘트 정보가 변경되었습니다. 다시 동기화해 주세요." msgid "BOX message has change" -msgstr "BOX 메시지가 변경되었습니다" \ No newline at end of file +msgstr "BOX 메시지가 변경되었습니다" + +msgid "Flushing" +msgstr "플러싱" \ No newline at end of file diff --git a/qdt/i18n/nl/QIDIStudio_nl.po b/qdt/i18n/nl/QIDIStudio_nl.po index dade03f..ba530ec 100644 --- a/qdt/i18n/nl/QIDIStudio_nl.po +++ b/qdt/i18n/nl/QIDIStudio_nl.po @@ -16229,4 +16229,7 @@ msgid "The filament information in the BOX has changed. Please resynchronize it. msgstr "De filamentinformatie in de BOX is gewijzigd. Synchroniseer deze opnieuw." msgid "BOX message has change" -msgstr "BOX-bericht is gewijzigd" \ No newline at end of file +msgstr "BOX-bericht is gewijzigd" + +msgid "Flushing" +msgstr "Spoelen" \ No newline at end of file diff --git a/qdt/i18n/pl/QIDIStudio_pl.po b/qdt/i18n/pl/QIDIStudio_pl.po index 022c729..4805a3d 100644 --- a/qdt/i18n/pl/QIDIStudio_pl.po +++ b/qdt/i18n/pl/QIDIStudio_pl.po @@ -16134,4 +16134,7 @@ msgid "The filament information in the BOX has changed. Please resynchronize it. msgstr "Informacje o filamentach w BOX-ie uległy zmianie. Proszę je zsynchronizować ponownie." msgid "BOX message has change" -msgstr "Komunikat BOX-a został zmieniony" \ No newline at end of file +msgstr "Komunikat BOX-a został zmieniony" + +msgid "Flushing" +msgstr "Płukanie" \ No newline at end of file diff --git a/qdt/i18n/pt-BR/QIDIStudio_pt-BR.po b/qdt/i18n/pt-BR/QIDIStudio_pt-BR.po index dae4986..69e58e3 100644 --- a/qdt/i18n/pt-BR/QIDIStudio_pt-BR.po +++ b/qdt/i18n/pt-BR/QIDIStudio_pt-BR.po @@ -16218,4 +16218,7 @@ msgid "The filament information in the BOX has changed. Please resynchronize it. msgstr "As informações do filamento na BOX foram alteradas. Por favor, ressincronize-as." msgid "BOX message has change" -msgstr "A mensagem da BOX foi alterada" \ No newline at end of file +msgstr "A mensagem da BOX foi alterada" + +msgid "Flushing" +msgstr "Limpeza" \ No newline at end of file diff --git a/qdt/i18n/ru/QIDIStudio_ru.po b/qdt/i18n/ru/QIDIStudio_ru.po index 67bc339..df810b3 100644 --- a/qdt/i18n/ru/QIDIStudio_ru.po +++ b/qdt/i18n/ru/QIDIStudio_ru.po @@ -14195,4 +14195,7 @@ msgid "The filament information in the BOX has changed. Please resynchronize it. msgstr "Информация о филаменте в BOX была изменена. Пожалуйста, выполните повторную синхронизацию." msgid "BOX message has change" -msgstr "Сообщение BOX изменено" \ No newline at end of file +msgstr "Сообщение BOX изменено" + +msgid "Flushing" +msgstr "Промывка" \ No newline at end of file diff --git a/qdt/i18n/sv/QIDIStudio_sv.po b/qdt/i18n/sv/QIDIStudio_sv.po index bf33cf6..ca924bc 100644 --- a/qdt/i18n/sv/QIDIStudio_sv.po +++ b/qdt/i18n/sv/QIDIStudio_sv.po @@ -16249,4 +16249,7 @@ msgid "The filament information in the BOX has changed. Please resynchronize it. msgstr "Filamentinformationen i BOX har ändrats. Vänligen synkronisera om den." msgid "BOX message has change" -msgstr "BOX-meddelandet har ändrats" \ No newline at end of file +msgstr "BOX-meddelandet har ändrats" + +msgid "Flushing" +msgstr "Spolning" \ No newline at end of file diff --git a/qdt/i18n/tr/QIDIStudio_tr.po b/qdt/i18n/tr/QIDIStudio_tr.po index 73f675e..2dc6ec7 100644 --- a/qdt/i18n/tr/QIDIStudio_tr.po +++ b/qdt/i18n/tr/QIDIStudio_tr.po @@ -14412,4 +14412,7 @@ msgid "The filament information in the BOX has changed. Please resynchronize it. msgstr "BOX içindeki filament bilgisi değişti. Lütfen yeniden senkronize edin." msgid "BOX message has change" -msgstr "BOX mesajı değişti" \ No newline at end of file +msgstr "BOX mesajı değişti" + +msgid "Flushing" +msgstr "Temizleme" \ No newline at end of file diff --git a/qdt/i18n/uk/QIDIStudio_uk.po b/qdt/i18n/uk/QIDIStudio_uk.po index e56a10e..f08aae4 100644 --- a/qdt/i18n/uk/QIDIStudio_uk.po +++ b/qdt/i18n/uk/QIDIStudio_uk.po @@ -16302,4 +16302,7 @@ msgid "The filament information in the BOX has changed. Please resynchronize it. msgstr "Інформація про філамент у BOX змінилася. Будь ласка, виконайте повторну синхронізацію." msgid "BOX message has change" -msgstr "Повідомлення BOX змінилося" \ No newline at end of file +msgstr "Повідомлення BOX змінилося" + +msgid "Flushing" +msgstr "Промивання" \ No newline at end of file diff --git a/qdt/i18n/zh_cn/QIDIStudio_zh_CN.po b/qdt/i18n/zh_cn/QIDIStudio_zh_CN.po index d103fbc..0edf077 100644 --- a/qdt/i18n/zh_cn/QIDIStudio_zh_CN.po +++ b/qdt/i18n/zh_cn/QIDIStudio_zh_CN.po @@ -20028,4 +20028,7 @@ msgid "The filament information in the BOX has changed. Please resynchronize it. msgstr "BOX中的耗材信息已变更，请重新同步" msgid "BOX message has change" -msgstr "BOX消息已更新" \ No newline at end of file +msgstr "BOX消息已更新" + +msgid "Flushing" +msgstr "冲刷" \ No newline at end of file diff --git a/resources/i18n/cs/QIDIStudio.mo b/resources/i18n/cs/QIDIStudio.mo index 6cec521..e8fa619 100644 Binary files a/resources/i18n/cs/QIDIStudio.mo and b/resources/i18n/cs/QIDIStudio.mo differ diff --git a/resources/i18n/de/QIDIStudio.mo b/resources/i18n/de/QIDIStudio.mo index 73de093..654890f 100644 Binary files a/resources/i18n/de/QIDIStudio.mo and b/resources/i18n/de/QIDIStudio.mo differ diff --git a/resources/i18n/es/QIDIStudio.mo b/resources/i18n/es/QIDIStudio.mo index 73f7321..e044d69 100644 Binary files a/resources/i18n/es/QIDIStudio.mo and b/resources/i18n/es/QIDIStudio.mo differ diff --git a/resources/i18n/fr/QIDIStudio.mo b/resources/i18n/fr/QIDIStudio.mo index ba4d3d3..b2f68bd 100644 Binary files a/resources/i18n/fr/QIDIStudio.mo and b/resources/i18n/fr/QIDIStudio.mo differ diff --git a/resources/i18n/hu/QIDIStudio.mo b/resources/i18n/hu/QIDIStudio.mo index a3dc57b..97c31d0 100644 Binary files a/resources/i18n/hu/QIDIStudio.mo and b/resources/i18n/hu/QIDIStudio.mo differ diff --git a/resources/i18n/it/QIDIStudio.mo b/resources/i18n/it/QIDIStudio.mo index 932107c..4c1c64a 100644 Binary files a/resources/i18n/it/QIDIStudio.mo and b/resources/i18n/it/QIDIStudio.mo differ diff --git a/resources/i18n/ja/QIDIStudio.mo b/resources/i18n/ja/QIDIStudio.mo index 6df59ff..dea5a39 100644 Binary files a/resources/i18n/ja/QIDIStudio.mo and b/resources/i18n/ja/QIDIStudio.mo differ diff --git a/resources/i18n/ko/QIDIStudio.mo b/resources/i18n/ko/QIDIStudio.mo index c38fb77..9f95eba 100644 Binary files a/resources/i18n/ko/QIDIStudio.mo and b/resources/i18n/ko/QIDIStudio.mo differ diff --git a/resources/i18n/nl/QIDIStudio.mo b/resources/i18n/nl/QIDIStudio.mo index b5576cb..5eb3863 100644 Binary files a/resources/i18n/nl/QIDIStudio.mo and b/resources/i18n/nl/QIDIStudio.mo differ diff --git a/resources/i18n/pl/QIDIStudio.mo b/resources/i18n/pl/QIDIStudio.mo index 395e3d7..664d27e 100644 Binary files a/resources/i18n/pl/QIDIStudio.mo and b/resources/i18n/pl/QIDIStudio.mo differ diff --git a/resources/i18n/pt-BR/QIDIStudio.mo b/resources/i18n/pt-BR/QIDIStudio.mo index 392a3ba..bcc6956 100644 Binary files a/resources/i18n/pt-BR/QIDIStudio.mo and b/resources/i18n/pt-BR/QIDIStudio.mo differ diff --git a/resources/i18n/pt_br/QIDIStudio.mo b/resources/i18n/pt_br/QIDIStudio.mo index 392a3ba..bcc6956 100644 Binary files a/resources/i18n/pt_br/QIDIStudio.mo and b/resources/i18n/pt_br/QIDIStudio.mo differ diff --git a/resources/i18n/ru/QIDIStudio.mo b/resources/i18n/ru/QIDIStudio.mo index 1f95190..8455644 100644 Binary files a/resources/i18n/ru/QIDIStudio.mo and b/resources/i18n/ru/QIDIStudio.mo differ diff --git a/resources/i18n/sv/QIDIStudio.mo b/resources/i18n/sv/QIDIStudio.mo index e97529f..0555bea 100644 Binary files a/resources/i18n/sv/QIDIStudio.mo and b/resources/i18n/sv/QIDIStudio.mo differ diff --git a/resources/i18n/tr/QIDIStudio.mo b/resources/i18n/tr/QIDIStudio.mo index 473b6ea..29094f9 100644 Binary files a/resources/i18n/tr/QIDIStudio.mo and b/resources/i18n/tr/QIDIStudio.mo differ diff --git a/resources/i18n/uk/QIDIStudio.mo b/resources/i18n/uk/QIDIStudio.mo index 90413f7..da2d44e 100644 Binary files a/resources/i18n/uk/QIDIStudio.mo and b/resources/i18n/uk/QIDIStudio.mo differ diff --git a/resources/i18n/zh_cn/QIDIStudio.mo b/resources/i18n/zh_cn/QIDIStudio.mo index 3b89f61..d921dbf 100644 Binary files a/resources/i18n/zh_cn/QIDIStudio.mo and b/resources/i18n/zh_cn/QIDIStudio.mo differ diff --git a/resources/profiles/X 4 Series/machine/Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/X 4 Series/machine/Qidi X-Plus 4 0.4 nozzle.json index ea300fb..483b7f5 100644 --- a/resources/profiles/X 4 Series/machine/Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/X 4 Series/machine/Qidi X-Plus 4 0.4 nozzle.json @@ -11,7 +11,7 @@ "default_print_profile": "0.20mm Standard @XPlus4", "printer_settings_id": "Qidi", "bed_exclude_area": ["0x305", "0x302", "35x302", "35x305", "305x305", "305x305", "305x305", "305x20", "293x20", "293x0", "305x0", "305x20", "305x305"], - "change_filament_gcode": "{if current_extruder != next_extruder}\nG1 Z{max_layer_z + 3.0} F1200\nTOOL_CHANGE_START F=[current_extruder] T=[next_extruder]\n{if long_retraction_when_cut && retraction_distance_when_cut > 2}\nDISABLE_ALL_SENSOR\nMOVE_TO_TRASH\nG1 E-[retraction_distance_when_cut] F200\nM400\n{endif}\nMOVE_TO_TRASH\nCLEAR_OOZE\nCUT_FILAMENT T=[current_extruder]\nMOVE_TO_TRASH\n{if nozzle_temperature_range_high[current_extruder] >= nozzle_temperature_range_high[next_extruder]}\nM104 S{nozzle_temperature_range_high[current_extruder]}\n{else}\nM104 S{nozzle_temperature_range_high[next_extruder]}\n{endif}\nM106 S0\nM106 P2 S0\nDISABLE_ALL_SENSOR\nUNLOAD_T[current_extruder]\nG92 E0\nG1 E25 F300\nT[next_extruder]\n{if nozzle_temperature_range_high[current_extruder] >= nozzle_temperature_range_high[next_extruder]}\nSET_HEATER_TEMPERATURE HEATER=extruder TARGET={nozzle_temperature_range_high[current_extruder]} WAIT=1\n{else}\nSET_HEATER_TEMPERATURE HEATER=extruder TARGET={nozzle_temperature_range_high[next_extruder]} WAIT=1\n{endif}\n{if long_retraction_when_cut && retraction_distance_when_cut > 2}\nG1 E{retraction_distance_when_cut - 2} F200\nG1 E2 F20\nM400\n{else}\n{if flush_length_1 > 23.7}\nG1 E{83.7 * 0.43} F{old_filament_e_feedrate}\nG1 E{83.7 * 0.02} F50\nG1 E-[old_retract_length_toolchange] F1800\nM106 S255\nM400\nG4 P5000\nM106 S0\nCLEAR_FLUSH\nG1 E{83.7 * 0.23} F{old_filament_e_feedrate}\nG1 E{83.7 * 0.02} F50\nG1 E{83.7 * 0.23} F{old_filament_e_feedrate}\nG1 E{83.7 * 0.02} F50\nG1 E{83.7 * 0.23} F{old_filament_e_feedrate}\nG1 E{83.7 * 0.02} F50\nG1 E-[old_retract_length_toolchange] F1800\n{else}\nG1 E{60 * 0.46} F{old_filament_e_feedrate}\nG1 E{60 * 0.02} F50\nM106 S255\nM400\nG4 P5000\nM106 S0\nCLEAR_FLUSH\nG1 E{60 * 0.23} F{old_filament_e_feedrate}\nG1 E{60 * 0.02} F50\nG1 E{60 * 0.23} F{old_filament_e_feedrate}\nG1 E{60 * 0.02} F50\nG1 E{60 * 0.23} F{old_filament_e_feedrate}\nG1 E{60 * 0.02} F50\nG1 E-[old_retract_length_toolchange] F1800\n{endif}\n{endif}\nM106 S255\nM400\nG4 P5000\nM106 S0\nCLEAR_FLUSH\nCLEAR_FLUSH\nG92 E0\n{if flush_length_1 > 1}\nM83\nG1 E{flush_length_1 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_1 * 0.02} F50\nG1 E{flush_length_1 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_1 * 0.02} F50\nG1 E{flush_length_1 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_1 * 0.02} F50\n{endif}\n{if flush_length_2 > 1}\nG1 E-[new_retract_length_toolchange] F1800\nM106 S255\nM400\nG4 P5000\nM106 S0\nCLEAR_FLUSH\nM83\nG1 E{flush_length_2 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\n{endif}\n{if flush_length_3 > 1}\nG1 E-[new_retract_length_toolchange] F1800\nM106 S255\nM400\nG4 P5000\nM106 S0\nCLEAR_FLUSH\nM83\nG1 E{flush_length_3 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\n{endif}\n{if flush_length_4 > 1}\nG1 E-[new_retract_length_toolchange] F1800\nM106 S255\nM400\nG4 P5000\nM106 S0\nCLEAR_FLUSH\nM83\nG1 E{flush_length_4 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\n{endif}\nG1 E-[new_retract_length_toolchange] F1800\nM106 S255\nM109 S[new_filament_temp]\nG92 E0\nM400\nM106 S0\nCLEAR_FLUSH\nCLEAR_OOZE\nG1 Y300 F9000\nTOOL_CHANGE_END\nENABLE_ALL_SENSOR\n{endif}", + "change_filament_gcode": "{if current_extruder != next_extruder}\nG1 Z{max_layer_z + 3.0} F1200\nTOOL_CHANGE_START F=[current_extruder] T=[next_extruder]\n{if long_retraction_when_cut && retraction_distance_when_cut > 2}\nDISABLE_ALL_SENSOR\nG1 E-[retraction_distance_when_cut] F200\nM400\n{endif}\nCUT_FILAMENT T=[current_extruder]\nMOVE_TO_TRASH\n{if nozzle_temperature_range_high[current_extruder] >= nozzle_temperature_range_high[next_extruder]}\nM104 S{nozzle_temperature_range_high[current_extruder]}\n{else}\nM104 S{nozzle_temperature_range_high[next_extruder]}\n{endif}\nM106 S0\nM106 P2 S0\nDISABLE_ALL_SENSOR\nUNLOAD_T[current_extruder]\nG92 E0\nG1 E25 F300\nT[next_extruder]\n{if nozzle_temperature_range_high[current_extruder] >= nozzle_temperature_range_high[next_extruder]}\nSET_HEATER_TEMPERATURE HEATER=extruder TARGET={nozzle_temperature_range_high[current_extruder]} WAIT=1\n{else}\nSET_HEATER_TEMPERATURE HEATER=extruder TARGET={nozzle_temperature_range_high[next_extruder]} WAIT=1\n{endif}\n{if long_retraction_when_cut && retraction_distance_when_cut > 2}\nG1 E{retraction_distance_when_cut - 2} F200\nG1 E2 F20\nM400\n{else}\n{if filament_type[next_extruder] == \"PETG\"}\nM109 S260\n{else}\nM109 S[nozzle_temperature_range_high]\n{endif}\n{if flush_length_1 > 23.7}\nG1 E{83.7 * 0.43} F{old_filament_e_feedrate}\nG1 E{83.7 * 0.02} F50\nG1 E-[old_retract_length_toolchange] F1800\nM106 S255\nM400\nG91\nG1 X2.5 F60\nG1 X-2.5 F60\nG90\nM106 S0\nCLEAR_FLUSH\nG1 E{83.7 * 0.23} F{old_filament_e_feedrate}\nG1 E{83.7 * 0.02} F50\nG1 E{83.7 * 0.23} F{old_filament_e_feedrate}\nG1 E{83.7 * 0.02} F50\nG1 E{83.7 * 0.23} F{old_filament_e_feedrate}\nG1 E{83.7 * 0.02} F50\nG1 E-[old_retract_length_toolchange] F1800\n{else}\nG1 E{60 * 0.46} F{old_filament_e_feedrate}\nG1 E{60 * 0.02} F50\nM106 S255\nM400\nG91\nG1 X2.5 F60\nG1 X-2.5 F60\nG90\nM106 S0\nCLEAR_FLUSH\nG1 E{60 * 0.23} F{old_filament_e_feedrate}\nG1 E{60 * 0.02} F50\nG1 E{60 * 0.23} F{old_filament_e_feedrate}\nG1 E{60 * 0.02} F50\nG1 E{60 * 0.23} F{old_filament_e_feedrate}\nG1 E{60 * 0.02} F50\nG1 E-[old_retract_length_toolchange] F1800\n{endif}\n{endif}\nM106 S255\nG91\nG1 X2.5 F60\nG1 X-2.5 F60\nG90\nM106 S0\nCLEAR_FLUSH\nCLEAR_FLUSH\nG92 E0\n{if flush_length_1 > 1}\nM83\nG1 E{flush_length_1 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_1 * 0.02} F50\nG1 E{flush_length_1 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_1 * 0.02} F50\nG1 E{flush_length_1 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_1 * 0.02} F50\n{endif}\n{if flush_length_2 > 1}\nG1 E-[new_retract_length_toolchange] F1800\nM106 S255\nM400\nG91\nG1 X2.5 F60\nG1 X-2.5 F60\nG90\nM106 S0\nCLEAR_FLUSH\nM83\nG1 E{flush_length_2 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\n{endif}\n{if flush_length_3 > 1}\nG1 E-[new_retract_length_toolchange] F1800\nM106 S255\nM400\nG91\nG1 X2.5 F60\nG1 X-2.5 F60\nG90\nM106 S0\nCLEAR_FLUSH\nM83\nG1 E{flush_length_3 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\n{endif}\n{if flush_length_4 > 1}\nG1 E-[new_retract_length_toolchange] F1800\nM106 S255\nM400\nG91\nG1 X2.5 F60\nG1 X-2.5 F60\nG90\nM106 S0\nCLEAR_FLUSH\nM83\nG1 E{flush_length_4 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\n{endif}\nG1 E-[new_retract_length_toolchange] F1800\nM106 S255\nM109 S[new_filament_temp]\nG92 E0\nM400\nM106 S0\nCLEAR_FLUSH\nCLEAR_OOZE\nG1 Y300 F9000\nTOOL_CHANGE_END\nENABLE_ALL_SENSOR\n{endif}", "default_filament_profile": ["QIDI PLA Rapido @Qidi X-Plus 4 0.4 nozzle"], "enable_long_retraction_when_cut": "2", "extruder_clearance_height_to_lid": "135", diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index bb92431..70a9e63 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -1741,7 +1741,7 @@ Sidebar::Sidebar(Plater *parent) wxBoxSizer* bSizer39; bSizer39 = new wxBoxSizer( wxHORIZONTAL ); p->m_filament_icon = new ScalableButton(p->m_panel_filament_title, wxID_ANY, "filament"); - p->m_staticText_filament_settings = new Label(p->m_panel_filament_title, _L("Project Filaments"), LB_PROPAGATE_MOUSE_EVENT); + p->m_staticText_filament_settings = new Label(p->m_panel_filament_title, _L("Filaments"), LB_PROPAGATE_MOUSE_EVENT); bSizer39->Add(p->m_filament_icon, 0, wxALIGN_CENTER | wxLEFT | wxRIGHT, FromDIP(10)); bSizer39->Add( p->m_staticText_filament_settings, 0, wxALIGN_CENTER ); bSizer39->Add(FromDIP(10), 0, 0, 0, 0); @@ -1762,7 +1762,7 @@ Sidebar::Sidebar(Plater *parent) // QDS // add wiping dialog //wiping_dialog_button->SetFont(wxGetApp().normal_font()); - p->m_flushing_volume_btn = new Button(p->m_panel_filament_title, _L("Flushing volumes")); + p->m_flushing_volume_btn = new Button(p->m_panel_filament_title, _L("Flushing")); p->m_flushing_volume_btn->SetFont(Label::Body_10); p->m_flushing_volume_btn->SetPaddingSize(wxSize(FromDIP(6),FromDIP(3))); p->m_flushing_volume_btn->SetCornerRadius(FromDIP(8));