You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
AnHardt e917477fec Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
Conflicts:
	Marlin/dogm_lcd_implementation.h
	Marlin/fonts/make_fonts.bat

Claerd conflicts with my own #1621. (His was easy. :-) )

corrected typo in fonts/README.fonts

Applied changes to the new delta-configurations
 and deletet there some extra whitespace at the line-endings.
10 years ago
..
configurator Move TOPO_ORIGIN define to Configuration.h 10 years ago
example_configurations Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 10 years ago
fonts Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 10 years ago
scripts Moved font directory. Updated README.fonts 10 years ago
BlinkM.cpp Cleanup of cardreader.* 10 years ago
BlinkM.h Cleanup of cardreader.* 10 years ago
Configuration.h Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 10 years ago
ConfigurationStore.cpp Add Travel Acceleration and change the M204 options 10 years ago
ConfigurationStore.h Cleanup of cardreader.* 10 years ago
Configuration_adv.h Merge branch 'Development' into marlin_configurator 10 years ago
DOGMbitmaps.h Replaced some literal constants with defines 10 years ago
Makefile Remove hardcoded programmer option (-cwiring). Use variable AVRDUDE_PROGRAMMER. 10 years ago
Marlin.h Merge branch 'Development' into delta_auto_bed_level 10 years ago
Marlin.ino - Rename WRITE_E_STEP for consistency 10 years ago
Marlin.pde - Rename WRITE_E_STEP for consistency 10 years ago
MarlinSerial.cpp - Rename WRITE_E_STEP for consistency 10 years ago
MarlinSerial.h - Rename WRITE_E_STEP for consistency 10 years ago
Marlin_main.cpp Merge pull request #1631 from AnHardt/iss1593 10 years ago
Sd2Card.cpp - Rename WRITE_E_STEP for consistency 10 years ago
Sd2Card.h Revert "Move Sd library out into library" 10 years ago
Sd2PinMap.h - Rename WRITE_E_STEP for consistency 10 years ago
SdBaseFile.cpp Rename lastnr to autostart_index and... 10 years ago
SdBaseFile.h - Rename WRITE_E_STEP for consistency 10 years ago
SdFatConfig.h Rename lastnr to autostart_index and... 10 years ago
SdFatStructs.h Revert "Move Sd library out into library" 10 years ago
SdFatUtil.cpp Revert "Move Sd library out into library" 10 years ago
SdFatUtil.h Revert "Move Sd library out into library" 10 years ago
SdFile.cpp Revert "Move Sd library out into library" 10 years ago
SdFile.h Revert "Move Sd library out into library" 10 years ago
SdInfo.h Revert "Move Sd library out into library" 10 years ago
SdVolume.cpp - Rename WRITE_E_STEP for consistency 10 years ago
SdVolume.h Revert "Move Sd library out into library" 10 years ago
Servo.cpp Formatting cleanup of quiet sources 10 years ago
Servo.h Formatting cleanup of quiet sources 10 years ago
boards.h Updated PR to streamline integration 10 years ago
cardreader.cpp Some suggested changes for #1555 10 years ago
cardreader.h Cleanup of cardreader.* 10 years ago
digipot_mcp4451.cpp Cleanup of cardreader.* 10 years ago
dogm_font_data_6x9_marlin.h Added 5 new font.h files to main directory. 10 years ago
dogm_font_data_HD44780_C.h Corrected Cyrillic fonts. Round II. 10 years ago
dogm_font_data_HD44780_J.h Added 5 new font.h files to main directory. 10 years ago
dogm_font_data_HD44780_W.h Added 5 new font.h files to main directory. 10 years ago
dogm_font_data_ISO10646_1.h Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 10 years ago
dogm_font_data_ISO10646_5_Cyrillic.h Corrected cyrillic font again 10 years ago
dogm_font_data_ISO10646_Kana.h Added 5 new font.h files to main directory. 10 years ago
dogm_font_data_Marlin_symbols.h Added 5 new font.h files to main directory. 10 years ago
dogm_lcd_implementation.h Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 10 years ago
fastio.h - Rename WRITE_E_STEP for consistency 10 years ago
language.h Applied thinkyheads corrections from 2015-03-17 10 years ago
language_an.h Applied thinkyheads corrections from 2015-03-17 10 years ago
language_ca.h Applied thinkyheads corrections from 2015-03-17 10 years ago
language_de.h Applied thinkyheads corrections from 2015-03-17 10 years ago
language_en.h Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji 10 years ago
language_es.h Applied thinkyheads corrections from 2015-03-17 10 years ago
language_eu.h Applied thinkyheads corrections from 2015-03-17 10 years ago
language_fi.h Applied thinkyheads corrections from 2015-03-17 10 years ago
language_fr.h Applied thinkyheads corrections from 2015-03-17 10 years ago
language_it.h Applied thinkyheads corrections from 2015-03-17 10 years ago
language_kana.h Applied thinkyheads corrections from 2015-03-17 10 years ago
language_kana_utf8.h Applied thinkyheads corrections from 2015-03-17 10 years ago
language_nl.h Applied thinkyheads corrections from 2015-03-17 10 years ago
language_pl.h Applied thinkyheads corrections from 2015-03-17 10 years ago
language_pt-br.h Applied thinkyheads corrections from 2015-03-17 10 years ago
language_pt.h Applied thinkyheads corrections from 2015-03-17 10 years ago
language_ru.h Applied thinkyheads corrections from 2015-03-17 10 years ago
language_test.h Applied thinkyheads corrections from 2015-03-17 10 years ago
motion_control.cpp Update motion_control.cpp 10 years ago
motion_control.h Removed interrupt nesting in the stepper ISR. 13 years ago
pins.h Merge pull request #1546 from apollo-ng/pr-felix 10 years ago
pins_3DRAG.h Issue #1504 – K8200 Z_ENABLE_PIN 10 years ago
pins_5DPRINT.h Split up pins to make it more manageable 10 years ago
pins_99.h Split up pins to make it more manageable 10 years ago
pins_AZTEEG_X1.h Split up pins to make it more manageable 10 years ago
pins_AZTEEG_X3.h Azteeg X3 overrides too 10 years ago
pins_AZTEEG_X3_PRO.h Merge branch 'Development' into fixup_ramps_boards 10 years ago
pins_BAM_DICE_DUE.h Merge branch 'Development' into fixup_ramps_boards 10 years ago
pins_BRAINWAVE.h Split up pins to make it more manageable 10 years ago
pins_CHEAPTRONIC.h Cleanup rotary encoder encrot* defines 10 years ago
pins_DUEMILANOVE_328P.h Split up pins to make it more manageable 10 years ago
pins_ELEFU_3.h Cleanup rotary encoder encrot* defines 10 years ago
pins_FELIX2.h Minor fixes 10 years ago
pins_GEN3_MONOLITHIC.h Split up pins to make it more manageable 10 years ago
pins_GEN3_PLUS.h Split up pins to make it more manageable 10 years ago
pins_GEN6.h Split up pins to make it more manageable 10 years ago
pins_GEN6_DELUXE.h Split up pins to make it more manageable 10 years ago
pins_GEN7_12.h cleanup 10 years ago
pins_GEN7_13.h Split up pins to make it more manageable 10 years ago
pins_GEN7_14.h cleanup 10 years ago
pins_GEN7_CUSTOM.h Split up pins to make it more manageable 10 years ago
pins_HEPHESTOS.h Merge branch 'Development' into fixup_ramps_boards 10 years ago
pins_K8200.h Split up pins to make it more manageable 10 years ago
pins_LEAPFROG.h Max endstop pins disabled by configuration 10 years ago
pins_MEGATRONICS.h Cleanup rotary encoder encrot* defines 10 years ago
pins_MEGATRONICS_1.h Cleanup rotary encoder encrot* defines 10 years ago
pins_MEGATRONICS_2.h Cleanup rotary encoder encrot* defines 10 years ago
pins_MEGATRONICS_3.h Cleanup rotary encoder encrot* defines 10 years ago
pins_MELZI.h Split up pins to make it more manageable 10 years ago
pins_MELZI_1284.h Split up pins to make it more manageable 10 years ago
pins_OMCA.h Split up pins to make it more manageable 10 years ago
pins_OMCA_A.h Split up pins to make it more manageable 10 years ago
pins_PRINTRBOARD.h Split up pins to make it more manageable 10 years ago
pins_RAMBO.h Cleanup rotary encoder encrot* defines 10 years ago
pins_RAMPS_13.h Filament Runout Sensor Feature 10 years ago
pins_RAMPS_OLD.h Max endstop pins disabled by configuration 10 years ago
pins_RUMBA.h Cleanup of temperature code 10 years ago
pins_SANGUINOLOLU_11.h Split up pins to make it more manageable 10 years ago
pins_SANGUINOLOLU_12.h Split up pins to make it more manageable 10 years ago
pins_SAV_MKI.h Split up pins to make it more manageable 10 years ago
pins_SETHI.h cleanup 10 years ago
pins_STB_11.h Split up pins to make it more manageable 10 years ago
pins_TEENSY2.h Split up pins to make it more manageable 10 years ago
pins_TEENSYLU.h Split up pins to make it more manageable 10 years ago
pins_ULTIMAIN_2.h Split up pins to make it more manageable 10 years ago
pins_ULTIMAKER.h Split up pins to make it more manageable 10 years ago
pins_ULTIMAKER_OLD.h Split up pins to make it more manageable 10 years ago
pins_WITBOX.h Merge branch 'Development' into fixup_ramps_boards 10 years ago
planner.cpp Merge branch 'Development' into delta_auto_bed_level 10 years ago
planner.h Merge branch 'Development' into delta_auto_bed_level 10 years ago
qr_solve.cpp Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation" 10 years ago
qr_solve.h Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation" 10 years ago
speed_lookuptable.h Revert "Reduce PROGMEM warnings" 10 years ago
stepper.cpp fix macro 10 years ago
stepper.h - Rename WRITE_E_STEP for consistency 10 years ago
stepper_indirection.cpp - Add support for L6470 Drivers. 10 years ago
stepper_indirection.h - Add support for L6470 Drivers. 10 years ago
temperature.cpp Fix for #1612 10 years ago
temperature.h Cleanup of temperature code 10 years ago
thermistortables.h Extend the idea of dummy temperature sensors. 10 years ago
ultralcd.cpp Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 10 years ago
ultralcd.h - Rename WRITE_E_STEP for consistency 10 years ago
ultralcd_implementation_hitachi_HD44780.h Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji 10 years ago
ultralcd_st7920_u8glib_rrd.h Update ultralcd_st7920_u8glib_rrd.h 10 years ago
utf_mapper.h Applied thinkyheads corrections from 2015-03-17 10 years ago
vector_3.cpp Fix decimal places in G29 Bed Equation Coeficients 10 years ago
vector_3.h Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation" 10 years ago
watchdog.cpp Fix compiling the watchdog error message when the manual reset watchdog is used. 12 years ago
watchdog.h Various typo fixes - only in comments, no code changes. 11 years ago