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

364 Commits

Author SHA1 Message Date
3d-gussner 8c690b68c1 Activated/new functions 
filament runout sensor activated
heated bed PID tuning added and changed cycles from 5 to 8
Minor translation changes
 2017-08-01 15:54:17 +02:00
3d-gussner 1cc5f5972b Merge remote-tracking branch 'refs/remotes/prusa3d/MK2' into MK2 
# Conflicts:
#	Firmware/Configuration.h
#	Firmware/ConfigurationStore.cpp
#	Firmware/Configuration_adv.h
#	Firmware/Marlin_main.cpp
#	Firmware/language_all.cpp
#	Firmware/language_all.h
#	Firmware/language_de.h
#	Firmware/language_en.h
#	Firmware/stepper.cpp
 2017-08-01 15:38:47 +02:00
PavelSindler 1acadcc31c Merge pull request #133 from Sebastianv650/MK2-LIN_ADV-PR 
Port from Marlin LIN_ADVANCE
 2017-08-01 10:20:13 +02:00
XPila 4c0a299a2a Merge pull request #155 from PavelSindler/MK2 
M110 fix from thess; fan kickstart; Farm mode: asking for color used, changed statistics
 2017-07-24 12:40:46 +02:00
PavelSindler fe44e60e5f version changed 2017-07-21 20:26:16 +02:00
PavelSindler b5039351be Merge pull request #151 from PavelSindler/MK2 
improved scrolling in SD card menu, storing to eeprom via M500 improved and uses different eeprom version for multi material
 2017-07-21 20:23:16 +02:00
PavelSindler 2a7c4f0926 Farm mode: when print finishes, ask which filament was used for print; statistics modified 2017-07-21 20:17:00 +02:00
PavelSindler 6bbbf3f88e removed redundant code 2017-07-21 17:39:36 +02:00
PavelSindler b3ff1fd947 M110 fix (PR #137 from thess) 2017-07-21 17:30:19 +02:00
PavelSindler c3fb6e43fd fan kickstart enabled 2017-07-21 16:51:36 +02:00
PavelSindler df342c646d dont show message that default settings are used if user has never run M500 2017-07-19 20:59:38 +02:00
PavelSindler f2d34d4cd9 changed multimaterial eeprom version 2017-07-19 17:05:36 +02:00
PavelSindler 63847b5b16 changed version 2017-07-19 17:00:15 +02:00
PavelSindler 625b8acc8e eeprom version for multimaterial changed, show message that hardcoded default settings were loaded during printer setup, improved scrolling in sd card menu 2017-07-19 16:59:53 +02:00
Sebastianv650 d1d3949717 Add SNMM functionality to LIN_ADVANCE 2017-07-16 15:41:27 +02:00
Sebastianv650 d5fba084e2 LIN_ADVANCE basic port from Marlin 
This integrates LIN_ADVANCE into the Prusa FW. Note that further checks or updates may be necessary for MM printing!
 2017-07-16 15:41:26 +02:00
3d-gussner 96c1e5961c Merge to 3.0.12 2017-07-11 23:21:15 +02:00
PavelSindler 0473b7e0db Merge pull request #143 from PavelSindler/MK2 
retrieve settings from eeprom changed for axis steps per unit, translated support menu, long beep in multi material color print fixed
 2017-07-11 17:05:28 +02:00
PavelSindler 2ace5fc827 tranlations of support menu, retrieving settings from eeprom changed to exclude E steps per unit 2017-07-11 16:28:43 +02:00
PavelSindler f89ba2c46a axis steps per unit excluded from M500, version changed 2017-07-10 17:30:47 +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
PavelSindler 2e57e48227 long beep in multimaterial colorprint fixed 2017-07-04 14:35:58 +02:00
Ted Hess 5611852e1b Fix/implement M110 command. Allow colons in command - don't treat as EOL. 2017-07-03 11:09:52 -04: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 1d561601c7 comments added 2017-06-29 13:32:17 +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