Commit Graph

561 Commits

Author SHA1 Message Date
Michal Průša
f1c741d027 Filament autoloading improved and minor tweaks
Filament autoloading now acts like normal loading (Error message pops out if nozzle too cold, Printer asks if should extrude more when done loading)

Autoloading now unable to turn on when filament sensor is turned off or not responding

Color not right changed to color not correct to avoid slight confusion
2017-12-28 18:59:57 +01:00
Michal Průša
ee1b7ee510
Merge pull request #355 from michalprusa/text-grooming
Text grooming
2017-12-28 16:00:56 +01:00
Michal Průša
26255766f6 Translation fix
on -> zap
off -> vyp
2017-12-28 15:55:16 +01:00
Michal Průša
5e5588c72c Text grooming
Added language mutations of error messages, menu items.
Synced wording of crash detection in messages.
rPi port -> RPi port.
Minor menu items alignment.
2017-12-28 15:45:52 +01:00
XPila
a7bc1688e5
Merge pull request #353 from XPila/MK3
Mk3
2017-12-28 02:59:04 +01:00
Robert Pelnar
bd58718d9d dummy "ok" response
build 139 (RC4)
2017-12-28 02:45:05 +01:00
Robert Pelnar
bd0b4da3b7 Merge remote-tracking branch 'upstream/MK3' into MK3 2017-12-28 01:40:23 +01:00
Robert Pelnar
e064133a04 Merge remote-tracking branch 'upstream/MK3' into MK3
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-12-28 01:37:13 +01:00
XPila
e00ac9566e
Merge pull request #351 from michalprusa/Unload-fix
Filament unload slightly tweaked
2017-12-28 01:32:22 +01:00
XPila
7afda54912
Merge branch 'MK3' into Unload-fix 2017-12-28 01:32:09 +01:00
XPila
9158bde378
Merge branch 'MK3' into Unload-fix 2017-12-28 01:31:23 +01:00
XPila
996449dc0c
Merge pull request #349 from michalprusa/rPi-port
2nd USART -> rPi port
2017-12-28 01:29:37 +01:00
Michal Průša
0987771d3b Language corrections for colour not clear and M600 tune
Color not clear is not a thing anymore, message was reformed to make more sense. M600 now has improved unloading too.
2017-12-27 23:31:49 +01:00
Michal Průša
e495d5cc01 Filament unload slightly tweaked
Filament unload has now 3 sections:
1) Fast long retract to cut strings
2) Slow short retract to cool down the tip
3) Fast short retract to get past pulley quicly to prevent forming of plug
2017-12-27 22:31:39 +01:00
Robert Pelnar
69d496e157 autoload filament menu (PFW-95, PFW-96) 2017-12-27 21:57:51 +01:00
XPila
cf1e5bed4d
Merge pull request #350 from XPila/MK3
Mk3
2017-12-27 21:43:30 +01:00
Robert Pelnar
cbd7f033e8 crashdetection and mode menu (PFW-85, PFW-97) 2017-12-27 21:43:04 +01:00
Robert Pelnar
546314fda7 Removed debug messages from serial comunication (octoprint...).
build 137b
2017-12-27 20:29:24 +01:00
Michal Průša
763bbc2531 2nd USART -> rPi port 2017-12-27 19:41:58 +01:00
Robert Pelnar
f9d5619682 MINTEMP safety for ambient temperature < 18C
Silent mode acceleration limit lowered to 1000mm/s^2
2017-12-27 18:20:04 +01:00
XPila
527b870700
Merge pull request #344 from XPila/MK3
Mk3
2017-12-23 03:45:33 +01:00
Robert Pelnar
a09dee7aea build 138 (RC3) 2017-12-23 03:44:47 +01:00
Robert Pelnar
23ed33fc21 disable crashdetection while usb printing 2017-12-23 03:42:19 +01:00
Robert Pelnar
8739b4a610 MINTEMP fix 2017-12-23 03:36:08 +01:00
Robert Pelnar
1a69c979bf Increase Z current (PFW-90). 2017-12-23 01:01:57 +01:00
PavelSindler
8f7a50cfcd
Merge pull request #343 from PavelSindler/m110_fix
M110 fix
2017-12-23 00:04:11 +01:00
PavelSindler
e8477b525c initial version of M110 fix (port from MK2) 2017-12-22 22:34:57 +01:00
XPila
257b8e9f59
Merge pull request #342 from XPila/MK3
Mk3 - RC3
2017-12-22 20:35:15 +01:00
Robert Pelnar
c4b045083c Extrude mintemp increased to 190C 2017-12-22 20:34:24 +01:00
Robert Pelnar
7f05b9fd44 changed menu order (PFW 91) 2017-12-22 20:31:45 +01:00
Robert Pelnar
6abba7bfe9 filament autoload - better detection algorithm, autoload in M600 from menu
unload menu always visible
2017-12-22 20:14:26 +01:00
PavelSindler
bf6fbdd44d
Merge pull request #341 from PavelSindler/resend
Resend always contains OK
2017-12-22 19:24:00 +01:00
PavelSindler
7114772784 whitespace 2017-12-22 19:23:11 +01:00
PavelSindler
3aca1271ed serial resend request always contains OK 2017-12-22 18:54:55 +01:00
PavelSindler
6f7a2ba263
Merge pull request #340 from PavelSindler/MK3_for_merging
removed some serial line error messages
2017-12-22 13:35:33 +01:00
PavelSindler
1917b6a1d7 removed some serial line error messages which caused that octoprint changed status 2017-12-22 13:27:04 +01:00
PavelSindler
33d715616f
Merge pull request #339 from PavelSindler/MK3_for_merging
setup function
2017-12-21 13:42:22 +01:00
PavelSindler
71bb4022dc setup function 2017-12-21 13:40:16 +01:00
XPila
18e662bd7c
Merge pull request #338 from XPila/MK3
LCD_PWM removed (will be solved other way)
2017-12-21 01:04:08 +01:00
Robert Pelnar
3ddbac6056 LCD_PWM removed (will be solved other way) 2017-12-21 01:00:49 +01:00
PavelSindler
bb6c8703e8
Merge pull request #335 from XPila/MK3
Mk3
2017-12-21 00:08:59 +01:00
PavelSindler
0e447c34de
Merge branch 'MK3' into MK3 2017-12-21 00:08:46 +01:00
PavelSindler
f227952c0b
Merge branch 'MK3' into MK3 2017-12-21 00:07:01 +01:00
PavelSindler
7d163887e7
Merge pull request #337 from PavelSindler/wizard
selftest fix
2017-12-21 00:04:31 +01:00
PavelSindler
b8fd058749 selftest fix 2017-12-21 00:03:41 +01:00
PavelSindler
6671b33d99
Merge pull request #336 from PavelSindler/wizard
Wizard and selftest improvements
2017-12-20 23:42:50 +01:00
PavelSindler
17d9bb205a selftest tests filament sensor, selftest messages have language variants 2017-12-20 23:40:18 +01:00
Robert Pelnar
eba2924fdd Remove load/unload menu when autoload enabled 2017-12-20 22:55:11 +01:00
Robert Pelnar
a3a0e70eeb Fsensor autoload enabled menu and eeprom variable 2017-12-20 22:29:41 +01:00
Robert Pelnar
c88938e813 Fixed blocked lcd buttons
build = 137y
2017-12-20 21:33:07 +01:00