220 Commits (97b0da0c2e33270ea56e7c801ce5c15b0c4d0a2f)

Author	SHA1	Message	Date
Tim Koster	61db046b32	Added #ifdef BLINKM around new code. Also refined BlinkM.h.	11 years ago
Tim Koster	88dfeefca3	Define BlinkM default disabled	11 years ago
Tim Koster	5350faf2a2	Merge https://github.com/timkoster/MarlinBlinkM into Marlin_v1	11 years ago
Tim Koster	7016cc9511	Added BlinkM support over i2c	11 years ago
Tim Koster	3b315b3da0	Added BlinkM support over i2c	11 years ago
Nicolas Rossi	a54fe2d73c	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1 ... Conflicts: Marlin/Marlin_main.cpp	12 years ago
hg42@gmx.net	2ca983568d	separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)	12 years ago
Nicolas Rossi	9bf1cf1b22	Pre-calculate diagonal rod length squared	12 years ago
Nicolas Rossi	4623e78ce0	Added Honeywell thermistor 135-104LAF-J01	12 years ago
Guillaume Seguin	34da3a0a3f	Merge github.com:ErikZalm/Marlin into Marlin_v1 ... Conflicts: Marlin/language.h	12 years ago
Erik van der Zalm	c4a2077951	M109 and M190 now wait when cooling down if R is used instead of S. ... M109 S180 waits only when heating. M109 R180 also waits when cooling.	12 years ago
Erik van der Zalm	6397b3339c	restored configuration.h defaults	12 years ago
Michael Mayer	e509cdbeb0	added contrast control function for gLCDs	12 years ago
Michael Mayer	99b7e926e7	added MaKr3d Melzi board	12 years ago
Erik van der Zalm	ecf3ab5de4	Added thermistor 60 to configuration.h	12 years ago
Nicolas Rossi	2daa85918e	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1 ... Conflicts: Marlin/Configuration.h Marlin/Marlin_main.cpp Marlin/language.h Marlin/pins.h Marlin/ultralcd.cpp	12 years ago
Erik van der Zalm	2015989f84	Added DISABLE_MIN_ENDSTOPS	12 years ago
Christian Inci	648d45cfb2	Fix Pin Description Typo ... Reverse 'Bed' and 'Fan' at the RAMPS 33 Description. Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>	12 years ago
lajos	02dee80fa5	added Azteeg X1 motherboard	12 years ago
Erik van der Zalm	e34c9981ab	Delta disabled by default	12 years ago
Erik van der Zalm	7ad12be763	Merge branch 'Marlin_v1' of https://github.com/codexmas/Marlin into codexmas-Marlin_v1 ... Conflicts: Marlin/Configuration.h README.md	12 years ago
Erik van der Zalm	408169aef4	Merge branch 'Marlin_v1' of https://github.com/BorisLandoni/Marlin into BorisLandoni-Marlin_v1 ... Conflicts: Marlin/Configuration.h Marlin/language.h Marlin/pins.h	12 years ago
Erik van der Zalm	bd96d22bfb	Merge branch 'Marlin_v1' into thinkyhead ... Conflicts: Marlin/Configuration.h Marlin/Configuration_adv.h Marlin/Marlin.h Marlin/Marlin_main.cpp Marlin/Servo.cpp Marlin/language.h Marlin/pins.h Marlin/planner.cpp Marlin/ultralcd_implementation_hitachi_HD44780.h README.md	12 years ago
Erik van der Zalm	6f4a6e531c	Merge branch 'deltabot' into Marlin_v1	12 years ago
Erik van der Zalm	ff6fa09ecf	Moved corexy implementation from stepper to planner ... (Thanks iquizzle)	12 years ago
Erik van der Zalm	c8dcc7c208	Allow increasing the software PWM frequency.	12 years ago
Erik van der Zalm	373f3ecab3	Merge branch 'deltabot' of https://github.com/jcrocholl/Marlin into deltabot ... Conflicts: Marlin/Configuration.h Marlin/Marlin_main.cpp Marlin/pins.h	12 years ago
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	12 years ago
BorisLandoni	c1cb5977ee	Update Configuration.h	12 years ago
BorisLandoni	8a5bd8a808	Update Configuration.h	12 years ago
BorisLandoni	6588933c04	Update Configuration.h	12 years ago
Scott Lahteine	5dabc95409	Apply all changes from latest Marlin_V1 ... Diffed and merged, preserving my updates	12 years ago
Gord Christmas	f4f30c9d64	Added servo actuated enstop coding to allow G28 command to engage and retract a servo to specified angles.	12 years ago
Erik van der Zalm	79374f0b93	Merge branch 'reisnyderb' of https://github.com/ErikZalm/Marlin into Marlin_v1	12 years ago
kiyoshigawa	4b19c8552e	Fixing changed Configuration.h settings to be default values per ErikZalm Request.	12 years ago
Erik van der Zalm	5090c56651	More redundant temp sensor changes. (After testing and debugging by reifsnderb)	12 years ago
Gatulibu	b78fa6bb70	Added support for Megatronics v2.0 and Minitronics v1.0 ... merged from code downloaded from reprapworld.com	12 years ago
Erik van der Zalm	9be61cdc02	Added redundant temp sensor	12 years ago
Alexander Kasimir	e2ff536b03	Fixed typo in Comment	12 years ago
Robert F-C	0d4a9444c4	Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1	12 years ago
Gord Christmas	28ada096e2	Adding servo documentation	12 years ago
Robert F-C	dfa549f268	Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1	12 years ago
Gord Christmas	dc59f07d24	First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple.	12 years ago
Erik van der Zalm	bd2cd4903e	Added #ifdef BARICUDA around the BariCUDA changes	12 years ago
gregor	2739c26c4f	changes: ... - changed the variables from keypad to reprapworld_keypad - added a missing ifdef check	12 years ago
gregor	6fb9573157	added support for the reprapworld keypad	12 years ago
Tim Anderson	1fa61c297e	Turning off Control Panel by Default and Updating the link to the LiquidCrystal_I2C library to avoid confusion.	12 years ago
kiyoshigawa	b27a59f41e	Added support for Elefu RA Board and Elefu Control Panel	12 years ago
Scott Lahteine	0ef54f2f85	Make M303 silent when "S0" is sent ... If S is left out perhaps it should be silent, but check the spec for this M code.	12 years ago
Scott Lahteine	a200521eab	Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h ... Also cosmetic comment changes and spelling corrections in printed messages	12 years ago