1418 Commits

Author	SHA1	Message	Date
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