melch
/
Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,857 Commits
2 Branches
0 Tags
2.0 GiB
x301
2.0.x
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'ed7a2f9fac'
${ noResults }
Commit Graph

2857 Commits (ed7a2f9face6f8e467f380a2f6dbf6c5cfe2875f)
 

Author SHA1 Message Date
Scott Lahteine 92b54aa27e #define HAS_POWER_SWITCH 10 years ago
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.
 10 years ago
Scott Lahteine 6864280803 Use elif and parentheses in conditionals 10 years ago
Scott Lahteine 8c136a5ab5 Conditionals and comments for PS = 0 10 years ago
Scott Lahteine 2faed961ce Allow POWER_SUPPLY 0 for no power switch 10 years ago
Scott Lahteine baa6787393 Merge pull request #1740 from thinkyhead/fixup_homing 
Apply leveling for DELTA
 10 years ago
Scott Lahteine 346c07cc1a Merge pull request #1743 from AnHardt/extrudemultiply 
Replace extrudemultiply by extruder_multiply[active_extruder]
 10 years ago
AnHardt 9ac7dc675e Make filament display on dogm_... same as hitachi... 
Thanks @MagoKimbra.
 10 years ago
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.
 10 years ago
Scott Lahteine e63076504d Merge pull request #1733 from AnHardt/c20 
Get back folder symbols on Hitachi displays
 10 years ago
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.
 10 years ago
croadfeldt 06f767d608 Merge remote-tracking branch 'upstream/development' into development 10 years ago
Scott Lahteine b47fa8c064 Merge pull request #1735 from AnHardt/compilerCandy 
Remove some further warnings
 10 years ago
Scott Lahteine e96db1cd6c Make G29 shared function inline 10 years ago
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
 10 years ago
Scott Lahteine 85b67e5223 Merge pull request #1738 from thinkyhead/fixup_homing 
Fix G29 E and M48 n
 10 years ago
Scott Lahteine ce44bee28b Small code reduction 10 years ago
Scott Lahteine 0213f7f016 Cleanup case for M666 10 years ago
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
 10 years ago
Scott Lahteine 1e9999711c Merge pull request #1736 from thinkyhead/fixup_homing 
Fix G28 homing Y with X
 10 years ago
Scott Lahteine d738b7acdd Merge pull request #1724 from Natealus/Development 
Viki 2 Pins from Manual and Azteeg X3 Pro Endstop Reswap
 10 years ago
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
 10 years ago
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.
 10 years ago
AnHardt 507efa771b Remove unused variable fan_rot 
and satisfy the compiler about the implicit compare.
 10 years ago
AnHardt 2b959a7752 Some additional {} to make the compiler happy. 10 years ago
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.
 10 years ago
AnHardt 81bab8739d Get back folder symbols on Hitachi displays 
and make use of column 20.
 10 years ago
Chris Roadfeldt a9802c95b3 Ensure Z_PROBE_PIN is defined if Z_PROBE_AND_ENDSTOP is. 10 years ago
Chris Roadfeldt 62834a1c43 Don't deploy probe on Z Axis homing if Z_PROBE_AND_ENDSTOP is enabled, 
unless Z_SAFE_HOMING is.
 10 years ago
Chris Roadfeldt 666fad3494 Typo fixed in sanity check. 10 years ago
Chris Roadfeldt 08a7aa16c5 Don't deploy Z Probe on Z homing if Z_PROBE_AND_ENDSTOP is defined. 10 years ago
Chris Roadfeldt 80285251cc More config cleanup work for Z_PROBE_AND_ENDSTOP. 10 years ago
Chris Roadfeldt fe4549cd83 Config file Z_PROBE_AND_ENDSTOP description clean up. 10 years ago
Chris Roadfeldt 82d2f11129 More additional sanity checks for Z_PROBE_AND_ENDSTOP 10 years ago
Chris Roadfeldt 05134f0807 Additional Sanity Checks for Z_PROBE_AND_ENDSTOP 10 years ago
Chris Roadfeldt c75a5e8c55 Fixed typo for Z_PROBE_AND_ENDSTOP support in pins_RAMPS.h. 
Confirmed Sanity checks are working.....
 10 years ago
Chris Roadfeldt a98ac4033b Added Z_PROBE_PIN to #define for Z_PROBE_AND_ENDSTOP support. 10 years ago
Chris Roadfeldt 6125124d6c Config file cleanup for Z_PROBE_AND_ENDSTOP support. 10 years ago
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
 10 years ago
Natealus ca5821aa57 Made #ifdef DELTA branch instead 
Another fellow here gave me the idea to do it this way
 10 years ago
Natealus 04fda6b3e9 Undesired behavior with endstops swapped 
Made my swap commented out so its the option not the default.
 10 years ago
Natealus ca1477d830 Revert "Undesired behavior with endstops swapped" 
This reverts commit 15028e9b08.
 10 years ago
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.
 10 years ago
Nate Stokes 18245c6cd2 Update pins_RAMBO.h 
Updated for the changes that Thinkyhead made before I submitted mine.
 10 years ago
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. :)
 10 years ago
Scott Lahteine a22efc5f11 Merge pull request #1597 from Wurstnase/g29_auto_script 
G29 auto script
 10 years ago
Scott Lahteine 62a3da9618 Merge pull request #1723 from thinkyhead/tweak_g92 
Tweak G92
 10 years ago
Scott Lahteine cc7a081cae Merge pull request #1722 from Natealus/Development 
Azteeg X3 Pro Pin Revisions
 10 years ago
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
 10 years ago
Scott Lahteine 2b0c25a091 Tweak G92 to call plan_set_position only once, yes? 10 years ago