Commit Graph

943 Commits

Author SHA1 Message Date
DRracer 65087b89ee Merge remote-tracking branch 'upstream/MK3' into code_size_optimization
and resolve conflicts (ultralcd.cpp)
2019-07-22 17:26:14 +02:00
Marek Kühn bd4bfbe586 Added M862 details 2019-07-19 16:15:12 +02:00
Marek Kühn 94e79806bc Updated doxygen docs to work better with confluence. 2019-07-19 13:51:55 +02:00
NotaRobotexe 756ce51b5e
Merge branch 'MK3' into octoprint_fix 2019-07-17 20:06:06 +02:00
NotaRobotexe b8fec59f21 octoprint fan error fix 2019-07-17 19:59:31 +02:00
DRracer 255db28684 merge unit test and upstream changes 2019-07-17 10:30:49 +02:00
NotaRobotexe e6255e8451 octoprint fan error work 2019-07-16 19:18:31 +02:00
DRracer 1dab0f7a04
Merge pull request #2008 from leptun/MK3_LCD_improvements
Lcd optimization - 1K of flash saved
2019-07-16 19:15:57 +02:00
DRracer 8b806f692e
Merge pull request #1664 from MRprusa3d/PFW-811
"disable_z()" for Delta PSU
2019-07-16 16:46:34 +02:00
DRracer d65b333664
Merge pull request #2003 from mkbel/heat_hysteresis
Heat hysteresis
2019-07-16 13:10:47 +02:00
DRracer 0422713b29
Merge pull request #2005 from prusa3d/MK3_3.7.2
Mk3 3.7.2
2019-07-16 08:50:38 +02:00
leptun 8b1c687629 Lcd optimization - 1K of flash saved 2019-07-15 20:32:58 +03:00
Marek Bel 9083d151b2 wait_for_heater() in restore_print_from_ram_and_continue() only if saved_extruder_temperature differs from target hot-end temperature.
This fixes problem, that restore_print_from_ram_and_continue() blocked for heating for at least TEMP_RESIDENCY_TIME (3 seconds) even if temperature was resumed by M600 command.
2019-07-15 18:07:05 +02:00
Marek Bel 549a8a1a6b Restore print fan speed earlier then nozzle temperature.
Avoids nozzle temperature dip when fan is turned on.
2019-07-15 16:25:21 +02:00
NotaRobotexe 8fb30f886a octoprint stop fix 2019-07-15 14:30:21 +02:00
DRracer a3fde091ab More than 7.5KB saved by slight refactoring of printing to serial line 2019-07-12 10:10:56 +02:00
Marek Běl d3dd0ad271
Merge pull request #1952 from NotaRobotexe/sound
new sound
2019-07-10 18:06:32 +02:00
MRprusa3d 98bae7af9f
Merge branch 'MK3' into PFW-873 2019-07-10 16:50:14 +02:00
DRracer 9585789288
Merge pull request #1976 from NotaRobotexe/MK3_3.7.2_PP
dont fire power panic at normal power off
2019-07-10 14:19:00 +02:00
MRprusa3d 8229a45187 pre-production version ;-) 2019-07-09 12:16:51 +02:00
NotaRobotexe 9592460281 add old delay 2019-07-04 18:43:59 +02:00
NotaRobotexe e77898d5dc code edit 2019-07-04 13:21:27 +02:00
NotaRobotexe 81b3b71cca check eeprom inicialization 2019-07-03 19:37:11 +02:00
MRprusa3d a3a7f3106e print parameters checking 2019-07-03 17:21:11 +02:00
NotaRobotexe ff3c9d1a7c dont fire power panic at normal power off 2019-06-28 11:25:56 +02:00
Marek Bel 4a16fe6902 Save z_offset, bed_temp and pinda_temp with sheet calibration. 2019-06-26 14:10:12 +02:00
NotaRobotexe 4058cd144b add delay_keep_alive without updating lcd 2019-06-25 14:30:11 +02:00
NotaRobotexe b5168bd6c2 fan error fix 2019-06-24 17:30:56 +02:00
Marek Bel 19a474eaa5 Fix compiler warnings. 2019-06-20 18:00:29 +02:00
Marek Bel 0a48082609 Add steel sheet profile selector. 2019-06-20 16:40:53 +02:00
Marek Bel 24cec4091b Merge branch 'MK3' into sound 2019-06-17 17:28:19 +02:00
Marek Běl aff020a6d4
Merge pull request #1897 from NotaRobotexe/farm_mode
PFW-571 send PRN:4 instead PRN:1, PFW-874 new firmware version alert with 30s timeout
2019-06-14 20:05:30 +02:00
Marek Bel b1df1fb1f1 Fix formatting. We are never using 2 space indentation. 4 spaces are preferred, tabulator is acceptable if surrounding code uses tabs. 2019-06-14 18:18:27 +02:00
DRracer 55dc78546b
Merge pull request #1913 from mkbel/fix_spelling
Fix spelling.
2019-06-13 15:12:30 +02:00
Marek Bel 25f0eb9a39 Fix spelling. 2019-06-13 15:01:54 +02:00
Marek Bel 72f5e87c61 Merge branch 'MK3' into use_enum_class_2 2019-06-12 19:17:35 +02:00
Marek Bel 1390d4e5b9 Use first letter capital camel case for enum class members. Change underlying type to uint_least8_t. 2019-06-12 19:11:41 +02:00
Marek Bel 5fcf760954 Use first letter capital camel case for enum class members. Rename CustomMsgTypes to CustomMsg. Remove unnecessary maping to numbers. Change underlying type to uint_least8_t. 2019-06-12 18:54:43 +02:00
Marek Bel cbb92860d0 Use first letter capital camel case for enum class members. 2019-06-12 18:54:32 +02:00
MRprusa3d b7d3766ae2
Merge branch 'MK3' into PFW-790 2019-06-12 17:32:13 +02:00
DRracer c7e1e73880 another almost 200B down by proper usage of smaller data types and enum
classes
2019-06-12 15:41:55 +02:00
DRracer baa36ce740 another almost 200B down by proper usage of smaller data types and enum
classes
2019-06-12 09:58:42 +02:00
Marek Běl cb6a3e7e12
Merge pull request #1907 from DRracer/fan_check_error_fix
Do not allow resume printing if fans are still not ok
2019-06-11 15:12:48 +02:00
DRracer 13c3ab14fa test fan check error only when enabled by #ifdef 2019-06-11 15:05:40 +02:00
DRracer 3e37150552 Do not allow resume printing if fans are still not ok 2019-06-11 14:53:10 +02:00
NotaRobotexe bb980e2fca sound edit, delete mute mode, add blind mode 2019-06-10 15:03:52 +02:00
Marek Běl 327e6cd39b
Merge pull request #1889 from DRracer/fan_check_error_fix
Fan check error fix
2019-06-06 15:52:44 +02:00
DRracer 0cf6bc0677
Merge pull request #1903 from mkbel/filament_runout_mk3_2
Filament runout mk3 2
2019-06-06 15:51:35 +02:00
MRprusa3d 1d8c24e8a9 "disable_z()" for Delta PSU IV
correction for (motor) mode switching
2019-06-05 19:22:04 +02:00
Marek Bel 19351df8a7 Extracted computation of z_shift for M600 into a separate function to
improve readability. Surprisingly, also the code got shorter.
2019-06-05 18:34:26 +02:00
DRracer aeed49a80e Fix filament runout on optical filament sensors
Reworked the IR variant accordingly
Some code-size optimization in related functions
2019-06-05 18:33:41 +02:00
DRracer 10247a28a3
Merge pull request #1896 from NotaRobotexe/power_panic
documentation for power panic
2019-06-05 16:10:04 +02:00
NotaRobotexe 0cab2284ea PFW-874 new firmware alert timeout 2019-06-05 15:48:10 +02:00
NotaRobotexe 14270ac1f6 power panic documentation 2019-06-05 15:10:51 +02:00
NotaRobotexe d263728c37 documentation 2019-06-05 14:55:59 +02:00
DRracer 33b2aa5e58
Merge pull request #1894 from NotaRobotexe/power_panic
Power panic Z axis fix
2019-06-05 13:34:21 +02:00
NotaRobotexe 2c4e98dc27 power panic improvement 2019-06-05 13:12:08 +02:00
DRracer 6755791778 Fix repeated fan error checking 2019-05-31 11:29:11 +02:00
Marek Bel e79c203c96 Do not always cut if it is not enabled from menu. 2019-05-30 23:04:06 +02:00
Marek Bel ccb649b1f6 Add always cut experimental / for testing feature. 2019-05-30 23:03:59 +02:00
NotaRobotexe e9c870e7a0 fix of fixof power panic 2019-05-29 20:33:22 +02:00
NotaRobotexe 3b2cbc68d8 PFW-571 send PRN:4 instead PRN:1 while changing filament 2019-05-28 18:22:34 +02:00
DRracer 1c619133a3
Merge pull request #1880 from NotaRobotexe/power_panic
PFW-828  add uvlo tiny z positio back
2019-05-28 14:29:13 +02:00
NotaRobotexe bcb6129c29 delete comment 2019-05-28 14:11:38 +02:00
NotaRobotexe 8842d16832 add back uvlo tiny z positio 2019-05-28 13:50:21 +02:00
DRracer 2f96badef4
Merge pull request #1870 from NotaRobotexe/power_panic
PFW-828 after power panic printer start print in the air
2019-05-27 17:13:08 +02:00
Marek Běl 9c3b93f900
Merge pull request #1869 from DRracer/fix_mintemp_and_fsensor
Fix MINTEMP errors and fsensor runout
2019-05-27 16:32:22 +02:00
NotaRobotexe f070a10904 edit 2019-05-27 10:10:24 +02:00
NotaRobotexe 55a2d588f1 PFW-828 printing in the air after power panic 2019-05-24 18:30:58 +02:00
NotaRobotexe 69455bfc75 PFW-828 fix printing in the air after power panic 2019-05-24 18:28:16 +02:00
DRracer 9cb0bc7bcf Fix MINTEMP errors and fsensor runout 2019-05-24 08:46:44 +02:00
NotaRobotexe 1399d7dcc8 support only for MK3/MK3S 2019-05-23 15:22:31 +02:00
Ondrej Tuma 63235625ab pause printer by flag 2019-05-23 13:13:11 +02:00
Marek Bel dad2065da6 Merge branch 'MK3' into rise_z 2019-05-15 16:37:17 +02:00
Marek Bel 1f3877b221 Extract duplicate code into function. Saves 4B of flash. 2019-05-15 16:31:10 +02:00
Marek Bel 1a78bd53ba Fix compiler warning
sketch/Marlin_main.cpp: In function 'void marlin_wait_for_click()':
sketch/Marlin_main.cpp:9646:12: warning: unused variable 'busy_state_backup' [-Wunused-variable]
2019-05-14 19:11:46 +02:00
Marek Bel 91e72a79f0 Fix compiler warning
sketch/Marlin_main.cpp:871:13: warning: unused variable 'ir_detected' [-Wunused-variable]
2019-05-14 19:07:50 +02:00
Marek Běl efa8e6e6ba
Merge pull request #1658 from Harpalyke/save-ustep-res-with-M500
Allow save of uStep resolution with M500
2019-05-13 17:08:34 +02:00
Marek Běl 0a343d4d66
Merge pull request #1806 from NotaRobotexe/fw_check
check if firmware is on right type of printer
2019-05-11 02:11:54 +02:00
NotaRobotexe e7dd5c60d3 check if firmware is on right type of printer 2019-05-07 18:10:44 +02:00
Ondrej Tuma b7fe43bf68 Deleted bad cols/rows definitions for translation. 2019-05-07 12:52:23 +02:00
Robert Pelnar 18dec75b56 MK2.5 - watchdog enabled + test (command "D-1") 2019-04-29 13:19:59 +02:00
Marek Bel 75fac9dab2 Do not kill printer if External SPI flash W25X20CL is not responding.
Remove internationalization macro for this message. It has no sense to be translated as internationalization in most cases doesn't work if it is not responding.
Show this message instead of splash screen if the error is encountered.
There is no additional delay or wait for click, as such functions doesn't work in setup function.
2019-04-16 22:20:53 +02:00
Marek Bel 84cabd3836 Change busy_state type, save 340B of flash 2019-04-05 15:20:34 +02:00
Marek Bel bf57a59147 Extract duplicate code into function. Saves 106B flash. 2019-04-05 15:12:35 +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 4b1fc69088 "disable_z()" for Delta PSU III
stealthChop set if motor-disable (@ Z) required
2019-04-02 20:04:44 +02:00
PavelSindler d22793f276 Z-probe nr. states reduced to 1; 3; 5 2019-03-28 12:02:46 +01:00
PavelSindler e7900aeaa1 Merge remote-tracking branch 'upstream/MK3' into 7x7_polishing 2019-03-28 08:08:54 +01:00
PavelSindler e259967991 remove / comment debug code 2019-03-27 20:41:45 +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
MRprusa3d 17a534e42b "disable_z()" for Delta PSU II 2019-03-25 23:28:25 +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
MRprusa3d 632781c4a2 "disable_z()" for Delta PSU 2019-03-21 00:45:15 +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
Marek Bel 4100bd33a7 Fix Dcodes compilation errors and warnings. 2019-03-19 13:53:58 +01:00
PavelSindler 6e26f61726 fixed 7x7 mesh bed leveling vs. Z calibration check 2019-03-14 14:48:01 +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