db4d8e835c
Merge pull request #1752 from thinkyhead/fix_lcd_click
...
Fix LCD click
10 years ago
935592cf6a
offsets off by default
10 years ago
2a45922afe
Restore extruder_offset, init more simply
10 years ago
28792e5731
Fix typo in assignment
10 years ago
bb6174524f
Fix EXTRUDER_OFFSET compiler error
...
- Addressing issue #1741
10 years ago
571652c49b
Fix LCD click
...
- Make the default LCD click sound more pleasant
- Fix warnings about bed temperature runaway
10 years ago
45ece5afb1
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
10 years ago
17707e7479
Fixed Z_PROBE_PIN pullup bug.
...
Documented some additional areas that should be addressed if Z_PROBE is
fully separated from Z_MIN or Z_MAX.
Fixed a documentation error in sanity checks. Servos start at 0 not 1.
10 years ago
21ab44cfa7
Merge pull request #1750 from thinkyhead/fixup_config
...
Bring all configs up to date
10 years ago
50145266cd
Merge pull request #1748 from thinkyhead/raise_before_homing
...
Apply Z_RAISE_BEFORE_HOMING before homing XY
10 years ago
a117b6bff6
Merge pull request #1747 from thinkyhead/progress_bar_tweak
...
Fix up LCD_PROGRESS_BAR
10 years ago
3348b3bf0c
Allow SD_FINISHED_RELEASECOMMAND to be undefined
10 years ago
82794fa5f7
Add delta generic not renaming
10 years ago
ba2c7cb467
Update configs with all the latest
10 years ago
ec1d9c0b8f
Use Z_PROBE_ENDSTOP_INVERTING when checking pin status.
10 years ago
3175c70c79
Manually synching back up with MarlinFirmware/Development.
10 years ago
faac2af4af
Merge remote-tracking branch 'origin/Development' into Development
10 years ago
3be00cce6f
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Configuration.h
10 years ago
e08f8eed05
Revert 06f767d..cba5692
...
This rolls back to commit 06f767d608
10 years ago
2e7a4bd7db
Merge pull request #1749 from thinkyhead/fixup_config
...
Restore ENDSTOPPULLUPS in Configuration.h
10 years ago
5e82ed4f30
Restore ENDSTOPPULLUPS in Configuration.h
10 years ago
b8973051c3
Merge pull request #1746 from thinkyhead/power_supply
...
Allow POWER_SUPPLY to be 0
10 years ago
992b07ca57
Don't disable Z_RAISE_BEFORE_HOMING when Z_PROBE_AND_ENDSTOP is enabled.
10 years ago
cba5692673
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Marlin_main.cpp
Marlin/stepper.cpp
10 years ago
8500c80b33
Apply Z_RAISE_BEFORE_HOMING before homing XY
10 years ago
92b54aa27e
#define HAS_POWER_SWITCH
10 years ago
5519882eea
Fix up LCD_PROGRESS_BAR
...
- Some messages should not expire with `PROGRESS_MSG_EXPIRE`.
- Simplify conditional for progress bar with sanity checks.
- Rename `messageTick` to `expireStatusMillis` and make it the expire
time.
10 years ago
6864280803
Use elif and parentheses in conditionals
10 years ago
8c136a5ab5
Conditionals and comments for PS = 0
10 years ago
2faed961ce
Allow POWER_SUPPLY 0 for no power switch
10 years ago
baa6787393
Merge pull request #1740 from thinkyhead/fixup_homing
...
Apply leveling for DELTA
10 years ago
346c07cc1a
Merge pull request #1743 from AnHardt/extrudemultiply
...
Replace extrudemultiply by extruder_multiply[active_extruder]
10 years ago
9ac7dc675e
Make filament display on dogm_... same as hitachi...
...
Thanks @MagoKimbra.
10 years ago
50a732360a
Replace extrudemultiply by extruder_multiply[active_extruder]
...
Fix for #1460 .
Seems to work with only one extruder. Can't test this myself with more.
10 years ago
e63076504d
Merge pull request #1733 from AnHardt/c20
...
Get back folder symbols on Hitachi displays
10 years ago
41d258697a
Pass the z for after probing to retract_z_probe
...
A `z_before` value is passed to probe_pt, but the `retract_z_probe`
function assumes that Z is 0, doesn’t add `current_position[Z_AXIS]` as
other cases do. This may be superfluous, so this is a test, and will be
reverted if it has no effect.
10 years ago
06f767d608
Merge remote-tracking branch 'upstream/development' into development
10 years ago
b47fa8c064
Merge pull request #1735 from AnHardt/compilerCandy
...
Remove some further warnings
10 years ago
e96db1cd6c
Make G29 shared function inline
10 years ago
d73b169de3
Apply leveling for DELTA,
...
- Fix `prepare_move` function not calling `adjust_delta`
- Add more shorthand for plan_buffer_line.
- Fix wrong `federate` usage, assuming they are all mm/m
- Minor `stepper.cpp` cleanup
10 years ago
85b67e5223
Merge pull request #1738 from thinkyhead/fixup_homing
...
Fix G29 E and M48 n
10 years ago
ce44bee28b
Small code reduction
10 years ago
0213f7f016
Cleanup case for M666
10 years ago
803425e12c
Fix G29 E and M48 n
...
- Users prefer `G29 E` to work like `M48 E` so fixed that
- `M48 n` replaced with `M48 P` (or `p`). `n` legacy support
- Shorten some strings to save precious bytes
- Smaller code for 3-point probing
10 years ago
1e9999711c
Merge pull request #1736 from thinkyhead/fixup_homing
...
Fix G28 homing Y with X
10 years ago
d738b7acdd
Merge pull request #1724 from Natealus/Development
...
Viki 2 Pins from Manual and Azteeg X3 Pro Endstop Reswap
10 years ago
e8ae51bfe3
Fix G28 homing Y with X
...
- Fixed a typo causing G28 to home incorrectly
- Added documentation to G28
- Added homeXYZ bools to neaten the code
- Added a note about home_offsets being questionable
10 years ago
7b2550a604
Times can't be negative.
...
cardreader.cpp needs temperature.h for autotempShutdown() when
AUTOTEMP is defined but warns about unused variables.
Unpublished variables by putting them in to temperature.cpp.
10 years ago
507efa771b
Remove unused variable fan_rot
...
and satisfy the compiler about the implicit compare.
10 years ago
2b959a7752
Some additional {} to make the compiler happy.
10 years ago
Scott Lahteine