892 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robert F-C	4121311b9d	Change to LCD status indicators ... The I2C LCD status indicators now indicate when the hotends or bed are turned on at all (rather than just when they are in their heating phase)	2013-05-18 22:30:42 +10:00
Robert F-C	dfa549f268	Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1	2013-05-18 21:59:39 +10:00
ErikZalm	64360164ad	Merge pull request #482 from codexmas/Marlin_v1 ... servosupport	2013-05-16 10:19:00 -07:00
ErikZalm	86405cdd11	Merge pull request #479 from MStohn/thermocouple ... BUGFIXES for temperature.cpp / add RUMBA thermocouple support	2013-05-16 10:06:59 -07:00
Erik van der Zalm	6c45c3f4e7	BariCUDA changes	2013-05-16 19:01:12 +02:00
Gord Christmas	96624f0f31	Forgot to include reference to Servo in makefile	2013-05-16 08:25:20 -07:00
Gord Christmas	dc59f07d24	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
Gord Christmas	b668cb0516	Adding in clean copies of Servo library from Arduino 1.0.4	2013-05-16 06:47:42 -07:00
MaikStohn	95dff34b73	fixed wrong compare for min temp check of heater 1 and heater 2	2013-05-16 01:17:38 +02:00
MaikStohn	4cc6f9f6de	fixed wrong pin initialization when using temperature 2 pin input	2013-05-16 01:17:08 +02:00
MaikStohn	61a48cc662	Add support for RUMBA thermocouple add on	2013-05-16 01:16:33 +02:00
MaikStohn	9cc15876be	Add support for RUMBA thermocouple add on	2013-05-16 01:16:08 +02:00
ErikZalm	c9cf2174dd	Merge pull request #474 from xifle/Marlin_v1 ... Fixed "Cooldown" Selection not reseting bed temp	2013-05-14 14:58:53 -07:00
Erik van der Zalm	bd2cd4903e	Added #ifdef BARICUDA around the BariCUDA changes	2013-05-14 23:56:32 +02:00
Jordan Miller	37f3199df3	fixed problems in planner with solenoids for BariCUDA when set to 0	2013-05-14 23:35:01 +02:00
Jordan Miller	fbd899a37d	Support for BariCUDA Paste Extruder derived from MakerBot Frostruder. Using Ultimachine RAMBo board. M126/M127 and M128/M129.	2013-05-14 23:34:45 +02:00
xifle	29bb8d7d4f	Fixed "Cooldown" Selection not reseting bed temp ... - enquecommand with multiple lines "\n" doesn't work -> M140 S0 didn't get processed. So I wrote a new func for the cooldown which uses setTargetHotend. In addition this does return to status page after selection. - Added setWatch() to preheat-functions (Temperatur sanity check would never have worked when preheating from the lcd panel)	2013-05-14 16:56:19 +02:00
Robert F-C	015d0594b0	Optimize menu selection for Viki rotary encoder. ... The Viki LCD rotary encoder uses a different number of steps per rotation. This fixes the seeming "missed" steps when selecting a menu.	2013-05-12 07:51:28 +10:00
ErikZalm	90664d20a4	Merge pull request #472 from gregor2005/Marlin_v1 ... added support for the reprapworld keypad	2013-05-10 13:26:17 -07:00
gregor	2739c26c4f	changes: ... - changed the variables from keypad to reprapworld_keypad - added a missing ifdef check	2013-05-10 22:20:02 +02:00
gregor	6fb9573157	added support for the reprapworld keypad	2013-05-10 21:57:17 +02:00
ErikZalm	2c0fa34c9e	Merge pull request #466 from midopple/Marlin_v1 ... BUG Fix in Commands M907,M350 and M351	2013-05-05 14:24:48 -07:00
midopple	a65a26d6b4	If CORE_XY is in use X and Y Axis had to be activated at the same time	2013-05-05 19:23:59 +02:00
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	2013-05-05 19:19:55 +02:00
daid	e3bc420daa	Merge pull request #464 from arnoudja/Marlin_v1 ... Solved minor bug in controllerFan()	2013-05-03 12:38:23 -07:00
Arnoud	fc4ab05157	Solved minor bug in controllerFan() ... Extruder 2 was checked where extruder 1 should be checked.	2013-05-03 21:32:34 +02:00
daid	727aa2a051	Merge pull request #459 from martinxyz/fix-rounding-error ... fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error	2013-05-02 08:34:03 -07:00
Martin Renold	1a397825f9	fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error	2013-05-01 08:30:24 +02:00
Robert F-C	1c127217df	Make DOGLCD merge neater.	2013-04-29 22:03:37 +10:00
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.	2013-04-29 21:50:52 +10:00
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
ErikZalm	4f96ad5621	Merge pull request #456 from Stefanowicz/Marlin_v1 ... Add (as an option) slower SD transfer mode	2013-04-24 02:01:52 -07:00
Lukasz Stefanowicz	d71f1e9bf6	Add (as an option) slower SD transfer mode	2013-04-24 10:50:57 +02:00
ErikZalm	db5bb8546d	Merge pull request #452 from MStohn/Marlin_v1 ... 128x64 RepRapDiscount Full Graphic Smart Controller support	2013-04-23 09:43:37 -07:00
daid	4b2ece159b	Merge pull request #453 from brackendawson/Marlin_v1 ... Make Gen7 1.4+ heater temp sensort pins match silkscreen.	2013-04-16 10:12:25 -07:00
Bracken Dawson	d5ee2a5a62	Make Gen7 1.4 heater pins match silkscreen	2013-04-16 17:37:38 +01:00
MaikStohn	7ac6d7f78e	FIX: Speedup - no explicit display clear needed in u8glib	2013-04-16 14:22:24 +02:00
MaikStohn	13596e8722	Added RepRapDiscount FULL GRAPHIC Smart Controller	2013-04-16 14:21:39 +02:00
MaikStohn	3a6abe1d6e	Removed STB custom font hack from u8glib library and moved to marlin project	2013-04-16 13:54:39 +02:00
MaikStohn	16afbf9bfa	FIX: adopted latest changes from hitachi implementation	2013-04-16 13:51:48 +02:00
MaikStohn	c83863d5d6	add U8glib library to Arduino1.x includes	2013-04-16 12:44:54 +02:00
daid303	34bca48b98	Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1	2013-04-15 15:11:38 +02:00
daid303	ac52dcc174	Updated the card menu and watch messages to make it more informative.	2013-04-15 15:11:22 +02:00
daid	84920e9c58	Merge pull request #449 from Stefanowicz/Marlin_v1 ... Fix: Build error when EEPROM_SETTINGS is defined and PIDTEMP is undefined	2013-04-12 13:45:15 -07:00
Stefanowicz	31bb3fb297	Fix: Build error when EEPROM_SETTINGS is defined and PIDTEMP is undefined	2013-04-12 18:04:32 +02:00
daid303	c80a78bb70	Lower the default max E feedrate a bit. With the stepper fix this is much to high.	2013-04-12 13:54:38 +02:00
Simon Oliver	5d5909fc25	Fix failure to compile with heated bed: remove call to non-existant scaleBedPID().	2013-04-12 13:32:47 +02:00
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	2013-04-12 13:31:30 +02:00
ErikZalm	1f74ef4157	Merge pull request #441 from bkpsu/Marlin_v1 ... Fixed cardreader.h to resolve issue #440 (Pull Request #425 missing file)	2013-04-01 01:06:10 -07:00
Bart K	4fa2260a59	Fixed cardreader.h to resolve issue #440 (Pull Request #425 missing file)	2013-03-31 19:59:16 -04:00