Marlin/Marlin
Guillaume Seguin 34da3a0a3f Merge github.com:ErikZalm/Marlin into Marlin_v1
Conflicts:
	Marlin/language.h
2013-07-23 21:46:41 +02:00
..
cardreader.cpp Added : M32 - Select file and start SD print (Can be used when printing from SD card) 2013-07-14 22:39:59 +02:00
cardreader.h Support for 10 level deep SD folder hierarchy 2013-05-04 04:18:02 -07:00
Configuration_adv.h Disable DUAL_X_CARRIAGE by default 2013-07-20 23:50:30 +10:00
Configuration.h Merge github.com:ErikZalm/Marlin into Marlin_v1 2013-07-23 21:46:41 +02:00
ConfigurationStore.cpp added contrast control function for gLCDs 2013-07-14 15:28:26 +07: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 fixed bad lcd commit from makr3d 2013-07-15 17:34:21 +02:00
DOGMbitmaps.h Apply all changes from latest Marlin_V1 2013-06-06 15:49:25 -07:00
fastio.h Apply all changes from latest Marlin_V1 2013-06-06 15:49:25 -07:00
language.h Merge github.com:ErikZalm/Marlin into Marlin_v1 2013-07-23 21:46:41 +02:00
LCD Menu Tree.pdf
LiquidCrystalRus.cpp Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h 2013-05-02 09:22:58 -07:00
LiquidCrystalRus.h
Makefile added MaKr3d Melzi board 2013-07-14 15:17:55 +07:00
Marlin_main.cpp Merge github.com:ErikZalm/Marlin into Marlin_v1 2013-07-23 21:46:41 +02:00
Marlin.h Support dual x-carriage printers 2013-07-17 22:44:45 +10:00
Marlin.pde Apply all changes from latest Marlin_V1 2013-06-06 15:49:25 -07:00
MarlinSerial.cpp
MarlinSerial.h
Menu Plans.xlsx
motion_control.cpp
motion_control.h
pins.h Merge github.com:ErikZalm/Marlin into Marlin_v1 2013-07-23 21:46:41 +02:00
planner.cpp Moved corexy implementation from stepper to planner 2013-06-09 13:10:06 +02:00
planner.h Apply all changes from latest Marlin_V1 2013-06-06 15:49:25 -07:00
Sd2Card.cpp Fix for a few -Wextra warnings. 2012-11-12 15:35:28 +01:00
Sd2Card.h
Sd2PinMap.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +01:00
SdBaseFile.cpp
SdBaseFile.h
SdFatConfig.h
SdFatStructs.h Added long filename support. 2012-08-22 14:49:57 +02:00
SdFatUtil.cpp
SdFatUtil.h
SdFile.cpp First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions. 2012-11-06 12:06:41 +01:00
SdFile.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +01:00
SdInfo.h
SdVolume.cpp
SdVolume.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +01:00
Servo.cpp Apply all changes from latest Marlin_V1 2013-06-06 15:49:25 -07:00
Servo.h Apply all changes from latest Marlin_V1 2013-06-06 15:49:25 -07:00
speed_lookuptable.h
stepper.cpp Support dual x-carriage printers 2013-07-17 22:44:45 +10: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 Merge branch 'Marlin_v1' into thinkyhead 2013-06-09 22:26:47 +02:00
temperature.h Apply all changes from latest Marlin_V1 2013-06-06 15:49:25 -07: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 branch 'Marlin_v1' into thinkyhead 2013-06-09 22:26:47 +02:00
ultralcd_st7920_u8glib_rrd.h Apply all changes from latest Marlin_V1 2013-06-06 15:49:25 -07:00
ultralcd.cpp Merge github.com:ErikZalm/Marlin into Marlin_v1 2013-07-23 21:46:41 +02:00
ultralcd.h Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1 2013-07-14 15:45:49 +02:00
watchdog.cpp
watchdog.h