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
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
55dc78546b
Merge pull request #1913 from mkbel/fix_spelling
...
Fix spelling.
2019-06-13 15:12:30 +02:00
25f0eb9a39
Fix spelling.
2019-06-13 15:01:54 +02:00
72f5e87c61
Merge branch 'MK3' into use_enum_class_2
2019-06-12 19:17:35 +02:00
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
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
cbb92860d0
Use first letter capital camel case for enum class members.
2019-06-12 18:54:32 +02:00
b7d3766ae2
Merge branch 'MK3' into PFW-790
2019-06-12 17:32:13 +02:00
c7e1e73880
another almost 200B down by proper usage of smaller data types and enum
...
classes
2019-06-12 15:41:55 +02:00
baa36ce740
another almost 200B down by proper usage of smaller data types and enum
...
classes
2019-06-12 09:58:42 +02:00
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
13c3ab14fa
test fan check error only when enabled by #ifdef
2019-06-11 15:05:40 +02:00
3e37150552
Do not allow resume printing if fans are still not ok
2019-06-11 14:53:10 +02:00
bb980e2fca
sound edit, delete mute mode, add blind mode
2019-06-10 15:03:52 +02:00
327e6cd39b
Merge pull request #1889 from DRracer/fan_check_error_fix
...
Fan check error fix
2019-06-06 15:52:44 +02:00
0cf6bc0677
Merge pull request #1903 from mkbel/filament_runout_mk3_2
...
Filament runout mk3 2
2019-06-06 15:51:35 +02:00
1d8c24e8a9
"disable_z()" for Delta PSU IV
...
correction for (motor) mode switching
2019-06-05 19:22:04 +02:00
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
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
10247a28a3
Merge pull request #1896 from NotaRobotexe/power_panic
...
documentation for power panic
2019-06-05 16:10:04 +02:00
0cab2284ea
PFW-874 new firmware alert timeout
2019-06-05 15:48:10 +02:00
14270ac1f6
power panic documentation
2019-06-05 15:10:51 +02:00
d263728c37
documentation
2019-06-05 14:55:59 +02:00
33b2aa5e58
Merge pull request #1894 from NotaRobotexe/power_panic
...
Power panic Z axis fix
2019-06-05 13:34:21 +02:00
2c4e98dc27
power panic improvement
2019-06-05 13:12:08 +02:00
6755791778
Fix repeated fan error checking
2019-05-31 11:29:11 +02:00
e79c203c96
Do not always cut if it is not enabled from menu.
2019-05-30 23:04:06 +02:00
ccb649b1f6
Add always cut experimental / for testing feature.
2019-05-30 23:03:59 +02:00
e9c870e7a0
fix of fixof power panic
2019-05-29 20:33:22 +02:00
3b2cbc68d8
PFW-571 send PRN:4 instead PRN:1 while changing filament
2019-05-28 18:22:34 +02:00
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
bcb6129c29
delete comment
2019-05-28 14:11:38 +02:00
8842d16832
add back uvlo tiny z positio
2019-05-28 13:50:21 +02:00
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
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
f070a10904
edit
2019-05-27 10:10:24 +02:00
55a2d588f1
PFW-828 printing in the air after power panic
2019-05-24 18:30:58 +02:00
69455bfc75
PFW-828 fix printing in the air after power panic
2019-05-24 18:28:16 +02:00
9cb0bc7bcf
Fix MINTEMP errors and fsensor runout
2019-05-24 08:46:44 +02:00
1399d7dcc8
support only for MK3/MK3S
2019-05-23 15:22:31 +02:00
63235625ab
pause printer by flag
2019-05-23 13:13:11 +02:00
dad2065da6
Merge branch 'MK3' into rise_z
2019-05-15 16:37:17 +02:00
1f3877b221
Extract duplicate code into function. Saves 4B of flash.
2019-05-15 16:31:10 +02:00
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
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
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
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
e7dd5c60d3
check if firmware is on right type of printer
2019-05-07 18:10:44 +02:00
b7fe43bf68
Deleted bad cols/rows definitions for translation.
2019-05-07 12:52:23 +02:00
18dec75b56
MK2.5 - watchdog enabled + test (command "D-1")
2019-04-29 13:19:59 +02:00
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
84cabd3836
Change busy_state type, save 340B of flash
2019-04-05 15:20:34 +02:00
bf57a59147
Extract duplicate code into function. Saves 106B flash.
2019-04-05 15:12:35 +02:00
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
4b1fc69088
"disable_z()" for Delta PSU III
...
stealthChop set if motor-disable (@ Z) required
2019-04-02 20:04:44 +02:00
d22793f276
Z-probe nr. states reduced to 1; 3; 5
2019-03-28 12:02:46 +01:00
e7900aeaa1
Merge remote-tracking branch 'upstream/MK3' into 7x7_polishing
2019-03-28 08:08:54 +01:00
e259967991
remove / comment debug code
2019-03-27 20:41:45 +01:00
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
17a534e42b
"disable_z()" for Delta PSU II
2019-03-25 23:28:25 +01:00
576bfb17c7
whitespace
2019-03-21 18:51:54 +01:00
175f840d16
return statement not used (fixes Pronterface issues)
2019-03-21 18:46:07 +01:00
632781c4a2
"disable_z()" for Delta PSU
2019-03-21 00:45:15 +01:00
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
7d98177716
farmMode updates
2019-03-19 19:48:40 +01:00
4100bd33a7
Fix Dcodes compilation errors and warnings.
2019-03-19 13:53:58 +01:00
6e26f61726
fixed 7x7 mesh bed leveling vs. Z calibration check
2019-03-14 14:48:01 +01:00
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
1f131f66e0
print parameters checking
...
nozzle diameter
2019-03-14 00:36:56 +01:00
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
b20d9171b6
Merge remote-tracking branch 'upstream/MK3' into 7x7
2019-03-12 11:47:17 +01:00
42036270cf
Merge pull request #1619 from MRprusa3d/PFW-795d
...
better autoLoad II
2019-03-12 11:44:30 +01:00
c9cff11732
Merge pull request #1593 from MRprusa3d/PFW-647
...
mode switching, G-code unification
2019-03-12 11:40:43 +01:00
4d2b155ff9
Merge pull request #1594 from mkbel/fix_change_filament
...
Fix change filament
2019-03-12 11:39:15 +01:00
9a83925a97
fixed bug in counting approximate Z coordinate
2019-03-11 23:13:55 +01:00
3388444b6c
better autoLoad II
...
autoLoad inhibit if Support::ExtruderInfo(@MKx)/SensorInfo(@MKxS)-menu is selected
2019-03-11 20:43:07 +01:00
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
952e0e1e77
change min. nProbeRetry to 1
2019-03-08 19:49:10 +01:00
6a864ffbab
G80 parameters configurable via settings menu
2019-03-08 15:43:37 +01:00
98bb2b7acf
merge debug gcodes for bed analysis
2019-03-06 20:45:23 +01:00
dccb6ca2c6
Merge remote-tracking branch 'upstream/MK3' into bed_analysis_gcodes2
2019-03-06 19:56:52 +01:00
f0cc313fed
debug gcodes (fans, bed analysis) moved to Dcodes, HOST_KEEPALIVE_FEATURE simplified
2019-03-06 19:56:48 +01:00
5766a5537e
limit number of probes
2019-03-05 22:43:44 +01:00
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
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
7bcd54f8ba
Add missing function prototype.
2019-03-05 17:30:27 +01:00
ebfd4b2f47
Fix compiler warning: unused parameter 'calib'
2019-03-05 17:02:57 +01:00
790ae9f0ce
Fix compiler warning: unused parameter 'pstep'.
2019-03-05 16:41:41 +01:00
20a03d703d
G-code unification
...
"FSENSOR_RECOVER" ->-> "PRUSA fsensor_recover"
2019-03-05 13:36:13 +01:00
f161d3ade4
Change formatting.
2019-03-04 22:17:43 +01:00
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
17f095b957
shorter Z movements (makes calibration faster)
2019-03-04 20:32:56 +01:00
9dde8c4732
Merge pull request #1591 from MRprusa3d/PFW-795c
...
better autoLoad
2019-03-04 15:31:04 +01:00
b02ca18c93
better autoLoad
...
autoLoad inhibit if Support::ExtruderInfo-menu is selected
2019-03-04 12:52:35 +01:00
85c208f9f4
Merge branch 'MK3' into bad_load_cut
2019-03-01 14:55:55 +01:00
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
e27fdafcec
menu switch - initial
2019-02-28 19:42:09 +01:00
482f8ef01a
Merge remote-tracking branch 'mionut/7MBL' into 7x7
2019-02-28 15:54:49 +01:00
02a692c5d9
Store cutter enable state in EEPROM.
2019-02-27 17:34:03 +01:00
4a4eb9962c
Cut filament when cutter is enabled and MMU load fails.
2019-02-27 10:42:26 +01:00
ff35119ef3
preHeat @ filament management
...
another funcionality III / autoLoad
2019-02-26 17:33:37 +01:00
be0ed46335
preHeat @ filament management
...
another funcionality III
2019-02-22 03:09:50 +01:00
da0867cfc5
preHeat @ filament management
...
another funcionality
2019-02-20 03:01:33 +01:00
afc86a1363
missing ;
2019-02-18 05:50:29 +02:00
11d19879fc
Merge pull request #1533 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad / MMU
2019-02-15 17:45:38 +01:00
4835b9b220
7x7 points mesh bed leveling
2019-02-14 10:57:58 +02:00
80c3420a12
Merge branch 'MK3' into PFW-210
2019-02-14 00:05:50 +01:00
ef1f82627e
preHeat @ filament load / unload / autoLoad / MMU
...
MMU options added
2019-02-13 23:53:00 +01:00
daaec0ef04
Convert MmuCmd to enum class.
2019-02-13 17:12:35 +01:00
9e873ac0f7
Use enum for mmu_cmd instead of plain integer type.
2019-02-13 01:51:39 +01:00
27d002a46f
Merge remote-tracking branch 'robert/MK3-variants' into variants
2019-02-06 09:20:21 +01:00
860e6f9994
Merge remote-tracking branch 'upstream/MK3' into variants
2019-02-06 09:19:38 +01:00
fcb7dd90cf
Merge pull request #1505 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad
2019-02-06 09:14:03 +01:00
a53d150903
preHeat @ filament load / unload / autoLoad
...
autoLoad option added
2019-02-06 01:58:05 +01:00
93d4128163
Fixed timer2 colission with arduino framework around "tone" function.
2019-02-05 19:08:57 +01:00
62e253edd0
fanSpeed -> fanSpeedSoftPwm (fixes fan speed menu)
2019-02-05 18:21:44 +01:00
903028e574
fix fan speed measuring for PWM = 255
2019-02-05 17:46:31 +01:00
f9298b37b8
fan check hotfix (selftest, measuring RPM, fan errors)
2019-02-05 04:02:38 +01:00
9a51a7be29
Merge branch 'bed_correction_fix' into variants
2019-02-04 12:47:06 +01:00
fba207e0ec
crash detection: don't wait for heater if target temp = 0; new priting type
2019-02-04 01:13:46 +01:00
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
4444b155f1
M600: prevention of blob; massage changed when autoload is active
2019-02-01 21:08:34 +01:00
97aaf919a3
Merge remote-tracking branch 'upstream/MK3' into dev
2019-02-01 18:12:59 +01:00
dd4d8e1277
calibrate z endstop update
2019-01-28 19:23:19 +01:00
af348aa8ba
compilation error fix: pin for LCD brightness
2019-01-28 17:56:44 +01:00
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
434a723151
Timing functions 'micros' and 'delay' replaced in whole source with 'micros2' and 'delay2'
2019-01-27 17:37:27 +01:00
fc0b55b213
Timing functions micros2 and delay2 + fix of delay_keep_alive().
2019-01-27 17:23:53 +01:00
7e3a1c7d45
merge changes from upstream
2019-01-25 17:57:24 +01:00
6b1cf99066
conditional compilation updated
2019-01-24 16:14:02 +01:00
da2c963893
conditional compilation improved: fsensor_autoload_check_stop() and fsensor_autoload_check_start(); M600 "filament not responding" error on printers with ir sensor fixed
2019-01-24 16:00:52 +01:00
e0c1e4a02d
version which should on all printer versions: autoload, selftest, filament detection, filament sensors initialization, filament menus
2019-01-24 01:12:30 +01:00
54f8f4eb4d
Merge pull request #1460 from MRprusa3d/PFW-723
...
Pfw 723
2019-01-23 14:12:19 +01:00
052ae323f8
Merge branch 'MK3' into prusa3d-DEV_MK3
2019-01-15 16:58:36 +01:00
2db42c8577
Merge branch 'MK3' into auto_deplete_2
2019-01-07 21:39:46 +01:00
c080b899c3
Change filament number in T command to alternative if depleted and lcd_autoDepleteEnabled().
2019-01-04 22:32:48 +01:00
4e300fd552
minTemp
...
safety heaters management during/after minTemp
2019-01-02 18:25:41 +01:00
ba57986b72
merge changes from upstream
2018-12-21 20:58:38 +01:00
b8c5b6259e
Fix - move down after calibrate Z (PFW718)
2018-12-19 14:40:10 +01:00
16e5fb50dd
Remove M601 from queue before saving state (prevent infinite loop - PFW713)
2018-12-18 20:39:38 +01:00
34f116b4d9
Move 1mm down with disabled endstop after calibrate_z_auto (PFW718)
2018-12-18 19:57:29 +01:00
2100376eb1
Merge remote-tracking branch 'upstream/MK3' into idler_sensor
2018-12-18 16:16:48 +01:00
927898151a
fix - tmc2130 conditional translation
2018-12-14 15:46:50 +01:00
cfe83daf4a
Meshbed leveling fail - move 1mm outside of colission with disabled endstop
2018-12-14 15:32:47 +01:00
df71398066
statistics fix
2018-12-13 00:43:27 +01:00
a9829b6a1a
add statistics and idler sensor state
2018-12-13 00:12:00 +01:00
29ecd4ec7a
duplicit T-codes execution improved, E-stepper movements when waiting for ok from mmu, continue loading function improved, eeprom: fail stats for mmu
2018-12-12 22:32:47 +01:00
3d4cb8a994
Document gcode T.
2018-12-12 20:30:28 +01:00
c256af0a1c
unknown filament added; the same T-code will be not executed twice in a row; continue loading
2018-12-12 14:50:55 +01:00
Marek Běl
Marek Bel
DRracer
MRprusa3d
NotaRobotexe
MRprusa3d
Ondrej Tuma
Robert Pelnar
PavelSindler
Harpalyke
PavelSindler
Laurentiu