Scott Lahteine
c1fbef1722
Merge pull request #1988 from thinkyhead/bye_string_url
Remove obsolete STRING_URL
9 years ago
Scott Lahteine
31516e2a3b
Merge pull request #1985 from Arengorn/Development
Update of servo.h
9 years ago
Scott Lahteine
185f8a0a66
Merge pull request #1917 from CONSULitAS/Development_Update_K8200_Config
Example Configuration for K8200: comments/URL/readme
9 years ago
Scott Lahteine
0970102950
Remove obsolete STRING_URL
9 years ago
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.
9 years ago
Scott Lahteine
c1dd9bda7f
Merge pull request #1987 from thinkyhead/fix_homing_zpos
Disable endstops between homing bumps
9 years ago
Scott Lahteine
71a0b1a5bb
Disable endstops between homing bumps
9 years ago
Scott Lahteine
8c28e36e75
Merge pull request #1986 from thinkyhead/fix_homing_zpos
Fix homing Z position
9 years ago
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.
9 years ago
Scott Lahteine
2bc1d70a31
Merge pull request #1977 from AnHardt/Cinese2
We mark this historic day, when Marlin went to China.
9 years ago
Scott Lahteine
ed988e39a8
Merge pull request #1984 from thinkyhead/leveling_menu_items
Level Bed in Prepare submenu
9 years ago
Bernardo
e449659338
Update Servo.cpp
Updated "servo.h" to "Servo.h"
9 years ago
Bernardo
ff67ee73fc
Update Marlin_main.cpp
Corrected "servo.h" to "Servo.h" because of the updated filename.
9 years ago
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`
9 years ago
CONSULitAS
6af40e9dc0
K8200 example Configuration.h: STRING_URL removed
K8200 example Configuration.h:
* STRING_URL removed: like proposed by thinkyhead in #1917
9 years ago
CONSULitAS
d1c1f766d5
Merge remote-tracking branch 'upstream/Development' into K8200_2015-04-23_TEST
Conflicts:
Marlin/example_configurations/K8200/Configuration.h
9 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.
9 years ago
AnHardt
6cba6bcd82
Add 'cn' to the other 'Configuration.h's
9 years ago
AnHardt
1d9699be0f
Add some doku
9 years ago
AnHardt
76b12edecf
Give TALL_FONT_CORRECTION a default
9 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.
9 years ago
Scott Lahteine
01bedd17c9
Merge pull request #1973 from thinkyhead/m111_debug_level
M111 - Debug Level
9 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
9 years ago
Scott Lahteine
1f530beaf1
Merge pull request #1970 from thinkyhead/rename_files
Rename files to move them in the IDE
9 years ago
Scott Lahteine
0ec444720f
Rename blinkm files
9 years ago
Scott Lahteine
a22a228bcc
Rename files to move them in the IDE
9 years ago
Scott Lahteine
ac9ca64c50
Merge pull request #1969 from thinkyhead/buzz_duration
Fix BEEPER duration
9 years ago
Scott Lahteine
a932e7490f
No noTone needed, but delay is
9 years ago
Scott Lahteine
9c5d14ea68
Fix BEEPER duration
9 years ago
Scott Lahteine
b3436c875a
Merge pull request #1968 from thinkyhead/more_disable_warning
Add a warning for DISABLE_[XYZ] options
9 years ago
Scott Lahteine
5c29fda167
Add a warning for DISABLE_[XYZ] options
9 years ago
Scott Lahteine
0438f0d835
Merge pull request #1924 from thinkyhead/raise_z_for_m401_m402
Raise Z for M401 and M402
9 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
9 years ago
Scott Lahteine
c92b59952a
Use millis_t for progress_bar_ms and expire_status_ms
9 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
9 years ago
Scott Lahteine
97dfa0365d
Rename expireStatusMillis to expire_status_ms
9 years ago
Scott Lahteine
7295640f44
Remove extraneous ;
9 years ago
Scott Lahteine
0d8c00d3f6
Define lcd_hasstatus for no lcd also
9 years ago
Scott Lahteine
777ca11760
Merge pull request #1925 from thinkyhead/move_zoffset
Apply zprobe_zoffset in axis_is_at_home
9 years ago
Scott Lahteine
182f2cda35
Minor cleanup of M48
9 years ago
Scott Lahteine
3a6fd912cd
Latest upstream commits, merged
9 years ago
Scott Lahteine
3c9e94e035
Merge pull request #1964 from AnHardt/Max6675again
Add variant for MAX6675 in M104
9 years ago
Scott Lahteine
56ff46eb8b
Improve code_has_value test
9 years ago
Scott Lahteine
ce142afdda
G4 shows status message only if no message is set already
- Address issue raised in #1961
9 years ago
Scott Lahteine
c5a1b227a4
Merge pull request #1965 from thinkyhead/g28_xyz_are_flags
Remove set-coordinate extension of G28
9 years ago
Scott Lahteine
35e79d56a5
Remove set-coordinate extension of G28
9 years ago
Scott Lahteine
3a74bb5039
Merge pull request #1945 from Wurstnase/max_endstopp
Max endstopp
9 years ago
Scott Lahteine
2606d1d892
Merge pull request #1960 from Wurstnase/macro_steppercpp
Macro steppercpp
9 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
9 years ago
Wurstnase
79a44a9de3
stepper.cpp macros rework
delete some tabs
9 years ago