zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
2032 commits 1 branch 0 tags 156 MiB
Commit graph

2032 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Schell 22e591518a Update language_de.h 
Add 4th extruder
 2015-01-26 21:08:13 +01:00
Philip Schell a20c35bb38 Update language_ca.h 
Add 4th extruder
 2015-01-26 21:04:31 +01:00
AnHardt aa48056c03 Made centering of bootlogo work and removed contraproductiv setScale2x2() in dogm_lcd_implementation.h 2015-01-26 17:26:22 +01:00
AnHardt 0d219b3e14 Make centering of STRING_SPLASH work 2015-01-26 16:00:10 +01:00
AnHardt 59315330dd Remove definition of VERSION_STRING and replace where usend with STRING_VERSION 2015-01-26 15:52:01 +01:00
AnHardt 8c792c7b22 Make STRING_VERSION and VERSION_STRING the same 2015-01-26 15:40:44 +01:00
Scott Lahteine a231764523 tweak tweak 2015-01-26 05:18:43 -08:00
Scott Lahteine acf4a12fc3 tweak 2015-01-26 05:17:08 -08:00
Scott Lahteine 74b40b039a Merge branch 'cleanup_pins' of https://github.com/thinkyhead/Marlin into cleanup_pins 
Pull for divergence.
 2015-01-26 05:09:33 -08:00
Scott Lahteine 812fafac80 Max endstop pins disabled by configuration 
There’s no need to ask users to uncomment Max Endstop pins when they
have them. These will be set to -1 later if the endstop option is
disabled.
 2015-01-26 05:08:41 -08:00
Scott Lahteine a0a97c9c4c cleanup 2015-01-26 05:08:40 -08:00
Scott Lahteine aa23e75eb8 Cleanup heading 2015-01-26 05:08:40 -08:00
Scott Lahteine 89282ebaa6 Split up pins to make it more manageable 
Hopefully this is helpful to organization and future expansion….
 2015-01-26 05:08:40 -08:00
Scott Lahteine b87ec5da73 Max endstop pins disabled by configuration 
There’s no need to ask users to uncomment Max Endstop pins when they
have them. These will be set to -1 later if the endstop option is
disabled.
 2015-01-25 20:08:51 -08:00
Scott Lahteine e5a7f34fa4 Add support for 4th extruder 
#1405 includes some changes to pins.h for a 4th extruder. This commit
applies those changes. It also deals with a possible problem with
SENSITIVE_PINS.
 2015-01-25 19:43:43 -08:00
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.
 2015-01-25 19:30:51 -08:00
Scott Lahteine b51a583f08 cleanup 2015-01-25 19:20:25 -08:00
Scott Lahteine 5347ac2766 cleanup 2015-01-25 18:50:09 -08:00
Scott Lahteine b684f7e92b Cleanup heading 2015-01-25 18:42:16 -08:00
Scott Lahteine 86f1d1cfc3 Split up pins to make it more manageable 
Hopefully this is helpful to organization and future expansion….
 2015-01-25 18:40:00 -08:00
MagoKimbra 3021f7f743 Fix PID_dT 
Add PID_dT in temeprature.cpp
 2015-01-25 17:56:14 +01:00
Scott Lahteine 415d95a298 Merge pull request #1401 from thinkyhead/issue_1379_printrboard_lcd 
Proposed fix to #1379. Printrboard I2C LCD support
 2015-01-24 16:38:09 -08:00
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.
 2015-01-24 05:10:48 -08:00
Scott Lahteine 3ec0f7cfc0 Merge branch 'issue_1379_printrboard_lcd' of https://github.com/thinkyhead/Marlin into issue_1379_printrboard_lcd 
Diverged from origin
 2015-01-24 05:01:26 -08:00
Scott Lahteine 6723388f7f Proposed fix to #1379. Printrboard I2C LCD support 2015-01-24 05:01:02 -08:00
Scott Lahteine 09eff0c4db Merge branch 'rename_lastnr' of https://github.com/thinkyhead/Marlin into rename_lastnr 
Diverged from origin
 2015-01-24 04:58:11 -08:00
Scott Lahteine 03c9cb60e8 Rename lastnr to autostart_index and... 
Replace instances of the number 13 with FILENAME_LENGTH where
appropriate.
 2015-01-24 04:57:44 -08:00
MagoKimbra ef5959a705 Fix Temperature 
Githun insert this line when i merge with actual Branch development...
 2015-01-24 13:49:29 +01:00
MagoKimbra 3d4ee6c868 Merge branch '4th-extruders' of https://github.com/MagoKimbra/Marlin into 4th-extruders 
Conflicts:
	Marlin/temperature.cpp
 2015-01-24 13:41:15 +01:00
MagoKimbra 986e723eeb Add 4th extruder 2015-01-24 13:37:58 +01:00
Scott Lahteine 9552e59306 Merge pull request #1402 from thinkyhead/issue_1227_max6675_spi 
Borrow from Ultimaker to fix MAX6675 SPI conflict
 2015-01-24 04:06:42 -08:00
Scott Lahteine 49765fc75d Merge branch 'issue_1227_max6675_spi' of https://github.com/thinkyhead/Marlin into issue_1227_max6675_spi 
Branches diverged
 2015-01-24 03:50:04 -08:00
Scott Lahteine f16bdd2ff2 Borrow from Ultimaker to fix MAX6675 SPI conflict 
Changes to temperature.cpp from Ultimaker fork, intended to address
#1226 and #1227
 2015-01-24 03:49:15 -08:00
Scott Lahteine 1ed3913333 Rename lastnr to autostart_index and... 
Replace instances of the number 13 with FILENAME_LENGTH where
appropriate.
 2015-01-23 22:55:13 -08:00
Scott Lahteine 06c3b37933 Formatting cleanup of quiet sources 
Formatting for code-folding plus minor style changes to less active
code.
 2015-01-23 22:26:52 -08:00
Scott Lahteine 23fcd1ecb2 Merge pull request #1407 from thinkyhead/cleanup_marlinserial 
Formatting cleanup of quiet sources
 2015-01-23 21:33:43 -08:00
Scott Lahteine fd78902194 Formatting cleanup of quiet sources 2015-01-23 21:11:50 -08:00
Scott Lahteine 5c1814383a Merge pull request #1390 from floyd871/Development 
Show Custom M_Code for Z-Probe Offset when entering M503
 2015-01-23 20:08:23 -08:00
MagoKimbra 0ebf896070 Add 4th extruder 2015-01-23 23:13:06 +01:00
Michael Neumann a9d7ab9530 Update ConfigurationStore.cpp 
Done
 2015-01-23 21:05:27 +01:00
Scott Lahteine a244bcb953 Merge pull request #1403 from thinkyhead/issue_1356 
Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET
 2015-01-23 10:51:39 -08:00
Scott Lahteine 3a9a3e5ed8 Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET 
This define is not used.
 2015-01-23 10:51:06 -08:00
Scott Lahteine e770489f27 Borrow from Ultimaker to fix MAX6675 SPI conflict 
Changes to temperature.cpp from Ultimaker fork, intended to address
#1226 and #1227
 2015-01-23 10:37:39 -08:00
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.
 2015-01-23 08:36:25 -08:00
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.
 2015-01-23 16:30:13 +00:00
Scott Lahteine 0218ad45a1 Proposed fix to #1379. Printrboard I2C LCD support 2015-01-23 07:42:26 -08:00
Scott Lahteine 9040446780 Merge pull request #1395 from AnHardt/iss1394 
removed function step_wait() from stepper.cpp
 2015-01-23 06:58:10 -08:00
Scott Lahteine 25f79c5010 Merge pull request #1391 from CONSULitAS/Development-newBoard_K8200 
Add: Board for Vellemann K8200 (derived from 3Drag)
 2015-01-23 06:08:38 -08:00
Scott Lahteine 9ce75ab7de Merge pull request #1386 from roglio/Development 
Fixing a build error for melzi and gfx display
 2015-01-23 06:00:24 -08:00
Scott Lahteine 99e6ce901b Merge pull request #1393 from thinkyhead/issue_1385_timing 
Add proper delay in stepper.cpp
 2015-01-23 03:33:39 -08:00