1
0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-27 22:08:02 +00:00
MarlinFirmware/Marlin
Steffen Vogel 69dc411ae0 Merge branch 'Development' of github.com:MarlinFirmware/Marlin into LogoLCD
Conflicts:
	Marlin/dogm_lcd_implementation.h
2015-01-10 14:57:11 +01:00
..
example_configurations Correct some mistakes 2015-01-06 21:55:08 +01: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
BlinkM.h
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 DOGLCD and LCD_PROGRESS_BAR to coexist 2015-01-09 18:16:56 -08:00
Configuration.h adding string for bouts splash string to config 2015-01-09 18:48:30 +01:00
ConfigurationStore.cpp Fix syntax error caused by previous changes. 2015-01-02 11:12:16 -05:00
ConfigurationStore.h
digipot_mcp4451.cpp Defines for electronics boards 2014-12-18 13:59:31 -08:00
dogm_font_data_marlin.h
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
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 Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language_de.h Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language_en.h Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language_es.h Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language_eu.h Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language_fi.h Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language_fr.h Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language_it.h Correct some mistakes 2015-01-06 21:55:08 +01:00
language_nl.h Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language_pl.h Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language_pt.h Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language_ru.h Revert "Add "Detailed Z Probe" menu item with ABL is defined." 2015-01-04 21:53:37 -05:00
language.h Update Marlin Firmware URL 2015-01-07 05:26:47 -06:00
LiquidCrystalRus.cpp
LiquidCrystalRus.h
Makefile
Marlin_main.cpp Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into Development 2015-01-09 21:33:29 +01:00
Marlin.h Fix CoreXY speed calculation 2015-01-06 16:39:48 -02:00
Marlin.ino
Marlin.pde
MarlinSerial.cpp Simple code cleanup. Rename "homeing" to homing. 2014-10-05 13:20:53 -07:00
MarlinSerial.h
motion_control.cpp Update motion_control.cpp 2014-10-04 09:24:09 +02:00
motion_control.h
pins.h Update pins.h 2014-12-31 13:04:16 +13:00
planner.cpp Fix CoreXY speed calculation 2015-01-06 16:39:48 -02: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
Sd2Card.h
Sd2PinMap.h
SdBaseFile.cpp
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 Fix regressions affecting compilation 2014-12-30 07:36:18 -08:00
SdFatUtil.h
SdFile.cpp
SdFile.h
SdInfo.h
SdVolume.cpp
SdVolume.h
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
stepper.cpp Toshiba Stepper Driver support 2014-12-03 15:01:52 +01:00
stepper.h
temperature.cpp I have added some code in the "temperature.cpp" for have the possibility of control the time of the states with the heater drived by relays, with this feature now it is possible use PID function in conjunction with relay to control the temperature. I have made some tests and the temperature stay always in the range of +-1°C from the setted temp. 2015-01-06 18:32:17 +01:00
temperature.h Added "auto fan" checks to PID_autotune 2014-12-23 23:50:00 -05:00
thermistortables.h Update line 627 ,wrong number on thermistortables 2014-10-06 14:21:44 +02: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
ultralcd.cpp DOGLCD and LCD_PROGRESS_BAR to coexist 2015-01-09 18:16:56 -08:00
ultralcd.h DOGLCD and LCD_PROGRESS_BAR to coexist 2015-01-09 18:16:56 -08: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
watchdog.h