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
Scott Lahteine
c3560e0288
Include axis parameter to ultralcd's line_to_current
2015-04-23 19:10:09 -07:00
Scott Lahteine
a0a5ff61c4
Merge pull request #1951 from AnHardt/Azteeg_x3
...
Fix for #1946
2015-04-23 18:40:00 -07:00
Scott Lahteine
0094481e55
Merge pull request #1955 from AnHardt/langlang
...
Add DISPLAY_CHARSET_HD44780_CYRILLIC as alternative in SanityCheck.h
2015-04-23 18:36:06 -07:00
Scott Lahteine
64268f3312
Fixup axis_is_at_home a little
2015-04-23 18:16:44 -07:00
Scott Lahteine
996d0a9185
Squish the code down a little
2015-04-23 18:06:36 -07:00
Scott Lahteine
8534bc376c
Fix homing of YZ with DUAL_X_CARRIAGE
2015-04-23 17:56:37 -07:00
Scott Lahteine
3b97a7d446
Merge pull request #1944 from AnHardt/beep2
...
More Beeper clean up
2015-04-23 17:50:02 -07:00
Scott Lahteine
461aaf2126
Merge pull request #1941 from thinkyhead/gcode_M410
...
Add M410 QuickStop command
2015-04-23 17:30:58 -07:00
Wurstnase
be9e4ceddc
fix typo
...
c'n'p ftw :/
2015-04-23 10:35:14 +02:00
unknown
c26d816839
filter any 0
2015-04-22 12:09:57 +02:00
AnHardt
f2c94b3298
tone will end automaticly
2015-04-22 01:49:55 +02:00
AnHardt
c5e0e29d23
Add DISPLAY_CHARSET_HD44780_CYRILLIC as alternative in SanityCheck.h
...
and add some documentation - how to integrate a new font.
2015-04-21 21:42:00 +02:00
AnHardt
b59e92ab99
Fix for #1946
...
Syntax error.
2015-04-21 13:50:28 +02:00
Wurstnase
61ae43f35e
v <-> code_value
2015-04-20 23:31:10 +02:00
Wurstnase
da0d91a79b
max endstopp
...
no user will home to 0 with a max endstopp
2015-04-20 23:28:46 +02:00
AnHardt
3a27a78f9e
Commented REPRAP_DISCOUNT_SMART_CONTROLLER again
...
and removed some tabs.
2015-04-20 15:01:43 +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
Wurstnase
92575cecca
new timout/add adv_ok
2015-04-20 00:22:40 +02:00
AnHardt
671aaf2dc9
Minor fix for M300
...
Corrected wrong order of parameters.
2015-04-19 13:25:20 +02:00
Scott Lahteine
d931220a65
Tweak comments
2015-04-18 23:12:29 -07:00
Scott Lahteine
47847765e2
Add M410 QuickStop command
2015-04-18 23:07:48 -07:00
Scott Lahteine
a4ca87ba99
Merge pull request #1933 from bq/Fix_stray_in_configuration
...
Fixed compilation error "error: stray ‘\357’ in program"
2015-04-18 03:56:31 -07:00
Scott Lahteine
5e3bb4bdf3
Merge pull request #1931 from paclema/M303_echo
...
Added new PID autotune info, to make easy copy & paste results to marlin
2015-04-18 03:49:31 -07:00
Scott Lahteine
67a4471324
Merge pull request #1926 from nophead/acceleration_fix
...
Fixed jump in speed at high accelerations on axes with lots of steps
2015-04-18 03:09:54 -07:00
Ivan Galvez Junquera
b99e63a7bf
Fixed compilation error "error: stray ‘\357’ in program" in several configuration files.
...
Introduced in commit 697ee2dc
2015-04-17 16:10:58 +02:00
Bo Herrmannsen
2d1e730216
Update README.md
2015-04-17 15:00:21 +02:00
