Firmware2/Marlin
Edward Patel 8067a985ce Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
Fixed conflicts:
	Marlin/planner.h
2015-03-17 22:48:08 +01:00
..
configurator Move TOPO_ORIGIN define to Configuration.h 2015-03-15 15:49:36 -07:00
example_configurations Update test 2015-03-16 09:16:00 +02: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 Cleanup of cardreader.* 2015-03-02 07:06:01 -08:00
BlinkM.h Cleanup of cardreader.* 2015-03-02 07:06:01 -08:00
boards.h Updated PR to streamline integration 2015-03-02 09:49:45 +00:00
cardreader.cpp Some suggested changes for #1555 2015-03-03 00:48:20 -08:00
cardreader.h Cleanup of cardreader.* 2015-03-02 07:06:01 -08:00
Configuration_adv.h Merge branch 'Development' into marlin_configurator 2015-03-11 15:47:32 -07:00
Configuration.h Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 2015-03-17 22:48:08 +01:00
ConfigurationStore.cpp Added menu option for bed leveling. 2015-03-15 23:24:32 +01:00
ConfigurationStore.h Cleanup of cardreader.* 2015-03-02 07:06:01 -08:00
digipot_mcp4451.cpp Cleanup of cardreader.* 2015-03-02 07:06:01 -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 - Rename WRITE_E_STEP for consistency 2015-03-14 04:28:22 -07:00
DOGMbitmaps.h Replaced some literal constants with defines 2015-02-03 09:52:29 +01:00
fastio.h - Rename WRITE_E_STEP for consistency 2015-03-14 04:28:22 -07:00
language_an.h Remove language strings that only add a number 2015-01-27 21:36:58 -08:00
language_ca.h Remove language strings that only add a number 2015-01-27 21:36:58 -08:00
language_de.h Make exemplaric use of new display charsets in language_en.h and languag_de.h 2015-02-01 13:20:58 +01:00
language_en.h Added menu option for bed leveling. 2015-03-15 23:24:32 +01:00
language_es.h Remove language strings that only add a number 2015-01-27 21:36:58 -08:00
language_eu.h Remove language strings that only add a number 2015-01-27 21:36:58 -08:00
language_fi.h Fixed error in translation 2015-02-11 08:50:48 +02:00
language_fr.h Remove language strings that only add a number 2015-01-27 21:36:58 -08:00
language_it.h Remove language strings that only add a number 2015-01-27 21:36:58 -08:00
language_nl.h Remove language strings that only add a number 2015-01-27 21:36:58 -08:00
language_pl.h Remove language strings that only add a number 2015-01-27 21:36:58 -08:00
language_pt-br.h Portuguese (pt) and Brazilian Portuguese (pt-br) 2015-01-27 21:45:21 -08:00
language_pt.h Changes for Portuguese too 2015-01-27 21:53:08 -08:00
language_ru.h Fix iss#1492 2015-02-16 13:53:58 +01:00
language.h Make sure a ROM is selected for ULTRA_LCD 2015-03-06 15:37:54 -08:00
LiquidCrystalRus.cpp Fix iss#1492 2015-02-16 13:53:58 +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 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 2015-03-17 22:48:08 +01:00
Marlin.h Merge branch 'Development' into delta_auto_bed_level 2015-03-16 08:24:26 +02:00
Marlin.ino - Rename WRITE_E_STEP for consistency 2015-03-14 04:28:22 -07:00
Marlin.pde - Rename WRITE_E_STEP for consistency 2015-03-14 04:28:22 -07:00
MarlinSerial.cpp - Rename WRITE_E_STEP for consistency 2015-03-14 04:28:22 -07:00
MarlinSerial.h - Rename WRITE_E_STEP for consistency 2015-03-14 04:28:22 -07:00
mesh_bed_leveling.cpp Added menu option for bed leveling. 2015-03-15 23:24:32 +01:00
mesh_bed_leveling.h Added menu option for bed leveling. 2015-03-15 23:24:32 +01:00
motion_control.cpp Update motion_control.cpp 2014-10-04 09:24:09 +02:00
motion_control.h
pins_3DRAG.h Issue #1504 – K8200 Z_ENABLE_PIN 2015-02-15 21:56:23 -08:00
pins_5DPRINT.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_99.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_AZTEEG_X1.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_AZTEEG_X3_PRO.h Merge branch 'Development' into fixup_ramps_boards 2015-02-19 17:26:22 -08:00
pins_AZTEEG_X3.h Azteeg X3 overrides too 2015-02-19 17:28:38 -08:00
pins_BAM_DICE_DUE.h Merge branch 'Development' into fixup_ramps_boards 2015-02-19 17:26:22 -08:00
pins_BRAINWAVE.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_CHEAPTRONIC.h Cleanup rotary encoder encrot* defines 2015-03-02 06:42:48 -08:00
pins_DUEMILANOVE_328P.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_ELEFU_3.h Cleanup rotary encoder encrot* defines 2015-03-02 06:42:48 -08:00
pins_FELIX2.h Minor fixes 2015-03-04 12:35:32 +00:00
pins_GEN3_MONOLITHIC.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_GEN3_PLUS.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_GEN6_DELUXE.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_GEN6.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_GEN7_12.h cleanup 2015-01-27 15:32:34 -08:00
pins_GEN7_13.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_GEN7_14.h cleanup 2015-01-27 15:32:34 -08:00
pins_GEN7_CUSTOM.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_HEPHESTOS.h Merge branch 'Development' into fixup_ramps_boards 2015-02-19 17:26:22 -08:00
pins_K8200.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_LEAPFROG.h Max endstop pins disabled by configuration 2015-01-27 15:33:21 -08:00
pins_MEGATRONICS_1.h Cleanup rotary encoder encrot* defines 2015-03-02 06:42:48 -08:00
pins_MEGATRONICS_2.h Cleanup rotary encoder encrot* defines 2015-03-02 06:42:48 -08:00
pins_MEGATRONICS_3.h Cleanup rotary encoder encrot* defines 2015-03-02 06:42:48 -08:00
pins_MEGATRONICS.h Cleanup rotary encoder encrot* defines 2015-03-02 06:42:48 -08:00
pins_MELZI_1284.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_MELZI.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_OMCA_A.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_OMCA.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_PRINTRBOARD.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_RAMBO.h Cleanup rotary encoder encrot* defines 2015-03-02 06:42:48 -08:00
pins_RAMPS_13.h Filament Runout Sensor Feature 2015-03-07 22:43:15 +02:00
pins_RAMPS_OLD.h Max endstop pins disabled by configuration 2015-01-27 15:33:21 -08:00
pins_RUMBA.h Cleanup of temperature code 2015-02-24 04:46:11 -08:00
pins_SANGUINOLOLU_11.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_SANGUINOLOLU_12.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_SAV_MKI.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_SETHI.h cleanup 2015-01-27 15:32:34 -08:00
pins_STB_11.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_TEENSY2.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_TEENSYLU.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_ULTIMAIN_2.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_ULTIMAKER_OLD.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_ULTIMAKER.h Split up pins to make it more manageable 2015-01-27 15:32:34 -08:00
pins_WITBOX.h Merge branch 'Development' into fixup_ramps_boards 2015-02-19 17:26:22 -08:00
pins.h Merge pull request #1546 from apollo-ng/pr-felix 2015-03-15 07:52:22 -07:00
planner.cpp Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 2015-03-17 22:48:08 +01:00
planner.h Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 2015-03-17 22:48:08 +01: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 - Rename WRITE_E_STEP for consistency 2015-03-14 04:28:22 -07:00
Sd2Card.h Revert "Move Sd library out into library" 2015-01-15 18:52:10 -05:00
Sd2PinMap.h - Rename WRITE_E_STEP for consistency 2015-03-14 04:28:22 -07:00
SdBaseFile.cpp Rename lastnr to autostart_index and... 2015-01-24 04:57:44 -08:00
SdBaseFile.h - Rename WRITE_E_STEP for consistency 2015-03-14 04:28:22 -07:00
SdFatConfig.h Rename lastnr to autostart_index and... 2015-01-24 04:57:44 -08: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 - Rename WRITE_E_STEP for consistency 2015-03-14 04:28:22 -07:00
SdVolume.h Revert "Move Sd library out into library" 2015-01-15 18:52:10 -05:00
Servo.cpp Formatting cleanup of quiet sources 2015-01-23 22:26:52 -08:00
Servo.h Formatting cleanup of quiet sources 2015-01-23 22:26:52 -08:00
speed_lookuptable.h Revert "Reduce PROGMEM warnings" 2015-01-16 16:48:22 +01:00
stepper_indirection.cpp - Add support for L6470 Drivers. 2015-02-27 12:43:23 +01:00
stepper_indirection.h - Add support for L6470 Drivers. 2015-02-27 12:43:23 +01:00
stepper.cpp fix macro 2015-03-17 12:50:44 +01:00
stepper.h - Rename WRITE_E_STEP for consistency 2015-03-14 04:28:22 -07:00
temperature.cpp Fix for #1612 2015-03-15 21:35:33 +01:00
temperature.h Cleanup of temperature code 2015-02-24 04:46:11 -08:00
thermistortables.h Extend the idea of dummy temperature sensors. 2015-02-24 11:02:16 +01:00
ultralcd_implementation_hitachi_HD44780.h - Rename WRITE_E_STEP for consistency 2015-03-14 04:28:22 -07:00
ultralcd_st7920_u8glib_rrd.h Update ultralcd_st7920_u8glib_rrd.h 2015-03-14 14:31:00 +01:00
ultralcd.cpp Added menu option for bed leveling. 2015-03-15 23:24:32 +01:00
ultralcd.h - Rename WRITE_E_STEP for consistency 2015-03-14 04:28:22 -07:00
vector_3.cpp Fix decimal places in G29 Bed Equation Coeficients 2015-03-13 14:39:41 -03: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