Commit Graph

1603 Commits

Author SHA1 Message Date
Marek Bel 3662f60f8f if max_feedrate_silent and max_acceleration_units_per_sq_second_silent were never stored to eeprom, use default values; 2018-09-24 18:13:20 +02:00
Marek Bel c38fef281d Use cs.max_feedrate_silent, cs.max_acceleration_units_per_sq_second_silent from ConfigurationStore. 2018-09-24 17:33:58 +02:00
Marek Bel ca179a2d18 Use cs.filament_size from ConfigurationStore. 2018-09-24 17:29:02 +02:00
Marek Bel e225e9cab0 Use cs.volumetric_enabled from ConfigurationStore. 2018-09-24 17:12:16 +02:00
Marek Bel a201128b20 Use cs.retract_length, cs.retract_feedrate, cs.retract_zlift, cs.retract_recover_length and cs.retract_recover_feedrate from ConfigurationStore. 2018-09-24 17:10:25 +02:00
Marek Bel 7e593e6922 Use cs.autoretract_enabled from ConfigurationStore. 2018-09-24 17:03:10 +02:00
Marek Bel 20ba2b1c79 Use cs.bedKp, cs.bedKi and cs.bedKd from ConfigurationStore. 2018-09-24 16:57:48 +02:00
Marek Bel 54bcc8aa52 Use cs.Kp, cs.Ki and cs.Kd from ConfigurationStore. 2018-09-24 16:54:50 +02:00
Marek Bel f2ae3fb1f7 Use cs.zprobe_zoffset from ConfigurationStore. 2018-09-24 16:47:57 +02:00
Marek Bel 959d0069fa Use cs.add_homing from ConfigurationStore. 2018-09-24 16:42:28 +02:00
Marek Bel ac7c062161 Use cs.max_jerk from ConfigurationStore. 2018-09-24 16:35:33 +02:00
Marek Bel bb66bfe6a7 Use cs.minsegmenttime from ConfigurationStore. 2018-09-24 16:22:50 +02:00
mkbel 0e7afc67ca
Merge pull request #1175 from PavelSindler/eeprom_version
M500 EEPROM version update and M500 EEPROM block size check
2018-09-24 16:19:55 +02:00
Marek Bel 10428b30d9 Use cs.mintravelfeedrate from ConfigurationStore. 2018-09-24 16:01:58 +02:00
PavelSindler cd438c5c00 whitespace 2018-09-24 16:01:31 +02:00
PavelSindler 740e922b87 EEPROM M500 block size check for reading stored data added 2018-09-24 16:00:23 +02:00
Marek Bel 26e2fd1c76 Use cs.minimumfeedrate from ConfigurationStore. 2018-09-24 15:57:24 +02:00
Marek Bel b8fefceb4d Use cs.retract_acceleration from ConfigurationStore. 2018-09-24 15:53:35 +02:00
Marek Bel 7dbe0afdc4 Use cs.acceleration from ConfigurationStore. 2018-09-24 15:47:36 +02:00
Marek Bel cee51cf9c3 Use cs.max_acceleration_units_per_sq_second_normal from ConfigurationStore. 2018-09-24 15:40:35 +02:00
Marek Bel 02becb5e6a Use cs.max_feedrate_normal from ConfigurationStore. 2018-09-24 15:09:19 +02:00
PavelSindler 053b94b711 remove "start" duplicity in setup 2018-09-24 14:57:46 +02:00
Marek Bel 3f28632443 Use cs.axis_steps_per_unit from ConfigurationStore. 2018-09-24 14:54:41 +02:00
Marek Bel d611cad087 Temporary hide M500_conf cs to allow automated renaming. 2018-09-24 14:42:01 +02:00
Marek Bel e94dc1341a Use M500_conf cs in Config_ StoreSettings, RetrieveSettings and ResetDefault. 2018-09-24 14:34:43 +02:00
Marek Bel 991db0e71d Finish default_conf. 2018-09-23 23:36:01 +02:00
Marek Bel d9e2dcc736 Incomplete. 2018-09-23 22:21:28 +02:00
Marek Bel 58af1ae4c4 Add configuration store struct. 2018-09-21 20:52:44 +02:00
PavelSindler d8dc2eef7a if max_feedrate_silent and max_acceleration_units_per_sq_second_silent were never stored to eeprom, use default values; eeprom_version changed back to V2 2018-09-21 15:42:28 +02:00
PavelSindler 1c33b673c0 comment update 2018-09-19 18:43:27 +02:00
PavelSindler 3d57d504ba
Merge pull request #1174 from mkbel/fix_runout_resume
Fix runout resume
2018-09-19 18:29:32 +02:00
Marek Bel 2607a0c4ed Update documentation. 2018-09-19 17:22:06 +02:00
Marek Bel b92b307ee8 Make variables constant. 2018-09-19 17:21:45 +02:00
Marek Bel cce8131070 Add missing s for seconds of print time. 2018-09-19 17:20:41 +02:00
Marek Bel b5bb40474d Fix print time overflow. 2018-09-19 17:17:32 +02:00
PavelSindler 0a5394a20e defines moved to eeprom.h 2018-09-19 15:10:10 +02:00
PavelSindler 752aec37fb M500 EEPROM version changed; if EEPROM_M500_SIZE is not updated, data are not stored 2018-09-19 14:36:26 +02:00
Marek Bel 9868dd766e Fix print not recovered when filament sensor is disabled during filament change initiated by filament run out. 2018-09-19 14:22:08 +02:00
Marek Bel a5a7b1f1d6 Move functions definitions behind variable definitions. (No change in functionality.) 2018-09-19 14:08:31 +02:00
Marek Bel 05d3b7032d Update documentation. 2018-09-18 17:48:11 +02:00
Marek Bel a7fdfdd258 Put repetitive code into separate function. No change in functionality. 2018-09-18 17:15:13 +02:00
Marek Bel 6ee97468ee Remove lcd_buttons_update() call from all other places than interrupt. There is no known reason, why lcd_buttons_update() should be called from multiple places and multiple contexts. Remove mutex, which is not needed anymore, and wasn't implemented properly anyway (Operation was not atomic.). 2018-09-18 16:05:49 +02:00
Marek Bel f532da4b17 Remove duplicate button debouncing code. Save 254B flash. 2018-09-18 14:39:01 +02:00
Marek Bel 90a10a692a Enable button debouncing also in modal mode (!lcd_update_enabled). In lcd_clicked() consume click event immediately. 2018-09-18 14:38:50 +02:00
Marek Bel ab2d350ed1 Don't enable lcd update in lcd_show_fullscreen_message_and_wait_P(). Don't show menu in wizard when ejecting filament. 2018-09-17 21:23:13 +02:00
Marek Bel a687b8e64a Don't enable lcd update inside mmu_eject_filament(). 2018-09-17 17:12:36 +02:00
Marek Bel f496076508 Remove redundant code. No change in functionality. 2018-09-14 18:33:03 +02:00
Marek Bel 635a1b4cd8 Add possibility to to select preheat temperature when unloading filament in first layer calibration wizard.
Known limitations:
During filament eject, menu is shown for some moment.
2018-09-14 18:29:14 +02:00
Marek Bel fe30e58fb5 Add possibility to unload filament from wizard before first layer calibration, if it is not PLA.
Known limitations:
Preheat temperature other than PLA can not be selected.
During filament eject, menu is shown for some moment.
2018-09-14 16:06:25 +02:00
Marek Bel d14822b22f Give wizard states human readable names. Use uint8_t as underlying type - saves 20B of FLASH memory. 2018-09-13 16:37:41 +02:00
Marek Bel 8235f0f869 Merge branch 'MK3_dev' into add_cancel 2018-09-12 19:38:26 +02:00
Marek Bel 7bc46323e2 Update pause print documentation. 2018-09-12 18:35:26 +02:00
Marek Bel de2100ac7b Merge branch 'MK3' into MK3_dev 2018-09-12 15:22:12 +02:00
PavelSindler 0d4f4fe933
Merge pull request #1143 from PavelSindler/lang2
lang fix
2018-09-12 09:38:18 +02:00
PavelSindler 45066ebddc lang fix 2018-09-12 09:37:16 +02:00
PavelSindler 30d54be9de
Merge pull request #1142 from PavelSindler/lang2
changed version
2018-09-12 09:20:32 +02:00
PavelSindler 298950e601 changed version 2018-09-12 09:19:23 +02:00
Robert Pelnar 3e84bf6341 Lang update (translation + increased reserved space) 2018-09-12 02:45:13 +02:00
Marek Bel 13b67f0e0a Add Cancel item into PLA filament selection menu initiated by first layer calibration with MMU. 2018-09-11 22:33:13 +02:00
Marek Bel ada7cffd32 Open menu to select filament before first layer calibration if MMU unit is present. 2018-09-11 19:53:29 +02:00
PavelSindler 96aada9061 load filament messages, czech language missing translation readded 2018-09-11 18:25:38 +02:00
Marek Bel 5649d6c3c0 Precede active filament on status screen with letter F. 2018-09-11 17:27:10 +02:00
Marek Bel 98264808dc Change gcode "T?" question from "Choose extruder:" to "Choose filament" and answers from "Extruder 1" .. "Extruder 5" to "Filament 1" .. "Filament 5". 2018-09-11 17:16:13 +02:00
Marek Bel 46df46f482 Add possibility to use other filaments in LCD_COMMAND_V2_CAL. 2018-09-11 17:03:20 +02:00
Marek Bel 19a1ccdc76 Rename choose_extruder_menu() to choose_menu_P(), add parameters to make it reusable. 2018-09-11 16:51:00 +02:00
Marek Bel 6c6354b2cb Do not preheat nozzle before loading filament to MMU in first layer calibration wizard.
Show insert PLA filament to the first tube of MMU instead of "to the extruder".

First layer calibration wizard with MMU is now functional. But there is no option to unload filament from wizard.
2018-09-11 16:03:46 +02:00
Marek Bel 0fcd2cf2a1 Merge branch 'MK3_dev' into fix_mmu_1st_lay_cal 2018-09-11 15:26:35 +02:00
PavelSindler d9a2fe70ec missing declaration fix 2018-09-11 11:06:37 +02:00
PavelSindler c023fb12d5 add choose filament messages 2018-09-11 09:50:50 +02:00
PavelSindler 90e3ae5464
Merge pull request #1127 from XPila/MK3
Lang update, french translation
2018-09-11 09:44:02 +02:00
Robert Pelnar 4ca300bc39 Lang update, french translation
+resized reserved space
2018-09-11 03:43:05 +02:00
Marek Bel b3bc71b45b Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev 2018-09-10 23:52:51 +02:00
PavelSindler 25a46557d1 merge with upstream 2018-09-10 22:11:32 +02:00
PavelSindler 8a9f066c1b choose_extruder_menu: extruder -> filament 2018-09-10 22:09:37 +02:00
Marek Bel cc08d660f7 Always use filament 1 for first layer calibration when MMU is present.
Lift Z when moving from intro line to meander.
For MMU, print longer intro line to allow load to nozzle.
2018-09-10 20:55:50 +02:00
PavelSindler 1bb9e9ed92 MMU_DEBUG 2018-09-10 20:39:28 +02:00
PavelSindler 6fa798aa83 init 2018-09-10 20:08:13 +02:00
PavelSindler 1253fb338a wizard hotfix 2018-09-10 18:02:54 +02:00
Marek Bel 764e5c9769 Merge branch 'MK3' into MK3_dev 2018-09-09 22:52:01 +02:00
Marek Bel 5a6ef00cfc Do not unload filament from nozzle when touching bed in the end of first layer calibration. Unload it after reaching home position. 2018-09-07 10:50:23 +02:00
Marek Bel ebfbf4ac3f Merge branch 'MK3' into MK3_dev 2018-09-07 09:24:45 +02:00
mkbel cbc506c379
Merge pull request #1110 from PavelSindler/lcd_clicked_error_fix
lcd_clicked() fix (PFW-534 and PFW-546)
2018-09-07 09:07:03 +02:00
Marek Bel 001680bbdc Merge branch 'MK3' into time_remaining_fix
# Conflicts:
#	Firmware/Marlin_main.cpp
2018-09-07 08:21:36 +02:00
mkbel 801f8e93e8
Merge pull request #1112 from PavelSindler/MK25_time_remaining
MK25: always show "normal mode" remaining time (PFW-553)
2018-09-07 08:05:16 +02:00
PavelSindler 2f02828273 time remaining fix 2018-09-07 02:02:35 +02:00
PavelSindler 66305b3e04 MK25: always show "normal mode" remaining time 2018-09-06 23:05:36 +02:00
PavelSindler 48bf5d3a75
Merge pull request #1104 from mkbel/MK3_dev
Merge MK3 into Mk3_dev
2018-09-06 21:01:29 +02:00
PavelSindler dbc0654b1c
Merge pull request #1108 from mkbel/pause_print
Pause print
2018-09-06 21:01:16 +02:00
PavelSindler 48f5da9cb8 lcd_clicked fix 2018-09-06 20:54:51 +02:00
Marek Bel 0e50c388af Save 1K flash memory. 2018-09-06 15:06:46 +02:00
Marek Bel 0d99dc0a3f PFW-543 Add filament ramming when unloading filament with MMU. 2018-09-06 15:06:33 +02:00
Marek Bel 5d1e59cec3 Fix problem that nozzle temperature stays 0 if resume print is invoked from menu earlier than pause movements are finished. 2018-09-06 13:20:24 +02:00
Marek Bel 0fe48de4af Remove feedmultiplyBckp global variable. Remove redundant isPrintPaused = true assignment, as it is already done in lcd_pause_print(). Remove unused saved_feedmultiply and fanSpeedBckp prototypes. Move isPrintPaused = true assignment to safer location, as LCD_COMMAND_LONG_PAUSE is not reached if lcd_commands_type is not LCD_COMMAND_IDLE. 2018-09-06 12:23:21 +02:00
Marek Bel 05a0b9c939 Remove fanSpeedBckp global variable. 2018-09-06 11:41:44 +02:00
Marek Bel 40990c4deb Remove saved_feedmultiply global variable. 2018-09-06 11:30:06 +02:00
Marek Bel b43c8dad74 Remove HotendTempBckp global variable. 2018-09-06 10:05:59 +02:00
Marek Bel d71311f13f Remove redundant HotendTempBckp from crash detection recover. 2018-09-06 09:41:37 +02:00
Marek Bel 920d828833 Rename lcd_sdcard_pause() to lcd_pause_print() to reflect, that also USB printing could be possible to pause. Unite it with pause_print() and use new (immediate) pause mechanism in all places where old mechanism was used. Rename resume_print() to lcd_resume_print() and make it global, unite it with lcd_sdcard_resume() and use it also in place, where lcd_commands_type = LCD_COMMAND_LONG_PAUSE_RESUME was used. Remove LCD_COMMAND_LONG_PAUSE_RESUME lcd_command_type. Remove unused pause_lastpos[]. 2018-09-06 08:43:54 +02:00
Marek Bel 67b2456ad9 Merge branch 'MK3' into MK3_dev 2018-09-05 21:48:29 +02:00
Marek Bel 74be7677cf Fix problem, that current_position is rewritten after long_pause() call. 2018-09-05 21:10:05 +02:00