Commit Graph

442 Commits

Author SHA1 Message Date
PavelSindler
a724c2664c menus updated, set lcd_commands_step = 0; 2017-12-12 14:25:13 +01:00
PavelSindler
9ef5570fa3 menus accessable during first layer calibration updated 2017-12-12 13:41:31 +01:00
PavelSindler
d29a95bd65 if first layer calibration is active set SD_PRINTING to true 2017-12-12 11:41:54 +01:00
Robert Pelnar
7204e91ec6 Filament sensor not responding - (PFW-41)
build number = 130
2017-12-11 18:17:25 +01:00
Robert Pelnar
124a3e6da8 Stealth mode limits + END_FILE_SECTION=10000 2017-12-11 16:17:36 +01:00
PavelSindler
20de899d25
Merge branch 'MK3' into sort_files 2017-12-11 11:50:47 +01:00
PavelSindler
c9f95628d0 changed version 2017-12-11 11:49:40 +01:00
PavelSindler
13a17f9fd4 dont sort files when changing sort type in settings menu 2017-12-11 11:45:20 +01:00
PavelSindler
1c61f2f29c First working version 2017-12-11 11:30:49 +01:00
Robert Pelnar
c708f63803 build 128 2017-12-11 00:01:47 +01:00
Robert Pelnar
b76758b7b6 Ram status - heap and stack monitor. 2017-12-10 23:45:46 +01:00
Robert Pelnar
e8b2043d03 Stack monitor in stepper ISR 2017-12-10 20:38:09 +01:00
PavelSindler
26135ea227 all sd sort files: initial version; sorting type switch not added to SD card menu itself 2017-12-10 11:08:50 +01:00
Robert Pelnar
9dba7dcd1f DISABLE_M42_M226 = +56 bytes RAM (because of stack overflow)
build 127
2017-12-09 19:31:27 +01:00
Robert Pelnar
995801c967 Silent mode limits
+ cannot compile "END_FILE_SECTION"
2017-12-09 14:41:50 +01:00
Robert Pelnar
82f5a79527 bug fix (cannot compile) - ultralcd.cpp - conversion from (const char*) 2017-12-08 19:22:02 +01:00
PavelSindler
00945cf7c3 version changed 2017-12-08 16:59:45 +01:00
PavelSindler
868aacc7d5 turn on second serial line from settings menu 2017-12-08 16:56:06 +01:00
PavelSindler
07aa7a3803 support two serial lines at the same time 2017-12-07 19:14:17 +01:00
PavelSindler
d0b6b19373 save filename to eeprom first, then check if file is complete 2017-12-07 17:16:23 +01:00
PavelSindler
b5ad41b8af build number 2017-12-06 18:28:08 +01:00
PavelSindler
2cbd1f7894 fix: added saving filename to eeprom which was removed by accident 2017-12-06 18:13:54 +01:00
PavelSindler
071873b38a init; last merged file: Marlin_main.cpp 2017-12-06 17:48:16 +01:00
PavelSindler
40b7a5c82f build number changed 2017-12-06 14:59:26 +01:00
PavelSindler
44218a1b53 incomplete file check ported from MK2: initial version 2017-12-06 14:55:53 +01:00
XPila
443dc53145
Merge pull request #292 from XPila/MK3
Automatic filament load in M600
2017-12-05 18:38:23 +01:00
Robert Pelnar
58f8fdb51b Automatic filament load in M600 2017-12-05 18:37:03 +01:00
PavelSindler
bc0278c6e1 build number changed 2017-12-05 17:13:07 +01:00
PavelSindler
d7db407f32 xyz cal.: add delay_keep_alive messages to reset watchdog (LS optimization method takes more than 4s in some cases) 2017-12-05 13:16:59 +01:00
PavelSindler
22065e4877 merging from dev/MK3 2017-12-02 21:56:39 +01:00
Robert Pelnar
0de584c213 bugfix UVLO - extruder position from stepper 2017-11-29 02:08:15 +01:00
Robert Pelnar
a56b0ccaf8 bugfix - Filament sensor enable from menu 2017-11-29 00:15:45 +01:00
Robert Pelnar
9413eca52c UVLO recover E absolute mode
build number 119
2017-11-28 23:41:58 +01:00
Robert Pelnar
13f1684a4c build 118 2017-11-28 22:53:51 +01:00
XPila
1da1eaea01
Merge pull request #117 from PavelSindler/m600
M600: wait for user before unloading filament
2017-11-28 22:45:57 +01:00
Robert Pelnar
1863819e39 pat9125 reinit when fsensor enabled from menu. 2017-11-28 22:44:58 +01:00
PavelSindler
020a7ec257 unload filament can be repeated 2017-11-28 19:04:43 +01:00
PavelSindler
059c255a35 changed build version to b117 2017-11-28 18:31:38 +01:00
PavelSindler
c0112f05e1 M600: wait for user before unloading filament 2017-11-28 18:28:53 +01:00
PavelSindler
2cf7f54e5f changed build 2017-11-27 20:29:47 +01:00
PavelSindler
3f7be78997 translation to Czech language added 2017-11-27 18:54:44 +01:00
PavelSindler
bd748bc986 EINY -> EINSY 2017-11-27 18:47:48 +01:00
PavelSindler
211725c946 dont show temp cal message, dont save uvlo flag to eeprom if printing from USB 2017-11-27 18:30:16 +01:00
PavelSindler
ddc8587bbd
Merge pull request #112 from PavelSindler/menu_corrections
Menu corrections, translation to Czech language
2017-11-27 18:00:31 +01:00
PavelSindler
ce3f14e1c0 tune menu updated 2017-11-27 17:55:32 +01:00
PavelSindler
67a2e0a706 settings menu updated 2017-11-27 17:01:01 +01:00
PavelSindler
f075711e64 corrected menus 2017-11-27 16:37:46 +01:00
PavelSindler
7c6d63ffb5 pla preheat temp. changed, temp calibration on/off moved to settings menu 2017-11-27 16:21:54 +01:00
PavelSindler
044ed951cb translations to czech language and menu corrections: initial version 2017-11-27 16:06:34 +01:00
Robert Pelnar
7c8de94778 filament unload - initial
lower currents for power panic
2017-11-27 15:54:36 +01:00
Robert Pelnar
533418d63e opravene nezadouci resetovani watchdogem
powerpanic Z shift = 0.64mm (misto 1.92mm)
teplotni kompenzace default = ON
2017-11-27 14:43:56 +01:00
Robert Pelnar
25c16cc835 Extrudser info, merge upstream (powerpanic fix)
build number = 114
2017-11-27 07:44:12 +01:00
XPila
60930beb52
Merge pull request #108 from PavelSindler/power_panic
Power panic works with folders
2017-11-27 07:27:17 +01:00
Robert Pelnar
1113124bde PINDA calibration and precalibrated characteristics. 2017-11-27 07:09:53 +01:00
PavelSindler
d9f44eb16b unused code commented 2017-11-27 06:36:41 +01:00
PavelSindler
bd59e11660 removed serial print 2017-11-27 06:22:32 +01:00
PavelSindler
42b533b5d8 first working version 2017-11-27 06:20:51 +01:00
XPila
3b892e16d8
Merge branch 'MK3' into MK3 2017-11-27 04:49:23 +01:00
Robert Pelnar
4dae6f871e Sg load meassurement durring self test - 'Belt status' 2017-11-27 04:46:58 +01:00
PavelSindler
a40c759ee7 First run: show calibration status messages in case that user refused to use wizard 2017-11-27 02:03:42 +01:00
PavelSindler
5a77113fb5 init 2017-11-27 01:59:47 +01:00
PavelSindler
24195557ea removed redundant line 2017-11-27 01:24:58 +01:00
PavelSindler
a7b40d43e3 timeouting to status in the end of first layer cal. 2017-11-27 01:23:11 +01:00
PavelSindler
7de187d813 if user dont confirm live adjust Z by pressing the knob, save last live adjust value to eeprom 2017-11-27 00:17:45 +01:00
PavelSindler
4c7cc5520e "confirm nozzle clean" message re-added 2017-11-26 21:26:36 +01:00
PavelSindler
856d8c1be9
Merge pull request #103 from PavelSindler/print_menu_fix
Print menu fix
2017-11-26 20:58:32 +01:00
PavelSindler
a61964666e whitespace and minor corrections 2017-11-26 20:57:28 +01:00
PavelSindler
626818f87d removed debug messages 2017-11-26 20:53:09 +01:00
PavelSindler
d8bf148996 manage heater added 2017-11-26 20:51:56 +01:00
PavelSindler
4297a98fdd debuging messages 2017-11-26 19:10:38 +01:00
XPila
efba30b77e
Merge pull request #102 from XPila/MK3
Fixed bug - unload filament restarts the printer.
2017-11-26 17:20:40 +01:00
Robert Pelnar
e5fee387db Fixed bug - unload filament restarts the printer. 2017-11-26 17:14:39 +01:00
PavelSindler
e605305db4 build number changed 2017-11-24 23:01:53 +01:00
PavelSindler
38c1ea7867
Merge pull request #101 from PavelSindler/wizard
Wizard and mesh bed leveling messages
2017-11-24 22:58:16 +01:00
PavelSindler
05348a33db wizard: dont update lcd when loading filament 2017-11-24 22:55:47 +01:00
XPila
25b0b0b381
Merge pull request #100 from XPila/MK3
Fsensor synchronization and triggering improved
2017-11-24 22:03:55 +01:00
Robert Pelnar
f2e9bdef24 Fsensor synchronization and triggering improved
Watchdog implemented (4s interval, triggered from manage_heater)
Stallguard sensitivity for XY decreased by 1
Extruder current adjusted to 5.5kg force
Build number = 111
2017-11-24 21:53:35 +01:00
PavelSindler
171dc707fa improve mesh bed leveling messages 2017-11-24 20:18:11 +01:00
PavelSindler
4b644a58ae block of gcodes changed to avoid full buffer during v2 cal. 2017-11-23 18:22:00 +01:00
PavelSindler
79c221d6c0
Merge pull request #97 from PavelSindler/wizard
show live adjust Z option in main menu during First layer cal.
2017-11-23 15:59:03 +01:00
PavelSindler
2170c1bbe7 timeout to status prolonged, no timeout allowed when MSG_WIZARD_RERUN 2017-11-23 15:46:10 +01:00
PavelSindler
ba1bb4aea3 whitespace 2017-11-22 19:18:32 +01:00
PavelSindler
6d0574dd0f changed Y_MIN and probe points coordinates 2017-11-22 19:13:34 +01:00
PavelSindler
6bd221ad3b Y distance between nozzle and PINDA corrected 2017-11-22 16:07:03 +01:00
PavelSindler
7d825de214 show live adjust Z option in main menu when running First layer calibration 2017-11-22 11:18:39 +01:00
Robert Pelnar
213ee43cc9 Merge usptream
Crashdetection fixed
pl language removed (because of low flash capacity)
build number = 110
2017-11-22 08:41:52 +01:00
XPila
ee9936fa6c
Merge pull request #95 from PavelSindler/selftest_fix
selftest for axis modified to overcome collision between cables and PSU cover
2017-11-22 02:58:46 +01:00
XPila
ed379275a5
Merge pull request #94 from PavelSindler/PID_cal_update
PID calibration temp runaway
2017-11-22 02:58:25 +01:00
XPila
e5e2988247
Merge pull request #92 from PavelSindler/initial_message
Initial message changed
2017-11-22 02:45:27 +01:00
XPila
551db1ce6b
Merge pull request #90 from PavelSindler/sd_card_menu
Improved SD card menu
2017-11-22 02:45:11 +01:00
PavelSindler
e661020ada selftest for x_axis modified little bit to overcome problems with cables and PSU cover colision 2017-11-21 18:46:13 +01:00
PavelSindler
1ca48fee49 PID calibration temp runaway 2017-11-21 15:11:15 +01:00
PavelSindler
bbffd2f31b basic language corrections 2017-11-21 14:44:07 +01:00
PavelSindler
ae6a0b4d29 Initial message changed. Needs to be updated in bootlader. 2017-11-21 14:16:55 +01:00
Robert Pelnar
b8525f8043 Print class printf function (experimental, disabled by default)
LiquidCrystal VT100 escape codes (EraseScreen, CursorHome, ...)
Stream support for lcd and uart, fprintf and printf (stdout=uartout)
Dcodes enabled, code reduced, printf used
Splash screen with esc codes
2017-11-20 20:09:54 +01:00
PavelSindler
77eb26353c Improved SD card menu 2017-11-20 17:20:56 +01:00
Robert Pelnar
aee62750e7 Build 109 2017-11-16 22:03:36 +01:00
XPila
afb85865b6
Merge branch 'MK3' into wizard 2017-11-16 20:54:07 +01:00
XPila
279ea79bf6
Merge pull request #86 from PavelSindler/keepalive_messages
host keep alive messages
2017-11-16 20:53:09 +01:00
XPila
2a85de48ea
Merge pull request #88 from XPila/MK3
Mk3
2017-11-16 20:52:46 +01:00
Robert Pelnar
ef3e06da30 ... 2017-11-16 20:52:13 +01:00
Robert Pelnar
ee2f927148 Build Number = 108
FSensor log can be enabled with D9125L1
Selftest menu
PINDA D codes
2017-11-16 20:51:50 +01:00
PavelSindler
5e4236dd2e selftest for axis improved (better code readibility) and no crash triggered 2017-11-16 18:02:11 +01:00
PavelSindler
2199c84ec9 wrapper function for selftest 2017-11-15 16:40:35 +01:00
PavelSindler
16a7adfe33 merging with upstream 2017-11-15 15:45:26 +01:00
PavelSindler
91d125369e keepalive messages initial version 2017-11-15 15:09:29 +01:00
PavelSindler
19d89b37b5
Merge pull request #83 from PavelSindler/lin_adv_fix
Lin adv. fix from MK2 fw
2017-11-15 11:53:39 +01:00
PavelSindler
457e4f61b9
Merge pull request #84 from PavelSindler/support_menu_fix
Support menu translated and fixes, snmm M600 long beep fix
2017-11-15 11:53:15 +01:00
PavelSindler
4630df6cf4 pause print fix for absolute mode, minor first layer cal. fix for snmm 2017-11-14 16:51:34 +01:00
PavelSindler
f209f698ac translations, cursor position changes 2017-11-14 16:16:02 +01:00
PavelSindler
9e2533ecdf Support menu translated and fixes, snmm M600 long beep fix 2017-11-14 16:10:10 +01:00
PavelSindler
4d9780a3c6 Merged lin adv. fix from MK2 2017-11-14 13:57:32 +01:00
XPila
dfe3541d2b
Merge branch 'MK3' into MK3 2017-11-13 18:48:19 +01:00
Robert Pelnar
01de834e0d SG_THR_X = 2, holding currents == running currents
Farm preheat menu
dcode D5 - read/write/erase FLASH
dcode D6 - bootloader update test (for new stk500-prusa)
_NO_ASM - MINGW simulator support
fixed bug - "Fil. sensor [on/off]" menu
Build number = 107
2017-11-13 18:45:11 +01:00
PavelSindler
ee5505887c First layer cal. corrections, translations to all languages for Wizard MK2 added 2017-11-13 17:43:14 +01:00
PavelSindler
eda0c6bd39 english version of xyz: place/remove steel sheet; wait for cooling down removed, 2017-11-13 17:09:26 +01:00
PavelSindler
5707f8b14e Merge remote-tracking branch 'upstream/MK3' into wizard 2017-11-13 14:39:14 +01:00
PavelSindler
fbbcc27f1a X max lowered to 250, XYZ/Z calibration: Z top coordinate changed, changes in xyz cal. because of stell sheet, still not final version 2017-11-12 11:30:06 +01:00
PavelSindler
a81d28664f axis selftest fixed 2017-11-08 14:25:31 +01:00
michalprusa
1e81861e0c Configuration files reordered and added build number 2017-11-07 23:54:06 +01:00
XPila
55325a5a32
Merge branch 'MK3' into MK3 2017-11-07 17:15:27 +01:00
PavelSindler
e88ac72cc8 missing messages added 2017-11-07 16:57:52 +01:00
PavelSindler
2e68770e62 initial version - messages missing (will not compile) 2017-11-07 16:49:04 +01:00
PavelSindler
67c76104a5 Configuration_prusa updated 2017-11-07 11:39:11 +01:00
PavelSindler
c36b7be90c SUPPORT_VERBOSITY initial version 2017-11-07 11:36:41 +01:00
PavelSindler
461675b806
Merge pull request #78 from PavelSindler/4point_xyz_cal
4point xyz cal.
2017-11-07 10:02:32 +01:00
michalprusa
967594edf0 Added G-CODE "PRUSA FAN" to report RPM of both fans 2017-11-03 20:27:52 +01:00
Robert Pelnar
877c8a3978 TMC2130 configuration in eeprom (not finished).
Extruder and Z holding currents same as running currents.
M600 filament unload speed = 3500 (PFW-22).
FSensor - algorithm changed (reset error couter instead of decrement)
build number = 106
2017-10-30 15:45:29 +01:00
PavelSindler
1ee6016fa0 Merge remote-tracking branch 'upstream/MK3' into 4point_xyz_cal 2017-10-30 11:48:45 +01:00
Robert Pelnar
bd7c3d08f3 Marlin_main - lineending CRLF -> LF 2017-10-27 17:07:02 +02:00
Robert Pelnar
0607086e14 Build number = 105 2017-10-27 16:38:12 +02:00
PavelSindler
c4d7b801b9 Initial version. XYZ cal works, but bed ref. points coordinates must be checked. 2017-10-27 16:12:37 +02:00
PavelSindler
d37c925bc0 Merge branch 'MK3' into print_fan_speed 2017-10-26 18:04:38 +02:00
PavelSindler
f4d5d891df measuring pulse width: initial version 2017-10-26 17:42:27 +02:00
Robert Pelnar
45d6baa757 setup second serial port only in case it is selected
build number = 104
2017-10-24 23:20:48 +02:00
Robert Pelnar
cddb0eafb8 PAT9125 - sampled only Y value, new debug code D9125.
FSensor - synchronous sampling and new algorithm
build number = 103
2017-10-24 19:45:15 +02:00
Robert Pelnar
8734961e0e M114 now reports also actual extruder position,
PAT9125 HWI2C (Wire) support,
fsensor implementation into separate file
build number = 102
2017-10-22 22:42:45 +02:00
michalprusa
1244b195f9 M119 now reports real values of hardware endstops, not SG status. 2017-10-18 18:04:42 +02:00
michalprusa
84bdc6c0e6 Merge remote-tracking branch 'origin/MK3' into MK3 2017-10-18 15:36:31 +02:00
Robert Pelnar
66c19b874d Extruder settings tunning (http://jira.prusa/projects/PFW/issues/PFW-5)
buildnumber increased to 101
2017-10-17 21:24:11 +02:00
Robert Pelnar
6a0f8752c3 Endless loop after calibration Z (http://jira.prusa/projects/PFW/issues/PFW-3?filter=allissues)
Buildnumber (http://jira.prusa/projects/PFW/issues/PFW-4?filter=allissues)
2017-10-17 21:05:31 +02:00
Robert Pelnar
cc9f03a46f Line endings to LF (./le.sh lf) 2017-10-03 13:01:59 +02:00
michalprusa
7cf0218737 Merge remote-tracking branch 'origin/MK3' into MK3 2017-09-27 21:34:37 +01:00
Robert Pelnar
cc469b4c51 changed configuration 2017-09-26 17:20:44 +02:00
michalprusa
0b88142253 Merge remote-tracking branch 'origin/MK3' into MK3 2017-09-26 14:48:32 +01:00
michalprusa
77debbc568 Fail stats moved to main menu to be easily accessible 2017-09-26 14:46:33 +01:00
michalprusa
c3585bc696 Automatic recovery typo fix
Failures statistics in eeprom
2017-09-26 14:14:17 +01:00
Robert Pelnar
ca33f7f60f PWM_GRAD back to 4 (trinamic suggested value), standstilltimeout = 1000 2017-09-26 13:07:25 +02:00
michalprusa
5ff28682be Automatic recovery after crash is detected 2017-09-26 11:48:46 +01:00
michalprusa
a4a90aa9ed Merge remote-tracking branch 'origin/MK3' into MK3 2017-09-26 11:37:39 +01:00