Commit Graph

426 Commits

Author SHA1 Message Date
PavelSindler
071873b38a init; last merged file: Marlin_main.cpp 2017-12-06 17:48:16 +01:00
PavelSindler
cdb193495d
Merge pull request #294 from PavelSindler/file_check
incomplete file check port from MK2:
2017-12-06 15:04:27 +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
f509fa740f
Merge pull request #291 from PavelSindler/MK3_for_merging
build number changed
2017-12-05 17:13:55 +01:00
PavelSindler
bc0278c6e1 build number changed 2017-12-05 17:13:07 +01:00
PavelSindler
f717f52afa
Merge pull request #290 from PavelSindler/xyz_cal_fix
xyz cal.: reset watchdog during LS optimization method
2017-12-05 13:50:47 +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
eb2232ba73
Merge pull request #289 from PavelSindler/MK3_for_merging
arduino addons
2017-12-02 22:25:51 +01:00
PavelSindler
99cf2fa87c arduino addons added 2017-12-02 22:21:49 +01:00
PavelSindler
9c7a4e4882
Merge pull request #288 from PavelSindler/MK3_for_merging
Merging MK3 from dev repository
2017-12-02 22:10:13 +01:00
PavelSindler
22065e4877 merging from dev/MK3 2017-12-02 21:56:39 +01:00
XPila
26cdb75cf7
Merge pull request #119 from XPila/MK3
Mk3
2017-11-29 03:11:12 +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
XPila
b488345681
Merge pull request #118 from XPila/MK3
pat9125 reinit when fsensor enabled from menu.
2017-11-28 22:45:42 +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
aa6c62740e
Merge pull request #116 from PavelSindler/MK3
changed build
2017-11-27 20:30:38 +01:00
PavelSindler
2cf7f54e5f changed build 2017-11-27 20:29:47 +01:00
PavelSindler
6efef3a7ce
Merge pull request #115 from PavelSindler/MK3
translation to Czech language added
2017-11-27 18:55:25 +01:00
PavelSindler
3f7be78997 translation to Czech language added 2017-11-27 18:54:44 +01:00
PavelSindler
f8f32b605d
Merge pull request #114 from PavelSindler/MK3
EINY -> EINSY
2017-11-27 18:48:31 +01:00
PavelSindler
bd748bc986 EINY -> EINSY 2017-11-27 18:47:48 +01:00
PavelSindler
016fa409eb
Merge pull request #113 from PavelSindler/wizard
dont show temp cal message, dont save uvlo flag to eeprom if printing…
2017-11-27 18:31:22 +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
XPila
3fd8b6ef1b
Merge pull request #111 from XPila/MK3
filament unload - initial
2017-11-27 16:24:32 +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
XPila
65bda580da
Merge pull request #110 from XPila/MK3
Mk3
2017-11-27 14:46:20 +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
XPila
5781b8e523
Merge pull request #109 from XPila/MK3
PINDA calibration and precalibrated characteristics.
2017-11-27 07:12:08 +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