diff --git a/BIGTREE_TFT35_V3.0_E3.26.x.bin b/BIGTREE_TFT35_V3.0_E3.26.x.bin new file mode 100644 index 0000000000..47c9848909 Binary files /dev/null and b/BIGTREE_TFT35_V3.0_E3.26.x.bin differ diff --git a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.26.x.bin b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.26.x.bin index 878a115b51..20d5f8e259 100644 Binary files a/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.26.x.bin and b/Copy to SD Card root directory to update/BIGTREE_TFT35_V3.0.26.x.bin differ diff --git a/Copy to SD Card root directory to update/Language Packs/language_am.ini b/Copy to SD Card root directory to update/Language Packs/language_am.ini index f0519e9fb4..ededeba9b1 100755 --- a/Copy to SD Card root directory to update/Language Packs/language_am.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_am.ini @@ -284,4 +284,7 @@ label_case_light:Case light label_load_started:Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_unload_started:Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_heaters_on:Some heaters are still ON.\nDo you want to stop them? +label_print_total_time:Print complete.\nPrint Time: %02u:%02u:%02u \n +label_print_filament_used:Filament Used: %3.2f meters +label_print_summary:Print Summary Popup diff --git a/Copy to SD Card root directory to update/Language Packs/language_ca.ini b/Copy to SD Card root directory to update/Language Packs/language_ca.ini index 8d0882a57b..b384d41bcc 100755 --- a/Copy to SD Card root directory to update/Language Packs/language_ca.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_ca.ini @@ -284,4 +284,7 @@ label_case_light:Case light label_load_started:Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_unload_started:Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_heaters_on:Some heaters are still ON.\nDo you want to stop them? +label_print_total_time:Print complete.\nPrint Time: %02u:%02u:%02u \n +label_print_filament_used:Filament Used: %3.2f meters +label_print_summary:Print Summary Popup diff --git a/Copy to SD Card root directory to update/Language Packs/language_cn.ini b/Copy to SD Card root directory to update/Language Packs/language_cn.ini index 5e90a5927d..780cd2f785 100755 --- a/Copy to SD Card root directory to update/Language Packs/language_cn.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_cn.ini @@ -284,4 +284,7 @@ label_case_light:Case light label_load_started:Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_unload_started:Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_heaters_on:Some heaters are still ON.\nDo you want to stop them? +label_print_total_time:Print complete.\nPrint Time: %02u:%02u:%02u \n +label_print_filament_used:Filament Used: %3.2f meters +label_print_summary:Print Summary Popup diff --git a/Copy to SD Card root directory to update/Language Packs/language_cz.ini b/Copy to SD Card root directory to update/Language Packs/language_cz.ini index 10c5875585..4fe803e364 100755 --- a/Copy to SD Card root directory to update/Language Packs/language_cz.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_cz.ini @@ -284,4 +284,7 @@ label_case_light:Osvětlení label_load_started:Probíhá zavádění filamentu.\nNení možná další akce,\ndokud to nebude dokončeno.\nProsím čekejte. label_unload_started:Probíhá vysunování filamentu.\nNení možná další akce,\ndokud to nebude dokončeno.\nProsím čekejte.. label_heaters_on:Topení jsou stále zapnutá.\nChcete je vypnout? +label_print_total_time:Print complete.\nPrint Time: %02u:%02u:%02u \n +label_print_filament_used:Filament Used: %3.2f meters +label_print_summary:Print Summary Popup diff --git a/Copy to SD Card root directory to update/Language Packs/language_de.ini b/Copy to SD Card root directory to update/Language Packs/language_de.ini index 1dfbc283ed..5e7d090cf8 100755 --- a/Copy to SD Card root directory to update/Language Packs/language_de.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_de.ini @@ -284,4 +284,7 @@ label_case_light:Case light label_load_started:Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_unload_started:Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_heaters_on:Some heaters are still ON.\nDo you want to stop them? +label_print_total_time:Print complete.\nPrint Time: %02u:%02u:%02u \n +label_print_filament_used:Filament Used: %3.2f meters +label_print_summary:Print Summary Popup diff --git a/Copy to SD Card root directory to update/Language Packs/language_du.ini b/Copy to SD Card root directory to update/Language Packs/language_du.ini index a58bce2066..2cb39652bd 100755 --- a/Copy to SD Card root directory to update/Language Packs/language_du.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_du.ini @@ -284,4 +284,7 @@ label_case_light:Case light label_load_started:Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_unload_started:Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_heaters_on:Some heaters are still ON.\nDo you want to stop them? +label_print_total_time:Print complete.\nPrint Time: %02u:%02u:%02u \n +label_print_filament_used:Filament Used: %3.2f meters +label_print_summary:Print Summary Popup diff --git a/Copy to SD Card root directory to update/Language Packs/language_en.ini b/Copy to SD Card root directory to update/Language Packs/language_en.ini index d45bd972d5..56fda85b0c 100755 --- a/Copy to SD Card root directory to update/Language Packs/language_en.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_en.ini @@ -284,4 +284,7 @@ label_case_light:Case light label_load_started:Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_unload_started:Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_heaters_on:Some heaters are still ON.\nDo you want to stop them? +label_print_total_time:Print complete.\nPrint Time: %02u:%02u:%02u \n +label_print_filament_used:Filament Used: %3.2f meters +label_print_summary:Print Summary Popup diff --git a/Copy to SD Card root directory to update/Language Packs/language_es.ini b/Copy to SD Card root directory to update/Language Packs/language_es.ini index ad87cfa8ef..01c02ea113 100755 --- a/Copy to SD Card root directory to update/Language Packs/language_es.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_es.ini @@ -284,4 +284,7 @@ label_case_light:Case light label_load_started:Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_unload_started:Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_heaters_on:Some heaters are still ON.\nDo you want to stop them? +label_print_total_time:Print complete.\nPrint Time: %02u:%02u:%02u \n +label_print_filament_used:Filament Used: %3.2f meters +label_print_summary:Print Summary Popup diff --git a/Copy to SD Card root directory to update/Language Packs/language_fr.ini b/Copy to SD Card root directory to update/Language Packs/language_fr.ini index 0569652cd0..0c7c35fd53 100755 --- a/Copy to SD Card root directory to update/Language Packs/language_fr.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_fr.ini @@ -284,4 +284,7 @@ label_case_light:Caisson label_load_started:Chargement du filament en cours.\nAucune action possible avant\nla fin du processus.\nVeuillez patienter. label_unload_started:Déchargement du filament en cours.\nAucune action possible avant\nla fin du processus.\nVeuillez patienter. label_heaters_on:Certains éléments sont\ntoujours en chauffe.\nVoulez-vous les arrêter ? +label_print_total_time:Print complete.\nPrint Time: %02u:%02u:%02u \n +label_print_filament_used:Filament Used: %3.2f meters +label_print_summary:Print Summary Popup diff --git a/Copy to SD Card root directory to update/Language Packs/language_gr.ini b/Copy to SD Card root directory to update/Language Packs/language_gr.ini index a02fb4e3fe..71b1023f49 100755 --- a/Copy to SD Card root directory to update/Language Packs/language_gr.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_gr.ini @@ -284,4 +284,7 @@ label_case_light:Case light label_load_started:Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_unload_started:Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_heaters_on:Some heaters are still ON.\nDo you want to stop them? +label_print_total_time:Print complete.\nPrint Time: %02u:%02u:%02u \n +label_print_filament_used:Filament Used: %3.2f meters +label_print_summary:Print Summary Popup diff --git a/Copy to SD Card root directory to update/Language Packs/language_hu.ini b/Copy to SD Card root directory to update/Language Packs/language_hu.ini index cf7951a2e0..e2e59089b4 100755 --- a/Copy to SD Card root directory to update/Language Packs/language_hu.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_hu.ini @@ -1,287 +1,290 @@ -#### Language Code:HU -## Language Version:20201007 -## Maximum byte per keyword is 250 Bytes. -## Escape characters are not supported except newline '\n' - -label_language:Magyar -label_heat:Fűtés -label_move:Mozgás -label_home:Végállás -label_disable_steppers:Léptetők -label_print:Nyomtatás -label_extrude:Adagolás -label_fan:Hűtés -label_settings:Opciók -label_screen_settings:Kijelző -label_machine_settings:Gép -label_feature_settings:Funkciók -label_sound:Hangok -label_touch_sound:Érintés hangja -label_toast_sound:Fűtő értesítések -label_alert_sound:Felugró riasztások -label_shut_down:Leállítás -label_rgb_settings:LED Szín -label_rgb_off:LED KI -label_terminal:Terminál -label_custom:Egyedi -label_leveling:Szintezés -label_point_1:1. pont -label_point_2:2. pont -label_point_3:3. pont -label_point_4:4. pont -label_point_5:5. pont -label_bed_leveling:Ágyszint -label_bl_complete:Ágy Szintezése Sikeres -label_bl_smart_fill:A hiányzó szonda pontok\nkitöltésre kerültek.\nMegjegyzés: Mentsd el! -label_bl_enable:BL: be -label_bl_disable:BL: ki -label_abl:ABL -label_bbl:BBL -label_ubl:UBL -label_mbl:MBL -label_mbl_settings:Kézi Rács Szintezés -label_abl_settings:Automata Szintezés -label_abl_settings_bbl:Bilineáris Szintezés -label_abl_settings_ubl:Egységes Szintezés -label_abl_settings_ubl_save:Mentés szlotba -label_abl_settings_ubl_load:Betöltés szlotból -label_abl_slot0:Szlot 0 -label_abl_slot1:Szlot 1 -label_abl_slot2:Szlot 2 -label_abl_slot3:Szlot 3 -label_abl_slot_eeprom:Emlékezzen a következő\nújraindításnál? (EEPROM Mentése) -label_abl_z:Z Áttűnés -label_bltouch:BLTouch -label_bltouch_test:Teszt -label_bltouch_deploy:Telepítés -label_bltouch_stow:Elhelyezés -label_bltouch_repeat:Ismétlés -label_z_offset:Z Eltolás -label_probe_offset:Szonda Eltolás -label_home_offset:Kezdőpont Eltolás -label_confirmation:Biztos vagy benne? -label_down:Le -label_up:Fel -label_save:Mentés -label_restore:Betöltés -label_reset:Újratölt -label_default:Alapért. -label_clear:Tiszta -label_next:Tovább -label_distance:Távolság -label_invalid_value:Nincs érvényes érték/s megadva -label_timeout_reached:Időkorlát elérve! -label_process_running:Folyamat fut! -label_process_completed:Folyamat befejezve! -label_process_aborted:Folyamat megszakítva! -label_inc:Növel -label_dec:Csökkent -label_nozzle:Fej -label_bed:Ágy -label_chamber:Kamra -label_start:Kezdés -label_stop:Állj -label_back:Vissza -label_page_up:Fel -label_page_down:Le -label_pause:Szünet -label_resume:Folytatás -label_load:Betöltés -label_unload:Kiadás -label_load_unload:Betöltés/Kiadás -label_load_unload_short:Fil. Ki/Be -label_slow_speed:Lassú -label_normal_speed:Normál -label_fast_speed:Gyors -label_fan_full_speed:Teljes -label_fan_half_speed:Fél -label_rotate_ui:Forgatás -label_touchscreen_adjust:Igazítás -label_more:Több -label_screen_info:Infó -label_status:Státusz -label_simulator_bg_color:Marlin mód háttérszín -label_simulator_font_color:Marlin mód betűszín -label_white:Fehér -label_black:Fekete -label_blue:Kék -label_red:Piros -label_green:Zöld -label_cyan:Cián -label_yellow:Sárga -label_brown:Barna -label_gray:Szürke -label_orange:Narancs -label_indigo:Indigó -label_violet:Viola -label_magenta:Bíborvörös -label_purple:Lila -label_lime:Mész -label_darkblue:Sötétkék -label_darkgreen:Sötétzöld -label_darkgray:Sötétszürke -label_disconnect:Leválaszt -label_baudrate:Kapcsolat -label_percentage:Százalék -label_babystep:Mikrolépés -label_percentage_speed:Sebesség -label_percentage_flow:Folyás -label_value_zero:Nulla -label_1_degree:1℃ -label_5_degree:5℃ -label_10_degree:10℃ -label_x_inc:X+ -label_y_inc:Y+ -label_z_inc:Z+ -label_x_dec:X- -label_y_dec:Y- -label_z_dec:Z- -label_x:X -label_y:Y -label_z:Z -label_001_mm:0.01mm -label_01_mm:0.1mm -label_1_mm:1mm -label_5_mm:5mm -label_10_mm:10mm -label_100_mm:100mm -label_200_mm:200mm -label_1_percent:1% -label_5_percent:5% -label_10_percent:10% -label_percent_value:%d%% -label_ready:Kész -label_busy:Feldolgozás alatt, kérlek várj... -label_unconnected:Nincs nyomtató csatlakoztatva! -label_disconnect_info:Most a számítógépéről vezérelheted a nyomtatót! -label_loading:Betöltés... -label_power_failed:Folytatod a nyomtatást? -label_continue:Folytatás -label_cancel:Mégse -label_adjust_title:Érintőképernyő kalibrálása. -label_adjust_info:Kattints a piros pontra. -label_adjust_ok:Kalibrálás sikeres. -label_adjust_failed:A kalibrálás sikertelen, próbáld újra -label_warning:Figyelem! -label_stop_print:Megállítod a nyomtatást? -label_confirm:Igen -label_tftsd:TFT-SD -label_read_tftsd_error:TFT-SD olvasási hiba! -label_tftsd_inserted:SD-Kártya behelyezve! -label_tftsd_removed:SD-Kártya eltávolítva! -label_u_disk:USB Tár -label_read_u_disk_error:USB olvasási hiba! -label_u_disk_inserted:USB behelyezve! -label_u_disk_removed:USB eltávolítva! -label_onboardsd:Lap-SD -label_read_onboardsd_error:Alaplap-SD olvasási hiba! -label_filament_sensor:Filament érzékelő -label_filament_runout:Filament kifutás! -label_preheat:Előfűtés -label_preheat_both:Mindkettő -label_is_pause:Nem sikerült az adagolás\na nyomtatás alatt.\nSzünetelteted a nyomtatást? -label_auto_shut_down:Automata kikapcsolás -label_unifiedmove:Mozgás -label_unifiedheat:Fűt/Hűt -label_cooldown:Lehűtés -label_emergencystop:VészSTOP -label_touch_to_exit:Érintsd meg a kilépéshez. -label_mainmenu:Főmenü -label_wait_temp_shut_down:Várd meg a fej\nvisszahűlését.%d℃ -label_force_shut_down:Kényszerítés -label_shutting_down:Leállítás... -label_parameter_setting:Tényezők -label_on:BE -label_off:KI -label_smart:OKOS -label_terminal_ack:ACK Megjelenítése -label_invert_xaxis:X megfordítása -label_invert_yaxis:Y megfordítása -label_invert_zaxis:Z megfordítása -label_move_speed:Mozg.Sebesség (X-Y-Z) -label_knob_led:Forgatógomb LED -label_knob_led_idle:Forgatógomb tétlen -label_m0_pause:Szünetelés M0 parancsal -label_send_start_gcode:Kezdő G-Kód -label_send_end_gcode:Befejező G-Kód -label_send_cancel_gcode:Leállító G-Kód -label_persistent_status_info:Perzisztens állapotinfó -label_file_listmode:Fájlnéző listamód -label_current_setting:Motoráramok Beállítása -label_steps_setting:Lépés Beállítás -label_maxfeedrate:Max Előtolási Sebesség -label_maxacceleration:Max Gyorsulás -label_acceleration:Gyorsulás -label_print_acceleration:Nyomtatás Gyorsulás -label_retract_acceleration:Adagoló Gyorsulása -label_travel_acceleration:Utazási Gyorsulás -label_jerk:Rántás -label_junction_deviation:Keresztezés Eltérés -label_bump_sensitivity:TMC ütközés érzékenység -label_fwretract:FW Visszahúzás -label_fwrecover:FW Visszahúzás helyreáll. -label_lin_advance:Lineáris Haladás -label_reset_settings_info:Minden beállítás vissza\nfog állni alapértelmezett\nértékre. Folytatod? -label_reset_settings_done:A beállítások visszaállítása\nsikeresen megtörtént.\nAz aktiváláshoz indítsd\nújra az eszközt. -label_info:Infó -label_lcd_brightness:LCD Fényerősség -label_lcd_brightness_dim:LCD Halványítás -label_lcd_dim_idle_timer:LCD Halványítási idő -label_5_seconds:5 Mp. -label_10_seconds:10 Mp. -label_30_seconds:30 Mp. -label_60_seconds:1 Perc. -label_120_seconds:2 Perc. -label_300_seconds:5 Perc. -label_custom_seconds:Egyedi -label_st7920_fullscreen:Nagyképernyős Marlin mód -label_plr_en:Áramkiesés helyreálítása -label_setting_save:Beállítások mentése -label_setting_reset:Beállítás visszaállítása -label_setting_restore:Beállítások újratöltése -label_eeprom_settings:EEPROM -label_eeprom_save_info:Mented a megváltozott\nbeállításokat az EEPROM-ba? -label_eeprom_restore_info:Betöltöd a beállításokat az\nEEPROM-ból? -label_eeprom_reset_info:Visszaállítod az EEPROM-ot a\ngyári beállításokra? -label_retract_feedrate:Visszahúzás előtol. -label_retract_length:Visszahúzás hossz -label_retract_swap_length:Csere hossz vissza. -label_retract_z_lift:Z emelése visszahú. -label_retract_auto:Automata Visszahúzás -label_recover_feedrate:Előtolás javítás -label_swap_recover_feedrate:Csere előtolás jav. -label_recover_length:Hossz javítás -label_swap_recover_length:Cserehossz javítás -label_start_print:Elindítod a %s\nfájl nyomtatását? -label_ack_notification:ACK egyéb típus -label_leveling_edge_distance:Ágy szélének távolsága -label_xy_unlock:Felold XY -label_tuning:Tuning -label_pid:PID -label_pid_title:PID Automatikus Hangolás -label_pid_start_info:A PID önhangolása elindul.\nPercekig is eltarthat.\nFolytatod? -label_pid_start_info_2:PID Automatikus hangolása zajlik! -label_pid_start_info_3:NE ÉRINTSD meg a kijelzőt míg nincs kész! (zöld LED jelzi)! -label_tune_extruder:Lépés hangolás -label_tune_ext_extrude_100:Kiad 100mm -label_tune_ext_temp:Adagoló hangolás | Fűt -label_tune_ext_templow:Túl alacsony a kívánt hőfok!\nMinimum hőmérséklet: %d C -label_tune_ext_desiredval:A hőfok még nem érte el a kívánt értéket -label_tune_ext_mark120mm:A 120mm-t jelöld be a szálon\nNyomd '%s' ha kész\nMérd meg a hátralévő hosszt\nadagolás után. -label_tune_ext_heatoff:Kikapcsolod a fűtést? -label_tune_ext_adj_esteps:Állítható E-lépés -label_tune_ext_esteps_saved:Új E-lépés mentve!\nNe felejtsd el\nmenteni EEPROM-ba.\nÚj érték: %0.2f -label_tune_ext_measured:Fennmaradó Hossz: -label_tune_ext_old_estep:Régi e-lépés: %0.2f -label_tune_ext_new_estep:Új e-lépés: %0.2f -label_connection_settings:Kapcsolat -label_offset_tool:Második fej eltolása -label_hybrid_threshold:TMC Hibrid Küszöbérték -label_notifications:Értesítések -label_mesh_editor:Háló Szerkesztő -label_mesh_tuner:Háló Hangoló -label_case_light:Gépház Világítás -label_load_started:A filament betöltése folyamatban van,\nnem lehetséges további művelet,\nmíg véget nem ér.\nKérlek várj! -label_unload_started:A filament kiadása folyamatban van,\nnem lehetséges további művelet,\nmíg véget nem ér.\nKérlek várj! -label_heaters_on:Néhány fűtőelem még üzemel.\nKikapcsolod a fűtőelemeket? - +#### Language Code:HU +## Language Version:20201007 +## Maximum byte per keyword is 250 Bytes. +## Escape characters are not supported except newline '\n' + +label_language:Magyar +label_heat:Fűtés +label_move:Mozgás +label_home:Végállás +label_disable_steppers:Léptetők +label_print:Nyomtatás +label_extrude:Adagolás +label_fan:Hűtés +label_settings:Opciók +label_screen_settings:Kijelző +label_machine_settings:Gép +label_feature_settings:Funkciók +label_sound:Hangok +label_touch_sound:Érintés hangja +label_toast_sound:Fűtő értesítések +label_alert_sound:Felugró riasztások +label_shut_down:Leállítás +label_rgb_settings:LED Szín +label_rgb_off:LED KI +label_terminal:Terminál +label_custom:Egyedi +label_leveling:Szintezés +label_point_1:1. pont +label_point_2:2. pont +label_point_3:3. pont +label_point_4:4. pont +label_point_5:5. pont +label_bed_leveling:Ágyszint +label_bl_complete:Ágy Szintezése Sikeres +label_bl_smart_fill:A hiányzó szonda pontok\nkitöltésre kerültek.\nMegjegyzés: Mentsd el! +label_bl_enable:BL: be +label_bl_disable:BL: ki +label_abl:ABL +label_bbl:BBL +label_ubl:UBL +label_mbl:MBL +label_mbl_settings:Kézi Rács Szintezés +label_abl_settings:Automata Szintezés +label_abl_settings_bbl:Bilineáris Szintezés +label_abl_settings_ubl:Egységes Szintezés +label_abl_settings_ubl_save:Mentés szlotba +label_abl_settings_ubl_load:Betöltés szlotból +label_abl_slot0:Szlot 0 +label_abl_slot1:Szlot 1 +label_abl_slot2:Szlot 2 +label_abl_slot3:Szlot 3 +label_abl_slot_eeprom:Emlékezzen a következő\nújraindításnál? (EEPROM Mentése) +label_abl_z:Z Áttűnés +label_bltouch:BLTouch +label_bltouch_test:Teszt +label_bltouch_deploy:Telepítés +label_bltouch_stow:Elhelyezés +label_bltouch_repeat:Ismétlés +label_z_offset:Z Eltolás +label_probe_offset:Szonda Eltolás +label_home_offset:Kezdőpont Eltolás +label_confirmation:Biztos vagy benne? +label_down:Le +label_up:Fel +label_save:Mentés +label_restore:Betöltés +label_reset:Újratölt +label_default:Alapért. +label_clear:Tiszta +label_next:Tovább +label_distance:Távolság +label_invalid_value:Nincs érvényes érték/s megadva +label_timeout_reached:Időkorlát elérve! +label_process_running:Folyamat fut! +label_process_completed:Folyamat befejezve! +label_process_aborted:Folyamat megszakítva! +label_inc:Növel +label_dec:Csökkent +label_nozzle:Fej +label_bed:Ágy +label_chamber:Kamra +label_start:Kezdés +label_stop:Állj +label_back:Vissza +label_page_up:Fel +label_page_down:Le +label_pause:Szünet +label_resume:Folytatás +label_load:Betöltés +label_unload:Kiadás +label_load_unload:Betöltés/Kiadás +label_load_unload_short:Fil. Ki/Be +label_slow_speed:Lassú +label_normal_speed:Normál +label_fast_speed:Gyors +label_fan_full_speed:Teljes +label_fan_half_speed:Fél +label_rotate_ui:Forgatás +label_touchscreen_adjust:Igazítás +label_more:Több +label_screen_info:Infó +label_status:Státusz +label_simulator_bg_color:Marlin mód háttérszín +label_simulator_font_color:Marlin mód betűszín +label_white:Fehér +label_black:Fekete +label_blue:Kék +label_red:Piros +label_green:Zöld +label_cyan:Cián +label_yellow:Sárga +label_brown:Barna +label_gray:Szürke +label_orange:Narancs +label_indigo:Indigó +label_violet:Viola +label_magenta:Bíborvörös +label_purple:Lila +label_lime:Mész +label_darkblue:Sötétkék +label_darkgreen:Sötétzöld +label_darkgray:Sötétszürke +label_disconnect:Leválaszt +label_baudrate:Kapcsolat +label_percentage:Százalék +label_babystep:Mikrolépés +label_percentage_speed:Sebesség +label_percentage_flow:Folyás +label_value_zero:Nulla +label_1_degree:1℃ +label_5_degree:5℃ +label_10_degree:10℃ +label_x_inc:X+ +label_y_inc:Y+ +label_z_inc:Z+ +label_x_dec:X- +label_y_dec:Y- +label_z_dec:Z- +label_x:X +label_y:Y +label_z:Z +label_001_mm:0.01mm +label_01_mm:0.1mm +label_1_mm:1mm +label_5_mm:5mm +label_10_mm:10mm +label_100_mm:100mm +label_200_mm:200mm +label_1_percent:1% +label_5_percent:5% +label_10_percent:10% +label_percent_value:%d%% +label_ready:Kész +label_busy:Feldolgozás alatt, kérlek várj... +label_unconnected:Nincs nyomtató csatlakoztatva! +label_disconnect_info:Most a számítógépéről vezérelheted a nyomtatót! +label_loading:Betöltés... +label_power_failed:Folytatod a nyomtatást? +label_continue:Folytatás +label_cancel:Mégse +label_adjust_title:Érintőképernyő kalibrálása. +label_adjust_info:Kattints a piros pontra. +label_adjust_ok:Kalibrálás sikeres. +label_adjust_failed:A kalibrálás sikertelen, próbáld újra +label_warning:Figyelem! +label_stop_print:Megállítod a nyomtatást? +label_confirm:Igen +label_tftsd:TFT-SD +label_read_tftsd_error:TFT-SD olvasási hiba! +label_tftsd_inserted:SD-Kártya behelyezve! +label_tftsd_removed:SD-Kártya eltávolítva! +label_u_disk:USB Tár +label_read_u_disk_error:USB olvasási hiba! +label_u_disk_inserted:USB behelyezve! +label_u_disk_removed:USB eltávolítva! +label_onboardsd:Lap-SD +label_read_onboardsd_error:Alaplap-SD olvasási hiba! +label_filament_sensor:Filament érzékelő +label_filament_runout:Filament kifutás! +label_preheat:Előfűtés +label_preheat_both:Mindkettő +label_is_pause:Nem sikerült az adagolás\na nyomtatás alatt.\nSzünetelteted a nyomtatást? +label_auto_shut_down:Automata kikapcsolás +label_unifiedmove:Mozgás +label_unifiedheat:Fűt/Hűt +label_cooldown:Lehűtés +label_emergencystop:VészSTOP +label_touch_to_exit:Érintsd meg a kilépéshez. +label_mainmenu:Főmenü +label_wait_temp_shut_down:Várd meg a fej\nvisszahűlését.%d℃ +label_force_shut_down:Kényszerítés +label_shutting_down:Leállítás... +label_parameter_setting:Tényezők +label_on:BE +label_off:KI +label_smart:OKOS +label_terminal_ack:ACK Megjelenítése +label_invert_xaxis:X megfordítása +label_invert_yaxis:Y megfordítása +label_invert_zaxis:Z megfordítása +label_move_speed:Mozg.Sebesség (X-Y-Z) +label_knob_led:Forgatógomb LED +label_knob_led_idle:Forgatógomb tétlen +label_m0_pause:Szünetelés M0 parancsal +label_send_start_gcode:Kezdő G-Kód +label_send_end_gcode:Befejező G-Kód +label_send_cancel_gcode:Leállító G-Kód +label_persistent_status_info:Perzisztens állapotinfó +label_file_listmode:Fájlnéző listamód +label_current_setting:Motoráramok Beállítása +label_steps_setting:Lépés Beállítás +label_maxfeedrate:Max Előtolási Sebesség +label_maxacceleration:Max Gyorsulás +label_acceleration:Gyorsulás +label_print_acceleration:Nyomtatás Gyorsulás +label_retract_acceleration:Adagoló Gyorsulása +label_travel_acceleration:Utazási Gyorsulás +label_jerk:Rántás +label_junction_deviation:Keresztezés Eltérés +label_bump_sensitivity:TMC ütközés érzékenység +label_fwretract:FW Visszahúzás +label_fwrecover:FW Visszahúzás helyreáll. +label_lin_advance:Lineáris Haladás +label_reset_settings_info:Minden beállítás vissza\nfog állni alapértelmezett\nértékre. Folytatod? +label_reset_settings_done:A beállítások visszaállítása\nsikeresen megtörtént.\nAz aktiváláshoz indítsd\nújra az eszközt. +label_info:Infó +label_lcd_brightness:LCD Fényerősség +label_lcd_brightness_dim:LCD Halványítás +label_lcd_dim_idle_timer:LCD Halványítási idő +label_5_seconds:5 Mp. +label_10_seconds:10 Mp. +label_30_seconds:30 Mp. +label_60_seconds:1 Perc. +label_120_seconds:2 Perc. +label_300_seconds:5 Perc. +label_custom_seconds:Egyedi +label_st7920_fullscreen:Nagyképernyős Marlin mód +label_plr_en:Áramkiesés helyreálítása +label_setting_save:Beállítások mentése +label_setting_reset:Beállítás visszaállítása +label_setting_restore:Beállítások újratöltése +label_eeprom_settings:EEPROM +label_eeprom_save_info:Mented a megváltozott\nbeállításokat az EEPROM-ba? +label_eeprom_restore_info:Betöltöd a beállításokat az\nEEPROM-ból? +label_eeprom_reset_info:Visszaállítod az EEPROM-ot a\ngyári beállításokra? +label_retract_feedrate:Visszahúzás előtol. +label_retract_length:Visszahúzás hossz +label_retract_swap_length:Csere hossz vissza. +label_retract_z_lift:Z emelése visszahú. +label_retract_auto:Automata Visszahúzás +label_recover_feedrate:Előtolás javítás +label_swap_recover_feedrate:Csere előtolás jav. +label_recover_length:Hossz javítás +label_swap_recover_length:Cserehossz javítás +label_start_print:Elindítod a %s\nfájl nyomtatását? +label_ack_notification:ACK egyéb típus +label_leveling_edge_distance:Ágy szélének távolsága +label_xy_unlock:Felold XY +label_tuning:Tuning +label_pid:PID +label_pid_title:PID Automatikus Hangolás +label_pid_start_info:A PID önhangolása elindul.\nPercekig is eltarthat.\nFolytatod? +label_pid_start_info_2:PID Automatikus hangolása zajlik! +label_pid_start_info_3:NE ÉRINTSD meg a kijelzőt míg nincs kész! (zöld LED jelzi)! +label_tune_extruder:Lépés hangolás +label_tune_ext_extrude_100:Kiad 100mm +label_tune_ext_temp:Adagoló hangolás | Fűt +label_tune_ext_templow:Túl alacsony a kívánt hőfok!\nMinimum hőmérséklet: %d C +label_tune_ext_desiredval:A hőfok még nem érte el a kívánt értéket +label_tune_ext_mark120mm:A 120mm-t jelöld be a szálon\nNyomd '%s' ha kész\nMérd meg a hátralévő hosszt\nadagolás után. +label_tune_ext_heatoff:Kikapcsolod a fűtést? +label_tune_ext_adj_esteps:Állítható E-lépés +label_tune_ext_esteps_saved:Új E-lépés mentve!\nNe felejtsd el\nmenteni EEPROM-ba.\nÚj érték: %0.2f +label_tune_ext_measured:Fennmaradó Hossz: +label_tune_ext_old_estep:Régi e-lépés: %0.2f +label_tune_ext_new_estep:Új e-lépés: %0.2f +label_connection_settings:Kapcsolat +label_offset_tool:Második fej eltolása +label_hybrid_threshold:TMC Hibrid Küszöbérték +label_notifications:Értesítések +label_mesh_editor:Háló Szerkesztő +label_mesh_tuner:Háló Hangoló +label_case_light:Gépház Világítás +label_load_started:A filament betöltése folyamatban van,\nnem lehetséges további művelet,\nmíg véget nem ér.\nKérlek várj! +label_unload_started:A filament kiadása folyamatban van,\nnem lehetséges további művelet,\nmíg véget nem ér.\nKérlek várj! +label_heaters_on:Néhány fűtőelem még üzemel.\nKikapcsolod a fűtőelemeket? +label_print_total_time:Print complete.\nPrint Time: %02u:%02u:%02u \n +label_print_filament_used:Filament Used: %3.2f meters +label_print_summary:Print Summary Popup + diff --git a/Copy to SD Card root directory to update/Language Packs/language_it.ini b/Copy to SD Card root directory to update/Language Packs/language_it.ini old mode 100755 new mode 100644 index 1b4f46d76d..5cd4bf7d36 --- a/Copy to SD Card root directory to update/Language Packs/language_it.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_it.ini @@ -284,4 +284,7 @@ label_case_light:Luce label_load_started:Carico filamento in corso...\nNon sono possibili altre\nazioni fino al termine.\nAttendere prego. label_unload_started:Scarico filamento in corso...\nNon sono possibili altre\nazioni fino al termine.\nAttendere prego. label_heaters_on:Alcuni riscaldatori sono ancora accesi\nVuoi spegnerli? +label_print_total_time:Print complete.\nPrint Time: %02u:%02u:%02u \n +label_print_filament_used:Filament Used: %3.2f meters +label_print_summary:Print Summary Popup diff --git a/Copy to SD Card root directory to update/Language Packs/language_jp.ini b/Copy to SD Card root directory to update/Language Packs/language_jp.ini index f63500be57..ea0e46a078 100755 --- a/Copy to SD Card root directory to update/Language Packs/language_jp.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_jp.ini @@ -284,4 +284,7 @@ label_case_light:Case light label_load_started:Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_unload_started:Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_heaters_on:Some heaters are still ON.\nDo you want to stop them? +label_print_total_time:Print complete.\nPrint Time: %02u:%02u:%02u \n +label_print_filament_used:Filament Used: %3.2f meters +label_print_summary:Print Summary Popup diff --git a/Copy to SD Card root directory to update/Language Packs/language_pl.ini b/Copy to SD Card root directory to update/Language Packs/language_pl.ini index 1560e27c7c..5311d21abc 100755 --- a/Copy to SD Card root directory to update/Language Packs/language_pl.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_pl.ini @@ -284,4 +284,7 @@ label_case_light:Case light label_load_started:Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_unload_started:Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_heaters_on:Some heaters are still ON.\nDo you want to stop them? +label_print_total_time:Print complete.\nPrint Time: %02u:%02u:%02u \n +label_print_filament_used:Filament Used: %3.2f meters +label_print_summary:Print Summary Popup diff --git a/Copy to SD Card root directory to update/Language Packs/language_pt.ini b/Copy to SD Card root directory to update/Language Packs/language_pt.ini index bb68b35dc4..b5948422d0 100755 --- a/Copy to SD Card root directory to update/Language Packs/language_pt.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_pt.ini @@ -284,4 +284,7 @@ label_case_light:Case light label_load_started:Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_unload_started:Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_heaters_on:Some heaters are still ON.\nDo you want to stop them? +label_print_total_time:Print complete.\nPrint Time: %02u:%02u:%02u \n +label_print_filament_used:Filament Used: %3.2f meters +label_print_summary:Print Summary Popup diff --git a/Copy to SD Card root directory to update/Language Packs/language_ru.ini b/Copy to SD Card root directory to update/Language Packs/language_ru.ini index b1764462fe..aaf500fdef 100755 --- a/Copy to SD Card root directory to update/Language Packs/language_ru.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_ru.ini @@ -284,4 +284,7 @@ label_case_light:Подсветка label_load_started:Загрузка филамента начата.\nДождитесь пока сопло достигнет\nнеобходимой температуры.\nПожалуйста подождите. label_unload_started:Выгрузка филамента начата.\nДождитесь пока сопло достигнет\nнеобходимой температуры.\nПожалуйста подождите. label_heaters_on:Некоторые нагреватели все еще работают.\nХотите прервать нагрев? +label_print_total_time:Print complete.\nPrint Time: %02u:%02u:%02u \n +label_print_filament_used:Filament Used: %3.2f meters +label_print_summary:Print Summary Popup diff --git a/Copy to SD Card root directory to update/Language Packs/language_sk.ini b/Copy to SD Card root directory to update/Language Packs/language_sk.ini index ffd62d08c0..0830256ee5 100755 --- a/Copy to SD Card root directory to update/Language Packs/language_sk.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_sk.ini @@ -284,4 +284,7 @@ label_case_light:Case light label_load_started:Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_unload_started:Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_heaters_on:Some heaters are still ON.\nDo you want to stop them? +label_print_total_time:Print complete.\nPrint Time: %02u:%02u:%02u \n +label_print_filament_used:Filament Used: %3.2f meters +label_print_summary:Print Summary Popup diff --git a/Copy to SD Card root directory to update/Language Packs/language_sl.ini b/Copy to SD Card root directory to update/Language Packs/language_sl.ini index 0bcec9a8fd..8b6229f22a 100755 --- a/Copy to SD Card root directory to update/Language Packs/language_sl.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_sl.ini @@ -284,4 +284,7 @@ label_case_light:Case light label_load_started:Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_unload_started:Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_heaters_on:Some heaters are still ON.\nDo you want to stop them? +label_print_total_time:Print complete.\nPrint Time: %02u:%02u:%02u \n +label_print_filament_used:Filament Used: %3.2f meters +label_print_summary:Print Summary Popup diff --git a/Copy to SD Card root directory to update/Language Packs/language_tc.ini b/Copy to SD Card root directory to update/Language Packs/language_tc.ini index 8995082308..1a45fc685b 100755 --- a/Copy to SD Card root directory to update/Language Packs/language_tc.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_tc.ini @@ -284,4 +284,7 @@ label_case_light:Case light label_load_started:Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_unload_started:Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_heaters_on:Some heaters are still ON.\nDo you want to stop them? +label_print_total_time:Print complete.\nPrint Time: %02u:%02u:%02u \n +label_print_filament_used:Filament Used: %3.2f meters +label_print_summary:Print Summary Popup diff --git a/Copy to SD Card root directory to update/Language Packs/language_tr.ini b/Copy to SD Card root directory to update/Language Packs/language_tr.ini index 68b47631ac..c09df37503 100755 --- a/Copy to SD Card root directory to update/Language Packs/language_tr.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_tr.ini @@ -97,9 +97,9 @@ label_fan_full_speed:Tam label_fan_half_speed:Yarım label_rotate_ui:Döndür label_touchscreen_adjust:Kalibre -label_more:Daha +label_more:Ayar label_screen_info:Bilgi -label_status:Bilgi +label_status:Durum label_simulator_bg_color:Marlin modu arkaplan renk label_simulator_font_color:Marlin modu font renk label_white:Beyaz @@ -284,4 +284,7 @@ label_case_light:Aydınlatma label_load_started:Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_unload_started:Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by. label_heaters_on:Some heaters are still ON.\nDo you want to stop them? +label_print_total_time:Baskı tamamlandı.\nBaskı Süresi: %02u:%02u:%02u \n +label_print_filament_used:Kullanılan Filaman: %3.2f metre +label_print_summary:Baskı Özeti diff --git a/Copy to SD Card root directory to update/Language Packs/language_uk.ini b/Copy to SD Card root directory to update/Language Packs/language_uk.ini index 3442c4007c..0744822dc8 100644 --- a/Copy to SD Card root directory to update/Language Packs/language_uk.ini +++ b/Copy to SD Card root directory to update/Language Packs/language_uk.ini @@ -284,4 +284,7 @@ label_case_light:Підсвічування label_load_started:Процедура завантаження \nфіламенту, чекаємо поки хотенд \nдосягне бажаної температури. \nБудь ласка зачекайте. label_unload_started:Процедура вивавантаження. \nфіламенту, чекаємо поки хотенд \nдосягне бажаної температури. \nБудь ласка зачекайте. label_heaters_on:Деякі обігрівачі\nвсе ще увімкнені. \nВи хочете їх зупинити? +label_print_total_time:Print complete.\nPrint Time: %02u:%02u:%02u \n +label_print_filament_used:Filament Used: %3.2f meters +label_print_summary:Print Summary Popup diff --git a/TFT/src/User/API/Language/Language.inc b/TFT/src/User/API/Language/Language.inc index 100ac59f54..433c9bd60b 100644 --- a/TFT/src/User/API/Language/Language.inc +++ b/TFT/src/User/API/Language/Language.inc @@ -279,3 +279,6 @@ X_WORD (CASE_LIGHT) X_WORD (LOAD_STARTED) X_WORD (UNLOAD_STARTED) X_WORD (HEATERS_ON) +X_WORD (PRINT_TOTAL_TIME) +X_WORD (PRINT_FILAMENT_USED) +X_WORD (PRINT_SUMMARY) diff --git a/TFT/src/User/API/Language/language_am.h b/TFT/src/User/API/Language/language_am.h index 6f19e06add..e363a3b5b1 100644 --- a/TFT/src/User/API/Language/language_am.h +++ b/TFT/src/User/API/Language/language_am.h @@ -282,5 +282,8 @@ #define STRING_LOAD_STARTED "Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_UNLOAD_STARTED "Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_HEATERS_ON "Some heaters are still ON.\nDo you want to stop them?" // translation needed + #define STRING_PRINT_TOTAL_TIME "Print complete.\nPrint Time: %02u:%02u:%02u \n" // translation needed + #define STRING_PRINT_FILAMENT_USED "Filament Used: %3.2f meters" // translation needed + #define STRING_PRINT_SUMMARY "Print Summary Popup" // translation needed #endif diff --git a/TFT/src/User/API/Language/language_ca.h b/TFT/src/User/API/Language/language_ca.h index c892315fb2..39db31014e 100644 --- a/TFT/src/User/API/Language/language_ca.h +++ b/TFT/src/User/API/Language/language_ca.h @@ -282,5 +282,8 @@ #define STRING_LOAD_STARTED "Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_UNLOAD_STARTED "Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_HEATERS_ON "Some heaters are still ON.\nDo you want to stop them?" // translation needed + #define STRING_PRINT_TOTAL_TIME "Print complete.\nPrint Time: %02u:%02u:%02u \n" // translation needed + #define STRING_PRINT_FILAMENT_USED "Filament Used: %3.2f meters" // translation needed + #define STRING_PRINT_SUMMARY "Print Summary Popup" // translation needed #endif diff --git a/TFT/src/User/API/Language/language_cn.h b/TFT/src/User/API/Language/language_cn.h index 2c79797baa..01e62c50c9 100644 --- a/TFT/src/User/API/Language/language_cn.h +++ b/TFT/src/User/API/Language/language_cn.h @@ -282,5 +282,8 @@ #define STRING_LOAD_STARTED "Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_UNLOAD_STARTED "Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_HEATERS_ON "Some heaters are still ON.\nDo you want to stop them?" // translation needed + #define STRING_PRINT_TOTAL_TIME "Print complete.\nPrint Time: %02u:%02u:%02u \n" // translation needed + #define STRING_PRINT_FILAMENT_USED "Filament Used: %3.2f meters" // translation needed + #define STRING_PRINT_SUMMARY "Print Summary Popup" // translation needed #endif diff --git a/TFT/src/User/API/Language/language_cz.h b/TFT/src/User/API/Language/language_cz.h index a3d664f912..44f7afba9a 100644 --- a/TFT/src/User/API/Language/language_cz.h +++ b/TFT/src/User/API/Language/language_cz.h @@ -282,5 +282,8 @@ #define STRING_LOAD_STARTED "Probíhá zavádění filamentu.\nNení možná další akce,\ndokud to nebude dokončeno.\nProsím čekejte." // translation needed #define STRING_UNLOAD_STARTED "Probíhá vysunování filamentu.\nNení možná další akce,\ndokud to nebude dokončeno.\nProsím čekejte.." // translation needed #define STRING_HEATERS_ON "Topení jsou stále zapnutá.\nChcete je vypnout?" // translation needed + #define STRING_PRINT_TOTAL_TIME "Print complete.\nPrint Time: %02u:%02u:%02u \n" // translation needed + #define STRING_PRINT_FILAMENT_USED "Filament Used: %3.2f meters" // translation needed + #define STRING_PRINT_SUMMARY "Print Summary Popup" // translation needed #endif diff --git a/TFT/src/User/API/Language/language_de.h b/TFT/src/User/API/Language/language_de.h index 93382eb1f6..3bb78c946d 100644 --- a/TFT/src/User/API/Language/language_de.h +++ b/TFT/src/User/API/Language/language_de.h @@ -282,5 +282,8 @@ #define STRING_LOAD_STARTED "Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_UNLOAD_STARTED "Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_HEATERS_ON "Some heaters are still ON.\nDo you want to stop them?" // translation needed + #define STRING_PRINT_TOTAL_TIME "Print complete.\nPrint Time: %02u:%02u:%02u \n" // translation needed + #define STRING_PRINT_FILAMENT_USED "Filament Used: %3.2f meters" // translation needed + #define STRING_PRINT_SUMMARY "Print Summary Popup" // translation needed #endif diff --git a/TFT/src/User/API/Language/language_du.h b/TFT/src/User/API/Language/language_du.h index 26d92b8e7d..95bbde7d23 100644 --- a/TFT/src/User/API/Language/language_du.h +++ b/TFT/src/User/API/Language/language_du.h @@ -282,5 +282,8 @@ #define STRING_LOAD_STARTED "Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_UNLOAD_STARTED "Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_HEATERS_ON "Some heaters are still ON.\nDo you want to stop them?" // translation needed + #define STRING_PRINT_TOTAL_TIME "Print complete.\nPrint Time: %02u:%02u:%02u \n" // translation needed + #define STRING_PRINT_FILAMENT_USED "Filament Used: %3.2f meters" // translation needed + #define STRING_PRINT_SUMMARY "Print Summary Popup" // translation needed #endif diff --git a/TFT/src/User/API/Language/language_en.h b/TFT/src/User/API/Language/language_en.h index 7ac2a459b9..08ea077d6d 100644 --- a/TFT/src/User/API/Language/language_en.h +++ b/TFT/src/User/API/Language/language_en.h @@ -282,5 +282,8 @@ #define STRING_LOAD_STARTED "Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." #define STRING_UNLOAD_STARTED "Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." #define STRING_HEATERS_ON "Some heaters are still ON.\nDo you want to stop them?" + #define STRING_PRINT_TOTAL_TIME "Print complete.\nPrint Time: %02u:%02u:%02u \n" + #define STRING_PRINT_FILAMENT_USED "Filament Used: %3.2f meters" + #define STRING_PRINT_SUMMARY "Print Summary Popup" #endif diff --git a/TFT/src/User/API/Language/language_es.h b/TFT/src/User/API/Language/language_es.h index c815cbf40f..d4ab055475 100644 --- a/TFT/src/User/API/Language/language_es.h +++ b/TFT/src/User/API/Language/language_es.h @@ -282,5 +282,8 @@ #define STRING_LOAD_STARTED "Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_UNLOAD_STARTED "Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_HEATERS_ON "Some heaters are still ON.\nDo you want to stop them?" // translation needed + #define STRING_PRINT_TOTAL_TIME "Print complete.\nPrint Time: %02u:%02u:%02u \n" // translation needed + #define STRING_PRINT_FILAMENT_USED "Filament Used: %3.2f meters" // translation needed + #define STRING_PRINT_SUMMARY "Print Summary Popup" // translation needed #endif diff --git a/TFT/src/User/API/Language/language_fr.h b/TFT/src/User/API/Language/language_fr.h old mode 100755 new mode 100644 index 7aefffc35d..1060fe9c98 --- a/TFT/src/User/API/Language/language_fr.h +++ b/TFT/src/User/API/Language/language_fr.h @@ -282,5 +282,8 @@ #define STRING_LOAD_STARTED "Chargement du filament en cours.\nAucune action possible avant\nla fin du processus.\nVeuillez patienter." #define STRING_UNLOAD_STARTED "Déchargement du filament en cours.\nAucune action possible avant\nla fin du processus.\nVeuillez patienter." #define STRING_HEATERS_ON "Certains éléments sont\ntoujours en chauffe.\nVoulez-vous les arrêter ?" + #define STRING_PRINT_TOTAL_TIME "Print complete.\nPrint Time: %02u:%02u:%02u \n" // translation needed + #define STRING_PRINT_FILAMENT_USED "Filament Used: %3.2f meters" // translation needed + #define STRING_PRINT_SUMMARY "Print Summary Popup" // translation needed #endif \ No newline at end of file diff --git a/TFT/src/User/API/Language/language_gr.h b/TFT/src/User/API/Language/language_gr.h index 56dbfbee7d..1c3ea7ce64 100644 --- a/TFT/src/User/API/Language/language_gr.h +++ b/TFT/src/User/API/Language/language_gr.h @@ -282,5 +282,8 @@ #define STRING_LOAD_STARTED "Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_UNLOAD_STARTED "Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_HEATERS_ON "Some heaters are still ON.\nDo you want to stop them?" // translation needed + #define STRING_PRINT_TOTAL_TIME "Print complete.\nPrint Time: %02u:%02u:%02u \n" // translation needed + #define STRING_PRINT_FILAMENT_USED "Filament Used: %3.2f meters" // translation needed + #define STRING_PRINT_SUMMARY "Print Summary Popup" // translation needed #endif diff --git a/TFT/src/User/API/Language/language_hu.h b/TFT/src/User/API/Language/language_hu.h index d4b4f93c7f..bf985f8b95 100644 --- a/TFT/src/User/API/Language/language_hu.h +++ b/TFT/src/User/API/Language/language_hu.h @@ -282,5 +282,8 @@ #define STRING_LOAD_STARTED "A filament betöltése folyamatban van,\nnem lehetséges további művelet,\nmíg véget nem ér.\nKérlek várj!" #define STRING_UNLOAD_STARTED "A filament kiadása folyamatban van,\nnem lehetséges további művelet,\nmíg véget nem ér.\nKérlek várj!" #define STRING_HEATERS_ON "Néhány fűtőelem még üzemel.\nKikapcsolod a fűtőelemeket?" + #define STRING_PRINT_TOTAL_TIME "Print complete.\nPrint Time: %02u:%02u:%02u \n" // translation needed + #define STRING_PRINT_FILAMENT_USED "Filament Used: %3.2f meters" // translation needed + #define STRING_PRINT_SUMMARY "Print Summary Popup" // translation needed #endif diff --git a/TFT/src/User/API/Language/language_it.h b/TFT/src/User/API/Language/language_it.h index 10a9181d16..a2bcc98d86 100644 --- a/TFT/src/User/API/Language/language_it.h +++ b/TFT/src/User/API/Language/language_it.h @@ -282,5 +282,8 @@ #define STRING_LOAD_STARTED "Carico filamento in corso...\nNon sono possibili altre\nazioni fino al termine.\nAttendere prego." #define STRING_UNLOAD_STARTED "Scarico filamento in corso...\nNon sono possibili altre\nazioni fino al termine.\nAttendere prego." #define STRING_HEATERS_ON "Alcuni riscaldatori sono ancora accesi\nVuoi spegnerli?" + #define STRING_PRINT_TOTAL_TIME "Print complete.\nPrint Time: %02u:%02u:%02u \n" // translation needed + #define STRING_PRINT_FILAMENT_USED "Filament Used: %3.2f meters" // translation needed + #define STRING_PRINT_SUMMARY "Print Summary Popup" // translation needed #endif diff --git a/TFT/src/User/API/Language/language_jp.h b/TFT/src/User/API/Language/language_jp.h index b88daae155..ef6f0ac91f 100644 --- a/TFT/src/User/API/Language/language_jp.h +++ b/TFT/src/User/API/Language/language_jp.h @@ -282,5 +282,8 @@ #define STRING_LOAD_STARTED "Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_UNLOAD_STARTED "Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_HEATERS_ON "Some heaters are still ON.\nDo you want to stop them?" // translation needed + #define STRING_PRINT_TOTAL_TIME "Print complete.\nPrint Time: %02u:%02u:%02u \n" // translation needed + #define STRING_PRINT_FILAMENT_USED "Filament Used: %3.2f meters" // translation needed + #define STRING_PRINT_SUMMARY "Print Summary Popup" // translation needed #endif diff --git a/TFT/src/User/API/Language/language_keywords.h b/TFT/src/User/API/Language/language_keywords.h index 72a3712925..60d22ddb0c 100644 --- a/TFT/src/User/API/Language/language_keywords.h +++ b/TFT/src/User/API/Language/language_keywords.h @@ -289,7 +289,9 @@ extern "C" { #define LANG_KEY_LOAD_STARTED "label_load_started:" #define LANG_KEY_UNLOAD_STARTED "label_unload_started:" #define LANG_KEY_HEATERS_ON "label_heaters_on:" - +#define LANG_KEY_PRINT_TOTAL_TIME "print_total_time:" +#define LANG_KEY_PRINT_FILAMENT_USED "print_filament_used:" +#define LANG_KEY_PRINT_SUMMARY "print_summary:" #ifdef __cplusplus } #endif diff --git a/TFT/src/User/API/Language/language_pl.h b/TFT/src/User/API/Language/language_pl.h index 1275eaa877..b9990fe902 100644 --- a/TFT/src/User/API/Language/language_pl.h +++ b/TFT/src/User/API/Language/language_pl.h @@ -282,5 +282,8 @@ #define STRING_LOAD_STARTED "Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_UNLOAD_STARTED "Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_HEATERS_ON "Some heaters are still ON.\nDo you want to stop them?" // translation needed + #define STRING_PRINT_TOTAL_TIME "Print complete.\nPrint Time: %02u:%02u:%02u \n" // translation needed + #define STRING_PRINT_FILAMENT_USED "Filament Used: %3.2f meters" // translation needed + #define STRING_PRINT_SUMMARY "Print Summary Popup" // translation needed #endif diff --git a/TFT/src/User/API/Language/language_pt.h b/TFT/src/User/API/Language/language_pt.h index c1ca9a9b79..8d390e74f4 100644 --- a/TFT/src/User/API/Language/language_pt.h +++ b/TFT/src/User/API/Language/language_pt.h @@ -282,5 +282,8 @@ #define STRING_LOAD_STARTED "Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_UNLOAD_STARTED "Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_HEATERS_ON "Some heaters are still ON.\nDo you want to stop them?" // translation needed + #define STRING_PRINT_TOTAL_TIME "Print complete.\nPrint Time: %02u:%02u:%02u \n" // translation needed + #define STRING_PRINT_FILAMENT_USED "Filament Used: %3.2f meters" // translation needed + #define STRING_PRINT_SUMMARY "Print Summary Popup" // translation needed #endif diff --git a/TFT/src/User/API/Language/language_ru.h b/TFT/src/User/API/Language/language_ru.h index ff066bf840..90c1c425a4 100644 --- a/TFT/src/User/API/Language/language_ru.h +++ b/TFT/src/User/API/Language/language_ru.h @@ -282,5 +282,8 @@ #define STRING_LOAD_STARTED "Загрузка филамента начата.\nДождитесь пока сопло достигнет\nнеобходимой температуры.\nПожалуйста подождите." #define STRING_UNLOAD_STARTED "Выгрузка филамента начата.\nДождитесь пока сопло достигнет\nнеобходимой температуры.\nПожалуйста подождите." #define STRING_HEATERS_ON "Некоторые нагреватели все еще работают.\nХотите прервать нагрев?" + #define STRING_PRINT_TOTAL_TIME "Print complete.\nPrint Time: %02u:%02u:%02u \n" // translation needed + #define STRING_PRINT_FILAMENT_USED "Filament Used: %3.2f meters" // translation needed + #define STRING_PRINT_SUMMARY "Print Summary Popup" // translation needed #endif diff --git a/TFT/src/User/API/Language/language_sk.h b/TFT/src/User/API/Language/language_sk.h index 12c394e322..354e78c812 100644 --- a/TFT/src/User/API/Language/language_sk.h +++ b/TFT/src/User/API/Language/language_sk.h @@ -282,5 +282,8 @@ #define STRING_LOAD_STARTED "Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_UNLOAD_STARTED "Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_HEATERS_ON "Some heaters are still ON.\nDo you want to stop them?" // translation needed + #define STRING_PRINT_TOTAL_TIME "Print complete.\nPrint Time: %02u:%02u:%02u \n" // translation needed + #define STRING_PRINT_FILAMENT_USED "Filament Used: %3.2f meters" // translation needed + #define STRING_PRINT_SUMMARY "Print Summary Popup" // translation needed #endif diff --git a/TFT/src/User/API/Language/language_sl.h b/TFT/src/User/API/Language/language_sl.h index 820bb11389..1ed0a5d70e 100644 --- a/TFT/src/User/API/Language/language_sl.h +++ b/TFT/src/User/API/Language/language_sl.h @@ -282,5 +282,8 @@ #define STRING_LOAD_STARTED "Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_UNLOAD_STARTED "Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_HEATERS_ON "Some heaters are still ON.\nDo you want to stop them?" // translation needed + #define STRING_PRINT_TOTAL_TIME "Print complete.\nPrint Time: %02u:%02u:%02u \n" // translation needed + #define STRING_PRINT_FILAMENT_USED "Filament Used: %3.2f meters" // translation needed + #define STRING_PRINT_SUMMARY "Print Summary Popup" // translation needed #endif diff --git a/TFT/src/User/API/Language/language_tc.h b/TFT/src/User/API/Language/language_tc.h index 565af512cc..0d16f8afe9 100644 --- a/TFT/src/User/API/Language/language_tc.h +++ b/TFT/src/User/API/Language/language_tc.h @@ -282,5 +282,8 @@ #define STRING_LOAD_STARTED "Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_UNLOAD_STARTED "Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_HEATERS_ON "Some heaters are still ON.\nDo you want to stop them?" // translation needed + #define STRING_PRINT_TOTAL_TIME "Print complete.\nPrint Time: %02u:%02u:%02u \n" // translation needed + #define STRING_PRINT_FILAMENT_USED "Filament Used: %3.2f meters" // translation needed + #define STRING_PRINT_SUMMARY "Print Summary Popup" // translation needed #endif diff --git a/TFT/src/User/API/Language/language_tr.h b/TFT/src/User/API/Language/language_tr.h index 6fb87f0281..5ccaf82174 100644 --- a/TFT/src/User/API/Language/language_tr.h +++ b/TFT/src/User/API/Language/language_tr.h @@ -95,9 +95,9 @@ #define STRING_FAN_HALF_SPEED "Yarım" #define STRING_ROTATE_UI "Döndür" #define STRING_TOUCHSCREEN_ADJUST "Kalibre" - #define STRING_MORE "Daha" + #define STRING_MORE "Ayar" #define STRING_SCREEN_INFO "Bilgi" - #define STRING_STATUS "Bilgi" + #define STRING_STATUS "Durum" #define STRING_SIMULATOR_BG_COLOR "Marlin modu arkaplan renk" #define STRING_SIMULATOR_FONT_COLOR "Marlin modu font renk" #define STRING_WHITE "Beyaz" @@ -282,5 +282,8 @@ #define STRING_LOAD_STARTED "Filament load in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_UNLOAD_STARTED "Filament unload in progress.\nNo further actions possible\nuntil it's done.\nPlease stand by." // translation needed #define STRING_HEATERS_ON "Some heaters are still ON.\nDo you want to stop them?" // translation needed + #define STRING_PRINT_TOTAL_TIME "Baskı tamamlandı.\nBaskı Süresi: %02u:%02u:%02u \n" + #define STRING_PRINT_FILAMENT_USED "Kullanılan Filaman: %3.2f metre" + #define STRING_PRINT_SUMMARY "Baskı Özeti" #endif diff --git a/TFT/src/User/API/Language/language_uk.h b/TFT/src/User/API/Language/language_uk.h index b228bf7d8d..265a89c627 100644 --- a/TFT/src/User/API/Language/language_uk.h +++ b/TFT/src/User/API/Language/language_uk.h @@ -282,5 +282,8 @@ #define STRING_LOAD_STARTED "Процедура завантаження \nфіламенту, чекаємо поки хотенд \nдосягне бажаної температури. \nБудь ласка зачекайте." #define STRING_UNLOAD_STARTED "Процедура вивавантаження. \nфіламенту, чекаємо поки хотенд \nдосягне бажаної температури. \nБудь ласка зачекайте." #define STRING_HEATERS_ON "Деякі обігрівачі\nвсе ще увімкнені. \nВи хочете їх зупинити?" + #define STRING_PRINT_TOTAL_TIME "Print complete.\nPrint Time: %02u:%02u:%02u \n" // translation needed + #define STRING_PRINT_FILAMENT_USED "Filament Used: %3.2f meters" // translation needed + #define STRING_PRINT_SUMMARY "Print Summary Popup" // translation needed #endif diff --git a/TFT/src/User/API/Printing.c b/TFT/src/User/API/Printing.c index 881db4cf67..c5e372a9ba 100644 --- a/TFT/src/User/API/Printing.c +++ b/TFT/src/User/API/Printing.c @@ -6,6 +6,29 @@ PRINTING infoPrinting; static bool update_waiting = false; +static float filament_used; +static float last_E_pos; + +void resetFilamentUsed(void) +{ + filament_used = 0; + last_E_pos = ((infoFile.source == BOARD_SD) ? coordinateGetAxisActual(E_AXIS) : coordinateGetAxisTarget(E_AXIS)); +} + +void updateFilamentUsed(void) +{ + float E_pos = ((infoFile.source == BOARD_SD) ? coordinateGetAxisActual(E_AXIS) : coordinateGetAxisTarget(E_AXIS)); + if ((E_pos + 20) < last_E_pos) //Check whether E position reset. If retract more than 20mm, false filament used values would be calculated. + { + filament_used = filament_used + E_pos; + last_E_pos = E_pos; + } else if (E_pos > last_E_pos) + { + filament_used = filament_used + (E_pos - last_E_pos); + last_E_pos = E_pos; + } +} + // bool isPrinting(void) { @@ -233,6 +256,7 @@ void endPrinting(void) switch (infoFile.source) { case BOARD_SD: + request_M27(0); break; case TFT_UDISK: @@ -243,12 +267,30 @@ void endPrinting(void) infoPrinting.printing = infoPrinting.pause = false; powerFailedClose(); powerFailedDelete(); - if(infoSettings.send_end_gcode == 1){ + if((infoFile.source != BOARD_SD) && (infoSettings.send_end_gcode == 1)) + { sendPrintCodes(1); } + if (infoSettings.print_summary) + { + infoMenu.cur = 0; + char tempstr1[140]; + char tempstr2[70]; + u8 hour = infoPrinting.time / 3600; + u8 min = infoPrinting.time % 3600 / 60; + u8 sec = infoPrinting.time % 60; + sprintf(tempstr1, (char *)textSelect(LABEL_PRINT_TOTAL_TIME), hour, min, sec); + if (filament_used > 0) + { + sprintf(tempstr2, (char *)textSelect(LABEL_PRINT_FILAMENT_USED), filament_used / 1000); + strcat(tempstr1, tempstr2); + resetFilamentUsed(); + } + popupReminder(DIALOG_TYPE_INFO, LABEL_SCREEN_INFO, (u8*)tempstr1); + } } -static inline void printingFinished(void) +void printingFinished(void) { BUZZER_PLAY(sound_success); endPrinting(); @@ -414,13 +456,17 @@ void loopCheckPrinting(void) if(infoMenu.menu[infoMenu.cur] == menuMarlinMode) return; #endif - if (infoHost.printing && !infoPrinting.printing) { + if (infoHost.printing && !infoPrinting.printing) + { infoPrinting.printing = true; if (!hasPrintingMenu()) + { infoMenu.menu[++infoMenu.cur] = menuPrinting; + } } - if (!infoPrinting.printing && (infoMenu.menu[infoMenu.cur] == menuPrinting)) { + if (!infoPrinting.printing && (infoMenu.menu[infoMenu.cur] == menuPrinting) && infoSettings.print_summary) + { infoMenu.cur = 0; } diff --git a/TFT/src/User/API/Printing.h b/TFT/src/User/API/Printing.h index 4452f24d50..882635e97b 100644 --- a/TFT/src/User/API/Printing.h +++ b/TFT/src/User/API/Printing.h @@ -54,7 +54,7 @@ void setPrintingTime(uint32_t RTtime); void exitPrinting(void); void endPrinting(void); -void completePrinting(void); +void printingFinished(void); void abortPrinting(void); uint8_t *getCurGcodeName(char *path); void sendPrintCodes(uint8_t index); @@ -83,6 +83,9 @@ void startShutdown(void); void loopCheckPrinting(void); +void resetFilamentUsed(void); +void updateFilamentUsed(void); + #ifdef __cplusplus } #endif diff --git a/TFT/src/User/API/Settings.c b/TFT/src/User/API/Settings.c index 7f4cfaf68e..3f51eaa083 100644 --- a/TFT/src/User/API/Settings.c +++ b/TFT/src/User/API/Settings.c @@ -103,6 +103,7 @@ void infoSettingsReset(void) infoSettings.lcd_brightness = DEFAULT_LCD_BRIGHTNESS; infoSettings.lcd_idle_brightness = DEFAULT_LCD_IDLE_BRIGHTNESS; infoSettings.lcd_idle_timer = DEFAULT_LCD_IDLE_TIMER; + infoSettings.print_summary = DISPLAY_PRINT_SUMMARY; // Start, End & Cancel G-codes infoSettings.send_start_gcode = DISABLED; diff --git a/TFT/src/User/API/Settings.h b/TFT/src/User/API/Settings.h index a9becdd21a..1a347ffabe 100644 --- a/TFT/src/User/API/Settings.h +++ b/TFT/src/User/API/Settings.h @@ -166,6 +166,7 @@ typedef struct uint8_t lcd_brightness; uint8_t lcd_idle_brightness; uint8_t lcd_idle_timer; + uint8_t print_summary; // Start, End & Cancel G-codes uint8_t send_start_gcode; diff --git a/TFT/src/User/API/config.c b/TFT/src/User/API/config.c index e727e5ecec..b83194c63b 100644 --- a/TFT/src/User/API/config.c +++ b/TFT/src/User/API/config.c @@ -594,6 +594,10 @@ void parseConfigKey(u16 index) break; } + case C_INDEX_PRINT_SUMMARY: + infoSettings.print_summary = getOnOff(); + break; + //---------------------------------------------------------Marlin Mode Settings (Only for TFT35_V3.0/TFT24_V1.1/TFT28V3.0) #if defined(ST7920_SPI) || defined(LCD2004_simulator) diff --git a/TFT/src/User/API/config.h b/TFT/src/User/API/config.h index f3a99310ac..76f4b9c693 100644 --- a/TFT/src/User/API/config.h +++ b/TFT/src/User/API/config.h @@ -109,6 +109,7 @@ extern "C" { #define CONFIG_BRIGHTNESS "lcd_brightness:" #define CONFIG_BRIGHTNESS_IDLE "lcd_idle_brightness:" #define CONFIG_BRIGHTNESS_IDLE_DELAY "lcd_idle_delay:" +#define CONFIG_PRINT_SUMMARY "print_summary:" //-----------------------------Custom G-Code Commands (up to 15 custom G-code) #define CONFIG_CUSTOM_LABEL_1 "custom_label_1:" #define CONFIG_CUSTOM_LABEL_2 "custom_label_2:" diff --git a/TFT/src/User/API/config.inc b/TFT/src/User/API/config.inc index a09a6b7889..4700a85538 100644 --- a/TFT/src/User/API/config.inc +++ b/TFT/src/User/API/config.inc @@ -98,6 +98,7 @@ X_CONFIG(KNOB_LED_IDLE) X_CONFIG(BRIGHTNESS) X_CONFIG(BRIGHTNESS_IDLE) X_CONFIG(BRIGHTNESS_IDLE_DELAY) +X_CONFIG(PRINT_SUMMARY) //-----------------------------CustomG-Code Commands upto 15 custom G-code X_CONFIG(CUSTOM_LABEL_1) X_CONFIG(CUSTOM_LABEL_2) diff --git a/TFT/src/User/API/flashStore.c b/TFT/src/User/API/flashStore.c index 31d3f2dbdd..4108dde8d1 100644 --- a/TFT/src/User/API/flashStore.c +++ b/TFT/src/User/API/flashStore.c @@ -103,6 +103,8 @@ void readStoredPara(void) infoSettings.lcd_idle_brightness = byteToWord(data + (index += 4), 4); infoSettings.lcd_idle_timer = byteToWord(data + (index += 4), 4); + infoSettings.print_summary = byteToWord(data + (index += 4), 4); + infoSettings.serial_alwaysOn = byteToWord(data + (index += 4), 4); infoSettings.marlin_mode_bg_color = byteToWord(data + (index += 4), 4); infoSettings.marlin_mode_font_color = byteToWord(data + (index += 4), 4); @@ -241,6 +243,8 @@ void storePara(void) wordToByte(infoSettings.lcd_idle_brightness, data + (index += 4)); wordToByte(infoSettings.lcd_idle_timer, data + (index += 4)); + wordToByte(infoSettings.print_summary, data + (index += 4)); + wordToByte(infoSettings.serial_alwaysOn, data + (index += 4)); wordToByte(infoSettings.marlin_mode_bg_color, data + (index += 4)); wordToByte(infoSettings.marlin_mode_font_color, data + (index += 4)); diff --git a/TFT/src/User/API/parseACK.c b/TFT/src/User/API/parseACK.c index adb68e3a12..08b2786e17 100644 --- a/TFT/src/User/API/parseACK.c +++ b/TFT/src/User/API/parseACK.c @@ -258,10 +258,15 @@ void hostActionCommands(void) } else if (ack_seen("cancel")) //To be added to Marlin abortprint routine { + if (infoHost.printing == true) + { + request_M27(0); + } infoHost.printing = false; infoPrinting.printing = false; infoPrinting.cur = infoPrinting.size; } + } void parseACK(void) @@ -298,7 +303,6 @@ void parseACK(void) // Avoid can't getting this parameter due to disabled M503 in Marlin storeCmd("M115\n"); storeCmd("M211\n"); // retrieve the software endstops state - request_M27(infoSettings.m27_refresh_time); } } @@ -387,6 +391,10 @@ void parseACK(void) if (ack_seen("Z:")) { coordinateSetAxisActual(Z_AXIS, ack_value()); + if (ack_seen("E:")) + { + coordinateSetAxisActual(E_AXIS, ack_value()); + } } } coordinateQuerySetWait(false); @@ -409,9 +417,17 @@ void parseACK(void) infoPrinting.pause = false; infoHost.printing = true; + if (infoSettings.print_summary) + { + resetFilamentUsed(); + } infoPrinting.time = 0; infoPrinting.cur = 0; infoPrinting.size = ack_value(); + if (infoMachineSettings.autoReportSDStatus == 1) + { + request_M27(infoSettings.m27_refresh_time); //Check if there is a SD or USB print running. + } } else if(infoMachineSettings.onboard_sd_support == ENABLED && infoFile.source == BOARD_SD && ack_seen("Not SD printing")) { @@ -429,7 +445,8 @@ void parseACK(void) } else if(infoMachineSettings.onboard_sd_support == ENABLED && infoFile.source == BOARD_SD && ack_seen("Done printing file")) { - infoPrinting.printing = false; + infoHost.printing = false; + printingFinished(); infoPrinting.cur = infoPrinting.size; } diff --git a/TFT/src/User/Configuration.h b/TFT/src/User/Configuration.h index abd3859abc..19b38d1793 100644 --- a/TFT/src/User/Configuration.h +++ b/TFT/src/User/Configuration.h @@ -247,12 +247,22 @@ */ #define NOZZLE_PAUSE_M600_M601 -/* M701, M702 ; Marlin filament load unload gcodes support +/** + * M701, M702 ; Marlin filament load unload gcodes support * FILAMENT_LOAD_UNLOAD_GCODES option on Marlin configuration_adv.h need to be uncommented * Adds a submenu to the movement menu for selecting load and unload actions */ #define LOAD_UNLOAD_M701_M702 +/** + * Enable print summary popup + * This will enable a popup at print end. + * The popup shows the approximate print time and approximate filament used. + * Displayed values are calculated by approximation and may differ from the actual values. + * When enabled also the menu jumps to the status screen after the popup. + */ +#define DISPLAY_PRINT_SUMMARY 1 // 0: Disabled 1: Enabled + /** * Auto save/load Bed Leveling data * The TFT will auto detect if BL data are available. diff --git a/TFT/src/User/Menu/FeatureSettings.c b/TFT/src/User/Menu/FeatureSettings.c index cdd5055128..339c4fe396 100644 --- a/TFT/src/User/Menu/FeatureSettings.c +++ b/TFT/src/User/Menu/FeatureSettings.c @@ -87,6 +87,7 @@ typedef enum SKEY_ST7920_FULLSCREEN, #endif SKEY_PLR_EN, + SKEY_PRINT_SUMMARY, SKEY_RESET_SETTINGS, // Keep reset always at the bottom of the settings menu list. SKEY_COUNT //keep this always at the end }SKEY_LIST; @@ -130,6 +131,7 @@ LISTITEM settingPage[SKEY_COUNT] = { {ICONCHAR_BLANK, LIST_TOGGLE, LABEL_ST7920_FULLSCREEN, LABEL_OFF}, #endif {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_PLR_EN, LABEL_BACKGROUND}, + {ICONCHAR_TOGGLE_ON, LIST_TOGGLE, LABEL_PRINT_SUMMARY, LABEL_BACKGROUND}, // Keep reset settings always at the bottom of the settings menu list. {ICONCHAR_BLANK, LIST_MOREBUTTON, LABEL_SETTING_RESET, LABEL_BACKGROUND} }; @@ -280,6 +282,11 @@ void updateFeatureSettings(uint8_t key_val) settingPage[item_index].icon = toggleitem[infoSettings.powerloss_en]; break; + case SKEY_PRINT_SUMMARY: + infoSettings.print_summary = (infoSettings.print_summary + 1) % TOGGLE_NUM; + settingPage[item_index].icon = toggleitem[infoSettings.print_summary]; + break; + default: return; } @@ -396,6 +403,10 @@ void loadFeatureSettings(){ settingPage[item_index].icon = toggleitem[infoSettings.powerloss_en]; break; + case SKEY_PRINT_SUMMARY: + settingPage[item_index].icon = toggleitem[infoSettings.print_summary]; + break; + default: break; } diff --git a/TFT/src/User/Menu/Print.c b/TFT/src/User/Menu/Print.c index 29a5c29a72..8f68592497 100644 --- a/TFT/src/User/Menu/Print.c +++ b/TFT/src/User/Menu/Print.c @@ -305,7 +305,7 @@ void menuPrintFromSource(void) setPrintModelIcon(infoFile.source != BOARD_SD && model_DecodeToFlash(infoFile.title)); char temp_info[FILE_NUM + 50]; - sprintf(temp_info, (char *)textSelect(LABEL_START_PRINT), infoFile.file[key_num + start - infoFile.F_num]); + sprintf(temp_info, (char *)textSelect(LABEL_START_PRINT), (u8* )((infoFile.source == BOARD_SD) ? infoFile.Longfile[key_num + start - infoFile.F_num] : infoFile.file[key_num + start - infoFile.F_num])); //confirm file selction setDialogText( LABEL_PRINT, (u8*)temp_info, LABEL_CONFIRM, LABEL_CANCEL); showDialog(DIALOG_TYPE_QUESTION, startPrint, ExitDir, NULL); diff --git a/TFT/src/User/Menu/PrintingMenu.c b/TFT/src/User/Menu/PrintingMenu.c index 6e1666c1e4..8e37a8e3b8 100644 --- a/TFT/src/User/Menu/PrintingMenu.c +++ b/TFT/src/User/Menu/PrintingMenu.c @@ -123,6 +123,11 @@ void menuBeforePrinting(void) break; } infoPrinting.printing = true; + infoPrinting.time = 0; + if (infoSettings.print_summary) + { + resetFilamentUsed(); + } infoMenu.menu[infoMenu.cur] = menuPrinting; } @@ -245,8 +250,11 @@ static inline void toggleinfo(void) rapid_serial_loop(); //perform backend printing loop before drawing to avoid printer idling reDrawSpeed(SPD_ICON_POS); speedQuery(); - if (infoFile.source == BOARD_SD) - coordinateQuery(); + if (infoFile.source == BOARD_SD) coordinateQuery(); + if (infoSettings.print_summary) + { + updateFilamentUsed(); + } } } @@ -266,7 +274,10 @@ static inline void printingDrawPage(void) void stopConfirm(void) { abortPrinting(); - infoMenu.cur--; + if (!infoSettings.print_summary) + { + --infoMenu.cur; + } } void menuPrinting(void) @@ -411,7 +422,12 @@ void menuPrinting(void) else { exitPrinting(); - infoMenu.cur--; + if (infoSettings.print_summary) + { + infoMenu.cur = 0; + } else { + --infoMenu.cur; + } } break; diff --git a/TFT/src/User/config.ini b/TFT/src/User/config.ini index c655f82502..ab8089df43 100644 --- a/TFT/src/User/config.ini +++ b/TFT/src/User/config.ini @@ -573,6 +573,14 @@ lcd_idle_brightness:5 # lcd_idle_delay:4 +#### Enable print summary popup +# This will enable a popup at print end. +# The popup shows the approximate print time and approximate filament used. +# Displayed values are calculated by approximation and may differ from the actual values. +# When enabled also the menu jumps to the status screen after the popup. +# Options: [enable: 1, disable: 0] +print_summary:1 + #-------------------------------------------------------------------- # Custom Gcode Commands