CONSULitAS
d1c1f766d5
Merge remote-tracking branch 'upstream/Development' into K8200_2015-04-23_TEST
...
Conflicts:
Marlin/example_configurations/K8200/Configuration.h
10 years ago
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.
10 years ago
AnHardt
6cba6bcd82
Add 'cn' to the other 'Configuration.h's
10 years ago
AnHardt
1d9699be0f
Add some doku
10 years ago
AnHardt
76b12edecf
Give TALL_FONT_CORRECTION a default
10 years ago
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.
10 years ago
Scott Lahteine
fb379384ee
Reduce MBL eeprom read code
10 years ago
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
10 years ago
Scott Lahteine
01bedd17c9
Merge pull request #1973 from thinkyhead/m111_debug_level
...
M111 - Debug Level
10 years ago
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
10 years ago
Scott Lahteine
1f530beaf1
Merge pull request #1970 from thinkyhead/rename_files
...
Rename files to move them in the IDE
10 years ago
Scott Lahteine
0ec444720f
Rename blinkm files
10 years ago
Scott Lahteine
a22a228bcc
Rename files to move them in the IDE
10 years ago
Scott Lahteine
ac9ca64c50
Merge pull request #1969 from thinkyhead/buzz_duration
...
Fix BEEPER duration
10 years ago
Scott Lahteine
a932e7490f
No noTone needed, but delay is
10 years ago
Scott Lahteine
9c5d14ea68
Fix BEEPER duration
10 years ago
Scott Lahteine
b3436c875a
Merge pull request #1968 from thinkyhead/more_disable_warning
...
Add a warning for DISABLE_[XYZ] options
10 years ago
Scott Lahteine
5c29fda167
Add a warning for DISABLE_[XYZ] options
10 years ago
Scott Lahteine
0438f0d835
Merge pull request #1924 from thinkyhead/raise_z_for_m401_m402
...
Raise Z for M401 and M402
10 years ago
Scott Lahteine
a640cad139
Merge pull request #1967 from thinkyhead/g4_dwell_message
...
Use millis_t for progress_bar_ms and expire_status_ms
10 years ago
Scott Lahteine
c92b59952a
Use millis_t for progress_bar_ms and expire_status_ms
10 years ago
Scott Lahteine
b275946a52
Merge pull request #1966 from thinkyhead/g4_dwell_message
...
G4 shows status message only if no message is set already
10 years ago
Scott Lahteine
97dfa0365d
Rename expireStatusMillis to expire_status_ms
10 years ago
Scott Lahteine
7295640f44
Remove extraneous ;
10 years ago
Scott Lahteine
0d8c00d3f6
Define lcd_hasstatus for no lcd also
10 years ago
Scott Lahteine
777ca11760
Merge pull request #1925 from thinkyhead/move_zoffset
...
Apply zprobe_zoffset in axis_is_at_home
10 years ago
Scott Lahteine
182f2cda35
Minor cleanup of M48
10 years ago
Scott Lahteine
3a6fd912cd
Latest upstream commits, merged
10 years ago
Scott Lahteine
3c9e94e035
Merge pull request #1964 from AnHardt/Max6675again
...
Add variant for MAX6675 in M104
10 years ago
Scott Lahteine
56ff46eb8b
Improve code_has_value test
10 years ago
Scott Lahteine
ce142afdda
G4 shows status message only if no message is set already
...
- Address issue raised in #1961
10 years ago
Scott Lahteine
c5a1b227a4
Merge pull request #1965 from thinkyhead/g28_xyz_are_flags
...
Remove set-coordinate extension of G28
10 years ago
Scott Lahteine
35e79d56a5
Remove set-coordinate extension of G28
10 years ago
Scott Lahteine
3a74bb5039
Merge pull request #1945 from Wurstnase/max_endstopp
...
Max endstopp
10 years ago
Scott Lahteine
2606d1d892
Merge pull request #1960 from Wurstnase/macro_steppercpp
...
Macro steppercpp
10 years ago
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
10 years ago
Wurstnase
79a44a9de3
stepper.cpp macros rework
...
delete some tabs
10 years ago
Scott Lahteine
588ed70d4a
Latest upstream commits, merged
10 years ago
Scott Lahteine
7fb8d9fe05
Merge remote-tracking branch 'origin/move_zoffset' into move_zoffset
10 years ago
Scott Lahteine
0165560333
Apply zprobe_zoffset in axis_is_at_home
...
Ensure the probe offset will always be included when homing Z.
10 years ago
Scott Lahteine
075386e7fe
Merge pull request #1959 from thinkyhead/lcd_move_rate
...
Include axis parameter to ultralcd's line_to_current
10 years ago
Scott Lahteine
2558c10c6c
Use the slower feedrate for XY axes
10 years ago
Scott Lahteine
31932912dd
Use AxisEnum instead of int for _lcd_move
10 years ago
Scott Lahteine
c2e11daf66
Merge pull request #1958 from thinkyhead/redo_1937
...
Fix homing of YZ with DUAL_X_CARRIAGE
10 years ago
Scott Lahteine
c3560e0288
Include axis parameter to ultralcd's line_to_current
10 years ago
Scott Lahteine
a0a5ff61c4
Merge pull request #1951 from AnHardt/Azteeg_x3
...
Fix for #1946
10 years ago
Scott Lahteine
0094481e55
Merge pull request #1955 from AnHardt/langlang
...
Add DISPLAY_CHARSET_HD44780_CYRILLIC as alternative in SanityCheck.h
10 years ago
Scott Lahteine
64268f3312
Fixup axis_is_at_home a little
10 years ago
Scott Lahteine
996d0a9185
Squish the code down a little
10 years ago
Scott Lahteine
8534bc376c
Fix homing of YZ with DUAL_X_CARRIAGE
10 years ago