Marlin-Artillery-M600

Archived

Author	SHA1	Message	Date
David Forrest	8c4377dd63	temperature.cpp: Fix PID_DEBUG compile error.	2014-02-26 00:44:22 -05:00
ErikZalm	fde8c2c310	Merge pull request #807 from Cylindric3D/typofixes_upstream5 Various typo fixes #5 - only in comments, no code changes.	2014-02-25 18:49:41 +01:00
Cylindric	fdce91192e	Various typo fixes - only in comments, no code changes.	2014-02-25 10:01:15 +00:00
Cylindric	d819c55395	Various typo fixes - only in comments, no code changes.	2014-02-25 09:52:58 +00:00
ErikZalm	fd4542f33a	Merge pull request #805 from whosawhatsis/M200 autretract fix	2014-02-24 22:35:08 +01:00
ErikZalm	e8291ed728	Merge pull request #802 from Makers-Tool-Works/Marlin_v1 Clarify which PID values to enter	2014-02-24 22:31:13 +01:00
ErikZalm	465b654d24	Merge pull request #797 from Cylindric3D/update_menu_plan Update menu plan	2014-02-24 22:30:19 +01:00
ErikZalm	88506a80c3	Merge pull request #789 from smiler/Marlin_v1 Fixed typo.	2014-02-24 22:26:31 +01:00
ErikZalm	b514d3c87f	Merge pull request #781 from Cylindric3D/typofixes_upstream Various typo fixes #3 - only in comments, no code changes.	2014-02-24 22:25:38 +01:00
whosawhatsis	77df0d689a	autretract fix I made these changes previously, but I can’t find the commit now. This reapplies the changes to get auto retract working again. Conflicts: Marlin/Configuration_adv.h Marlin/Marlin_main.cpp	2014-02-24 13:24:38 -08:00
ErikZalm	cc5f1d475c	Merge pull request #772 from ellensp/Marlin_v1 Updated gen3+ board pins names to current convention	2014-02-24 22:22:15 +01:00
Cylindric	91759dede6	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream	2014-02-24 17:29:37 +00:00
Cylindric	557217fc05	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan	2014-02-24 17:29:24 +00:00
RoyOnWheels	aee63afccd	Clarify which PID values to enter Users can be confused as to which values to enter after a PID tune. Updating the message to help clarity it. New message: "PID Autotune finished! Put the last Kp, Ki and Kd constants from above into Configuration.h" Old message: "PID Autotune finished! Put the Kp, Ki and Kd constants into Configuration.h"	2014-02-23 14:36:50 -08:00
Gabe Rosenhouse	99f6326544	Remove unnecessary dependency on time.h from qr_solve.cpp Fixed compiler errors on Ubuntu using arduino-core	2014-02-20 16:43:37 -08:00
Cylindric	ea669cb504	Fix some extra and some missing tabs, to make the file consistent.	2014-02-20 14:28:29 +00:00
Cylindric	b46a1b6360	Update the menu plan document with the current menu as per ultralcd.cpp.	2014-02-20 14:20:27 +00:00
Cylindric	3cc7626d1f	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan	2014-02-20 14:12:10 +00:00
Gabe Rosenhouse	174b8d99d5	Simplify 3-point probing using new code only	2014-02-19 21:48:05 -08:00
Gabe Rosenhouse	3b718b816c	better documentation	2014-02-19 14:04:37 -08:00
Gabe Rosenhouse	34fd59c370	ABL at any points	2014-02-19 13:18:21 -08:00
Cylindric	541155ea87	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream	2014-02-19 15:52:18 +00:00
alexborro	9fa328e5c8	Merge pull request #793 from MissionSt/use_axis_enums Use constants instead of numeric literals	2014-02-19 10:15:57 -03:00
Gabe Rosenhouse	f308a8af91	update comment	2014-02-19 01:06:24 -08:00
Gabe Rosenhouse	357e31270a	Prevent G29 without first homing in X and Y If position is unknown, then G29 can be dangerous.	2014-02-19 00:51:43 -08:00
Gabe Rosenhouse	d2d7d186b5	Use descriptive constants, more	2014-02-19 00:10:17 -08:00
Gabe Rosenhouse	2ccdf4f36d	Use descriptive constants instead of numeric literals	2014-02-19 00:02:59 -08:00
Christian Axelsson	c00383f286	Fixed typo.	2014-02-18 18:50:12 +01:00
Cylindric	60f72a78a9	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream	2014-02-18 17:31:58 +00:00
nothinman	abba7a0003	Merge pull request #782 from marcovannoord/Marlin_v1 Added dutch to language.h	2014-02-18 16:19:50 +00:00
Cylindric	b868d668fa	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream	2014-02-18 12:11:01 +00:00
Marco	8212d8d543	Revert "Fixed small typo that would prevent compiling" This reverts commit `51ae4881ab`.	2014-02-18 10:40:25 +01:00
daid	46bae30573	Merge pull request #776 from whosawhatsis/fwretract Fwretract fixes, cleanup	2014-02-18 10:39:28 +01:00
Marco	51ae4881ab	Fixed small typo that would prevent compiling	2014-02-18 09:47:36 +01:00
Marco	498d76fd79	Fixed some messages where the text shown on the screen was more than 17 characters	2014-02-18 09:40:10 +01:00
Jim Morris	af9395ac2e	Add M605 to dynamically set delta configuration Save above configs in eeprom fix docs in createTemperatureLookupMarlin.py add missing azteegX3pro digipot settings in delta example config	2014-02-17 20:50:59 -08:00
nothinman	fd42f0d226	Merge pull request #783 from MissionSt/fix/syntax-error Fix compile error	2014-02-17 20:59:43 +00:00
nothinman	96217bf36a	Merge pull request #777 from PxT/M114 Add whitespace to M114 output	2014-02-17 18:07:47 +00:00
Marco	cf5c3b6610	Added dutch to language.h	2014-02-17 17:00:50 +01:00
Gabe Rosenhouse	d1c64b9dc4	Fix syntax error introduced in `477b6fa1d`	2014-02-17 07:56:19 -08:00
Cylindric	5d50819791	Various typo fixes - only in comments, no code changes.	2014-02-17 13:04:44 +00:00
nothinman	3f455889d0	Merge pull request #769 from Cylindric3D/typofixes_1 Various typo fixes - only in comments, no code changes.	2014-02-17 11:30:01 +00:00
nothinman	4ddedb3b27	Merge pull request #780 from Cylindric3D/typofixes_2 Various typo fixes #2 - only in comments, no code changes.	2014-02-17 11:29:18 +00:00
nothinman	d4ba23bc28	Merge pull request #770 from josefpavlik/Marlin_v1 Marlin v1	2014-02-17 11:27:05 +00:00
nothinman	bbb424bd2f	Merge pull request #779 from MissionSt/makefile-fix-abl Makefile fixes	2014-02-17 11:22:34 +00:00
Cylindric	8f0cee2a14	Various typo fixes - only in comments, no code changes.	2014-02-17 10:58:36 +00:00
Cylindric	08263ae66e	Merge branch 'Marlin_v1' into typofixes_1	2014-02-17 10:28:20 +00:00
Gabe Rosenhouse	5bd09d26e2	Makefile works with auto bed leveling	2014-02-16 23:23:29 -08:00
Gabe Rosenhouse	b45beeffd6	typo fix in Makefile	2014-02-16 23:23:29 -08:00
Paul Telford	306588925d	Add whitespace to M114 output	2014-02-16 21:01:19 -08:00
whosawhatsis	c43838bb1e	disable auto retract by default This should make it safe to enable FWRETRACT by default, with autoretract (which should now be fixed) only enabled by M209. FWRETRACT should probably now default to enabled (to make G10/G11 and M207-209 available, without changing functionality when they are not used), but I’ll save that for another pull request/discussion.	2014-02-16 19:04:54 -08:00
whosawhatsis	99f0e44864	Move FWRETRACT defaults to configuration_adv.h	2014-02-16 19:00:28 -08:00
whosawhatsis	66e3869138	Fix autoretract This takes the (now working) G10/G11 code and moves it to a function, which is called by G10 and G11, and also called by G1 if autoretract is enabled and a retract/recover move is detected.	2014-02-16 18:59:04 -08:00
whosawhatsis	2f2459c0db	Fix G10/G11 Z-lift	2014-02-16 18:15:34 -08:00
Gabe Rosenhouse	8c5675c290	Use language.h instead of English literals for "bed"	2014-02-16 17:16:00 -08:00
Gabe Rosenhouse	0f7393a13e	Refactor 'accurate' auto bed leveling to use probe_pt()	2014-02-16 10:44:15 -08:00
Gabe Rosenhouse	c4fbb44d6d	Refactor 3-point auto bed leveling to use probe_pt()	2014-02-16 10:44:08 -08:00
Gabe Rosenhouse	ad2c6488c7	Add probe_pt(), useful for auto bed leveling	2014-02-16 10:38:29 -08:00
Peter	c9c83a4560	Updated gen3+ board pins names to current convention	2014-02-16 00:47:06 +13:00
Mark Hanford	ab0d3c4fb3	Various typo fixes - only in comments, no code changes.	2014-02-14 11:48:24 +00:00
Josef Pavlik	477b6fa1df	move engaged from lcd console refreshes power off timeout	2014-02-14 12:37:21 +01:00
Josef Pavlik	831fc2a952	Pt100 and Pt1000 temperature sensors handling	2014-02-14 12:26:27 +01:00
nothinman	7dcd350941	A few changes to Russian, changed LCD strings to be <=17 characters.	2014-02-13 11:58:14 +00:00
daid	c31bb2b7ad	Only show the ZProbe offset when auto-bed-leveling is enabled.	2014-02-13 11:48:55 +01:00
daid	46f5bea19f	Add configurable beep for UltiPanel.	2014-02-13 11:17:33 +01:00
daid	d16a770855	Ultimainboard 2.x does not has a PS_ON pin.	2014-02-13 10:57:03 +01:00
daid	71bb3a8133	Add comments for Ultimainboard 2.0 configuration.	2014-02-13 10:53:46 +01:00
daid	9b7d87e885	Remove duplicate contrast define.	2014-02-13 10:50:17 +01:00
daid	816f0a678a	Merge pull request #768 from whosawhatsis/Marlin_v1 multiple FWretract fixes	2014-02-13 09:14:57 +01:00
whosawhatsis	6e43398509	G10/G11 bugfixes Previous version was broken by using G92 E0 between retract and recover.	2014-02-12 13:03:00 -08:00
whosawhatsis	d6c5c503d4	correct feedrate units in comments for M207/M208	2014-02-12 13:02:47 -08:00
nothinman	15d6116188	Merge pull request #689 from cajun-rat/tidy Use C++ initialization list	2014-02-12 16:38:11 +00:00
Martin Lukasik	0b9ecf3824	Language cleanup, part 1.	2014-02-12 13:21:26 +00:00
whosawhatsis	b5ba5c1465	Merge branch 'Marlin_v1' of https://github.com/whosawhatsis/Marlin into Marlin_v1	2014-02-11 19:06:03 -08:00
whosawhatsis	78e7654601	Keep FWRETRACT values in terms of millimeters when using M200 for volumetric E units	2014-02-11 19:05:35 -08:00
whosawhatsis	3f6d44d40b	Keep FWRETRACT values in terms of millimeters when using M200 for volumetric E units	2014-02-11 18:50:11 -08:00
Cylindric	363dc2f0e8	Merge branch 'Marlin_v1' into update_menu_plan	2014-02-12 00:51:16 +00:00
nothinman	5f797ca29f	Updated Polish, changed default firmware URL to Marlin.	2014-02-11 22:38:01 +00:00
Mark Hanford	0778f5f028	Add missing entries to the new Aragonian language.	2014-02-11 14:40:53 +00:00
Mark Hanford	54bab3e0d0	Merge branch 'Marlin_v1' into localisation Conflicts: Marlin/language.h	2014-02-11 14:35:28 +00:00
Mark Hanford	bdd0211aeb	Move strings in ultralcd.cpp into language.h.	2014-02-11 13:54:43 +00:00
Daniel Martinez	c8e5a82d49	keep English as default lang.	2014-02-09 18:24:24 +01:00
Daniel Martinez	f64592e362	Add Aragonese translation	2014-02-09 18:19:37 +01:00
ErikZalm	ac74f45dc0	Merge pull request #752 from MatixYo/patch-3 Update language.h	2014-02-09 17:52:26 +01:00
MatixYo	36086d3ca4	Update language.h Updated Polish translations.	2014-02-07 19:15:51 +01:00
Cylindric	1781031f2d	Update LCD Menu Tree with current options, based on ultralcd.cpp and language.h.	2014-02-07 01:52:44 +00:00
Jim Morris	d485988bec	fix typo	2014-02-05 14:39:45 -08:00
Jim Morris	8a1fd25363	Default is to not define digipot_i2c	2014-02-05 14:28:23 -08:00
Jim Morris	5097c57d3a	Added pins for Azteeg X3 Pro under motherboard 68	2014-02-05 14:25:42 -08:00
Jim Morris	b819fc53ca	Add Azteeg X3 Pro as motherboard 68 Add digipot i2c control for MCP4451 Allow M907 to set i2c digipot currents in amps Fix Makefile to allow Azteeg motherboards Fix Makefile to allow Wire libraries only Add beeper pin for Azteeg X3 Pro	2014-02-05 01:47:12 -08:00
ErikZalm	e1ae7952eb	Merge pull request #743 from Opticalworm/Marlin_v1 Improved support for panelolu2 encoder and buzzer	2014-02-03 12:33:10 -08:00
David Forrest	a5f53f0cf3	Heater wattage reporting for M105 using EXTRUDER_WATTS and BED_WATTS	2014-02-03 14:50:28 -05:00
Ronald	8d162e5bd7	Improved support for panelolu2 encoder and buzzer I added #define for LCD_FEEDBACK_FREQUENCY_HZ and LCD_FEEDBACK_FREQUENCY_DURATION_MS which is used to alter the default buzzer sound. When selecting Panelolu2 in configuration.h: - it automatically sets the correct ENCODER_PULSES_PER_STEP and ENCODER_STEPS_PER_MENU_ITEM. - if LCD_USE_I2C_BUZZER is defined it will also set the default LCD_FEEDBACK_FREQUENCY_HZ and LCD_FEEDBACK_FREQUENCY_DURATION_MS When selecting the sanguinololu 1284p the following is true: - its now enables LARGE_FLASH - It enables the gcode M300 when the panelolu2 LCD_USE_I2C_BUZZER is defined	2014-02-03 07:45:03 +00:00
whosawhatsis	b2c11ba980	Change diameter code to 'D' For some reason that I can’t figure out, the decimal is dropped when using ’S’ for the code. Also some minor code improvements to M200.	2014-02-01 18:49:25 -08:00
ErikZalm	61059385a3	Merge pull request #737 from whosawhatsis/M200 M200 implementation	2014-02-01 10:37:49 -08:00
whosawhatsis	856edfcc0d	Fixed math This is why I wanted to sleep on the code I wrote while falling asleep rather than immediately submitting a pull request.	2014-01-31 08:43:11 -08:00
ErikZalm	0d81ae77bc	Merge pull request #727 from drf5n/oversampling temperature.cpp: Actually use OVERSAMPLENR in the oversampling calculation.	2014-01-31 07:09:10 -08:00
ErikZalm	84df13f7d1	Merge pull request #721 from drf5n/lcdOnly Enable basic ULTRA_LCD screen w/o encoders and menus.	2014-01-31 07:07:12 -08:00
ErikZalm	4c7e9502ad	Merge pull request #718 from drf5n/temptableRes createTemperatureLookupMarlin.py: Add resolution comments and format for...	2014-01-31 07:06:02 -08:00
ErikZalm	652a0f6b5a	Merge pull request #717 from drf5n/tpins2 fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/...	2014-01-31 07:05:20 -08:00
ErikZalm	96a0cdc541	Merge pull request #716 from drf5n/maketeensy Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HAR...	2014-01-31 07:04:29 -08:00
whosawhatsis	d24df7af2c	M200 implementation	2014-01-31 00:54:19 -08:00
David Forrest	f0b8d5ba3d	createTemperatureLookupMarlin.py: Change comment to refer to actual program name.	2014-01-29 23:34:22 -05:00
David Forrest	50f44d9249	createTemperatureLookupMarlin.py: Truncate to short after application of OVERSAMPLENR for improved resolution.	2014-01-29 23:24:07 -05:00
David Forrest	f5b5dd8038	createTemperatureLookupMarlin.py: Add output of Steinhart-Hart coefficients.	2014-01-29 22:59:47 -05:00
David Forrest	76cf07c3f7	Configuration.h: Use OVERSAMPLENR in dT_PID definition.	2014-01-21 23:25:51 -05:00
David Forrest	476c7193d8	temperature.cpp: Use OVERSAMPLENR in oversampling calculation.	2014-01-21 16:49:03 -05:00
whosawhatsis	f08bb8bb6a	Previous commit borked.	2014-01-19 22:06:45 -08:00
whosawhatsis	b1f8f492c6	Remove previous_millis_cmd update from extruder runout prevention code This seems to defeat the purpose of previous_millis_cmd, preventing the time elapsed from previous_millis_cmd from ever reaching max_inactive_time or stepper_inactive_time while the heat was on.	2014-01-19 19:22:08 -08:00
whosawhatsis	8a5eaa3c9b	Fix crash after home bug Fixes a bug in the Extruder Runout Prevention feature that caused the extruder to move back to “current_position” after a move if it was activated while the move was in progress. For long home moves (which are longer than the dimensions of the machine’s working area), this would cause the machine to crash into the far end of its travel after homing. This usually occurred on the Z axis, which could result in damage to the machine if you don’t hit the reset button in time.	2014-01-19 19:11:51 -08:00
David Forrest	61a7256d42	Enable basic ULTRA_LCD screen w/o encoders and menus.	2014-01-17 17:00:47 -05:00
l.lefebvre	fdac8f6cec	Update ConfigurationStore.cpp Unable to compile if ENABLE_AUTO_BED_LEVELING is not set (not set by default).	2014-01-17 16:09:58 +01:00
Alex Borro	05932e4458	Add Z Probe Offset to EEPROM and Ultra LCD	2014-01-16 18:13:46 -02:00
David Forrest	7216583b8b	createTemperatureLookupMarlin.py: Add resolution comments and format for Marlin.	2014-01-16 12:40:15 -05:00
David Forrest	e8e0697e48	fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/Printrboard compatibility.	2014-01-16 11:23:29 -05:00
David Forrest	75f39fadfc	Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HARDWARE_MOTHERBOARD=={8,81,82,83,84})	2014-01-16 10:58:35 -05:00
daid	df194f75e1	Added PT100 support for Ultiboard2	2014-01-06 11:20:03 +01:00
daid	380144c20f	Add Ultiboard2 electronics. With PWM current settings. For the few people that have this new board as experiment in their UM-Original.	2014-01-06 11:05:02 +01:00
fsantini	6ae7f7870d	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into ErikZalm Conflicts: Marlin/Configuration.h Marlin/Marlin_main.cpp	2013-12-23 12:20:32 +01:00
Phil Wise	17d6d965dc	Use C++ initialization list This is the recommended approach for object initialization. The change doesn't affect binary size (although in theory it could make it smaller).	2013-12-19 21:21:46 +00:00
Joseivaldo Benito Junior	ce8b9c4fc5	Correct missing parameter from last upmerge Signed-off-by: Joseivaldo Benito Junior <jrbenito@benito.qsl.br>	2013-12-19 00:50:44 -02:00
Joseivaldo Benito Junior	8e48e24c7f	Update Delta example files Signed-off-by: Joseivaldo Benito Junior <jrbenito@benito.qsl.br>	2013-12-18 00:04:36 -02:00
ErikZalm	46d2443c7d	Merge pull request #676 from IVI053/Marlin_v1 Minor improvements for encoder configuration, LCD entry for PSU controll and thermistor pins on RAMPS	2013-12-17 02:28:28 -08:00
-	eed053dffb	Revert "Made numbering of heat bed thermistor more logical as D8 is bed, D9 is Extruder 2 and D10 is Extruder 1, so T0 should be E1, T1 E1 and T2 bed to be sequential as MOSFET-Outputs" This reverts commit `b7eadb9f37`.	2013-12-16 12:22:06 +01:00
Erik van der Zalm	8349fc89a4	Fixed planner bug	2013-12-16 11:40:23 +01:00
Francesco Santini	da2a6f9a31	Accurate bed leveling: x loop inside y and zigzag motion	2013-12-13 10:31:19 +01:00
RicardoGA	d29615dc0c	Z and Y dual stepper drivers error if you try to enable Z_DUAL_STEPPER_DRIVERS the error "You cannot have dual drivers for both Y and Z" shows even if you don't have defined Y_DUAL_STEPPER_DRIVERS and don't let you compile the firmware to solve this problem i change this line: #ifdef Z_DUAL_STEPPER_DRIVERS && Y_DUAL_STEPPER_DRIVERS to: #if defined (Z_DUAL_STEPPER_DRIVERS) && defined (Y_DUAL_STEPPER_DRIVERS) now the error only show if you define both Z_DUAL_STEPPER_DRIVERS and Y_DUAL_STEPPER_DRIVERS	2013-12-11 14:37:43 -06:00
fsantini	5bde7fcb28	Minor code and comment polishing	2013-12-11 21:27:43 +01:00
-	20faff5935	Incorporate PS_DEFAULT_OFF for starting state on LCD menu entry	2013-12-08 21:35:57 +01:00
-	e5d3044801	Added posibility to set ENCODER_STEPS_PER_MENU_ITEM in Configuration.h like ENCODER_PULSES_PER_STEP as it depends on it for usability	2013-12-08 21:34:56 +01:00
-	b7eadb9f37	Made numbering of heat bed thermistor more logical as D8 is bed, D9 is Extruder 2 and D10 is Extruder 1, so T0 should be E1, T1 E1 and T2 bed to be sequential as MOSFET-Outputs	2013-12-08 21:30:42 +01:00
Michal Dyntar	e8786bf110	Added support for Cheaptronic v1 electronic	2013-12-07 13:29:47 +01:00
fsantini	cc2925b705	Implemented a least squares fit of the bed equation for auto bed leveling. The code for the LSQ solver (qr_solve) is copyrighted by John Burkardt and released under LGPL here: http://people.sc.fsu.edu/~%20jburkardt/c_src/qr_solve/qr_solve.html (see qr_solve.cpp for further copyright information)	2013-12-06 21:46:25 +01:00
fsantini	b64661070e	Fixed the plane vector equation to a simpler one (only dependent on the normal) Removed the calculation of the inverse matrix since the rotation matrix is orthogonal, therefore inverted == transposed. Much simpler and mathematically robust.	2013-12-06 21:32:21 +01:00
Alex Borro	5c44f6c434	Bed Heater monitoring in Controller Fan In some cases the Bed Heater FET heats up more then stepper drivers, so this change add the bed monitoring to the controller fan. As soon as the bed heater is turned on, the controller fan will run as well.	2013-11-27 23:23:06 -02:00
Alex Borro	b33375d438	Z Axis Safe Homing when using Z Probe Recommended for those who are using the Z Probe for Z Homing (as Z-Endstop) This feature has two changes: 1) Allow user to choose where the Z Probe will touch the bed when homing all axis together (G28) by setting below defines: Z_SAFE_HOMING_X_POINT Z_SAFE_HOMING_Y_POINT 2) Prevents the user to perform Z Axis Homing when the Z Probe is outsite bed.	2013-11-27 22:37:35 -02:00
Alex Borro	35905ea4f9	Allow heaters to stay full On when PWM=127 In previous version, even with PWM = 127, the system turns the FET off and then on in the next cycle. This bevavior may increase the FET heat dissipation. It was fixed keeping the FET always On when PWM=127.	2013-11-27 18:13:38 -02:00
Erik van der Zalm	a94e588765	Changed slow buttons behavior.	2013-11-17 17:41:30 +01:00
Erik van der Zalm	69af392554	Added HEATERS_PARALLEL (Request from reifsnyderb) This allows a hot end with two heaters and a FET for each heater. This is useful if the FET is not capable of heating two heaters.	2013-11-17 13:29:02 +01:00
Erik van der Zalm	48a185d004	Fixed compile errors from bad commits.	2013-11-10 16:36:37 +01:00
ErikZalm	24d1f480b6	Merge pull request #647 from shaggythesheep/newfeature-M226 Implement M226 - GCode Initiated Pause	2013-11-10 07:27:01 -08:00
ErikZalm	95b41413e6	Merge pull request #641 from hugokernel/master M80 - ATX Power On related modification	2013-11-10 07:26:35 -08:00
ErikZalm	59b96e323e	Merge pull request #640 from fmalpartida/SAV-MkI Added support for BT on AT90USB devices, corrected LCD bug, added new board and LCD	2013-11-10 07:26:08 -08:00
ErikZalm	2433ee6fc8	Merge pull request #637 from justuswilhelm/Marlin_v1 Fix servo control for Melzi v2.0	2013-11-10 07:22:12 -08:00
ErikZalm	3455a2bac2	Merge pull request #636 from PrintToPeer/Marlin_v1 Add UUID support to M115 responses.	2013-11-10 07:21:46 -08:00
Richard Miles	dc887ef99b	Implement M226 - GCode Initiated Pause Implemented M226 as described here: http://reprap.org/wiki/G-code#M226:_Gcode_Initiated_Pause Waits for pin to be become either HIGH, LOW or the inverse of what it was before. Allows printing to pause until user interaction	2013-11-09 15:11:58 +00:00
Charles R	c244eb860c	If you have a switch on suicide pin, this is useful if you want to start another print with suicide feature after a print without suicide...	2013-11-04 12:04:04 +01:00
fmalpartida	7b556d2e96	Added BT support on AT90USB devices Added AT90USB device BT connectivity support using second UART.	2013-11-03 19:57:06 +01:00
Kaz Walker	a5e8575829	Add UUID support to M115 responses.	2013-11-01 14:51:50 -06:00
Daniel Benamy	cab84e0e5b	Add (correct) missing pin definitions for Y2 I tested this and it works.	2013-10-30 22:44:20 -04:00
fmalpartida	5b3f60ea2e	Corrected LCD only error If only an LCD is defined and no menu or keyboard defined, there is a compilation error. Added conditional compilation.	2013-10-30 21:52:46 +01:00
Justus Perlwitz	62d0b79023	Fix servo control for Melzi	2013-10-30 20:59:58 +01:00
fmalpartida	b5a964fcc5	Initial SAV MkI (RepRap CloneWars board) integration. Included support for BT dongle on AT90USB boards. Added LCD Shift Register LCD control Included support for RepRap Clone Wars project board (SAV MKI).	2013-10-30 11:45:32 +01:00
dumle29	f941203172	PS_ON configurable boot state Allows the user to select wheter or not the PSU should be turned on or kept in standby when marlin boots	2013-10-29 18:44:56 +01:00
whosawhatsis	c79e3967b3	Make G11 not horribly broken	2013-10-24 18:58:42 -07:00
bkubicek	d69822ed51	Fix '#' since it can occure in comments.	2013-10-22 10:34:51 +02:00
bkubicek	2fb2a0a119	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2013-10-22 10:08:21 +02:00
bkubicek	39d88bcccb	preparation for hibernation If a print is stopped, it would be nice in the future to write a file with the printer state, the filename of the print, and the position within the print. this file could be read, to continue a previously stopped print. not finished yet.	2013-10-22 10:04:08 +02:00
bkubicek	ab965376ff	Sub-file calls. by overloading M32 it is now possible to execute gcode files from other gcode files, with a fixed recursion level. This can be used e.g. for having a real start.g and end.g somewhere on the sd card, which are then called from the normal print file. Another usecase would be to have macro-files for nozzle-change and layerchange. I have not tested the speedwise performance. The testing was done with pronterface. syntax: normal call from sd card will open the new file and continue executing there. M32 !/path/filename# this however will call the new file and return to the caller file. M32 P !/path/filename# with the optional "S<position>" the file starting position can be set. this is for continuing prints from a previous location.	2013-10-22 10:02:18 +02:00
bkubicek	b2cc27e5ea	Added a magic character for sd buffering. if a '#' is read now the buffer will be emptied before reading ahead. This is so one can execute files from within gcode files, without messing the buffer with preread characters from the caller file. # can not occure in sd files imho, because it should only occure within checksums in ther serial communication. Yes, thats a lame argument. If you have a better idea please tell me. It has to be a character that one can type on a keyboard manually.	2013-10-22 09:54:13 +02:00
Erik van der Zalm	8a08cca0f2	Added temperature status less. Hopefully fixed viky button handling without braking other boards	2013-10-20 12:12:35 +02:00
Erik van der Zalm	667d278f54	Revert "Fix for Viki display" This reverts commit `314fd13c39`.	2013-10-20 10:16:46 +02:00
Erik van der Zalm	bf27e79e74	Small BlinkM fix	2013-10-20 10:06:02 +02:00
Erik van der Zalm	87e28c0599	Added ifdefs to blinkm	2013-10-20 09:55:15 +02:00
Erik van der Zalm	24c6b2ab35	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2013-10-20 09:51:58 +02:00
ErikZalm	6a803ba9c5	Merge pull request #590 from timkoster/Marlin_v1 Added BlinkM support over i2c	2013-10-20 00:51:35 -07:00
Erik van der Zalm	457d8a0acb	Fixed merge conflicts	2013-10-20 09:50:27 +02:00
Alex Borro	6f85a8c7aa	Bed auto Leveling change: Raise Z before homing - Added "Z_RAISE_BEFORE_HOMING" for raising Z the defined distance before homing. This is useful to avoid Z-Probe collision when hotend is near bed. - Fixed the issue of Z not going bellow Z_PROBE_OFFSET when "min_software_endstops" is true. Now the Z_PROBE_OFFSET is not set in Z_MIN_POS, it is added after homing.	2013-10-12 17:28:11 -03:00
Alex Borro	dd3086d3f2	Show Temperature ADC values If "SHOW_TEMP_ADC_VALUES" is defined in Configuration_adv.h, the M105 command will present, after tradicional temperatures, the ADC value read from temp sensors. This is great for adjusting thermistor tables with thermocouple. From Pronterface you can see the ADC value and compare with a thermocouple reading.. then you just need to create your own thermistor table. Since this merge doesnt change the original information, it doesnt mess with PC software parsing (tested under Pronterface and Repetier-Host).	2013-10-12 10:41:23 -03:00
bkubicek	7fad13a1e2	Reverse SD card file name order. This is _not_ automatically the cronological, since deleting a file will free the filesystem descriptor for it, which then will be used by the next file copied on it. Since this makes the auto0.g file very inaccessible, I put the option back, to have it in the prepare menu. this should satisfy https://github.com/ErikZalm/Marlin/pull/373 as a reminder, auto0.g will be executed every time after a boot with sd card present and file present. thereafter, if there is a file auto1.g this will be done. Thats IMHO the best place to put settings, and prepare heating. I also execute again after each (now again via the prepare menu) before starting a new print/ after a failed one. It for me 100% replaces any start.gcode form the slicers.	2013-10-12 13:24:55 +02:00
bkubicek	b832f5b9f6	added delta tower babystepping. Its untested, but hopefully florian horsch will be able to try. also, removed some trouble for compilation with corexy. I think that babystepping is only possible in z for a delta tower. not sure if it would be usefull to step individual motors on a delta, i don't own one	2013-10-07 09:14:04 +02:00
bkubicek	c38b0855c8	I think that filament change is ready for the masses. I have tested very often with my ultimaker. I strongly vote for it being a single gcode, because otherwise the triggering from the menu is terrible.	2013-10-06 21:20:26 +02:00
bkubicek	d147a057ac	Add the socalled "Babystepping" feature. It is a realtime control over the head position via the LCD menu system that works _while_ printing. Using it, one can e.g. tune the z-position in realtime, while printing the first layer. Also, lost steps can be manually added/removed, but thats not the prime feature. Stuff is placed into the Tune->Babystep * It is not possible to have realtime control via gcode sending due to the buffering, so I did not include a gcode yet. However, it could be added, but it movements will not be realtime then. Historically, a very similar thing was implemented for the "Kaamermaker" project, while Joris was babysitting his offspring, hence the name. say goodby to fuddling around with the z-axis.	2013-10-06 21:14:51 +02:00
Erik van der Zalm	bca353cc12	Fixed duplicate define in fastio.h	2013-10-03 19:24:53 +02:00
Alex Borro	253dfc4bc1	Bed Auto Leveling feature Check the Readme for instruction how to enable and configure the feature	2013-09-29 13:20:06 -03:00
ErikZalm	1bda6bf862	Merge pull request #609 from phq1910/patch-1 Update Configuration.h	2013-09-26 11:47:58 -07:00
ErikZalm	c80aac1518	Merge pull request #610 from phq1910/patch-2 Update pins.h	2013-09-26 11:47:47 -07:00
Erik van der Zalm	314fd13c39	Fix for Viki display	2013-09-26 20:32:19 +02:00
phq1910	4f7c6dfe35	Update pins.h Include Pins cpu Sethi 3D	2013-09-26 11:40:54 -03:00
phq1910	57173739a1	Update Configuration.h Include CPU Sethi 3D	2013-09-26 11:29:44 -03:00
Erik van der Zalm	0dca49a7c0	Added Azteeg X3 board.	2013-09-24 17:31:16 +02:00
Erik van der Zalm	d8c2c810b4	Added info to the delta configuration files in the configuration.h file	2013-09-23 23:29:46 +02:00
Erik van der Zalm	9bc88f8bab	Placed optional ENCODER_PULSES_PER_STEP in the configuration.h file	2013-09-23 23:25:11 +02:00
Erik van der Zalm	3ca1ca6869	Fixed missing ENCODER_PULSES_PER_STEP	2013-09-23 23:18:35 +02:00
Tim Koster	97b0da0c2e	Removed #ifndef BLINKM	2013-09-22 10:43:27 +03:00
Tim Koster	61db046b32	Added #ifdef BLINKM around new code. Also refined BlinkM.h.	2013-09-20 10:57:42 +03:00
Richard Miles	77df2ab0e7	Make Y_DUAL_STEPPER_DRIVERS disabled by default	2013-09-17 21:49:44 +01:00
Richard Miles	ed1ab42186	Added Y_DUAL_STEPPER_DRIVERS Enables two stepper drivers to be used for the Y axis (useful for Shapeoko style machines) Each Y driver can be stepped in either the same way or in opposite directions, accounting for different hardware setups (leadscrew vs. belt driven)	2013-09-17 19:19:20 +01:00
Richard Miles	f4a59e4ce5	Revert "Added Y_DUAL_STEPPER_DRIVERS" This reverts commit `7ee275b620`.	2013-09-17 19:05:49 +01:00
Richard Miles	7ee275b620	Added Y_DUAL_STEPPER_DRIVERS Enables two stepper drivers to be used for the Y axis (useful for Shapeoko style machines) Each Y driver can be stepped either the same way or in opposite directions, accounting for different hardware setups (leadscrew vs. belt driven)	2013-09-17 19:02:00 +01:00
ErikZalm	6a1e980c6d	Merge pull request #600 from xoan/Encoder_Pulses_Per_Step add ENCODER_PULSES_PER_STEP	2013-09-14 04:56:45 -07:00
ErikZalm	20076a8bd3	Merge pull request #598 from GDV0/Marlin_v1 FIx compilation error when enabling SERVO_ENDSTOPS (#591)	2013-09-14 04:54:19 -07:00
Erik van der Zalm	3626b5ad8b	Removed Delta from the default config file. Changed EEPROM CHITCHAT behavior. M503 is always enabled.	2013-09-14 13:50:09 +02:00
Xoan Sampaiño	bf7007d02f	add ENCODER_PULSES_PER_STEP	2013-09-13 04:12:51 +02:00
GDV0	f17506c504	FIx compilation error when enabling SERVO_ENDSTOPS (#591 )	2013-09-11 23:09:37 +02:00
Martin Lukasik	acd8619809	Fan fix for Panelolu2+Sanguinololu.	2013-09-10 22:10:58 +01:00
George Roberts	595580556c	Fixed bug that makes ulticontroller knob backwards introduced Feb 28 2013 by Robert. Bug introduced in version `6beb42cdf6`. Robert did a good job of simplifying but messed up this chunk of code. Looking at working version: `839bef6d5d` it seems there is no case where encrot3 should be defined as 2 because if ULTICONTROLLER is defined then NEWPANEL is also defined.	2013-09-10 09:56:19 -04:00
Tim Koster	88dfeefca3	Define BlinkM default disabled	2013-09-10 12:32:21 +03:00
Tim Koster	5350faf2a2	Merge https://github.com/timkoster/MarlinBlinkM into Marlin_v1	2013-09-10 12:27:26 +03:00
Tim Koster	7016cc9511	Added BlinkM support over i2c	2013-09-10 12:18:29 +03:00
Tim Koster	3b315b3da0	Added BlinkM support over i2c	2013-09-06 22:25:39 +03:00
Jim Morris	f26f26b7bd	Fix the example delta configuration as someone forgot to do it.	2013-09-05 16:36:55 -07:00
Peter Hercek	9aa2229077	add command M666 for adjusting delta printer endstop position	2013-08-28 01:15:20 +02:00
Robert F-C	9547fb9dfb	Add duplication and auto-park mode for dual x-carriage support.	2013-08-08 00:10:26 +10:00
Steve Kelly	53614e5144	add pins for rambo lcd	2013-08-03 11:45:53 -05:00
Steve Kelly	b42d24e31e	add additional pins to avr2560 for rambo lcd	2013-08-03 11:37:12 -05:00
Nicolas Rossi	b0c8120fcc	Added feedrate setting in exemple config for manual moves from panel	2013-08-03 13:09:53 +02:00
Nicolas Rossi	a54fe2d73c	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1 Conflicts: Marlin/Marlin_main.cpp	2013-08-03 13:05:56 +02:00
ErikZalm	7ea63d08df	Merge pull request #565 from iXce/avrdudeconfpath Detect OS in Makefile to use the correct avrdude.conf path	2013-08-02 13:16:07 -07:00
ErikZalm	4187b637a5	Merge pull request #570 from hg42/separate-INVERTING-macros-for-MIN-and-MAX-endstops separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)	2013-08-02 13:15:30 -07:00
ErikZalm	07e7de3600	Merge pull request #569 from hg42/convert-PROTOCOL-macros-from-statements-to-expressions convert PROTOCOL macros from statements to (multiple, comma separated) expressions	2013-08-02 13:13:29 -07:00
Guillaume Seguin	c0c4c97db6	Detect OS in Makefile to use the correct avrdude.conf path	2013-08-01 19:20:27 +02:00
hg42@gmx.net	2ca983568d	separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)	2013-08-01 15:06:39 +02:00
hg42@gmx.net	3700f688f5	convert PROTOCOL macros from statements to (multiple, comma separated) expressions	2013-08-01 14:56:39 +02:00
daid	a504c88346	Fix a bug where the PID controllers D action kicks in hard as soon as the PID controller starts.	2013-08-01 14:12:30 +02:00
Nicolas Rossi	394ed08f88	Added feedrate setting for manual moves from panel	2013-07-30 14:33:30 +02:00
Nicolas Rossi	9bf1cf1b22	Pre-calculate diagonal rod length squared	2013-07-30 14:09:21 +02:00
Nicolas Rossi	4623e78ce0	Added Honeywell thermistor 135-104LAF-J01	2013-07-30 14:02:18 +02:00
Brendan-csel	d7f384f680	Skip SD menu refresh if nothing has changed	2013-07-30 14:02:15 +02:00
Brendan-csel	abc8320a68	Save LCD_CLICKED before it is cleared The SD card menu was refreshing so slowly that the button interrupt was clearing LCD_CLICKED before the menu items could check it.	2013-07-30 14:02:13 +02:00
Guillaume Seguin	f4c3135c6d	Add Panelolu2 pins for RAMPS1.3	2013-07-30 14:02:11 +02:00
Guillaume Seguin	aae42c68f9	Update French translation in language.h	2013-07-30 14:02:08 +02:00
Guillaume Seguin	4d435c38a6	Add support of LiquidTWI2-based panels to Makefile Use LIQUID_TWI2=1 as make argument to enable this support	2013-07-30 14:02:06 +02:00
Guillaume Seguin	6c42a3a339	Woops, fix logic	2013-07-30 14:02:04 +02:00
Guillaume Seguin	376d8af2c8	Report temperatures for all extruders	2013-07-30 14:02:01 +02:00
ErikZalm	434b6a05c1	Merge pull request #552 from iXce/Marlin_v1 Report temperatures for all extruders in reply to M105	2013-07-29 10:39:21 -07:00
ErikZalm	bdc2621119	Merge pull request #561 from Brendan-csel/Marlin_v1 Fix for Viki LCD issues printing from SD card	2013-07-29 10:38:17 -07:00
ErikZalm	6965bd4e15	Merge pull request #560 from njprossi/Marlin_v1 Fixed move from panel for delta bot #557	2013-07-29 10:37:40 -07:00
ErikZalm	a55b33e613	Merge pull request #559 from iXce/panelolupinsramps13 Add Panelolu2 pins for RAMPS1.3	2013-07-29 10:37:03 -07:00
ErikZalm	8b34351537	Merge pull request #558 from iXce/frenchupdate Update French translation in language.h	2013-07-29 10:36:43 -07:00
ErikZalm	735e556724	Merge pull request #555 from iXce/liquidtwi2_makefile Add support of LiquidTWI2-based panels to Makefile	2013-07-29 10:33:54 -07:00
Brendan-csel	d80aecda0a	Skip SD menu refresh if nothing has changed	2013-07-29 21:00:29 +12:00
Brendan-csel	be2dea1dc6	Save LCD_CLICKED before it is cleared The SD card menu was refreshing so slowly that the button interrupt was clearing LCD_CLICKED before the menu items could check it.	2013-07-29 20:58:09 +12:00
Nicolas Rossi	55c287a69e	Fixed move from panel for delta bot #557	2013-07-28 22:54:37 +02:00
Guillaume Seguin	1902d339b0	Add Panelolu2 pins for RAMPS1.3	2013-07-28 19:19:57 +02:00
Guillaume Seguin	eb23a68e92	Update French translation in language.h	2013-07-28 18:50:47 +02:00
ErikZalm	1561c6df51	Merge pull request #547 from wolfmanjm/delta-configuration Setup Default configuration for Deltas if DELTA is defined	2013-07-24 03:11:36 -07:00
Guillaume Seguin	374bc99fa3	Add support of LiquidTWI2-based panels to Makefile Use LIQUID_TWI2=1 as make argument to enable this support	2013-07-24 12:09:53 +02:00
Jim Morris	ab624eac2a	revert COnfiguratiuon to the same as head	2013-07-24 02:57:46 -07:00
Jim Morris	52f79ffeca	add an example default configuration for delta style bots	2013-07-24 02:55:52 -07:00
Jim Morris	b9d7ccf1cd	Merge remote-tracking branch 'upstream/Marlin_v1' into delta-configuration Conflicts: Marlin/Marlin_main.cpp	2013-07-24 02:49:25 -07:00
Guillaume Seguin	d4d1540727	Use -fno-use-cxa-atexit to override gcc --enable-cxa_atexit	2013-07-24 11:19:38 +02:00
Guillaume Seguin	01ed99143c	Woops, fix logic	2013-07-23 23:34:42 +02:00
Guillaume Seguin	76841450c8	Only display poweron/poweroff if PS_ON_PIN > -1	2013-07-23 22:28:30 +02:00
Guillaume Seguin	44f327d738	Uniformly reindent language.h	2013-07-23 22:13:40 +02:00
Guillaume Seguin	326d2db025	Update language.h so that all languages compile Some strings still need translation, but at least everything compiles.	2013-07-23 22:11:54 +02:00
Guillaume Seguin	2cb716f513	Run Marlin/language.h through dos2unix	2013-07-23 21:49:37 +02:00
Guillaume Seguin	34da3a0a3f	Merge github.com:ErikZalm/Marlin into Marlin_v1 Conflicts: Marlin/language.h	2013-07-23 21:46:41 +02:00
Guillaume Seguin	18199ff960	Merge github.com:ErikZalm/Marlin into Marlin_v1	2013-07-23 21:33:52 +02:00
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.	2013-07-22 22:46:14 +10:00
Robert F-C	c3568398b5	Disable DUAL_X_CARRIAGE by default	2013-07-20 23:50:30 +10:00
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.	2013-07-20 13:07:50 +10:00
Jim Morris	fb20ceabce	enable soft endstops for delta disable delta by default	2013-07-17 16:21:51 -07:00
Jim Morris	d01ee7e7b5	fix zjerk being the same for delta as xy jerk add more delta defaults on delta make second home even slower	2013-07-17 16:14:07 -07:00
Robert F-C	d7390e13d9	Support dual x-carriage printers Dual x-carriage designs offer some substantial improvements for dual extruder printing.	2013-07-17 22:44:45 +10:00
Jim Morris	f3aa2a48e7	update max pos	2013-07-17 01:29:51 -07:00
Jim Morris	460751503e	Added default configurations for deltas when DELTA is defined	2013-07-17 01:17:27 -07:00
Maik Stohn	9da94c247a	fixed bad lcd commit from makr3d #elsif does not exist #elif is correct	2013-07-15 17:34:21 +02:00
Erik van der Zalm	59004023fd	Fixed typo	2013-07-15 17:22:56 +02:00
Erik van der Zalm	461dad6e05	Added : M32 - Select file and start SD print (Can be used when printing from SD card) Untested	2013-07-14 22:39:59 +02:00
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.	2013-07-14 21:10:24 +02:00
ErikZalm	8a2a3ef91d	Merge pull request #531 from iXce/Marlin_v1_lcd Only clamp panel movements if software endstops are enabled	2013-07-14 06:50:23 -07:00
Erik van der Zalm	6397b3339c	restored configuration.h defaults	2013-07-14 15:49:03 +02:00
Erik van der Zalm	cdaaad3df1	Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1	2013-07-14 15:45:49 +02:00
Erik van der Zalm	e3bdefd873	fixed missing #endif	2013-07-14 15:42:53 +02:00
Erik van der Zalm	a5be0c52c6	no message	2013-07-14 15:35:54 +02:00
Michael Mayer	e509cdbeb0	added contrast control function for gLCDs	2013-07-14 15:28:26 +07:00
Michael Mayer	99b7e926e7	added MaKr3d Melzi board	2013-07-14 15:17:55 +07:00
Gabino Lopez	68be33b1fc	Update language.h I update the spanish Messages, now this compile for spanish language.	2013-07-04 10:23:00 +02:00
daid	acb3271c9a	Merge pull request #534 from xifle/Marlin_v1 Fixes compiler warning for feedrate deadzone	2013-07-01 23:41:51 -07:00
xifle	61fe430d4f	Should fix compiler warning for feedrate deadzone	2013-07-01 11:10:02 +02:00
Gord Christmas	fde17d5720	Fix for ugly code compilation errors in SERVO_ENDSTOP checks	2013-06-28 08:02:04 -07:00
Guillaume Seguin	aa65c20d1f	Only clamp panel movements if software endstops are enabled	2013-06-28 14:18:00 +02:00
Erik van der Zalm	ecf3ab5de4	Added thermistor 60 to configuration.h	2013-06-27 23:25:51 +02:00
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	2013-06-20 23:59:56 +02:00
Erik van der Zalm	2015989f84	Added DISABLE_MIN_ENDSTOPS	2013-06-18 19:20:26 +02:00
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>	2013-06-16 23:35:33 +02:00
ErikZalm	171719f18c	Merge pull request #525 from lajos/ultralcd_pid ultralcd.cpp compile errors when !defined(PIDTEMP)	2013-06-16 00:02:54 -07:00
lajos	b519af4f05	fixed another !defined(PIDTEMP) compile in ultralcd.cpp	2013-06-15 20:49:18 -04:00
lajos	7d03c52511	fixed compile error in ultralcd.cpp when PIDTEMP undefined	2013-06-15 18:09:52 -04:00
lajos	02dee80fa5	added Azteeg X1 motherboard	2013-06-15 16:58:17 -04:00
Henrik Brix Andersen	47dc70e3ec	Fix location of avrdude.conf	2013-06-15 09:50:25 +02:00
Henrik Brix Andersen	1d258903bb	Allow command line compilation when using BEEPER.	2013-06-15 09:36:55 +02:00
Erik van der Zalm	e34c9981ab	Delta disabled by default	2013-06-11 22:33:58 +02:00
Erik van der Zalm	26a441fc7d	More 3Drag controller patches.	2013-06-10 18:26:15 +02:00
Erik van der Zalm	ac975ed8c2	Merge branch 'deltabot' into Marlin_v1	2013-06-10 18:20:29 +02:00
Jim Morris	caa848f943	fix homing for deltas	2013-06-09 21:10:00 -07:00
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	2013-06-09 23:10:41 +02:00
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	2013-06-09 22:57:40 +02:00
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	2013-06-09 22:26:47 +02:00
Erik van der Zalm	73f21cd5d6	Spanish updated so far.	2013-06-09 21:40:35 +02:00
Erik van der Zalm	6f4a6e531c	Merge branch 'deltabot' into Marlin_v1	2013-06-09 13:55:18 +02:00
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.	2013-06-09 13:54:19 +02:00
Erik van der Zalm	ff6fa09ecf	Moved corexy implementation from stepper to planner (Thanks iquizzle)	2013-06-09 13:10:06 +02:00
Erik van der Zalm	c8dcc7c208	Allow increasing the software PWM frequency.	2013-06-09 12:52:49 +02:00
Erik van der Zalm	8b0d82e9db	Removed "awaiting translation" for french	2013-06-09 12:24:06 +02:00
Erik van der Zalm	1e05d192ab	Make the beep tone less offensive	2013-06-09 12:21:16 +02:00
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	2013-06-09 00:51:58 +02:00
kiyoshigawa	f295712008	Trying to fix weird diff on ultralcd_implementation_hitachi_HD44780.h	2013-06-08 09:27:56 -06:00
kiyoshigawa	69b02031ca	Fixed small error in lcd define statements.	2013-06-08 09:09:11 -06:00
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
BorisLandoni	c1cb5977ee	Update Configuration.h	2013-06-08 14:37:39 +02:00
BorisLandoni	8a5bd8a808	Update Configuration.h	2013-06-08 14:37:17 +02:00
BorisLandoni	c1d7cf939e	Update language.h	2013-06-07 17:38:17 +02:00
BorisLandoni	4c7d1436e9	Update pins.h	2013-06-07 18:37:44 +03:00
BorisLandoni	6588933c04	Update Configuration.h	2013-06-07 18:36:16 +03:00
Scott Lahteine	5dabc95409	Apply all changes from latest Marlin_V1 Diffed and merged, preserving my updates	2013-06-06 15:49:25 -07:00
Gord Christmas	a733537ddd	Missed some variable declarations Integrated fixes from henrikbrixandersen pull request #504	2013-06-06 09:18:03 -07:00
Gord Christmas	f4f30c9d64	Added servo actuated enstop coding to allow G28 command to engage and retract a servo to specified angles.	2013-06-06 07:36:52 -07:00
Erik van der Zalm	79374f0b93	Merge branch 'reisnyderb' of https://github.com/ErikZalm/Marlin into Marlin_v1	2013-06-05 17:44:48 +02:00
Maik Stohn	da05b3ba94	faster GLCD (ST7920 SW-SPI) implementation / fixes - fixed long menu entries (>14 or >18 chars) caused overrun in dogm lcd implementation - fixed pin set problem when in interrupt - much faster ST7920 SW-SPI implementation - increased ST7920 framebuffer size for more speed	2013-06-05 16:27:44 +02:00
kiyoshigawa	4b19c8552e	Fixing changed Configuration.h settings to be default values per ErikZalm Request.	2013-06-04 12:01:55 -06:00
Erik van der Zalm	971ec35135	Expanded M302 to allow setting the temp	2013-06-02 17:36:23 +02:00
Erik van der Zalm	5090c56651	More redundant temp sensor changes. (After testing and debugging by reifsnderb)	2013-05-29 19:29:30 +02:00
Guillaume Seguin	16b9239a26	Report temperatures for all extruders	2013-05-29 18:06:12 +02:00
ErikZalm	a964b3cf3d	Merge pull request #495 from Gatulibu/Marlin_v1 Added support for Megatronics v2.0 and Minitronics v1.0	2013-05-28 07:51:49 -07:00
Maik Stohn	e8572c5239	Fix: Long menu entries (>14 or >18 chars) caused overrun in hitachi display implementation	2013-05-28 15:53:07 +02:00
Maik Stohn	7ee70c2248	Fix: removed wrong ; at end of define	2013-05-28 15:50:48 +02:00
Gatulibu	b78fa6bb70	Added support for Megatronics v2.0 and Minitronics v1.0 merged from code downloaded from reprapworld.com	2013-05-28 14:03:31 +02:00
Erik van der Zalm	9be61cdc02	Added redundant temp sensor	2013-05-26 17:57:49 +02:00
Erik van der Zalm	7231a20dba	Put #ifdef around servo pins in pins.h. This allows the pins to be used for M42.	2013-05-24 21:05:11 +02:00
Alexander Kasimir	e2ff536b03	Fixed typo in Comment	2013-05-22 16:02:03 +03:00
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.	2013-05-22 21:33:23 +10:00
Maik Stohn	bd33cf4a9f	fixed typo / added "const" to defines for newer gcc compatibility	2013-05-21 17:58:34 +02:00
ErikZalm	567291e734	Merge pull request #485 from Banjer/Panelolu2_Melzi Add Panelolu2 support for Melzi	2013-05-21 08:46:27 -07:00
Maik Stohn	8d80cbbf4c	fix broken LCD commit #dfa549f268 from buildrob - GLCD/DOGM implementation was ignored	2013-05-21 16:53:38 +02:00
xifle	98d0d48191	fixed merge	2013-05-20 14:52:35 +02:00
xifle	bbe67fca5a	soft tab correction	2013-05-20 14:50:39 +02:00
xifle	9eeb711c96	Merged from Upstream Master	2013-05-20 14:45:37 +02:00
Bas Spaans	424101110c	Add Panelolu2 support for Melzi	2013-05-19 12:09:34 +02:00
Robert F-C	0d4a9444c4	Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1	2013-05-19 08:50:58 +10:00
Erik van der Zalm	86cce025f4	Added #ifdef NUM_SERVOS to servo.cpp	2013-05-18 23:12:28 +02:00
xifle	03141a5ef4	LCD: Added Deadzone at 100% Feedrate This adds a deadzone at 100% Feedrate when changing it at the status screen/main menu. Prevents from unwanted feedrate-changing when navigating back to the main menu and makes it easier to return to 100%.	2013-05-18 19:53:46 +02:00
Gord Christmas	28ada096e2	Adding servo documentation	2013-05-18 06:01:58 -07:00
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
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
Tim Anderson	594193c908	Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1	2013-05-06 23:29:38 -06:00
Tim Anderson	1fa61c297e	Turning off Control Panel by Default and Updating the link to the LiquidCrystal_I2C library to avoid confusion.	2013-05-06 23:23:54 -06:00
kiyoshigawa	b27a59f41e	Added support for Elefu RA Board and Elefu Control Panel	2013-05-06 08:44:38 -06: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
Scott Lahteine	a5cd582665	Support for 10 level deep SD folder hierarchy	2013-05-04 04:18:02 -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
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.	2013-05-02 09:55:15 -07:00
Scott Lahteine	a200521eab	Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h Also cosmetic comment changes and spelling corrections in printed messages	2013-05-02 09:22:58 -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	289c02eda4	Remove unnecessary pin initialization in stepper.cpp (duplicates initialization in Marlin_main.cpp)	2013-04-30 01:11:23 +10:00
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	2013-04-30 01:08:29 +10:00
Robert F-C	c3cdaceab3	Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1	2013-04-29 22:13:55 +10: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
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
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
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
Bart K	4fa2260a59	Fixed cardreader.h to resolve issue #440 (Pull Request #425 missing file)	2013-03-31 19:59:16 -04:00
Erik van der Zalm	038d405254	Corrected #endif in language.h	2013-03-31 20:28:29 +02:00
Dirk Eichel	443aaa30bf	Removed GIT fragments Seems that there was something wrong while merging	2013-03-30 23:26:42 +01:00
ErikZalm	7f622467fc	Merge pull request #425 from kefir-/m928_logging M928 logging	2013-03-30 08:50:34 -07:00
ErikZalm	86867928ac	Merge pull request #434 from DDRBoxman/Marlin_v1 Add support for M300: Play beep sound	2013-03-30 08:49:54 -07:00
ErikZalm	9a38cad6f0	Merge pull request #430 from STB3/GLCD_128x64_dots Final task of the 128x64dots GLCD implementation	2013-03-30 08:49:14 -07:00
ErikZalm	7a5c474d91	Update Configuration.h	2013-03-28 21:27:50 +01:00
Dirk Eichel	4e448b700a	Merged fetched files from Marlin_v1 branch Pull requests: #414 #433 #432 #428	2013-03-26 21:43:04 +01:00
ErikZalm	9f2862ce48	Merge pull request #414 from whosawhatsis/Marlin_v1 regenerated thermistor table 7	2013-03-25 13:14:49 -07:00
ErikZalm	9fb8bd5685	Merge pull request #433 from whosawhatsis/bang-mode Separate PID_MAX from BANG_MAX	2013-03-25 13:11:34 -07:00
Colin Edwards	0d075378d5	Add LARGE_FLASH define and enable it for some of the beefier boards The LARGE_FLASH flag allows superfluous features to be excluded on boards with less memory	2013-03-25 10:42:27 -05:00
Colin Edwards	9a1c90471f	Ignore unused beeper pins	2013-03-25 10:28:15 -05:00
Colin Edwards	1a0f889803	Add support for M300: Play beep sound	2013-03-24 23:35:05 -05:00
Robert F-C	9322c408c6	Updated for LiquidTWI2 library version 1.2.3 The new version of the library means that PANELOLU no longer needs to be defined in LiquidTWI.h (the library file can be used as is) and the new version of the library also enables the buzzer on the Panucatt VIKI panel.	2013-03-24 18:19:58 +11:00
whosawhatsis	fd5b7e0cec	Separate PID_MAX from BANG_MAX This allows PID_FUNCTIONAL_RANGE to use a maximum duty cycle higher than PID_MAX. This is useful for powerful heaters to heat quickly in bang-bang mode, but use a lower duty cycle that is easier to stabilize in PID mode.	2013-03-22 18:16:26 -07:00
blddk	e5a853a3d0	Added automated extruder fan function	2013-03-22 18:49:05 +01:00
blddk	72419f69a9	Added rumba	2013-03-22 18:41:54 +01:00
blddk	91bea43332	Added rumba pinout	2013-03-22 18:29:47 +01:00
blddk	d2b00fe486	Removed html and added rumba Found some unwanted html at the bottom of the file which caused it to not be able to compile. Also added rumba as machine.	2013-03-22 18:28:16 +01:00
Dirk Eichel	6c66cae694	GLCD init screen cosmetics	2013-03-19 21:25:11 +01:00
Dirk Eichel	f3e0e5184d	Add include selector between char. LCD and GLCD	2013-03-19 20:59:21 +01:00
Dirk Eichel	5d3862f9d1	Modified u8glib logo on welcome screen	2013-03-19 20:32:23 +01:00
Dirk Eichel	0b320f75e9	Removed debug code, add some comments	2013-03-19 20:29:25 +01:00
Dirk Eichel	5f1cd70122	Add code to lcd_update() for GLCD This code selects between the routines for the GLCD or the char. display.	2013-03-19 20:19:16 +01:00
Dirk Eichel	a49c09a776	Add variable for animated fan, add float conversion w/o sign A new variable was introduced to allow fan animation on the GLCD. Add additional float to string conversion routine without sign character. This is used for the coordinates visualisation on the GLCD.	2013-03-19 20:13:23 +01:00
Dirk Eichel	26d8863111	Add library selection between GLCD and char. LCD	2013-03-19 20:03:47 +01:00
Dirk Eichel	4a141a694f	Marlin code for GLCD display This contains the menues, status screen etc...	2013-03-19 19:59:56 +01:00
Dirk Eichel	83c790a020	Add bitmap graphics for GLCD 1. Marlin welcome screen 2. Status screen symbols 3 Extruders, heated bed, animated fan logo 1 3. Status screen symbols 3 Extruders, heated bed, animated fan logo 2	2013-03-19 19:57:35 +01:00
Dirk Eichel	233df9cca0	Add missing LF at the end of the file	2013-03-19 19:12:33 +01:00
Dirk Eichel	bb0de75a92	Removed umwanted HTML code ath the end of the file Sorry for that. This does not lead to compile errors. I removed the unwanted code to make it clean.	2013-03-19 06:46:05 +01:00
Ryan Turner	7c47e7162d	Adding Maker's Tool Works heated bed thermistor	2013-03-18 22:53:37 -05:00
daid	af78d0cbfa	Merge pull request #1 from illuminarti/Fix_E_Speed Fix step rate bug (especially for retraction)	2013-03-18 23:36:11 +01:00
Dirk Eichel	9a78f321a4	Add pins for Motherboard variant 64 These definition contain also the definition for the graphics LCD.	2013-03-18 23:36:11 +01:00
Dirk Eichel	5de25ccd20	Add Motherboard variant 64 - STB V1.1 Definition for the graphic LCD are already in it, they will not harm the configuration as they are only defined constants	2013-03-18 23:36:10 +01:00
daid	d6ce63c49c	Merge pull request #411 from STB3/Marlin_w_STB_Board_support Add STB board support to Marlin (next step towards graphic LCD implementation)	2013-03-18 07:57:39 -07:00
Ketil Froyn	f036be7c4e	Clean up tab/whitespace from last commit	2013-03-16 23:11:58 +01:00
Ketil Froyn	07e11c7cf5	Add command M928 to enable logging to file of received gcode commands	2013-03-16 23:02:57 +01:00
daid	92782f9252	Merge pull request #1 from illuminarti/Fix_E_Speed Fix step rate bug (especially for retraction)	2013-03-15 09:07:34 +01:00
whosawhatsis	6a61a3c0b4	missing comma in last commit	2013-03-08 16:15:49 -08:00
whosawhatsis	f0aee4101a	regenerated thermistor table 7 Generated with createTemperatureLookup.py. The old table crapped out at 270C, which was a problem for polycarbonate.	2013-03-08 13:41:49 -08:00
Nicolas Rossi	aba67e2449	No bed config for RAMPS The motherboard 35 is a config without bed with this pins setting : D8 Extruder D9 Fan D10 Controller Fan	2013-03-05 15:51:24 +01:00
Nicolas Rossi	6504e96165	Turn off power supply off-load Disable the high current output and wait a little before to turn off, because the interrupting capacity of the PSU is unknown. Could be a function if needed by other.	2013-03-05 15:03:48 +01:00
Nicolas Rossi	86bf911139	Toggle menu for PSU from LCD pannel From the prepare menu, accessible when is not printing, you have the possibility to turn off the PSU when is on et vice versa. From the host, you can turn off or turn on the PSU then the menu is updated accordingly. From the LCD message, the printer status is reported ready or off respectively when the PSU is on or off.	2013-03-05 14:52:51 +01:00
Robert F-C	7bad72359c	Support encoder click on PANELOLU2 being read through I2C This change also handles the case where the pause/stop/restart button on the VIKI is not used. Make LCD I2C buzz sound the same as the normal buzz (300ms is too long for quick feedback).	2013-03-03 18:47:50 +11:00
Robert F-C	1daf2f3256	Number of extruders is not an advanced configuration - it is a basic property.	2013-03-02 16:14:19 +11:00
Robert F-C	f1263d3f88	Further reduce code by using precompiler logic	2013-03-02 16:12:11 +11:00
Dirk Eichel	140e095c6e	Add pins for Motherboard variant 64 These definition contain also the definition for the graphics LCD.	2013-03-01 17:47:32 +01:00
Dirk Eichel	b2c1c64fb1	Add Motherboard variant 64 - STB V1.1 Definition for the graphic LCD are already in it, they will not harm the configuration as they are only defined constants	2013-03-01 17:39:54 +01:00
Dirk Eichel	ceb5ee38af	Replaced corrupted language.h file on local PC with current from ErikZalm/Marlin	2013-03-01 17:27:57 +01:00
Dirk Eichel	8efd4cfd73	fixed merge conflict	2013-03-01 16:27:35 +01:00
Robert F-C	372e12f83f	Implement automatic extruder/cold-end fan control based on temperature This change allows fan outputs to automatically turn on/off when the associated nozzle temperature of an extruder is above/below a threshold temperature. Multiple extruders can be assigned to the same pin in which case the fan will turn on when any selected extruder is above the threshold. It also makes the M42 command compatible with the M106/M107 command. The majority of the logic in this change will be evaluated by the compiler at build time (i.e, low code space requirements).	2013-03-01 21:57:23 +11:00
Robert F-C	6beb42cdf6	Attempt to address Bernhard's comments Refactor configuration to try to make items clearer (what defines a panel vs what is user changeable).	2013-03-01 01:17:07 +11:00
Robert F-C	839bef6d5d	Fix Configuration.h file to not define LCDs be default. Also fix compile time check in Marlin.pde	2013-02-28 02:32:20 +11:00
Robert F-C	1292d735ba	Converge all I2C LCD branches (PANELOLU2, VIKI & PCF8575) This includes refactoring the buttons code to remove a large amount of non-pin dependent duplication from pins.h.	2013-02-28 02:04:51 +11:00
daid303	4eb81a69e6	Only compile the new extruder offset code if you have multiple extruders.	2013-02-27 12:32:07 +01:00
daid	3e9cd334a4	Merge pull request #383 from dob71/jeff Hotend offset handling for multi-extruder machines	2013-02-27 03:10:18 -08:00
MendelMax	67710df9f3	Made i2c mode wok with the hardware I am able to test (ywrobot / sainsmart i2c LCD 2004) Removed incorrect LiquidCrystal_I2C Library	2013-02-26 22:22:12 +00:00
Bob Clough	b6209c86dd	Added import of Wire Library to make I2C LCD support compilable	2013-02-25 15:15:23 +00:00
Bob Clough	2b567d1df5	Added I2C port expander support to HD44780	2013-02-25 14:22:14 +00:00
Bob Clough	06272f463d	Added Config variables for activating I2C LCDs and setting type and address	2013-02-25 14:14:46 +00:00
daid303	de3dec7215	Also show the tune menu when USB printing.	2013-02-20 00:54:44 +01:00
Denis Bakin	73d41c10b9	Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into jeff Conflicts: Marlin/language.h Marlin/thermistortables.h	2013-02-18 12:10:52 -05:00
daid	63da4dc59a	Merge pull request #398 from DanieleSdei/Marlin_v1 Marlin v1, alignment of the Italian language	2013-02-16 15:41:43 -08:00
Daniele Sdei	82e28851bd	Italian language: SD-Card change and SD-Card init	2013-02-16 12:17:29 +01:00
Daniele Sdei	aed5965ad8	Italian language: remove space and some fix	2013-02-16 12:14:50 +01:00
codenamepawel	d360846dd4	Update Marlin/language.h Update Polish language #define MSG_RESUMING "Wznawiam drukowanie"	2013-02-16 03:42:53 +01:00
daid303	2f60e324dc	Fixed #394	2013-02-14 14:04:26 +01:00
daid	5e2abfcdcd	Merge pull request #391 from STB3/Marlin_with_SD-Card_Change_Menu Add SD-Card change and SD-Card init. for electronics equipped with LCD Display	2013-02-13 08:56:00 -08:00
Dirk Eichel	a0d4e8e78e	Add Messages for SD Card init. & change	2013-02-13 10:05:18 +01:00
mfeherpataky	bbf0cc1379	Update Marlin/ultralcd_implementation_hitachi_HD44780.h Fix to a bug that I just introduced - sorry. Forgot about offset of string length.	2013-02-12 20:06:51 +01:00
Dirk Eichel	c8f1fbd9d8	Add SD-Card change and SD-Card init. Add SD-Card change and SD-Card init. for reprap electronics without SD-Chard change detect pin.	2013-02-12 17:35:46 +01:00
mfeherpataky	71ddb8dc60	Update Marlin/ultralcd_implementation_hitachi_HD44780.h Use all available characters in narrow LCDs < 20 characters.	2013-02-12 00:03:40 +01:00
mfeherpataky	d2c547c407	Update Marlin/ultralcd_implementation_hitachi_HD44780.h Fix to a minor bug with hardcoded LCD_WIDTH that draws edited values outside of the 16 characters width LCDs.	2013-02-11 23:25:24 +01:00
Denis B	70871715e4	Added support for extruder offset handling The extruder offset can be specified in the configuration file or adjusted on the fly using the "M218 T# X# Y#" command. The EEPROM support is not yet merged in. The "T#" command can take option "F#" that specifies the feedrate at which the printing head should be re-positioned. If not specified the re-positioning move is not preformed immediately, but the coordinates are adjusted for the printer to properly position the head when the next movement happens.	2013-02-04 23:05:45 -05:00
Denis B	49b2ddc8c1	Cleaned up non-standard characters	2013-02-04 01:41:40 -05:00
Bernhard Kubicek	f8876a7958	Merge pull request #376 from kintel/skip_longfilenames Also skip .files and _files with long filenames. I think its better than before. If somebody dislikes it, or wants additional configuration, it can be done in a future step. Thanks, Marius, and nice to have you helping!	2013-02-03 03:05:31 -08:00
daid	18fcc367d2	Merge pull request #371 from Banjer/Melzi_LED_PIN Chenged LED_PIN for Melzi boards, added comment about broken versions of...	2013-02-02 03:23:43 -08:00
Bas Spaans	19ce90fe02	Added comment about M42 usage (clean)	2013-01-31 18:20:23 +01:00
Bas Spaans	00fed0a703	Revert "Extended comment explaining M42 usage" This reverts commit `01541ee64c`.	2013-01-31 18:11:13 +01:00
Marius Kintel	e06d820909	Also skip .files and _files with long filenames	2013-01-31 12:07:42 -05:00
Bas Spaans	01541ee64c	Extended comment explaining M42 usage	2013-01-31 18:00:25 +01:00
Marius Kintel	f24f02e212	compile fix: quickStop() needs stepper.h	2013-01-31 10:43:03 -05:00
Bas Spaans	12c41423ad	Fixed typo in comment	2013-01-30 22:54:04 +01:00
Bas Spaans	0995eaa492	Chenged LED_PIN for Melzi boards, added comment about broken versions of the Sanguino libraries	2013-01-30 22:25:01 +01:00
Bernhard	1d06b10962	Added a feature to have filament change by gcode or display trigger. [default off for now] syntax: M600 X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal] if enabled, after a M600, the printer will retract by E, lift by Z, move to XY, retract even more filament. Oh, and it will display "remove filament" and beep like crazy. You are then supposed to insert a new filament (other color, e.g.) and click the display to continue. After having the nozzle cleaned manually, aided by the disabled e-steppers. After clicking, the printer will then go back the whole shebang, and continue printing with a fancy new color.	2013-01-27 13:21:34 +01:00
daid303	408b349a84	Fixed #368 . Commented out the wrong pin definition, but explained why it is there.	2013-01-21 15:46:17 +01:00
Daniele Sdei	9ecb267b63	Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1	2013-01-14 15:47:40 +01:00
Daniele Sdei	3cf59f6f9a	add RepRapPro Huxley thermistor tables	2013-01-14 15:36:08 +01:00
daid	c1730e2b08	Merge pull request #363 from yuroller/sanguino_panelolu Panelolu pin assignment for sanguinololu	2013-01-10 07:19:37 -08:00
Yuri Valentini	86358dd6cd	Panelolu pin assignment for sanguinololu from http://reprap.org/wiki/Panelolu	2013-01-10 12:23:20 +01:00
daid303	0f3f5d083d	Minor cleanup of the new FAN_KICKSTART code. #334	2013-01-10 11:08:45 +01:00
daid	6ec56fa923	Merge pull request #334 from KevinOConnor/FanKick Add feature to briefly run the cooling fan at full speed when it first starts.	2013-01-09 02:47:59 -08:00
daid	965baf2683	Merge pull request #362 from daid/Marlin_v1 Finnish language	2013-01-09 02:42:09 -08:00
Kevin O'Connor	3d91bd486c	Add "kick fan" feature - briefly run fan at full speed on start. Add a feature to run the cooling fan at full speed for a small period (default 100ms) when first starting the fan. Some fans wont reliably start spinning at low power, and many fans have issue with the PWM at low power. However, once the fan starts spinning it can reliably be set to a wide range of PWM values.	2013-01-08 18:50:15 -05:00
Kevin O'Connor	3f2f94ef28	Be consistent in setting of the fan PWM. Always set the FAN PWM value in check_axes_activity() and always use the value of the active move if a move is active.	2013-01-08 18:49:18 -05:00
Henry Palonen	7f30039d2a	+ Finnish translation	2013-01-08 19:21:34 +02:00
daid303	14e1d495ef	Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1	2013-01-08 17:10:30 +01:00
daid303	bbe7d3d0fe	Fixed #312	2013-01-08 17:09:57 +01:00
daid	7ce509b9a7	Merge pull request #361 from yuroller/MakefileSanguino Makefile sanguino	2013-01-08 06:22:27 -08:00
Yuri Valentini	9c34c4f05b	fixes for ramps compilation using installed arduino ide	2013-01-08 12:54:31 +01:00
daid303	442ade15a6	Move Gen6 stuff into a proper location.	2013-01-08 12:31:28 +01:00
daid	5fd4582cc8	Merge pull request #242 from Drakelive/Marlin_v1 Fixes issues # 216 and # 135 for Gen6 and Gen6 Deluxe board	2013-01-08 03:29:20 -08:00
daid303	8b88e3b386	Fixed #345 , Fixed #267 .	2013-01-08 12:14:55 +01:00
daid	27843388c6	Merge pull request #360 from njprossi/Marlin_v1 Power signal control definitions for other power supplies	2013-01-08 02:58:02 -08:00
daid303	921273baa0	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
Yuri Valentini	7d20ec706e	Added libraries from Arduino 1.0.3 for sanguino build	2013-01-07 17:26:50 +01:00
Nicolas Rossi	437eb3bafc	Initialize PS_ON at startup	2013-01-07 14:57:51 +01:00
Nicolas Rossi	f3c1fc70a9	Power signal control definitions for ATX and others	2013-01-07 14:33:30 +01:00
Yuri Valentini	dad7691df9	makefile for sanguino standalone compilation	2013-01-07 11:08:10 +01:00
Erik vd Zalm	6752cb2d9c	PID now per extruder. Fixed typo	2013-01-06 14:26:23 +01:00
Erik vd Zalm	0ac452e252	Disable is now multi extruder compatible. M84 got a T option.	2013-01-06 13:37:01 +01:00
Johann Rocholl	9e7b5056a0	{X,Y,Z}_{MIN,MAX}_POS are actually in Gcode coordinates.	2012-12-28 16:20:10 -08:00
Daniele Sdei	5f82f03ff3	Add italian MSG_RESUMING.	2012-12-28 11:44:35 +01:00
daid303	5e3873c8db	Add german MSG_RESUMING.	2012-12-25 20:53:11 +01:00
daid303	01aac2a142	Small changes on the LCD panel, let the speed control work better, line up the parameter edit the same as the menu, remove some unused defines, and remove the Z from the 10mm move menu.	2012-12-21 16:14:47 +01:00
daid303	b69cb9fbd9	Change the end of SD cart print message from minutes/seconds to hours/minutes.	2012-12-19 12:26:40 +01:00
daid	30254e3388	Merge pull request #350 from jcrocholl/Marlin_v1 Automatically set _MIN_PIN and _MAX_PIN according to *_HOME_DIR.	2012-12-17 02:16:31 -08:00
daid303	38ee395ac7	Replace the 1ms delay for 2 nops to get a 100ns delay. #259	2012-12-17 11:12:11 +01:00
daid303	5df5e4c4a2	Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1	2012-12-17 11:09:18 +01:00
daid303	a95dcd74e7	Fix some of the duplicated PSTRs, saving 500bytes of flash with LCD on.	2012-12-17 11:09:09 +01:00
Johann Rocholl	8caf5d252d	Remove bogus blank line.	2012-12-16 12:50:20 -08:00
Johann Rocholl	1c2ecddae4	Fix typo (# missing before define).	2012-12-16 12:33:44 -08:00
Johann Rocholl	6dfb8a2187	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.	2012-12-16 12:30:33 -08:00
Johann Rocholl	3b2e5027e5	Merged updates from Marlin_v1.	2012-12-16 12:19:24 -08:00
Johann Rocholl	b39f5d614a	For boards with only one endstop per axis, automatically set _MIN_PIN and _MAX_PIN according to *_HOME_DIR.	2012-12-16 12:09:53 -08:00
oni303	ab09fa4bbf	fixed pwm generation at pin D12 and D13 when one of them is used as FAN_PIN on Sanguino, added soft pwm entry for FAN_PIN in temperature.cpp	2012-12-16 01:36:57 +01:00
Sergey Taranenko	5697451c72	fix lcd class	2012-12-14 15:39:47 +04:00
Sergey Taranenko	58e806f3fa	Fix the russial translation.	2012-12-14 15:39:26 +04:00
Sergey Taranenko	50a5ce1dc4	deduplicate messages	2012-12-14 15:37:05 +04:00
daid303	6123a00e64	Fix the german translation.	2012-12-14 11:11:02 +01:00
daid303	7c21716886	Fixed #341	2012-12-14 10:53:11 +01:00
daid303	ae1bc83350	Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1	2012-12-13 13:25:22 +01:00
daid303	596a7e1904	Fix compiling for Arduin < 1.0.0	2012-12-13 13:24:55 +01:00
Daid	b264317fa0	Reverted the patch by KevinOConnor, as it crashes some versions of avr-gcc and caused linking issues.	2012-12-13 12:19:12 +01:00
Daid	673577a31b	Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1	2012-12-13 11:41:34 +01:00
Daid	23022f1a82	Updates to Makefile to compile for Teensy.	2012-12-13 11:41:27 +01:00
daid	96e9db8919	Merge pull request #339 from KevinOConnor/CompilerFlags Add additional optimization flags to Makefile	2012-12-13 01:30:17 -08:00
daid303	08356361ac	Fixing a problem with heated beds not working without PID and BED_LIMIT_SWITCHING	2012-12-13 10:25:29 +01:00
daid303	047d037f8c	#ifdef fix for #326	2012-12-13 09:04:41 +01:00
Kevin O'Connor	0908458381	Use gcc "-fwhole-program" optimization. Use "whole program" and "link time optimization" features of gcc. The whole-program optimization enables the compiler to evaluate the entire firmware for optimization instead of just one code file at a time. This leads to better overall optimizations.	2012-12-12 23:22:35 -05:00
Kevin O'Connor	16fbb455ef	Use linker "--relax" option. The "relax" option enables the linker to convert certain "call" instructions to the smaller "rcall" instruction. This reduces the size of the resulting binary.	2012-12-12 23:22:31 -05:00
daid303	f30b46b2a8	One more fix for #338 , I really should get a heated bed to test with.	2012-12-12 23:06:17 +01:00
daid303	65c3f1ffcd	Most likely fixing #338	2012-12-12 21:56:17 +01:00
daid303	7577717b59	Fixed #336	2012-12-12 13:08:26 +01:00
daid303	1a8f54cea1	The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.	2012-12-12 11:47:03 +01:00
daid303	6731c094ee	Fix compiling with just an 16x2 LCD and no buttons.	2012-12-12 11:32:33 +01:00
daid303	b99a928a80	Fix the M117 (display message on LCD) when used over USB with checksums.	2012-12-12 09:35:32 +01:00
daid303	55ba90ac19	Add PID functional range setting. With high powered heaters the current functional range of 10 degrees causes high overshoots as the PID needs to kick in before the temperature hits 10 degrees below target.	2012-12-12 09:08:37 +01:00
daid303	5ff5cee8ce	Fix the sensitive pin definitions, there where analogue numbers in the digital pin list. Also made M42 without a P function on the LED_PIN (which was otherwise a useless pin definition)	2012-12-11 14:53:53 +01:00
daid303	8b58edc70e	Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1	2012-12-11 13:38:34 +01:00
daid	d0319d45af	Merge pull request #335 from jcrocholl/Marlin_v1 Fix endstop pins for Printrboard	2012-12-11 02:59:58 -08:00
Johann Rocholl	ca409e5531	Fix X/Y/Z_MIN_PIN for Printrboard.	2012-12-11 01:59:48 -08:00
Johann Rocholl	1f45cb0a51	Fix typo in MANUAL_HOME_POSITION (plural S missing) and improve comments.	2012-12-11 01:54:40 -08:00
Johann Rocholl	931a0052ea	Fix typo in MANUAL_HOME_POSITION (plural S missing) and reduce BLOCK_BUFFER_SIZE because 64 wasn't working for some reason.	2012-12-11 01:22:04 -08:00
daid303	46ec4b648c	Added some missing Mxxx comments to M commands. Fixed the unsetting of the timer dividers for the fast PWM fan.	2012-12-11 10:21:44 +01:00
Daid	724f5aa36b	Update on makefile for moved Arduino addons.	2012-12-10 12:06:30 +01:00
daid303	6d9dfa96c3	Move the Arduino related stuff out of the Marlin tree, as they are not directly related to Marlin functionality but addons for the Arduino IDE. Also split up the addons for pre 1.0.0 Arduino and post 1.0.0 Arduino.	2012-12-10 12:02:29 +01:00
daid303	3fb07d9b8d	Add MINTEMP/MAXTEMP error to LCD, and fix temperature bug with more then 1 extruder.	2012-12-10 10:48:46 +01:00
Johann Rocholl	8e2519e88b	Add realtime delta geometry in Marlin_main.cpp.	2012-12-10 01:04:12 -08:00
Johann Rocholl	cec7283b21	Enable QUICK_HOME for deltabot.	2012-12-10 00:43:47 -08:00
Johann Rocholl	2292441f0c	Use X/Y/Z_MAX_PIN instead of X/Y/Z_MIN_PIN for top endstops on deltabot.	2012-12-10 00:43:14 -08:00
Johann Rocholl	c430906d3b	Deltabot settings and configuration adjustments.	2012-12-10 00:10:56 -08:00
daid303	82c8724b33	Fix compile with PID_DEBUG	2012-12-09 23:50:12 +01:00
daid303	9b160972a1	Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1	2012-12-09 23:46:42 +01:00
daid303	e036750bdf	Use the disable macros on initialization. Which fixes a bug when there is no pin defined for stepper enabled (motherboard 4)	2012-12-09 23:46:25 +01:00
Daid	fcd9de72ef	Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1	2012-12-09 23:31:07 +01:00
Daid	32d4373e0f	Add printrboard and brainwave to Makefile.	2012-12-09 23:30:55 +01:00
daid	b3ddbcee2a	Merge pull request #329 from jcrocholl/Marlin_v1 Add Printrboard and Brainwave to pins.h and fastio.h	2012-12-09 14:29:26 -08:00
Daid	29435dfb4b	Proper avr for Sanguino in Makefile.	2012-12-09 23:02:03 +01:00
daid303	52158dffcc	Big temperature code update. No longer converts back and forwards between temperature and raw sample value. Reducing complexity, removing code. Also named some variables better. While keeping the safety intact and functionality the same.	2012-12-09 23:00:06 +01:00
Daid	ca7acbe6d9	Allow specification of which arduino hardware subvariant in Makefile.	2012-12-09 19:19:57 +01:00
Johann Rocholl	33247733e0	Teensylu and Printrboard use different analog pins for thermistors.	2012-12-09 02:19:13 -08:00
Johann Rocholl	621c24a10f	AT90USB is only defined after pins.h is included.	2012-12-09 01:40:33 -08:00
Johann Rocholl	6cba11f087	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
Johann Rocholl	4d351b4846	Improved formatting and comments for consistency.	2012-12-08 20:15:53 -08:00
Johann Rocholl	a30007caa4	If fastio.h is not messed up then Teensylu and Printrboard are actually using the same pins.	2012-12-08 19:46:42 -08:00
Johann Rocholl	6aa87a7b67	Use the same fastio.h definition for AT90USB1286/7 and AT90USB646/7.	2012-12-08 15:16:38 -08:00
Johann Rocholl	b1c38d4c82	Avoid compiler warnings (redefined MOTHERBOARD) in Arduino 1.0 and greater.	2012-12-08 11:34:18 -08:00
Johann Rocholl	42e21bb06e	Add support for Printrboard (from https://github.com/lincomatic/Marlin ) and Brainwave (from https://github.com/metrix/Sprinter ).	2012-12-08 10:49:01 -08:00
Johann Rocholl	ce4b5bbeaa	Add AT90USB646 support from Sprinter to fastio.h.	2012-12-08 10:45:58 -08:00
Daid	f413aa33b3	Small makefile change, posibility to add defines on the commandline, and fix compiling with watchdog enabled when using the Makefile.	2012-12-08 11:49:53 +01:00
daid303	587154c01b	Fix the WATCHPERIOD implementation. It did not work correctly in a multi extruder setup, it did not work after 32 seconds after startup (int16 used as millies timestamp). And it did not work if you gave an M104 or M109 when the target was already around the target setpoint. So on average, it did not work at all. The new implementation should be robust in detecting a failure to heat up.	2012-12-06 10:36:07 +01:00
daid303	1f27870d41	Fix compiling the watchdog error message when the manual reset watchdog is used.	2012-12-06 10:27:50 +01:00
daid303	c5d4225804	Mistake there, not sure why I did that. My bad.	2012-12-05 20:23:13 +01:00
daid303	529748894c	Minor changes in the temperature code for some cleanup.	2012-12-05 19:54:01 +01:00
daid303	4e26ecc940	The Partial release message (which does not really tell you anything) overwrites the final print time on the LCD, which is a real shame. So I removed the message.	2012-12-05 19:32:26 +01:00
daid303	c421774422	The Partial release message (which does not really tell you anything) overwrites the final print time on the LCD, which is a real shame. So I removed the message.	2012-12-05 19:32:02 +01:00
daid303	16078e47d4	Fixed #325	2012-12-04 16:27:21 +01:00
daid303	6a9bee27cc	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
daid303	94ea26ff46	Some minor changes on code style. And a bugfix where the counters for positioning in the stepper where wrong depending on compiler settings. (Caused strange values to reported back with M114 and endstop triggers). Also fixed compiling with FWRETRACT enabled.	2012-12-03 12:13:20 +01:00
daid303	6c51fe5039	Fix the bug where the SD percentage calculation is wrong when the file is larger then 42MB	2012-12-03 11:35:36 +01:00
brupje	57429cb9fe	Fix for keypad	2012-11-29 21:42:19 +01:00
daid303	97fa2a9c30	Few simple fixes that save RAM, as static strings are stored in RAM by default.	2012-11-28 10:30:34 +01:00
Daid	c94ca24adc	Fixed #317	2012-11-24 17:32:30 +01:00
Daid	99e9554edd	Some fixes in the Makefile to support Arduino 1.0.0 or higher and added the Rambo. Still needs some more work for the different arduino hardware variants.	2012-11-24 11:46:31 +01:00
Erik vd Zalm	dbbf050005	More rambo fixes	2012-11-21 20:53:56 +01:00
Erik vd Zalm	f934d0ef5b	Merge remote-tracking branch 'tonokip/Marlin_v1' into Marlin_v1 Conflicts: Marlin/Configuration.h	2012-11-21 20:36:30 +01:00
Erik vd Zalm	e48dfcc2b3	Tmp copy before merge	2012-11-21 20:29:31 +01:00
Erik vd Zalm	b98fb17fe9	Small FREQUENCY_LIMIT changes	2012-11-21 20:17:44 +01:00
daid	bce67ec2c9	Merge pull request #312 from gege2b/Marlin_v1 Added french translation	2012-11-18 13:43:07 -08:00
Gege	9b1d2483a0	I hope last changes to french translation	2012-11-18 22:34:56 +01:00
Gege	b1adc567da	Correction to french translation (non-ASCII chars only)	2012-11-18 20:00:41 +01:00
Gege	0807d82af0	Correction to french translation (plain text only)	2012-11-18 19:39:56 +01:00
Erik vd Zalm	5cd7a90b32	Added new temperature lookup table creation tool. This one uses stein hart-hart equations. You need 3 temperature resistance:combinations. This gives a better result then using beta.	2012-11-16 23:51:05 +01:00
gege2b	bb119739b0	Added french translation	2012-11-16 18:38:50 +01:00
daid	df8dd5ac21	Merge pull request #306 from nothinman/Marlin_v1 Added automatic build numbering.	2012-11-14 01:59:33 -08:00
MaikStohn	2b7b1e52b1	allow marlin internal 0°C represenation	2012-11-13 14:37:08 +01:00
Martin Lukasik	2f771b3979	Added automatic build numbering.	2012-11-12 21:06:59 +00:00
daid	9bebe9b631	Merge pull request #302 from nothinman/Marlin_v1 Added Polish translation. Cosmetic changes to English.	2012-11-12 12:13:30 -08:00
daid303	a2032afa3a	Fixed #303	2012-11-12 21:04:07 +01:00
Martin Lukasik	6a55ca8370	Added Polish translation. Cosmetic changes to English.	2012-11-12 15:54:07 +00:00
daid303	8f20562f49	Fix some of the crowded code style. And fixed the conditional. #300	2012-11-12 15:49:40 +01:00
daid303	43018a48c4	Fix for a few -Wextra warnings.	2012-11-12 15:35:28 +01:00
daid303	72586eb30a	Solved few warnings.	2012-11-12 09:29:12 +01:00
daid303	7a02ba361c	Header multiple include protection should match the filename, not just _ARDUINO_H, which is almost bound to go wrong some day.	2012-11-12 09:24:28 +01:00
daid303	f4a89ec776	SDCARDINSERTED is always defined, and thus we do not need the #ifdefs.	2012-11-12 09:16:27 +01:00
daid303	57834776ad	Made the 2nd speed lookup table condition more explicit.	2012-11-11 12:02:48 +01:00
Daid	caa2b25b40	Fix Gen7 compile if you have avr-libc version 1.7.1 or higher. See http://code.google.com/p/arduino/issues/detail?id=604	2012-11-11 11:17:54 +01:00
daid303	a27fef8750	Store the pre-heat constants outside of the ULTIPANEL define, so we can use them when storing EEPROM in a build without the ULTIPANEL.	2012-11-11 11:06:58 +01:00
daid303	789be03b4f	Update on makefile, should make it easier to compile for different boards without changing the makefile. (Still missing Arduino 1.x.x support).	2012-11-11 11:05:52 +01:00
daid303	40ce057a3e	Fixing issue #297	2012-11-10 14:37:01 +01:00
daid303	625ac81acc	Yes, makes sense, lets NOT use the value directly from the configuration define but modify it before setting it. This will not confuse people (including me) at all!	2012-11-09 22:36:31 +01:00
daid303	ffc69537aa	Update on some comments, make the MOTHERBOARD list complete again.	2012-11-09 09:10:51 +01:00
daid303	71efcfc648	Most likely fixing issue #295 .	2012-11-08 21:08:05 +01:00
daid303	04be9d6001	God damn. Sorry, my mistake, forgot to add this file.	2012-11-07 23:16:43 +01:00
daid303	c17da4b707	Add ConfigurationStore to the Makefile.	2012-11-07 22:43:01 +01:00
daid	ccd9fd0dc3	Merge pull request #292 from jothan/lcdfix Lcd fixes	2012-11-07 13:10:59 -08:00
Jonathan Bastien-Filiatrault	46b9988e26	Search and replace failure.	2012-11-07 16:09:30 -05:00
Jonathan Bastien-Filiatrault	0f73afb0b0	Avoid defining overriding definitions for the RepRapDiscount Smart Controller. Remove common definitions. Harmonize declaration order.	2012-11-07 16:04:28 -05:00
Jonathan Bastien-Filiatrault	36b452c7ac	Remove abbrs.	2012-11-07 15:42:18 -05:00
YanFM	332344bd43	Update Marlin/language.h Included Portuguese language	2012-11-07 09:43:13 -02:00
daid303	e6c1cadea0	Set the watchdog to a 4 second timeout, as with 1 second it can timeout during SD card init.	2012-11-07 12:32:17 +01:00
daid	faea7d72b8	Merge pull request #290 from buildrob/Marlin_v1 Clean up special serial port cases	2012-11-07 02:00:26 -08:00
daid303	12a4d60e18	Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template.	2012-11-07 10:02:45 +01:00
Jonathan Bastien-Filiatrault	9606f4d04f	Include Marlin_main.cpp in source files.	2012-11-06 20:32:48 -05:00
Jonathan Bastien-Filiatrault	3cbaad9288	RepRapDiscount Smart Controller pin definitions.	2012-11-06 20:32:13 -05:00
Robert F-C	99692dc99e	Clean up special serial port cases Assume SERIAL_PORT 0 if not defined. Collapse un-numbered register special case. Clarify comments.	2012-11-07 09:00:21 +11:00
daid303	5a998558a9	Update suggested by Robert F-C. #289	2012-11-06 21:04:29 +01:00
daid303	f6ff0ab767	signed/unsigned fixes.	2012-11-06 15:33:49 +01:00
daid303	5d471e0f34	Also reset the PID values to defaults. Fixes #281	2012-11-06 15:21:00 +01:00
daid303	d3ebc34958	Hopefully also support chips with a single UART in MarlinSerial now.	2012-11-06 14:43:36 +01:00
daid303	b6ff45254e	Better explain the watchdog "problem" and rename the config define so it explains that the feature belongs to the watchdog.	2012-11-06 13:33:00 +01:00
daid303	7e348fcb5f	By mistake enabled the watchdog by default. This should be off by default.	2012-11-06 13:20:08 +01:00
daid303	06b58a9c4f	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
daid	539f3b3fe4	Merge pull request #284 from brackendawson/Marlin_v1 Use the right pins for Gen7 1.4	2012-11-06 01:06:24 -08:00
Robert F-C	65c9a0728f	Set default serial port back to 0.	2012-11-05 22:15:07 +11:00
Robert F-C	ab9d183024	Make serial port configurable. This change makes the choice of serial port configurable so that wireless capability can be easily added by connecting Bluetooth modules (such as BlueSmirf or JY-MCU) to the expansion port pins.	2012-11-05 21:34:27 +11:00
Bracken Dawson	f5631a89e8	Add dummy Emergancy Pin to Gen7 1.4 Change required after pulling from ErikZalm.	2012-10-26 22:28:37 +01:00
Bracken Dawson	a4f9e1ebf2	Merge git://github.com/ErikZalm/Marlin into Marlin_v1	2012-10-26 22:20:35 +01:00
Bracken Dawson	2873d67b17	Put bogus temp override back in Gen7 up to 1.3 Took out the ifdef when I split 1.4 out and forgot to permanently define it for <=1.3.	2012-10-26 22:17:26 +01:00
ErikZalm	a7e40b2903	Merge pull request #276 from setar/Marlin_v1 Fix num of digits on LCD for E and Z axis.	2012-10-23 09:48:55 -07:00
MaikStohn	6ed02c86be	Fixed wrong code (will not even compile when EXTRUDERS>2)	2012-10-23 18:08:43 +02:00
Sergey Taranenko	2a67363e27	Fix ‘prog_uchar’ definition in LiquidCrystalRus.cpp	2012-10-22 11:05:17 +04:00
Sergey Taranenko	205304ddee	Merge git://github.com/ErikZalm/Marlin into Marlin_v1	2012-10-22 10:59:27 +04:00
Erik vd Zalm	58bca87c72	fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '	2012-10-21 14:40:06 +02:00
Erik vd Zalm	febeb43197	Revert "fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '" This reverts commit `cb02c2f9d8`.	2012-10-21 14:36:31 +02:00
Sergey Taranenko	8178dec4c3	Fix num of digits on LCD for E and Z axis. The number of steps per mm often contains 4 digits before the decimal point and does not require precision greater than 0.1	2012-10-18 17:45:40 +04:00
ErikZalm	70f57a6844	Merge pull request #273 from setar/Marlin_v1 fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '	2012-10-17 04:10:18 -07:00
ErikZalm	ff14199e58	Merge pull request #270 from jothan/Marlin_v1 Create an explicit rule for building applet/Marlin.cpp.	2012-10-17 04:09:36 -07:00
Daniele Sdei	695938ba3f	Italian language support	2012-10-17 12:48:26 +02:00
Sergey Taranenko	cb02c2f9d8	fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '	2012-10-17 10:49:05 +04:00
Jonathan Bastien-Filiatrault	e4a5e333ef	Generalize.	2012-10-15 21:34:33 -04:00
Jonathan Bastien-Filiatrault	e10d3136c8	Create an explicit rule for building applet/Marlin.cpp. It would seem that the pattern matches do not work when the source file is created when make is running. The result of this is that it is necessary to run "make" twice to build the firmware. This adds an explicit rule without a pattern match for building applet/Marlin.cpp it corrects the make behaviour at the cost of adding a little redundancy in the Makefile.	2012-10-15 21:16:25 -04:00
ErikZalm	9f089756b7	Merge pull request #265 from setar/Marlin_v1 Added Russian translation	2012-10-14 14:11:58 -07:00
brupje	326423719f	Add support for Megatronics	2012-10-14 14:05:57 +03:00
brupje	d07b6e93d5	Add support for Megatronics	2012-10-14 14:05:12 +03:00
Sergey Taranenko	efcc28d347	Fix check for include LiquidCrystalRus.h	2012-10-13 00:29:34 +04:00
Sergey Taranenko	cfc193cdac	Enables support the Cyrillic alphabet for LCD	2012-10-12 19:06:43 +04:00
Sergey Taranenko	24bcc9647d	Added Russian translation	2012-10-12 18:33:05 +04:00
Mark Finn	bf7e453d02	Unwanted artifacts from unclean merge of bed-pid tree	2012-10-09 14:47:35 -05:00
ErikZalm	36a746d7d5	Merge pull request #244 from markfinn/pidbed PID for heated bed	2012-10-08 11:15:16 -07:00
elgambitero	df09e2adce	Spanish updated	2012-09-26 19:14:07 +02:00
elgambitero	ddf6603d81	Spanish language updated. Bug fixes on dialogs.	2012-09-26 19:11:45 +02:00
elgambitero	4bf8b1aeee	fesfas	2012-09-26 19:05:31 +02:00
drakelive	be1e099f1b	Union whit Erick version	2012-09-25 19:17:15 +02:00
elgambitero	7afd202b89	New dialogs translated to spanish. Bug fixes. Dialogs from M119 translated, and "Set Preheat" dialogs adapted to the screen size.	2012-09-25 19:16:57 +02:00
elgambitero	ebc4601185	Some new dialogs translated to Spanish	2012-09-25 19:08:44 +02:00
drakelive	c8ea9b0e58	Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin	2012-09-25 18:51:20 +02:00
drakelive	ca7ca4572e	primo commit	2012-09-25 18:46:38 +02:00
johnnyr	8016f058bc	fix max endstop pins	2012-09-19 13:15:17 -05:00
Mark Finn	d197f8504b	clean up and changes from testing	2012-09-17 19:18:50 -05:00
Mark Finn	eb06a886c4	missed	2012-09-17 14:23:49 -05:00
Mark Finn	04631d2250	cleanup for pull	2012-09-17 14:17:24 -05:00
Mark Finn	0a5ad3ab85	move comment to correct place	2012-09-17 08:42:35 -05:00
ZetaPhoenix	8ac5b29e02	Changes to M119 response for easier visual comparison Changed to report on individual lines with "TRIGGERED" or "open" instead of "H" or "L" on one line as H&L could be confused with logic levels High and Low which may be wrong if using inverted logic. Added strings to language.h. Fixed typo "deu" in English language that was fixed in #134 but got added back in via `9f7f7354f5`	2012-09-16 14:51:24 -07:00
ZetaPhoenix	c6caa45ae2	Limit Switch locations based on MIN/MAX limits and homing direction fixes #246 Added statements to set the limit switch positions to the maximum travel if homing in the positive direction as well as bed center at (0,0) if defined. Relocated code based on feedback.	2012-09-15 15:25:49 -07:00
ZetaPhoenix	dc566d654f	fixes #246 Added statements to set the limit switch positions to the maximum travel if homing in the positive direction as well as bed center at (0,0) if defined.	2012-09-14 21:48:49 -07:00
ErikZalm	ba898faa7d	Merge pull request #249 from gwelchc/patch-2 Slight modification for byte savings	2012-09-14 12:13:36 -07:00
ErikZalm	0152ee71a5	Merge pull request #248 from gwelchc/patch-1 Binary representation for characters in ultraldc.pde	2012-09-14 12:10:28 -07:00
G. W. C.	6ccbfeb80c	Update Marlin/Marlin.pde Added function 'setTargetedHotend' that turns into a function an operation repeated 3 times through the M-codes processing. This modification saves a few bytes that can be used to add support for new commands.	2012-09-14 16:38:54 +03:00
G. W. C.	c433142abf	Update Marlin/ultralcd.pde The joris' char drawins are expressed in binary so to show their content's in a more visual fashion. This is not a code modification as much as a readibility modification.	2012-09-14 16:29:43 +03:00
andrey-vasilyev	1d389ad3a8	Fix M81 not working reliably on Gen7 Some discussion of the issue is here http://forums.reprap.org/read.php?181,118329,page=1	2012-09-13 19:23:48 +04:00
Mark Finn	9698f4ea64	bed pid Conflicts: Marlin/Configuration.h	2012-09-12 21:18:59 -05:00
drakelive	e5c39b7c2a	commit	2012-09-10 14:25:49 +02:00
ZetaPhoenix	e8c92e0a95	Missing #else in temperature.cpp prevented reading bed temp when TEMP_BED_PIN <7. Thanks to Leland Wallace for helping me track this down via "Sesame Street" coding (what is not like the other)	2012-09-09 16:06:02 -07:00
drake	bf2071871c	Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin	2012-09-08 23:08:34 +02:00
drake	fc32e20881	first commit	2012-09-08 22:26:23 +02:00
Erik vd Zalm	abf0693e8e	Added KILL_PIN -1 to gen7 boards	2012-09-04 08:20:27 +02:00
Erik vd Zalm	47319cf64e	Fixed typo in SF arc fix code.	2012-09-03 21:28:31 +02:00
Erik vd Zalm	e358a2d7af	Added fix for SF Arc Point fillet procedure	2012-09-02 01:12:49 +02:00
ErikZalm	044a64a1fb	Merge pull request #225 from Justblair/Marlin_v1 Added PDF file containing Menu Tree for documentation purposes.	2012-09-01 04:41:49 -07:00
Drakelive	d728e35658	Update Marlin/pins.h	2012-08-30 23:36:49 +03:00
tonokip	1c1fddc7ac	Added support for the Rambo reprap electronics board. Added Mcodes to set motor current and microstepping pins.	2012-08-30 00:16:57 -07:00
Blair Thompson	dcd3e8a211	Tidy up	2012-08-29 22:53:41 +01:00
Blair Thompson	ddd9d0cfd4	Added PDF file containing Menu Tree for documentation purposes. Source xlsx document included.	2012-08-29 21:08:41 +01:00
Erik vd Zalm	0e58ef6805	Some dialogs are corrected	2012-08-29 21:15:59 +02:00
Erik vd Zalm	0e89022cc3	Correct temptable_55 name.	2012-08-28 19:47:22 +02:00
Bracken Dawson	47d4f55bc0	Fix Gen7 1.4 pinout Gen7 1.4 uses very different pin assignments, might as well make a new section and remove some of the conditionals from each. It's easier to change your pin assingment this way if like me you don't wire it exactly to plan.	2012-08-22 23:15:46 +01:00
elgambitero	6cd150842f	Update Marlin/language.h Some dialogs corrected and Default language set to 1	2012-08-22 21:46:22 +03:00
elgambitero	299c18596f	Update Marlin/language.h Some dialogs are corrected	2012-08-22 21:44:57 +03:00
ErikZalm	b86336c3f5	Merge pull request #221 from daid/Marlin_v1 Long filename support for LCD display	2012-08-22 06:30:35 -07:00
daid	b69e75c89a	Added long filename support.	2012-08-22 14:49:57 +02:00
stohn	1d224cc031	merged with upstream and FIXED AGAIN bad translation commit PLEASE BE MORE CAREFUL WHEN SUBMITTING NEW TRANSLATIONS When you add new menu items / messages always copy them to ALL languages (just use english)	2012-08-22 13:05:42 +02:00
stohn	06c03fe2f0	new method for message for making KILLED message visible The cli(); at the start of the kill() function also stops the internal arduino timer which stops updating of millis() which prevents the display of the "KILLED." message. The new function updates the display directly without checking any timers.	2012-08-22 12:44:41 +02:00
daid	87ff61a8a6	Fix for #201	2012-08-22 10:54:55 +02:00
Blair Thompson	aacbebbebe	Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.	2012-08-21 23:46:10 +01:00
stohn	31873ec707	changed int to long to overcome overflow of number display - related bug reports: Issue #201, Issue #213	2012-08-21 16:47:39 +02:00
stohn	de0448343f	added KILL_PIN support / cleaned up manage_inactivity function definition	2012-08-21 14:48:29 +02:00
stohn	69961dbba3	fixed incorrect menu messages from last commit... - removed several multiple definitions of same message - fixed definition of missing messages in german and spanish - tweaked german translation (a lot) - added note about changing and testing this file	2012-08-21 14:44:20 +02:00
Blair Thompson	6c050b8440	Fixes error introduced at commit `aee475aa55` which caused the sketch not to comile for language option 1. Several defines were removed but still referenced in ultralcd.pde	2012-08-20 21:54:47 +01:00
Blair Thompson	b9f9f8f7d3	The pre-heat ABS and PLA options in the LCD Menu were broken a while back. The pre-heat worked fine, but the cooling fans were not switching on as intended. This is now fixed.	2012-08-20 21:49:37 +01:00
elgambitero	d38b96fff1	Update Marlin/language.h	2012-08-12 22:45:11 +03:00
Erik vd Zalm	9f7f7354f5	Set default language 1	2012-08-12 21:29:42 +02:00
elgambitero	aee475aa55	Update Marlin/language.h Spanish language included. It features the LCD screen messages and a small part of the Serial messages.	2012-08-12 21:26:17 +03:00
Erik vd Zalm	9083966c22	Do not use feedrate multiiply on Z and E only moves.	2012-08-12 18:13:34 +02:00
Erik vd Zalm	5406c533db	Disable FAST_PWM by default. On some systems it does not work ok.	2012-08-11 15:51:04 +02:00
Erik vd Zalm	f92dc91c3d	Enable M503 also when eeprom is disabled	2012-08-11 15:49:40 +02:00
James Adams	35a1dd081f	no message	2012-08-11 15:33:35 +02:00
James Adams	5131ab19ca	Fixed Retract in LCD Menu	2012-08-11 15:29:40 +02:00
James Adams	96f4f90cb3	Added pause and retract lcd menu items	2012-08-11 15:29:33 +02:00
James Adams	e10355500d	Updated Language.h with pause, resume, and retract	2012-08-11 15:29:26 +02:00
ErikZalm	a97c006bbf	Merge pull request #195 from kobaan/Marlin_v1 Updated german translations in language.h	2012-08-11 01:45:30 -07:00
ErikZalm	f062794a0d	Merge pull request #208 from Enchiridion/Marlin_v1 Added support for dual Z axis stepper drivers	2012-08-11 01:42:49 -07:00
ErikZalm	57468d3c21	Merge pull request #210 from Dabble63/Marlin_v1 Add Duty Cycling to the Heater Bed	2012-08-11 01:42:02 -07:00
Dabble63	6b45e9f167	Add Duty Cycling to the Heater Bed	2012-08-11 09:17:47 +03:00
Ian Jackson	adee81170d	M206: save values in eeprom Really, we should have a way to adjust the XYZ homing of a machine in the eeprom. So as the second stage of this, make the M206 home offset parameters subject to the M500/M501/M502/M503 eeprom commands. Bump the eeprom version to "V06". Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>	2012-08-11 01:43:00 +01:00
Ian Jackson	1dba212e18	HOMEAXIS: make into a function Replace the large macro HOMEAXIS with a function. This avoids the compiler generating three copies of largely identical code. The saving is 724 bytes of program memory. We make use of XYZ_CONSTS_FROM_CONFIG to provide convenient array-shaped access to MAX_LENGTH, HOME_RETRACT_MM and HOME_DIR. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>	2012-08-11 01:43:00 +01:00
Ian Jackson	7bb326d389	eeprom: provide smaller code for SERIAL_ECHOPAIR SERIAL_ECHOPAIR implies, eventually, two calls to MYSERIAL.print. One of these has FORCE_INLINE for a per-character loop, and both involve constructing a method call rather than a simple function call. Produce better and smaller code by providing three specialised functions serial_echopair. This saves 672 bytes of program memory (with EEPROM_SETTINGS and SDSUPPORT enabled). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>	2012-08-11 01:42:59 +01:00
Ian Jackson	957e966d2d	M206: always use homing ("homeing") offsets Previously the parameters set in M206 would only be used if a G82 command was sent with specific axis home values. This limits its usefulness. Really, we should have a way to adjust the XYZ homing of a machine in the eeprom. So as the first stage of this, make M206 affect every home command. The values set using M206 are now added to the configuration variables [XYZ]_HOME_POS. This is achieved by replacing all uses of [XYZ]_HOME_POS in the code by a new home_pos[] which includes the adjustment. We also have to adjust the uses of [XYZ]_{MIN,MAX}_POS similarly - see below. To allow axis_is_at_home to be written as a function taking an axis index rather than a macro taking an axis letter, we provide constant arrays in program memory containing the values of [XYZ]_{MIN,MAX,HOME}_POS from the compiled-in configuration. This is done with some helper macros to deal with the declaration (XYZ_CONSTS_FROM_CONFIG) and definition of the inline function which does the program memory access. We also introduce the overloaded function read_pgm_any, whose instances are produced with DEFINE_PGM_READ_ANY, which allows the access functions to automatically produce the correct type. The type- and pointer-massaging code in the access function boils down, when compiled, to a simple program memory access. A question arises: if the M206 offset is set, should this adjustment to the home position shift or change the possible range of movement permitted by the software endstops ? The documentation in Configuration.h describes these limits as: // Travel limits after homing Since this is a file containing physical limits, and actual suggested values for these configuration parameters appear to include a certain amount of slop, I've taken the view that these should be regarded as nominal physical distances from the limit switches, and that the permissible travel should be unaffected by M206. So for example with the (rather unrealistic) #define X_HOME_DIR -1 #define X_MIN_POS -20 #define X_HOME_POS 0 #define X_MAX_POS 100 no matter the setting of M206 X, the machine would be permitted to move from 20mm "beyond" the limit switch trigger point in the negative X direction and 100mm away from the limit switch in the positive X direction, for a total travel of 120mm. With M206 X-10 that would be considered to correspond to X coordinates -30 to +90. With M206 X+10 that would be considered to correspond to X coordinates -10 to +110. fixes #200 (in ErikZalm/Marlin). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>	2012-08-11 01:35:03 +01:00
Ian Jackson	faccb35850	software_endstops: use _MIN_POS and _MAX_POS for arcs If [XYZ]_HOME_POS and [XYZ]_MIN_POS aren't 0, these corrections are wrong. Use the same logic as in Marlin.pde:prepare_move: ie, clamp to [XYZ]_{MIN,MAX}_POS. While we're here, put this cut-and-paste code in a function clamp_to_software_endstops. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>	2012-08-10 19:36:30 +01:00
Ian Jackson	3f15b7c7b8	Makefile: Better display of size (device memory usage) Run avr-size with the --mcu=... -C option as well. That reports how much actual device program and data memory is used along with a percentage fullness. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>	2012-08-10 19:36:30 +01:00
Ian Jackson	0c35facc94	Makefile: support V=1 Often it can be useful to see the actual commands being run by make. Other projects (eg, the Linux kernel) support this with a "V=1" make parameter. Do the same here. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>	2012-08-10 19:36:29 +01:00
Ian Jackson	71404eef29	.gitignore: Add ~, .orig, *.rej, move to root directory Move the .gitignore out of the Marlin subdirectory so it applies to the whole tree, and add some missing patterns. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>	2012-08-10 19:36:29 +01:00
Ian Jackson	a873541ef6	Marlin.pde: include comment for emacs mode Emacs by default doesn't recognise a ".pde" file as C++ source code. Add the annotation to the top of the file to make it work. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>	2012-08-10 19:36:29 +01:00
Enchiridion	50cde90324	Added support for dual Z axis stepper drivers	2012-08-04 00:32:26 -06:00
kobaan	603a5e25b3	Updated german translations in language.h and eliminated a few double lines.	2012-07-16 14:26:28 +03:00
Chris Palmer	538189cc19	Fixed soft limits when the origin is in the middle. HOME_POS is now always where the endstop is and can be outside the limits. The limits are now defined by MIN_POS and MAX_POS rather than HOME_POS and MAX_LENGTH. The Z is axis now homed first if direction is away from the bed. Saguinololu limit pins change from MIN to MAX according to the homing direction.	2012-07-14 22:24:26 +02:00
ErikZalm	686011a548	Fixed typo	2012-07-14 17:25:35 +03:00
Erik van der Zalm	cd57bf305b	Merge git://github.com/daid/Marlin into Marlin_v1 Added invert step pins to corexy code	2012-07-14 15:07:14 +02:00
Erik van der Zalm	ea2c19f978	Added CoreXY support (Thanks Ilan Moyer)	2012-07-14 14:21:53 +02:00
Erik van der Zalm	aa65fe22ed	decoupled axes sucessfully at least on pure x or y jog	2012-07-14 13:43:19 +02:00
daid	12de8fff81	Support step motor controllers with active low step pins.	2012-06-29 16:27:47 +02:00
Erik van der Zalm	b67dacdc8f	Fixed AD595 define	2012-06-11 17:33:42 +02:00
Bernhard	d3002ef741	corrected retract	2012-06-03 16:56:40 +02:00
Bernhard	0c123950e9	__ header file replace	2012-06-02 20:44:17 +02:00
Bernhard	bf077125b9	added firmware retract. disabled by default	2012-06-02 20:32:28 +02:00
Bernhard	0e5e249ab5	added individual pullup setting option to have finer control in case there is a special z-min sensor, for example	2012-06-02 13:47:50 +02:00
Bernhard Kubicek	6b14f95b3e	Merge pull request #170 from linagee/Marlin_v1 Marlin v1	2012-06-02 03:46:56 -07:00
Bernhard Kubicek	c7ce99d495	Merge pull request #172 from daid/Marlin_v1 Add M401 - Wait for user to press button on LCD (with optional timeout) minor fix in M115.	2012-06-02 03:44:03 -07:00
Bernhard Kubicek	b7fc14bc65	repaired thermistortable_6 by graphcial fitting of the off-slope values. see issue 179. Erik, I know you asked for no changes, but this file probably is not related and hopefully allright.	2012-05-30 14:14:36 +03:00
ErikZalm	9e1021efbe	Fixed SL bug.	2012-05-28 22:32:53 +03:00
Daid	e9bec9b6fe	Fixed E1_ENABLE pin for Ultimaker. This was wrong for the 1.5.4 and 1.5.3 PCB (I cannot check the 1.5.6)	2012-05-24 18:36:55 +02:00
linagee	fbd282b3ba	Update Marlin/Configuration.h	2012-05-20 13:19:28 -06:00
linagee	2e8c5049c5	Update Marlin/thermistortables.h	2012-05-20 13:18:45 -06:00
linagee	2d0d8e5272	Small correction.	2012-05-20 11:09:07 -06:00
Daid	4d7fe7115f	Changed M401 to M0/M1 as suggested, so they match normal CNC stop commands.	2012-05-20 14:37:30 +02:00
linagee	9e9db65c3f	Update Marlin/thermistortables.h	2012-05-20 05:51:29 -06:00
linagee	bd966ef389	Update Marlin/thermistortables.h	2012-05-20 05:49:01 -06:00
linagee	775da3f103	Added top ratings and extended to ADC=1 for table 3 and 5.	2012-05-20 05:35:57 -06:00
linagee	96a4baa0be	Update Marlin/thermistortables.h	2012-05-20 04:55:22 -06:00
linagee	2aa9f7b131	Update Marlin/thermistortables.h	2012-05-20 04:35:28 -06:00
linagee	c4490f5f3d	Update Marlin/Configuration.h	2012-05-20 04:27:52 -06:00
linagee	dd9144994e	Tested May 19 - It works! Verified with separate thermocouple TM-902C also.	2012-05-20 04:13:29 -06:00
linagee	4c37d0d9f1	Extended range above 250C. (Operating range states up to 300C)	2012-05-20 04:01:30 -06:00
Daid	b59724e42b	Add strigification for extruder amount in M115 report.	2012-05-19 19:01:14 +02:00
Daid	16413bb8f2	Last M401 update, refresh the LCD during an M401 wait.	2012-05-19 18:53:56 +02:00
Daid	b3941fce5c	Update after testing	2012-05-19 18:48:43 +02:00
Daid	d494688565	Do not initialize in the header file.	2012-05-19 17:57:52 +02:00
Daid	516ec90242	Add M401 - Wait for user on LCD button press	2012-05-19 17:54:07 +02:00
Daid	7244aa7eb7	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2012-05-19 17:38:46 +02:00
linagee	de2ca3b2e8	Grammar correction.	2012-05-19 07:40:35 -06:00
linagee	c2fc466e1b	Update Marlin/Configuration.h	2012-05-19 05:56:17 -06:00
linagee	241f5a4c0e	Update Marlin/thermistortables.h	2012-05-19 05:52:12 -06:00
linagee	9f9f498491	Update Marlin/Configuration.h	2012-05-19 05:47:30 -06:00
Erik van der Zalm	e31bef31ad	Limit PID autotune PWM to PID_MAX	2012-05-16 19:32:23 +02:00
ErikZalm	b2a9ccdb97	Merge pull request #159 from MaikStohn/Marlin_v1 Marlin v1 - BUG FIXES / CORRECTIONS	2012-05-16 12:32:35 -07:00
Erik van der Zalm	d459fb41b7	Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1	2012-05-16 19:22:08 +02:00
ErikZalm	804e0d6117	Merge pull request #164 from guanix/Marlin_v1 Melzi support	2012-05-16 12:21:48 -07:00
Erik van der Zalm	ba96059203	add additional dropsegments test	2012-05-16 19:21:44 +02:00
zittix	fbd91ab0b5	Fixes #153 for bad call to abs()	2012-05-16 18:17:34 +02:00
MaikStohn	b51c06e2b3	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2012-05-11 16:57:08 +02:00
MaikStohn	159ae90874	bug fix for scrolling of main menu when using SMALL_DISPLAY (2 lines only)	2012-05-11 15:23:10 +02:00
MaikStohn	e48f5aa6a7	fixed typo	2012-05-11 15:22:06 +02:00
MaikStohn	1efe9ab497	changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu	2012-05-11 15:19:09 +02:00
Guan Yang	602c8ee02b	Melzi support	2012-05-09 18:37:07 -04:00
Daid	279d00da9f	Fixed #if for Ultimaker.	2012-05-09 10:50:44 +02:00
Bernhard Kubicek	451f9cc6d1	Residual in the comments: there are no more mm/minutes but only mm/sec in the planner buffer.	2012-05-09 08:05:13 +03:00
Erik de Bruijn	e3fe1f0d00	Made a more granular configuration possible PREVENT_LENGTHY_EXTRUDE. You can now decide to allow/disallow large length of extrusions to be executed. Turning off the protection might be beneficial to those who want to do fast and long reversals.	2012-05-08 17:44:08 +02:00
Erik de Bruijn	d88205d89d	Suggestion to improve (TODO), no actual code changed	2012-05-08 17:43:57 +02:00
Erik de Bruijn	5aa80e6c05	Made language.h more flexible. Automatically do the right defines based on MOTHERBOARD == 7 ? "Ultimaker" : "Mendel"	2012-05-08 17:43:02 +02:00
MaikStohn	b657a18449	Revert "magic PROGMEM defines to avoid hundreds of wrong GCC warnings" This reverts commit `3682d9bd5b`.	2012-05-04 12:24:07 +02:00
MaikStohn	d188ae4c9d	added missing declaration of buttons_init() This is required when moving the buttons_init() function to the lcd_init() function	2012-05-03 15:48:44 +02:00
MaikStohn	3682d9bd5b	magic PROGMEM defines to avoid hundreds of wrong GCC warnings	2012-05-03 15:43:23 +02:00
MaikStohn	032df0b2c6	Moved LCD initialization out of constructor Since the class "MainMenu" was used within a static variable the initialization of the object (constructor call) was done before Arduino library startup. It always caused a crash when using AVRStudio with JTAG debugger (caused from calling the LCD initialization / the lot of I/O work / the stack used during this calls). By moving the LCD_INIT out of the constructor and using an explicit call inside of Arduino setup() implementation immediately fixed all problems and the JTAG debugger runs fine.	2012-05-03 14:28:17 +02:00
MaikStohn	bd1ad7c76a	explicit includes to make it compile with AVRStudio/Eclipse	2012-05-03 14:22:43 +02:00
MaikStohn	060b38de5c	delete obsolete and wrong code "i" runs from 0 to 4 but "add_homeing" array size is 3 only. On the other hand the calculated value gets overwritten by either one of the if choice.	2012-05-03 14:15:46 +02:00
MaikStohn	789ba02d43	fixed typo in comment	2012-05-03 14:13:53 +02:00
Erik van der Zalm	1874cb71a6	Added option to increase the FAN PWM frequency.	2012-05-02 19:26:14 +02:00
Erik van der Zalm	6a5a34e0ff	Small cleanup	2012-04-30 13:37:49 +02:00
Erik van der Zalm	e3821bd86f	Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1	2012-04-30 13:36:27 +02:00
Erik van der Zalm	02af69911e	Added temperature window to M109. This is needed for systems with no overshoot PID.	2012-04-30 13:36:19 +02:00
ErikZalm	e203b8c754	Merge pull request #154 from daid/Marlin_v1 Added 2nd extruder temperature LCD readout and setting.	2012-04-28 13:19:55 -07:00
ErikZalm	362ddc4efc	Merge pull request #155 from Atntias/patch-1 adding M120 and 121 for turning on and off the endstops only for homing	2012-04-28 13:19:19 -07:00
sefi	c27081aa4a	Fix to allow M120/M121	2012-04-28 17:35:51 +03:00
sefi	e11e072eca	adding M120 and 121 for turning on and off the endstops only for homing function	2012-04-28 17:31:22 +03:00
Daid	8e68c6cf89	Show proper temperature for extruder 2	2012-04-27 15:00:01 +02:00
Daid	8503b78876	Added support for 2nd extruder temperature to UltraLCD	2012-04-27 14:51:32 +02:00
Logan Bowers	3eacb4c16d	Wrap the call to turn off the bed heater in a #if to prevent a compile error on boards that do not have a bed heater	2012-04-25 19:22:38 -07:00
Bernhard	e4d2138dbd	reinitialize the lcd, if the SD card is inserted or removed. It seems that LCDs can confused by electrical discharges from time to time. Since a removal or insert of the sd card takes a long time in firmware, just reinitializing the lcd does not hurt. actually, it solves a problem with the UltiControlle	2012-04-22 21:12:17 +02:00
Bernhard	464b755918	added support for the UltiController	2012-04-22 20:55:56 +02:00
Bernhard	44fd8d46d2	fixed quickhome	2012-04-22 20:44:27 +02:00
Bernhard	33bb044d7c	fixed catsting to (int)e in serial error messages. see https://github.com/ErikZalm/Marlin/issues/148	2012-04-22 20:04:39 +02:00
ErikZalm	c2557abc03	Merge pull request #138 from triffid/fix-makefile make should rebuild if configuration or Makefile is changed	2012-04-15 10:21:46 -07:00
Erik van der Zalm	67cf105bc6	Fixed AUTOTEMP (M109 S215 B260 F1 starts autotemp) Changed SLOWDOWN. IF this does not work ok OLD_SLOWDOWN is the old algo.	2012-04-15 19:17:33 +02:00
Erik van der Zalm	8aee9d51b6	Disabled disable_heater in PID_autotune.	2012-04-12 21:12:31 +02:00
Daid	414408b2d0	Fix for wrong systax in #ifdef.	2012-04-12 14:01:30 +02:00
Michael Moon	77d503fa13	Fix Makefile	2012-04-11 11:39:35 +10:00
Erik van der Zalm	cf7c8c458f	Fixed MAX6675	2012-04-10 21:57:57 +02:00
grrf	03b0850e63	This breaks temperature readout for pronterface!	2012-04-09 23:37:34 +03:00
tgiphil	ad8bc71d3e	- Fixed a typo	2012-04-07 20:01:31 -07:00
Erik van der Zalm	46feae79c6	Fixed typo in arc	2012-04-02 17:19:20 +02:00
Erik van der Zalm	4ca2f336f0	Changed default MINIMUM_PLANNER_SPEED -> 0.05 Fixed small bug in arcs M105 prints now actual_temp/target_temp	2012-04-01 16:23:40 +02:00
Erik van der Zalm	ae0bf8068b	Fixed arc offset.	2012-03-27 19:03:33 +02:00
Erik van der Zalm	0c1b863755	Ignore ":" in comments.	2012-03-25 14:41:26 +02:00
Erik van der Zalm	63aec3c56e	Replaced Kill by Stop. If the printer is stopped. Fix the error and use M999 to restart. Moved the PID_dT in the Ki and Kd calculation from the configuration.h to temperature.cpp	2012-03-25 14:36:51 +02:00
ErikZalm	8b785f75a6	Merge pull request #123 from buserror-uk/for-upstream For upstream	2012-03-23 11:54:58 -07:00
Tommy Cheng	520f1a54a8	Fix compilation error when PIDTEMP is undefined and ULTIPANEL is defined.	2012-03-24 02:26:59 +08:00
Michel Pollet	5550e893d5	New board variant, Open Motion Controller Open Hardware board currently used by the group build of http://tvrrug.org.uk The board can be found at http://solderpad.com/folknology/open-motion-controller/ Signed-off-by: Michel Pollet <buserror@gmail.com>	2012-03-22 13:51:21 +00:00
Michel Pollet	aa6e6e914e	Makefile: Redone + Removed most explicit pathnames, use the standard make "VPATH" to let make find the files for itself. + Added a "hardware variant" variable that allows compiging Sanguino and Gen7 as well as "generic" arduino. + Allows overriding the MOTHERBOARD define from the Makefile + Removed the 'preprocessor' bit that wasn't needed, now just "include" the files that are needed, since it allows gcc to show the right file/line when displaying error/warnings. + Uses gcc's own dependency generator to generate the .d files, and and include these instead of self-patching the makefile Signed-off-by: Michel Pollet <buserror@gmail.com>	2012-03-22 13:48:10 +00:00
Bernhard	0183e6332a	made prepare->autostart independent of current folder.	2012-03-19 20:24:40 +01:00
Bernhard	1532200435	found error in filenames. One array was too short. This had nothing to do with long filenames, other than if they were 12 characters exactly, which could only happen if the extension and the text before were filled completely	2012-03-19 20:06:58 +01:00
Erik van der Zalm	b985e4a134	Fixed compile errors in ultralcd when no ultra_lcd is selected.	2012-03-15 22:29:31 +01:00
Erik van der Zalm	2e749d60c3	Added DISABLE_MAX_ENDSTOPS	2012-03-12 20:32:14 +01:00
Erik van der Zalm	33f5697888	PPID tune exports more constants.	2012-03-11 22:18:25 +01:00
Erik van der Zalm	b44055cc51	Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1	2012-03-11 18:03:00 +01:00
Erik van der Zalm	f5eae52098	Added more manage_inactivity checks	2012-03-11 17:59:44 +01:00
ErikZalm	19a47dae4a	Merge pull request #99 from Justblair/master Better pin configuration for rotary encoder in RAMPS boards	2012-03-11 04:34:59 -07:00
Erik van der Zalm	910f4e77a2	Added 20MHz support.	2012-03-11 12:25:04 +01:00
ErikZalm	7cefad3744	Merge pull request #106 from bgamari/Marlin_v1 Make F_CPU dependence of stepper.cpp more explicit	2012-03-11 01:48:30 -08:00
Erik van der Zalm	87ff2f8867	Added CONTROLLERFAN. (Controlling a fan to cool down the steppper drivers)	2012-03-11 10:44:10 +01:00
Erik van der Zalm	387fe51a56	Do not disable steppers when there are moves in the queue.	2012-03-09 20:20:01 +01:00
Erik van der Zalm	421264e58a	Fixed typo	2012-03-09 17:49:48 +01:00
Erik van der Zalm	15ad923310	Removed !!!. Stupid arduino bootloader can't handle this.	2012-03-09 17:42:32 +01:00
Erik van der Zalm	61e09e6be2	Added FAN_PIN -1 checks	2012-03-08 22:09:49 +01:00
Erik van der Zalm	87c4e06c24	Corrected active_extruder when autotemp is used.	2012-03-08 22:04:13 +01:00
Erik van der Zalm	7b1e295f34	Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1	2012-03-08 21:48:06 +01:00
Erik van der Zalm	c077316b2b	Added PID autotune. (experimental) M303 Starts autotune. Wait till the Kp Ki and Kd constants are printed. Put these values in Configuration.h	2012-03-08 21:43:21 +01:00
Ben Gamari	49b228c4b3	Add instructions to regenerate speed_lookuptable when changing F_CPU	2012-03-07 18:11:03 -05:00
Ben Gamari	96509494f0	stepper: Clarify comment on timer-counter configuration	2012-03-07 18:11:01 -05:00
Ben Gamari	6d7e6a11fc	Add create_speed_lookup	2012-03-07 18:11:01 -05:00
Tommy Cheng	ce07c9186d	While Waiting for hotbed to warm up via M190, LCD Display and Click Encoder input freeze until target temperature is reached.	2012-03-05 23:12:26 +08:00
Erik van der Zalm	116dc86b8a	Fixed type in e-jerk	2012-03-04 23:09:13 +01:00
Blair Thompson	02ee9e3d30	Changed Pin Assignment for the RAMPS motherboard so that LCD and Rotary encoder are all wired to AUX-4 This simplifies wiring for those with RAMPS 1.3 and 1.4 boards.	2012-03-04 21:34:20 +00:00
Erik van der Zalm	e056bf8081	Added E-Jerk	2012-03-04 16:34:58 +01:00
Erik van der Zalm	4deeffbc88	Added missing defines to the german section. Translation still needed.	2012-03-04 14:08:20 +01:00
Erik van der Zalm	632528aa95	merging with SCUBA82	2012-03-04 13:41:47 +01:00
Erik van der Zalm	aac7aa3bf0	Queued fan control. Issue #90	2012-03-04 13:05:26 +01:00
Christian Thalhammer	fde51084f3	set SD file delete to M30; switch printime output to M31	2012-03-03 21:58:12 +01:00
Erik van der Zalm	21e2bae063	Changed (corrected?) SD_card comment handling.	2012-03-03 21:28:33 +01:00
Erik van der Zalm	e509bbf636	Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1	2012-03-03 20:41:22 +01:00
Erik van der Zalm	072011a3ef	Added current_block = NULL to quickStop()	2012-03-03 20:40:46 +01:00
ErikZalm	2422a857a1	Merge pull request #96 from haxar/Marlin_v1 make analog2tempBed return a precise celsius reading for BED_USES_THERMISTOR, ...	2012-03-03 11:24:58 -08:00
Erik van der Zalm	f598077af3	Removed vc files	2012-03-03 20:22:42 +01:00
Erik van der Zalm	cb0c84e075	Merge remote-tracking branch 'justblair/master' into Marlin_v1	2012-03-03 20:20:55 +01:00
ErikZalm	1d5809d458	Merge pull request #88 from daid/Marlin_v1 Made plan_buffer_line arguments const...	2012-03-03 11:18:14 -08:00
Erik van der Zalm	ed951b1977	Fixed RAMPS 1.2 support (Found and fixed by rrhb)	2012-03-03 20:15:41 +01:00
Blair Thompson	4879de08e8	The percent complete for the SD file statistic sits squint. Changed "lcd.Setcursor (7,2);" to "lcd.Setcursor (10,2);". The percent complete now lines up with the temperatures and Z-axis position figures, nicer to read and nicer to look at IMHO.	2012-03-03 16:47:27 +00:00
Blair Thompson	f278e1c00f	This is in my opinion a much better way of dealing with SD cards than my previous fix. Instead of adding a momentary switch to fake the insertion of the card I have modified the ultralcd menu item: Card Menu -> Refresh to reinitialise the card providing that the SDCARDDETECT pin has been set to -1 in the pins.h file. This requires one less switch on the front panel and the refresh menu item is in the most relevent place for a user who wishes to inert a card and then print from it. It also means that the "Card inserted" messages do not bother the users of these card readers (they dont make sense for users without SCCARDDETECT)	2012-03-03 16:30:31 +00:00
Blair Thompson	046a8e0039	Added more defines to the language.h file so that nowe most of the text strings are now configured via this file. Still got some hunting down to do to complete this task.	2012-03-03 15:51:47 +00:00
haxar	79a466ca26	make analog2tempBed return a precise celsius reading for BED_USES_THERMISTOR, complementing changes to analog2temp in `d15f01e`	2012-03-02 17:15:21 -08:00
Christian Thalhammer	5f3a422e68	added M31 - delete file from sd card	2012-03-02 21:49:05 +01:00
Christian Thalhammer	fa2e3a40e9	fixed LCD manual z axis move Feedrate to 70 (was 1700)	2012-03-01 14:38:50 +01:00
Christian Thalhammer	a92b3afe64	added german translation;Menue should be in english.. sounds better	2012-03-01 14:24:20 +01:00
Christian Thalhammer	9fa586bbed	fixed languages; Preheat_PLA and Preheat_ABS was not defined for non english	2012-03-01 14:05:40 +01:00
Daid	00d33e6b82	Typo fix	2012-02-29 19:01:21 +01:00
Daid	7d124478fa	Only protect the heater pins for the defined extruders. Changed the way the extruder pins are defined so it doesn't create extra -1 entries in the list.	2012-02-29 15:49:02 +01:00
Daid	3d83109028	Fixed general 16x2 LCD build without SD support.	2012-02-29 15:33:23 +01:00
Christian Thalhammer	cb02914687	Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1	2012-02-29 14:51:35 +01:00
Christian Thalhammer	10bf2bb8e1	-	2012-02-29 14:51:15 +01:00
Daid	d47b666630	Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1	2012-02-29 12:19:20 +01:00
Daid	88d289caa1	Made plan_buffer_line arguments const, which optimizes better and fixes the RUNOUT_PREVENTION feature.	2012-02-29 11:38:12 +01:00
Erik van der Zalm	b4833d55c2	Fixed HOME_POS in combination with G28 X0 or G28 Y0	2012-02-28 18:20:03 +01:00
Erik van der Zalm	c6f2ec3c82	remove stop_heating_wait	2012-02-27 18:45:45 +01:00
Erik van der Zalm	b48d67ce10	Fixed homing	2012-02-27 18:31:40 +01:00
ErikZalm	071eec7aa7	Merge pull request #81 from phord/09469add5560ca8a676c42e4bcd499868c33f0dd Clean up and add some trace info	2012-02-27 08:38:36 -08:00
ErikZalm	1ebe7d1ab6	Merge pull request #83 from phord/tempfix Add explicit #define for bogus temp override	2012-02-27 08:36:45 -08:00
Phil Hord	b65ef8d66c	Add support for upcoming Gen7 v1.4 V1.4 moves thermistor power to the always-on 5v line. The BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE is no longer needed on this board. Add a new motherboard type to support this feature.	2012-02-26 20:39:49 -05:00
Phil Hord	740f0c7690	Add explicit #define for bogus temp override The code to ignore the "bad thermistor reading failsafe" suicide function depends on the existing of the PS_ON pin feature. But in some boards this shouldn't be the case Fix this by adding an explicit definition to make our intentions more clear and separable.	2012-02-26 20:26:16 -05:00
Phil Hord	ba8500a236	pins.h: Define Z_MAX_PIN for Gen7 board The Z_MAX_PIN value was defined as no-value, but this causes the compile to fail. Fix this by setting the Z_MAX_PIN to the correct value (which happens to be 0 for pin PB0/DIO0/0).	2012-02-26 20:18:39 -05:00
Phil Hord	09469add55	Add board reset reporting (from Repetier-Firmware)	2012-02-26 18:26:56 -05:00
Phil Hord	f3101e96d9	Add suitable .gitignore to avoid build noise	2012-02-26 18:26:56 -05:00
Phil Hord	245dca4bee	Makefile: generic pde=>cpp rule This adds flexibility to the makefile by allowing different pde targets to be specified for different needs.	2012-02-26 18:26:55 -05:00
Erik van der Zalm	97d42ca2b2	SDSUPPORT default disabled	2012-02-26 22:05:38 +01:00
Changwoo Ryu	7b14953c99	Fix build on Sanguino based boards with ATmega1284P	2012-02-27 04:12:55 +09:00
Daid	286d5003fa	Fixed compiler warning for Sanguino compile	2012-02-26 17:35:01 +01:00
ErikZalm	66d50562b6	Merge pull request #76 from iXce/Marlin_v1 Fix Makefile	2012-02-26 07:30:51 -08:00
Erik van der Zalm	27f595a444	Changed version => RC2	2012-02-26 16:26:40 +01:00
Erik van der Zalm	018c567abf	Moved SLOWDOWN function. (jetty840) Included AD595 calibration options. (daid)	2012-02-26 16:23:47 +01:00
Erik van der Zalm	4fbda5c3f5	Merge remote-tracking branch 'daid/Marlin_v1' into Test	2012-02-26 16:10:59 +01:00
Erik van der Zalm	ce714fe306	Fixes in pins.h	2012-02-25 22:55:17 +01:00
Erik van der Zalm	35e57bf149	Added gen6 deluxe.	2012-02-25 17:44:45 +01:00
Erik van der Zalm	84ea2d61e8	Moved gen7 boards to motherboard type 10, 11 and 12. Split ramps1.3 in Sprinter like config and multiextruder config.	2012-02-24 23:34:41 +01:00
Guillaume Seguin	adc108d79e	Correctly build the produced applet/Marlin.cpp source	2012-02-24 21:21:19 +01:00
Erik van der Zalm	5aa9c41ab1	Changed comment mode for detection. Added M221 extuder multiply factor.	2012-02-24 20:42:07 +01:00
Erik van der Zalm	00690f7ffd	Fix cast warning in Gen7	2012-02-23 18:50:05 +01:00
Erik van der Zalm	01d28c18ab	Fixed casting warning in sanguino	2012-02-23 18:45:37 +01:00
Blair Thompson	2fd8c248fe	Added Fan control to the pre-heat settings. I find that the PID routine works better when the cooling fan is switched on at the beginning of a warm up routine. Otherwise when you enable the fan just before a print, you have a delay as the PIDre-adjusts. This should also be safer as most cooling fans are directed at the hot -ends thermal barrier!	2012-02-22 23:05:52 +00:00
Blair Thompson	d9f2f509d5	Added new menu items under the prepare submenu. Instead of a single pre-heat, now there is pre-heat ABS and PLA options Added defines to the configuration file to adjust preheat temperatures for both	2012-02-22 22:51:04 +00:00
Erik van der Zalm	ae3e7586c6	Added HOME_POS. This adds the posibility to make the center 0 Updated the Xsteps ... settings via the LCD menu	2012-02-22 18:07:56 +01:00
Erik van der Zalm	df1437bd86	Changed display format for some numbers.	2012-02-21 23:05:43 +01:00
Erik van der Zalm	8816ef1c64	Small fixes after merge	2012-02-21 20:36:43 +01:00
Erik van der Zalm	d298dd121f	merged SBUBA82 and Justblair	2012-02-21 20:26:59 +01:00
Erik van der Zalm	2cc9a89830	Merge remote-tracking branch 'SCUBA82/Marlin_v1' into Marlin_v1	2012-02-21 20:17:35 +01:00
Erik van der Zalm	a0a1f81913	various changes	2012-02-21 20:17:28 +01:00
Christian Thalhammer	8a8ea50f33	fixed manual axis movement lcd option	2012-02-21 09:31:28 +01:00
Blair Thompson	b976692d0f	Removed VS project files for tidyness stakes	2012-02-20 22:39:39 +00:00
Blair Thompson	fe940a142d	Added a structure that will allow easy translations/modifications to the LCD menu. Signed-off-by: Blair Thompson <mail@justblair.co.uk>	2012-02-20 22:22:46 +00:00
Christian Thalhammer	b3fb09a20c	change preheat to ABS values of nozzle 227 and be 105 �C next try for manual axis movement	2012-02-20 16:07:27 +01:00
Blair Thompson	a05a261b72	Added a workaround. Ramps SD card does not have sdcarddetect. My temporary solution is to add a momentary swtich that pulls down the SDCARDDETECT pin and mimicking the pull and reinsert ofa a SD card	2012-02-18 23:56:31 +00:00
Blair Thompson	1b6765ed12	Updated the pin config for RAMPS 1.3 to include ultimaker new style LCD/Rotary Encoder interface	2012-02-18 18:25:04 +00:00
Christian Thalhammer	1ff99ae25f	ATMega1284P support for Arduino IDE replace $ARDUINO_HOME/hardware/tools/avr/etc/arduino.conf with this file	2012-02-17 11:41:47 +01:00
Christian Thalhammer	e661578c84	support for GEN7 1.1,1.2 and 1.3	2012-02-17 10:46:48 +01:00
Daid	73344e69c1	Added temperature offset/gain settings for AD595.	2012-02-16 11:05:08 +01:00
Christian Thalhammer	d309565b56	Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 Conflicts: Marlin/Configuration.h	2012-02-13 13:07:55 +01:00
Christian Thalhammer	0e3631ff4b	smaller changes	2012-02-13 12:31:53 +01:00
Erik van der Zalm	fa2e1be0ca	changed default EXTRUDE_MINTEMP to 170.	2012-02-12 17:38:54 +01:00
Erik van der Zalm	7699f250e3	Fixed small merge bug	2012-02-12 14:06:08 +01:00
Erik van der Zalm	11518a987f	merged with triffid fork	2012-02-12 13:58:36 +01:00
Erik van der Zalm	13e185d330	removed unused HEATING_EARLY_FINISH_DEG_OFFSET Simplified stepper inactive time	2012-02-11 23:22:16 +01:00
Erik van der Zalm	b58eae7657	Corrected e-length calculation in planner	2012-02-11 18:36:42 +01:00
daid	2a77c84c8f	Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0.	2012-02-11 16:02:47 +01:00
Erik van der Zalm	d47a3e5950	Changed check i mtion_conrol if (millimeters_of_travel == 0.0) => if (millimeters_of_travel < 0.001) (thanks mooselake)	2012-02-09 21:02:01 +01:00
Erik van der Zalm	f87c80889f	Fixed M109 timer overflow (reported by triffid)	2012-02-09 20:54:49 +01:00
Erik van der Zalm	154de69c02	Print configuration.h version during startup (thanks hairykiwi)	2012-02-09 20:26:17 +01:00
Erik van der Zalm	6ef8459494	Corrected distance calculation. (thanks jv4779)	2012-02-09 19:53:06 +01:00
Erik van der Zalm	598eb1d4f1	Fixed compilation for gcc-4.6.2 with avr-lib-1.8.0 (thanks daid)	2012-02-09 19:38:53 +01:00
Erik van der Zalm	9173a5713b	Teensylu support.	2012-02-09 19:27:45 +01:00
Erik van der Zalm	da040fd393	Fixed ultimaker heater 1 pins. (Thanks daid)	2012-02-09 17:19:45 +01:00
Erik van der Zalm	bdb70c0509	Warning for 10k thermistor	2012-02-08 18:38:45 +01:00
Erik van der Zalm	5113513cb2	RC 1	2012-02-08 18:28:54 +01:00
Erik van der Zalm	d8a0c6450f	Split the configuration file in two parts. One for common settings. One for advanced settings.	2012-02-07 20:23:43 +01:00
Christian Thalhammer	4cc8e37bf1	lcd menue "move_axis" added	2012-02-07 12:58:05 +01:00
Christian Thalhammer	b5fae1104b	fixed sUICIDE_PIN disable	2012-02-07 08:50:26 +01:00
Erik van der Zalm	f9c5333f97	Made "stop heating wait" optional. Default off.	2012-02-06 20:13:44 +01:00
Erik van der Zalm	292ddd2edb	Fix Z_LATE_ENABLE	2012-02-06 17:38:16 +01:00
Christian Thalhammer	25cd8af536	added arduino ide GEN7 support Files	2012-02-06 14:11:25 +01:00
Christian Thalhammer	14702089ee	-disable TEMP Min MAX Kill while using PS_ON Pin ON GEN7 there is no temperature reading when power is off.. so Marlin would kill itself. There seems to be an update from "Traumflug" on GEN7 using standby VCC for thermistors.	2012-02-06 12:28:33 +01:00
Christian Thalhammer	b51e8bf7e5	-disabled CARDDETECT if PIN is set to -1 - redo disable Beeper if PIN is set to -1	2012-02-06 12:22:44 +01:00
Christian Thalhammer	3183a14755	-added Configuration for GEN7 which worked for me	2012-02-06 12:12:18 +01:00
Christian Thalhammer	5edef148fe	-disalbe beeper if BEEPER_PIN = -1	2012-02-06 12:10:32 +01:00
Christian Thalhammer	13e2ad2831	- added info for using GEN7 configuration	2012-02-06 11:58:52 +01:00
Christian Thalhammer	59cc5f889e	- added support for ATMega1284P	2012-02-06 11:55:56 +01:00
Christian Thalhammer	a11f3b2d2f	- Pins for modified GEN7 assigned - Added support for ATMega1284	2012-02-06 11:49:23 +01:00
Erik van der Zalm	abb7e63906	fixed z-disable bug.	2012-02-05 21:14:55 +01:00
Erik van der Zalm	9f139d6e0e	Added MAX6675 support. (Thanks to gregfrost) Needs some work to remove the blocking in read max6675.	2012-02-05 13:05:07 +01:00
Erik van der Zalm	e45e5c68bb	Added support for Gen3+ (Pins file only) Added late z enable. (blddk request) Only calculate look ahead if >2 moves in buffer. Removed some FORCE_INLINE to save memory. Signed-off-by: Erik van der Zalm <erik@vdzalm.eu>	2012-02-05 12:42:15 +01:00
Michael Moon	9c918a497b	more work on Makefile - actually rebuilds if Makefile or Configuration.h are altered, also much cleaner output	2012-01-25 20:46:27 +11:00
Michael Moon	ab01658fd2	local configuration stuff- WATCHPERIOD causes breakage, disable. few other misc changes	2012-01-24 17:02:45 +11:00
Michael Moon	42bedb3f60	PROGMEM elements must be const	2012-01-24 15:57:42 +11:00
Michael Moon	a991bde523	enable auto-reset before programming, disable afterwards	2012-01-24 14:25:28 +11:00
Michael Moon	3e575533c5	get M81 working	2012-01-24 14:24:41 +11:00
Michael Moon	2ae2ead97b	help residency not overflow	2012-01-24 14:24:24 +11:00
Michael Moon	71dc82e0b4	my local configuration	2012-01-24 13:19:37 +11:00
Michael Moon	5aadc2f5ca	cardreader needs to include some other files	2012-01-24 13:19:24 +11:00
Michael Moon	8d0916af13	allow Marlin to actually compile with Makefile pulled from Sprinter and a few other modifications	2012-01-24 13:18:54 +11:00
haxar	6cc6029d7a	M109 EOL fix when TEMP_RESIDENCY_TIME is undefined; printer interface (pronterface) could not see target extruder heater temperature to continue print	2012-01-22 03:25:56 -08:00
Bernhard	157aa7f2fd	m115 eol fix	2012-01-15 20:51:49 +01:00
Bernhard	7aeb45303d	small mistake	2012-01-15 18:31:21 +01:00
Bernhard	cee5f9020a	added suicide pin for a power supply to the arduino that is only active if the arduino is holding high for an output.	2012-01-15 17:06:10 +01:00
Bernhard	3814bbb529	made sd code only compile with SDSUPPORT defined. safes 10k of codespace	2011-12-26 09:28:51 +01:00
Bernhard	729cde4475	fix autostart failure if in wrong directory	2011-12-26 09:20:53 +01:00
Bernhard	396270a0de	fix duplicated definition of MOSI MISO pins in case motherboard==33	2011-12-26 09:20:21 +01:00
Bernhard	11f2dafc4e	one step closer to a functional makefile..	2011-12-22 16:43:28 +01:00
Bernhard	8463e39a4a	starting with sanguino arduino 1.0 compatibility	2011-12-22 16:11:15 +01:00
Bernhard	2bc160a978	add wiring.h, that can be used to overwrite: arduino-0023/hardware/arduino/cores/arduino/wiring.h this is necessary if the avr libraries are recent, but arduino is old. Alternative: newer arduino	2011-12-22 14:57:28 +01:00
Bernhard	57f9359a41	simplified the includes, makefile now works with arduino23	2011-12-22 14:55:45 +01:00
Bernhard	3c1a4aac2b	header file simplification	2011-12-22 12:38:50 +01:00
Bernhard	212515148e	added m240 photography support. default off	2011-12-22 12:11:39 +01:00
Bernhard	6735025428	cooldown	2011-12-22 12:02:33 +01:00
Bernhard	415aadf704	lcd panel bed support advance and ultipanel not any more in default config	2011-12-22 11:45:52 +01:00
Erik van der Zalm	554cc1718d	Fiexed E_ENABLE_PIN errors	2011-12-15 11:59:07 +01:00
Erik van der Zalm	617968ab76	G92 fix	2011-12-12 20:43:47 +01:00
Erik van der Zalm	84d9cf7339	merging	2011-12-12 20:35:46 +01:00
Erik van der Zalm	e017228569	Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF	2011-12-12 19:34:37 +01:00
Bernhard	3320a5b37d	make autotemp compatile for use without pid	2011-12-11 22:25:52 +01:00
Bernhard	06411d5c9e	ultralcd can now also stop the wait loop for the hot-end m109 heating when stopping sd prints.	2011-12-11 22:18:50 +01:00
Bernhard	82c99625fa	instant stop of sd prints from the panel.	2011-12-11 22:10:06 +01:00
Bernhard	01001b89d2	repaired nozzle runout prevention to not collide with automatic stepper disabeling.	2011-12-11 15:42:56 +01:00
Bernhard	88ee053af0	heating up santity, formarly knows as "watchdog", but renamed due to the existance of the real watchdog, works now.	2011-12-09 17:07:44 +01:00
Bernhard	b1d84d879b	st_synchronize back to normal..	2011-12-09 16:13:58 +01:00
Bernhard Kubicek	f6fe7143e4	Merge pull request #29 from k-eex/Marlin_v1 Fix M201 not saving settings in all places, so the changes did not get written into EEPROM	2011-12-09 06:37:42 -08:00
Bernhard	dde4b40fa9	disable steppers in runout prevention	2011-12-09 15:37:24 +01:00
Bernhard	2bc5e7ec9e	prevent too long extrudes, or too cold extrudes	2011-12-09 15:09:52 +01:00
Bernhard	aa4f9a6474	better values.	2011-12-09 14:09:34 +01:00
Bernhard	87fd249c43	made runout prevention independent of tempeorarily set esteps	2011-12-09 13:56:28 +01:00
Bernhard	1ec0c3b68a	extruder runout prevention.	2011-12-09 13:39:00 +01:00
Bernhard	5b4625f79c	added a partial release option to "m84" aka "stepper release". If you do tiny layers, you might want to keep the z-axis powered to not loose height positioning after homeing.	2011-12-09 12:51:08 +01:00
Bernhard	cc4a9cdb69	added autostart procedure trigger to the ultralcd menu	2011-12-09 12:33:00 +01:00
Bernhard	61c943b4bf	fixed the st_synchronize. it would have continued if there is only the last move of the buffer being stepped.	2011-12-09 12:32:31 +01:00
Keegi	bae1e422f6	Fix M201 not saving settings in all places, so the changes did not get written into EEPROM	2011-12-08 12:25:32 +02:00
Bernhard	754d2d69b2	z homing sound fix, for now until the actual cause is found..	2011-12-07 23:08:13 +01:00
Bernhard	986f0ba76c	moved <stdio.h> to more dominant location.	2011-12-07 20:56:47 +01:00
Bernhard	460b788d78	repaired homing position setting.	2011-12-07 20:54:34 +01:00
Denis B	4fd75dc813	Working version of multiple extruders (up to 3) - The temperature control is pretty much complete (not sure what to do w/ autotemp though) Changed the pins assignment to clearly separate bed and extruder heaters and temp sensors, changed a bit how termistor tables are handled. - The steppers control is rudimentary (only chanages what pins it uses depending on the active_extruder var, but that's enough for switching extruder in the start.gcode in the the profiles) - Tested only w/ RAMPS 1.4	2011-12-06 00:09:16 -05:00
Bernhard	12e8edcac3	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2011-12-04 22:27:37 +01:00
Bernhard	cf50ba140f	added M503 to display eeprom storage, and renamed eeprom routings. This version is compatible with the qtmarlin eeprom-tab.	2011-12-04 22:26:42 +01:00
Erik van der Zalm	89e832c295	Update endstops only for homing. (use less resources when not used)	2011-12-04 21:03:02 +01:00
Erik van der Zalm	b99c49ec3b	Add option to only check endstop when homing	2011-12-04 20:17:21 +01:00
Erik van der Zalm	95a0b28acb	Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1	2011-12-04 19:54:43 +01:00
Erik van der Zalm	af22e9cd38	Some advance modifications	2011-12-04 19:54:07 +01:00
Bernhard	7714b98da7	solved some compiler warnings that are now visible in arduino 1.0. Found a couple of unused variables, that I commented. Tried to solve the program memory warning message, and failed.	2011-12-04 12:40:18 +01:00
Bernhard	dfd240b260	overworked autotemp, removed one layer of nesting from the ultralcd.	2011-12-04 09:48:53 +01:00
Bernhard	4f909963e4	make QUICKHOME configureable	2011-12-04 09:02:09 +01:00
Erik van der Zalm	6b86f15686	More 2nd extruder implementation. (Not usable) Advance (not tested)	2011-12-02 17:45:05 +01:00
Bernhard	0bc9daa4f7	make it compile with arduino 1.0 ; function is still untested.	2011-12-01 16:38:01 +01:00
Bernhard	b0c3871750	more fixing of the sanguino math round problem	2011-11-30 09:07:56 +01:00
Bernhard	9c57453168	removed stream.h referenece from marlinserial.	2011-11-30 08:57:30 +01:00
Bernhard	59205ac5fc	preliminiary implementation for the early heating finish. Might be replaced by something more clever, e.g. by erik, and does not yet support the second extruder or the bed. its kind of not so cool, because you need 6 more ints. Maybe isheating() should use the degrees directly, as it is not used in time-critical anyways. Then it would be much easier. to have the offsets without additional variables.	2011-11-30 08:51:46 +01:00
Bernhard	7a4be21b4f	made it compile if arduino decides to include files in a differnt order. DEC HEX and stuff now defined in MarlinSerial.h	2011-11-30 08:32:28 +01:00
Bernhard	716e89b87c	first homing move diagonal towards home switches.	2011-11-29 22:11:45 +01:00
Bernhard	d00b7e5587	repaired compiliation in windows	2011-11-28 22:45:40 +01:00
Bernhard	e4ab0e5982	more inlines	2011-11-28 22:11:17 +01:00
Bernhard	8cb29921a0	possible stepper release after sd printing	2011-11-28 22:09:17 +01:00
Bernhard	044886b4a0	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2011-11-28 21:52:16 +01:00
Bernhard	b19c8b74b9	force inline	2011-11-28 21:51:44 +01:00
Erik van der Zalm	6d95644c0d	Moved M88 into M84. (M84 E)	2011-11-28 21:49:54 +01:00
Bernhard	311627141b	Merge branch 'smallopt' into Marlin_v1 Conflicts: Marlin/temperature.h	2011-11-28 21:36:01 +01:00
Erik van der Zalm	7216a12856	Disabled M88 for boards that don't have seperate enable pins.	2011-11-28 21:17:06 +01:00
Erik van der Zalm	98805c9228	Added M88 command. (Request from Action68)	2011-11-28 20:51:01 +01:00
Bernhard	85da81e673	inlineing of small functions in serial	2011-11-28 19:34:42 +01:00
Bernhard	b9ad0bb2ce	removed unecessary indirect register adressing in serial.	2011-11-28 19:28:38 +01:00
Bernhard	dd5ca68c87	get rid of indirect ringbuffer calls, made some inlines, removed virtual and streaming class requirements.	2011-11-28 19:13:40 +01:00
Erik van der Zalm	dd5296ad4d	Fixed temperature reading bug. (When using the lower and upper adc input bank)	2011-11-28 17:42:49 +01:00
Erik van der Zalm	f75f426dfa	Removed interrupt nesting in the stepper ISR. Add serial checkRx in stepper ISR. Copied HardwareSerial to MarlinSerial (Needed for checkRx).	2011-11-27 21:12:55 +01:00
Bernhard	2d9a715655	first naive attempt to have a offset in the homeing procedure. Does not enable to move into regions not allowed by endstops.	2011-11-27 17:27:17 +01:00
Bernhard	d2f034ba84	lcd message from gcode, m117	2011-11-27 16:53:11 +01:00
Bernhard	6aecf80278	add autotemp support to the lcd	2011-11-27 16:45:19 +01:00
Bernhard	b128d25f27	overlooked some inlines..	2011-11-27 16:45:00 +01:00
Bernhard	26a1de1e44	force inline	2011-11-27 16:04:58 +01:00
Bernhard	f8e170a44b	planner optimization by inline functions	2011-11-27 14:57:12 +01:00
Erik van der Zalm	aad4b75b94	First parts 2nd extruder	2011-11-26 17:33:25 +01:00
Bernhard	a0dc66f7bf	Home retract distance configureable per axis.	2011-11-26 12:04:06 +01:00
Bernhard	6d6f323535	make an option if sd-card stop should release the steppers.	2011-11-26 11:51:38 +01:00
Bernhard	4d6a5c29df	disable steppers as routine in stepper.cpp	2011-11-26 11:50:23 +01:00
Bernhard	74d0032e25	cooldown blocking selectable by #define.	2011-11-26 09:03:12 +01:00
Bernhard	191f36b493	slowdown	2011-11-25 23:59:30 +01:00
Bernhard	c54a807824	overworked ultralcd a bit	2011-11-25 23:37:08 +01:00
Bernhard	a6823a84e1	another typo	2011-11-25 22:36:33 +01:00
Bernhard	57e163e989	typo	2011-11-25 22:34:12 +01:00
Bernhard	b58787a367	now velocities are also set in mm/sec in gcode.	2011-11-25 22:32:26 +01:00
Bernhard	71ca78982b	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2011-11-25 22:14:36 +01:00
Bernhard	235051253a	overworked lcd+eeprom to have only mm/sec and PID including pid_dt	2011-11-25 22:14:29 +01:00
Erik van der Zalm	27654bfe69	Fixed variable (removed 0x)	2011-11-25 22:10:06 +01:00
Erik van der Zalm	cdf0bd4e63	Fixed config bug when EEPROM was disabled	2011-11-25 20:07:30 +01:00
Erik van der Zalm	6ac9b2e761	Fixed residency time bug. (Thanks to Sound :-) )	2011-11-25 19:34:36 +01:00
Erik van der Zalm	ac8adabb2b	Small nominal speed improvement.	2011-11-25 15:32:50 +01:00
Erik van der Zalm	0e0e4945d8	Removed ISR overtaken message from ISR routine	2011-11-25 13:59:58 +01:00
Erik van der Zalm	c0f8c9fd72	Seperate ENDSTOP_INVERTING for X Y and Z Added simple endstop filter. Corrected M114 count display.	2011-11-25 13:43:06 +01:00
Bernhard Kubicek	5535e51bf6	Yes, thats the beta.	2011-11-20 17:04:57 +01:00
Bernhard Kubicek	8b14a8ad34	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2011-11-20 16:39:39 +01:00
Bernhard Kubicek	924bab1a03	less lcd flickering	2011-11-20 16:37:01 +01:00
Bernhard Kubicek	379ea642e1	make tuneing sub-menu.	2011-11-20 16:05:42 +01:00
Erik van der Zalm	959d82e81e	Small temperature disable bug.	2011-11-20 15:03:35 +01:00
Erik van der Zalm	15bb3f284e	Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1	2011-11-20 14:51:40 +01:00
Erik van der Zalm	4e5becfc51	Added endstop reporting	2011-11-20 14:50:08 +01:00
Bernhard Kubicek	eeb4f029db	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2011-11-20 14:45:38 +01:00
Bernhard Kubicek	b21d5193f2	made ultralcd compatible with folders.	2011-11-20 14:43:47 +01:00
Erik van der Zalm	2e43f9c809	Changed min max temperature code.	2011-11-20 13:14:58 +01:00
Bernhard Kubicek	cd2268f10a	code cleanup in ultralcd.	2011-11-20 11:55:33 +01:00
Erik van der Zalm	0e7fee9a9b	Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1	2011-11-19 21:33:15 +01:00
Erik van der Zalm	915ef2d4a1	Added software endstops	2011-11-19 21:32:47 +01:00
Bernhard Kubicek	e87df99e22	update mcode documentation	2011-11-19 21:01:07 +01:00
Bernhard Kubicek	8a1e719a3f	overworked config file	2011-11-19 20:52:43 +01:00
Bernhard Kubicek	5ad1d19384	make it compile without sd_support	2011-11-19 20:18:54 +01:00
Bernhard Kubicek	7a2d1f5aeb	add M17, so the enable stepper button works in repg.	2011-11-19 18:22:22 +01:00
Erik van der Zalm	e02af3e66a	Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1	2011-11-19 17:23:47 +01:00
Erik van der Zalm	537b5c155d	Fixed arc flowrate.	2011-11-19 17:23:28 +01:00
Bernhard Kubicek	953d830bba	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2011-11-19 17:09:43 +01:00
Bernhard Kubicek	2a6afee832	make it compile without autotemp	2011-11-19 17:09:33 +01:00
Bernhard Kubicek	f52e1a9571	autotemp working, default=disabled.	2011-11-19 17:07:44 +01:00
Erik van der Zalm	6e6fdb9a4e	Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1	2011-11-19 16:18:13 +01:00
Erik van der Zalm	6841a10446	Fixed max/min temperature bug	2011-11-19 16:16:26 +01:00
Bernhard Kubicek	8a08b8e07e	trying to get autotemp to work.	2011-11-19 15:37:10 +01:00
Bernhard Kubicek	f0154de5b3	found bug that disabled printing from root.	2011-11-19 15:36:49 +01:00
Bernhard Kubicek	70650c331d	corrected the ultimaker default values, the previous had a calculation error: see: http://groups.google.com/group/ultimaker/browse_thread/thread/91906788639703cf	2011-11-19 14:50:31 +01:00
Bernhard Kubicek	9d90220537	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2011-11-19 14:35:53 +01:00
Bernhard Kubicek	869cee74e6	host-based sd card printing seems now to work with folders	2011-11-19 14:34:27 +01:00
Bernhard Kubicek	70abca195a	overworked cardreader for folder support; not finished yet.	2011-11-19 13:13:34 +01:00
Erik van der Zalm	ff69e0a772	Changed max/min temp init. Removed second uart from sabguino core	2011-11-19 12:19:53 +01:00
Bernhard Kubicek	1e5e141ac9	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2011-11-18 22:22:23 +01:00
Bernhard Kubicek	edb5ea7efa	the normal config again..	2011-11-18 22:22:07 +01:00
Bernhard Kubicek	5df5727e93	removed some debugging comments	2011-11-18 22:20:53 +01:00
Bernhard Kubicek	64f2121ab1	updated to sdfatlib2010902	2011-11-18 22:17:37 +01:00
Erik van der Zalm	b15902d3b5	Fixed bug in configuration.h	2011-11-18 19:46:16 +01:00
Erik van der Zalm	e63e224a33	Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 Conflicts: Marlin/Configuration.h Marlin/Marlin.pde	2011-11-18 19:04:09 +01:00
Erik van der Zalm	e7dca8614b	Advance experiments. Not working yet.	2011-11-18 18:59:17 +01:00
Bernhard Kubicek	46f80e82d9	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Conflicts: Marlin/ultralcd.h	2011-11-15 22:53:04 +01:00
Bernhard Kubicek	a9c7da06e3	and changed ultipanel to have the mm/sec and not mm/min Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Conflicts: Marlin/Marlin.pde Marlin/ultralcd.h	2011-11-15 22:50:43 +01:00
Bernhard Kubicek	02b9eceead	show sd%	2011-11-15 20:55:00 +01:00
Bernhard Kubicek	7919a40d06	watchdog,percent done,	2011-11-15 20:54:40 +01:00
Erik van der Zalm	805d37f77b	Fixed some small planner bugs	2011-11-15 18:14:00 +01:00
Erik van der Zalm	5fd41ae872	Some fixes in planner	2011-11-14 23:57:34 +01:00
Erik van der Zalm	95126c09c0	Added slowdown	2011-11-14 20:04:29 +01:00
Erik van der Zalm	331e82dcd3	Buffer size > 16	2011-11-14 18:53:09 +01:00
Erik van der Zalm	2643ae93d6	Added modified Sanguino files	2011-11-14 18:27:47 +01:00
Erik van der Zalm	c00eefb824	Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1	2011-11-14 18:26:57 +01:00
Erik van der Zalm	1d0452f10c	250000 baud	2011-11-14 18:24:02 +01:00
Bernhard Kubicek	c57906b627	fixed bug with adjusting ki in realtime.	2011-11-13 21:43:26 +01:00
Erik van der Zalm	ac82411c73	Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1	2011-11-13 20:46:44 +01:00
Erik van der Zalm	65934eee9c	A lot of changes in the planner code	2011-11-13 20:42:08 +01:00
Bernhard Kubicek	9980ceb4a3	added a m400, that finished all moves, and the mechanism so that if an endstop is hit it the ISR, the steps_to_be_taken are stored, and some current_block data that will be deleted in the next move If the normal loop() then finds such an event, the position is calculated (floats would have taken too long in the ISR) A serial message is generated.	2011-11-13 19:58:09 +01:00
Bernhard Kubicek	ff592b056a	heater power repair.	2011-11-13 00:48:55 +01:00
Bernhard Kubicek	e9adfa27b5	re-enabled heaterpower as storage for the current storage of the heater PWM duty cycle. the M301 now returns the current PID settings of the machine. M105 returns heating pwm duty cylce as "@:"	2011-11-12 20:37:28 +01:00
Bernhard Kubicek	36958ee305	minor changes and first not-well working version of autotemp	2011-11-09 22:09:16 +01:00
Bernhard Kubicek	ba8a53a40f	Streaming.h is gone. It conflicted with PROGMEM. And saving memory is more important than nicer code, imho	2011-11-09 20:30:41 +01:00
Bernhard Kubicek	27361e7cd0	beautified the config. ordered it into thematic sections.	2011-11-09 20:28:40 +01:00
Bernhard Kubicek	ab154d5592	project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram.	2011-11-09 20:27:44 +01:00
Bernhard Kubicek	7b70caab7c	made progmem mainly, found one bug in cardreader, added a empty class for cardreader in case no sd support.	2011-11-07 22:33:13 +01:00
Bernhard Kubicek	72ace55e6a	better visibility of public/private/imported variables	2011-11-06 23:34:40 +01:00
Bernhard Kubicek	977fd2b2c7	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2011-11-06 23:21:33 +01:00
Bernhard Kubicek	907daa49af	made loop counters uint8_t most were int(16_t) before	2011-11-06 23:21:12 +01:00
Erik van der Zalm	e3af73ee0c	Thermistor name problem	2011-11-06 23:20:01 +01:00
Bernhard Kubicek	0b43761c3a	preprocessor magic to have a single source principle	2011-11-06 23:13:19 +01:00
Bernhard Kubicek	156763d027	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2011-11-06 22:48:36 +01:00
Bernhard Kubicek	fc0064e525	made cardreader more selfsustained	2011-11-06 22:48:15 +01:00
Erik van der Zalm	d3bfffcb6e	Corrected thermistor naming	2011-11-06 22:37:43 +01:00
Bernhard Kubicek	01df04e02c	first compile with the cardreader class	2011-11-06 21:39:53 +01:00
Bernhard Kubicek	163efdf1c7	Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1	2011-11-06 19:49:04 +01:00
Bernhard Kubicek	87aaf0f70a	static'ified Marlin.pde.	2011-11-06 19:48:37 +01:00
Erik van der Zalm	5cf349a24a	Fixed some arc bugs	2011-11-06 19:37:12 +01:00
Bernhard Kubicek	79d1bfb5c0	made many possible variables static, so they cannot be used extern.	2011-11-06 19:36:29 +01:00
Erik van der Zalm	76b3f805c0	Added teensylu pins	2011-11-06 19:30:04 +01:00
Bernhard Kubicek	1d171e9e52	reformating and some minor bugs/things found on the way.	2011-11-06 19:23:08 +01:00
Bernhard Kubicek	900e0c9bf2	overworked the serial responses. Quite difficult, since many texts are Pronterface protocol.	2011-11-06 17:33:09 +01:00
Bernhard Kubicek	1740a83e11	correcting commit errors.	2011-11-06 15:10:29 +01:00
Bernhard Kubicek	7cc358b56b	wrong file location	2011-11-06 14:58:12 +01:00
Bernhard Kubicek	e8092898b1	watchdog into dedicated file	2011-11-06 14:22:15 +01:00
Bernhard Kubicek	2afb7bd4cf	refactured temperature.cpp so that there are now abstract functions to access temperatures.	2011-11-06 14:03:41 +01:00
Erik van der Zalm	0b82465168	First arcs version. (Arcs not working ok)	2011-11-06 12:39:00 +01:00
Erik van der Zalm	2e8e8878e5	Corrected temp variables.	2011-11-05 20:21:09 +01:00
Erik van der Zalm	04d3b5537f	Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 Conflicts: Marlin/Configuration.h Marlin/EEPROMwrite.h Marlin/Marlin.h Marlin/Marlin.pde Marlin/temperature.cpp Marlin/temperature.h Marlin/thermistortables.h	2011-11-05 20:03:38 +01:00
Erik van der Zalm	d15f01e1b4	Temperature changes	2011-11-05 19:21:36 +01:00
Bernhard Kubicek	ea86a5e10f	moved the variables in the ISR, thats the most normal use case of static.	2011-11-05 16:53:37 +01:00
Bernhard Kubicek	b9ea0651ec	Revert "this is not working. Do you maybe know why?" This reverts commit `8bcdb9f5f0`.	2011-11-05 16:49:29 +01:00
Bernhard Kubicek	8bcdb9f5f0	this is not working. Do you maybe know why?	2011-11-05 16:43:44 +01:00
Bernhard Kubicek	40e8081623	changed end of line to windows, which seems to be the majority of developers main platform.	2011-11-05 14:19:57 +01:00
Bernhard Kubicek	00674af3a8	merge from the branch bkubicek/Marlin/zalmmerge	2011-11-05 14:13:20 +01:00
Erik van der Zalm	d7c4f0780b	Added M42, M80 and M81	2011-11-05 11:18:52 +01:00
Erik van der Zalm	95d3d9847c	M109 now equal to sprinter	2011-11-04 23:38:25 +01:00
Erik van der Zalm	bf879ceaa9	Added thermistor tables	2011-11-04 22:51:14 +01:00
Erik van der Zalm	094afe7c10	Merged Marlin, Marlin non gen6 and Ultimaker changes	2011-11-04 18:02:56 +01:00
Erik van der Zalm	0b1423c303	Fixed crashes.	2011-10-18 19:13:30 +02:00
Erik van der Zalm	27664c6da6	Software endstps added	2011-09-15 17:37:58 +02:00
Erik van der Zalm	8e017b81ab	Sync with non-gen6 version	2011-09-14 18:56:45 +02:00
Erik van der Zalm	b5f6482dce	Fixed small feedrate bug. Copied Camiels comments in the Configuration.h file	2011-08-21 18:29:47 +02:00
Erik van der Zalm	0024a26ccf	Fixed lookup table bug.	2011-08-15 19:26:40 +02:00
Erik van der Zalm	5a1787b2f4	Fix M109	2011-08-14 22:15:33 +02:00
Erik van der Zalm	26bf57e22c	first-commit	2011-08-13 10:09:54 +02:00
Erik van der Zalm	f850af5c1c	Signed-off-by: Erik van der Zalm <erik@vdzalm.eu>	2011-08-12 22:31:59 +02:00
Erik van der Zalm	750f6c33e3	first commit	2011-08-12 22:28:35 +02:00

... 28 29 30 31 32 ...

2604 commits