5199 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
edwilliams16	114d9db7d0	Show babysteps on the LCD in mm, not steps	2016-06-15 23:03:24 -07:00
Scott Lahteine	b410bf933b	Merge pull request #4053 from thinkyhead/rc_cartesio_redo ... CNControls Cartesio UI Support	2016-06-15 22:33:45 -07:00
Scott Lahteine	4fa05913c3	Script to init the upstream remote for Marlin	2016-06-15 22:24:10 -07:00
Scott Lahteine	f639044c24	Merge pull request #3609 from jbrazio/feature/config-version ... Adds versioning for Configuration.h & Configuration_adv.h	2016-06-15 22:09:47 -07:00
Scott Lahteine	4d2cb70152	Cartesio UI Support	2016-06-15 21:46:54 -07:00
Scott Lahteine	da90bbe0eb	Merge pull request #4010 from thinkyhead/rc_toolchange_adjust ... Fixup position adjustment on toolchange	2016-06-15 21:10:33 -07:00
Scott Lahteine	948c467e16	Merge pull request #4043 from AnHardt/save_delay ... Introduce save_delay()	2016-06-15 21:06:43 -07:00
Scott Lahteine	4b93989a77	MBL Z adjustment on toolchange	2016-06-15 20:49:36 -07:00
Scott Lahteine	9c800d1f8c	Position adjustment for bed leveling	2016-06-15 20:49:36 -07:00
Scott Lahteine	8c7babb70f	Merge pull request #4049 from esenapaj/Fix-for-the-PR-#4023 ... Fix for the PR #4023(Add macros to move servos)	2016-06-15 20:39:46 -07:00
Scott Lahteine	2d6de3e592	Merge pull request #4047 from Alex9779/Fix/ultralcd_move_e ... RCBugFix with UltraLCD active does not compile	2016-06-15 20:38:41 -07:00
AnHardt	1219310622	Introduce save_delay() ... Introduce save_delay() for long delays what otherwise would cause watchdog resets Explizit lcd_set_custom_characters(false) at the end of bootscreen(). Else the charset is not proper set in case of LCD_PROGRESS_BAR.	2016-06-15 18:11:55 +02:00
esenapaj	44f091a413	Fix for the PR #4023(Add macros to move servos) ... ・Add missing ')'	2016-06-15 22:34:55 +09:00
Alexander Leisentritt	c2b7ef1e7e	"e" was renamed to "eindex" in a previous commit	2016-06-15 11:11:16 +02:00
Scott Lahteine	52ac2a62ee	Merge pull request #4013 from thinkyhead/rc_toolchange_no_move ... Use "Tn S1" to change tools without moving	2016-06-14 20:13:01 -07:00
Scott Lahteine	d2a00b74e3	Merge pull request #4004 from thinkyhead/rc_feedrate_in_gcode_T ... Use linear feedrate in gcode_T, not volumetric	2016-06-14 20:10:08 -07:00
Scott Lahteine	0ad26d0de8	Merge pull request #4034 from AnHardt/custom-splash-screen ... Custom Splash Screen	2016-06-14 18:51:39 -07:00
Jochen Groppe	574c938ab9	Merge pull request #4040 from esenapaj/Follow-up-the-PR-#3676 ... Follow-up the PR #3676(Advance extrusion algorithm – LIN_ADVANCE)	2016-06-14 19:22:49 +02:00
esenapaj	741cda0e47	Follow-up the PR #3676(Advance extrusion algorithm – LIN_ADVANCE) ... ・Update forgotten example configurations	2016-06-15 00:10:15 +09:00
AnHardt	02b3d6b8d3	Custom Splash Screen ... Custom Splash Screen for full graphic displays. Too complicated for the hitachis without knowing what exactly to display. On top of #4032 Realisation of an idea from #3996	2016-06-14 09:39:28 +02:00
Scott Lahteine	78a48d7e3c	Merge pull request #4038 from thinkyhead/rc_fix_heater_off ... Fix broken DISABLE_HEATER macro	2016-06-13 20:58:34 -07:00
Scott Lahteine	ee5be92206	Fix broken DISABLE_HEATER macro	2016-06-13 20:57:58 -07:00
Scott Lahteine	fc4fb9eba1	Merge pull request #4036 from thinkyhead/rc_lin_advance_feature ... Parse M905 args in Marlin_main.cpp	2016-06-13 19:26:29 -07:00
Scott Lahteine	8d8180e028	Parse M905 args in Marlin_main.cpp	2016-06-13 19:25:28 -07:00
Scott Lahteine	e7e57f0eb4	Merge pull request #4035 from thinkyhead/rc_lin_advance_feature ... Patch LIN_ADVANCE to use code_value_float	2016-06-13 18:55:14 -07:00
Scott Lahteine	2b340f5acb	patch LIN_ADVANCE to use code_value_float	2016-06-13 18:54:25 -07:00
Scott Lahteine	b708196770	Merge pull request #4032 from AnHardt/bootscreen-delay ... Show bootscreen later	2016-06-13 18:27:05 -07:00
Scott Lahteine	587de1b6b6	Merge pull request #3676 from thinkyhead/rc_lin_advance_feature ... Advance extrusion algorithm – LIN_ADVANCE	2016-06-13 18:04:58 -07:00
Scott Lahteine	738f414d2b	Merge pull request #4029 from tnw513/FixLangIt ... Update to language_it.h	2016-06-13 18:01:51 -07:00
AnHardt	b4fedec0d1	Show bootscreen later ... Init display and show bootscreen later, but init display in `kill()` to init outputs before the bootscreen delays but being able to display kill errors.	2016-06-14 01:59:50 +02:00
Silvio Didonna	08e2c5a6ea	Added and translated some strings from language_en	2016-06-13 13:04:09 +02:00
Silvio	29337db206	Merge pull request #3 from MarlinFirmware/RCBugFix ... update to latest rcbugfix	2016-06-13 12:47:42 +02:00
Scott Lahteine	17c86349c0	Merge pull request #4020 from thinkyhead/rc_test_M600 ... Fix Travis test for FILAMENTCHANGEENABLE	2016-06-12 18:50:26 -07:00
Scott Lahteine	b4c37a676f	Merge pull request #4025 from thinkyhead/rc_fix_ultralcd_move_e ... Fix manual move for multiple extruders	2016-06-12 17:27:36 -07:00
Scott Lahteine	4d2119f83a	_lcd_move => _lcd_move_xyz	2016-06-12 17:14:19 -07:00
Scott Lahteine	811967923a	Fix manual_move to move the correct E stepper	2016-06-12 17:14:19 -07:00
Scott Lahteine	0d0b751498	Merge pull request #4023 from thinkyhead/rc_servo_macros ... Add macros to move servos	2016-06-12 15:45:39 -07:00
Scott Lahteine	4fbe818163	Add macros to move servos	2016-06-12 15:38:30 -07:00
Scott Lahteine	9a1dfd0f5f	Fix Travis test for FILAMENTCHANGEENABLE	2016-06-12 14:24:56 -07:00
Scott Lahteine	e51f8df097	Merge pull request #4014 from thinkyhead/rc_one_less_ultipanel_cond ... No need to check ULTIPANEL with DOGLCD	2016-06-11 17:39:42 -07:00
Scott Lahteine	b322ac4417	No need to check ULTIPANEL with DOGLCD	2016-06-11 16:50:06 -07:00
João Brázio	8ccd97e7cc	Updated all example configuration files	2016-06-12 00:36:15 +01:00
Scott Lahteine	c7eeb09e8f	Merge pull request #4012 from Blue-Marlin/watchdoghealing ... Heal the watchdog	2016-06-11 16:18:22 -07:00
Scott Lahteine	7fb69e24fb	Use "Tn S1" to change tools without moving	2016-06-11 15:58:45 -07:00
Scott Lahteine	2f1bf8373b	Merge pull request #4005 from thinkyhead/rc_prepare_move_destination ... Clarify names of prepare_move functions	2016-06-11 15:51:58 -07:00
João Brázio	de8108648f	Added a versioning system to the config files	2016-06-11 23:48:10 +01:00
Blue-Marlin	efe719f898	Heal the watchgog	2016-06-12 00:34:31 +02:00
Scott Lahteine	b75e648f2c	Clarify names of prepare_move functions	2016-06-11 15:32:49 -07:00
Scott Lahteine	d50ba08246	Merge pull request #4011 from thinkyhead/rc_manual_move_cond ... Wrap all items depending on ULTIPANEL	2016-06-11 15:26:52 -07:00
Scott Lahteine	ae9b09fe94	menu => screen	2016-06-11 14:53:39 -07:00