aa48056c03
Made centering of bootlogo work and removed contraproductiv setScale2x2() in dogm_lcd_implementation.h
10 years ago
0d219b3e14
Make centering of STRING_SPLASH work
10 years ago
59315330dd
Remove definition of VERSION_STRING and replace where usend with STRING_VERSION
10 years ago
8c792c7b22
Make STRING_VERSION and VERSION_STRING the same
10 years ago
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.
10 years ago
3021f7f743
Fix PID_dT
...
Add PID_dT in temeprature.cpp
10 years ago
415d95a298
Merge pull request #1401 from thinkyhead/issue_1379_printrboard_lcd
...
Proposed fix to #1379 . Printrboard I2C LCD support
10 years ago
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.
10 years ago
3ec0f7cfc0
Merge branch 'issue_1379_printrboard_lcd' of https://github.com/thinkyhead/Marlin into issue_1379_printrboard_lcd
...
Diverged from origin
10 years ago
6723388f7f
Proposed fix to #1379 . Printrboard I2C LCD support
10 years ago
ef5959a705
Fix Temperature
...
Githun insert this line when i merge with actual Branch development...
10 years ago
3d4ee6c868
Merge branch '4th-extruders' of https://github.com/MagoKimbra/Marlin into 4th-extruders
...
Conflicts:
Marlin/temperature.cpp
10 years ago
986e723eeb
Add 4th extruder
10 years ago
9552e59306
Merge pull request #1402 from thinkyhead/issue_1227_max6675_spi
...
Borrow from Ultimaker to fix MAX6675 SPI conflict
10 years ago
49765fc75d
Merge branch 'issue_1227_max6675_spi' of https://github.com/thinkyhead/Marlin into issue_1227_max6675_spi
...
Branches diverged
10 years ago
f16bdd2ff2
Borrow from Ultimaker to fix MAX6675 SPI conflict
...
Changes to temperature.cpp from Ultimaker fork, intended to address
#1226 and #1227
10 years ago
23fcd1ecb2
Merge pull request #1407 from thinkyhead/cleanup_marlinserial
...
Formatting cleanup of quiet sources
10 years ago
fd78902194
Formatting cleanup of quiet sources
10 years ago
5c1814383a
Merge pull request #1390 from floyd871/Development
...
Show Custom M_Code for Z-Probe Offset when entering M503
10 years ago
0ebf896070
Add 4th extruder
10 years ago
a9d7ab9530
Update ConfigurationStore.cpp
...
Done
10 years ago
a244bcb953
Merge pull request #1403 from thinkyhead/issue_1356
...
Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET
10 years ago
3a9a3e5ed8
Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET
...
This define is not used.
10 years ago
e770489f27
Borrow from Ultimaker to fix MAX6675 SPI conflict
...
Changes to temperature.cpp from Ultimaker fork, intended to address
#1226 and #1227
10 years ago
54d5b52a2e
Merge pull request #1399 from beanz/use-bed-defines-not-extruder-ones
...
Code wont compile with extruder but without bed runaway protection defined.
10 years ago
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.
10 years ago
0218ad45a1
Proposed fix to #1379 . Printrboard I2C LCD support
10 years ago
9040446780
Merge pull request #1395 from AnHardt/iss1394
...
removed function step_wait() from stepper.cpp
10 years ago
25f79c5010
Merge pull request #1391 from CONSULitAS/Development-newBoard_K8200
...
Add: Board for Vellemann K8200 (derived from 3Drag)
10 years ago
9ce75ab7de
Merge pull request #1386 from roglio/Development
...
Fixing a build error for melzi and gfx display
10 years ago
99e6ce901b
Merge pull request #1393 from thinkyhead/issue_1385_timing
...
Add proper delay in stepper.cpp
10 years ago
15a00a5a7c
Add 1µs delay in other appropriate spots
10 years ago
23cb899c5a
removed function step_wait() from stepper.cpp
...
removed function step_wait() from stepper.cpp because its used nowhere.
10 years ago
d9d4a78e0f
Add proper delay in stepper.cpp
...
Issue #1385 describes a delay that the compiler is optimizing out and
this solution.
10 years ago
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
10 years ago
3b50a5e2e6
Add: Board for Vellemann K8200 (derived from 3Drag)
...
## Add: Board for Vellemann K8200 (derived from 3Drag)
* Boards.h: updated comment for board 3Drag - K8200 removed
* Boards.h: added `BOARD_K8200` with ID 78
* language.h.: machine name and firmware URL for new board
* pins.h: added `K8200` to any `#if` with `3Drag` and corresponding
comments
10 years ago
2d454da3af
Update ConfigurationStore.cpp
...
Show Custom M Code when entering M503
10 years ago
4f35de991a
Merge pull request #1383 from CONSULitAS/Development
...
Update Boards.h for Vellemann K8200 - comment only
10 years ago
91f7cc2e6d
Merge pull request #1380 from chertykov/Development
...
Remove hardcoded programmer option (-cwiring).
10 years ago
22571ca13d
Revert "Configuration for Aurora Z605"
...
This reverts commit 935ee968a7
10 years ago
935ee968a7
Configuration for Aurora Z605
...
Still not fine tuned but working.
10 years ago
ccdbeda526
Fixing a build error for melzi and gfx display
...
When a melzi board and a full gfx are both selected, the build fails
blaming for some missing defines.
This is a fix for the issue: now my configuration works.
10 years ago
e13f159343
Update Boards.h for Vellemann K8200 - comment only
...
## Update Boards.h for Vellemann K8200 - comment only
* Boards.h: updated comment for board 3Drag - K8200 uses same board
10 years ago
51c7f2fd5a
Revert "## Add: Example Configuration for Vellemann K8200"
...
This reverts commit 5333590ac2
10 years ago
5333590ac2
## Add: Example Configuration for Vellemann K8200
...
* K8200: new folder in example_configurations for Vellemann K8200 (3Drag
clone - should work with 3Drag too, please report)
* K8200/language.h: updated machine name and URL for K8200
* K8200/Configuration.h/Configuration_adv.h: updated manually with
parameters
form genuine Vellemann Firmware "firmware_k8200_marlinv2" based on the
recent development branch
* K8200/files by Vellemann: added folder with original files from
Vellemann homepage, since there is no GitHub fork you could link to by
them
I tested the changes on my K8200 with 20x4-LCD and Arduino 1.0.5 for
Windows - everything works well
10 years ago
ba3ac40b9d
Remove hardcoded programmer option (-cwiring). Use variable AVRDUDE_PROGRAMMER.
...
Change default value of AVRDUDE_PROGRAMMER to 'wiring'.
10 years ago
993bcd370f
Merge pull request #1373 from MarlinFirmware/revert-1350-Development
...
Revert "Reduce PROGMEM warnings"
10 years ago
53f971095d
Revert "Reduce PROGMEM warnings"
10 years ago
5c7e38478b
Merge pull request #1369 from PxT/patch-1
...
Update printrboard pin assignments
10 years ago
67b597ad46
Update printrboard pin assignments
...
Backported from Printrbot branch, allows the fan to work correctly.
10 years ago
AnHardt