3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,976 Commits 3 Branches 78 Tags 40 MiB
549a8a1a6b
Commit Graph

2300 Commits

Author SHA1 Message Date
Marek Bel
bf57a59147 Extract duplicate code into function. Saves 106B flash. 2019-04-05 15:12:35 +02:00
Marek Bel
4bfa3d7e0b Reporty busy: paused for user in case MMU is not responding. 2019-04-04 19:04:15 +02:00
Marek Bel
bf1a55ab02 Add mmu_continue_loading blocking variant and use it for usb printing, so that "ok" is not returned to the controller in case MMU load failed. 
Known limitation: MMU load failed is not handled properly if it happens again after user clicked printer button to continue print.
 2019-04-04 18:15:37 +02:00
MRprusa3d
aa0edd09f5 (preliminary) fix @ (bed) preHeatError 2019-04-03 22:48:58 +02:00
PavelSindler
fd96bde69f
Merge pull request #1667 from mkbel/Add_IR_sensor_fail_message 
Add ir sensor fail message
 2019-04-02 14:55:27 +02:00
PavelSindler
a8d8d9e4c9 version change 2019-04-01 20:52:24 +02:00
PavelSindler
c440ca7369
Revert "Phase correct PWM for bed, frequency 40KHz." 2019-04-01 18:44:13 +02:00
PavelSindler
ae11c1e26f rename function 2019-03-28 16:39:56 +01:00
PavelSindler
97594c83bb function misleading names changed 2019-03-28 14:58:58 +01:00
PavelSindler
96a111119b document 2019-03-28 14:52:50 +01:00
PavelSindler
8f69d5a501 document 2019-03-28 14:48:35 +01:00
PavelSindler
1dd486d86d max length of menu item strings added 2019-03-28 13:18:28 +01:00
PavelSindler
d22793f276 Z-probe nr. states reduced to 1; 3; 5 2019-03-28 12:02:46 +01:00
PavelSindler
02faadf0b9 MMU mode renamed 2019-03-28 09:49:08 +01:00
PavelSindler
e7900aeaa1 Merge remote-tracking branch 'upstream/MK3' into 7x7_polishing 2019-03-28 08:08:54 +01:00
PavelSindler
c1da07bda0
Merge pull request #1653 from XPila/MK3 
Phase correct PWM for bed, frequency 40KHz.
 2019-03-27 21:07:15 +01:00
PavelSindler
e259967991 remove / comment debug code 2019-03-27 20:41:45 +01:00
PavelSindler
5863297538 if deviation between current Z-probe and avg, value > 50um, enlarge Z-probe movements and repeat measurement 2019-03-27 20:25:00 +01:00
PavelSindler
a9ce38df71 Function for decision if we have valid Z-calibration data in eeprom fixed, mesh bed leveling: possible crash fix, temporaty debug info on serial line. 2019-03-26 17:14:05 +01:00
Marek Bel
baeee5817e Make lcd_selftest_error() calls safer, as nullptr parameter is not handled. It is hard to believe, but it actually saves 4B flash. 2019-03-22 00:24:22 +01:00
Marek Bel
966e772702 Fix compile error for non TMC2130 endstops check. 2019-03-22 00:14:29 +01:00
Marek Bel
89f1a3bacf Fix compile error for non TMC2130 pulley check. 2019-03-22 00:11:02 +01:00
Marek Bel
8582babddb Fix compile error for manual fan check. 2019-03-22 00:08:44 +01:00
Marek Bel
d1c5c03907 Fix compile error for manual fan check. 2019-03-22 00:03:14 +01:00
Marek Bel
c45a7f8641 Fix 1_75mm_MK3-EINSy10a-E3Dv6full variant build error. 2019-03-21 23:50:01 +01:00
Marek Bel
91779a5d04 Add filament sensor false triggering message. 2019-03-21 23:36:59 +01:00
Marek Bel
ba23b1b2c5 Remove unused. 2019-03-21 22:50:46 +01:00
Marek Bel
6c28ed6349 Convert lcd_selftest_error() first parameter to enum class. 2019-03-21 22:48:57 +01:00
PavelSindler
fbe68cb287 variables scope changed 2019-03-21 19:37:34 +01:00
PavelSindler
576bfb17c7 whitespace 2019-03-21 18:51:54 +01:00
PavelSindler
175f840d16 return statement not used (fixes Pronterface issues) 2019-03-21 18:46:07 +01:00
Harpalyke
0f21ccee3c Adding the microstepping resolution for all axis to the eprom config which is persisted during M500 for Mk3 and Mk3S 2019-03-19 21:39:59 +00:00
MRprusa3d
7d98177716 farmMode updates 2019-03-19 19:48:40 +01:00
Robert Pelnar
cfd185f315 Phase correct PWM for bed, frequency 40KHz. 2019-03-19 14:50:57 +01:00
Marek Bel
4100bd33a7 Fix Dcodes compilation errors and warnings. 2019-03-19 13:53:58 +01:00
PavelSindler
e37c2e0b2e version change 2019-03-15 20:01:02 +01:00
PavelSindler
7c5e9500a8 version change 2019-03-15 20:00:07 +01:00
PavelSindler
c05561d6b1
Merge pull request #1607 from PavelSindler/7x7 
7x7 mbl and switching mmu modes
 2019-03-15 19:55:15 +01:00
PavelSindler
0ca52216f3 Revert "variants update" 
This reverts commit c3a95ab79b.
 2019-03-15 13:14:32 +01:00
Marek Bel
ffe45bdef3 Disable mmu filament cutter feature. 2019-03-15 03:38:37 +01:00
PavelSindler
80ef2686ae mmu mode switching fix 2019-03-14 18:17:40 +01:00
PavelSindler
6e26f61726 fixed 7x7 mesh bed leveling vs. Z calibration check 2019-03-14 14:48:01 +01:00
PavelSindler
ef198856a4 increase relative movement in Z to work better with higher hysteresis PINDAs 2019-03-14 14:10:52 +01:00
PavelSindler
9e0e4198c5 Mesh by 3d-gussner, fixed difference between mbl points coordinates and coordinates used in planner for corrections, mbl settings menu update 2019-03-14 01:52:44 +01:00
MRprusa3d
1f131f66e0 print parameters checking 
nozzle diameter
 2019-03-14 00:36:56 +01:00
PavelSindler
72f51989fa compare measured Z-value during mesh bed leveling with Z-calibration value even for 7x7 mesh 2019-03-13 19:41:09 +01:00
PavelSindler
32138ea09a menu item alignment 2019-03-13 15:08:09 +01:00
PavelSindler
6c70d59810 mbl settings initialization fix 2019-03-13 15:05:10 +01:00
PavelSindler
c3a95ab79b variants update 2019-03-12 11:57:35 +01:00
PavelSindler
b20d9171b6 Merge remote-tracking branch 'upstream/MK3' into 7x7 2019-03-12 11:47:17 +01:00
PavelSindler
42036270cf
Merge pull request #1619 from MRprusa3d/PFW-795d 
better autoLoad II
 2019-03-12 11:44:30 +01:00
PavelSindler
c55f42965d
Merge pull request #1601 from MRprusa3d/PFW-749 
SD card menu enhancement
 2019-03-12 11:42:53 +01:00
PavelSindler
c9cff11732
Merge pull request #1593 from MRprusa3d/PFW-647 
mode switching, G-code unification
 2019-03-12 11:40:43 +01:00
PavelSindler
4d2b155ff9
Merge pull request #1594 from mkbel/fix_change_filament 
Fix change filament
 2019-03-12 11:39:15 +01:00
PavelSindler
0aa21c362e compile error fix 2019-03-11 23:37:30 +01:00
PavelSindler
9a83925a97 fixed bug in counting approximate Z coordinate 2019-03-11 23:13:55 +01:00
MRprusa3d
3388444b6c better autoLoad II 
autoLoad inhibit if Support::ExtruderInfo(@MKx)/SensorInfo(@MKxS)-menu is selected
 2019-03-11 20:43:07 +01:00
PavelSindler
698f81abe0 fix compile error 2019-03-11 15:55:48 +01:00
PavelSindler
819a91ab1e switching stealth/normal mode for mmu in settings menu and tune menu 2019-03-11 12:33:22 +01:00
PavelSindler
141b78c048 number of Z-probes defualt value changed from 4 to 3, mmu stealth mode switch in settings menu 2019-03-10 16:03:46 +01:00
PavelSindler
091934462d menu correction 2019-03-08 20:06:30 +01:00
PavelSindler
315959c13a menu update 2019-03-08 20:03:23 +01:00
PavelSindler
952e0e1e77 change min. nProbeRetry to 1 2019-03-08 19:49:10 +01:00
PavelSindler
f293d61d3d faster Z probe: move Z 150um relatively to last measurement. If PINDA is triggered at the beginning of measurement, move Z 500um higher and repeat measurement 2019-03-08 18:52:14 +01:00
PavelSindler
6a864ffbab G80 parameters configurable via settings menu 2019-03-08 15:43:37 +01:00
PavelSindler
98bb2b7acf merge debug gcodes for bed analysis 2019-03-06 20:45:23 +01:00
PavelSindler
dccb6ca2c6 Merge remote-tracking branch 'upstream/MK3' into bed_analysis_gcodes2 2019-03-06 19:56:52 +01:00
PavelSindler
f0cc313fed debug gcodes (fans, bed analysis) moved to Dcodes, HOST_KEEPALIVE_FEATURE simplified 2019-03-06 19:56:48 +01:00
PavelSindler
2a71dbefb8
Merge pull request #1597 from mkbel/fix_compiler__warning 
Fix compiler  warning
 2019-03-06 19:55:18 +01:00
MRprusa3d
6217329d50 SD card menu enhancement 2019-03-06 19:51:26 +01:00
PavelSindler
101453b674 mbl submenu 2019-03-06 13:27:31 +01:00
PavelSindler
5766a5537e limit number of probes 2019-03-05 22:43:44 +01:00
PavelSindler
7c187541e1 function for valid points determination improved; simple Z-coordinate estimation; measure all points and use inaccurate Z-coordinate in case that we don't have enought information for counting Z-coordinate estimation 2019-03-05 22:36:30 +01:00
PavelSindler
d9e93e8a77 measurements points moved 10mm to the left; measure only chosen points (e.g. not points affected by magnets proximity) 2019-03-05 20:40:08 +01:00
Marek Bel
1eab058ad4 Fix uninitialized variable used. 2019-03-05 18:08:35 +01:00
Marek Bel
7fcecabd5f Fix compiler warning: variable 'previous_millis_cmd' set but not used 2019-03-05 18:04:58 +01:00
Marek Bel
484259cbb2 Fix compiler warning: 'lcd_settings_linearity_correction_menu_save' defined but not used 2019-03-05 18:00:16 +01:00
Marek Bel
28f1e309a2 Fix compiler warning: 'old_x_max_endstop' defined but not used 
Fix compiler warning: 'old_y_max_endstop' defined but not used
 2019-03-05 17:44:47 +01:00
Marek Bel
7bcd54f8ba Add missing function prototype. 2019-03-05 17:30:27 +01:00
Marek Bel
ebfd4b2f47 Fix compiler warning: unused parameter 'calib' 2019-03-05 17:02:57 +01:00
Marek Bel
790ae9f0ce Fix compiler warning: unused parameter 'pstep'. 2019-03-05 16:41:41 +01:00
Marek Bel
5b9e7c4fe7 Fix warning: assignment makes pointer from integer without a cast. 2019-03-05 16:27:47 +01:00
PavelSindler
f1031d2302 new farm statuses for pause (14) and wait for user (15) 2019-03-05 16:00:50 +01:00
Marek Bel
23859921b9 Fix compiler warnings macro redefined. 2019-03-05 15:56:20 +01:00
MRprusa3d
20a03d703d G-code unification 
"FSENSOR_RECOVER" ->-> "PRUSA fsensor_recover"
 2019-03-05 13:36:13 +01:00
Marek Bel
f161d3ade4 Change formatting. 2019-03-04 22:17:43 +01:00
Marek Bel
b2255c8be9 Preheat nozzle before loading filament in M600 (change filament) gcode. 
This fixes problem of not heating the nozzle when retrying load after MMU load failed.
 2019-03-04 22:00:24 +01:00
MRprusa3d
7e48d633cb mode switching 
info-message viewing during mode switching
 2019-03-04 21:30:36 +01:00
PavelSindler
17f095b957 shorter Z movements (makes calibration faster) 2019-03-04 20:32:56 +01:00
mkbel
27f69bb761
Merge pull request #1570 from PavelSindler/mmu_stealth_mode 
mmu stealth mode
 2019-03-04 17:09:11 +01:00
PavelSindler
7f92d73a40 MMU_STEALTH_MODE -> MMU_FORCE_STEALTH_MODE; activate_stealth_mode() function update 2019-03-04 17:04:22 +01:00
PavelSindler
9dde8c4732
Merge pull request #1591 from MRprusa3d/PFW-795c 
better autoLoad
 2019-03-04 15:31:04 +01:00
PavelSindler
1051b7c39f
Merge pull request #1583 from mkbel/fix_cut 
Fix unable to cut filament, if nozzle is already preheated.
 2019-03-04 15:29:54 +01:00
PavelSindler
e832f0f2ee
Merge pull request #1582 from mkbel/remove_unused_code 
Remove commented out code, fix formatting.
 2019-03-04 15:29:36 +01:00
Marek Bel
8812d40546 Revert "Fix compiler warning: variable 'kill_message' set but not used" 
This reverts commit a964f996fa.
 2019-03-04 15:05:14 +01:00
MRprusa3d
b02ca18c93 better autoLoad 
autoLoad inhibit if Support::ExtruderInfo-menu is selected
 2019-03-04 12:52:35 +01:00
Marek Bel
9e38b1e101 Add missing message "Preheating to cut". 2019-03-01 18:17:08 +01:00
Marek Bel
6437d44991 Fix unable to cut filament, if nozzle is already preheated. 2019-03-01 18:10:06 +01:00
Marek Bel
83e07b5cdf Fix compiler warnings: 
sketch/ultralcd.cpp: In function 'void mFilamentPrompt()':
sketch/ultralcd.cpp:2335:7: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
 switch(eFilamentAction)
       ^
sketch/ultralcd.cpp:2335:7: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
      switch(eFilamentAction)
            ^
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuLoad' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuUnLoad' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuEject' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
sketch/ultralcd.cpp: In function 'void mFilamentItem(uint16_t, uint16_t)':
sketch/ultralcd.cpp:2513:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
      switch(eFilamentAction)
            ^
sketch/ultralcd.cpp:2513:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2562:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
      switch(eFilamentAction)
            ^
sketch/ultralcd.cpp:2562:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
 2019-03-01 18:07:19 +01:00
Marek Bel
824d11e4b0 Remove "Press the knob to eject filament" message, as it is never shown. 2019-03-01 17:43:28 +01:00
Marek Bel
57cf7ee171 Fix compiler warning: 'lcd_selftest_fsensor' defined but not used 2019-03-01 17:21:13 +01:00
Marek Bel
4c2d4fcf77 Fix compiler warning ultralcd.cpp:4038:10: warning: unused variable 'chars 2019-03-01 17:18:05 +01:00
Marek Bel
a964f996fa Fix compiler warning: variable 'kill_message' set but not used 
kill_message is unused since:

Author:      MRprusa3d <martin.remis@prusa3d.cz>
Date:        4 months ago (11/2/2018 11:03:14 PM)
Commit hash: 73794b56cf

MeshBed Leveling Fail

Z-leveling after MeshBed leveling failing
 2019-03-01 17:08:36 +01:00
Marek Bel
8e51b37d91 Suppress warning: unused parameter. 2019-03-01 16:57:20 +01:00
Marek Bel
22500970ba Remove commented out code, fix formatting. 2019-03-01 16:18:16 +01:00
PavelSindler
85c208f9f4
Merge branch 'MK3' into bad_load_cut 2019-03-01 14:55:55 +01:00
PavelSindler
22c0d6e230
Merge pull request #1577 from mkbel/add_cut 
Add MMU cut filament
 2019-03-01 14:53:12 +01:00
PavelSindler
e14e4be94e
Merge pull request #1575 from mkbel/add_ramming_eject 
Add filament ramming to eject filament.
 2019-03-01 14:21:23 +01:00
PavelSindler
0db721b244
Merge pull request #1559 from mkbel/detect_bad_load 
Move extruder forth and back after filament detected by sensor to det…
 2019-03-01 14:21:04 +01:00
PavelSindler
3cbcbba738
Merge pull request #1510 from mkbel/fix_menu_stack_third_time 
Fix menu stack overrun.
 2019-03-01 14:20:22 +01:00
PavelSindler
250a448d05
Merge pull request #1549 from mionut/7MBL 
7x7 mesh bed leveling with power failure save + pinda temperature filter
 2019-03-01 14:19:52 +01:00
PavelSindler
488497df2c version change 2019-03-01 13:56:03 +01:00
PavelSindler
ca88010018 Revert "version change" 
This reverts commit f14733f2dd.
 2019-03-01 13:54:25 +01:00
PavelSindler
f14733f2dd version change 2019-03-01 13:53:18 +01:00
PavelSindler
e27fdafcec menu switch - initial 2019-02-28 19:42:09 +01:00
PavelSindler
482f8ef01a Merge remote-tracking branch 'mionut/7MBL' into 7x7 2019-02-28 15:54:49 +01:00
Marek Bel
2a005caf42 Add cutter enable to tune menu. 2019-02-27 17:47:51 +01:00
Marek Bel
02a692c5d9 Store cutter enable state in EEPROM. 2019-02-27 17:34:03 +01:00
PavelSindler
ff6eb0b1af
Merge pull request #1568 from MRprusa3d/PFW-795 
preHeat @ filament management
 2019-02-27 13:15:39 +01:00
Marek Bel
4a4eb9962c Cut filament when cutter is enabled and MMU load fails. 2019-02-27 10:42:26 +01:00
MRprusa3d
2f1e968563 "lcd_update_enable()" replacement 2019-02-26 23:17:52 +01:00
Marek Bel
49b1d1cb93 Move prototype to header file. 2019-02-26 18:50:15 +01:00
Marek Bel
a67645fda6 Merge branch 'add_cut' into bad_load_cut 2019-02-26 18:35:55 +01:00
Marek Bel
815231bc26 Add MMU cut filament menu. 2019-02-26 17:58:00 +01:00
MRprusa3d
ff35119ef3 preHeat @ filament management 
another funcionality III / autoLoad
 2019-02-26 17:33:37 +01:00
Marek Bel
5a5a482a59 Rename preprocessor macro K1 to PID_K1 to avoid future conflict with MMU command. 2019-02-26 13:59:44 +01:00
Marek Bel
6c9dd4f272 Add filament ramming to eject filament. 2019-02-26 13:41:28 +01:00
Marek Bel
7a1b47c340 Convert functions mmu_eject_fil_0 to mmu_eject_fil_4 to template function. 2019-02-26 11:11:05 +01:00
Marek Bel
34e2495487 Convert mmu_load_to_nozzle_0 to mmu_load_to_nozzle_4 to template. 2019-02-26 10:32:10 +01:00
Marek Bel
d5c5ed55eb Change formatting. 2019-02-25 11:12:39 +01:00
Marek Bel
8f5fbe569c Merge branch 'MK3' into detect_bad_load 2019-02-25 10:41:26 +01:00
PavelSindler
8e3d52ee6d fix compilation error for MK2.5, make code more readable 2019-02-22 17:15:40 +01:00
PavelSindler
26cab2911f mmu stealth mode 2019-02-22 16:30:54 +01:00
Laurentiu
51827c578f MESH_MEAS_NUM_X_POINTS constant correction to MESH_MEAS_NUM_Y_POINTS 2019-02-22 15:05:06 +02:00
Laurentiu
62875f2e95 MESH_MEAS_NUM_X_POINTS constant correction to MESH_MEAS_NUM_Y_POINTS 2019-02-22 14:35:48 +02:00
MRprusa3d
c0a8d87e9e Merge remote-tracking branch 'my_remote/PFW-795' into PFW-795 2019-02-22 03:16:23 +01:00
MRprusa3d
be0ed46335 preHeat @ filament management 
another funcionality III
 2019-02-22 03:09:50 +01:00
PavelSindler
730e370e78
Merge pull request #1565 from PavelSindler/MK3_for_merging 
version change
 2019-02-21 19:17:03 +01:00
PavelSindler
da28773480 version change 2019-02-21 19:16:24 +01:00
MRprusa3d
e422cc1c26
Merge branch 'MK3' into PFW-795 2019-02-21 15:43:56 +01:00
MRprusa3d
ed93f1b7f0 preHeat @ filament management 
another funcionality IIb
 2019-02-21 15:27:22 +01:00
PavelSindler
16bb6c80c7
Merge pull request #1562 from PavelSindler/mmu_stop_print_fix 
comments
 2019-02-21 14:29:04 +01:00
PavelSindler
6ad5c07e6d comments 2019-02-21 14:28:05 +01:00
MRprusa3d
323071f50a preHeat @ filament management 
another funcionality II
 2019-02-21 13:20:29 +01:00
MRprusa3d
a54c68b874 preHeat @ filament management 
another funcionality II
 2019-02-21 04:45:44 +01:00
Marek Bel
8b858286ac Document. 2019-02-21 02:30:01 +01:00
Marek Bel
326c8492b5 Move extruder forth and back after filament detected by sensor to detect bad load. 2019-02-21 01:19:26 +01:00
PavelSindler
1e729048dc cmdqueue_reset fix 2019-02-21 00:14:49 +01:00
MRprusa3d
da0867cfc5 preHeat @ filament management 
another funcionality
 2019-02-20 03:01:33 +01:00
Laurentiu
afc86a1363 missing ; 2019-02-18 05:50:29 +02:00
PavelSindler
11d19879fc
Merge pull request #1533 from MRprusa3d/PFW-210 
preHeat @ filament load / unload / autoLoad / MMU
 2019-02-15 17:45:38 +01:00
PavelSindler
9d76b6912c merge new changes from upstream 2019-02-15 17:05:39 +01:00
PavelSindler
2b6668b853 merge MK3S branch into MK3 2019-02-15 16:42:40 +01:00
PavelSindler
fec64a9d5e
Merge pull request #1525 from mkbel/improve_mmu_load_failed_2 
Improve mmu load failed 2
 2019-02-15 15:52:35 +01:00
PavelSindler
69ff37729e whitespace 2019-02-15 14:19:30 +01:00
PavelSindler
0f791ce47f mmu needs attention: idler error fix 2019-02-15 14:17:47 +01:00
MRprusa3d
0c1f9b5100 preHeat @ filament management 
target temperature keeping
 2019-02-15 02:25:44 +01:00
Laurentiu
4835b9b220 7x7 points mesh bed leveling 2019-02-14 10:57:58 +02:00
MRprusa3d
80c3420a12
Merge branch 'MK3' into PFW-210 2019-02-14 00:05:50 +01:00
MRprusa3d
ef1f82627e preHeat @ filament load / unload / autoLoad / MMU 
MMU options added
 2019-02-13 23:53:00 +01:00
Marek Bel
a5437cb15b Resend MMU T commands only. 
This solves problem with unload repeated if unload takes too long, second ok reply then triggers Wait end and resumes print.
 2019-02-13 22:29:29 +01:00
Marek Bel
a4032e437e Add MMU wait command after MMU load failed. Resume print when MMU wait command returns OK. 2019-02-13 21:28:21 +01:00
Marek Bel
daaec0ef04 Convert MmuCmd to enum class. 2019-02-13 17:12:35 +01:00
Marek Bel
8e23e7f322 Save some flash by using smaller type for filament. 2019-02-13 16:37:54 +01:00
Marek Bel
9e873ac0f7 Use enum for mmu_cmd instead of plain integer type. 2019-02-13 01:51:39 +01:00
Marek Bel
bb7eeef1f4 Define debug printf and puts functions to make code more readable. 2019-02-12 23:24:23 +01:00
Marek Bel
e1216934ef Save flash by defining underlying type and omitting number value. 2019-02-12 21:53:11 +01:00
Marek Bel
3379fb4866 Convert mmu_state to enum. 2019-02-12 21:43:26 +01:00
PavelSindler
4c76393231 version change 2019-02-12 13:44:50 +01:00
PavelSindler
62500f0b55 version changed 2019-02-12 10:39:09 +01:00
Marek Bel
6c8d9c6fb4 Retry filament load on MMU load failure once. 2019-02-11 23:43:42 +01:00
Marek Bel
d33b24c281 Unload filament after MMU load failed so MMU unit can be controlled by its buttons. 2019-02-11 23:24:55 +01:00
PavelSindler
b85661309f configuration change 2019-02-11 16:38:36 +01:00
PavelSindler
ccc542d74a MK2.5 IR_SENSOR_PIN modified 2019-02-11 14:32:21 +01:00
PavelSindler
cd692f6be6 version change 2019-02-07 19:43:08 +01:00
PavelSindler
065d56b2c6 version change 2019-02-06 23:58:30 +01:00
PavelSindler
38b0e5439b version change 2019-02-06 23:52:24 +01:00
MRprusa3d
b17a961241 MK2.5S 
pin definition for filament sensor connection
 2019-02-06 23:31:48 +01:00
PavelSindler
e028db7bf9 version change 2019-02-06 23:30:01 +01:00
PavelSindler
ff52499bdc extr fan RPM measuring fix 2019-02-06 23:05:13 +01:00
PavelSindler
e432e258dc extr fan RPM measuring fix 2019-02-06 22:56:10 +01:00
PavelSindler
22217a42f7 message change 2019-02-06 21:37:39 +01:00
PavelSindler
a85d8e7f97 message change 2019-02-06 21:36:21 +01:00
PavelSindler
d19c92bca8 welcome message changed 2019-02-06 19:41:17 +01:00
PavelSindler
de9c87c592 welcome message changed 2019-02-06 19:38:52 +01:00
Marek Bel
c704a4b7ab Fix menu stack overrun. 2019-02-06 18:25:45 +01:00
PavelSindler
726d5aa3c3 typo fixed 2019-02-06 16:29:10 +01:00
PavelSindler
63c8a36185 typo fixed 2019-02-06 16:27:44 +01:00
PavelSindler
a220c97f94 Revert "variant files" 
This reverts commit 850d3316b6.
 2019-02-06 16:19:30 +01:00
PavelSindler
2fe8e0670a MK2 build fail fixed 2019-02-06 16:15:19 +01:00
PavelSindler
850d3316b6 variant files 2019-02-06 15:18:12 +01:00
PavelSindler
ef86c78f25 menu item text changed 2019-02-06 14:24:47 +01:00
PavelSindler
1ba046395e fan measurements fix: keep fanSpeedSoftPwm = 255 during measurements, selftest changes 2019-02-06 12:37:18 +01:00
PavelSindler
27d002a46f Merge remote-tracking branch 'robert/MK3-variants' into variants 2019-02-06 09:20:21 +01:00
PavelSindler
860e6f9994 Merge remote-tracking branch 'upstream/MK3' into variants 2019-02-06 09:19:38 +01:00
PavelSindler
fcb7dd90cf
Merge pull request #1505 from MRprusa3d/PFW-210 
preHeat @ filament load / unload / autoLoad
 2019-02-06 09:14:03 +01:00
MRprusa3d
a53d150903 preHeat @ filament load / unload / autoLoad 
autoLoad option added
 2019-02-06 01:58:05 +01:00
Robert Pelnar
93d4128163 Fixed timer2 colission with arduino framework around "tone" function. 2019-02-05 19:08:57 +01:00
PavelSindler
62e253edd0 fanSpeed -> fanSpeedSoftPwm (fixes fan speed menu) 2019-02-05 18:21:44 +01:00
PavelSindler
903028e574 fix fan speed measuring for PWM = 255 2019-02-05 17:46:31 +01:00
PavelSindler
91b12ff64b bed level correction menu fix (menu_item_edit for negative integers) 2019-02-05 16:49:29 +01:00
PavelSindler
f9298b37b8 fan check hotfix (selftest, measuring RPM, fan errors) 2019-02-05 04:02:38 +01:00
PavelSindler
ea20529945 merge changes from upstream 2019-02-04 15:23:39 +01:00
MRprusa3d
5a2df47077 minTemp 
better stability for delay-cutting
 2019-02-04 14:54:25 +01:00
PavelSindler
9a51a7be29 Merge branch 'bed_correction_fix' into variants 2019-02-04 12:47:06 +01:00
PavelSindler
0853ef5d06 Merge remote-tracking branch 'upstream/MK3' into variants 2019-02-04 12:45:28 +01:00
PavelSindler
b4f2dc3b5e Merge remote-tracking branch 'robert/MK3-variants' into variants 2019-02-04 12:41:08 +01:00
PavelSindler
6d5a2ae816
Merge pull request #1499 from MRprusa3d/PFW-210 
preHeat @ filament load / unload
 2019-02-04 12:37:42 +01:00
Robert Pelnar
d2a4cb4c49 Use _delay_ms instead of delay (fix - fast scrolling in sd card menu - temporary solution) 2019-02-04 12:20:07 +01:00
MRprusa3d
fff8fc8a48 preHeat @ filament load / unload 
filament-list correction (PET missing)
 2019-02-04 12:12:35 +01:00
PavelSindler
2f9ab7b185 Merge branch 'dev' into variants 2019-02-04 01:32:24 +01:00
Robert Pelnar
3244c37435 Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control 2019-02-04 01:32:04 +01:00
PavelSindler
036bd4eb46 Merge branch 'dev' into variants 2019-02-04 01:20:14 +01:00
PavelSindler
6bf8611afa mintemp: delay cutting lines removed 2019-02-04 01:19:58 +01:00
PavelSindler
71e4459cc9 Merge branch 'dev' into variants 2019-02-04 01:14:11 +01:00
PavelSindler
fba207e0ec crash detection: don't wait for heater if target temp = 0; new priting type 2019-02-04 01:13:46 +01:00
PavelSindler
5324181bf7 maximum bed level correction value enlarged from 50um to 100um and is now used in menus and mesh bed leveling itself 2019-02-03 20:56:14 +01:00
PavelSindler
454a087fb3 Merge branch 'dev' into variants 2019-02-01 21:24:38 +01:00
PavelSindler
4444b155f1 M600: prevention of blob; massage changed when autoload is active 2019-02-01 21:08:34 +01:00
PavelSindler
97aaf919a3 Merge remote-tracking branch 'upstream/MK3' into dev 2019-02-01 18:12:59 +01:00
Robert Pelnar
79449a8eaf Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control 2019-02-01 13:29:50 +01:00
PavelSindler
2cb3b99981 Merge branch 'dev' into variants 2019-01-31 18:04:38 +01:00
PavelSindler
4f67a9569c dont show filament sensor in extruder info menu 2019-01-31 18:03:56 +01:00
PavelSindler
6342b6032c Merge remote-tracking branch 'upstream/MK3' into variants 2019-01-31 10:18:41 +01:00
PavelSindler
491dbf5ebd
Merge pull request #1493 from MRprusa3d/PFW-210 
preHeat @ filament load / unload
 2019-01-31 10:15:59 +01:00
MRprusa3d
921b6993ee preHeat @ filament load / unload 2019-01-31 05:21:53 +01:00
PavelSindler
9926468c91 Merge remote-tracking branch 'upstream/MK3' into variants 2019-01-30 17:26:45 +01:00
PavelSindler
b24cd58a50
Merge pull request #1491 from XPila/MK3-bed_fast_pwm 
HW pwm fix
 2019-01-30 12:52:44 +01:00
Robert Pelnar
9890c60fe5 HW PWM fix 2019-01-30 00:06:12 +01:00
PavelSindler
bbdb2c1597 Merge branch 'dev' into variants 2019-01-29 15:34:56 +01:00
MRprusa3d
19fd05bb46
Merge pull request #1490 from PavelSindler/menu_update 
menu update
 2019-01-29 13:29:27 +01:00
PavelSindler
1fa9913029 include printers.h 2019-01-28 21:54:44 +01:00
PavelSindler
220437316b
Merge pull request #1485 from XPila/MK3-bed_fast_pwm 
Mk3 bed fast pwm
 2019-01-28 21:14:01 +01:00
PavelSindler
60acdd23c5 variants 2019-01-28 21:12:38 +01:00
PavelSindler
29e156b26d printer types updated 2019-01-28 19:48:46 +01:00
PavelSindler
25d54d43aa menu update 2019-01-28 19:41:02 +01:00
Marek Bel
6d2358125a Fix Timer_test broken by conditional translation for SYSTEM_TIMER_2. 2019-01-28 19:29:31 +01:00
PavelSindler
dd4d8e1277 calibrate z endstop update 2019-01-28 19:23:19 +01:00
PavelSindler
af348aa8ba compilation error fix: pin for LCD brightness 2019-01-28 17:56:44 +01:00
PavelSindler
83510ed489 check_for_ir_sensor 2019-01-28 17:27:16 +01:00
PavelSindler
8fe2d1de9a Merge remote-tracking branch 'my_dev/MK3' into dev 2019-01-28 17:15:22 +01:00
PavelSindler
8f039263d5 variant files and version 2019-01-28 17:14:24 +01:00
PavelSindler
1742dbdb9e Merge remote-tracking branch 'my_dev/MK3' into dev 2019-01-28 16:21:57 +01:00
PavelSindler
2ea34d21e7
Revert "Revert "Mk3 bed fast pwm"" 2019-01-28 14:20:31 +01:00
Robert Pelnar
1b4e49b5ac Fixed fancheck and include in TimerRemaining.h 
this commit enables fast pwm mode for bed (SYSTEM_TIMER_2 definition uncomented)
fancheck fix verified with selftest
 2019-01-28 12:57:33 +01:00
PavelSindler
0514306bed selftest fixed 2019-01-28 11:09:41 +01:00
PavelSindler
7889305702 merging changes from upstream 2019-01-28 11:00:42 +01:00
PavelSindler
41f103c28f
Revert "Mk3 bed fast pwm" 2019-01-28 10:53:51 +01:00
PavelSindler
c6e6df404c
Merge pull request #1482 from mkbel/IR_fsens_selftest 
Ir fsens selftest
 2019-01-28 10:39:12 +01:00
Robert Pelnar
eea755496b Conditional translation for SYSTEM_TIMER_2 because we want to have posibility to switch between old/new implementation. 
Timing functions (millis, micros and delay) replaced in whole source, defined in Marlin.h.
This commit enables original implementation (SYSTEM_TIMER_2 undefined)
Verified with passed complete wizard process.
 2019-01-27 22:48:51 +01:00