1763 Commits (1a7b0d9a3740f55ad11b300b68c128fcb4e971d0)

Author SHA1 Message Date
DocDawning 5bb3933b21 Fixed n00bsauce 10 years ago
DocDawning d109cd940b Normalized all configuration files to include my new section headers and the like. 10 years ago
DocDawning 055c4beaf9 Normalized section headers, added some headers, added help URLs for newbies 10 years ago
Scott Lahteine 9dc5de6166 Hide code that makes veteran geeks go "aha!" 10 years ago
Scott Lahteine bd387068bb Apply loops for extruders elsewhere also 10 years ago
Scott Lahteine 4a146d584b Loop, since the pending feature can use an array 10 years ago
Scott Lahteine bca884bf72 Realized it's not a bug, but cleanup code anyway 10 years ago
AnHardt 2dd43a82b1 Ups. #else added 10 years ago
AnHardt 26e55471f8 Update example configurations. 10 years ago
AnHardt 85385be132 Removed now automatic define of DISPLAY_CHARSET_DOGM + improved description. 10 years ago
AnHardt 0e40408ee5 Make exemplaric use of new display charsets in language_en.h and languag_de.h 10 years ago
AnHardt 8dce5a6644 Improve new charset featur.
Select DOGM-displays automaticly.
Give hint where to find charsets.
Add '²' and '³' characters.
10 years ago
Scott Lahteine c009c81e65 make marlin-main the default 10 years ago
Scott Lahteine f4ebc02555 marlin url 10 years ago
Scott Lahteine 0af9a0bf57 url to firmware downloads 10 years ago
Scott Lahteine 5f8dd92905 toss in a fix for .ru 10 years ago
Scott Lahteine 3f3ad9b3ad typo 10 years ago
Scott Lahteine 07639053fb Add support for BQ Prusa i3 "Hephestos" 10 years ago
Philip Schell fb7c636ecf Avoid compiling error
Only a missing ","... now it will compile again
10 years ago
alexborro 787d6fb61a Update RUMBA pins file
Add FAN1_PIN and SERVO0_PIN
10 years ago
Scott Lahteine 5fd5105d44 Merge pull request #1439 from clefranc/Development
Fix nozzle in temperature menu
10 years ago
AnHardt 76bf93efcb Revert "get STR_THERMOMETER from ultralcd_implementation_hitachi_HD44780.h"
This reverts commit 4d5b0e2037.
10 years ago
AnHardt 4d5b0e2037 get STR_THERMOMETER from ultralcd_implementation_hitachi_HD44780.h 10 years ago
Christian Lefrançois 33408a4dfc Update ultralcd.cpp
Fix number of nozzle displayed in temperature menu.
10 years ago
AnHardt 6e6e3cf443 merged https://github.com/MarlinFirmware/Marlin.git 10 years ago
AnHardt b3ca430a20 Inducted the defined placeholders in the translation table. 10 years ago
AnHardt e045034c3f Included Configuration.h to read the defined charsets.
Defined the charsets plus a default.
10 years ago
AnHardt 27c638803e Defined three charsets. 10 years ago
Scott Lahteine 073c59c50a Clean up some formatting
- Also partial cleanup of Marlin_main.cpp with a smidgen of Doxygen.
10 years ago
AnHardt 9a4d4b3a2f translated Deltamenu 10 years ago
AnHardt 8aa6487b4b MSG_ENDSTOP_ABORT = 'Endstop abort' > 'Endstop Abbr. Ein' 10 years ago
AnHardt 666ad7106b Translated redundand: define MSG_INIT_SDCARD and MSG_CNG_SDCARD 10 years ago
AnHardt e5c45fbe8c Infoscreen messages end with a '.' if not to long.
MSG_NO_MOVE = 'Kein Zug.' > 'Motoren Eingesch.' hat mich grau Haare gekostet.
Die englisch Meldung will sagen - Du kannst jetz am Extruder arbeiten, die
Achsen sind bockiert, die Motoren sperren die Achsen weil sie unter Strom
stehen, weil sie eingeschaltet sind.
10 years ago
AnHardt 1e22137e27 MSG_STOP_PRINT = 'Druck stoppen' > 'SD-Druck Abbruch'
to work out that this can't be resumed.
10 years ago
AnHardt 05d2ebd118 MSG_WATCH > 'Beobachten' > 'Info' 10 years ago
AnHardt 06cba91c39 eye candy 2 10 years ago
AnHardt 9352c9547f MSG_SPEED = 'Geschw' > 'Geschw.' 10 years ago
AnHardt 0dfb0162f3 eye candy. 10 years ago
AnHardt 7222b27501 MSG_MOVE_AXIS = 'Achsen bewegen' > 'Bewegen'. Is Extruder an axis? 10 years ago
AnHardt a6f808c9b1 remove unused #define MSG_RETRACT 10 years ago
AnHardt 152fa579f5 MSG_SWITCH_PS_OFF = 'Switch Power Off' -> 'Netzteil Aus' 10 years ago
AnHardt 7a32b742f3 MSG_SWITCH_PS_ON = 'Switch Power On' ->'Netzteil Ein' 10 years ago
AnHardt 4e176d2ce8 MSG_SET_ORIGIN = 'Setze Nullpunkt' ->'Setze Null hier' 10 years ago
AnHardt 1f8c8ad3ed MSG_SET_HOME_OFFSETS = 'Set home offsets' ->'Setze Home hier' 10 years ago
AnHardt 0e8836ce5e MSG_AUTO_HOME = 'Auto Nullpunkt' ->'Home' 10 years ago
AnHardt 56d3e6615d MSG_DISABLE_STEPPERS = 'Stepper abschalt.' -> 'Motoren Aus'# 10 years ago
Scott Lahteine 1258980832 Merge pull request #1429 from bq/Development
Add bq Witbox 3D printer
10 years ago
Victor Andueza 766762a4dc Change url link 10 years ago
Scott Lahteine 7df9ca051c Merge pull request #1428 from thinkyhead/issue_1388_eeprom
Make EEPROM storage consistent
10 years ago
Scott Lahteine fe3810f073 yeah, what he said 10 years ago
Scott Lahteine 6137bbd484 use eeprom read correctly 10 years ago
Scott Lahteine 9bc9051405 Flag EEPROM write errors on serial output
- Also adds a language string for the error.
- Also adds SERIAL_EOL as an alias for SERIAL_ECHOLN(“”)
10 years ago
Scott Lahteine ff99ca3040 Fix alignment of Restore following PIDTEMP
Should be reading 4 x 4 PID values instead of 4 x 3
10 years ago
Philip Schell 6c285930cb Fixing wrong pin to heater extruder 2 <-> 3
Extruder 2 and 3 was swapped
10 years ago
Victor Andueza 0d4ce27b79 Add pins_WITBOX file 10 years ago
Victor Andueza 13118cde33 Add bq Witbox 3D printer 10 years ago
Scott Lahteine 093fedfde8 Make EEPROM storage consistent
Update ConfigurationStore to always write dummy values for disabled
options, including FWRETRACT, DELTA, and SCARA. Update the EEPROM
version to “V15.” Also fixes a buffer overrun with axis_scaling in
Config_ResetDefault.
10 years ago
Scott Lahteine 34377ee512 Merge pull request #1427 from thinkyhead/fewer_preheat_strings
Remove language strings that only add a number
10 years ago
Scott Lahteine 7378a7fef4 Merge pull request #1408 from thinkyhead/cleanup_servo
Formatting cleanup of quiet sources
10 years ago
Scott Lahteine 5fbef6bed2 Merge pull request #1409 from thinkyhead/rename_lastnr
Rename lastnr to autostart_index and...
10 years ago
Scott Lahteine 53eea611b8 Fix MSG_NOZZLE 10 years ago
Scott Lahteine d7211a5324 Changes for Portuguese too 10 years ago
Scott Lahteine 0a21727c0a Portuguese (pt) and Brazilian Portuguese (pt-br) 10 years ago
Scott Lahteine c90f2e77d8 Remove language strings that only add a number
This won’t reduce the string storage in the end, but it makes the
language files smaller. Also removed remaining unused strings.
10 years ago
Scott Lahteine 2ce4a102ee Add support for Megatronics 3 a la #1426 10 years ago
Scott Lahteine ae4b348d77 Make sure _Ex_PINS is defined
Also fix analogInputToDigitalPin so it uses proper C hex notation
10 years ago
Scott Lahteine 80be6f3f91 tweak tweak 10 years ago
Scott Lahteine ebe78cb36f tweak 10 years ago
Scott Lahteine 82474fef8a 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.
10 years ago
Scott Lahteine 8045e4d60d 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.
10 years ago
Scott Lahteine df4f3e7712 cleanup 10 years ago
Scott Lahteine b6ecbd8cc4 cleanup 10 years ago
Scott Lahteine 4e573134de Cleanup heading 10 years ago
Scott Lahteine 574a5ab72a Split up pins to make it more manageable
Hopefully this is helpful to organization and future expansion….
10 years ago
clefranc d55c62bf9f Update ConfigurationStore.cpp
Moved #endif to allow filament settings to print.
10 years ago
clefranc e779641c73 Update ConfigurationStore.cpp
Added PIDTEMP dummy write to align EEPROM read/write operation.
10 years ago
Scott Lahteine baac6e242d Merge pull request #1419 from AnHardt/bootsplash
repair Bootsplash
10 years ago
AnHardt 75cf302da3 example configurations changed to meet Configuration.h 10 years ago
Philip Schell 61fd45a0c2 Add 4th extruder 10 years ago
Philip Schell 2650be4921 Add 4th extruder 10 years ago
Philip Schell a9763d894e Add 4th extruder 10 years ago
Philip Schell 4949088302 Add 4th extruder 10 years ago
Philip Schell fc5204bd42 Add 4th extruder 10 years ago
Philip Schell 9834818ef7 Add 4th extruder 10 years ago
Philip Schell 8696963154 Add 4th extruder 10 years ago
Philip Schell ee8a7419f4 Add 4th extruder 10 years ago
Philip Schell e18403235d Add 4th extruder 10 years ago
Philip Schell 7baee555f4 Add 4th extruder 10 years ago
Philip Schell cebc7daf2a Add 4th extruder 10 years ago
Philip Schell ef4c7abb21 Update language_es.h
Add 4th extruder
10 years ago
Philip Schell 22e591518a Update language_de.h
Add 4th extruder
10 years ago
Philip Schell a20c35bb38 Update language_ca.h
Add 4th extruder
10 years ago
Jérémie FRANCOIS dd301be52d Added suport for multiline G-code commands in the LCD menus 10 years ago
AnHardt aa48056c03 Made centering of bootlogo work and removed contraproductiv setScale2x2() in dogm_lcd_implementation.h 10 years ago
AnHardt 0d219b3e14 Make centering of STRING_SPLASH work 10 years ago
AnHardt 59315330dd Remove definition of VERSION_STRING and replace where usend with STRING_VERSION 10 years ago
AnHardt 8c792c7b22 Make STRING_VERSION and VERSION_STRING the same 10 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.
10 years ago
MagoKimbra 3021f7f743 Fix PID_dT
Add PID_dT in temeprature.cpp
10 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.
10 years ago
Scott Lahteine 6723388f7f Proposed fix to #1379. Printrboard I2C LCD support 10 years ago
Scott Lahteine 03c9cb60e8 Rename lastnr to autostart_index and...
Replace instances of the number 13 with FILENAME_LENGTH where
appropriate.
10 years ago
MagoKimbra ef5959a705 Fix Temperature
Githun insert this line when i merge with actual Branch development...
10 years ago
MagoKimbra 3d4ee6c868 Merge branch '4th-extruders' of https://github.com/MagoKimbra/Marlin into 4th-extruders
Conflicts:
	Marlin/temperature.cpp
10 years ago
MagoKimbra 986e723eeb Add 4th extruder 10 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
10 years ago
Scott Lahteine 06c3b37933 Formatting cleanup of quiet sources
Formatting for code-folding plus minor style changes to less active
code.
10 years ago
Scott Lahteine 23fcd1ecb2 Merge pull request #1407 from thinkyhead/cleanup_marlinserial
Formatting cleanup of quiet sources
10 years ago
Scott Lahteine fd78902194 Formatting cleanup of quiet sources 10 years ago
Scott Lahteine 5c1814383a Merge pull request #1390 from floyd871/Development
Show Custom M_Code for Z-Probe Offset when entering M503
10 years ago
MagoKimbra 0ebf896070 Add 4th extruder 10 years ago
Michael Neumann a9d7ab9530 Update ConfigurationStore.cpp
Done
10 years ago
Scott Lahteine 3a9a3e5ed8 Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET
This define is not used.
10 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.
10 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.
10 years ago
Scott Lahteine 9040446780 Merge pull request #1395 from AnHardt/iss1394
removed function step_wait() from stepper.cpp
10 years ago
Scott Lahteine 25f79c5010 Merge pull request #1391 from CONSULitAS/Development-newBoard_K8200
Add: Board for Vellemann K8200 (derived from 3Drag)
10 years ago
Scott Lahteine 9ce75ab7de Merge pull request #1386 from roglio/Development
Fixing a build error for melzi and gfx display
10 years ago
Scott Lahteine 15a00a5a7c Add 1µs delay in other appropriate spots 10 years ago
AnHardt 23cb899c5a removed function step_wait() from stepper.cpp
removed function step_wait() from stepper.cpp because its used nowhere.
10 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.
10 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
10 years ago
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
10 years ago
Michael Neumann 2d454da3af Update ConfigurationStore.cpp
Show Custom M Code when entering M503
10 years ago
Scott Lahteine 4f35de991a Merge pull request #1383 from CONSULitAS/Development
Update Boards.h for Vellemann K8200 - comment only
10 years ago
roglio 22571ca13d Revert "Configuration for Aurora Z605"
This reverts commit 935ee968a7.
10 years ago
roglio 935ee968a7 Configuration for Aurora Z605
Still not fine tuned but working.
10 years ago
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.
10 years ago
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
10 years ago
CONSULitAS 51c7f2fd5a Revert "## Add: Example Configuration for Vellemann K8200"
This reverts commit 5333590ac2.
10 years ago
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
10 years ago
Denis Chertykov ba3ac40b9d Remove hardcoded programmer option (-cwiring). Use variable AVRDUDE_PROGRAMMER.
Change default value of AVRDUDE_PROGRAMMER to 'wiring'.
10 years ago
daid 53f971095d Revert "Reduce PROGMEM warnings" 10 years ago
PxT 67b597ad46 Update printrboard pin assignments
Backported from Printrbot branch, allows the fan to work correctly.
10 years ago
galexander1 d4880a9e60 Revert "Move Sd library out into library" 10 years ago
Bo Herrmannsen ccdb086fc8 Merge pull request #1363 from PxT/patch-1
Fixes #1361
10 years ago
Bo Herrmannsen 5151db5c2f Merge pull request #1349 from msutas/patch-2
Improvement - G29 Option for Not Retracting Servo
10 years ago
Bo Herrmannsen 1746b2582b Merge pull request #1332 from Sniffle/Development
Rambo FAN_PIN documentation and servo support
10 years ago
Bo Herrmannsen 4b51b5a46d Merge pull request #1357 from odewdney/SDlib
Move Sd library out into library
10 years ago
Bo Herrmannsen f2cb4a3655 Merge pull request #1353 from thawkins/Development
fix avrdude upload in makefile
10 years ago
PxT 9fd4292923 Fixes #1361 10 years ago
odewdney f84ff4ba7d Move SD Fat library out of main src 10 years ago
Bo Herrmannsen ab074dac17 Merge pull request #1344 from grob6000/independent_pid
Independent PID parameters for each extruder
10 years ago
Bo Herrmannsen d4a665694a Merge pull request #1350 from odewdney/Development
Reduce PROGMEM warnings
10 years ago
odewdney 9d9c859ac1 First move of SdFat library 10 years ago
Tim Hawkins 5045d17a39 fix avrdude upload in makefile 10 years ago
msutas 3a5a6f42fb Corrected the ABL grid option
G29 E was not retracting the probe on the last probe point when used with ABL grid. Corrected.
10 years ago
odewdney cd55a93a13 re-add blank line 10 years ago
odewdney 23bfe30036 moved include themister to temperature.c 10 years ago
odewdney 538859669d Removing compiler warnings for progmem 10 years ago