cfa60bdb97
Merge branch 'Development' into squash_fixups
Conflicts:
Marlin/ultralcd.cpp
9 years ago
ccddc280be
Apply three more commits
9 years ago
666f9cd7b4
Merge pull request #1897 from epatel/Development
Manual bed leveling menu fixes.
9 years ago
e7aae314de
Merge pull request #1896 from thinkyhead/cold_extrude
Homing fixes
9 years ago
74e4b42f7e
Default MACHINE_NAME to "3D Printer"
9 years ago
8857b9e921
Use the extruder argument in plan_buffer_line
9 years ago
a37c7ff16d
Manual bed leveling menu fixes.
lcdDrawUpdate = 2 helped a lot!
9 years ago
ac2b23f574
Homing fixes
- Prevent `Z_SAFE_HOMING` from homing Z twice in some cases
- Allow `G28` with XYZ values of 0 to explicitly set the position
- Don’t add `home_offset` when setting XYZ explicitly in `G28`
- Add `code_has_value` function to check for the presence of a numeric
value (could just test for space or nul to allow other types of values)
9 years ago
b089eb42eb
Merge pull request #1893 from thinkyhead/cold_extrude
Fix doubled lcd_quick_feedback
9 years ago
055b11814a
Additional cleanup of ultralcd.cpp
9 years ago
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`.
9 years ago
f8b4ee079b
Merge pull request #1891 from thinkyhead/cold_extrude
machine name for hephestos too
9 years ago
c6bb98abad
machine name for hephestos too
9 years ago
79a5b14eb7
Merge pull request #1890 from thinkyhead/cold_extrude
Apply CUSTOM_MACHINE_NAME to configs
9 years ago
ccbe2c4ea3
Apply CUSTOM_MACHINE_NAME to configurations
- Replace “Mendel” with “RepRap”
9 years ago
71adb1ee59
Merge branch 'Development' into cold_extrude
Latest upstream commits
9 years ago
f1a03c5447
Merge pull request #1887 from thinkyhead/cold_extrude
Break out prevent_dangerous_extrude feature
9 years ago
5fe382949b
Some G-Codes comment cleanup
9 years ago
8f164f4c83
Clean up M85 in GCodes.md
9 years ago
a327d876fe
Document G92 arguments in GCodes.md
9 years ago
652d59cd80
Spacing of g-codes in GCodes.md
9 years ago
fe912f44dc
Smaller headings
9 years ago
93eb63238f
Move G Codes into categories with M Codes
9 years ago
a3b13eb5ac
Organize M Codes by Category
- In GCodes.md
9 years ago
3105ebc562
Restore M928, M999
9 years ago
01654bdec1
Cleanup formatting of some M codes
9 years ago
907e8e98e5
Add GCodes from Marlin 1.0.3 dev, format as pre
9 years ago
8b16ebe705
Break out prevent_dangerous_extrude feature
- It’s inline here, but could be a macro and duplicated for
`planner.cpp`
9 years ago
67c0e8323e
Merge pull request #1879 from thinkyhead/cold_extrude
Fix moves for DELTA for MANUAL_BED_LEVELING
9 years ago
740152ee70
Merge branch 'Development' into cold_extrude
Latest upstream commits
9 years ago
5914d9d7de
Shuffling declarations..
9 years ago
b328c6e6b6
Shuffling declarations.
9 years ago
fb4cefc91d
Define lcd_move_[xyz] ahead of lcd_move_menu_axis
9 years ago
9189cc66ab
Fix moves for DELTA for MANUAL_BED_LEVELING
- Use `line_to_current` in place of `plan_buffer_line`
9 years ago
7a1aef1450
Merge pull request #1877 from AnHardt/display-only
Made encoderPosition and quick_feedback dependant on NEWPANEL
9 years ago
6096164d79
Merge pull request #1878 from thinkyhead/cold_extrude
Cold extrude
9 years ago
a488445cbe
Fix spelling of "too"
9 years ago
b1950a7f25
Merge pull request #1875 from Natealus/Development
Z Probe inverting not present in example configs, causes error
9 years ago
df50523605
Made encoderPosition and quick_feedback dependant on NEWPANEL
where the hardware is available.
Fix for #1873
9 years ago
dcde09fdff
Merge remote-tracking branch 'upstream/Development' into Development
Latest upstream commits
9 years ago
2ca099d1e7
Merge pull request #1876 from thinkyhead/cold_extrude
Catch dangerous extrude before trying several
9 years ago
837ceb9abb
Merge pull request #1867 from epatel/Development
Added sanity check for MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS
9 years ago
a95544f92a
Spell adjustment
9 years ago
a00ebf03d4
Merge pull request #1868 from AnHardt/LCD_STR
Moved the definitions of the LCD_STR_* to Conditionals.h
9 years ago
7f22464353
Merge remote-tracking branch 'upstream/Development' into Development
Latest upstream commits
9 years ago
1269c445ab
Catch dangerous extrude before trying several
9 years ago
4abd23ae9e
Merge pull request #1866 from AnHardt/contrast
Remove Contrast Menu for device U8GLIB_ST7920
9 years ago
585eee6549
Z Probe inverting not present in example configs, causes error
The line const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to
invert the logic of the endstop is in the main configuration.h but
wasn't present in the example configuration.h's. Causes a compiling
error with Z Probe enabled. Just added it to all the configs. :)
9 years ago
540dbb35e2
And an other MSG_BED in Marlin_main.cpp
9 years ago
14d4419e16
Replaced SERIAL_PROTOCOLPGM(MSG_BED) with SERIAL_PROTOCOLPGM("Bed")
Resolved some warnings in Marlin_main.cpp regarding compares of signed and unsigned integers by replacing 'int' or 'uint16_t' with 'uint8_t'.
9 years ago
Scott Lahteine
Scott Lahteine
Edward Patel
AnHardt
Natealus