758 Commits (b58083b0fa9af218689efcc1b0c042f2acfc8d30)

Author SHA1 Message Date
Wurstnase 92575cecca new timout/add adv_ok 10 years ago
AnHardt 671aaf2dc9 Minor fix for M300
Corrected wrong order of parameters.
10 years ago
Scott Lahteine d931220a65 Tweak comments 10 years ago
Scott Lahteine 47847765e2 Add M410 QuickStop command 10 years ago
Wurstnase b09a957fce make 'wait' optional and mark as workaround 10 years ago
Scott Lahteine 63b98b8280 Raise Z for M401 and M402 10 years ago
wurstnase d69da22f7c last_command_time inside get_command() 10 years ago
wurstnase 574e2d856e remove config 10 years ago
paclema cde5eee2a5 Removed unnecessary comments 10 years ago
paclema e1b69db6d1 Fixed M48 mismatch between n and P parameter on documentation 10 years ago
Scott Lahteine e0e68c5cbc Rename servos[] array in Marlin to servo[] 10 years ago
Scott Lahteine 642f6a92bc fix type of code_has_value 10 years ago
Scott Lahteine 17ad80c1e1 Spacing in XYZ_CONSTS 10 years ago
Scott Lahteine 09d60e0128 Naming and code comments 10 years ago
Mehmet Sutas 5a9e45cc4a Fix Syntax Error Filament Runout Statement 10 years ago
Scott Lahteine ccddc280be Apply three more commits 10 years ago
Scott Lahteine ac2b23f574 Homing fixes
- Prevent `Z_SAFE_HOMING` from homing Z twice in some cases
- Allow `G28` with XYZ values of 0 to explicitly set the position
- Don’t add `home_offset` when setting XYZ explicitly in `G28`
- Add `code_has_value` function to check for the presence of a numeric
value (could just test for space or nul to allow other types of values)
10 years ago
Scott Lahteine 5fe382949b Some G-Codes comment cleanup 10 years ago
Scott Lahteine 8b16ebe705 Break out prevent_dangerous_extrude feature
- It’s inline here, but could be a macro and duplicated for
`planner.cpp`
10 years ago
Scott Lahteine 9189cc66ab Fix moves for DELTA for MANUAL_BED_LEVELING
- Use `line_to_current` in place of `plan_buffer_line`
10 years ago
Scott Lahteine 2ca099d1e7 Merge pull request #1876 from thinkyhead/cold_extrude
Catch dangerous extrude before trying several
10 years ago
Scott Lahteine a00ebf03d4 Merge pull request #1868 from AnHardt/LCD_STR
Moved the definitions of the LCD_STR_* to Conditionals.h
10 years ago
Scott Lahteine 1269c445ab Catch dangerous extrude before trying several 10 years ago
AnHardt 540dbb35e2 And an other MSG_BED in Marlin_main.cpp 10 years ago
AnHardt 14d4419e16 Replaced SERIAL_PROTOCOLPGM(MSG_BED) with SERIAL_PROTOCOLPGM("Bed")
Resolved some warnings in Marlin_main.cpp regarding compares of signed and unsigned integers by replacing 'int' or 'uint16_t' with 'uint8_t'.
10 years ago
AnHardt 6a514f3dc9 Aplied HAS_LCD_CONTRAST also to Marlin_main.cpp
and cleaned typo.
10 years ago
Scott Lahteine 3162971cd6 current_position not static 10 years ago
Scott Lahteine 27cb90da8b IsStopped / IsRunning inline 10 years ago
Scott Lahteine e03da4805b Merge pull request #1774 from epatel/Development
Mesh bed leveling: Added G29 S3 + finer display steps during manual input + bug fix
10 years ago
Scott Lahteine f7c4e7e19f Fix G29 not deploying in some instances 10 years ago
Edward Patel 002340f32c Merge branch 'Development-Marlin' into Development 10 years ago
Scott Lahteine c379f17117 Encapsulate setting of homing_bump_feedrate 10 years ago
Scott Lahteine d20f42c883 Don't stow the probe until the last grid point!
- Address Issue #1682 at hash #issuecomment-89756858
10 years ago
Scott Lahteine 6d084c017f Fix typo in FWRETRACT handler
Should be `retracting` and not `retract`
10 years ago
Edward Patel 2f0081bbb5 Compile error fix! Fix for merge artifacts. 10 years ago
Edward Patel ea10601406 Merge branch 'Development-Marlin' into Development
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
10 years ago
Scott Lahteine 61f8394361 Compare indices instead of floats for probe actions 10 years ago
Scott Lahteine 0935084141 Fix manage_inactivity
- Document `manage_inactivity` function
- Allow `EXTRUDER_RUNOUT_PREVENT` to work with all extruders
- Use faster `memcpy` for copying coordinates
10 years ago
Scott Lahteine c065da52ec Spacing and spelling 10 years ago
Scott Lahteine 8680b515b0 Fix missing tmp_extruder -> target_extruder 10 years ago
Scott Lahteine c185912c19 Latest upstream commits, mostly 10 years ago
Scott Lahteine 1e5c18bb14 Add code_value_short and SERIAL_CHAR 10 years ago
Scott Lahteine 84e4edaea7 Add M48 comment for #1794 10 years ago
Scott Lahteine b98ebd517e disable / enable_all_steppers functions 10 years ago
Scott Lahteine 713953d8c1 Upstream commits, allow no extruder in M105 10 years ago
Scott Lahteine 8f893eb8df Merge pull request #1798 from thinkyhead/fixup_probing
Fix probe height at G28 start
10 years ago
Scott Lahteine dde7e11f8e Merge branch 'Development' into fixup_tr
Latest upstream commits
10 years ago
Scott Lahteine abd7fc36b6 Fix probe height at G28 start 10 years ago
Scott Lahteine 610c8c5471 Merge pull request #1795 from thinkyhead/fixup_probing
Finish pin tests
10 years ago
Scott Lahteine e4934164e4 Merge pull request #1790 from Wurstnase/fix_home_z
fix feedrate for homing z
10 years ago
Scott Lahteine a469d796e1 Add cleanups needed for #1772 10 years ago
Scott Lahteine c0ca26cd50 Merge branch 'Development' into fixup_probing
Latest upstream commits
10 years ago
Scott Lahteine 5c1f08a35f Merge pull request #1772 from croadfeldt/Merge_cleanup
Z_PROBE_ENDSTOP
10 years ago
Scott Lahteine 92119d0f7d Static delta[] for SCARA 10 years ago
Scott Lahteine 6b919e14c1 Group all universal variables 10 years ago
Scott Lahteine 21cd2e4fae Merge branch 'Development' into fixup_probing
Latest upstream commits
10 years ago
Scott Lahteine 0e8182bbf2 Additional pin tests, cleanup 10 years ago
Wurstnase 45565b680d second wrong feedrate 10 years ago
Wurstnase 581b2aae04 fix feedrate for homing z
max_feedrate is in mm/s. line_to_destination needs a feedrate in mm/min because there is feedrate/60.
10 years ago
AnHardt 23cd54755f Fix typo in Marlin_main.cpp
related to current_position[Z_AXIS] and retract_zlift.

'+ =' -> '+='

Fix for #1786
10 years ago
Scott Lahteine e96df67630 Clarify thermal_runaway_protection
- Add comments documenting `thermal_runaway_protection`
- Add an enum for the thermal runaway states
- Add macros for temperature helper functions
- Fix a glitch with the z probe sled in homeaxis
10 years ago
Edward Patel 6b91b7b411 Mesh bed leveling: Added G29 S3 + finer steps in manual probing.
* Use "G29 S3 Xn Yn Zn.nn" to modify bad probed point manually
* Changed manual Z steps from 0.05 to 0.025 and made brought it to Configuration.h
10 years ago
Chris Roadfeldt 26dc80bf2d Typo fixed... 10 years ago
Chris Roadfeldt a57862e29f Cleaning up code in prep for merge with upstream. 10 years ago
Chris Roadfeldt 745d9fe1a4 Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup
Conflicts:
	Marlin/Marlin_main.cpp
10 years ago
Scott Lahteine 9593f09b99 Merge pull request #1764 from thinkyhead/probe_leveling
Fix homing and leveling
10 years ago
Scott Lahteine 72c7de3570 Cleanup M48 10 years ago
Scott Lahteine 97a258b0b0 Clean up, document home_axis 10 years ago
Chris Roadfeldt a508d835db Changed Z_PROBE_AND_ENDSTOP to Z_PROBE_ENDSTOP.
Updated documentation in Configuration.h.
Cleaned up and commented some code relating to Z_PROBE_ENDSTOP.
Separated Z_MIN_ENDSTOP and Z_PROBE_ENDSTOP completely.
10 years ago
Chris Roadfeldt fdb4ddbdea Merge remote-tracking branch 'MarlinFirmware/Development' into Development 10 years ago
Scott Lahteine 1c7391717e Include sync_plan_position_delta for SCARA also 10 years ago
Scott Lahteine 0b57a2ab8b Merge pull request #1757 from bq/Translation-strings
Added new trasnslatable labels.
10 years ago
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
10 years ago
Chris Roadfeldt c89b8368ee Merge remote-tracking branch 'MarlinFirmware/Development' into Development
Conflicts:
	Marlin/Marlin_main.cpp
10 years ago
Ivan Galvez Junquera d08782386b Added new trasnslatable labels.
* Added MSG_END_HOUR and MSG_END_MINUTE labels to all language files.
* Available translations:
  EN, FR, DE, ES, IT, PT, PT-BR.
10 years ago
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.
10 years ago
Scott Lahteine 5f6962dd90 Merge pull request #1755 from thinkyhead/fixup_config
Raise when not retracting
10 years ago
Scott Lahteine ae89ccd2c7 Use Z_RAISE_BETWEEN_PROBINGS 10 years ago
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
10 years ago
Scott Lahteine 2a45922afe Restore extruder_offset, init more simply 10 years ago
Scott Lahteine 28792e5731 Fix typo in assignment 10 years ago
Scott Lahteine bb6174524f Fix EXTRUDER_OFFSET compiler error
- Addressing issue #1741
10 years ago
Chris Roadfeldt 45ece5afb1 Merge remote-tracking branch 'MarlinFirmware/Development' into Development 10 years ago
Chris Roadfeldt 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
Scott Lahteine 50145266cd Merge pull request #1748 from thinkyhead/raise_before_homing
Apply Z_RAISE_BEFORE_HOMING before homing XY
10 years ago
Scott Lahteine a117b6bff6 Merge pull request #1747 from thinkyhead/progress_bar_tweak
Fix up LCD_PROGRESS_BAR
10 years ago
Chris Roadfeldt faac2af4af Merge remote-tracking branch 'origin/Development' into Development 10 years ago
Chris Roadfeldt 3be00cce6f Merge remote-tracking branch 'MarlinFirmware/Development' into Development
Conflicts:
	Marlin/Configuration.h
10 years ago
Chris Roadfeldt e08f8eed05 Revert 06f767d..cba5692
This rolls back to commit 06f767d608.
10 years ago
Chris Roadfeldt 992b07ca57 Don't disable Z_RAISE_BEFORE_HOMING when Z_PROBE_AND_ENDSTOP is enabled. 10 years ago
Chris Roadfeldt cba5692673 Merge remote-tracking branch 'MarlinFirmware/Development' into Development
Conflicts:
	Marlin/Marlin_main.cpp
	Marlin/stepper.cpp
10 years ago
Scott Lahteine 8500c80b33 Apply Z_RAISE_BEFORE_HOMING before homing XY 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 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
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 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 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 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 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
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 08a7aa16c5 Don't deploy Z Probe on Z homing if Z_PROBE_AND_ENDSTOP is defined. 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
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
Chris Roadfeldt 8b81f20c61 Filling in more places where Z_PROBE_PIN and Z_PROBE_AND_ENDSTOP need to
be.
Added Sanity Check for it.
Added hook so it's enabled.
10 years ago
Chris Roadfeldt fd823449ad Added serial message for Z Probe trigger. 10 years ago
Scott Lahteine b14be7235e Merge pull request #1585 from galexander1/strtod_e_fix
Fix `code_value` (so `G1X1E2` isn't evaluated as `G1 X100 E2`)
10 years ago
Scott Lahteine ba871e46bf Fix compiler warnings
- Patched up for most included configurations
10 years ago
Scott Lahteine ffe0df4b36 Latest upstream commits 10 years ago
Scott Lahteine 578f93bc26 Fixup temp arrays and leveling equation, prepare for merge 10 years ago
Scott Lahteine 460f73056b Fix ECHOPAIR ambiguity
- Also patch up some warnings
10 years ago
Scott Lahteine 19d418cd6a Fix up the code to eliminate warnings 10 years ago
Scott Lahteine 267d6bef15 Eliminate most warnings
- Fix a bug reading `code_value` for `M503 Sn`
- Hide and remove unused variables
10 years ago
Scott Lahteine b76a352d41 Fix the planeNormal calculation 10 years ago
Scott Lahteine 0b32431551 Remove abs() from planeNormal.z 10 years ago
Scott Lahteine 06eb7f5b3c Latest upstream commits 10 years ago
Scott Lahteine 04328d7537 Add zprobe_zoffset in set_bed_level_equation_*
- Also a small tweak to SanityCheck.h
10 years ago
AnHardt ebe5b87c2c < like in the oher compareble loops
to avoid:
Marlin_main.cpp:1790: warning: array subscript is above array bounds.
10 years ago
Scott Lahteine fbf9b21e0c Merge plus fixup zprobe_zoffset
- Make `zprobe_zoffset` conditional
- Fix ConfigurationStore for `zprobe_zoffset`
10 years ago
Scott Lahteine 96b5da7198 Fix up bed leveling code
- Init `zprobe_zoffset`
- Remove `current_position[Z_AXIS] = zprobe_zoffset` lines from the
`set_bed_level_equation_*` functions
- Apply standards to `mesh_bed_leveling` files
- Document `MESH_BED_LEVELING`
10 years ago
Victor Torre d43d47da14 Clean "fromsd" array is not SDSUPPORT
if not have SDSUPPORT the fromsd array is not necessary
10 years ago
alexborro 55025558dc Implement Dry-Run mode in G29
It just probe all the bed without appliying the matrix.
Useful after a first G29 to check the topology.
10 years ago
alexborro c2ba5d0c09 Fix ZigZag and Topograph table
ZigZag: Inverted Behavior.. If T supplied, it does not zigzag.
Topograph table: The table was rotated 90º clockwise.
10 years ago
alexborro 0ce3576685 New Feature: Z_DUAL_ENDSTOPS
Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z
steppers - Let's call them Z stepper and Z2 stepper.
That way the machine is capable to align the bed during home, since both
Z steppers are homed.
There is also an implementation of M666 (software endstops adjustment)
to this feature.
After Z homing, this adjustment is applied to just one of the steppers
in order to align the bed.
One just need to home the Z axis and measure the distance difference
between both Z axis and apply the math: Z adjust = Z - Z2.
If the Z stepper axis is closer to the bed, the measure Z > Z2 (yes, it
is.. think about it) and the Z adjust would be positive.
Play a little bit with small adjustments (0.5mm) and check the
behaviour.
The M119 (endstops report) will start reporting the Z2 Endstop as well.
10 years ago
Scott Lahteine 0d81abe1c9 Merge branch 'Development' into config_testing
Latest upstream commits
10 years ago
Scott Lahteine b26a3ea02c Merge pull request #1662 from josla972/refactor_scara
Refactor SCARA calibration. Save some lines of code and possibly ROM.
10 years ago
Scott Lahteine 4fbb80567e Get upstream commits 10 years ago
Scott Lahteine 146501215f Fix mangled probe_pt calls
- Address issue #1669
- Remove the TOPO_ORIGIN configuration setting
10 years ago
maverikou 15345cc249 Corrected Z_PROBE_ALLEN_KEY behaviour. 10 years ago
maverikou 0f034dd97e Clean up Z_RAISE_AFTER_PROBING to work the same in all code paths except Z_PROBE_SLED. 10 years ago
maverikou 6c96f32069 Blind fix for #1507 10 years ago
Josef Larsson 379348487e Removed malplaced comment. 10 years ago
Josef Larsson 9b3462f73f Refactor SCARA calibration. Save some lines of code and possibly ROM. 10 years ago
Scott Lahteine 691e753cc3 Don't add home offsets in G29
- Address #1262 by leaving values as set
- Rename `add_homing` to `home_offset`
10 years ago
Scott Lahteine 15eb5d35a2 Merge branch 'Development' into config_testing
Latest upstream commits
10 years ago
Edward Patel 3d0a060a7a Added G29 command 10 years ago
Scott Lahteine 63d5d28085 Merge branch 'Development' into config_testing
Latest upstream changes
10 years ago
Edward Patel 4619d80524 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 10 years ago
Scott Lahteine 2424713a8f Merge pull request #1640 from AnHardt/warning6
codepos not used in gcode_M28()
10 years ago
Scott Lahteine 670006b919 Remove invariant code from Configurations
- Add `Conditionals.h` with calculated configuration values
- Add `SanityCheck.h` with checks for configuration errors
- Remove equivalent code from all configurations
- Move error checks from some sources to `SanityCheck.h` also
- Fix initialization of count_direction in stepper.cpp
10 years ago
Edward Patel a61f679568 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 10 years ago
Edward Patel c87faa69ed Shortened mesh_plan_buffer_line() 10 years ago
AnHardt ae01a6b5f2 Make use of codepos.
Saves one addition.
Needs one pointer on the stack.

Don't know if this is a go trade.
10 years ago
Scott Lahteine 80e0ee10ca Merge pull request #1631 from AnHardt/iss1593
Decrease KILL_DELAY
10 years ago
Scott Lahteine 76127b8a55 Merge pull request #1630 from Wurstnase/fix_g29
optional parameters must be named when ignoring order
10 years ago
Scott Lahteine 8664c6d465 Merge pull request #1638 from AnHardt/warning4
delta[3] not used when DELTA not defined.
10 years ago
Scott Lahteine 10711ccc6a Merge pull request #1639 from AnHardt/warning5
G4 could wait for an undefined time
10 years ago
Edward Patel 240b5cfe04 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 10 years ago
alexborro 4521f6655b Restore "S" parameter of M204 for retrocompatibility. 10 years ago
alexborro 5ddb8d94e2 Update Documentation related to M204 10 years ago
AnHardt f8c4d43886 delta[3] is used with SCARA
Shoot in the dark.
10 years ago
AnHardt 72a9fed4fb codepos not used in gcode_M28()
Got:
Marlin_main.cpp:2567: warning: unused variable 'codepos'

Needs revision.
Don't now how this should look like.
10 years ago
AnHardt b94dd33641 G4 could wait for an undefined time
Got:
Marlin_main.cpp:1689: warning: 'codenum' may be used uninitialized in this function

And indeed codenum is undefined when no parameter is given.
10 years ago
AnHardt e90985a4e8 delta[3] not used when DELTA not defined.
got:
Marlin_main.cpp:387: warning: 'delta' defined but not used

Compiles cleaner when definition is removed.
10 years ago
AnHardt d1658eebfc Decrease KILL_DELAY
Users hat to press kill-button for unexpexted lon times.
See #1593
10 years ago
Wurstnase 00adb2a6c1 optional parameters must be named when ignoring order 10 years ago
Edward Patel 0d43898a22 Remove of mesh_plan_buffer_line parameter reference (e) 10 years ago
Edward Patel 8067a985ce Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
Fixed conflicts:
	Marlin/planner.h
10 years ago
maverikou 3570447ded Fix Z_RAISE_AFTER_PROBING 10 years ago
maverikou 8a739b6fba Merge branch 'Development' into delta_auto_bed_level
Conflicts:
	Marlin/Marlin_main.cpp
10 years ago
Scott Lahteine a686c9878f Move TOPO_ORIGIN define to Configuration.h
- Addressing issue #1608
10 years ago
Edward Patel 8005d22c81 Added menu option for bed leveling. 10 years ago
Edward Patel 0e51e53813 WIP. Adding bed leveling code. 10 years ago
Scott Lahteine 7bc77dc134 Merge pull request #1583 from galexander1/m404fix
M404 should not use 'N' address as parameter because 'N' is reserved
10 years ago
Scott Lahteine b80ed51fcc Fix controllerFan() code
- Add support for 4th extruder
- Fix parentheses matching
- Apply coding standards
- Address issue mentioned at #1575
10 years ago
Scott Lahteine bb4cb1b15a Merge pull request #1606 from thinkyhead/cleanup_stepper
Cleanup of stepper.cpp
10 years ago
alexborro d3259d0dba Merge pull request #1581 from msutas/Development
Filament Runout Sensor Feature
10 years ago
Scott Lahteine c37f7d15c9 - Rename WRITE_E_STEP for consistency
- Add BIT and TEST macros
- Add _APPLY_ macros to stepper.cpp to help with consolidation
- Consolidate code in stepper.cpp using macros
- Apply standards in stepper.cpp
- Use >= 0 instead of > -1 as a better semantic
- Replace DUAL_Y_CARRIAGE with Y_DUAL_STEPPER_DRIVERS
10 years ago
alexborro 2f3c77b751 Fix decimal places in G29 Bed Equation Coeficients 10 years ago
Scott Lahteine e4d77a6313 Merge pull request #1554 from 2PrintBeta/Development
Macro indirection for stepper drivers + Support for TMC26X and L6470 Stepper Drivers
10 years ago
Mehmet Sutas b373826428 Merge pull request #2 from MarlinFirmware/Development
update
10 years ago
alexborro 9157cbd8f3 Add Travel Acceleration and change the M204 options
Added option to set Travel Acceleration (non printing moves).
The M204 options was a non sense (S for printing moves and T for retract
moves).

It has been changed to:
P = Printing moves
R = Retract only (no X, Y, Z) moves
T = Travel (non
printing) moves

I will add this info o G-Code wiki in reprap.org. I also advise to put
this info in Marlin next version changelog.
10 years ago
alexborro 888cf161bd fix travel speed option for G29
I forgot to enclousure the variable with #ifdef
10 years ago
alexborro af63b54562 Add travel speed option to G29 command line 10 years ago
alexborro 60ceca1bc1 Add speed configuration for home-bumping movement 10 years ago
domonoky d813090d90 Merge remote-tracking branch 'remotes/upstream/Development' into Development
Conflicts:
	Marlin/Marlin_main.cpp
	Marlin/stepper.cpp
10 years ago
Scott Lahteine c321c97f35 Merge pull request #1584 from galexander1/stringcleanup
fix a handful of cases where strtod() was cast to int, instead of just using strtol()
10 years ago
maverikou 53abc5e2f1 Merge branch 'Development' into delta_auto_bed_level 10 years ago
Mehmet Sutas 956fb2d278 Merge pull request #1 from MarlinFirmware/Development
update
10 years ago
Scott Lahteine 624f23f550 Merge pull request #1575 from Wurstnase/fix-controllerFan
Fix controller fan
10 years ago
maverikou 424c747fb3 Enable M401 and M402 for deltas with allen key z-probes. 10 years ago
maverikou 0d593ab7c1 Fix debug message 10 years ago
Greg Alexander 3e8c5678f5 fix bug where, i.e., "G1X1E1" would be interpretted as "G1 X10 E1",
because strtod() will read the E address value as if it was a base 10
exponent.
10 years ago
Greg Alexander ed7874b4e0 M404 should not use 'N' address as parameter because 'N' is reserved for the line number 10 years ago
Greg Alexander b9dfa5cad4 use code_value_long() instead of (int)code_value() 10 years ago
Greg Alexander 901b03d020 use strtol() instead of strtod() when an integer value is desired 10 years ago
Mehmet Sutas cfc6a3a87a Filament Runout Sensor Feature
With this change a mechanical or optical switch may be used to check the
availability of the filament and when the filament runs out an M600
(filament change) command is issued. This is only done while printing
with an SD card.

This feature was requested several times (issue #679), but the requests
were not accepted since it was believed that this situation should be
handled at host side. However during an SD print the control is totally
on firmware and I think that during an SD print it should be handled by
the firmware.

The original code was posted at reprap forum
(http://forums.reprap.org/read.php?1,297350) by Lazymonk. I have only
corrected some bugs of the code and improved it by adding definitions to
the configuration.h in order to make it more standardized.
10 years ago
maverikou 7c24b97958 Ported over Johann Rocholl's improvements for delta printers:
- Nonlinear auto bed leveling code (includes G29, G30, Z_RAISE_AFTER_PROBING). Cleaned it up to be a delta-specific AUTO_BED_LEVELING_GRID code path.
- Allen key z-probe deployment and retraction code. Cleaned it up and added safety checks.
10 years ago
Wurstnase a5342c942e Update Marlin_main.cpp 10 years ago
Scott Lahteine d085725c86 More sanity-checking for ABL
- Moved sanity-checks to Marlin_main.cpp
- Applied to other configuration files
- Fixed formatting of ABL output
- Passing verbose level to probe_pt
- Miscellaneous cleanup
- Put CONFIG_STEPPERS_TOSHIBA into Configuration.h
10 years ago
Scott Lahteine 254970c92a Merge pull request #1570 from C-o-r-E/escape_fix
Fixes gCode handling of comments and escaped characters
10 years ago
Scott Lahteine 25dc79f124 Remove M48 credits also 10 years ago
Scott Lahteine 34e51f576f Fix compile error in gcode_G29
- A redo of #1576, which missed topo_flag
- Always set verbose_level
10 years ago
Wurstnase 62bd734612 fix controllerFan() for inverted enable pins
add ```^ !(n_ENABLE_ON)``` for each stepper
10 years ago
Gina Häußge 63b62d8d4e Fixed in-line comments and escaping
* "G1 X1 ; test" was not executing "G1 X1" due to never leaving comment mode.
  * "M117 Hello \;)" printed "Hello \" to the display due to not replacing serial_char properly.

Tested with the following commands:
    * M117 Hello ; test => displays "Hello" on display, ignores "test"
    * G1 X1 ; foo => moves 1mm in X, ignores "foo"
    * ; test => completely ignored, not even acknowledged
    * M117 Hello \;) => displays "Hello ;)" on display
    * M117 Hello \\;) => displays "Hello \" on display, ignores ")"
10 years ago
C-o-r-E 99fb1bc3e8 Attempt to resolve #1568 and add basic escape character support 10 years ago
Scott Lahteine cdc38aa783 Move gcode handlers into inline functions 10 years ago
Scott Lahteine 6d9e9a6bef Merge branch 'Development' into enhanced_g29
Latest upstream changes
10 years ago
Scott Lahteine 4db2179f5c Include 4th extruder support 10 years ago
OhmEye f90a947e65 Fix autoretract
Autoretract was broken, looks like it was overlooked when the retracted flag was updated for multi extruders.
10 years ago
Scott Lahteine 2ef6b3d57a Fix wrong defines, broken syntax 10 years ago
Scott Lahteine 32744d41a9 Do sanity checking on LRFB values
- Setting boundaries based on configured limits, contrasting with G28
(which forgets these limits?)
10 years ago
domonoky 075507fb9a missed one X_ENABLE_PIN 10 years ago
Scott Lahteine dfb38874f8 Some suggested changes for #1555 10 years ago
Scott Lahteine 7f8ea7105f Arrange ProbeAction values bitwise 10 years ago
Scott Lahteine 7684721977 Enhanced G29
- Adapted “Enhanced G29” code referred to in #1499 and posted at
[3dprintboard.com](http://3dprintboard.com/showthread.php?3105-Auto_Bed_
Leveling-Enhanced-G29-command)
- Compatible with current G29 while adding some new arguments
  - `V` sets the verbose level for serial out
  - `T` (or `V` > 2) send a Topology report to serial out
  - `E` works the same way as before
  - `P` works as before (source used `n` or `U`/`u`)
  - `L`, `R`, `B`, `F` work as before
- Still needs sanity checking for `LRBF`
10 years ago
C-o-r-E 874d3d3fc5 Add support for solenoid articulated extruders 10 years ago
domonoky 4a7aca2736 Merge remote-tracking branch 'remotes/upstream/Development' into Development 10 years ago
Scott Lahteine e30bfedce4 Fix undefined *_PROBE_BED_POSITION error 10 years ago
alexborro 227ab8c665 Merge pull request #1503 from MarcelMo/patch-2
Support for simple customisable AutoZProbing area
10 years ago
Scott Lahteine c9a3eb0c1a Spacing in calculate_volumetric_multiplier(s) 10 years ago
Scott Lahteine 0cf0c20532 Optimize calculate_volumetric_multiplier 10 years ago
domonoky b55995aae8 Introduce a layer of macro indirection to all stepper pins. This allows other stepper drivers to redefine them, so they can use SPI/I2C instead of direct pin manipulation. 10 years ago
Scott Lahteine 08c236059e Merge pull request #1505 from thinkyhead/issue_1499
Bed leveling probe behavior issue?
10 years ago
MagoKimbra 159196d1e9 Reset Alert message when finish M600 command 10 years ago
Scott Lahteine 978d114c73 Bed leveling probe behavior issue?
The `float` keyword should not be on these vars because they conceal
the outer vars, preventing them from obtaining known values before
being passed in `set_bed_level_equation_3pts`. Possibly related to
`Z_RAISE_BETWEEN_PROBING` not functioning.
10 years ago
MarcelMo d28f5b9e82 Support for simple customisable AutoZProbing area
When probing PCB´s I had the problem that i needed auto-leveling for specific areas (it´s never the same size).
Not much code, but very useful.
Now I use simply G29 L5 R55 F5 B35 P3 to probe a 4x6cm PCB before milling.
I used int for values... might be wrong...
I hope this time I got the right development tree. (tried first with https://github.com/MarlinFirmware/Marlin/pull/1130/commits)
10 years ago
Scott Lahteine 7866fa161f Merge pull request #1476 from Natealus/Development
Compiling errors with 4 Extruders defined and Viki 2 Implementation
10 years ago
Jérémie FRANCOIS 9d75a56b56 Merge remote-tracking branch 'upstream/Development' into Development
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
10 years ago
Natealus 38a500d05c Viki 2 Implementation
I've insert the define and pointer entries for the Viki 2 and miniViki
from Panucatt in all of the example configs and main config. With these
additions and with pins done in the old single pin.h style...I was able
to get the display working fine save for needing to turn Delta Segments
per Second down. But that's a common graphics lcd issue being looked
into right now.

I need assistance in understanding how the new divided pins files fit
together because my previous attempts at trying to get it to work
appropriately didn't seem successful. This originally came from trying
to find out how to swap the XYZ Min and Max Endstop pins in the Azteeg
X3 Pro. It only comes with one set of connectors and they're Min
Endstops. My previous experience didn't turn out well trying to tell the
firmware to home to the Min Endstops so the best solution I found was to
swap the pins in the firmware. If I'm missing a conflict with a setup
other than delta please let me know, but it makes sense in my setup.
10 years ago
Jérémie FRANCOIS 85e5aa4011 Generalized enqueue_commands_P, and moved them to Marlin_main as they should 10 years ago
Scott Lahteine 0cb1029311 remove extra plan_buffer_line 10 years ago
Scott Lahteine b97a950f53 Apply fix for M600 filament change
- Patch from #1453 for delta movement plan
- Fix: Set X with code X instead of adding to X
10 years ago
Scott Lahteine 9dc5de6166 Hide code that makes veteran geeks go "aha!" 10 years ago
Scott Lahteine bd387068bb Apply loops for extruders elsewhere also 10 years ago
Scott Lahteine 4a146d584b Loop, since the pending feature can use an array 10 years ago
Scott Lahteine bca884bf72 Realized it's not a bug, but cleanup code anyway 10 years ago
Philip Schell fb7c636ecf Avoid compiling error
Only a missing ","... now it will compile again
10 years ago
Scott Lahteine 073c59c50a Clean up some formatting
- Also partial cleanup of Marlin_main.cpp with a smidgen of Doxygen.
10 years ago
Scott Lahteine 093fedfde8 Make EEPROM storage consistent
Update ConfigurationStore to always write dummy values for disabled
options, including FWRETRACT, DELTA, and SCARA. Update the EEPROM
version to “V15.” Also fixes a buffer overrun with axis_scaling in
Config_ResetDefault.
10 years ago
Jérémie FRANCOIS dd301be52d Added suport for multiline G-code commands in the LCD menus 10 years ago
AnHardt 59315330dd Remove definition of VERSION_STRING and replace where usend with STRING_VERSION 10 years ago
MagoKimbra 986e723eeb Add 4th extruder 10 years ago
daid 53f971095d Revert "Reduce PROGMEM warnings" 10 years ago
Bo Herrmannsen 5151db5c2f Merge pull request #1349 from msutas/patch-2
Improvement - G29 Option for Not Retracting Servo
10 years ago
Bo Herrmannsen ab074dac17 Merge pull request #1344 from grob6000/independent_pid
Independent PID parameters for each extruder
10 years ago
Bo Herrmannsen d4a665694a Merge pull request #1350 from odewdney/Development
Reduce PROGMEM warnings
10 years ago
msutas 3a5a6f42fb Corrected the ABL grid option
G29 E was not retracting the probe on the last probe point when used with ABL grid. Corrected.
10 years ago
odewdney 538859669d Removing compiler warnings for progmem 10 years ago
grob6000 bf2c923db5 Make multiple PID parameters a config option
* Adds config parameter `PID_PARAMS_PER_EXTRUDER` - allows single PID
parameters to be used where this would be preferable (e.g. dual
identical extruders)
* When disabled, will use `float Kp, Ki, Kd, Kc;` as before.
Preprocessor macros used to switch between.
* ultralcd.cpp defines extra menus for extra parameters only where
required
* M301 reports `e:xx` only if independent pid parameters enabled
* EEPROM structure still leaves space for 3 extruders worth, when undef
will save single parameter to all extruder positions, but only read the
first
* Switching off saves approx 330 B with no LCD enabled, 2634B with LCD
(RRD) enabled: this is significant.
* LCD modifications should be tested.
10 years ago
msutas e0beb98fd3 Improvement - G29 Option for Not Retracting Servo
This change introduces an improvement to G29 command on Marlin.

Auto bed leveling operation's reliability is based on the repeatability of the Z-probe switch and the servo. This change introduces an option to G29 command. When the G29 command is sent with an "e" option, during auto bed levelling the servo is not retracted between probes which decreases the bias on auto bed levelling resulting from servo.

G29 command does the auto bed probing as it is.

G29 E command engages the servo on first probing point, probes all points and retracts the servo after probing the last point.

Please comment your opinions, test on your printer and check the code on a programmer's perspective. (I am not a good programmer.)
10 years ago
grob6000 37c7e8300f Independent PID parameters for each extruder
* Variables Kp, Ki, Kd, Kc now arrays of size EXTRUDERS
* M301 gains (optional, default=0) E parameter to define which
extruder's settings to modify. Tested, works with Repetier Host's EEPROM
config window, albeit only reads/updates settings for E0.
* All Kp, Ki, Kd, Kc parameters saved in EEPROM (version now v14), up to
3 extruders supported (same as Marlin in general)
10 years ago
Erik van der Zalm 1aade4a8e2 Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into Development 10 years ago
Erik van der Zalm 8a2e84e3f1 Possible fix for FWRETRACT with 0 zlift. 10 years ago
Erik van der Zalm 3a30d45c2e Revert "issue 968 for dev branch" 10 years ago
Dan Royer 9472bbe51d issue 968 for dev branch
try, try again.

If 'OK' is garbled on sending PC won't receive it.  Both machines will
wait on each other forever.  This resends OK if nothing is heard from PC
for a while to avoid this bad case.
10 years ago
Bo Herrmannsen a18b625534 Merge pull request #1261 from wgm4321/Development
Add Filament menu and add Filament/Retract settings to config store.
10 years ago
bkubicek d02daec08f fixed compilation 10 years ago
Bernhard Kubicek f24c5d82e3 Update Marlin_main.cpp
fixed minor typo
10 years ago
Wurstnase 8a6f098cc6 Expand manage_inactivity #1264
void manage_inactivity(bool ignore_stepper_queue=false)

standard is false so it is not necessary to change additional code. this
change should be better, hopefully nophead like this :)
10 years ago
Wurstnase d1995aec7a Rename ignore_blocks_queued
more speaking name
10 years ago
Wurstnase 4122de9d17 change filament issue
make a more general solution
10 years ago
wgm4321 cb12161191 Add Filament menu and add Filament/Retract settings to config store. 10 years ago
fmalpartida ec33df0554 Merge branch 'SAV-MkI_merge' into Development
Tested for SAV MKI and SAV 3D LCD on lewihe.
10 years ago
alexborro 3afe66bb0c Fix issues #1248, #1240
- Fixed issue when BAL area probing is shorter than it should be for
grid probing
- Warning when BAL activated with Delta Kinematics
- Fix XY_TRAVEL_SPEED when homing Z axis
10 years ago
Lukas Obermann 9eb6df17a7 Consider negative Z Offsets when auto bed leveling is active 10 years ago
Denis Chertykov 050ca9ca13 Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp 10 years ago
alexborro d74aabf259 Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation" 10 years ago
Bo Herrmannsen 60628864ca Merge pull request #1167 from thinkyhead/sd_freemem
Use SdFatUtil::FreeRam() for freeMemory() if there
10 years ago
Bo Herrmannsen 889d7ba218 Merge pull request #1177 from martin-pr/probing_z_speed
Split do_blocking_move() to XY and Z sections
10 years ago
Bo Herrmannsen 5e7bd2dc87 Merge pull request #1200 from chertykov/Marlin_v1
Fix syntax errors in #ifdef
10 years ago
Denis Chertykov b086394178 Fix syntax errors in #ifdef. 10 years ago
John Davis 4315c2547a Update Marlin_main.cpp
Changed level and leveling to compensation (except with "verbose_level" and "lcd_reset_alert_level").
10 years ago
Bo Herrmannsen 03e489aaad Merge pull request #1197 from foosel/fix/issue_1147
Fixes commands not being acknowledged in the same order they are received in
10 years ago
Gina Häußge acc0e75279 Fixes commands not being acknowledged in the same order they are received
in

G0 to G3 were previously acknowledged in the get_command method, causing
them to be possibly acknowledged before commands coming after them that
were acknowledged in process_commands.

This patch fixes this, moving the acknowledgement of G0 to G3 to the
process_commands method as well. These commands are therefore no
longer acknowledged when the enter the cmd_buffer but instead only
acknowledged when the enter the plan_buffer.

Guaranteeing that commands are acknowledged in the same order in which
they were received by the firmware allows host software to be able to
track the life cycle of commands and such a better management of the
firmware's serial buffers as well as better internal command processing
and response parsing without having to depend on throwing an epic
amount of regular expressions against each line received back from the
firmware.

Fixes ErikZalm/Marlin#1147
10 years ago
Scott Lahteine 07c6b5ab71 Using axis constants 10 years ago
Scott Lahteine 0450e83fa5 Use SdFatUtil::FreeRam() for freeMemory() if there 10 years ago
Scott Lahteine 60598b4cdd A few constants where they belong 10 years ago
Martin Prazak 2ef0669b19 Split do_blocking_move() to XY and Z sections to make sure that the Z homing feedrate is not exceeded 10 years ago
Neil Darlow 64139f5e5a Merge https://github.com/ErikZalm/Marlin into Marlin_v1 10 years ago
Scott Lahteine 7562183efc Skip over spaces first 10 years ago
Scott Lahteine 12b51d6060 Ignore S and P if no value >0 is included. 10 years ago
Scott Lahteine d12b24758a Clear LCD to welcome_msg if not printing
The welcome message is more appropriate than “resuming print” if
nothing is printing.
10 years ago
Scott Lahteine 92e21d3ee2 M0-M1 Enhancements
Allow M0 and M1 to include a message string. Ignore clicks on “Wait for
user” so that the Info Screen stays up.
10 years ago
Neil Darlow b81021f475 Merge https://github.com/ErikZalm/Marlin into Marlin_v1 10 years ago
Erik van der Zalm 058e446531 Merge pull request #1037 from filipmu/Filament-Sensor
Support for a filament diameter sensor
10 years ago
Erik van der Zalm b360306881 Merge pull request #1073 from WingTangWong/wing-fix-float-delta
Wing fix float delta
10 years ago
Scott Lahteine f989bd5435 Simple code cleanup. Rename "homeing" to homing. 10 years ago
Neil Darlow 6c5a460e65 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 10 years ago
galexander1 cb4a6dd2dc Merge pull request #1065 from oliasmage/Marlin_v1
Corrected retract() call for use of auto probe without sled enabled.
10 years ago
Bracken Dawson 01e9b536cb Fix build for non-sled bed auto levelling
This function should only be used with sled, not all bed auto
levelling.
10 years ago
Wing Tang Wong 58eabd21fb Added ifndef 10 years ago
Wing Tang Wong 88d12a762a Added #ifndef DELTA wrapper to float delta 10 years ago
Charles Bell 3b8216bdd1 Corrected #endif and ifdef for Z_PROBE_SLED code. 10 years ago
Charles Bell 37799f70ba Corrected retract() call for use of auto probe without sled enabled. 10 years ago
Neil Darlow 1632e5e38a Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 10 years ago
Erik van der Zalm 018b68a5c4 Merge pull request #976 from cocktailyogi/SCARA_by_Yogi
Implemented SCARA-Maths
10 years ago
Erik van der Zalm 9887555192 Merge pull request #998 from darconeous/pull-requests/fwretract
FWRETRACT fixes
10 years ago
Erik van der Zalm 68dd5e635e Merge pull request #1024 from oliasmage/Marlin_v1
Adding Z Probe via sled mounted endstop
10 years ago
Erik van der Zalm 25069ed4e9 Merge pull request #1031 from Roxy-3DPrintBoard/Z_PROBE_REPEATABILITY-with-correct-Defaults
Z probe repeatability with correct defaults
10 years ago
Filip Mulier 62db9848d3 Improvements and bug fixes in sensor delay buffer for filament sensor code
Improvement to avoid reinitializing delay buffer with every print. Fixed
issues in buffer indexing and memory out of bounds due to floating point
imprecision.  Simplified the code by avoiding conversion to standard
diameter and 1cu mm extrusion, which caused complications in determining
mm extruded.
11 years ago
Florian Baumann 5908fd5cec Fix reseting CHDK pin to LOW
chdkActive was set to false regardless of (millis() - chdkHigh) being bigger than the CHDK_DELAY or not. So if (millis() - chdkHigh) wasn't bigger than the delay the first time, the CHDK would never be set back to LOW.

Also, don't return from the function, as there might be other stuff to do, after the CHDK check.
11 years ago
Roxy-3DPrintBoard 0091865583 Z_PROBE_REPEATABILITY test
Z_PROBE_REPEATABILITY test for Auto Bed Leveling.
Implemented as M48 with extra user specified options.
Full support at
http://3dprintboard.com/showthread.php?2802-Auto_Bed_Leveling-Z-Probe-Repeatability-code
11 years ago
Filip Mulier 85649a4549 Real-time filament diameter measurement and control
This feature allows the printer to read the filament diameter
automatically and adjust the printer in real time.  Added code to read
an analog voltage that represents a filament diameter measurement.  This
measurement is delayed in a ring buffer to compensate for sensors that
are a distance away from the extruder.  The measurement is used to
adjust the volumetric_multiplier for the extruder.  Some additional g
codes (M404, M405, M406, M407) are used to set parameters and turn
on/off the control. g code M221 is updated.  Pins for RAMPS1.4, RAMBO,
and Printrboard are identified for analog input.  The configuration file
is updated with relevant user parameters.
11 years ago