SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2712 commits 1 branch 0 tags 119 MiB
Commit graph

2183 commits

Author SHA1 Message Date
Scott Lahteine
18bb6be80e Fix homing and leveling 
- Include the current Z when raising the axis after and between probing
- Add `sync_plan_position_delta` for parity with `sync_plan_position`
- Clean up and clarify `M48`, `dock_sled`, and others
 2015-03-31 18:52:19 -07:00
Scott Lahteine
97a69d9b1c Correct XYZ after obtaining plan_bed_level_matrix 
The current position needs to be updated by using the inverse
`plan_bed_level_matrix` on X, Y, and Z. All moves in the planner are
transformed by the `plan_bed_level_matrix` from this point forward.
 2015-03-31 04:24:13 -07:00
Scott Lahteine
5f6962dd90 Merge pull request #1755 from thinkyhead/fixup_config 
Raise when not retracting
 2015-03-31 03:47:01 -07:00
Scott Lahteine
ae89ccd2c7 Use Z_RAISE_BETWEEN_PROBINGS 2015-03-31 03:45:21 -07:00
Scott Lahteine
9a5a7a3f68 Raise when not retracting 
Code to raise the probe before retraction is good, but the code should
always raise the probe, not just when retracting
 2015-03-31 03:38:03 -07:00
Scott Lahteine
6ff1620fcb Merge pull request #1753 from thinkyhead/fix_extruder_offset 
Fix EXTRUDER_OFFSET compiler error
 2015-03-31 03:21:45 -07:00
Scott Lahteine
cda4bd4ad9 Correct the comment about M206 2015-03-31 03:20:15 -07:00
Scott Lahteine
935592cf6a offsets off by default 2015-03-31 02:50:52 -07:00
Scott Lahteine
2a45922afe Restore extruder_offset, init more simply 2015-03-31 02:49:47 -07:00
Scott Lahteine
28792e5731 Fix typo in assignment 2015-03-31 02:10:49 -07:00
Scott Lahteine
bb6174524f Fix EXTRUDER_OFFSET compiler error 
- Addressing issue #1741
 2015-03-31 02:08:57 -07:00
Scott Lahteine
571652c49b Fix LCD click 
- Make the default LCD click sound more pleasant
- Fix warnings about bed temperature runaway
 2015-03-31 01:41:24 -07:00
Scott Lahteine
21ab44cfa7 Merge pull request #1750 from thinkyhead/fixup_config 
Bring all configs up to date
 2015-03-30 23:49:04 -07:00
Scott Lahteine
50145266cd Merge pull request #1748 from thinkyhead/raise_before_homing 
Apply Z_RAISE_BEFORE_HOMING before homing XY
 2015-03-30 23:37:41 -07:00
Scott Lahteine
a117b6bff6 Merge pull request #1747 from thinkyhead/progress_bar_tweak 
Fix up LCD_PROGRESS_BAR
 2015-03-30 23:37:28 -07:00
Scott Lahteine
3348b3bf0c Allow SD_FINISHED_RELEASECOMMAND to be undefined 2015-03-30 23:31:48 -07:00
Scott Lahteine
82794fa5f7 Add delta generic not renaming 2015-03-30 23:25:04 -07:00
Scott Lahteine
ba2c7cb467 Update configs with all the latest 2015-03-30 23:24:33 -07:00
Scott Lahteine
5e82ed4f30 Restore ENDSTOPPULLUPS in Configuration.h 2015-03-30 21:15:16 -07:00
Scott Lahteine
8500c80b33 Apply Z_RAISE_BEFORE_HOMING before homing XY 2015-03-30 20:22:21 -07:00
Scott Lahteine
92b54aa27e #define HAS_POWER_SWITCH 2015-03-30 19:44:53 -07:00
Scott Lahteine
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.
 2015-03-30 18:00:54 -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
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
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