1
0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-25 04:48:31 +00:00
MarlinFirmware/Marlin
Chris Roadfeldt cba5692673 Merge remote-tracking branch 'MarlinFirmware/Development' into Development
Conflicts:
	Marlin/Marlin_main.cpp
	Marlin/stepper.cpp
2015-03-30 22:33:05 -05:00
..
configurator Fix compiler warnings 2015-03-27 20:29:05 -07:00
example_configurations Patch generic delta config 2015-03-28 14:13:25 -07:00
fonts Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 2015-03-19 12:35:43 +01:00
scripts Moved font directory. Updated README.fonts 2015-03-16 17:27:27 +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 Fix up the code to eliminate warnings 2015-03-27 00:32:58 -07:00
cardreader.h Cleanup of cardreader.* 2015-03-02 07:06:01 -08:00
Conditionals.h Parentheses need here otherwise sanitycheck.h does wrong thing on line 222 2015-03-27 20:22:59 +01:00
Configuration_adv.h comment #define Z_DUAL_STEPPER_DRIVERS 2015-03-25 13:46:29 +01:00
Configuration.h More config cleanup work for Z_PROBE_AND_ENDSTOP. 2015-03-29 03:06:20 -05:00
ConfigurationStore.cpp Fix compiler warnings 2015-03-27 20:29:05 -07: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_6x9_marlin.h Added 5 new font.h files to main directory. 2015-03-07 00:09:49 +01:00
dogm_font_data_HD44780_C.h Corrected Cyrillic fonts. Round II. 2015-03-14 15:10:45 +01:00
dogm_font_data_HD44780_J.h Added 5 new font.h files to main directory. 2015-03-07 00:09:49 +01:00
dogm_font_data_HD44780_W.h Added 5 new font.h files to main directory. 2015-03-07 00:09:49 +01:00
dogm_font_data_ISO10646_1.h Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 2015-03-19 12:35:43 +01:00
dogm_font_data_ISO10646_5_Cyrillic.h Corrected cyrillic font again 2015-03-16 16:59:14 +01:00
dogm_font_data_ISO10646_Kana.h Added 5 new font.h files to main directory. 2015-03-07 00:09:49 +01:00
dogm_font_data_Marlin_symbols.h Added 5 new font.h files to main directory. 2015-03-07 00:09:49 +01:00
dogm_lcd_implementation.h Make filament display on dogm_... same as hitachi... 2015-03-30 16:56:21 +02: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 Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
language_ca.h Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
language_de.h Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
language_en.h Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji 2015-03-24 16:59:15 +01:00
language_es.h Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
language_eu.h Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
language_fi.h Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
language_fr.h Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
language_it.h Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
language_kana_utf8.h Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
language_kana.h Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
language_nl.h Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
language_pl.h Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
language_pt-br.h Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
language_pt.h Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
language_ru.h Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
language_test.h Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
language.h Merge remote-tracking branch 'upstream/development' into development 2015-03-30 02:10:49 -05:00
Makefile Remove hardcoded programmer option (-cwiring). Use variable AVRDUDE_PROGRAMMER. 2015-01-18 20:18:43 +03:00
Marlin_main.cpp Merge remote-tracking branch 'MarlinFirmware/Development' into Development 2015-03-30 22:33:05 -05:00
Marlin.h Replace extrudemultiply by extruder_multiply[active_extruder] 2015-03-30 13:35:03 +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 Fix up bed leveling code 2015-03-25 20:36:24 -07:00
mesh_bed_leveling.h Fix up bed leveling code 2015-03-25 20:36:24 -07: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_3DRAG.h Fix compiler warnings 2015-03-27 20:29:05 -07:00
pins_5DPRINT.h Fix compiler warnings 2015-03-27 20:29:05 -07: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 Made #ifdef DELTA branch instead 2015-03-29 01:08:00 -06:00
pins_AZTEEG_X3.h Viki 2 Pins from Manual 2015-03-28 22:11:12 -06:00
pins_BAM_DICE_DUE.h Fix compiler warnings 2015-03-27 20:29:05 -07: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 Fix compiler warnings 2015-03-27 20:29:05 -07: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 Fix compiler warnings 2015-03-27 20:29:05 -07: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 Viki 2 Pins from Manual 2015-03-28 22:11:12 -06:00
pins_RAMBO.h Update pins_RAMBO.h 2015-03-28 22:29:54 -06:00
pins_RAMPS_13.h Fixed typo for Z_PROBE_AND_ENDSTOP support in pins_RAMPS.h. 2015-03-29 02:38:08 -05: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 Fix compiler warnings 2015-03-27 20:29:05 -07:00
pins.h Merge remote-tracking branch 'upstream/development' into development 2015-03-30 02:10:49 -05:00
planner.cpp Replace extrudemultiply by extruder_multiply[active_extruder] 2015-03-30 13:35:03 +02:00
planner.h ARRAY_BY_EXTRUDERS, shorthand to sync planner 2015-03-28 20:33:21 -07:00
qr_solve.cpp Fix up the code to eliminate warnings 2015-03-27 00:32:58 -07:00
qr_solve.h Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation" 2014-12-21 10:06:05 -02:00
SanityCheck.h Ensure Z_PROBE_PIN is defined if Z_PROBE_AND_ENDSTOP is. 2015-03-29 04:18:37 -05: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 Divide up Conditionals to get LCD items early 2015-03-20 02:50:28 -07:00
SdBaseFile.cpp Rename lastnr to autostart_index and... 2015-01-24 04:57:44 -08:00
SdBaseFile.h Pass sel to lcd_implementation_mark_as_selected 2015-03-19 13:40:36 -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 Merge remote-tracking branch 'MarlinFirmware/Development' into Development 2015-03-30 22:33:05 -05:00
stepper.h New Feature: Z_DUAL_ENDSTOPS 2015-03-24 14:06:44 -03:00
temperature.cpp Times can't be negative. 2015-03-30 01:58:46 +02:00
temperature.h Times can't be negative. 2015-03-30 01:58:46 +02:00
thermistortables.h Extend the idea of dummy temperature sensors. 2015-02-24 11:02:16 +01:00
ultralcd_implementation_hitachi_HD44780.h Get back folder symbols on Hitachi displays 2015-03-29 17:29:48 +02:00
ultralcd_st7920_u8glib_rrd.h In ST7920_SWSPI_SND_8BIT(uint8_t val) parameter is unsigned 2015-03-30 01:40:58 +02:00
ultralcd.cpp Replace extrudemultiply by extruder_multiply[active_extruder] 2015-03-30 13:35:03 +02:00
ultralcd.h Move variable blink from ultralcd.h to dogm_lcd_implementation.h 2015-03-28 13:14:38 +01:00
utf_mapper.h Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
vector_3.cpp Fix ECHOPAIR ambiguity 2015-03-27 00:46:39 -07:00
vector_3.h Fix ECHOPAIR ambiguity 2015-03-27 00:46:39 -07: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