1
0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-24 04:29:34 +00:00
MarlinFirmware/Marlin
daid 17de96ace7 Merge branch 'Marlin_v1' into revert-1154-sd_sorting
Conflicts:
	Marlin/cardreader.cpp
	Marlin/cardreader.h
2014-12-18 23:13:50 +01:00
..
example_configurations Merge branch 'Marlin_v1' into revert-1154-sd_sorting 2014-12-18 23:13:50 +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 Defines for electronics boards 2014-12-18 13:59:31 -08: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 Merge branch 'Marlin_v1' into revert-1154-sd_sorting 2014-12-18 23:13:50 +01:00
Configuration.h Clean up configs 2014-12-18 13:59:31 -08:00
ConfigurationStore.cpp Using axis constants 2014-12-18 08:13:08 -08:00
ConfigurationStore.h Removed Delta from the default config file. 2013-09-14 13:50:09 +02:00
COPYING
create_speed_lookuptable.py
createTemperatureLookupMarlin.py Add M605 to dynamically set delta configuration 2014-02-17 20:50:59 -08: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 pull request #1192 from thinkyhead/split_language 2014-12-18 22:26:55 +01:00
DOGMbitmaps.h Adaption of LCD info screen 2014-11-12 17:10:48 +01:00
fastio.h Various typo fixes - only in comments, no code changes. 2014-02-25 09:52:58 +00:00
language_an.h Clean up, move unused to the bottom, add headings 2014-12-18 10:33:00 -08:00
language_ca.h Clean up, move unused to the bottom, add headings 2014-12-18 10:33:00 -08:00
language_de.h Clean up, move unused to the bottom, add headings 2014-12-18 10:33:00 -08:00
language_en.h Clean up, move unused to the bottom, add headings 2014-12-18 10:33:00 -08:00
language_es.h Clean up, move unused to the bottom, add headings 2014-12-18 10:33:00 -08:00
language_eu.h Clean up, move unused to the bottom, add headings 2014-12-18 10:33:00 -08:00
language_fi.h Clean up, move unused to the bottom, add headings 2014-12-18 10:33:00 -08:00
language_fr.h Clean up, move unused to the bottom, add headings 2014-12-18 10:33:00 -08:00
language_it.h Clean up, move unused to the bottom, add headings 2014-12-18 10:33:00 -08:00
language_nl.h Clean up, move unused to the bottom, add headings 2014-12-18 10:33:00 -08:00
language_pl.h Clean up, move unused to the bottom, add headings 2014-12-18 10:33:00 -08:00
language_pt.h Clean up, move unused to the bottom, add headings 2014-12-18 10:33:00 -08:00
language_ru.h Clean up, move unused to the bottom, add headings 2014-12-18 10:33:00 -08:00
language.h Defines for electronics boards 2014-12-18 13:59:31 -08:00
LCD Menu Tree.pdf Update the menu plan document with the current menu as per ultralcd.cpp. 2014-02-20 14:20:27 +00:00
LiquidCrystalRus.cpp Various typo fixes - only in comments, no code changes. 2014-02-17 10:58:36 +00:00
LiquidCrystalRus.h
Makefile Support for Gen3 Monolithic electronics 2014-05-06 19:24:20 -05:00
Marlin_main.cpp Using axis constants 2014-12-18 08:13:08 -08:00
Marlin.h Merge pull request #1037 from filipmu/Filament-Sensor 2014-10-11 22:56:01 +02:00
Marlin.ino Add Azteeg X3 Pro as motherboard 68 2014-02-05 01:47:12 -08:00
Marlin.pde Add Azteeg X3 Pro as motherboard 68 2014-02-05 01:47:12 -08:00
MarlinSerial.cpp Simple code cleanup. Rename "homeing" to homing. 2014-10-05 13:20:53 -07:00
MarlinSerial.h Initial SAV MkI (RepRap CloneWars board) integration. 2013-10-30 11:45:32 +01:00
Menu Plans.xlsx Update the menu plan document with the current menu as per ultralcd.cpp. 2014-02-20 14:20:27 +00:00
motion_control.cpp Update motion_control.cpp 2014-10-04 09:24:09 +02:00
motion_control.h
pins.h Defines for electronics boards 2014-12-18 13:59:31 -08:00
planner.cpp Using axis constants 2014-12-18 08:13:08 -08:00
planner.h Using axis constants 2014-12-18 08:13:08 -08:00
qr_solve.cpp Various typo fixes - only in comments, no code changes. 2014-02-25 10:01:15 +00:00
qr_solve.h Simplify 3-point probing using new code only 2014-02-19 21:48:05 -08:00
Sd2Card.cpp Add feature to check&retry CRC read errors on SD. 2014-05-01 12:03:41 +02:00
Sd2Card.h Add feature to check&retry CRC read errors on SD. 2014-05-01 12:03:41 +02:00
Sd2PinMap.h Initial SAV MkI (RepRap CloneWars board) integration. 2013-10-30 11:45:32 +01:00
SdBaseFile.cpp Few simple fixes that save RAM, as static strings are stored in RAM by default. 2012-11-28 10:30:34 +01:00
SdBaseFile.h
SdFatConfig.h Merge branch 'Marlin_v1' into revert-1154-sd_sorting 2014-12-18 23:13:50 +01:00
SdFatStructs.h
SdFatUtil.cpp
SdFatUtil.h
SdFile.cpp
SdFile.h
SdInfo.h
SdVolume.cpp
SdVolume.h
Servo.cpp Bed Auto Leveling feature 2013-09-29 13:20:06 -03:00
Servo.h Various typo fixes - only in comments, no code changes. 2014-02-25 09:52:58 +00:00
speed_lookuptable.h Made the 2nd speed lookup table condition more explicit. 2012-11-11 12:02:48 +01:00
stepper.cpp Toshiba Stepper Driver support 2014-12-03 15:01:52 +01:00
stepper.h Various typo fixes - only in comments, no code changes. 2014-02-25 09:52:58 +00:00
temperature.cpp Defines for electronics boards 2014-12-18 13:59:31 -08:00
temperature.h Real-time filament diameter measurement and control 2014-08-06 19:30:57 -05:00
thermistortables.h Update line 627 ,wrong number on thermistortables 2014-10-06 14:21:44 +02:00
ultralcd_implementation_hitachi_HD44780.h Split up languages.h, use ISO codes 2014-12-18 09:31:19 -08: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 Merge branch 'Marlin_v1' into revert-1154-sd_sorting 2014-12-18 23:13:50 +01:00
ultralcd.h Reduce dogm lcd code 2014-12-18 07:03:40 -08:00
vector_3.cpp Fix issue 935: error in matrix calculation 2014-08-28 21:10:50 +02:00
vector_3.h Fixed the plane vector equation to a simpler one (only dependent on the normal) 2013-12-06 21:32:21 +01: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