92 Commits (53614e51442adaa6f254f8323e2fc0449e9b63dd)

Author	SHA1	Message	Date
Nicolas Rossi	a54fe2d73c	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1 ... Conflicts: Marlin/Marlin_main.cpp	11 years ago
hg42@gmx.net	2ca983568d	separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)	11 years ago
Nicolas Rossi	9bf1cf1b22	Pre-calculate diagonal rod length squared	11 years ago
Guillaume Seguin	6c42a3a339	Woops, fix logic	11 years ago
Guillaume Seguin	376d8af2c8	Report temperatures for all extruders	11 years ago
ErikZalm	434b6a05c1	Merge pull request #552 from iXce/Marlin_v1 ... Report temperatures for all extruders in reply to M105	11 years ago
Nicolas Rossi	55c287a69e	Fixed move from panel for delta bot #557	11 years ago
Jim Morris	b9d7ccf1cd	Merge remote-tracking branch 'upstream/Marlin_v1' into delta-configuration ... Conflicts: Marlin/Marlin_main.cpp	12 years ago
Guillaume Seguin	01ed99143c	Woops, fix logic	12 years ago
Guillaume Seguin	34da3a0a3f	Merge github.com:ErikZalm/Marlin into Marlin_v1 ... Conflicts: Marlin/language.h	12 years ago
Guillaume Seguin	18199ff960	Merge github.com:ErikZalm/Marlin into Marlin_v1	12 years ago
Robert F-C	fb5334f428	Fixed compile error when QUICK_HOME is defined. ... As well a couple of minor changes to handling of extruder offset for dual x-carriage mode.	12 years ago
Robert F-C	39cd3dbdbe	Remove dual x-carriage functionality that could/should be implemented in slicer ... Also added a couple of missed merge lines in homeaxis() from previous commit.	12 years ago
Jim Morris	d01ee7e7b5	fix zjerk being the same for delta as xy jerk ... add more delta defaults on delta make second home even slower	12 years ago
Robert F-C	d7390e13d9	Support dual x-carriage printers ... Dual x-carriage designs offer some substantial improvements for dual extruder printing.	12 years ago
Erik van der Zalm	59004023fd	Fixed typo	12 years ago
Erik van der Zalm	461dad6e05	Added : M32 - Select file and start SD print (Can be used when printing from SD card) ... Untested	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
Michael Mayer	e509cdbeb0	added contrast control function for gLCDs	12 years ago
Gord Christmas	fde17d5720	Fix for ugly code compilation errors in SERVO_ENDSTOP checks	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	ac975ed8c2	Merge branch 'deltabot' into Marlin_v1	12 years ago
Jim Morris	caa848f943	fix homing for deltas	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	01edf22a10	Fix home_all_axis to make QUICK_HOME work with Repetier-Host which sends G28 X0 Y0 Z0 instead of G28. Thanks to Matt Schoenholz for reporting this issue.	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
Scott Lahteine	5dabc95409	Apply all changes from latest Marlin_V1 ... Diffed and merged, preserving my updates	12 years ago
Gord Christmas	a733537ddd	Missed some variable declarations ... Integrated fixes from henrikbrixandersen pull request #504	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
Erik van der Zalm	971ec35135	Expanded M302 to allow setting the temp	12 years ago
Erik van der Zalm	5090c56651	More redundant temp sensor changes. (After testing and debugging by reifsnderb)	12 years ago
Guillaume Seguin	16b9239a26	Report temperatures for all extruders	12 years ago
Robert F-C	40eb07bad4	Revert and extend previous change pin check change ... Reviert previous change of #if BLAH_PIN > 0 to #if defined(BLAH_PIN) && BLAH_PIN > -1. Unfortunately some times pin 0 is used. For my sins I've gone through and replaced all unsafe checks of #if BLAH_PIN > -1 with the safe version.	12 years ago
Robert F-C	0d4a9444c4	Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1	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
Jordan Miller	fbd899a37d	Support for BariCUDA Paste Extruder derived from MakerBot Frostruder. Using Ultimachine RAMBo board. M126/M127 and M128/M129.	12 years ago
midopple	db2f157a22	Replace the <= to < in the Command M907, M350 and M351. ... The for loop for Axis count over the Array. Add a break after M907	12 years ago
Arnoud	fc4ab05157	Solved minor bug in controllerFan() ... Extruder 2 was checked where extruder 1 should be checked.	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
Robert F-C	d5ad7a0814	Rework change to incorporate CONTROLLERFAN ... Also refactor extruder auto fan logic to simplify further and now only check every 2.5 seconds	12 years ago
Robert F-C	c3cdaceab3	Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1	12 years ago
Robert F-C	7f57f28ccc	Add lcd_buzz function to ultralcd.h so that non-LCD code can make use of lcd's buzzer. ... Argument order of lcd_buzz was set to mirror that on tone(). Change default M300 frequency to something audible.	12 years ago
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	12 years ago
Simon Oliver	5d5909fc25	Fix failure to compile with heated bed: remove call to non-existant scaleBedPID().	12 years ago
Simon Oliver	93f0463b21	Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values ... Add new 'callback' edit-menu types that call a function after the edit is done. Use this to display and edit Ki and Kd correctly (removing the scaling first and reapplying it after). Also use it to reset maximum stepwise acceleration rates, after updating mm/s^2 rates via menus. (Previously, changes did nothing to affect planner unless saved back to EEPROM, and the machine reset). Add calls to updatePID() so that PID loop uses updated values whether set by gcode (it already did this), or by restoring defaults, or loading from EEPROM (it didn't do those last two). Similarly, update the maximum step/s^2 accel rates when the mm/s^2 values are changed - whether by menu edits, restore defaults, or EEPROM read. Refactor the acceleration rate update logic, and the PID scaling logic, into new functions that can be called from wherever, including the callbacks. Add menu items to allow the z jerk and e jerk to be viewed/edited in the Control->Motion menu, as per xy jerk. Conflicts: Marlin/language.h	12 years ago
ErikZalm	7f622467fc	Merge pull request #425 from kefir-/m928_logging ... M928 logging	12 years ago
ErikZalm	86867928ac	Merge pull request #434 from DDRBoxman/Marlin_v1 ... Add support for M300: Play beep sound	12 years ago