1
0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-24 04:29:34 +00:00
MarlinFirmware/Marlin
Robert F-C 788d62bcc4 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Marlin.pde
	Marlin/ultralcd.cpp
	Marlin/ultralcd_implementation_hitachi_HD44780.h
2013-04-29 21:13:46 +10:00
..
cardreader.cpp Add (as an option) slower SD transfer mode 2013-04-24 10:50:57 +02:00
cardreader.h Fixed cardreader.h to resolve issue #440 (Pull Request #425 missing file) 2013-03-31 19:59:16 -04:00
Configuration_adv.h Added a feature to have filament change by gcode or display trigger. 2013-01-27 13:21:34 +01:00
Configuration.h Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-04-29 21:13:46 +10:00
ConfigurationStore.cpp Fix: Build error when EEPROM_SETTINGS is defined and PIDTEMP is undefined 2013-04-12 18:04:32 +02:00
ConfigurationStore.h Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup. 2012-12-03 12:52:00 +01:00
COPYING
create_speed_lookuptable.py
createTemperatureLookupMarlin.py
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 FIX: Speedup - no explicit display clear needed in u8glib 2013-04-16 14:22:24 +02:00
DOGMbitmaps.h Add bitmap graphics for GLCD 2013-03-19 19:57:35 +01:00
fastio.h Use the same fastio.h definition for AT90USB1286/7 and AT90USB646/7. 2012-12-08 15:16:38 -08:00
language.h Updated the card menu and watch messages to make it more informative. 2013-04-15 15:11:22 +02:00
LCD Menu Tree.pdf
LiquidCrystalRus.cpp
LiquidCrystalRus.h
Makefile fixes for ramps compilation using installed arduino ide 2013-01-08 12:54:31 +01:00
Marlin_main.cpp Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-04-29 21:13:46 +10:00
Marlin.h Added libraries from Arduino 1.0.3 for sanguino build 2013-01-07 17:26:50 +01:00
Marlin.pde Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-04-29 21:13:46 +10:00
MarlinSerial.cpp Stop redefining MOTHERBOARD and #define AT90USB instead. Also put #ifndef AT90USB around the HardwareSerial_h trick, so now Printrboard / Brainwave support compiles on Arduino 1.0.2 as well. 2012-12-09 01:32:09 -08:00
MarlinSerial.h Stop redefining MOTHERBOARD and #define AT90USB instead. Also put #ifndef AT90USB around the HardwareSerial_h trick, so now Printrboard / Brainwave support compiles on Arduino 1.0.2 as well. 2012-12-09 01:32:09 -08:00
Menu Plans.xlsx
motion_control.cpp
motion_control.h
pins.h Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-04-29 21:13:46 +10:00
planner.cpp Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values 2013-04-12 13:31:30 +02:00
planner.h Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values 2013-04-12 13:31:30 +02:00
Sd2Card.cpp
Sd2Card.h
Sd2PinMap.h
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
SdFatStructs.h
SdFatUtil.cpp
SdFatUtil.h
SdFile.cpp
SdFile.h
SdInfo.h
SdVolume.cpp
SdVolume.h
speed_lookuptable.h
stepper.cpp Merge pull request #1 from illuminarti/Fix_E_Speed 2013-03-18 23:36:11 +01:00
stepper.h Added optional feature to stop printing when an endstop is hit. Made the Z display on the LCD in 3.2 format instead of 3.1. Added LCD message when and endstop is hit. 2013-01-08 11:53:18 +01:00
temperature.cpp Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values 2013-04-12 13:31:30 +02:00
temperature.h Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values 2013-04-12 13:31:30 +02:00
thermistortables.h Merge pull request #414 from whosawhatsis/Marlin_v1 2013-03-25 13:14:49 -07:00
ultralcd_implementation_hitachi_HD44780.h Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-04-29 21:13:46 +10:00
ultralcd.cpp Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-04-29 21:13:46 +10:00
ultralcd.h Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-04-29 21:13:46 +10: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