3079 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Scott Lahteine	0970102950	Remove obsolete STRING_URL	2015-04-27 21:59:14 -07:00
Scott Lahteine	28aef684b4	Merge pull request #1957 from Voxel8/sjk/home_y_before_x ... Allow Y to home before X with option in Configuration_adv.h.	2015-04-27 21:41:14 -07:00
Scott Lahteine	c1dd9bda7f	Merge pull request #1987 from thinkyhead/fix_homing_zpos ... Disable endstops between homing bumps	2015-04-27 21:16:47 -07:00
Scott Lahteine	71a0b1a5bb	Disable endstops between homing bumps	2015-04-27 21:14:30 -07:00
Scott Lahteine	8c28e36e75	Merge pull request #1986 from thinkyhead/fix_homing_zpos ... Fix homing Z position	2015-04-27 20:58:14 -07:00
Scott Lahteine	c36226c4dc	Fix homing Z position ... Add `sync_plan_position()` after `axis_is_at_home(axis)` to keep the planner position in sync when homing.	2015-04-27 20:55:19 -07:00
Scott Lahteine	2bc1d70a31	Merge pull request #1977 from AnHardt/Cinese2 ... We mark this historic day, when Marlin went to China.	2015-04-27 20:37:00 -07:00
Scott Lahteine	ed988e39a8	Merge pull request #1984 from thinkyhead/leveling_menu_items ... Level Bed in Prepare submenu	2015-04-27 19:32:59 -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
Steve Kelly	98ca46006c	Allow Y to home before X with option in Configuration_adv.h. ... This addresses comments in #1956 and #1079. In particular, this is useful when both endstops are stationary on a CoreXY system, and the Y axis needs to be homed before the X so the flags are aligned.	2015-04-27 16:17:30 -04:00
AnHardt	6cba6bcd82	Add 'cn' to the other 'Configuration.h's	2015-04-27 13:24:51 +02:00
AnHardt	1d9699be0f	Add some doku	2015-04-27 13:16:20 +02:00
AnHardt	76b12edecf	Give TALL_FONT_CORRECTION a default	2015-04-27 12:47:11 +02:00
AnHardt	6b1b71837c	Intit. commit for Chinese ... Edited the European part of 'ISO10646_CN.fon' to match the existing fonts. Added Chinese font to make_fonts.bat Created 'dogm_font_data_ISO10646_CN.h' Added Chinese to 'language.h' Added 'language_cn.h' with some minor edits. Added Chinese font in 'language_en.h' to not fall back to European font. Added cn to 'Configuration.h' Changed WIDTH to LCD_PIXEL_WIDTH and HEIGHT to LCD_PIXEL_HEIGHT to have more descriptive names. In 'dogm_lcd_implementation.h' Added Chinese Font Made 1 pixel more room for the larger Chinese font on the status line. Changed geometry of the 'select bar' by one pixel. Changed the way the position for values and postcars are set.	2015-04-27 12:15:36 +02:00
Scott Lahteine	01bedd17c9	Merge pull request #1973 from thinkyhead/m111_debug_level ... M111 - Debug Level	2015-04-26 20:39:56 -07:00
Scott Lahteine	d43cc2dd5f	M111 - Debug Level ... - Add `M111` as a standard option to set the debug level - Implement `DEBUG_ECHO` in `process_commands` - Other debug levels (e.g., `DEBUG_DRYRUN`) need more work	2015-04-26 20:08:45 -07:00
Scott Lahteine	1f530beaf1	Merge pull request #1970 from thinkyhead/rename_files ... Rename files to move them in the IDE	2015-04-26 15:15:51 -07:00
Scott Lahteine	0ec444720f	Rename blinkm files	2015-04-25 21:06:19 -07:00
Scott Lahteine	a22a228bcc	Rename files to move them in the IDE	2015-04-25 21:04:54 -07:00
Scott Lahteine	ac9ca64c50	Merge pull request #1969 from thinkyhead/buzz_duration ... Fix BEEPER duration	2015-04-25 03:26:28 -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	b3436c875a	Merge pull request #1968 from thinkyhead/more_disable_warning ... Add a warning for DISABLE_[XYZ] options	2015-04-25 00:47:42 -07:00
Scott Lahteine	5c29fda167	Add a warning for DISABLE_[XYZ] options	2015-04-25 00:46:33 -07:00
Scott Lahteine	0438f0d835	Merge pull request #1924 from thinkyhead/raise_z_for_m401_m402 ... Raise Z for M401 and M402	2015-04-24 22:41:12 -07:00
Scott Lahteine	a640cad139	Merge pull request #1967 from thinkyhead/g4_dwell_message ... Use millis_t for progress_bar_ms and expire_status_ms	2015-04-24 22:17:28 -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	b275946a52	Merge pull request #1966 from thinkyhead/g4_dwell_message ... G4 shows status message only if no message is set already	2015-04-24 22:02:37 -07:00
Scott Lahteine	97dfa0365d	Rename expireStatusMillis to expire_status_ms	2015-04-24 21:51:10 -07:00
Scott Lahteine	7295640f44	Remove extraneous ;	2015-04-24 21:37:27 -07:00
Scott Lahteine	0d8c00d3f6	Define lcd_hasstatus for no lcd also	2015-04-24 21:36:04 -07:00
Scott Lahteine	777ca11760	Merge pull request #1925 from thinkyhead/move_zoffset ... Apply zprobe_zoffset in axis_is_at_home	2015-04-24 21:29:07 -07:00
Scott Lahteine	182f2cda35	Minor cleanup of M48	2015-04-24 21:26:36 -07:00
Scott Lahteine	3a6fd912cd	Latest upstream commits, merged	2015-04-24 21:14:13 -07:00
Scott Lahteine	3c9e94e035	Merge pull request #1964 from AnHardt/Max6675again ... Add variant for MAX6675 in M104	2015-04-24 20:44:45 -07:00
Scott Lahteine	56ff46eb8b	Improve code_has_value test	2015-04-24 20:43:16 -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	c5a1b227a4	Merge pull request #1965 from thinkyhead/g28_xyz_are_flags ... Remove set-coordinate extension of G28	2015-04-24 19:34:38 -07:00
Scott Lahteine	35e79d56a5	Remove set-coordinate extension of G28	2015-04-24 19:23:12 -07:00
Scott Lahteine	3a74bb5039	Merge pull request #1945 from Wurstnase/max_endstopp ... Max endstopp	2015-04-24 19:17:38 -07:00
Scott Lahteine	2606d1d892	Merge pull request #1960 from Wurstnase/macro_steppercpp ... Macro steppercpp	2015-04-24 18:45:19 -07:00
AnHardt	0fed46360c	Add variant for MAX6675 in M104 ... Else will throw error: @:0 B@:0 Error:No thermistors - no temperature [ERROR] Error:No thermistors - no temperature when no bed is defined	2015-04-24 16:43:19 +02:00
Wurstnase	79a44a9de3	stepper.cpp macros rework ... delete some tabs	2015-04-24 08:03:17 +02:00
Scott Lahteine	588ed70d4a	Latest upstream commits, merged	2015-04-23 21:18:48 -07:00
Scott Lahteine	7fb8d9fe05	Merge remote-tracking branch 'origin/move_zoffset' into move_zoffset	2015-04-23 21:12:53 -07:00
Scott Lahteine	0165560333	Apply zprobe_zoffset in axis_is_at_home ... Ensure the probe offset will always be included when homing Z.	2015-04-23 21:12:38 -07:00
Scott Lahteine	075386e7fe	Merge pull request #1959 from thinkyhead/lcd_move_rate ... Include axis parameter to ultralcd's line_to_current	2015-04-23 21:06:57 -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	c2e11daf66	Merge pull request #1958 from thinkyhead/redo_1937 ... Fix homing of YZ with DUAL_X_CARRIAGE	2015-04-23 19:12:51 -07:00