MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
Firmware2/Marlin
History
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
..
example_configurations
Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET
2015-01-23 10:51:06 -08:00
scripts
rename stepper lookup table scipt to be consistent with termistor lookup table script
2015-01-06 10:30:20 +01:00
BlinkM.cpp
Corrected LCD only error
2013-10-30 21:52:46 +01:00
BlinkM.h
Corrected LCD only error
2013-10-30 21:52:46 +01:00
boards.h
Add: Board for Vellemann K8200 (derived from 3Drag)
2015-01-20 20:46:20 +01:00
cardreader.cpp
Merge branch 'Marlin_v1' into revert-1154-sd_sorting
2014-12-18 23:13:50 +01:00
cardreader.h
Merge branch 'Marlin_v1' into revert-1154-sd_sorting
2014-12-18 23:13:50 +01:00
Configuration_adv.h
Add 4th extruder
2015-01-24 13:37:58 +01:00
Configuration.h
Merge branch '4th-extruders' of https://github.com/MagoKimbra/Marlin into 4th-extruders
2015-01-24 13:41:15 +01:00
ConfigurationStore.cpp
Add 4th extruder
2015-01-24 13:37:58 +01:00
ConfigurationStore.h
Removed Delta from the default config file.
2013-09-14 13:50:09 +02:00
digipot_mcp4451.cpp
Defines for electronics boards
2014-12-18 13:59:31 -08:00
dogm_font_data_marlin.h
Removed STB custom font hack from u8glib library and moved to marlin project
2013-04-16 13:54:39 +02:00
dogm_lcd_implementation.h
Merge branch 'Development' of github.com:MarlinFirmware/Marlin into LogoLCD
2015-01-10 14:57:11 +01:00
DOGMbitmaps.h
added missing #endif
2015-01-09 20:23:38 +01:00
fastio.h
Various typo fixes - only in comments, no code changes.
2014-02-25 09:52:58 +00:00
language_an.h
Revert "Add "Detailed Z Probe" menu item with ABL is defined."
2015-01-04 21:53:37 -05:00
language_ca.h
Multiple PID parameter edit for ultralcd
2015-01-11 01:14:02 +11:00
language_de.h
Multiple PID parameter edit for ultralcd
2015-01-11 01:14:02 +11:00
language_en.h
Add 4th extruder
2015-01-24 13:37:58 +01:00
language_es.h
Multiple PID parameter edit for ultralcd
2015-01-11 01:14:02 +11:00
language_eu.h
Multiple PID parameter edit for ultralcd
2015-01-11 01:14:02 +11:00
language_fi.h
Multiple PID parameter edit for ultralcd
2015-01-11 01:14:02 +11:00
language_fr.h
Multiple PID parameter edit for ultralcd
2015-01-11 01:14:02 +11:00
language_it.h
Add 4th extruder
2015-01-24 13:37:58 +01:00
language_nl.h
Multiple PID parameter edit for ultralcd
2015-01-11 01:14:02 +11:00
language_pl.h
Multiple PID parameter edit for ultralcd
2015-01-11 01:14:02 +11:00
language_pt.h
Multiple PID parameter edit for ultralcd
2015-01-11 01:14:02 +11:00
language_ru.h
Multiple PID parameter edit for ultralcd
2015-01-11 01:14:02 +11:00
language.h
Add: Board for Vellemann K8200 (derived from 3Drag)
2015-01-20 20:46:20 +01:00
LiquidCrystalRus.cpp
Revert "Reduce PROGMEM warnings"
2015-01-16 16:48:22 +01:00
LiquidCrystalRus.h
Enables support the Cyrillic alphabet for LCD
2012-10-12 19:06:43 +04:00
Makefile
Remove hardcoded programmer option (-cwiring). Use variable AVRDUDE_PROGRAMMER.
2015-01-18 20:18:43 +03:00
Marlin_main.cpp
Add 4th extruder
2015-01-24 13:37:58 +01:00
Marlin.h
Add 4th extruder
2015-01-24 13:37:58 +01:00
Marlin.ino
Add Azteeg X3 Pro as motherboard 68
2014-02-05 01:47:12 -08:00
Marlin.pde
Revert "Move Sd library out into library"
2015-01-15 18:52:10 -05:00
MarlinSerial.cpp
Formatting cleanup of quiet sources
2015-01-23 21:11:50 -08:00
MarlinSerial.h
Formatting cleanup of quiet sources
2015-01-23 21:11:50 -08:00
motion_control.cpp
Update motion_control.cpp
2014-10-04 09:24:09 +02:00
motion_control.h
Removed interrupt nesting in the stepper ISR.
2011-11-27 21:12:55 +01:00
pins.h
Merge pull request #1405 from MagoKimbra/4th-extruders
2015-01-25 19:30:51 -08:00
planner.cpp
Add 4th extruder
2015-01-24 13:37:58 +01:00
planner.h
Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation"
2014-12-21 10:06:05 -02:00
qr_solve.cpp
Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation"
2014-12-21 10:06:05 -02:00
qr_solve.h
Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation"
2014-12-21 10:06:05 -02:00
Sd2Card.cpp
Revert "Move Sd library out into library"
2015-01-15 18:52:10 -05:00
Sd2Card.h
Revert "Move Sd library out into library"
2015-01-15 18:52:10 -05:00
Sd2PinMap.h
Revert "Move Sd library out into library"
2015-01-15 18:52:10 -05:00
SdBaseFile.cpp
Revert "Move Sd library out into library"
2015-01-15 18:52:10 -05:00
SdBaseFile.h
Revert "Move Sd library out into library"
2015-01-15 18:52:10 -05:00
SdFatConfig.h
Revert "Move Sd library out into library"
2015-01-15 18:52:10 -05:00
SdFatStructs.h
Revert "Move Sd library out into library"
2015-01-15 18:52:10 -05:00
SdFatUtil.cpp
Revert "Move Sd library out into library"
2015-01-15 18:52:10 -05:00
SdFatUtil.h
Revert "Move Sd library out into library"
2015-01-15 18:52:10 -05:00
SdFile.cpp
Revert "Move Sd library out into library"
2015-01-15 18:52:10 -05:00
SdFile.h
Revert "Move Sd library out into library"
2015-01-15 18:52:10 -05:00
SdInfo.h
Revert "Move Sd library out into library"
2015-01-15 18:52:10 -05:00
SdVolume.cpp
Revert "Move Sd library out into library"
2015-01-15 18:52:10 -05:00
SdVolume.h
Revert "Move Sd library out into library"
2015-01-15 18:52:10 -05:00
Servo.cpp
Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation"
2014-12-21 10:06:05 -02:00
Servo.h
Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation"
2014-12-21 10:06:05 -02:00
speed_lookuptable.h
Revert "Reduce PROGMEM warnings"
2015-01-16 16:48:22 +01:00
stepper.cpp
Add 4th extruder
2015-01-24 13:37:58 +01:00
stepper.h
Add 4th extruder
2015-01-24 13:37:58 +01:00
temperature.cpp
Fix PID_dT
2015-01-25 17:56:14 +01:00
temperature.h
Add 4th extruder
2015-01-24 13:37:58 +01:00
thermistortables.h
Add 4th extruder
2015-01-24 13:37:58 +01:00
ultralcd_implementation_hitachi_HD44780.h
Add Filament menu and add Filament/Retract settings to config store.
2015-01-02 11:12:15 -05:00
ultralcd_st7920_u8glib_rrd.h
Various typo fixes - only in comments, no code changes.
2014-02-17 10:58:36 +00:00
ultralcd.cpp
Add 4th extruder
2015-01-24 13:37:58 +01:00
ultralcd.h
Merge branch '4th-extruders' of https://github.com/MagoKimbra/Marlin into 4th-extruders
2015-01-24 13:41:15 +01:00
vector_3.cpp
Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation"
2014-12-21 10:06:05 -02:00
vector_3.h
Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation"
2014-12-21 10:06:05 -02:00
watchdog.cpp
Fix compiling the watchdog error message when the manual reset watchdog is used.
2012-12-06 10:27:50 +01:00
watchdog.h
Various typo fixes - only in comments, no code changes.
2014-02-17 10:58:36 +00:00