josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
344 Commits 31 Branches 140 Tags 71 MiB
Commit Graph

344 Commits

Author SHA1 Message Date
3d-gussner a7b77a3259 Roll back paus print function 2017-07-11 23:58:49 +02:00
3d-gussner e55a1cdd9f Roll back to 3.0.12 DENL... 
...-250k_baud-FR_SENS_24-PID_BED
 2017-07-11 23:30:39 +02:00
3d-gussner 96c1e5961c Merge to 3.0.12 2017-07-11 23:21:15 +02:00
3d-gussner 64357d8909 Merge branch 'MK2' of https://github.com/3d-gussner/Prusa-Firmware into MK2 2017-07-06 12:31:13 +02:00
3d-gussner 5720e3ad08 no hex files here 2017-07-06 12:27:30 +02:00
3d-gussner 0846e2b639 no hex files here 2017-07-06 12:27:17 +02:00
3d-gussner e8cbfd8cee Moved Print pause menu under support... 2017-07-06 12:25:50 +02:00
3d-gussner 1924266143 Merge remote-tracking branch 'refs/remotes/prusa3d/MK2' into MK2 
# Conflicts:
#	Firmware/Marlin.h
#	Firmware/Marlin_main.cpp
#	Firmware/language_all.cpp
#	Firmware/language_de.h
#	Firmware/language_en.h
#	Firmware/language_it.h
#	Firmware/mesh_bed_calibration.cpp
#	Firmware/mesh_bed_calibration.h
#	Firmware/ultralcd.cpp
 2017-07-06 10:31:28 +02:00
3d-gussner 89beaf479a minor change 2017-07-02 21:53:34 +02:00
3d-gussner f0c36f1701 LIN_ADV 2017-07-02 21:53:08 +02:00
PavelSindler b3eeac124a Merge pull request #131 from PavelSindler/MK2 
changed xyz details menu
 2017-06-23 13:15:41 +02:00
PavelSindler 5e63c5ed85 changed xyz details menu 2017-06-23 13:14:06 +02:00
PavelSindler 4d0e5428fb Merge pull request #128 from PavelSindler/MK2 
xyz details menu hidden for MK1
 2017-06-22 14:03:03 +02:00
PavelSindler ebef1a8e7b xyz details menu hidden for MK1 2017-06-22 14:00:05 +02:00
PavelSindler 321cace5e7 Merge pull request #127 from XPila/MK2 
MK1 backport - rename configuration files + version for RAMBo10a
 2017-06-22 13:20:33 +02:00
Robert Pelnar e2e358c9a3 MK1 backport - rename configuration files + version for RAMBo10a 2017-06-22 13:14:18 +02:00
PavelSindler 50d1edee3d Merge pull request #125 from XPila/MK2 
MK1 backport
 2017-06-22 11:51:20 +02:00
XPila 01d21c3e14 Merge pull request #122 from PavelSindler/MK2 
Multimaterial stop print extended, selftest fixed, XYZ cal. improved, unload filament reverted
 2017-06-22 11:49:05 +02:00
PavelSindler 05bfa39df1 shifting cursor position for printing "mm" in xyz details menu 2017-06-21 16:50:49 +02:00
PavelSindler 247e1bc1e3 change extruder messages translations 2017-06-21 14:29:39 +02:00
PavelSindler 1eeb960f44 Xyz details added to support menu 2017-06-20 18:16:07 +02:00
Robert Pelnar 5f3647abe5 MK1 backport 
configuration file variants/1_75mm-RAMBo13a-E3Dv6full.h
disabled Mesh Bed Leveling
disabled MK2-specific items in Calibration menu
 2017-06-20 15:22:52 +02:00
PavelSindler 0b75c88e9b firmware version changed 2017-06-19 17:06:50 +02:00
PavelSindler db11abf5e5 T? code initial version 2017-06-19 16:26:08 +02:00
PavelSindler d74c029327 LF line endings 2017-06-16 11:10:22 +02:00
PavelSindler 5e7952b6c9 line ending script added 2017-06-16 11:04:45 +02:00
PavelSindler 362d7ba833 unload filament reverted 2017-06-16 10:51:07 +02:00
PavelSindler 2be567c0d3 snmm: stop print menu messages updated 2017-06-15 15:16:15 +02:00
PavelSindler fae1bbae7f snmm: stop print menu messages translated 2017-06-15 15:15:37 +02:00
PavelSindler 6af95141f5 xyz calibation improvements: user is informed that front point is not reachable during first cal. phase, more info on serial, arithmetic mean used over iterations, initial points position changed for second ant third iteration 2017-06-15 14:43:28 +02:00
PavelSindler 7005c6d685 selftest for heater/heatbed thermistor updated (prolonged heating times, changed target temperature for heater) 2017-06-06 10:51:01 +02:00
PavelSindler 0c4b5795fa G4: in case that there is no dwell time set, "Sleep..." message is not printed on LCD 2017-06-05 10:22:02 +02:00
PavelSindler d40bc8e175 Merge pull request #117 from XPila/patch-1 
Line ending management script
 2017-06-02 15:46:24 +02:00
XPila ef74ab8878 Line ending management script 2017-06-01 16:35:52 +02:00
PavelSindler 1e734d361a selftest static memory error fixed; snmm: updated stop print messages 2017-05-31 17:52:00 +02:00
PavelSindler 34247972f5 fw version changed 2017-05-30 15:29:05 +02:00
PavelSindler 11a86a6a9a snmm: M702 (unload filament) extended, snmm stop print: user is asked which filaments to unload 2017-05-30 15:23:54 +02:00
PavelSindler bc61622d21 snmm: stop print unloads only used filaments, disable steppers (M84) resets used filaments 2017-05-29 17:35:45 +02:00
PavelSindler 024a50d2dc Merge pull request #113 from PavelSindler/MK2 
M117 fixed
 2017-05-26 14:12:07 +02:00
PavelSindler 36091dcde4 M117 command fixed to be able to print strings without restrictions 2017-05-26 14:10:50 +02:00
PavelSindler 86e4056680 removed unused gcode description 2017-05-23 15:06:32 +02:00
PavelSindler e331d7d569 Merge pull request #106 from PavelSindler/MK2 
changed printer revision displayed in support menu for multimaterial
 2017-05-22 14:37:46 +02:00
PavelSindler 536e3e8b9f changed printer revision displayed in support menu for multimaterial 2017-05-22 13:14:11 +02:00
PavelSindler 8dbe6afb69 Merge pull request #105 from PavelSindler/MK2 
modified langtool.pl to include avr/pgmspace.h to language_all
 2017-05-22 11:55:27 +02:00
PavelSindler baeeb733e9 modified palgtool.pl to include avr/pgmspace.h to language_all 2017-05-22 11:52:35 +02:00
PavelSindler 5d2e7fe97b Merge pull request #104 from PavelSindler/MK2 
added config files for multi material, changed fw version
 2017-05-22 10:26:51 +02:00
PavelSindler c2615d0038 added config files for multi material 2017-05-22 10:13:57 +02:00
PavelSindler e8440f8085 changed version 2017-05-22 01:47:50 +02:00
3d-gussner 9c201c4dd6 Split LIN_ADVANCE from TMC2103 support 
Check:
https://github.com/prusa3d/Prusa-Firmware/pull/93
and
https://github.com/madhunm/Prusa-Firmware/tree/MK2/Firmware
 2017-05-20 17:41:50 +02:00
3d-gussner 202f2351f9 Merge remote-tracking branch 'refs/remotes/prusa3d/MK2' into MK2 
# Conflicts:
#	Firmware/language_all.cpp
#	Firmware/language_en.h
 2017-05-20 11:13:35 +02:00