AnHardt
59315330dd
Remove definition of VERSION_STRING and replace where usend with STRING_VERSION
9 years ago
AnHardt
8c792c7b22
Make STRING_VERSION and VERSION_STRING the same
9 years ago
Scott Lahteine
a231764523
tweak tweak
9 years ago
Scott Lahteine
acf4a12fc3
tweak
9 years ago
Scott Lahteine
74b40b039a
Merge branch 'cleanup_pins' of https://github.com/thinkyhead/Marlin into cleanup_pins
Pull for divergence.
9 years ago
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.
9 years ago
Scott Lahteine
a0a97c9c4c
cleanup
9 years ago
Scott Lahteine
aa23e75eb8
Cleanup heading
9 years ago
Scott Lahteine
89282ebaa6
Split up pins to make it more manageable
Hopefully this is helpful to organization and future expansion….
9 years ago
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.
9 years ago
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.
9 years ago
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 years ago
Scott Lahteine
b51a583f08
cleanup
9 years ago
Scott Lahteine
5347ac2766
cleanup
9 years ago
Scott Lahteine
b684f7e92b
Cleanup heading
9 years ago
Scott Lahteine
86f1d1cfc3
Split up pins to make it more manageable
Hopefully this is helpful to organization and future expansion….
9 years ago
MagoKimbra
3021f7f743
Fix PID_dT
Add PID_dT in temeprature.cpp
9 years ago
Scott Lahteine
415d95a298
Merge pull request #1401 from thinkyhead/issue_1379_printrboard_lcd
Proposed fix to #1379 . Printrboard I2C LCD support
9 years ago
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 years ago
Scott Lahteine
3ec0f7cfc0
Merge branch 'issue_1379_printrboard_lcd' of https://github.com/thinkyhead/Marlin into issue_1379_printrboard_lcd
Diverged from origin
9 years ago
Scott Lahteine
6723388f7f
Proposed fix to #1379 . Printrboard I2C LCD support
9 years ago
Scott Lahteine
09eff0c4db
Merge branch 'rename_lastnr' of https://github.com/thinkyhead/Marlin into rename_lastnr
Diverged from origin
9 years ago
Scott Lahteine
03c9cb60e8
Rename lastnr to autostart_index and...
Replace instances of the number 13 with FILENAME_LENGTH where
appropriate.
9 years ago
MagoKimbra
ef5959a705
Fix Temperature
Githun insert this line when i merge with actual Branch development...
9 years ago
MagoKimbra
3d4ee6c868
Merge branch '4th-extruders' of https://github.com/MagoKimbra/Marlin into 4th-extruders
Conflicts:
Marlin/temperature.cpp
9 years ago
MagoKimbra
986e723eeb
Add 4th extruder
9 years ago
Scott Lahteine
9552e59306
Merge pull request #1402 from thinkyhead/issue_1227_max6675_spi
Borrow from Ultimaker to fix MAX6675 SPI conflict
9 years ago
Scott Lahteine
49765fc75d
Merge branch 'issue_1227_max6675_spi' of https://github.com/thinkyhead/Marlin into issue_1227_max6675_spi
Branches diverged
9 years ago
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 years ago
Scott Lahteine
1ed3913333
Rename lastnr to autostart_index and...
Replace instances of the number 13 with FILENAME_LENGTH where
appropriate.
9 years ago
Scott Lahteine
06c3b37933
Formatting cleanup of quiet sources
Formatting for code-folding plus minor style changes to less active
code.
9 years ago
Scott Lahteine
23fcd1ecb2
Merge pull request #1407 from thinkyhead/cleanup_marlinserial
Formatting cleanup of quiet sources
9 years ago
Scott Lahteine
fd78902194
Formatting cleanup of quiet sources
9 years ago
Scott Lahteine
5c1814383a
Merge pull request #1390 from floyd871/Development
Show Custom M_Code for Z-Probe Offset when entering M503
9 years ago
MagoKimbra
0ebf896070
Add 4th extruder
9 years ago
Michael Neumann
a9d7ab9530
Update ConfigurationStore.cpp
Done
9 years ago
Scott Lahteine
a244bcb953
Merge pull request #1403 from thinkyhead/issue_1356
Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET
9 years ago
Scott Lahteine
3a9a3e5ed8
Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET
This define is not used.
9 years ago
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 years ago
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 years ago
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 years ago
Scott Lahteine
0218ad45a1
Proposed fix to #1379 . Printrboard I2C LCD support
9 years ago
Scott Lahteine
9040446780
Merge pull request #1395 from AnHardt/iss1394
removed function step_wait() from stepper.cpp
9 years ago
Scott Lahteine
25f79c5010
Merge pull request #1391 from CONSULitAS/Development-newBoard_K8200
Add: Board for Vellemann K8200 (derived from 3Drag)
9 years ago
Scott Lahteine
9ce75ab7de
Merge pull request #1386 from roglio/Development
Fixing a build error for melzi and gfx display
9 years ago
Scott Lahteine
99e6ce901b
Merge pull request #1393 from thinkyhead/issue_1385_timing
Add proper delay in stepper.cpp
9 years ago
Scott Lahteine
15a00a5a7c
Add 1µs delay in other appropriate spots
9 years ago
AnHardt
23cb899c5a
removed function step_wait() from stepper.cpp
removed function step_wait() from stepper.cpp because its used nowhere.
9 years ago
Scott Lahteine
d9d4a78e0f
Add proper delay in stepper.cpp
Issue #1385 describes a delay that the compiler is optimizing out and
this solution.
9 years ago
CONSULitAS
d1322dafc9
Add: Example Configuration for Vellemann K8200 - based on new BOARD_K8200 #1391
# Add: Example Configuration for Vellemann K8200 - based on new
BOARD_K8200 #1391
* K8200: new folder in example_configurations for Vellemann K8200 (3Drag
clone - should work with 3Drag http://reprap.org/wiki/3drag , too. Please
report)
* K8200/Configuration.h/Configuration_adv.h: updated manually with
parameters form genuine Vellemann Firmware "firmware_k8200_marlinv2"
based on the recent development branch
I tested the changes on my K8200 with 20x4-LCD and Arduino 1.0.5 for
Windows (SD library added to IDE manually) - everything works well
9 years ago