3348b3bf0c
Allow SD_FINISHED_RELEASECOMMAND to be undefined
11 years ago
82794fa5f7
Add delta generic not renaming
11 years ago
ba2c7cb467
Update configs with all the latest
11 years ago
ec1d9c0b8f
Use Z_PROBE_ENDSTOP_INVERTING when checking pin status.
11 years ago
3175c70c79
Manually synching back up with MarlinFirmware/Development.
11 years ago
faac2af4af
Merge remote-tracking branch 'origin/Development' into Development
11 years ago
3be00cce6f
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Configuration.h
11 years ago
e08f8eed05
Revert 06f767d..cba5692
...
This rolls back to commit 06f767d608
11 years ago
2e7a4bd7db
Merge pull request #1749 from thinkyhead/fixup_config
...
Restore ENDSTOPPULLUPS in Configuration.h
11 years ago
5e82ed4f30
Restore ENDSTOPPULLUPS in Configuration.h
11 years ago
b8973051c3
Merge pull request #1746 from thinkyhead/power_supply
...
Allow POWER_SUPPLY to be 0
11 years ago
992b07ca57
Don't disable Z_RAISE_BEFORE_HOMING when Z_PROBE_AND_ENDSTOP is enabled.
11 years ago
cba5692673
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Marlin_main.cpp
Marlin/stepper.cpp
11 years ago
8500c80b33
Apply Z_RAISE_BEFORE_HOMING before homing XY
11 years ago
92b54aa27e
#define HAS_POWER_SWITCH
11 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.
11 years ago
6864280803
Use elif and parentheses in conditionals
11 years ago
8c136a5ab5
Conditionals and comments for PS = 0
11 years ago
2faed961ce
Allow POWER_SUPPLY 0 for no power switch
11 years ago
baa6787393
Merge pull request #1740 from thinkyhead/fixup_homing
...
Apply leveling for DELTA
11 years ago
346c07cc1a
Merge pull request #1743 from AnHardt/extrudemultiply
...
Replace extrudemultiply by extruder_multiply[active_extruder]
11 years ago
9ac7dc675e
Make filament display on dogm_... same as hitachi...
...
Thanks @MagoKimbra.
11 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.
11 years ago
e63076504d
Merge pull request #1733 from AnHardt/c20
...
Get back folder symbols on Hitachi displays
11 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.
11 years ago
06f767d608
Merge remote-tracking branch 'upstream/development' into development
11 years ago
b47fa8c064
Merge pull request #1735 from AnHardt/compilerCandy
...
Remove some further warnings
11 years ago
e96db1cd6c
Make G29 shared function inline
11 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
11 years ago
85b67e5223
Merge pull request #1738 from thinkyhead/fixup_homing
...
Fix G29 E and M48 n
11 years ago
ce44bee28b
Small code reduction
11 years ago
0213f7f016
Cleanup case for M666
11 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
11 years ago
1e9999711c
Merge pull request #1736 from thinkyhead/fixup_homing
...
Fix G28 homing Y with X
11 years ago
d738b7acdd
Merge pull request #1724 from Natealus/Development
...
Viki 2 Pins from Manual and Azteeg X3 Pro Endstop Reswap
11 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
11 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.
11 years ago
507efa771b
Remove unused variable fan_rot
...
and satisfy the compiler about the implicit compare.
11 years ago
2b959a7752
Some additional {} to make the compiler happy.
11 years ago
0f1bd6e4a7
In ST7920_SWSPI_SND_8BIT(uint8_t val) parameter is unsigned
...
therefor in macro ST7920_WRITE_BYTE(a) cast a to uint8_t
to make the compiler happy.
11 years ago
81bab8739d
Get back folder symbols on Hitachi displays
...
and make use of column 20.
11 years ago
a9802c95b3
Ensure Z_PROBE_PIN is defined if Z_PROBE_AND_ENDSTOP is.
11 years ago
62834a1c43
Don't deploy probe on Z Axis homing if Z_PROBE_AND_ENDSTOP is enabled,
...
unless Z_SAFE_HOMING is.
11 years ago
666fad3494
Typo fixed in sanity check.
11 years ago
08a7aa16c5
Don't deploy Z Probe on Z homing if Z_PROBE_AND_ENDSTOP is defined.
11 years ago
80285251cc
More config cleanup work for Z_PROBE_AND_ENDSTOP.
11 years ago
fe4549cd83
Config file Z_PROBE_AND_ENDSTOP description clean up.
11 years ago
82d2f11129
More additional sanity checks for Z_PROBE_AND_ENDSTOP
11 years ago
05134f0807
Additional Sanity Checks for Z_PROBE_AND_ENDSTOP
11 years ago
c75a5e8c55
Fixed typo for Z_PROBE_AND_ENDSTOP support in pins_RAMPS.h.
...
Confirmed Sanity checks are working.....
11 years ago
Scott Lahteine