3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
736 Commits 3 Branches 78 Tags 40 MiB
a6f900fd3c
Commit Graph

736 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Pelnar
a6f900fd3c Merge remote-tracking branch 'upstream/MK25' into MK25 
# 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.
 2018-03-06 15:11:50 +01:00
Robert Pelnar
49832d4d3b Safety timer (disable heaters after 15min idle) 2018-02-22 16:46:17 +01:00
PavelSindler
03a1bef4ee
Merge pull request #489 from PavelSindler/xyz_corrections_3 
typo fixed
 2018-02-22 13:41:22 +01:00
PavelSindler
819f2fd2b3 typo fixed 2018-02-22 13:40:31 +01:00
XPila
30bb84a7a7
Merge pull request #487 from PavelSindler/eeprom_printer_versions 
Eeprom hw versions
 2018-02-22 11:48:26 +01:00
XPila
ad33d3efd1
Merge pull request #488 from PavelSindler/xyz_corrections_3 
Xyz corrections
 2018-02-22 11:48:06 +01:00
PavelSindler
edc6366df2
Merge pull request #479 from PavelSindler/z_cal_fix 
x_max_pos correction
 2018-02-22 10:47:24 +01:00
PavelSindler
7a31fc5b6e
Merge pull request #486 from XPila/MK25 
Pinout, conditional translation and variant file for MK2
 2018-02-22 10:45:56 +01:00
PavelSindler
90e00b56a5 some defines moved to another position 2018-02-22 10:42:02 +01:00
PavelSindler
a4b3389dfa M45 verbosity, steel sheet define, minor modifications in xyz cal 2018-02-22 10:38:46 +01:00
PavelSindler
0fb471f528 whitespace 2018-02-22 00:11:17 +01:00
PavelSindler
0323af531d printer types and motherboard types added to eeprom; min extrude temp lowered because of woodfil 2018-02-22 00:09:12 +01:00
Robert Pelnar
c5175e97ec Pinout, conditional translation and variant file for MK2 2018-02-21 15:19:34 +01:00
PavelSindler
74f6bbfa6b
Merge pull request #480 from PavelSindler/xyz_v2 
calibration points/offset corrections
 2018-02-19 11:39:47 +01:00
PavelSindler
43b8b125bc calibration points/offset corrections 2018-02-19 11:38:52 +01:00
PavelSindler
4457961d40 x_max_pos 2018-02-19 01:03:13 +01:00
PavelSindler
08c59419da
Merge pull request #468 from PavelSindler/M600_currents 
M600 unload current
 2018-02-12 09:41:13 +01:00
PavelSindler
6fb7f22555
Merge pull request #472 from XPila/MK25 
Mk25
 2018-02-12 09:40:51 +01:00
Robert Pelnar
081b3852fc Menu - encoder position stack 2018-02-09 20:26:42 +01:00
Robert Pelnar
31e6271b2c Voltage measurement - conditional translation 2018-02-08 21:07:17 +01:00
PavelSindler
af48be7653
Merge pull request #469 from XPila/MK25 
fix - conditional translation for DEBUG build
 2018-02-08 18:59:05 +01:00
Robert Pelnar
b08636c554 fix - conditional translation for DEBUG build 2018-02-08 18:56:15 +01:00
PavelSindler
80f353e8ff Z_MAX_POS 2018-02-08 16:52:05 +01:00
PavelSindler
a719ae1b01 whitespace 2018-02-08 16:33:43 +01:00
PavelSindler
ebe1c10423 lower current for unload 2018-02-08 16:32:27 +01:00
PavelSindler
9c4ce3623d M600 unload current 2018-02-08 16:11:51 +01:00
XPila
37f138ed3a
Merge pull request #465 from PavelSindler/selftest_for_MK25 
MK2.5: last changes from MK3 branch ported, selftest: initial version, max endstops not used
 2018-02-07 11:12:28 +01:00
PavelSindler
29978c4126 TACH_1 must be defined to enable print fan error 2018-02-07 11:10:04 +01:00
PavelSindler
b202f2b297 version changed 2018-02-06 17:04:35 +01:00
PavelSindler
0c98ec5f6b selftest, max endstops undefined, initialization of extruder fan, y offset from extruder 2018-02-06 17:01:09 +01:00
PavelSindler
abf956b86f init 2018-02-06 09:19:27 +01:00
PavelSindler
df754a322b MK25 merge Xpila's changes 2018-02-06 08:33:26 +01:00
PavelSindler
16a685e618
Merge pull request #454 from XPila/MK25 
Mk25
 2018-02-06 08:27:24 +01:00
PavelSindler
a58767271b
Merge pull request #462 from PavelSindler/eeprom_version_change_fix 
erase eeprom section which belongs to M500 gcode in case that version…
 2018-02-05 16:58:47 +01:00
PavelSindler
33aa3d5e7d commint nr 2018-02-05 16:56:31 +01:00
PavelSindler
3bd892135a erase eeprom section which belongs to M500 gcode in case that version was changed and default settings are used 2018-02-05 16:49:06 +01:00
PavelSindler
8375e2cee3
Merge pull request #456 from PavelSindler/MK3_for_merging 
version changed
 2018-02-02 18:13:45 +01:00
PavelSindler
36536044f4 version changed 2018-02-02 17:48:02 +01:00
PavelSindler
c0d0c12eea
Merge pull request #455 from XPila/MK3 
bugfix - failstats (total counters) reset to zero for empty eeprom (0…
 2018-02-02 16:18:36 +01:00
Robert Pelnar
4d8807e924 bugfix - failstats (total counters) reset to zero for empty eeprom (0xff) 2018-02-02 15:59:37 +01:00
XPila
6ba52e33d3
Merge pull request #453 from PavelSindler/fw_version_check 
Fw version check and M600 filament unload current
 2018-02-01 20:35:37 +01:00
PavelSindler
2dd2c971e2 whitespace 2018-02-01 20:25:19 +01:00
PavelSindler
84f7d057f3 fw version check: FW_VERSION string is case insensitive (parsing RC works) 2018-02-01 20:23:45 +01:00
Robert Pelnar
8216b7777f hex files for MK2.5 and MK3 
Configuration_prusa.h for MK2.5
 2018-02-01 20:15:15 +01:00
Robert Pelnar
586c1d2cdb deleted hex files 2018-02-01 20:10:49 +01:00
Robert Pelnar
8562235440 MK2.5 port - compilable version 2018-02-01 20:08:11 +01:00
PavelSindler
d92f6292aa unload with lowered current 2018-02-01 17:43:03 +01:00
Robert Pelnar
f40b8a2186 MK3 configuration files, renamed EINY to EINSY 2018-02-01 17:10:41 +01:00
Robert Pelnar
f46d36a1d4 removed unused files (pins, variants) 2018-02-01 16:39:56 +01:00
PavelSindler
a256a8ff19
Merge pull request #450 from XPila/3.1.1-RC6 
filament sensor additional check after runout (3mm back, 3mm forward …
 2018-02-01 12:20:59 +01:00