Commit Graph

904 Commits

Author SHA1 Message Date
Marek Bel e53734895f Make MMU load failed blocking to workaround lack of resume print menu item.
The same workaround used as for USB print (Octoprint).
2019-08-16 20:20:17 +02:00
DRracer ba81149afe
Merge branch 'MK3' into MK3_3.7.3 2019-08-15 10:25:51 +02:00
DRracer a28c365bb1
Merge pull request #2075 from MRprusa3d/PFW-873b
farm mode update, documentation correction
2019-08-07 17:48:30 +02:00
MRprusa3d b471bb7540 farm mode update, documentation correction 2019-08-05 17:51:26 +02:00
Marek Kühn 091cd49ca5 Fw version check disabled in farm mode 2019-08-05 16:59:09 +02:00
DRracer cb19f0958b Use _delay() and _micros() for future compatibility 2019-08-05 09:51:06 +02:00
DRracer 7c9d3dd177 Update doxydoc of new G-codes 2019-08-01 13:09:20 +02:00
DRracer 3e60cf4537 enable only for MK3S (out of FLASH on the MK3) 2019-07-23 16:51:02 +02:00
DRracer 593675c667 delay, micros for the 3.7.x branch 2019-07-23 16:40:21 +02:00
DRracer 6860a572c2 detection of faulty RAMBo (incorrect capacitor on fan tach pin) for MK3/S 2019-07-23 15:55:53 +02:00
DRracer 6f79ef4c9c resolve hidden conflicts in commented code 2019-07-22 17:29:43 +02:00
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