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

1964 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Schell 7baee555f4 Add 4th extruder 2015-01-26 21:11:49 +01:00
Philip Schell cebc7daf2a Add 4th extruder 2015-01-26 21:10:42 +01:00
Philip Schell ef4c7abb21 Update language_es.h 
Add 4th extruder
 2015-01-26 21:09:24 +01:00
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
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
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
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 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
Scott Lahteine 15a00a5a7c Add 1µs delay in other appropriate spots 2015-01-23 03:24:45 -08:00
AnHardt 23cb899c5a removed function step_wait() from stepper.cpp 
removed function step_wait() from stepper.cpp because its used nowhere.
 2015-01-21 16:30:45 +01:00
Scott Lahteine d9d4a78e0f Add proper delay in stepper.cpp 
Issue #1385 describes a delay that the compiler is optimizing out and
this solution.
 2015-01-21 01:51:29 -08:00
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
 2015-01-20 23:13:44 +01:00
CONSULitAS 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
 2015-01-20 20:46:20 +01:00
Michael Neumann 2d454da3af Update ConfigurationStore.cpp 
Show Custom M Code when entering M503
 2015-01-20 16:21:44 +01:00
Scott Lahteine 4f35de991a Merge pull request #1383 from CONSULitAS/Development 
Update Boards.h for Vellemann K8200 - comment only
 2015-01-19 15:59:38 -08:00
Scott Lahteine 91f7cc2e6d Merge pull request #1380 from chertykov/Development 
Remove hardcoded programmer option (-cwiring).
 2015-01-19 15:43:14 -08:00
roglio 22571ca13d Revert "Configuration for Aurora Z605" 
This reverts commit 935ee968a7.
 2015-01-19 15:02:11 +01:00
roglio 935ee968a7 Configuration for Aurora Z605 
Still not fine tuned but working.
 2015-01-19 11:18:52 +01:00
roglio 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.
 2015-01-19 10:43:26 +01:00
CONSULitAS 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
 2015-01-19 00:53:17 +01:00
CONSULitAS 51c7f2fd5a Revert "## Add: Example Configuration for Vellemann K8200" 
This reverts commit 5333590ac2.
 2015-01-19 00:37:57 +01:00
CONSULitAS 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
 2015-01-19 00:28:55 +01:00
Denis Chertykov ba3ac40b9d Remove hardcoded programmer option (-cwiring). Use variable AVRDUDE_PROGRAMMER. 
Change default value of AVRDUDE_PROGRAMMER to 'wiring'.
 2015-01-18 20:18:43 +03:00
daid 993bcd370f Merge pull request #1373 from MarlinFirmware/revert-1350-Development 
Revert "Reduce PROGMEM warnings"
 2015-01-16 16:48:41 +01:00
daid 53f971095d Revert "Reduce PROGMEM warnings" 2015-01-16 16:48:22 +01:00
Bo Herrmannsen 5c7e38478b Merge pull request #1369 from PxT/patch-1 
Update printrboard pin assignments
 2015-01-16 15:35:42 +01:00