Commit Graph

497 Commits

Author SHA1 Message Date
3d-gussner b600f8fe9c Hyperfine, Filament Runout Sensor, some fixes...
and preparing for multiple hex files depending on needed languages part2
2017-10-14 12:14:03 +02:00
3d-gussner 730f6a0d10 Hyperfine, Filament Runout Sensor, some fixes...
and preparing for multiple hex files depending on needed languages
2017-10-14 12:13:18 +02:00
3d-gussner b18035a517 Updated patch from Thess and minor changes 2017-10-12 11:56:35 +02:00
3d-gussner 3c2ef71730 Update variants 2017-10-12 09:58:46 +02:00
3d-gussner a593224aec Update langtool_all.h/.cpp and some fixes 2017-10-12 09:58:08 +02:00
3d-gussner ce69e1c915 Delete 2017-10-12 09:53:19 +02:00
3d-gussner 3015066afe Delete 2017-10-12 09:53:07 +02:00
3d-gussner 7662240b34 Delete 2017-10-12 09:52:57 +02:00
3d-gussner 8109b4183c Delete 2017-10-12 09:52:48 +02:00
3d-gussner c1d393e50a Delete 2017-10-12 09:52:38 +02:00
3d-gussner d48688020e Delete 2017-10-12 09:52:25 +02:00
3d-gussner 36a82fcd69 Delete 2017-10-12 09:52:12 +02:00
3d-gussner a59a07c93c Delete 2017-10-12 09:52:01 +02:00
3d-gussner 1892ef752f Delete 2017-10-12 09:51:47 +02:00
3d-gussner f9b60af6e1 Delete 2017-10-12 09:51:20 +02:00
3d-gussner e14ab70368 Delete 2017-10-12 09:51:08 +02:00
3d-gussner 2727e16c61 Delete 2017-10-12 09:49:25 +02:00
3d-gussner 59516848eb Delete 2017-10-12 09:49:08 +02:00
3d-gussner 6d6fa71cd9 Update language_all.h/.cpp and some minor fixes 2017-10-12 09:48:25 +02:00
3d-gussner c7a97efe66 Merge pull request #22 from 3d-gussner/MK2-Hyperfine
Mk2 hyperfine
2017-10-10 14:10:04 +02:00
3d-gussner 50d23b6592 Merge branch 'MK2-ALL_IN_ONE' into MK2-Hyperfine 2017-10-10 14:03:30 +02:00
3d-gussner 21b11b9cee Merge pull request #21 from 3d-gussner/MK2-PLA_1st
Merge remote-tracking branch 'refs/remotes/prusa3d/MK2' into MK2-PLA_1st
2017-10-10 13:39:46 +02:00
3d-gussner 5f17028250 Merge pull request #20 from 3d-gussner/MK2
FW 3.1.0-RC1 with warning cleanup
2017-10-08 10:23:02 +02:00
3d-gussner d2f7a8e06c Merge branch 'MK2-Hyperfine' into MK2 2017-10-08 10:22:47 +02:00
3d-gussner 67bea348f7 Thess warning cleanup 2017-10-08 10:11:48 +02:00
3d-gussner a74d445cfa Default EN 2017-10-05 00:21:32 +02:00
3d-gussner 20fb567826 Merge remote-tracking branch 'upstream/MK2' into MK2 2017-10-05 00:20:01 +02:00
PavelSindler 2a22fa9fa9 Merge pull request #217 from PavelSindler/v2_cal
First layer calibration: print small rectangular in the end of calibration
2017-10-04 21:04:19 +02:00
PavelSindler 4297d90309 version changed 2017-10-04 20:54:17 +02:00
PavelSindler e8c4677506 rectangular object enlarged, counting E improved 2017-10-04 14:48:16 +02:00
3d-gussner 5d2c256b07 Merge to 3.0.12-9 part 2 2017-10-04 10:38:08 +02:00
3d-gussner 1b4f4654e1 Merge to 3.0.12-9 2017-10-04 10:36:28 +02:00
3d-gussner 2b9b639b6f Minor translation/typos and missed MSGs 2017-10-04 09:58:50 +02:00
3d-gussner 558c1b8546 Minor translation and typos changes 2017-10-04 09:31:18 +02:00
3d-gussner 88aa808e46 Merge remote-tracking branch 'origin/MK2' into MK2
# Conflicts:
#	Firmware/variants/1_75mm_MK1-RAMBo10a-E3Dv6full.h
#	Firmware/variants/1_75mm_MK1-RAMBo13a-E3Dv6full.h
#	Firmware/variants/1_75mm_MK2-MultiMaterial-RAMBo10a-E3Dv6full.h
#	Firmware/variants/1_75mm_MK2-MultiMaterial-RAMBo13a-E3Dv6full.h
#	Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h
#	Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h
2017-10-04 09:19:50 +02:00
3d-gussner fe11d4f027 Modified MGS(length=xx, lines=y) to get rid of...
warnings and errors running langtool.pl
2017-10-04 09:13:57 +02:00
3d-gussner da7be0c0ee Merge to 3.0.12-9 2017-10-04 02:41:32 +02:00
3d-gussner ea6eb4d30c Merge to 3.0.12-9 and
modify languange_en.h to get rid of warnings. Translation of new MSGs to German.
2017-10-04 02:40:54 +02:00
PavelSindler 6b7866b7be small rectangular added to first layer calibration 2017-10-04 02:37:46 +02:00
3d-gussner bf07279568 Merge remote-tracking branch 'upstream/MK2' into MK2 2017-10-04 01:04:22 +02:00
PavelSindler 6eaedec288 Merge pull request #216 from PavelSindler/MK2
added defines for auto power
2017-10-04 00:50:50 +02:00
PavelSindler 3e3102ad74 added defines for auto power 2017-10-04 00:49:46 +02:00
PavelSindler ff2fa67adc init 2017-10-04 00:43:17 +02:00
PavelSindler 7306e08471 Merge pull request #215 from PavelSindler/sorting
Sorting files improvements
2017-10-03 23:30:53 +02:00
PavelSindler 7bf30eb8dc changed version 2017-10-03 23:28:36 +02:00
PavelSindler fa815e2953 Merge pull request #208 from PavelSindler/MK2
pause print resume fix for extruder in absolute mode
2017-10-03 23:27:02 +02:00
PavelSindler 426483b6b9 Merge pull request #206 from PavelSindler/auto_power
Auto power mode
2017-10-03 23:26:12 +02:00
PavelSindler a280447610 improved progress bar, use bubble sort, sort switch moved to settings menu, manage heater, host keepalive messages, timeout prolonged, setup screen improved 2017-10-03 23:16:06 +02:00
PavelSindler 5a35212231 quicksort 2017-10-02 03:59:41 +02:00
3d-gussner 6aca8e8c00 Merge branch 'MK2-DE' into MK2 2017-09-29 17:42:13 +02:00