Scott Lahteine
ab1ddcd89d
Merge pull request #1425 from clefranc/Development
EEPROM data not aligned
пре 9 година
clefranc
d55c62bf9f
Update ConfigurationStore.cpp
Moved #endif to allow filament settings to print.
пре 9 година
clefranc
e779641c73
Update ConfigurationStore.cpp
Added PIDTEMP dummy write to align EEPROM read/write operation.
пре 9 година
Scott Lahteine
baac6e242d
Merge pull request #1419 from AnHardt/bootsplash
repair Bootsplash
пре 9 година
Scott Lahteine
a425111eb7
Merge pull request #1421 from blubbfish/patch-2
Fixing the language files for the 4th extruder
пре 9 година
AnHardt
75cf302da3
example configurations changed to meet Configuration.h
пре 9 година
Philip Schell
61fd45a0c2
Add 4th extruder
пре 9 година
Philip Schell
2650be4921
Add 4th extruder
пре 9 година
Philip Schell
a9763d894e
Add 4th extruder
пре 9 година
Philip Schell
4949088302
Add 4th extruder
пре 9 година
Philip Schell
fc5204bd42
Add 4th extruder
пре 9 година
Philip Schell
9834818ef7
Add 4th extruder
пре 9 година
Philip Schell
8696963154
Add 4th extruder
пре 9 година
Philip Schell
ee8a7419f4
Add 4th extruder
пре 9 година
Philip Schell
e18403235d
Add 4th extruder
пре 9 година
Philip Schell
7baee555f4
Add 4th extruder
пре 9 година
Philip Schell
cebc7daf2a
Add 4th extruder
пре 9 година
Philip Schell
ef4c7abb21
Update language_es.h
Add 4th extruder
пре 9 година
Philip Schell
22e591518a
Update language_de.h
Add 4th extruder
пре 9 година
Philip Schell
a20c35bb38
Update language_ca.h
Add 4th extruder
пре 9 година
AnHardt
aa48056c03
Made centering of bootlogo work and removed contraproductiv setScale2x2() in dogm_lcd_implementation.h
пре 9 година
AnHardt
0d219b3e14
Make centering of STRING_SPLASH work
пре 9 година
AnHardt
59315330dd
Remove definition of VERSION_STRING and replace where usend with STRING_VERSION
пре 9 година
AnHardt
8c792c7b22
Make STRING_VERSION and VERSION_STRING the same
пре 9 година
Scott Lahteine
865ca0ef04
Merge pull request #1405 from MagoKimbra/4th-extruders
All the additions look proper. I can't think of any other extruder-count-related items that you might have missed. So, with some optimism, I will merge this for testing.
пре 9 година
MagoKimbra
3021f7f743
Fix PID_dT
Add PID_dT in temeprature.cpp
пре 9 година
Scott Lahteine
415d95a298
Merge pull request #1401 from thinkyhead/issue_1379_printrboard_lcd
Proposed fix to #1379 . Printrboard I2C LCD support
пре 9 година
Scott Lahteine
a7b02975b7
No TEMP1 or TEMP2 pins for TEENSYLU || PRINTRBOARD
Pins 2 and 3 are probably general-use pins, since the filament sensor
uses pin 2.
пре 9 година
Scott Lahteine
3ec0f7cfc0
Merge branch 'issue_1379_printrboard_lcd' of https://github.com/thinkyhead/Marlin into issue_1379_printrboard_lcd
Diverged from origin
пре 9 година
Scott Lahteine
6723388f7f
Proposed fix to #1379 . Printrboard I2C LCD support
пре 9 година
MagoKimbra
ef5959a705
Fix Temperature
Githun insert this line when i merge with actual Branch development...
пре 9 година
MagoKimbra
3d4ee6c868
Merge branch '4th-extruders' of https://github.com/MagoKimbra/Marlin into 4th-extruders
Conflicts:
Marlin/temperature.cpp
пре 9 година
MagoKimbra
986e723eeb
Add 4th extruder
пре 9 година
Scott Lahteine
9552e59306
Merge pull request #1402 from thinkyhead/issue_1227_max6675_spi
Borrow from Ultimaker to fix MAX6675 SPI conflict
пре 9 година
Scott Lahteine
49765fc75d
Merge branch 'issue_1227_max6675_spi' of https://github.com/thinkyhead/Marlin into issue_1227_max6675_spi
Branches diverged
пре 9 година
Scott Lahteine
f16bdd2ff2
Borrow from Ultimaker to fix MAX6675 SPI conflict
Changes to temperature.cpp from Ultimaker fork, intended to address
#1226 and #1227
пре 9 година
Scott Lahteine
23fcd1ecb2
Merge pull request #1407 from thinkyhead/cleanup_marlinserial
Formatting cleanup of quiet sources
пре 9 година
Scott Lahteine
fd78902194
Formatting cleanup of quiet sources
пре 9 година
Scott Lahteine
5c1814383a
Merge pull request #1390 from floyd871/Development
Show Custom M_Code for Z-Probe Offset when entering M503
пре 9 година
MagoKimbra
0ebf896070
Add 4th extruder
пре 9 година
Michael Neumann
a9d7ab9530
Update ConfigurationStore.cpp
Done
пре 9 година
Scott Lahteine
a244bcb953
Merge pull request #1403 from thinkyhead/issue_1356
Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET
пре 9 година
Scott Lahteine
3a9a3e5ed8
Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET
This define is not used.
пре 9 година
Scott Lahteine
e770489f27
Borrow from Ultimaker to fix MAX6675 SPI conflict
Changes to temperature.cpp from Ultimaker fork, intended to address
#1226 and #1227
пре 9 година
Scott Lahteine
54d5b52a2e
Merge pull request #1399 from beanz/use-bed-defines-not-extruder-ones
Code wont compile with extruder but without bed runaway protection defined.
пре 9 година
Mark Hindess
0ce252ba7a
This ifdef is for bed code so should use bed constants for testing.
Without this fix, the code wont compile with extruder but without bed
runaway protection defined.
пре 9 година
Scott Lahteine
0218ad45a1
Proposed fix to #1379 . Printrboard I2C LCD support
пре 9 година
Scott Lahteine
9040446780
Merge pull request #1395 from AnHardt/iss1394
removed function step_wait() from stepper.cpp
пре 9 година
Scott Lahteine
25f79c5010
Merge pull request #1391 from CONSULitAS/Development-newBoard_K8200
Add: Board for Vellemann K8200 (derived from 3Drag)
пре 9 година
Scott Lahteine
9ce75ab7de
Merge pull request #1386 from roglio/Development
Fixing a build error for melzi and gfx display
пре 9 година