Commit Graph

2188 Commits

Author SHA1 Message Date
Chris Roadfeldt
3be00cce6f Merge remote-tracking branch 'MarlinFirmware/Development' into Development
Conflicts:
	Marlin/Configuration.h
2015-03-30 23:59:01 -05:00
Chris Roadfeldt
e08f8eed05 Revert 06f767d..cba5692
This rolls back to commit 06f767d608.
2015-03-30 23:51:36 -05:00
Scott Lahteine
5e82ed4f30 Restore ENDSTOPPULLUPS in Configuration.h 2015-03-30 21:15:16 -07:00
Chris Roadfeldt
cba5692673 Merge remote-tracking branch 'MarlinFirmware/Development' into Development
Conflicts:
	Marlin/Marlin_main.cpp
	Marlin/stepper.cpp
2015-03-30 22:33:05 -05:00
Scott Lahteine
92b54aa27e #define HAS_POWER_SWITCH 2015-03-30 19:44:53 -07:00
Scott Lahteine
6864280803 Use elif and parentheses in conditionals 2015-03-30 16:52:27 -07:00
Scott Lahteine
8c136a5ab5 Conditionals and comments for PS = 0 2015-03-30 16:50:05 -07:00
Scott Lahteine
2faed961ce Allow POWER_SUPPLY 0 for no power switch 2015-03-30 16:39:47 -07:00
Scott Lahteine
baa6787393 Merge pull request #1740 from thinkyhead/fixup_homing
Apply leveling for DELTA
2015-03-30 15:45:33 -07:00
AnHardt
9ac7dc675e Make filament display on dogm_... same as hitachi...
Thanks @MagoKimbra.
2015-03-30 16:56:21 +02:00
AnHardt
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.
2015-03-30 13:35:03 +02:00
Scott Lahteine
e63076504d Merge pull request #1733 from AnHardt/c20
Get back folder symbols on Hitachi displays
2015-03-30 01:57:00 -07:00
Scott Lahteine
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.
2015-03-30 00:45:02 -07:00
croadfeldt
06f767d608 Merge remote-tracking branch 'upstream/development' into development 2015-03-30 02:10:49 -05:00
Scott Lahteine
b47fa8c064 Merge pull request #1735 from AnHardt/compilerCandy
Remove some further warnings
2015-03-29 23:55:19 -07:00
Scott Lahteine
e96db1cd6c Make G29 shared function inline 2015-03-29 23:21:39 -07:00
Scott Lahteine
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
2015-03-29 23:16:12 -07:00
Scott Lahteine
85b67e5223 Merge pull request #1738 from thinkyhead/fixup_homing
Fix G29 E and M48 n
2015-03-29 20:08:19 -07:00
Scott Lahteine
ce44bee28b Small code reduction 2015-03-29 19:45:14 -07:00
Scott Lahteine
0213f7f016 Cleanup case for M666 2015-03-29 19:39:43 -07:00
Scott Lahteine
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
2015-03-29 18:56:09 -07:00
Scott Lahteine
1e9999711c Merge pull request #1736 from thinkyhead/fixup_homing
Fix G28 homing Y with X
2015-03-29 18:27:17 -07:00
Scott Lahteine
d738b7acdd Merge pull request #1724 from Natealus/Development
Viki 2 Pins from Manual and Azteeg X3 Pro Endstop Reswap
2015-03-29 18:26:32 -07:00
Scott Lahteine
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
2015-03-29 18:06:59 -07:00
AnHardt
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.
2015-03-30 01:58:46 +02:00
AnHardt
507efa771b Remove unused variable fan_rot
and satisfy the compiler about the implicit compare.
2015-03-30 01:46:38 +02:00
AnHardt
2b959a7752 Some additional {} to make the compiler happy. 2015-03-30 01:42:35 +02:00
AnHardt
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.
2015-03-30 01:40:58 +02:00
AnHardt
81bab8739d Get back folder symbols on Hitachi displays
and make use of column 20.
2015-03-29 17:29:48 +02:00
Chris Roadfeldt
a9802c95b3 Ensure Z_PROBE_PIN is defined if Z_PROBE_AND_ENDSTOP is. 2015-03-29 04:18:37 -05:00
Chris Roadfeldt
62834a1c43 Don't deploy probe on Z Axis homing if Z_PROBE_AND_ENDSTOP is enabled,
unless Z_SAFE_HOMING is.
2015-03-29 03:55:41 -05:00
Chris Roadfeldt
666fad3494 Typo fixed in sanity check. 2015-03-29 03:25:03 -05:00
Chris Roadfeldt
08a7aa16c5 Don't deploy Z Probe on Z homing if Z_PROBE_AND_ENDSTOP is defined. 2015-03-29 03:21:48 -05:00
Chris Roadfeldt
80285251cc More config cleanup work for Z_PROBE_AND_ENDSTOP. 2015-03-29 03:06:20 -05:00
Chris Roadfeldt
fe4549cd83 Config file Z_PROBE_AND_ENDSTOP description clean up. 2015-03-29 03:04:59 -05:00
Chris Roadfeldt
82d2f11129 More additional sanity checks for Z_PROBE_AND_ENDSTOP 2015-03-29 02:53:55 -05:00
Chris Roadfeldt
05134f0807 Additional Sanity Checks for Z_PROBE_AND_ENDSTOP 2015-03-29 02:51:51 -05:00
Chris Roadfeldt
c75a5e8c55 Fixed typo for Z_PROBE_AND_ENDSTOP support in pins_RAMPS.h.
Confirmed Sanity checks are working.....
2015-03-29 02:38:08 -05:00
Chris Roadfeldt
a98ac4033b Added Z_PROBE_PIN to #define for Z_PROBE_AND_ENDSTOP support. 2015-03-29 02:36:26 -05:00
Chris Roadfeldt
6125124d6c Config file cleanup for Z_PROBE_AND_ENDSTOP support. 2015-03-29 02:29:16 -05:00
Chris Roadfeldt
324c14943b Bug fixes for Z_PROBE_AND_ENDSTOP.
Code cleanup for Z_PROBE_AND_ENDSTOP.
Added Z_PROBE_PIN to pins_RAMPS_13.h
2015-03-29 02:16:09 -05:00
Natealus
ca5821aa57 Made #ifdef DELTA branch instead
Another fellow here gave me the idea to do it this way
2015-03-29 01:08:00 -06:00
Natealus
04fda6b3e9 Undesired behavior with endstops swapped
Made my swap commented out so its the option not the default.
2015-03-29 00:55:47 -06:00
Natealus
ca1477d830 Revert "Undesired behavior with endstops swapped"
This reverts commit 15028e9b08.
2015-03-29 00:52:53 -06:00
Natealus
15028e9b08 Undesired behavior with endstops swapped
I made my changes to swap MIN and MAX endstops on the Azteeg X3 Pro the
option rather than the default to fix unexpected reversal.
2015-03-29 00:42:40 -06:00
Nate Stokes
18245c6cd2 Update pins_RAMBO.h
Updated for the changes that Thinkyhead made before I submitted mine.
2015-03-28 22:29:54 -06:00
Natealus
234a9d0b12 Viki 2 Pins from Manual
I added in the pins into the new board files for the Azteeg X3, X3 Pro,
Printrboard, and Rambo. I'm sure it can be added for others too but
these are the manual specified pins. Just like many things here though,
I can't test for the boards other than the Azteeg X3 Pro. Hopefully it
works smoothly for everyone who happens on this nifty display. :)
2015-03-28 22:11:12 -06:00
Scott Lahteine
a22efc5f11 Merge pull request #1597 from Wurstnase/g29_auto_script
G29 auto script
2015-03-28 20:54:17 -07:00
Scott Lahteine
62a3da9618 Merge pull request #1723 from thinkyhead/tweak_g92
Tweak G92
2015-03-28 20:53:37 -07:00
Scott Lahteine
afff968e88 ARRAY_BY_EXTRUDERS, shorthand to sync planner
- Add some documentation to planner and stepper headers
- Patch up RAMBO pins with undefs
- Add `sync_plan_position` inline to set current XYZE
- Swap indices in `extruder_offset` to fix initialization values
2015-03-28 20:33:21 -07:00