bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
6a81291c57
Marlin_Firmware/Marlin
History
kiyoshigawa 6a81291c57 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 
This should fix issues with pull request 467, I hope.

Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin.pde
	Marlin/ultralcd_implementation_hitachi_HD44780.h
2013-06-08 08:48:18 -06: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 More redundant temp sensor changes. (After testing and debugging by reifsnderb) 2013-05-29 19:29:30 +02:00
Configuration.h Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2013-06-08 08:48:18 -06: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 first commit 2011-08-12 22:28:35 +02:00
create_speed_lookuptable.py Added 20MHz support. 2012-03-11 12:25:04 +01:00
createTemperatureLookupMarlin.py Added new temperature lookup table creation tool. This one uses stein hart-hart equations. 2012-11-16 23:51:05 +01: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 faster GLCD (ST7920 SW-SPI) implementation / fixes 2013-06-05 16:27:44 +02:00
DOGMbitmaps.h fixed typo / added "const" to defines for newer gcc compatibility 2013-05-21 17:58:34 +02:00
fastio.h Added support for Megatronics v2.0 and Minitronics v1.0 2013-05-28 14:03:31 +02: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 Added PDF file containing Menu Tree for documentation purposes. Source xlsx document included. 2012-08-29 21:08:41 +01:00
LiquidCrystalRus.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
LiquidCrystalRus.h Enables support the Cyrillic alphabet for LCD 2012-10-12 19:06:43 +04:00
Makefile Forgot to include reference to Servo in makefile 2013-05-16 08:25:20 -07:00
Marlin_main.cpp Missed some variable declarations 2013-06-06 09:18:03 -07:00
Marlin.h Revert and extend previous change pin check change 2013-05-22 21:33:23 +10:00
Marlin.pde Revert and extend previous change pin check change 2013-05-22 21:33:23 +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 Tidy up 2012-08-29 22:53:41 +01:00
motion_control.cpp software_endstops: use *_MIN_POS and *_MAX_POS for arcs 2012-08-10 19:36:30 +01:00
motion_control.h Removed interrupt nesting in the stepper ISR. 2011-11-27 21:12:55 +01:00
pins.h Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2013-06-08 08:48:18 -06:00
planner.cpp Expanded M302 to allow setting the temp 2013-06-02 17:36:23 +02:00
planner.h Expanded M302 to allow setting the temp 2013-06-02 17:36:23 +02:00
Sd2Card.cpp Fix for a few -Wextra warnings. 2012-11-12 15:35:28 +01:00
Sd2Card.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +01:00
Sd2PinMap.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +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 Added long filename support. 2012-08-22 14:49:57 +02:00
SdFatConfig.h Added long filename support. 2012-08-22 14:49:57 +02:00
SdFatStructs.h Added long filename support. 2012-08-22 14:49:57 +02:00
SdFatUtil.cpp Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0. 2012-02-11 16:02:47 +01:00
SdFatUtil.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +01:00
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 made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +01:00
SdVolume.cpp made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +01:00
SdVolume.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +01:00
Servo.cpp Missed some variable declarations 2013-06-06 09:18:03 -07:00
Servo.h First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple. 2013-05-16 07:03:01 -07:00
speed_lookuptable.h Made the 2nd speed lookup table condition more explicit. 2012-11-11 12:02:48 +01:00
stepper.cpp Revert and extend previous change pin check change 2013-05-22 21:33:23 +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 More redundant temp sensor changes. (After testing and debugging by reifsnderb) 2013-05-29 19:29:30 +02:00
temperature.h Added redundant temp sensor 2013-05-26 17:57:49 +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 branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2013-06-08 08:48:18 -06:00
ultralcd_st7920_u8glib_rrd.h faster GLCD (ST7920 SW-SPI) implementation / fixes 2013-06-05 16:27:44 +02:00
ultralcd.cpp fixed merge 2013-05-20 14:52:35 +02:00
ultralcd.h Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-05-18 21:59:39 +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 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