946 Commits

Author	SHA1	Message	Date
Scott Lahteine	d19cfcfc1d	max_jerk array, DEFAULT_XYJERK => DEFAULT_[XY]JERK	2016-10-02 06:34:56 -05:00
Scott Lahteine	850259bb25	Watch bed temp also for Control menu item	2016-09-28 14:14:04 -05:00
Scott Lahteine	ea0dbee3c9	Enable ABL by type, support bilinear on cartesian	2016-09-25 23:35:37 -05:00
Scott Lahteine	145d9005d1	Fix BLTOUCH string and SERVO_DELAY	2016-09-21 01:45:23 -05:00
Scott Lahteine	13523cbf29	Fix and extend BLTouch support	2016-09-20 16:20:36 -05:00
Scott Lahteine	f38a33a5d8	Add handling of BLTouch error state	2016-09-18 22:00:32 -05:00
Scott Lahteine	9429c7db89	Use ABC indices in delta[]	2016-09-18 13:50:38 -05:00
Scott Lahteine	83a41c7ceb	Remove SCARA axis_scaling	2016-09-16 15:21:18 -05:00
Scott Lahteine	5ecc7d9f25	Clear LCD button state, apply timer to all ... Addressing #3007	2016-09-13 16:10:27 -05:00
Scott Lahteine	6ab54c60b1	Add conditionals for kinematics, leveling	2016-09-13 03:32:59 -05:00
Scott Lahteine	e354cf5884	Apply sw_endstops_enabled to manual move	2016-08-21 00:10:08 -05:00
Scott Lahteine	71319adbb8	Wrap ULTIPANEL-dependent code	2016-08-20 18:33:11 -05:00
Scott Lahteine	305913545e	Move number-to-string function to utility.*	2016-08-20 18:33:11 -05:00
Scott Lahteine	628dcbc764	extruder_multiplier => flow_percentage	2016-08-18 22:13:47 -05:00
Scott Lahteine	132322e4d9	Fix #4614: currentScreen only defined with ULTIPANEL	2016-08-14 00:29:46 -07:00
Scott Lahteine	405afec393	Include decimeters in filamentUsed display	2016-08-12 05:16:43 -07:00
Scott Lahteine	432e9a1f50	Use configured feedrates, center for DELTA_CALIBRATION_MENU	2016-08-11 12:05:55 -07:00
Scott Lahteine	58c8e6cef2	Fixes #4576: Convert filamentUsed to long for display	2016-08-09 23:57:28 -07:00
Scott Lahteine	3be4511230	Patch command order in delta calibration menu	2016-08-08 21:15:25 -07:00
Scott Lahteine	88540d8ecf	Fix: LCD displays SD status at startup	2016-08-08 20:53:18 -07:00
Scott Lahteine	b16ea09498	Make DELTA_CALIBRATION_MENU more universal	2016-08-08 20:42:58 -07:00
Scott Lahteine	42927530fe	Explicitly clear the screen in lcd_goto_screen	2016-08-06 18:10:39 -07:00
Scott Lahteine	a6d2c2479f	Minor cleanup of lcd_goto_screen calls	2016-08-06 18:10:39 -07:00
Scott Lahteine	e47c8b9829	Save bytes for custom chars (Hitachi LCD)	2016-08-06 18:10:39 -07:00
Scott Lahteine	938e6d15c4	Patch up some flaws, here and there	2016-08-05 08:17:37 -07:00
Scott Lahteine	7e2bd9a233	Z_RAISE_PROBE_* => Z_PROBE_*_HEIGHT	2016-08-03 21:18:38 -07:00
Scott Lahteine	c9123adc59	Improved SCREEN / MENU macros	2016-08-02 18:05:34 -07:00
Scott Lahteine	3cccaa9885	Allow encoder pulse/step override for more LCDs	2016-08-02 15:57:26 -07:00
Scott Lahteine	330f82971b	Buzzer requires BEEPER_PIN	2016-08-02 14:05:37 -07:00
Scott Lahteine	38af251b91	Use a default argument in _lcd_move_e	2016-08-01 16:09:26 -07:00
Scott Lahteine	63fd1f49a6	PID_EXTRUSION_SCALING, disabled by default	2016-07-31 17:49:34 -07:00
Scott Lahteine	ad68b4cb8b	Followup to #4468	2016-07-30 03:49:42 -07:00
Scott Lahteine	696b63e300	Specify manual-movable E axes by extruder type	2016-07-30 00:36:48 -07:00
Scott Lahteine	b7b7c90477	Merge pull request #4389 from thinkyhead/rc_optimize_planner ... Optimize planner with precalculation, etc.	2016-07-24 17:48:23 -07:00
Scott Lahteine	f8b5749235	Replace division in planner with multiplication	2016-07-24 13:27:49 -07:00
João Brázio	62d96d72f3	Renamed timestamp_t to duration_t	2016-07-24 03:16:02 +01:00
Scott Lahteine	1766b990b8	Merge pull request #4376 from jbrazio/timestamp_t-short ... Adds short format to timestamp_t	2016-07-22 21:17:17 -07:00
João Brázio	9e5dbf67e8	Update the stats menu to include longest job and extruded filament	2016-07-23 03:05:45 +01:00
João Brázio	b4aad85c9a	Rework stats menu to use timestamp_t	2016-07-23 01:42:21 +01:00
Scott Lahteine	d5e2d523c7	Generalize kinematics function names	2016-07-22 16:36:34 -07:00
Scott Lahteine	0432613ad7	use enabled macro for mapper setting	2016-07-19 18:08:56 -07:00
Scott Lahteine	2bad02e60d	Reprapworld Keypad: F1 opens the Move Axis menu	2016-07-19 16:40:39 -07:00
Scott Lahteine	eaa6f568ee	Prevent re-entrant call of Reprapworld Keypad handler	2016-07-19 16:40:39 -07:00
Scott Lahteine	06ac1f3bcf	Reduce Reprapworld Keypad move code size	2016-07-19 16:40:39 -07:00
Scott Lahteine	8a2efd1155	Rename ultralcd implementation files for consistency	2016-07-19 15:26:14 -07:00
Scott Lahteine	c502018eab	Merge pull request #4353 from jbrazio/global-enum-file ... General cleanup: enum	2016-07-19 13:37:56 -07:00
João Brázio	3ebad4e020	Moves all global enums to a central file	2016-07-19 14:31:09 +01:00
esenapaj	361307831e	Follow-up the PR #4335 (Debug char, fix compile errors for lcd pins) ... ・Solve a flickering when SD card is inserted or removed at using a ASCII LCD + language_kana.h	2016-07-18 20:09:24 +09:00
Scott Lahteine	f242aea032	Merge pull request #4319 from thinkyhead/rc_feedrates_to_mess_with_you ... Wrangle feed rate variables	2016-07-17 14:07:52 -07:00
Scott Lahteine	9f9fe043ba	Apply sq macro throughout	2016-07-17 13:29:41 -07:00
Scott Lahteine	93ba5bddd7	Append units to feedrate variables	2016-07-17 13:29:41 -07:00
Scott Lahteine	94955a8bf7	pad string in lcd_finishstatus	2016-07-17 12:27:37 -07:00
Scott Lahteine	05da02f0a2	Implement MIXING_EXTRUDER and SWITCHING_EXTRUDER	2016-07-17 10:53:10 -07:00
Scott Lahteine	9766e24504	Merge pull request #4277 from thinkyhead/rc_mks_13_viki2 ... Support for VIKI2 with MKS 1.3 / 1.4	2016-07-16 23:49:33 -07:00
Scott Lahteine	aaa0d298b9	Merge pull request #4326 from thinkyhead/rc_no_static_items_fix ... Suppress compiler warnings in ultralcd.cpp	2016-07-16 23:38:08 -07:00
Petr Zahradník junior	2d7fe9dc78	LCD Longer print	2016-07-16 18:21:06 -07:00
Scott Lahteine	d53dcaa796	Suppress some compiler warnings	2016-07-16 17:59:01 -07:00
Scott Lahteine	95ab2fd3ae	Fix skipping of static items	2016-07-14 19:16:16 -07:00
Scott Lahteine	c5e51f6b96	finished => completed	2016-07-14 11:46:35 -07:00
Scott Lahteine	e481b79af1	Allow stopwatch and printcounter to go over 18 hours	2016-07-14 11:39:57 -07:00
Scott Lahteine	2224032568	Merge pull request #4285 from thinkyhead/rc_manual_move_fast_fine ... No delay for the smallest LCD moves	2016-07-12 20:16:38 -07:00
Scott Lahteine	a8b6b6a128	Merge pull request #4252 from thinkyhead/rc_rename_hpb ... Replace PLA/ABS preheating with generic	2016-07-12 20:00:33 -07:00
Scott Lahteine	ecd5e810ac	No delay for the smallest LCD moves	2016-07-12 18:09:01 -07:00
Scott Lahteine	2b9515d60f	Merge pull request #4281 from AnHardt/lang-system ... Don't use UTF-strlen() if the text is not UTF	2016-07-12 17:21:28 -07:00
Scott Lahteine	e9f62d8fdb	Remove extraneous conditions for encoder position	2016-07-12 16:41:00 -07:00
AnHardt	54d35230df	Don't use UTF-strlen() if the text is not UTF	2016-07-12 19:59:03 +02:00
Scott Lahteine	4865447830	Merge pull request #4276 from esenapaj/Suppress-warnings ... Suppress warnings	2016-07-11 19:08:59 -07:00
Scott Lahteine	6e68dd292b	Merge pull request #4243 from thinkyhead/rc_fix_static_scrolling ... Improve STATIC_ITEM implementation	2016-07-11 18:25:00 -07:00
Scott Lahteine	d17b161832	Don't draw current screen if simply changing screens	2016-07-11 18:14:04 -07:00
Scott Lahteine	096f9981d1	Scroll to the top when changing screens	2016-07-11 18:14:04 -07:00
Scott Lahteine	155af6b861	Rename vars, add comments for menu macros	2016-07-11 18:14:04 -07:00
Scott Lahteine	31f2cf5f6f	Make encoderLine signed for proper compares	2016-07-11 18:14:03 -07:00
Scott Lahteine	d2099fef0d	Left-justify thermistor info	2016-07-11 18:14:03 -07:00
Scott Lahteine	85aeb02aa6	Invert headings on Graphical LCD	2016-07-11 18:14:03 -07:00
Scott Lahteine	13dc619f43	Scroll static screens more simply	2016-07-11 18:14:02 -07:00
Scott Lahteine	5051723c2e	Redraw after cursor correction in STATIC_ITEM	2016-07-11 18:14:02 -07:00
esenapaj	58177a1602	Suppress warnings	2016-07-12 08:22:24 +09:00
Scott Lahteine	10ebf28ee3	Allow override of ENCODER_FEEDRATE_DEADZONE, lower default for Viki	2016-07-11 15:43:08 -07:00
Scott Lahteine	6121c9018a	Merge pull request #4265 from thinkyhead/rc_buzzer_patchup ... Two strategies to address a stuck buzzer	2016-07-10 19:46:15 -07:00
Scott Lahteine	71674059c3	Two strategies to address a stuck buzzer	2016-07-10 19:25:23 -07:00
Petr Zahradnik	eaf9e615ce	Total print time for LCD correction (hours:minutes format)	2016-07-10 13:08:05 +02:00
Scott Lahteine	f9e08b1fcd	Merge pull request #4254 from AnHardt/killscreen ... Add a kill-screen	2016-07-09 20:44:42 -07:00
AnHardt	faac2bcfdb	Add a kill-screen	2016-07-10 04:50:45 +02:00
Scott Lahteine	1026e5b071	Replace PLA/ABS preheating with generic	2016-07-09 18:06:51 -07:00
AnHardt	de3a169336	Always define MIN_Z_HEIGHT_FOR_HOMING even if 0 ... Always define MIN_Z_HEIGHT_FOR_HOMING even if 0 Always make a potential rise to `home_offset[Z_AXIS]` possible in G28. Get rid of some very ugly constructs in MBL (ultralcd.cpp).	2016-07-08 15:08:32 +02:00
Scott Lahteine	834ad14c8d	Add quickstop_stepper to update current position with stepper.quick_stop()	2016-07-07 16:37:22 -07:00
Scott Lahteine	160a2be117	Change cancel_heatup to wait_for_heatup	2016-07-06 09:17:50 -07:00
Scott Lahteine	ef8980bfa0	Shorter labels for Print Stats info	2016-07-03 16:00:24 -07:00
Scott Lahteine	2ed625dafa	Fix compiler warnings for static screens	2016-07-03 15:26:17 -07:00
Scott Lahteine	982f10e6a0	Use STATIC_ITEM for LCD message display	2016-07-02 15:47:15 -07:00
Petr Zahradnik	43ff0ce35f	Rewritten FILAMENT_CHANGE_ENABLE feature	2016-07-02 15:34:33 -07:00
Scott Lahteine	51b7820686	Patch up About Printer sub-menus	2016-07-02 15:22:34 -07:00
Anthony Birkett	7a377c1d75	Add "About Printer" information menu. ... Includes: *firmware version / branch / date. *extruder count *board information (name, serial details, power supply type) *thermistors (names, min/max temperatures) *printer statistics (PRINTCOUNTER details) Thanks to @thinkyhead for contributions.	2016-07-02 15:22:26 -07:00
Scott Lahteine	bd491818d6	Reduce storage requirements for strings, make some PGM	2016-06-27 20:36:18 -07:00
Edward Patel	da88b00585	MBL: Add support for max z endstop ... See https://github.com/MarlinFirmware/Marlin/issues/4088	2016-06-25 21:58:02 +02:00
Scott Lahteine	74878d1f16	Always do a brief delay in lcd_quick_feedback	2016-06-24 14:46:10 -07:00
Scott Lahteine	bb9c67b4b5	Tweak some feedrate vars	2016-06-22 03:27:31 -07:00
Scott Lahteine	bbf5b486c3	Add an SD Card stop function, use in ultralcd	2016-06-17 18:27:14 -07:00
Scott Lahteine	1000563d80	Make M851 standard with a bed probe	2016-06-17 15:19:42 -07:00
edwilliams16	114d9db7d0	Show babysteps on the LCD in mm, not steps	2016-06-15 23:03:24 -07:00
Alexander Leisentritt	c2b7ef1e7e	"e" was renamed to "eindex" in a previous commit	2016-06-15 11:11:16 +02: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	b322ac4417	No need to check ULTIPANEL with DOGLCD	2016-06-11 16:50:06 -07:00
Scott Lahteine	ae9b09fe94	menu => screen	2016-06-11 14:53:39 -07:00
Scott Lahteine	45ea8749d3	Wrap all items depending on ULTIPANEL	2016-06-11 14:27:34 -07:00
Blue-Marlin	378ff92e98	manage_manual_move(); -> ULTIPANEL ... Makr the call of `manage_manual_move() ` depandent of `ULTIPANEL`	2016-06-10 23:36:57 +02:00
Scott Lahteine	e2d4919c01	Merge pull request #3991 from thinkyhead/rc_axis_units ... Rename some vars to clarify their relationship to acceleration	2016-06-09 20:57:01 -07:00
João Brázio	5b5aa1572b	Non-blocking buzzer	2016-06-09 20:20:05 -07:00
Scott Lahteine	72c6f2923f	axis_steps_per_unit => axis_steps_per_mm	2016-06-09 17:04:51 -07:00
Scott Lahteine	cb4704e07a	Rename some planner acceleration vars ... - `per_sq_second` => `per_s2` - `per_sqr_second` => `per_s2` - `axis_steps_per_sqr_second` => `max_acceleration_steps_per_s2`	2016-06-09 17:04:50 -07:00
Scott Lahteine	b23f710034	Cleanup and naming for num-to-string functions	2016-06-08 13:12:27 -07:00
Scott Lahteine	47b5c55c29	Implement the delayed-move technique	2016-06-05 02:29:49 -07:00
Scott Lahteine	a3e25a0fca	Instead of trying to move now, set a flag to move asap	2016-06-05 02:29:48 -07:00
Scott Lahteine	43947072d5	Merge pull request #3895 from thinkyhead/rc_singlenozzle_part_2 ... SINGLENOZZLE: EXTRUDERS versus HOTENDS	2016-06-04 15:23:17 -07:00
Scott Lahteine	c2362c1b3c	Apply Marlin coding standards to MBL class	2016-06-03 21:43:32 -07:00
Edward Patel	c06de0f097	MBL: Added keeping MBL active when homing single axises for #3750	2016-06-03 21:42:29 -07:00
Scott Lahteine	cd441ce652	SINGLENOZZLE: EXTRUDERS versus HOTENDS	2016-06-03 17:38:03 -07:00
Scott Lahteine	32f8300cc6	Merge pull request #3944 from thinkyhead/rc_eboston_lcd_contrast ... Improved LCD contrast handling	2016-06-03 17:08:41 -07:00
Scott Lahteine	664b299a51	This fix is not DELTA compatible	2016-06-02 17:16:19 -07:00
Scott Lahteine	064efb20e0	Also call clear_command_queue for lcd_sdcard_stop	2016-06-02 17:16:19 -07:00
Scott Lahteine	6277395e1e	set_current_position_from_planner() after stepper.quick_stop()	2016-06-02 17:16:19 -07:00
Scott Lahteine	381bc6f0b0	set_position => set_position_mm	2016-06-02 17:16:19 -07:00
Scott Lahteine	efa7209acf	Improved LCD contrast handling ... Based on MarlinFirmware/MarlinDev#200 from @eboston	2016-06-02 16:17:34 -07:00
Scott Lahteine	bd97bbc52a	Make HAS_LCD_CONTRAST a boolean flag	2016-05-31 11:47:02 -07:00
Scott Lahteine	3861f1e0da	Merge pull request #3908 from jbrazio/bugfix/3826 ... Closes #3826: SD printing will now pause and stop the print counter	2016-05-30 00:08:57 -07:00
Scott Lahteine	dc22097b3a	Fix some of array initializations ... - In `stepper.h` init `count_direction` array - In `ultralcd.cpp` init `autotune_temp` array	2016-05-29 20:55:13 -07:00
João Brázio	40e64b36de	Closes #3826: SD printing will now pause and stop the print counter ... The LCD menu items for SD printing pause/stop have been updated to control also the print job timer. This commit also fixes a small output bug with M78, the failed print counter was displaying the wrong value.	2016-05-30 00:56:39 +01:00
Scott Lahteine	a4ed988c60	Two index finding functions for MBL	2016-05-23 14:25:42 -07:00
Scott Lahteine	8218558953	Update comments, rename next_ping_ms, followup to #3797	2016-05-19 16:44:57 -07:00
AnHardt	0c4d885d5b	Speedup sreen update delay ... Speedup sreen update delay and correct a comment. A module division by 10 is slooooow. (powers of 2 are fast - but then you can AND a bitmask with the same result)	2016-05-19 15:41:09 +02:00
Scott Lahteine	754b0152f5	Fix MBL zigzag calls	2016-05-15 12:35:01 -07:00
Scott Lahteine	14cd0f4c92	Merge pull request #3740 from thinkyhead/rc_lcd_home_options ... Individual Axis Homing LCD menu items	2016-05-12 11:59:46 -07:00
João Brázio	09150cae79	Individual Axis Homing LCD menu items	2016-05-11 19:28:19 -07:00
Scott Lahteine	4dc4e2063f	Add REVERSE_ENCODER_DIRECTION option	2016-05-11 15:39:28 -07:00
Scott Lahteine	51109d4af7	Use AxisEnum with _lcd_babystep()	2016-05-05 21:04:30 -07:00
Scott Lahteine	b65ea98d6b	Localize babystepping in the Temperature class ... So that `ultralcd.cpp` doesn’t need to worry about the details.	2016-05-05 15:00:31 -07:00
esenapaj	1a97442d19	Follow-up the PR #3643(Temperature singleton) ... Follow-up the PR #3643(Temperature singleton) ・Change from fanSpeedSoftPwm[0] to thermalManager.fanSpeedSoftPwm[0] in planner.cpp It fix compilation error when FAN_SOFT_PWM is enabled. ・Remove declaration of setExtruderAutoFanState() in temperature.h Because that function was abolished. ・Change from babystepsTodo to thermalManager.babystepsTodo in ultralcd.cpp It fix compilation errors when BABYSTEPPING is enabled.	2016-05-05 18:01:39 +09:00
Scott Lahteine	084f6b5b44	Temperature singleton class	2016-05-04 19:42:12 -07:00
Scott Lahteine	b4b5c7a6b7	Merge pull request #3670 from thinkyhead/rc_scoovo_controller ... Use directional buttons when defined	2016-05-03 17:42:18 -07:00
Scott Lahteine	ddafb859e2	Use directional buttons when defined	2016-05-03 12:50:49 -07:00
esenapaj	605808fe37	Additional follow-up the PR #3631(Encapsulate S... ... Additional follow-up the PR #3631(Encapsulate Stepper, Planner, Endstops in singleton classes) ・Change from abort_on_endstop_hit to stepper.abort_on_endstop_hit in endstop.cpp, Marlin_main.cpp, and ultralcd.cpp ・Add include path to cardreader.h and temperature.h in endstop.cpp(for CardReader class and disable_all_heaters()) It fix compilation error when ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED and SDSUPPORT are enabled. ・Change from digipot_current() to stepper.digipot_current() in Marlin_main.cpp ・Change from digitalPotWrite() to stepper.digitalPotWrite() in Marlin_main.cpp It fix compilation errors when HAS_DIGIPOTSS is enabled. ・Change from microstep_mode() to stepper.microstep_mode() in Marlin_main.cpp ・Change attribute of microstep_mode() from private to public in stepper.h ・Change from microstep_readings() to stepper.microstep_readings() in Marlin_main.cpp ・Change from microstep_ms() to stepper.microstep_ms() in Marlin_main. It fix compilation errors when HAS_MICROSTEPS is enabled.	2016-05-03 18:28:37 +09:00
Scott Lahteine	60c6efb75c	Merge pull request #3653 from thinkyhead/rc_bed_temp_watch_merge ... Introduce temp watch protection for the bed	2016-05-01 13:58:28 -07:00
gralco	908229dbb3	Introduce temp watch protection for the bed ... When setting the bed temp via M140/M190 if the thermistor does not read an increase of WATCH_BED_TEMP_INCREASE degrees by WATCH_BED_TEMP_PERIOD seconds then it will throw "Error:Heating failed, system stopped! Heater_ID: bed" and call the kill() function. Conflicts: Marlin/Configuration_adv.h	2016-05-01 13:12:51 -07:00
Scott Lahteine	96f51f400f	Planner singleton class	2016-04-30 17:26:50 -07:00
Scott Lahteine	5e4e535ce8	Stepper and Endstops as singleton objects	2016-04-30 17:26:50 -07:00
Scott Lahteine	88c6693b9e	Fix a typo in #3586 to fix MBL	2016-04-22 20:04:08 -07:00
Scott Lahteine	003aab6dfd	Revert MBL menus to "known" working point	2016-04-21 12:59:55 -07:00
Scott Lahteine	dc2281d2f4	Add nextMenu, nextEncoderPosition to change menus after handler loop	2016-04-20 20:19:12 -07:00
Scott Lahteine	7fa2bda1b9	Give the "alive dot" its own blink	2016-04-20 18:57:17 -07:00
Scott Lahteine	9d5e1f32fd	Use axis_homed in _lcd_level_bed_homing, item in Prepare before homing	2016-04-20 18:53:33 -07:00
Scott Lahteine	9bcb72e7f8	Further patches to MBL - break up into more handlers	2016-04-20 16:37:35 -07:00
Scott Lahteine	3f6ae85748	Fix some MBL display issues for DOGLCD	2016-04-20 16:36:45 -07:00
Scott Lahteine	3db5a75f30	Merge pull request #3568 from thinkyhead/rc_various_fixes ... General code cleanup, improved naming, etc.	2016-04-19 20:53:38 -07:00
Scott Lahteine	78747b1328	min_pos/max_pos => sw_endstop_min/sw_endstop_max	2016-04-19 19:43:38 -07:00
Scott Lahteine	ba84d8d091	Allow setting PIDTEMP and PIDTEMPBED together or apart	2016-04-19 18:09:29 -07:00
Scott Lahteine	4f04bf7fe8	Show steps done in the babystep display	2016-04-18 20:52:38 -07:00
Scott Lahteine	c242bee449	Add a final lift, if configured, in Manual Bed Leveling	2016-04-17 00:12:46 -07:00
Scott Lahteine	234987ee2f	Fix MBL lift	2016-04-16 14:17:06 -07:00
Scott Lahteine	e0830bf8f1	Don't use LCD alert unless error or alert level is reset later	2016-04-15 18:48:49 -07:00
Scott Lahteine	866c5be395	Merge pull request #3500 from thinkyhead/rc_shrink_menu_macros ... Reduce redundancy in MENU_ITEM code	2016-04-14 19:09:14 -07:00
Scott Lahteine	4fb8013be1	Reduce redundancy in MENU_ITEM code	2016-04-14 18:42:06 -07:00
Scott Lahteine	2129db581e	Simplify MBL movement, zigzag	2016-04-14 16:58:42 -07:00
Scott Lahteine	0493fccc0b	mbl.active is a bool now	2016-04-14 16:58:42 -07:00
Scott Lahteine	b05f448317	Comments on MBL menu items	2016-04-14 16:58:42 -07:00
Scott Lahteine	fda8f96f00	Fix bug in lcd_preheat_pla0123 and lcd_preheat_abs0123 ... Trying to preheat a non-existent extruder causes a crash.	2016-04-14 15:48:43 -07:00
Scott Lahteine	2ae7394640	More fine-grained control of LCD redraw	2016-04-12 21:34:34 -07:00
Scott Lahteine	3a1ac14bbc	Merge pull request #3437 from thinkyhead/rc_lcd_encoder_movement ... More bits when encoderPosition is cast as signed	2016-04-11 17:03:23 -07:00
Scott Lahteine	386140f361	Test time difference in safe way	2016-04-10 18:09:31 -07:00
Scott Lahteine	8198cc30b5	More bits when encoderPosition is cast as signed	2016-04-09 14:22:12 -07:00
Scott Lahteine	4e17187c96	Merge pull request #3426 from thinkyhead/rc_no_unhomed_lcd_move_on_delta_scara ... No LCD Move for unhomed Delta/SCARA	2016-04-07 19:29:45 -07:00
Scott Lahteine	5fc6daba2b	Disallow REPRAPWORLD_KEYPAD moves on Delta/SCARA until homed	2016-04-07 18:40:54 -07:00
Scott Lahteine	165e73794a	Tweak encoderPosition non-zero test	2016-04-07 16:09:42 -07:00
Scott Lahteine	479d307a44	Disable LCD Move XYZ for unhomed Delta/SCARA	2016-04-07 16:09:42 -07:00
Scott Lahteine	fb38d698db	Add feedback after "Click to Begin"	2016-04-05 15:35:05 -07:00
Scott Lahteine	582b58e660	Add audio feedback to edit items	2016-04-05 14:51:11 -07:00
Scott Lahteine	a70c3ffc21	Minor syntax tweak with encoderPosition	2016-04-05 14:51:11 -07:00
Scott Lahteine	0f247187b8	Drop extra setting of currentMenu	2016-04-05 14:51:11 -07:00
Scott Lahteine	24cde86a4f	Fix syntax highlighting of menu_edit_type lines	2016-04-05 14:51:11 -07:00
Scott Lahteine	86372cd394	Add underscore to internal lcd move function names	2016-04-05 14:51:11 -07:00
Scott Lahteine	aa97328cd3	Use min_pos/max_pos for _lcd_move	2016-04-05 14:51:10 -07:00
Scott Lahteine	f936df9507	Small cleanup of feedrate dead-zone	2016-04-05 14:51:10 -07:00
Scott Lahteine	f5c2fb27cd	Handle defer_return_to_status in lcd_goto_menu	2016-04-05 14:51:10 -07:00
Scott Lahteine	8459f7fa5c	Use ms where possible.	2016-04-05 14:51:10 -07:00
Scott Lahteine	34ce9c4c1c	Restore save previous for menu edit items	2016-04-05 14:26:36 -07:00
Scott Lahteine	1220dfd5d6	Fix: menu edit items saving position twice	2016-04-04 16:36:04 -07:00
Scott Lahteine	d771174797	Merge pull request #3337 from esenapaj/patch-2 ... suppress warnings	2016-04-03 17:01:22 -07:00
Scott Lahteine	7a2f73c6db	Remove extra comma from LCDHandlerAction	2016-04-03 16:27:30 -07:00
Scott Lahteine	3fbf67e5ce	Patch MBL feedback and event handling	2016-04-03 16:27:30 -07:00
Scott Lahteine	ef2fbaec98	Headings for menu sub-items, actions, etc.	2016-04-03 16:27:29 -07:00
Scott Lahteine	dc109ac4e2	Move MBL code to its logical place	2016-04-03 16:27:29 -07:00
Scott Lahteine	6730408ec1	Move lcd_autostart_sd to its logical place	2016-04-03 16:27:29 -07:00
Scott Lahteine	056b80dc53	Have "back" menu items go to the previous item	2016-04-03 16:27:29 -07:00
Scott Lahteine	c94482168b	Add MSG_LEVEL_BED_CANCEL for MBL	2016-04-03 16:27:29 -07:00
esenapaj	f9e1a0ee6c	suppress warnings	2016-04-04 06:48:53 +09:00
Scott Lahteine	771ee1c1a9	Update MBL menu sub-function names	2016-04-02 18:20:47 -07:00
Scott Lahteine	d659777e70	Fix MBL to handle re-entrant calls	2016-04-02 18:14:49 -07:00
Scott Lahteine	5719fcba51	Add MSG_LEVEL_BED_DONE and MSG_LEVEL_BED_WAITING	2016-04-02 18:14:49 -07:00
Scott Lahteine	d1c45ff80b	More user interaction in MBL	2016-04-02 18:14:49 -07:00
Scott Lahteine	240b71ee1c	Give names to lcdDrawUpdate values	2016-04-02 18:14:48 -07:00
Scott Lahteine	b0a3c7a91c	Add feedback sounds to MBL items	2016-04-02 17:08:43 -07:00
Scott Lahteine	782c598e66	Use ftostr43 with '+' option in MBL Z adjuster	2016-04-02 17:08:43 -07:00
Scott Lahteine	f08b0d034f	Merge pull request #3328 from RicardoGA/RC_Babystepping_fix ... Babystepping Fix	2016-04-02 16:48:45 -07:00
RicardoGA	6b1d2263a2	Babystepping Fix	2016-04-02 14:53:57 -06:00
Alexander Hirzel	6e0d627c8c	Unbreak the Delta radius clipping	2016-04-02 12:58:39 -04:00
Alexander Hirzel	949172606f	Fix manual Y movement on delta (regression).	2016-04-02 10:48:13 -04:00
Scott Lahteine	b98f72b483	Small optimization for ftostr43	2016-04-01 17:54:16 -07:00
Scott Lahteine	a393941d2d	Combine "XYZ" with MSG_LEVEL_BED_HOMING	2016-04-01 17:51:03 -07:00
Scott Lahteine	097cc75ba8	Patch _lcd_level_bed draw to fix flicker, show proper offset	2016-04-01 17:51:03 -07:00
Scott Lahteine	1e1a18e091	Remove extra semicolon in ultralcd.cpp	2016-04-01 17:51:03 -07:00
Scott Lahteine	0b4f65dca8	Always limit blink to ~1 second intervals	2016-04-01 17:51:03 -07:00
Scott Lahteine	0d6609c3c5	lcd_goto_menu should set lcdDrawUpdate to 2	2016-04-01 17:07:40 -07:00
Scott Lahteine	af89ccf96a	Use flag to defer lcd return-to-status	2016-04-01 17:07:39 -07:00
Scott Lahteine	641b30217e	Patch prevEncoderPosition compile issue ... Thanks to @jbrazio #3301	2016-04-01 17:07:39 -07:00
Scott Lahteine	92882fcc51	Allow lcd_implementation_drawedit to draw a message	2016-04-01 17:04:33 -07:00
Scott Lahteine	fcedfd6e99	Clean up num2str functions, extend ftostr43	2016-04-01 16:52:59 -07:00
Scott Lahteine	f543aaa54e	Apply standard pin test to buttons ... This is the easiest way to make button pin testing consistent without renaming all the button pins. Just make a macro especially for testing if button pins are set, since they are named consistently in the pins files.	2016-04-01 15:12:12 -07:00
Scott Lahteine	6a4d394fff	Fix pointer-to-string issues with set_home_offsets and _lcd_level_bed_homing	2016-03-30 12:32:25 -07:00
Scott Lahteine	f0b96f5cae	Merge pull request #3276 from thinkyhead/rc_sdprint_and_lcd_sleuth ... Refinements, fixes, reduced stack usage in CardReader	2016-03-29 18:30:18 -07:00
Scott Lahteine	4ed8351e3d	Revert use of enqueue_and_echo_command_now	2016-03-29 16:23:12 -07:00
Scott Lahteine	b60ea95adf	Keep blinking limited to LCD_UPDATE_INTERVAL	2016-03-28 19:41:13 -07:00
Scott Lahteine	8cb04816b5	Apply PID_AUTOTUNE_MENU option to ultralcd.cpp	2016-03-25 19:31:56 -07:00
Edward Patel	14afe1a017	Move to Z=0 for G28 when using Manual Bed Leveling ... copy of 406992f9dd	2016-03-25 04:58:44 -07:00
Edward Patel	c606ed447a	Add "G29 S4" to fine tune Z level for Mesh Bed Leveling. ... Also add mbl.z_offset to the EEPROM, bumping the version to V23.	2016-03-25 04:58:43 -07:00
Scott Lahteine	f394c0639e	Merge pull request #3230 from jbrazio/bugfix/ultra-lcd-warning ... Fix a compiler warning in ultralcd.cpp	2016-03-25 01:14:54 -07:00
Scott Lahteine	0da744b7b0	Further cleanup of comments, partial Doxygen-style ... Following up on #3231	2016-03-25 00:45:56 -07:00
jbrazio	80f221ed11	Fixed: warning: extra tokens at end of #endif directive	2016-03-24 19:33:25 +00:00
jbrazio	5e5d250832	Added gplv3 header to all Marlin files	2016-03-24 18:01:20 +00:00
Scott Lahteine	04fa9d4f47	Make Autotune options into Menu Edit Items	2016-03-24 02:00:08 -07:00
WPBack	e3f583a3be	Fixes for PID AutoTune from menu ... Fixes for #3189 Setting a temp is still missing	2016-03-24 01:47:30 -07:00
WPBack	3b3e8a02b5	Initial implementation of PID Autotune Menu Items ... Adds the parameter U to M303. If U1 is included , it will use the PID-values from the auto-tune.	2016-03-24 01:46:37 -07:00
Scott Lahteine	15fccd43ee	Fix spacing of an #endif	2016-03-20 20:32:55 -07:00
Scott Lahteine	6a3529247f	"Homing" as a translatable string	2016-03-19 04:41:03 -07:00
Scott Lahteine	c97c2dcaf7	Use const parameters instead of static casting ... Alternative fix to #3149	2016-03-19 03:36:53 -07:00
Scott Lahteine	4bbea5124d	Support for multiple PWM fans	2016-03-19 03:10:18 -07:00
Scott Lahteine	4634feaeab	Merge pull request #3012 from thinkyhead/fix_command_injection ... Use a serial line buffer to prevent queue corruption	2016-03-19 01:43:54 -07:00
Scott Lahteine	e5fd43f343	Implement BABYSTEPPING for COREXY and COREXZ	2016-03-18 18:22:53 -07:00
Scott Lahteine	8fe7420310	Use a separate serial line buffer	2016-03-18 16:46:20 -07:00
Scott Lahteine	7d25c107a8	Merge pull request #3149 from esenapaj/patch-1 ... suppress warnings	2016-03-18 15:40:14 -07:00
Scott Lahteine	d56c6af24e	Merge pull request #3114 from thinkyhead/rc_reverse_lcd_menu ... Option to reverse the click-wheel direction in menus	2016-03-18 15:39:29 -07:00
Scott Lahteine	cc291aeb3c	Move definition of "blink" to main ultralcd file	2016-03-17 18:19:05 -07:00
Scott Lahteine	8f24475e02	Simplify limiting encoderLine in END_MENU	2016-03-16 04:05:41 -07:00
Scott Lahteine	fbef2f5b61	Implement reverse menu direction in ultralcd.cpp	2016-03-16 04:03:49 -07:00
Scott Lahteine	6e1bc03d3b	Additional wrapping for #3140	2016-03-15 01:18:58 -07:00
Scott Lahteine	1c384930f3	Merge pull request #3140 from thinkyhead/rc_fix_macro_expansion ... Wrap macros to prevent bad expansions	2016-03-15 00:25:34 -07:00
esenapaj	8de7a6f9b1	suppress warnings	2016-03-15 06:34:02 +09:00
Blue-Marlin	c73f1b2471	Extend stack_overflow_protection for lcd_move_e and _lcd_level_bed ... Extend stack_overflow_protection for lcd_move_e() and _lcd_level_bed() with a refined method of 3050.	2016-03-13 13:59:44 +01:00
Scott Lahteine	f9ded2a7c4	Wrap macros to prevent bad expansions	2016-03-12 22:38:55 -08:00
Scott Lahteine	b45a0c4c60	Fix bugs in edit submenus so they return to origin ... Expected behavior: After editing a value the menu should return to the previous place with the edited item selected. Actual behavior: Either the top (back) item from the previous screen is selected, or the menu jumps up another level. Solution: Pass the correct arguments to `lcd_goto_menu` on click when editing a value.	2016-03-09 21:06:56 -08:00
Scott Lahteine	f18d3f451a	Limit LCD move_to_x/y coordinates for deltas ... Related to MarlinFirmware/MarlinDev#270	2016-03-06 05:52:00 -08:00
Scott Lahteine	ff13070b59	Use _BV macros, patch up others	2016-03-06 05:51:55 -08:00
Scott Lahteine	209f5f21e0	Use macros where possible ... Apply `constrain`, `NOMORE`, `NOLESS` and `CRITICAL_SECTION` macros wherever possible.	2016-03-06 05:51:55 -08:00
Scott Lahteine	3a3d358df9	Fix Printrboard with LCD (redo) ... Based on #2860 - rebased for RCBugFix	2016-03-05 22:13:00 -08:00
Scott Lahteine	eb85342fd9	Merge pull request #2989 from AnHardt/fix2661 ... Pre home display - Stepper release	2016-03-05 21:30:17 -08:00
AnHardt	e736779d7e	blink for char-lcds ... Implement and test blinking for char-lcds # Conflicts: # Marlin/ultralcd_implementation_hitachi_HD44780.h solved	2016-02-28 16:58:19 +01:00
Blue-Marlin	fd9e94e5a4	Fix crashes when the Z axis is moved via LCD ... Fix crashes when the Z axis is moved via LCD by calling `plan_buffer_line` only when there is enough room in the planner buffer, to avoid endless recursion. A brief description about what went wrong is in #1166	2016-02-28 00:59:47 +01:00
esenapaj	4882a7eded	more suitable display format for delta printer	2016-01-29 18:38:25 +09:00
Ruwan J Egoda Gamage	06555febdd	Using SET_INPUT instead of pinMode	2015-12-24 12:12:25 -05:00
Ruwan J Egoda Gamage	a64bcd53e9	reusing millis()	2015-12-13 22:06:03 -05:00
Ruwan J Egoda Gamage	83c4131ba3	Cleaning up, getting rid of the fake encoder count variable.	2015-12-13 15:28:40 -05:00
Ruwan J Egoda Gamage	5eeea2f611	Fixing Rigidbot LCD Panel Support	2015-12-13 15:28:40 -05:00
Scott Lahteine	60d5658da8	Revert nozzle_bed_fan_menu_items ... For some reason that I cannot determine, using a sub-function causes the Tune sub-menu to act strangely, yet replacing the function call with its code content works perfectly.	2015-12-09 20:33:52 -06:00
AnHardt	bb4efcf603	Handle temp callbacks when THERMAL_PROTECTION_HOTENDS is not defined ... by alternate definition for the callback macros	2015-12-01 07:21:52 -06:00
AnHardt	96d0d04b8f	Update LCD buttons less frequently ... Move slow_buttons_update into the LCD_UPDATE_INTERVAL block lcd_implementation_read_slow_buttons() will then be executed ~10 times a second.	2015-11-30 05:44:32 -06:00
AnHardt	c956b52c4a	Babystep Multiplier ... Analog to https://github.com/MarlinFirmware/MarlinDev/pull/250 by @RicardoGA Restore the Babystep Multiplicator functionality and now it's available for X/Y/Z	2015-11-30 05:43:10 -06:00
AnHardt	be7167ed97	Change XY formatting on LCD (PR#2740) ... According to #123 negative values for XY at or below -100 are displaying incorrectly, dropping the first digit. Deltas can easily have XY values in this range. This PR adds a function to display floats/ints formatted like `_123`, `-123`, `_-12`, or `__-1` as appropriate and applies it to the XY coordinates on Hitachi displays. It also moves the Z value to the right to be consistent with the XY formatting.	2015-11-13 06:46:11 -06:00
Scott Lahteine	754b13d8fe	Patch issue #2315	2015-11-12 00:03:22 -06:00
Scott Lahteine	0c7f7ebcfb	Styling adjustments (PR#2668 & PR#2670) ... Keep "astyled" reformatting	2015-10-03 22:02:45 -05:00
Richard Wackerbarth	03f0edb57e	Fix high LCD status screen update frequency (PR#2655)	2015-09-28 11:07:33 -05:00
Scott Lahteine	5d65a36dee	Give lcd_sd_status an UNKNOWN state (PR#180)	2015-09-14 06:32:27 -05:00
Scott Lahteine	7ac7ddbf20	Show nozzles, heaters, and extruders numbered 1-4	2015-09-12 07:40:18 -05:00
Scott Lahteine	5bc480fee8	Fix Move E menu items	2015-09-12 07:33:49 -05:00
Scott Lahteine	fc882c34a3	Init lcd_sd_status as false to force lcd_update test ... Replaces #145 which is way out of date	2015-09-12 07:32:20 -05:00
Scott Lahteine	e27dd5c22d	Conditionalize functions that rely on SDSUPPORT	2015-09-12 07:30:09 -05:00
Scott Lahteine	558665cd90	Constrain Tune > Nozzle/Flow menu items	2015-09-10 08:47:11 -05:00
Scott Lahteine	f7f6b5faae	Fix lcd_move_e compile error (PR#143) ... Fix a compile error introduced in #98	2015-09-07 09:36:05 -05:00
Scott Lahteine	2b30e8ac99	Conditionals for ULTIPANEL without SDSUPPORT	2015-09-06 02:04:49 -05:00
Eric Kuzmenko	b23d765991	Added Extrude From Multiple Extruders from LCD feature	2015-09-05 05:33:18 -05:00
Richard Wackerbarth	6292d9e815	Rename ENABLE_AUTO_BED_LEVELING ... With the introduction of the #if ENABLED(…) reads better than	2015-08-27 20:52:08 -05:00
Scott Lahteine	46453905d6	Apply remaining ENABLED/DISABLED conditionals	2015-08-03 16:04:48 -05:00
Scott Lahteine	270c766de2	SDCARDDETECT -> SD_DETECT, added docs ... - `SD_DETECT_PIN` replaces `SDCARDDETECT` - `SD_DETECT_INVERTED` replaces `SDCARDDETECTINVERTED` - Revise the description of `SD_DETECT_INVERTED` - Add a note about the override of `SD_DETECT_INVERTED` in `Conditionals.h`	2015-08-02 21:59:41 -05:00
Scott Lahteine	8d3b74cc6e	Rename SDCARDDETECT to SDCARDDETECT_PIN ... - Rename the pin so it can be tested with `PIN_EXISTS` - Fix some incorrect tests for `SDCARDDETECT`	2015-08-02 21:34:13 -05:00
Scott Lahteine	94a796c8cc	Rename BEEPER to BEEPER_PIN ... For consistency with other pins, allowing use of `PIN_EXISTS` macro.	2015-07-31 17:13:53 -05:00
Scott Lahteine	0d8989fc14	Overridable Options - Part 7 (PR#2559) ... Apply `ENABLED` / `DISABLED` macros to LCD-related files.	2015-07-31 01:04:37 -05:00
Scott Lahteine	c66955aaf9	Mark unchanging arrays as const (PR#2494) ... The compiler may be able to optimize if it knows an array won’t be changing.	2015-07-22 21:37:37 -05:00
Scott Lahteine	69b0490b77	Show minimal preheat options in menus (PR#2471)	2015-07-19 16:14:59 -05:00
AnHardt	722829b058	Move buzzing code to buzzr.h & buzzer.cpp (PR#2307) ... at least the lcd independent part from Marlin_main.cpp.	2015-06-22 22:31:48 -04:00
Scott Lahteine	a274769f4f	Clean up spacing and comments ... Also clean up some trailing spaces in a few other sources	2015-06-15 20:20:31 -05:00
AnHardt	6ab7b560af	Rework buzzing (PR#2296) ... by: Moving HAS_LCD_BUZZ macro to Coditionals.h Renaming HAS_LCD_BUZZ to HAS_BUZZER to make clear is has nothing to do with the lcd. Removing the ULTRALCD condition. Moving declaration of lcd_buzz() out of the ULTRA_LCD block in ultralcd.h Moving definition of lcd_buzz() out of the ULTIPANEL block in ultralcd.cpp Renaming lcd_buzz() to buzz() to make clear is has nothing to do with the lcd. All buzzing code is now only dependent on the existence of a BEEPER-pin or the definition of a LCD_USE_I2C_BUZZER. To do: Check the conditions for the BEEPER-pin in all pin-files.	2015-06-15 06:13:26 -05:00
Scott Lahteine	90f858aa85	Use translated strings for axis movement (PR#2280) ... Suggest we use the translated strings here. They use (except for German) the phrasing “Move X” instead of just the axis letter, but they should fit the available space. The “Extruder” string would be the same, except it will be translated.	2015-06-14 08:16:00 -05:00
wurstnase	e7e964432b	consistency name for multiplier ... replace extruder_multiply with extruder_multiplier like feedrate_multiplier or volumetric_multiplier	2015-06-01 22:33:22 +02:00
AnHardt	f18f689c01	Replace MSG_F? with MSG_N? ... To avoid double definitions. I prefer to read N for Number not for Nozzle.	2015-05-28 20:30:23 +02:00
AnHardt	bc0764894a	Shift call of start_watching_heater() into setTargetHotend() ... to warrant watching is set or reset. Make setTargetBed() in _lcd_preheat() dependant of TEMP_SENSOR_BED. Use disable_all_heaters() in lcd_cooldown() and abort_on_endstop_hit.	2015-05-21 20:36:11 +02:00
Ed Boston	ca8d1756d5	Define fixes ... Fixed a couple defines that were not changed or commented out.	2015-05-18 14:23:31 -07:00
Ed Boston	a83bf18ee1	More functional seperation ... Moved SDCARDDETECTINVERTED and SDSLOW to Conditionals.h. Added U8GLIB_LM6059_AF to define display specific actions. Added reminder to compile in u8glib	2015-05-18 05:37:46 -07:00
Ed Boston	047e688e93	Changed ADAFRUIT_ST7565 to ELB_FULL_GRAPHIC_CONTROLLER ... Rename of define to avoid confusion between the controller and the display which had similar names.	2015-05-17 15:23:17 -07:00
Ed Boston	41f8cdb3a6	ADAFRUIT_ST7565 ... Added support for new display type	2015-05-17 12:47:41 -07:00
Scott Lahteine	fcfd99c1ae	Add comments to lcd_control_temperature_menu	2015-05-12 18:46:16 -07:00
Scott Lahteine	9b3d4380d3	Only watch the heater that was set	2015-05-10 20:26:45 -07:00
Scott Lahteine	54deb9eea3	Enable WATCH_TEMP_PERIOD by default	2015-05-08 22:36:02 -07:00
brupje	8f8bf3a897	Make Marlin actually compile when #define REPRAPWORLD_KEYPAD is uncommented	2015-05-05 11:03:20 +02:00
Scott Lahteine	d4c74b8f8c	Don't apply M428 if an error occurs ... - Also move audio feedback into the command - Added shorthand for `lcd_buzz` availability	2015-04-29 19:05:48 -07:00
Scott Lahteine	d065d37822	Add M428 to set home_offset logically	2015-04-29 18:26:16 -07:00
Scott Lahteine	0f687b5dda	Merge branch 'Development' into eeprom_in_gcode ... Latest upstream commits	2015-04-27 21:47:47 -07:00
Scott Lahteine	5b248757c7	Level Bed in Prepare submenu ... - Add “Level Bed” menu item for auto bed leveling - Hide the option if homing has not been done yet - Arrange the Prepare submenu more logically (?) - Add documentation comments, some white-space - Apply some coding standards here and there - Move old encoder multiplier debug option to `ultralcd.cpp`	2015-04-27 19:11:25 -07:00
Scott Lahteine	0fca084ea6	Make EEPROM reproducible in GCode ... With these changes the output of `M503 S0` is all you need to restore the EEPROM. Building on this it is straightforward to save and restore the EEPROM state using the SD card or external GCode file. - Added `M145` to set “heatup states” for the LCD menu - Added `M420` to toggle Mesh Bed Leveling - Added `M421` to set a single Mesh coordinate - Extended `Config_PrintSettings` with added M codes - Cleaned up some comments here and there	2015-04-26 20:56:33 -07:00
Scott Lahteine	a22a228bcc	Rename files to move them in the IDE	2015-04-25 21:04:54 -07:00
Scott Lahteine	a932e7490f	No noTone needed, but delay is	2015-04-25 03:25:30 -07:00
Scott Lahteine	9c5d14ea68	Fix BEEPER duration	2015-04-25 03:12:49 -07:00
Scott Lahteine	c92b59952a	Use millis_t for progress_bar_ms and expire_status_ms	2015-04-24 22:16:09 -07:00
Scott Lahteine	97dfa0365d	Rename expireStatusMillis to expire_status_ms	2015-04-24 21:51:10 -07:00
Scott Lahteine	ce142afdda	G4 shows status message only if no message is set already ... - Address issue raised in #1961	2015-04-24 20:13:01 -07:00
Scott Lahteine	2558c10c6c	Use the slower feedrate for XY axes	2015-04-23 20:06:17 -07:00
Scott Lahteine	31932912dd	Use AxisEnum instead of int for _lcd_move	2015-04-23 19:32:37 -07:00
Scott Lahteine	c3560e0288	Include axis parameter to ultralcd's line_to_current	2015-04-23 19:10:09 -07:00
Scott Lahteine	3b97a7d446	Merge pull request #1944 from AnHardt/beep2 ... More Beeper clean up	2015-04-23 17:50:02 -07:00
AnHardt	f2c94b3298	tone will end automaticly	2015-04-22 01:49:55 +02:00
AnHardt	064f2b37d0	More Beeper clean up. ... Centralised beep code to lcd_buzz(). From gcode_M300() and lcd_quick_feedback(). Enforced max. duration for M300 to 5 seconds. Corrected description in 'Configuration.h' LCD_FEEDBACK_FREQUENCY_HZ 0 gives now a silent delay of LCD_FEEDBACK_FREQUENCY_DURATION_MS.	2015-04-20 11:11:13 +02:00
Scott Lahteine	09d60e0128	Naming and code comments	2015-04-13 17:17:36 -07:00
Scott Lahteine	ccddc280be	Apply three more commits	2015-04-12 22:47:44 -07:00
Scott Lahteine	055b11814a	Additional cleanup of ultralcd.cpp	2015-04-11 04:56:08 -07:00
Scott Lahteine	388dd0cfa5	Fix doubled lcd_quick_feedback ... - MENU_ITEM causes lcd_quick_feedback to be called, so only those calls to `lcd_goto_menu` outside of the `MENU_ITEM` macro need to set the `feedback` flag when calling `lcd_goto_menu`.	2015-04-11 04:45:04 -07:00
Scott Lahteine	740152ee70	Merge branch 'Development' into cold_extrude ... Latest upstream commits	2015-04-09 20:23:47 -07:00
Scott Lahteine	5914d9d7de	Shuffling declarations..	2015-04-09 20:21:30 -07:00
Scott Lahteine	b328c6e6b6	Shuffling declarations.	2015-04-09 20:05:10 -07:00
Scott Lahteine	fb4cefc91d	Define lcd_move_[xyz] ahead of lcd_move_menu_axis	2015-04-09 19:33:16 -07:00
Scott Lahteine	9189cc66ab	Fix moves for DELTA for MANUAL_BED_LEVELING ... - Use `line_to_current` in place of `plan_buffer_line`	2015-04-09 04:32:14 -07:00
AnHardt	df50523605	Made encoderPosition and quick_feedback dependant on NEWPANEL ... where the hardware is available. Fix for #1873	2015-04-09 12:26:45 +02:00
AnHardt	bcc04192fc	Remove Contrast Menu for U8GLIB_ST7920 ... The other two devices we use in u8glib have more than only dummy code. Checked this in the library code.	2015-04-08 12:56:38 +02:00
Scott Lahteine	7431ef7e2d	Merge branch 'Development' into dev_version ... Latest upstream commits	2015-04-07 21:14:00 -07:00
Scott Lahteine	43773ff735	Formatting and lcd contrast masking	2015-04-07 21:11:03 -07:00
Scott Lahteine	cf9b58452c	Minimum delay in menu click feedback ... Squished #1849	2015-04-07 20:20:30 -07:00
Edward Patel	002340f32c	Merge branch 'Development-Marlin' into Development	2015-04-07 22:49:12 +02:00
AnHardt	ac843fbf3b	Fix lcd_status_message ... Because we now can use utf8 with up to 3 bytes per symbol, lcd_status_message[] must be 3*LCD_WIDTH wide. Filling up the message, or cutting to length, are fixed to. Fix for #1832 about at the end.	2015-04-07 02:33:34 +02:00
Edward Patel	0e6514e7bd	Bug fix! Missed putting z value back in right slot after zigzag mod.	2015-04-05 04:13:34 +02:00
Edward Patel	ea10601406	Merge branch 'Development-Marlin' into Development ... Conflicts: Marlin/Configuration.h Marlin/Marlin_main.cpp	2015-04-05 04:06:02 +02:00
AnHardt	340d165a9c	Reduce display updates for dogm displays ... In 'if (encoderPastThreshold || LCD_CLICKED)' lcdDrawUpdate was not set. 'lcd_status_update_delay'-loop was not effective in function lcd_status_screen(). The loop prevented the update of the status screen but not the displays update. Shifted the loop into lcd_update().	2015-04-04 22:02:24 +02:00
AnHardt	418d22d7b3	Revert "Testloop cleanup" ... This reverts commit 6361404b91.	2015-04-04 18:33:36 +02:00
AnHardt	6361404b91	Testloop cleanup ... Shifted condition should still be in.	2015-04-04 17:56:13 +02:00
AnHardt	6d4b3f0d6a	Move the condition before the loop ... Result see: https://youtu.be/AEnBzdu9_tk Dot is moving not so fast -> less executed loops.	2015-04-04 17:49:39 +02:00
AnHardt	4cb7dfc546	Move the 'alive dot' in every displayloop ... Result see: https://www.youtube.com/watch?v=tdu7J0i-c4g Loop is executed several times per display update.	2015-04-04 17:34:28 +02:00
Scott Lahteine	61f8394361	Compare indices instead of floats for probe actions	2015-04-04 05:01:16 -07:00
Edward Patel	6b91b7b411	Mesh bed leveling: Added G29 S3 + finer steps in manual probing. ... * Use "G29 S3 Xn Yn Zn.nn" to modify bad probed point manually * Changed manual Z steps from 0.05 to 0.025 and made brought it to Configuration.h	2015-04-01 21:18:51 +02:00
AnHardt	19b11dfdd7	Fix can't enter MENU_MULTIPLIER_ITEM	2015-03-31 18:29:16 +02:00
Scott Lahteine	571652c49b	Fix LCD click ... - Make the default LCD click sound more pleasant - Fix warnings about bed temperature runaway	2015-03-31 01:41:24 -07:00
Scott Lahteine	a117b6bff6	Merge pull request #1747 from thinkyhead/progress_bar_tweak ... Fix up LCD_PROGRESS_BAR	2015-03-30 23:37:28 -07:00
Scott Lahteine	5519882eea	Fix up LCD_PROGRESS_BAR ... - Some messages should not expire with `PROGRESS_MSG_EXPIRE`. - Simplify conditional for progress bar with sanity checks. - Rename `messageTick` to `expireStatusMillis` and make it the expire time.	2015-03-30 18:00:54 -07:00
Scott Lahteine	8c136a5ab5	Conditionals and comments for PS = 0	2015-03-30 16:50:05 -07:00
Scott Lahteine	2faed961ce	Allow POWER_SUPPLY 0 for no power switch	2015-03-30 16:39:47 -07:00
AnHardt	50a732360a	Replace extrudemultiply by extruder_multiply[active_extruder] ... Fix for #1460. Seems to work with only one extruder. Can't test this myself with more.	2015-03-30 13:35:03 +02:00
Scott Lahteine	ba871e46bf	Fix compiler warnings ... - Patched up for most included configurations	2015-03-27 20:29:05 -07:00
Scott Lahteine	bc2f249cc6	Merge pull request #1622 from AnHardt/tm-utf-minus-kanji ... The big Language Pack	2015-03-27 18:24:19 -07:00
Scott Lahteine	abfcbd793f	Merge pull request #1693 from chris-bo/rework_lcd_beeper ... use only one implementation for beeper feedback	2015-03-27 17:03:38 -07:00
Scott Lahteine	78090275a9	Fix probe range editing ... - Increase the probe offset range to -20…20 - Apply the range limits to the menu item	2015-03-26 13:52:48 -07:00
AnHardt	20f909567a	Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji ... Conflicts: README.md Solved	2015-03-26 10:05:00 +01:00
Christian Bohn	eab5fad539	code formatting	2015-03-26 09:00:34 +01:00
Christian Bohn	4c3cbc0961	use only one implementation for beeper feedback	2015-03-25 12:23:50 +01:00
AnHardt	8848b7e9ef	Add the missed {} to END_MENU in ultralcd.cpp ... what caused an extra update of encoderLine most of the time.	2015-03-25 09:48:21 +01:00
AnHardt	9d589cbb2a	Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji ... Conflicts: Marlin/example_configurations/delta/generic/Configuration.h Marlin/example_configurations/delta/kossel_mini/Configuration.h Marlin/language.h Conflicts solved	2015-03-24 16:59:15 +01:00
Scott Lahteine	0d81abe1c9	Merge branch 'Development' into config_testing ... Latest upstream commits	2015-03-23 21:13:04 -07:00
nicolas-rambaud	37cde8a191	Report changes from previous PR from old code base including : ... I've updated the minimum values from the LCD. It has been a while that i want to at least fix this. I have an inductive probe and often i need to set my zOffset to something lower than 0.5. With the current implementation, the default LCD value is set to 0.5 for some reason. On my case i need to be able to set it down to 0.0 as my inductive probe can be lower than 0.5. Before with the LCD we couldn't change this value below 0.5. We had to flash the firmware every time which was painful. Now we are able to change this value down to 0.0 if needed. I've also changed the minimum value for Z min acceleration. In the default configuration it's set to 25 but on the LCD the minimum was 100 which is not coherent. I've changes the minimum to 10. On this axis, depending on the mechanics/motor drivers we might require very low acceleration, so i guess 10 is somehow realistic.	2015-03-23 12:29:12 +01:00
Scott Lahteine	4fbb80567e	Get upstream commits	2015-03-22 23:07:22 -07:00
Scott Lahteine	691e753cc3	Don't add home offsets in G29 ... - Address #1262 by leaving values as set - Rename `add_homing` to `home_offset`	2015-03-21 16:30:02 -07:00
Scott Lahteine	15eb5d35a2	Merge branch 'Development' into config_testing ... Latest upstream commits	2015-03-21 15:42:45 -07:00
Scott Lahteine	63abeaff38	Merge branch 'Development' into config_testing ... Latest upstream commits	2015-03-21 15:03:06 -07:00
Edward Patel	c516747847	Merge branch 'Development' into manual-bed-leveling+mesh-bed-level	2015-03-21 14:49:52 +01:00
AnHardt	64e3d33893	Fix shrinked menucode ... by updating 'encoderPosition' in END_MENU() line 1.	2015-03-20 23:36:14 +01:00
AnHardt	6bfccaf99e	Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji ... Conflicts: Marlin/dogm_lcd_implementation.h Marlin/ultralcd_implementation_hitachi_HD44780.h Fixed conflicts 1	2015-03-20 13:08:18 +01:00
Scott Lahteine	b6d381f863	Divide up Conditionals to get LCD items early	2015-03-20 02:50:28 -07:00
Scott Lahteine	670006b919	Remove invariant code from Configurations ... - Add `Conditionals.h` with calculated configuration values - Add `SanityCheck.h` with checks for configuration errors - Remove equivalent code from all configurations - Move error checks from some sources to `SanityCheck.h` also - Fix initialization of count_direction in stepper.cpp	2015-03-19 22:22:23 -07:00
Edward Patel	a61f679568	Merge branch 'Development' into manual-bed-leveling+mesh-bed-level	2015-03-20 02:28:35 +01:00
Scott Lahteine	a547dc2148	Merge branch 'Development' into optimize_menu_code ... Get upstream changes	2015-03-19 13:31:37 -07:00
alexborro	e650d4044e	Fix "Stop Print" function in the LCD menu ... When one hit "Stop Print" option in LCD menu, the command buffer was not cleared. The printer keep moving until the buffer has been emptied. Actually I could not clear the command buffer as well.. I don't know why, it doesnt work as expected. I need to implement a routine inside Stepper ISR to handle such situation.	2015-03-19 14:16:18 -03:00
AnHardt	e917477fec	Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji ... Conflicts: Marlin/dogm_lcd_implementation.h Marlin/fonts/make_fonts.bat Claerd conflicts with my own #1621. (His was easy. :-) ) corrected typo in fonts/README.fonts Applied changes to the new delta-configurations and deletet there some extra whitespace at the line-endings.	2015-03-19 12:35:43 +01:00
Scott Lahteine	4ce79920e5	Merge pull request #1635 from AnHardt/warnings1 ... Negative times are unlikly	2015-03-18 19:10:12 -07:00
Scott Lahteine	be3f2dc1d9	Merge pull request #1636 from AnHardt/warning2 ... lcd_control_retract_menu() is conditional.	2015-03-18 19:09:05 -07:00
AnHardt	5099b86ad4	lcd_autostart_sd() has two conditions. ... got: ultralcd.cpp:408: warning: 'void lcd_autostart_sd()' defined but not used	2015-03-18 10:51:13 +01:00
AnHardt	5d81c779cc	lcd_control_retract_menu() is conditional. ... Got: ultralcd.cpp:64: warning: 'void lcd_control_retract_menu()' declared 'static' but never defined	2015-03-18 10:39:59 +01:00
AnHardt	450b89e63c	Negative times are unlikly ... While bunting an other bug I stumbled across: ultralcd.cpp:1250: warning: comparison between signed and unsigned integer expressions Changed to the type of lcd_next_update_millis.	2015-03-18 10:31:34 +01:00
AnHardt	00b162a993	Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji ... Conflicts: Marlin/language.h Conflict cleaned	2015-03-16 17:13:49 +01:00
Scott Lahteine	3405f85a6a	Reduce size of menu code ... - Get rid of _selected functions, passing selected state instead	2015-03-15 22:02:33 -07:00
Edward Patel	8005d22c81	Added menu option for bed leveling.	2015-03-15 23:24:32 +01:00
Scott Lahteine	c37f7d15c9	- Rename WRITE_E_STEP for consistency ... - Add BIT and TEST macros - Add _APPLY_ macros to stepper.cpp to help with consolidation - Consolidate code in stepper.cpp using macros - Apply standards in stepper.cpp - Use >= 0 instead of > -1 as a better semantic - Replace DUAL_Y_CARRIAGE with Y_DUAL_STEPPER_DRIVERS	2015-03-14 04:28:22 -07:00
alexborro	9157cbd8f3	Add Travel Acceleration and change the M204 options ... Added option to set Travel Acceleration (non printing moves). The M204 options was a non sense (S for printing moves and T for retract moves). It has been changed to: P = Printing moves R = Retract only (no X, Y, Z) moves T = Travel (non printing) moves I will add this info o G-Code wiki in reprap.org. I also advise to put this info in Marlin next version changelog.	2015-03-11 13:19:02 -03:00
AnHardt	6fc2ccd568	Make use of new remenbering fontswitch.	2015-03-10 18:04:03 +01:00
Scott Lahteine	f379edca78	Cleanup rotary encoder encrot* defines ... The encrot values are used in only one place, and don’t vary, so remove redundant references.	2015-03-02 06:42:48 -08:00
Scott Lahteine	2af559cca3	Shared function for menu_edit_* and menu_edit_callback_*	2015-02-23 20:31:28 -08:00
Scott Lahteine	517f411999	Spacing adjustment to menu_edit* macro	2015-02-23 20:11:52 -08:00
Scott Lahteine	4938ae5caf	Add required backslash for macro expansion	2015-02-23 20:10:49 -08:00
Scott Lahteine	e182cdebf9	Add required backslash for macro expansion	2015-02-23 19:54:07 -08:00
Scott Lahteine	fa4c36df68	Fix menu callback issue wrt LCD_CLICKED	2015-02-23 19:40:57 -08:00
Scott Lahteine	3ba47ea277	Remove test/demo multi=line code menu items	2015-02-22 10:10:37 -08:00
Scott Lahteine	40ef472a25	Merge in encoder multiplier	2015-02-21 20:18:49 -08:00
Scott Lahteine	1c13cd604b	Formatting in babysteps defines	2015-02-21 18:45:10 -08:00
Scott Lahteine	3a26804d80	Adapt to latest PID code and fix typos	2015-02-21 18:41:04 -08:00
Scott Lahteine	422582da71	Prep formatting for upcoming PR	2015-02-21 18:24:16 -08:00
Scott Lahteine	0d6a7a2df0	Merge with latest upstream changes	2015-02-21 18:13:31 -08:00
Scott Lahteine	57bc28b42c	Cleanup and fix ultralcd.cpp ... - Fix bug in lcd_control_temperature_menu - Remove test menu-item left in from multi-line command feature - Replace literals with translatable strings - Reduce lcd_preheat code redundancy - Reduce menu macro redundancy - Clean up formatting	2015-02-21 17:38:56 -08:00
Scott Lahteine	4fcd4b444e	Merge pull request #1519 from thinkyhead/fix_recent_issues ... Fix implementation of PID menu items	2015-02-21 16:43:11 -08:00
Scott Lahteine	430c4b6538	Replace missing backslash	2015-02-20 02:17:16 -08:00
Scott Lahteine	a8939eec28	Readability of MENU_MULTIPLIER_ITEM ... Last commit before bed.	2015-02-20 02:08:41 -08:00
Scott Lahteine	09e09b308e	Tweaky spacing adjustments	2015-02-20 01:22:56 -08:00
Scott Lahteine	c610471b0c	Add PID_PARAMS_PER_EXTRUDER conditional	2015-02-20 00:00:19 -08:00
Scott Lahteine	2d6fa9ce80	Proper implementation of PID menu items ... - Make this work per #1344	2015-02-19 23:54:06 -08:00
wgm4321	b8e79dce89	Fix compilation errors when encoder multiplier is disabled	2015-02-19 21:51:23 -05:00
wgm4321	65e1fc71be	Add encoder rate multiplier	2015-02-19 21:42:57 -05:00
AnHardt	6cdcd6c6d1	Fix iss#1492 ... Introduced lcd_strlen() and lcd_strlen_P(). Replaced the old functions where necessary. Reworked language_ru.h. Speeded up test for zero length string in cardreader.cpp	2015-02-16 13:53:58 +01:00
Jérémie FRANCOIS	9d75a56b56	Merge remote-tracking branch 'upstream/Development' into Development ... Conflicts: Marlin/Configuration.h Marlin/Marlin_main.cpp	2015-02-11 06:38:36 +01:00
Jérémie FRANCOIS	85e5aa4011	Generalized enqueue_commands_P, and moved them to Marlin_main as they should	2015-02-07 23:24:20 +01:00
AnHardt	b1dbd765c6	Centralise definition of fonts for DOGM displays ... Prework for issue #1448 and #1447 Will merge in when pull request #1457 is in.	2015-02-03 13:10:09 +01:00
Christian Lefrançois	33408a4dfc	Update ultralcd.cpp ... Fix number of nozzle displayed in temperature menu.	2015-01-30 11:16:13 -05:00
Scott Lahteine	34377ee512	Merge pull request #1427 from thinkyhead/fewer_preheat_strings ... Remove language strings that only add a number	2015-01-27 22:10:08 -08:00
Scott Lahteine	5fbef6bed2	Merge pull request #1409 from thinkyhead/rename_lastnr ... Rename lastnr to autostart_index and...	2015-01-27 22:07:23 -08:00
Scott Lahteine	53eea611b8	Fix MSG_NOZZLE	2015-01-27 22:00:32 -08:00
Scott Lahteine	c90f2e77d8	Remove language strings that only add a number ... This won’t reduce the string storage in the end, but it makes the language files smaller. Also removed remaining unused strings.	2015-01-27 21:36:58 -08:00
Jérémie FRANCOIS	dd301be52d	Added suport for multiline G-code commands in the LCD menus	2015-01-26 18:50:29 +01:00
Scott Lahteine	03c9cb60e8	Rename lastnr to autostart_index and... ... Replace instances of the number 13 with FILENAME_LENGTH where appropriate.	2015-01-24 04:57:44 -08:00
MagoKimbra	986e723eeb	Add 4th extruder	2015-01-24 13:37:58 +01:00
grob6000	bf2c923db5	Make multiple PID parameters a config option ... * Adds config parameter `PID_PARAMS_PER_EXTRUDER` - allows single PID parameters to be used where this would be preferable (e.g. dual identical extruders) * When disabled, will use `float Kp, Ki, Kd, Kc;` as before. Preprocessor macros used to switch between. * ultralcd.cpp defines extra menus for extra parameters only where required * M301 reports `e:xx` only if independent pid parameters enabled * EEPROM structure still leaves space for 3 extruders worth, when undef will save single parameter to all extruder positions, but only read the first * Switching off saves approx 330 B with no LCD enabled, 2634B with LCD (RRD) enabled: this is significant. * LCD modifications should be tested.	2015-01-11 13:50:17 +11:00
grob6000	0877aa0fe0	Merge remote-tracking branch 'upstream/Development' into independent_pid	2015-01-11 11:32:58 +11:00
grob6000	7d32c7f36d	Multiple PID parameter edit for ultralcd ... * Depending on extruder count, will add menu items for ultralcd to edit individual PID parameters for each extruder * Added menu items to each language_xx.h * Builds OK, but recommend testing with typical LCD	2015-01-11 01:14:02 +11:00
Scott Lahteine	326b925557	DOGLCD and LCD_PROGRESS_BAR to coexist ... Small changes (and formatting to confuse the diff’er) which first allows DOGLCD and LCD_PROGRESS_BAR to be enabled in tandem, then a #warning (rather than error) that the extra progress bar / message options don’t apply to graphical displays at this time. This leaves open perhaps combining the progress bar and message area in some future (or forked custom) graphical LCD display arrangement (at which time the relevant variables may be moved into ultralcd.cpp with externs in ultralcd.h). I also added a conditional error that the progress bar and the filament display may not work well together.	2015-01-09 18:16:56 -08:00
wgm4321	067b509479	Re-enable filament menu with recalc fix when enabling/disabling mm3	2015-01-05 22:29:29 -05:00
wgm4321	a19f2f8ae7	Disable volumetric menu item due to missing recalc of of multipliers when enabled/disabled	2015-01-04 22:15:16 -05:00
wgm4321	f24dda9700	Revert "Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3" ... This reverts commit dd7e4ee97f.	2015-01-04 22:08:41 -05:00
wgm4321	ec4681ab6b	Revert "Add "Detailed Z Probe" menu item with ABL is defined." ... This reverts commit 2b9722f387.	2015-01-04 21:53:37 -05:00
wgm4321	dd7e4ee97f	Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3	2015-01-04 21:44:55 -05:00
wgm4321	2b9722f387	Add "Detailed Z Probe" menu item with ABL is defined.	2015-01-04 21:42:16 -05:00
Bo Herrmannsen	a18b625534	Merge pull request #1261 from wgm4321/Development ... Add Filament menu and add Filament/Retract settings to config store.	2015-01-02 15:35:29 +01:00
Scott Lahteine	e7db8ee9e5	ftostr32np > ftostr32sp ... sp=space-padded, similar to: ns=no-sign	2014-12-30 07:26:25 -08:00
Scott Lahteine	10e1b6ef8b	Least stack-usage self-contained ftostr32np() ... This is the optimal code for a self-contained formatter, although the original code is crafty in being smaller and simpler, and can be evaluated as using the original output as a scratch pad for state, making the final formatter more straightforward. While this code is longer, all code-paths are minimal.	2014-12-30 07:26:25 -08:00
Scott Lahteine	d1f21d1189	As it should be	2014-12-30 07:26:25 -08:00
Scott Lahteine	449dad71f2	Least stack-usage self-contained ftostr32np() ... This is the optimal code for a self-contained formatter, although the original code is crafty in being smaller and simpler, and can be evaluated as using the original output as a scratch pad for state, making the final formatter more straightforward. While this code is longer, all code-paths are minimal.	2014-12-30 07:26:24 -08:00
Scott Lahteine	a2109cb492	Patch to make Z look more like X and Y on UltraLCD	2014-12-30 07:26:24 -08:00
Caleb Anderson	cb047e9070	Actual menu change. Moved menu logic to not be shown unless not currently printing. (untested but straight-forward, printer in a bad state currently)	2014-12-29 10:19:25 -07:00
wgm4321	cb12161191	Add Filament menu and add Filament/Retract settings to config store.	2014-12-28 20:43:14 -05:00
fmalpartida	ec33df0554	Merge branch 'SAV-MkI_merge' into Development ... Tested for SAV MKI and SAV 3D LCD on lewihe.	2014-12-28 19:54:06 +01:00
Bo Herrmannsen	c9f60183a9	Merge pull request #1233 from NarimaanV/Development ... Fixed BABYSTEPPING feature	2014-12-28 10:13:21 +01:00
Scott Lahteine	2f467e2797	LCD Progress Bar	2014-12-27 22:26:14 -08:00
NarimaanV	7667949aca	Fixed BABYSTEPPING feature ... Moved PSTR() macro to correct place which was causing the " initializer fails to determine size of '__c' " when attempting to compile with BABYSTEPPING enabled.	2014-12-23 12:49:54 -05:00
daid	17de96ace7	Merge branch 'Marlin_v1' into revert-1154-sd_sorting ... Conflicts: Marlin/cardreader.cpp Marlin/cardreader.h	2014-12-18 23:13:50 +01:00
Bo Herrmannsen	a9c334e8bc	Merge pull request #1191 from thinkyhead/code_shrink ... Shrink and Optimize	2014-12-18 17:23:11 +01:00
Scott Lahteine	1857e611d3	Other small tweaks	2014-12-18 07:49:16 -08:00
Scott Lahteine	63e1665fa9	Reduce ultralcd.cpp redundancies	2014-12-18 07:30:05 -08:00
Scott Lahteine	e4b98011cf	And one more...	2014-12-17 23:01:24 -08:00
Bo Herrmannsen	31ca3de72f	Merge pull request #819 from neildarlow/Marlin_v1 ... Activate LiquidTWI2 device detection and space-pad LCD status line.	2014-12-17 21:42:53 +01:00
Bo Herrmannsen	e83cfc0a62	Merge pull request #1163 from thinkyhead/lcd_abort_message ... LCD "Abort" Message	2014-12-17 21:30:19 +01:00
Bo Herrmannsen	0b310ab6c5	Merge pull request #1153 from xinfab/negative_values_in_menu ... Negative values in menu	2014-12-17 20:58:01 +01:00
Bo Herrmannsen	91d740e128	Merge pull request #1141 from filipmu/Filament-Sensor ... Display filament sensor data on a 20x4 LCD or Graphical LCD	2014-12-17 20:38:30 +01:00
alexborro	ab355a90d3	Revert "SD Sort and Buffer"	2014-12-17 14:50:59 -02:00