Commit Graph

5010 Commits

Author SHA1 Message Date
XPila
ce32c86c8b
Merge pull request #308 from XPila/MK3
Filament sensor not responding - (PFW-41)
2017-12-11 18:26:23 +01:00
Robert Pelnar
7204e91ec6 Filament sensor not responding - (PFW-41)
build number = 130
2017-12-11 18:17:25 +01:00
XPila
3dfeb31b46
Merge pull request #307 from XPila/MK3
Stealth mode limits + END_FILE_SECTION=10000
2017-12-11 16:18:24 +01:00
Robert Pelnar
124a3e6da8 Stealth mode limits + END_FILE_SECTION=10000 2017-12-11 16:17:36 +01:00
PavelSindler
5e018bc051
Merge pull request #306 from PavelSindler/sort_files
Sorting files
2017-12-11 11:55:40 +01:00
PavelSindler
92f6aa9c0e
Merge branch 'MK3' into sort_files 2017-12-11 11:55:22 +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
XPila
bad82452cc
Merge pull request #303 from XPila/MK3
Mk3
2017-12-11 00:04:27 +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
XPila
49bbb950ed
Merge pull request #302 from XPila/MK3
Stack monitor in stepper ISR
2017-12-10 20:41:44 +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
XPila
3b45d3de48
Merge pull request #300 from XPila/MK3
DISABLE_M42_M226 = +56 bytes RAM (because of stack overflow)
2017-12-09 19:32:00 +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
XPila
3aef37f6a0
Merge pull request #299 from XPila/MK3
Silent mode limits
2017-12-09 14:42:23 +01:00
Robert Pelnar
995801c967 Silent mode limits
+ cannot compile "END_FILE_SECTION"
2017-12-09 14:41:50 +01:00
XPila
6f810a9548
Merge pull request #298 from XPila/MK3
bug fix (cannot compile) - ultralcd.cpp - conversion from (const char*)
2017-12-08 19:22:26 +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
8a950d5972
Merge pull request #296 from PavelSindler/MK3_for_merging
Save filename to eeprom first, then check if file is complete
2017-12-07 17:26:46 +01:00
PavelSindler
d0b6b19373 save filename to eeprom first, then check if file is complete 2017-12-07 17:16:23 +01:00
PavelSindler
327273d12b
Merge pull request #295 from PavelSindler/power_panic
Power panic fix
2017-12-06 18:30:40 +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
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
PavelSindler
c5dd9dd654 gitignore 2017-12-02 00:19:47 +01:00
PavelSindler
707e9cb396 chages in power panic absolute mode 2017-12-01 14:26:08 +01:00
PavelSindler
06f7439dc1 changed version 2017-11-29 14:11:31 +01:00
PavelSindler
74441ce3a1 power panic in absolute mode fixed, but some e steps are probably missing 2017-11-29 14:05:47 +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