d065d37822
Add M428 to set home_offset logically
10 years ago
013a09dbe6
Added configurable script for filrunout form configuration.h
10 years ago
4dcc0fd55a
Fixed sintaxis error of filament runout
10 years ago
ce3caf447b
Tweak how homeaxis deploys and stows
10 years ago
a235dca79c
Stow z on M402 without extra raise
10 years ago
3688256f86
Merge pull request #1974 from thinkyhead/eeprom_in_gcode
...
Make EEPROM reproducible in GCode
10 years ago
31516e2a3b
Merge pull request #1985 from Arengorn/Development
...
Update of servo.h
10 years ago
0f687b5dda
Merge branch 'Development' into eeprom_in_gcode
...
Latest upstream commits
10 years ago
28aef684b4
Merge pull request #1957 from Voxel8/sjk/home_y_before_x
...
Allow Y to home before X with option in Configuration_adv.h.
10 years ago
71a0b1a5bb
Disable endstops between homing bumps
10 years ago
c36226c4dc
Fix homing Z position
...
Add `sync_plan_position()` after `axis_is_at_home(axis)` to keep the
planner position in sync when homing.
10 years ago
ff178d8cf7
Change M421 to take coordinates
...
This makes `M421` more amenable for irregular matrices
10 years ago
ff67ee73fc
Update Marlin_main.cpp
...
Corrected "servo.h" to "Servo.h" because of the updated filename.
10 years ago
98ca46006c
Allow Y to home before X with option in Configuration_adv.h.
...
This addresses comments in #1956 and #1079 . In particular, this is useful
when both endstops are stationary on a CoreXY system, and the Y axis needs
to be homed before the X so the flags are aligned.
10 years ago
0fca084ea6
Make EEPROM reproducible in GCode
...
With these changes the output of `M503 S0` is all you need to restore
the EEPROM. Building on this it is straightforward to save and restore
the EEPROM state using the SD card or external GCode file.
- Added `M145` to set “heatup states” for the LCD menu
- Added `M420` to toggle Mesh Bed Leveling
- Added `M421` to set a single Mesh coordinate
- Extended `Config_PrintSettings` with added M codes
- Cleaned up some comments here and there
10 years ago
d43cc2dd5f
M111 - Debug Level
...
- Add `M111` as a standard option to set the debug level
- Implement `DEBUG_ECHO` in `process_commands`
- Other debug levels (e.g., `DEBUG_DRYRUN`) need more work
10 years ago
a22a228bcc
Rename files to move them in the IDE
10 years ago
0438f0d835
Merge pull request #1924 from thinkyhead/raise_z_for_m401_m402
...
Raise Z for M401 and M402
10 years ago
b275946a52
Merge pull request #1966 from thinkyhead/g4_dwell_message
...
G4 shows status message only if no message is set already
10 years ago
182f2cda35
Minor cleanup of M48
10 years ago
3a6fd912cd
Latest upstream commits, merged
10 years ago
3c9e94e035
Merge pull request #1964 from AnHardt/Max6675again
...
Add variant for MAX6675 in M104
10 years ago
56ff46eb8b
Improve code_has_value test
10 years ago
ce142afdda
G4 shows status message only if no message is set already
...
- Address issue raised in #1961
10 years ago
35e79d56a5
Remove set-coordinate extension of G28
10 years ago
3a74bb5039
Merge pull request #1945 from Wurstnase/max_endstopp
...
Max endstopp
10 years ago
0fed46360c
Add variant for MAX6675 in M104
...
Else will throw error:
@:0 B@:0
Error:No thermistors - no temperature
[ERROR] Error:No thermistors - no temperature
when no bed is defined
10 years ago
588ed70d4a
Latest upstream commits, merged
10 years ago
0165560333
Apply zprobe_zoffset in axis_is_at_home
...
Ensure the probe offset will always be included when homing Z.
10 years ago
075386e7fe
Merge pull request #1959 from thinkyhead/lcd_move_rate
...
Include axis parameter to ultralcd's line_to_current
10 years ago
2558c10c6c
Use the slower feedrate for XY axes
10 years ago
64268f3312
Fixup axis_is_at_home a little
10 years ago
996d0a9185
Squish the code down a little
10 years ago
8534bc376c
Fix homing of YZ with DUAL_X_CARRIAGE
10 years ago
3b97a7d446
Merge pull request #1944 from AnHardt/beep2
...
More Beeper clean up
10 years ago
be9e4ceddc
fix typo
...
c'n'p ftw :/
10 years ago
c26d816839
filter any 0
10 years ago
61ae43f35e
v <-> code_value
10 years ago
da0d91a79b
max endstopp
...
no user will home to 0 with a max endstopp
10 years ago
064f2b37d0
More Beeper clean up.
...
Centralised beep code to lcd_buzz().
From gcode_M300() and lcd_quick_feedback().
Enforced max. duration for M300 to 5 seconds.
Corrected description in 'Configuration.h'
LCD_FEEDBACK_FREQUENCY_HZ 0 gives now a silent delay of
LCD_FEEDBACK_FREQUENCY_DURATION_MS.
10 years ago
92575cecca
new timout/add adv_ok
10 years ago
671aaf2dc9
Minor fix for M300
...
Corrected wrong order of parameters.
10 years ago
d931220a65
Tweak comments
10 years ago
47847765e2
Add M410 QuickStop command
10 years ago
b09a957fce
make 'wait' optional and mark as workaround
10 years ago
63b98b8280
Raise Z for M401 and M402
10 years ago
d69da22f7c
last_command_time inside get_command()
10 years ago
574e2d856e
remove config
10 years ago
cde5eee2a5
Removed unnecessary comments
10 years ago
e1b69db6d1
Fixed M48 mismatch between n and P parameter on documentation
10 years ago
e0e68c5cbc
Rename servos[] array in Marlin to servo[]
10 years ago
642f6a92bc
fix type of code_has_value
10 years ago
17ad80c1e1
Spacing in XYZ_CONSTS
10 years ago
09d60e0128
Naming and code comments
10 years ago
5a9e45cc4a
Fix Syntax Error Filament Runout Statement
10 years ago
ccddc280be
Apply three more commits
10 years ago
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
5fe382949b
Some G-Codes comment cleanup
10 years ago
8b16ebe705
Break out prevent_dangerous_extrude feature
...
- It’s inline here, but could be a macro and duplicated for
`planner.cpp`
10 years ago
9189cc66ab
Fix moves for DELTA for MANUAL_BED_LEVELING
...
- Use `line_to_current` in place of `plan_buffer_line`
10 years ago
2ca099d1e7
Merge pull request #1876 from thinkyhead/cold_extrude
...
Catch dangerous extrude before trying several
10 years ago
a00ebf03d4
Merge pull request #1868 from AnHardt/LCD_STR
...
Moved the definitions of the LCD_STR_* to Conditionals.h
10 years ago
1269c445ab
Catch dangerous extrude before trying several
10 years ago
540dbb35e2
And an other MSG_BED in Marlin_main.cpp
10 years ago
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
6a514f3dc9
Aplied HAS_LCD_CONTRAST also to Marlin_main.cpp
...
and cleaned typo.
10 years ago
3162971cd6
current_position not static
10 years ago
27cb90da8b
IsStopped / IsRunning inline
10 years ago
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
f7c4e7e19f
Fix G29 not deploying in some instances
10 years ago
002340f32c
Merge branch 'Development-Marlin' into Development
10 years ago
c379f17117
Encapsulate setting of homing_bump_feedrate
10 years ago
d20f42c883
Don't stow the probe until the last grid point!
...
- Address Issue #1682 at hash #issuecomment-89756858
10 years ago
6d084c017f
Fix typo in FWRETRACT handler
...
Should be `retracting` and not `retract`
10 years ago
2f0081bbb5
Compile error fix! Fix for merge artifacts.
10 years ago
ea10601406
Merge branch 'Development-Marlin' into Development
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
10 years ago
61f8394361
Compare indices instead of floats for probe actions
10 years ago
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
c065da52ec
Spacing and spelling
10 years ago
8680b515b0
Fix missing tmp_extruder -> target_extruder
10 years ago
c185912c19
Latest upstream commits, mostly
10 years ago
1e5c18bb14
Add code_value_short and SERIAL_CHAR
10 years ago
84e4edaea7
Add M48 comment for #1794
10 years ago
b98ebd517e
disable / enable_all_steppers functions
10 years ago
713953d8c1
Upstream commits, allow no extruder in M105
10 years ago
8f893eb8df
Merge pull request #1798 from thinkyhead/fixup_probing
...
Fix probe height at G28 start
10 years ago
dde7e11f8e
Merge branch 'Development' into fixup_tr
...
Latest upstream commits
10 years ago
abd7fc36b6
Fix probe height at G28 start
10 years ago
610c8c5471
Merge pull request #1795 from thinkyhead/fixup_probing
...
Finish pin tests
10 years ago
e4934164e4
Merge pull request #1790 from Wurstnase/fix_home_z
...
fix feedrate for homing z
10 years ago
a469d796e1
Add cleanups needed for #1772
10 years ago
c0ca26cd50
Merge branch 'Development' into fixup_probing
...
Latest upstream commits
10 years ago
5c1f08a35f
Merge pull request #1772 from croadfeldt/Merge_cleanup
...
Z_PROBE_ENDSTOP
10 years ago
92119d0f7d
Static delta[] for SCARA
10 years ago
6b919e14c1
Group all universal variables
10 years ago
21cd2e4fae
Merge branch 'Development' into fixup_probing
...
Latest upstream commits
10 years ago
0e8182bbf2
Additional pin tests, cleanup
10 years ago
45565b680d
second wrong feedrate
10 years ago
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
23cd54755f
Fix typo in Marlin_main.cpp
...
related to current_position[Z_AXIS] and retract_zlift.
'+ =' -> '+='
Fix for #1786
10 years ago
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
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
26dc80bf2d
Typo fixed...
10 years ago
a57862e29f
Cleaning up code in prep for merge with upstream.
10 years ago
745d9fe1a4
Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup
...
Conflicts:
Marlin/Marlin_main.cpp
10 years ago
9593f09b99
Merge pull request #1764 from thinkyhead/probe_leveling
...
Fix homing and leveling
10 years ago
72c7de3570
Cleanup M48
10 years ago
97a258b0b0
Clean up, document home_axis
10 years ago
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
fdb4ddbdea
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
10 years ago
1c7391717e
Include sync_plan_position_delta for SCARA also
10 years ago
0b57a2ab8b
Merge pull request #1757 from bq/Translation-strings
...
Added new trasnslatable labels.
10 years ago
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
c89b8368ee
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Marlin_main.cpp
10 years ago
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
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
5f6962dd90
Merge pull request #1755 from thinkyhead/fixup_config
...
Raise when not retracting
10 years ago
ae89ccd2c7
Use Z_RAISE_BETWEEN_PROBINGS
10 years ago
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
2a45922afe
Restore extruder_offset, init more simply
10 years ago
28792e5731
Fix typo in assignment
10 years ago
bb6174524f
Fix EXTRUDER_OFFSET compiler error
...
- Addressing issue #1741
10 years ago
45ece5afb1
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
10 years ago
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
50145266cd
Merge pull request #1748 from thinkyhead/raise_before_homing
...
Apply Z_RAISE_BEFORE_HOMING before homing XY
10 years ago
a117b6bff6
Merge pull request #1747 from thinkyhead/progress_bar_tweak
...
Fix up LCD_PROGRESS_BAR
10 years ago
faac2af4af
Merge remote-tracking branch 'origin/Development' into Development
10 years ago
3be00cce6f
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Configuration.h
10 years ago
e08f8eed05
Revert 06f767d..cba5692
...
This rolls back to commit 06f767d608
10 years ago
992b07ca57
Don't disable Z_RAISE_BEFORE_HOMING when Z_PROBE_AND_ENDSTOP is enabled.
10 years ago
cba5692673
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Marlin_main.cpp
Marlin/stepper.cpp
10 years ago
8500c80b33
Apply Z_RAISE_BEFORE_HOMING before homing XY
10 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.
10 years ago
8c136a5ab5
Conditionals and comments for PS = 0
10 years ago
2faed961ce
Allow POWER_SUPPLY 0 for no power switch
10 years ago
baa6787393
Merge pull request #1740 from thinkyhead/fixup_homing
...
Apply leveling for DELTA
10 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.
10 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.
10 years ago
06f767d608
Merge remote-tracking branch 'upstream/development' into development
10 years ago
e96db1cd6c
Make G29 shared function inline
10 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
10 years ago
ce44bee28b
Small code reduction
10 years ago
0213f7f016
Cleanup case for M666
10 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
10 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
10 years ago
62834a1c43
Don't deploy probe on Z Axis homing if Z_PROBE_AND_ENDSTOP is enabled,
...
unless Z_SAFE_HOMING is.
10 years ago
08a7aa16c5
Don't deploy Z Probe on Z homing if Z_PROBE_AND_ENDSTOP is defined.
10 years ago
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
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
2b0c25a091
Tweak G92 to call plan_set_position only once, yes?
10 years ago
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
fd823449ad
Added serial message for Z Probe trigger.
10 years ago
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
ba871e46bf
Fix compiler warnings
...
- Patched up for most included configurations
10 years ago
ffe0df4b36
Latest upstream commits
10 years ago
578f93bc26
Fixup temp arrays and leveling equation, prepare for merge
10 years ago
460f73056b
Fix ECHOPAIR ambiguity
...
- Also patch up some warnings
10 years ago
19d418cd6a
Fix up the code to eliminate warnings
10 years ago
267d6bef15
Eliminate most warnings
...
- Fix a bug reading `code_value` for `M503 Sn`
- Hide and remove unused variables
10 years ago
b76a352d41
Fix the planeNormal calculation
10 years ago
0b32431551
Remove abs() from planeNormal.z
10 years ago
06eb7f5b3c
Latest upstream commits
10 years ago
04328d7537
Add zprobe_zoffset in set_bed_level_equation_*
...
- Also a small tweak to SanityCheck.h
10 years ago
ebe5b87c2c
< like in the oher compareble loops
...
to avoid:
Marlin_main.cpp:1790: warning: array subscript is above array bounds.
10 years ago
fbf9b21e0c
Merge plus fixup zprobe_zoffset
...
- Make `zprobe_zoffset` conditional
- Fix ConfigurationStore for `zprobe_zoffset`
10 years ago
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
d43d47da14
Clean "fromsd" array is not SDSUPPORT
...
if not have SDSUPPORT the fromsd array is not necessary
10 years ago
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
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
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
0d81abe1c9
Merge branch 'Development' into config_testing
...
Latest upstream commits
10 years ago
b26a3ea02c
Merge pull request #1662 from josla972/refactor_scara
...
Refactor SCARA calibration. Save some lines of code and possibly ROM.
10 years ago
4fbb80567e
Get upstream commits
10 years ago
146501215f
Fix mangled probe_pt calls
...
- Address issue #1669
- Remove the TOPO_ORIGIN configuration setting
10 years ago
15345cc249
Corrected Z_PROBE_ALLEN_KEY behaviour.
10 years ago
0f034dd97e
Clean up Z_RAISE_AFTER_PROBING to work the same in all code paths except Z_PROBE_SLED.
10 years ago
6c96f32069
Blind fix for #1507
10 years ago
379348487e
Removed malplaced comment.
10 years ago
9b3462f73f
Refactor SCARA calibration. Save some lines of code and possibly ROM.
10 years ago
691e753cc3
Don't add home offsets in G29
...
- Address #1262 by leaving values as set
- Rename `add_homing` to `home_offset`
10 years ago
15eb5d35a2
Merge branch 'Development' into config_testing
...
Latest upstream commits
10 years ago
3d0a060a7a
Added G29 command
10 years ago
63d5d28085
Merge branch 'Development' into config_testing
...
Latest upstream changes
10 years ago
4619d80524
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
10 years ago
2424713a8f
Merge pull request #1640 from AnHardt/warning6
...
codepos not used in gcode_M28()
10 years ago
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
a61f679568
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
10 years ago
c87faa69ed
Shortened mesh_plan_buffer_line()
10 years ago
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
80e0ee10ca
Merge pull request #1631 from AnHardt/iss1593
...
Decrease KILL_DELAY
10 years ago
76127b8a55
Merge pull request #1630 from Wurstnase/fix_g29
...
optional parameters must be named when ignoring order
10 years ago
8664c6d465
Merge pull request #1638 from AnHardt/warning4
...
delta[3] not used when DELTA not defined.
10 years ago
10711ccc6a
Merge pull request #1639 from AnHardt/warning5
...
G4 could wait for an undefined time
10 years ago
240b5cfe04
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
10 years ago
4521f6655b
Restore "S" parameter of M204 for retrocompatibility.
10 years ago
5ddb8d94e2
Update Documentation related to M204
10 years ago
f8c4d43886
delta[3] is used with SCARA
...
Shoot in the dark.
10 years ago
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
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
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
d1658eebfc
Decrease KILL_DELAY
...
Users hat to press kill-button for unexpexted lon times.
See #1593
10 years ago
00adb2a6c1
optional parameters must be named when ignoring order
10 years ago
0d43898a22
Remove of mesh_plan_buffer_line parameter reference (e)
10 years ago
8067a985ce
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
...
Fixed conflicts:
Marlin/planner.h
10 years ago
3570447ded
Fix Z_RAISE_AFTER_PROBING
10 years ago
8a739b6fba
Merge branch 'Development' into delta_auto_bed_level
...
Conflicts:
Marlin/Marlin_main.cpp
10 years ago
a686c9878f
Move TOPO_ORIGIN define to Configuration.h
...
- Addressing issue #1608
10 years ago
8005d22c81
Added menu option for bed leveling.
10 years ago
0e51e53813
WIP. Adding bed leveling code.
10 years ago
7bc77dc134
Merge pull request #1583 from galexander1/m404fix
...
M404 should not use 'N' address as parameter because 'N' is reserved
10 years ago
b80ed51fcc
Fix controllerFan() code
...
- Add support for 4th extruder
- Fix parentheses matching
- Apply coding standards
- Address issue mentioned at #1575
10 years ago
bb4cb1b15a
Merge pull request #1606 from thinkyhead/cleanup_stepper
...
Cleanup of stepper.cpp
10 years ago
d3259d0dba
Merge pull request #1581 from msutas/Development
...
Filament Runout Sensor Feature
10 years ago
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
2f3c77b751
Fix decimal places in G29 Bed Equation Coeficients
10 years ago
e4d77a6313
Merge pull request #1554 from 2PrintBeta/Development
...
Macro indirection for stepper drivers + Support for TMC26X and L6470 Stepper Drivers
10 years ago
b373826428
Merge pull request #2 from MarlinFirmware/Development
...
update
10 years ago
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
888cf161bd
fix travel speed option for G29
...
I forgot to enclousure the variable with #ifdef
10 years ago
af63b54562
Add travel speed option to G29 command line
10 years ago
60ceca1bc1
Add speed configuration for home-bumping movement
10 years ago
d813090d90
Merge remote-tracking branch 'remotes/upstream/Development' into Development
...
Conflicts:
Marlin/Marlin_main.cpp
Marlin/stepper.cpp
10 years ago
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
53abc5e2f1
Merge branch 'Development' into delta_auto_bed_level
10 years ago
956fb2d278
Merge pull request #1 from MarlinFirmware/Development
...
update
10 years ago
624f23f550
Merge pull request #1575 from Wurstnase/fix-controllerFan
...
Fix controller fan
10 years ago
424c747fb3
Enable M401 and M402 for deltas with allen key z-probes.
10 years ago
0d593ab7c1
Fix debug message
10 years ago
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
ed7874b4e0
M404 should not use 'N' address as parameter because 'N' is reserved for the line number
10 years ago
b9dfa5cad4
use code_value_long() instead of (int)code_value()
10 years ago
901b03d020
use strtol() instead of strtod() when an integer value is desired
10 years ago
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
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
a5342c942e
Update Marlin_main.cpp
10 years ago
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
254970c92a
Merge pull request #1570 from C-o-r-E/escape_fix
...
Fixes gCode handling of comments and escaped characters
10 years ago
25dc79f124
Remove M48 credits also
10 years ago
34e51f576f
Fix compile error in gcode_G29
...
- A redo of #1576 , which missed topo_flag
- Always set verbose_level
10 years ago
62bd734612
fix controllerFan() for inverted enable pins
...
add ```^ !(n_ENABLE_ON)``` for each stepper
10 years ago
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
99fb1bc3e8
Attempt to resolve #1568 and add basic escape character support
10 years ago
cdc38aa783
Move gcode handlers into inline functions
10 years ago
6d9e9a6bef
Merge branch 'Development' into enhanced_g29
...
Latest upstream changes
10 years ago
4db2179f5c
Include 4th extruder support
10 years ago
f90a947e65
Fix autoretract
...
Autoretract was broken, looks like it was overlooked when the retracted flag was updated for multi extruders.
10 years ago
2ef6b3d57a
Fix wrong defines, broken syntax
10 years ago
32744d41a9
Do sanity checking on LRFB values
...
- Setting boundaries based on configured limits, contrasting with G28
(which forgets these limits?)
10 years ago
075507fb9a
missed one X_ENABLE_PIN
10 years ago
dfb38874f8
Some suggested changes for #1555
10 years ago
7f8ea7105f
Arrange ProbeAction values bitwise
10 years ago
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
874d3d3fc5
Add support for solenoid articulated extruders
10 years ago
4a7aca2736
Merge remote-tracking branch 'remotes/upstream/Development' into Development
10 years ago
e30bfedce4
Fix undefined *_PROBE_BED_POSITION error
10 years ago
227ab8c665
Merge pull request #1503 from MarcelMo/patch-2
...
Support for simple customisable AutoZProbing area
10 years ago
c9a3eb0c1a
Spacing in calculate_volumetric_multiplier(s)
10 years ago
0cf0c20532
Optimize calculate_volumetric_multiplier
10 years ago
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
08c236059e
Merge pull request #1505 from thinkyhead/issue_1499
...
Bed leveling probe behavior issue?
10 years ago
159196d1e9
Reset Alert message when finish M600 command
10 years ago
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
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
7866fa161f
Merge pull request #1476 from Natealus/Development
...
Compiling errors with 4 Extruders defined and Viki 2 Implementation
10 years ago
9d75a56b56
Merge remote-tracking branch 'upstream/Development' into Development
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
10 years ago
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
85e5aa4011
Generalized enqueue_commands_P, and moved them to Marlin_main as they should
10 years ago
0cb1029311
remove extra plan_buffer_line
10 years ago
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
9dc5de6166
Hide code that makes veteran geeks go "aha!"
10 years ago
bd387068bb
Apply loops for extruders elsewhere also
10 years ago
4a146d584b
Loop, since the pending feature can use an array
10 years ago
bca884bf72
Realized it's not a bug, but cleanup code anyway
10 years ago
fb7c636ecf
Avoid compiling error
...
Only a missing ","... now it will compile again
10 years ago
073c59c50a
Clean up some formatting
...
- Also partial cleanup of Marlin_main.cpp with a smidgen of Doxygen.
10 years ago
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
dd301be52d
Added suport for multiline G-code commands in the LCD menus
10 years ago
59315330dd
Remove definition of VERSION_STRING and replace where usend with STRING_VERSION
10 years ago
986e723eeb
Add 4th extruder
10 years ago
53f971095d
Revert "Reduce PROGMEM warnings"
10 years ago
5151db5c2f
Merge pull request #1349 from msutas/patch-2
...
Improvement - G29 Option for Not Retracting Servo
10 years ago
ab074dac17
Merge pull request #1344 from grob6000/independent_pid
...
Independent PID parameters for each extruder
10 years ago
d4a665694a
Merge pull request #1350 from odewdney/Development
...
Reduce PROGMEM warnings
10 years ago
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
538859669d
Removing compiler warnings for progmem
10 years ago
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
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
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
1aade4a8e2
Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into Development
10 years ago
8a2e84e3f1
Possible fix for FWRETRACT with 0 zlift.
10 years ago
3a30d45c2e
Revert "issue 968 for dev branch"
10 years ago
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
a18b625534
Merge pull request #1261 from wgm4321/Development
...
Add Filament menu and add Filament/Retract settings to config store.
10 years ago
d02daec08f
fixed compilation
10 years ago
f24c5d82e3
Update Marlin_main.cpp
...
fixed minor typo
10 years ago
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
d1995aec7a
Rename ignore_blocks_queued
...
more speaking name
10 years ago
4122de9d17
change filament issue
...
make a more general solution
10 years ago
cb12161191
Add Filament menu and add Filament/Retract settings to config store.
10 years ago
ec33df0554
Merge branch 'SAV-MkI_merge' into Development
...
Tested for SAV MKI and SAV 3D LCD on lewihe.
10 years ago
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
9eb6df17a7
Consider negative Z Offsets when auto bed leveling is active
10 years ago
050ca9ca13
Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp
10 years ago
d74aabf259
Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation"
10 years ago
60628864ca
Merge pull request #1167 from thinkyhead/sd_freemem
...
Use SdFatUtil::FreeRam() for freeMemory() if there
10 years ago
889d7ba218
Merge pull request #1177 from martin-pr/probing_z_speed
...
Split do_blocking_move() to XY and Z sections
10 years ago
5e7bd2dc87
Merge pull request #1200 from chertykov/Marlin_v1
...
Fix syntax errors in #ifdef
10 years ago
b086394178
Fix syntax errors in #ifdef.
10 years ago
4315c2547a
Update Marlin_main.cpp
...
Changed level and leveling to compensation (except with "verbose_level" and "lcd_reset_alert_level").
10 years ago
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
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
07c6b5ab71
Using axis constants
10 years ago
0450e83fa5
Use SdFatUtil::FreeRam() for freeMemory() if there
10 years ago
60598b4cdd
A few constants where they belong
10 years ago
2ef0669b19
Split do_blocking_move() to XY and Z sections to make sure that the Z homing feedrate is not exceeded
10 years ago
64139f5e5a
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
7562183efc
Skip over spaces first
10 years ago
12b51d6060
Ignore S and P if no value >0 is included.
10 years ago
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
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
b81021f475
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
058e446531
Merge pull request #1037 from filipmu/Filament-Sensor
...
Support for a filament diameter sensor
10 years ago
b360306881
Merge pull request #1073 from WingTangWong/wing-fix-float-delta
...
Wing fix float delta
10 years ago
f989bd5435
Simple code cleanup. Rename "homeing" to homing.
10 years ago
6c5a460e65
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
cb4a6dd2dc
Merge pull request #1065 from oliasmage/Marlin_v1
...
Corrected retract() call for use of auto probe without sled enabled.
10 years ago
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
58eabd21fb
Added ifndef
10 years ago
88d12a762a
Added #ifndef DELTA wrapper to float delta
10 years ago
3b8216bdd1
Corrected #endif and ifdef for Z_PROBE_SLED code.
10 years ago
37799f70ba
Corrected retract() call for use of auto probe without sled enabled.
10 years ago
1632e5e38a
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
018b68a5c4
Merge pull request #976 from cocktailyogi/SCARA_by_Yogi
...
Implemented SCARA-Maths
10 years ago
9887555192
Merge pull request #998 from darconeous/pull-requests/fwretract
...
FWRETRACT fixes
10 years ago
68dd5e635e
Merge pull request #1024 from oliasmage/Marlin_v1
...
Adding Z Probe via sled mounted endstop
10 years ago
25069ed4e9
Merge pull request #1031 from Roxy-3DPrintBoard/Z_PROBE_REPEATABILITY-with-correct-Defaults
...
Z probe repeatability with correct defaults
10 years ago
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
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
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
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
d2fcb3ee56
CAB: Added code for Z-probe with Z endstop mounted on a sled.
11 years ago
3cd7dbcc45
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
c13a831ea1
Merge pull request #1017 from foosel/fix/checksum_truncation_bug
...
Fix for a wrong checksum truncation for certain commands
11 years ago
2d22902d08
Fix for a wrong checksum truncation for certain commands
...
Positioning of string terminator to truncate checksum from the commands
M23, M28, M30, M32, M928 and M117 was off by one, causing the last
letter of the actual command to be truncated instead of just the
checksum.
In case of the SD commands this caused checksummed commands targeting
existing files to fail since the last letter of the filename was
truncated.
In case of M117 this caused the last given letter not to be displayed.
This patch fixes the off-by-one error and sets the null terminator
on the exact position of the * starting the checksum instead of the
character before that.
11 years ago
2f4a20257c
imported last Marlin changes
11 years ago
aacff0d361
Merge pull request #948 from Dim3nsioneer/Marlin_v1
...
Implementation of FW extruder change retract
11 years ago
1fd9a7d476
Fix for FWRETRACT on DELTA printers.
...
Fixes #817
11 years ago
3f2c771d90
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
2242a84218
Changed the declaration of the variable to Marlin_main.cpp to fix issue on commit #965
11 years ago
6e3406d228
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
d86c3cf43c
Changed the type of variable to bool, the name to "cancel_heatup", flags implementation and added this fix to M190 gcode too.
11 years ago
f0cab611db
optimised some math-code
11 years ago
fae7d08698
fixed wrong compiler-option
11 years ago
512f2a3136
restore Branch from Backup
...
sorry for that
11 years ago
cd3220d055
Inverted state logic for forced_heating_stop variable
11 years ago
86b4b805d2
Fixed stop print LCD function on M104
11 years ago
3c927901a4
Implementation of FW extruder change retract
...
FW retraction is extended onto swap retraction invoked by 'G10 S1'.
Bookkeeping of the retract state of all extruders allows for having one
extruder fw standard retracted while another extruder is swap retracted.
An LCD menu item for the swap retract and recover length was added.
11 years ago
efb6d61413
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
38192cb5f3
Add M112 description to Marlin_main
11 years ago
aed5ec008a
Merge pull request #851 from DanNixon/estop
...
Implemented M112
11 years ago
cfb98ef682
More coverity fixes
11 years ago
9db9842aea
Fixed error found by the free coverity tool ( https://scan.coverity.com/ )
...
===================================================
Hi,
Please find the latest report on new defect(s) introduced to ErikZalm/Marlin found with Coverity Scan.
Defect(s) Reported-by: Coverity Scan
Showing 15 of 15 defect(s)
** CID 59629: Unchecked return value (CHECKED_RETURN)
/Marlin_main.cpp: 2154 in process_commands()()
** CID 59630: Operands don't affect result (CONSTANT_EXPRESSION_RESULT)
/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/cores/arduino/Tone.cpp: 319 in tone(unsigned char, unsigned int, unsigned long)()
** CID 59631: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1187 in process_commands()()
** CID 59632: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1193 in process_commands()()
** CID 59633: Out-of-bounds write (OVERRUN)
/temperature.cpp: 914 in disable_heater()()
** CID 59634: Out-of-bounds write (OVERRUN)
/temperature.cpp: 913 in disable_heater()()
** CID 59635: Out-of-bounds read (OVERRUN)
/temperature.cpp: 626 in analog2temp(int, unsigned char)()
** CID 59636: Out-of-bounds read (OVERRUN)
/temperature.cpp: 620 in analog2temp(int, unsigned char)()
** CID 59637: Out-of-bounds write (OVERRUN)
/temperature.cpp: 202 in PID_autotune(float, int, int)()
** CID 59638: Out-of-bounds read (OVERRUN)
/temperature.cpp: 214 in PID_autotune(float, int, int)()
** CID 59639: Out-of-bounds write (OVERRUN)
/Marlin_main.cpp: 2278 in process_commands()()
** CID 59640: Out-of-bounds read (OVERRUN)
/Marlin_main.cpp: 1802 in process_commands()()
** CID 59641: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 51 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
** CID 59642: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 45 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
** CID 59643: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 32 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
________________________________________________________________________________________________________
*** CID 59629: Unchecked return value (CHECKED_RETURN)
/Marlin_main.cpp: 2154 in process_commands()()
2148 }
2149 #endif
2150 }
2151 }
2152 break;
2153 case 85: // M85
CID 59629: Unchecked return value (CHECKED_RETURN)
Calling "code_seen" without checking return value (as is done elsewhere 66 out of 67 times).
2154 code_seen('S');
2155 max_inactive_time = code_value() * 1000;
2156 break;
2157 case 92: // M92
2158 for(int8_t i=0; i < NUM_AXIS; i++)
2159 {
________________________________________________________________________________________________________
*** CID 59630: Operands don't affect result (CONSTANT_EXPRESSION_RESULT)
/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/cores/arduino/Tone.cpp: 319 in tone(unsigned char, unsigned int, unsigned long)()
313 else
314 {
315 // two choices for the 16 bit timers: ck/1 or ck/64
316 ocr = F_CPU / frequency / 2 - 1;
317
318 prescalarbits = 0b001;
CID 59630: Operands don't affect result (CONSTANT_EXPRESSION_RESULT)
"ocr > 65535U" is always false regardless of the values of its operands. This occurs as the logical operand of if.
319 if (ocr > 0xffff)
320 {
321 ocr = F_CPU / frequency / 2 / 64 - 1;
322 prescalarbits = 0b011;
323 }
324
________________________________________________________________________________________________________
*** CID 59631: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1187 in process_commands()()
1181 case 2: // G2 - CW ARC
1182 if(Stopped == false) {
1183 get_arc_coordinates();
1184 prepare_arc_move(true);
1185 return;
1186 }
CID 59631: Missing break in switch (MISSING_BREAK)
The above case falls through to this one.
1187 case 3: // G3 - CCW ARC
1188 if(Stopped == false) {
1189 get_arc_coordinates();
1190 prepare_arc_move(false);
1191 return;
1192 }
________________________________________________________________________________________________________
*** CID 59632: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1193 in process_commands()()
1187 case 3: // G3 - CCW ARC
1188 if(Stopped == false) {
1189 get_arc_coordinates();
1190 prepare_arc_move(false);
1191 return;
1192 }
CID 59632: Missing break in switch (MISSING_BREAK)
The above case falls through to this one.
1193 case 4: // G4 dwell
1194 LCD_MESSAGEPGM(MSG_DWELL);
1195 codenum = 0;
1196 if(code_seen('P')) codenum = code_value(); // milliseconds to wait
1197 if(code_seen('S')) codenum = code_value() * 1000; // seconds to wait
1198
________________________________________________________________________________________________________
*** CID 59633: Out-of-bounds write (OVERRUN)
/temperature.cpp: 914 in disable_heater()()
908 WRITE(HEATER_0_PIN,LOW);
909 #endif
910 #endif
911
912 #if defined(TEMP_1_PIN) && TEMP_1_PIN > -1
913 target_temperature[1]=0;
CID 59633: Out-of-bounds write (OVERRUN)
Overrunning array "soft_pwm" of 1 bytes at byte offset 1 using index "1".
914 soft_pwm[1]=0;
915 #if defined(HEATER_1_PIN) && HEATER_1_PIN > -1
916 WRITE(HEATER_1_PIN,LOW);
917 #endif
918 #endif
919
________________________________________________________________________________________________________
*** CID 59634: Out-of-bounds write (OVERRUN)
/temperature.cpp: 913 in disable_heater()()
907 #if defined(HEATER_0_PIN) && HEATER_0_PIN > -1
908 WRITE(HEATER_0_PIN,LOW);
909 #endif
910 #endif
911
912 #if defined(TEMP_1_PIN) && TEMP_1_PIN > -1
CID 59634: Out-of-bounds write (OVERRUN)
Overrunning array "target_temperature" of 1 2-byte elements at element index 1 (byte offset 2) using index "1".
913 target_temperature[1]=0;
914 soft_pwm[1]=0;
915 #if defined(HEATER_1_PIN) && HEATER_1_PIN > -1
916 WRITE(HEATER_1_PIN,LOW);
917 #endif
918 #endif
________________________________________________________________________________________________________
*** CID 59635: Out-of-bounds read (OVERRUN)
/temperature.cpp: 626 in analog2temp(int, unsigned char)()
620 if(heater_ttbl_map[e] != NULL)
621 {
622 float celsius = 0;
623 uint8_t i;
624 short (*tt)[][2] = (short (*)[][2])(heater_ttbl_map[e]);
625
CID 59635: Out-of-bounds read (OVERRUN)
Overrunning array "heater_ttbllen_map" of 1 bytes at byte offset 1 using index "e" (which evaluates to 1).
626 for (i=1; i<heater_ttbllen_map[e]; i++)
627 {
628 if (PGM_RD_W((*tt)[i][0]) > raw)
629 {
630 celsius = PGM_RD_W((*tt)[i-1][1]) +
631 (raw - PGM_RD_W((*tt)[i-1][0])) *
________________________________________________________________________________________________________
*** CID 59636: Out-of-bounds read (OVERRUN)
/temperature.cpp: 620 in analog2temp(int, unsigned char)()
614 if (e == 0)
615 {
616 return 0.25 * raw;
617 }
618 #endif
619
CID 59636: Out-of-bounds read (OVERRUN)
Overrunning array "heater_ttbl_map" of 1 2-byte elements at element index 1 (byte offset 2) using index "e" (which evaluates to 1).
620 if(heater_ttbl_map[e] != NULL)
621 {
622 float celsius = 0;
623 uint8_t i;
624 short (*tt)[][2] = (short (*)[][2])(heater_ttbl_map[e]);
625
________________________________________________________________________________________________________
*** CID 59637: Out-of-bounds write (OVERRUN)
/temperature.cpp: 202 in PID_autotune(float, int, int)()
196 {
197 soft_pwm_bed = (MAX_BED_POWER)/2;
198 bias = d = (MAX_BED_POWER)/2;
199 }
200 else
201 {
CID 59637: Out-of-bounds write (OVERRUN)
Overrunning array "soft_pwm" of 1 bytes at byte offset 1 using index "extruder" (which evaluates to 1).
202 soft_pwm[extruder] = (PID_MAX)/2;
203 bias = d = (PID_MAX)/2;
204 }
205
206
207
________________________________________________________________________________________________________
*** CID 59638: Out-of-bounds read (OVERRUN)
/temperature.cpp: 214 in PID_autotune(float, int, int)()
208
209 for(;;) {
210
211 if(temp_meas_ready == true) { // temp sample ready
212 updateTemperaturesFromRawValues();
213
CID 59638: Out-of-bounds read (OVERRUN)
Overrunning array "current_temperature" of 1 4-byte elements at element index 1 (byte offset 4) using index "extruder" (which evaluates to 1).
214 input = (extruder<0)?current_temperature_bed:current_temperature[extruder];
215
216 max=max(max,input);
217 min=min(min,input);
218 if(heating == true && input > temp) {
219 if(millis() - t2 > 5000) {
________________________________________________________________________________________________________
*** CID 59639: Out-of-bounds write (OVERRUN)
/Marlin_main.cpp: 2278 in process_commands()()
2272 tmp_extruder = code_value();
2273 if(tmp_extruder >= EXTRUDERS) {
2274 SERIAL_ECHO_START;
2275 SERIAL_ECHO(MSG_M200_INVALID_EXTRUDER);
2276 }
2277 }
CID 59639: Out-of-bounds write (OVERRUN)
Overrunning array "volumetric_multiplier" of 1 4-byte elements at element index 1 (byte offset 4) using index "tmp_extruder" (which evaluates to 1).
2278 volumetric_multiplier[tmp_extruder] = 1 / area;
2279 }
2280 break;
2281 case 201: // M201
2282 for(int8_t i=0; i < NUM_AXIS; i++)
2283 {
________________________________________________________________________________________________________
*** CID 59640: Out-of-bounds read (OVERRUN)
/Marlin_main.cpp: 1802 in process_commands()()
1796 int pin_status = code_value();
1797 int pin_number = LED_PIN;
1798 if (code_seen('P') && pin_status >= 0 && pin_status <= 255)
1799 pin_number = code_value();
1800 for(int8_t i = 0; i < (int8_t)sizeof(sensitive_pins); i++)
1801 {
CID 59640: Out-of-bounds read (OVERRUN)
Overrunning array "sensitive_pins" of 28 2-byte elements at element index 55 (byte offset 110) using index "i" (which evaluates to 55).
1802 if (sensitive_pins[i] == pin_number)
1803 {
1804 pin_number = -1;
1805 break;
1806 }
1807 }
________________________________________________________________________________________________________
*** CID 59641: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 51 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
45 }
46
47 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable,
48 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
49 {
50 init(1, rs, 255, enable, d0, d1, d2, d3, 0, 0, 0, 0);
CID 59641: Uninitialized scalar field (UNINIT_CTOR)
Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls.
51 }
52
53 void LiquidCrystal::init(uint8_t fourbitmode, uint8_t rs, uint8_t rw, uint8_t enable,
54 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
55 uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
56 {
________________________________________________________________________________________________________
*** CID 59642: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 45 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
39 }
40
41 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable,
42 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
43 {
44 init(1, rs, rw, enable, d0, d1, d2, d3, 0, 0, 0, 0);
CID 59642: Uninitialized scalar field (UNINIT_CTOR)
Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls.
45 }
46
47 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable,
48 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
49 {
50 init(1, rs, 255, enable, d0, d1, d2, d3, 0, 0, 0, 0);
________________________________________________________________________________________________________
*** CID 59643: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 32 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
26
27 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable,
28 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
29 uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
30 {
31 init(0, rs, rw, enable, d0, d1, d2, d3, d4, d5, d6, d7);
CID 59643: Uninitialized scalar field (UNINIT_CTOR)
Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls.
32 }
33
34 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable,
35 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
36 uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
37 {
________________________________________________________________________________________________________
To view the defects in Coverity Scan visit, http://scan.coverity.com/projects/2224?tab=overview
11 years ago
e541323741
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
21ec6b88c3
Update Marlin_main.cpp
...
Added description of autotemp flags to M109
11 years ago
6adbdf42e0
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
27d544ac25
Speed up QUICK_HOME feedrate for diagonal move
...
Speed up the diagonal move while still keeping each individual axis at
or below its homing feedrate.
11 years ago
95ad6ec9a1
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
27a7cf9fcf
use existing strings
11 years ago
b0aeac117f
Adjustable Z probe offset, via custom M-code
11 years ago
73b380d8d2
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
c23376f2e7
Merge pull request #837 from whosawhatsis/fwretract
...
FWRETRACT in mm/s
11 years ago
9a5d23d96f
Merge pull request #866 from sakunamary/Marlin_v1
...
fix bug for dual extruders not working
11 years ago
303ee67896
Merge pull request #864 from whosawhatsis/M200
...
fix bug in M200 with multiple extruders
11 years ago
8759508319
fix bug for dual extruders not working
...
some guy find that marlin not working good for dual extruders delta .
when type T0 or T1 to active extruder and E0 or E1 move causing XYZ
motion . so i locales the bugs and fix it , I have dry run the fix.
11 years ago
a65564eef6
fix bug in M200 with multiple extruders
11 years ago
aeaf9b9312
fix bug in M200 with multiple extruders
11 years ago
f643f4d674
Test and refactor
11 years ago
bbe8fbe13d
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
3906f27c46
Individual extruder flow rate
...
Extension of M221, Tune menu
11 years ago
a38c90ee84
Added estop handling
11 years ago
272072fa20
Added M112
11 years ago
aab61e63c3
FWRETRACT in mm/s
...
Firmware retraction now stores the retract and recover speeds in mm/s
instead of mm/min. This makes it match the units of the maximum
feedrate, and fixes problems with modifying the value via LCD control
panel. From gcode, the values are still taken in mm/min to match the
units of G1 and similar, and they are converted to mm/s before they are
stored.
I also lowered the default retract feedrate to make it less likely to
cause problems for geared extruders when the user hasn’t bothered to
set a reasonable maximum feedrate, though users should be setting both
of these values to suit their hardware.
11 years ago
09af1b90b8
Added CHDK support
...
Added CHDK support to take pictures instead of doing an IR command, see more about how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
11 years ago
7325d7102e
Activate LiquidTWI2 device detection and space-pad LCD status line.
11 years ago
8ea5665ee2
Merge remote-tracking branch 'origin/Marlin_v1' into add/M665-set-delta-configuration
...
Conflicts:
Marlin/Marlin_main.cpp
11 years ago
fdce91192e
Various typo fixes - only in comments, no code changes.
11 years ago
77df0d689a
autretract fix
...
I made these changes previously, but I can’t find the commit now. This
reapplies the changes to get auto retract working again.
Conflicts:
Marlin/Configuration_adv.h
Marlin/Marlin_main.cpp
11 years ago
174b8d99d5
Simplify 3-point probing using new code only
11 years ago
3b718b816c
better documentation
11 years ago
34fd59c370
ABL at any points
11 years ago
9fa328e5c8
Merge pull request #793 from MissionSt/use_axis_enums
...
Use constants instead of numeric literals
11 years ago
f308a8af91
update comment
11 years ago
357e31270a
Prevent G29 without first homing in X and Y
...
If position is unknown, then G29 can be dangerous.
11 years ago
d2d7d186b5
Use descriptive constants, more
11 years ago
2ccdf4f36d
Use descriptive constants instead of numeric literals
11 years ago
46bae30573
Merge pull request #776 from whosawhatsis/fwretract
...
Fwretract fixes, cleanup
11 years ago
af9395ac2e
Add M605 to dynamically set delta configuration
...
Save above configs in eeprom
fix docs in createTemperatureLookupMarlin.py
add missing azteegX3pro digipot settings in delta example config
11 years ago
fd42f0d226
Merge pull request #783 from MissionSt/fix/syntax-error
...
Fix compile error
11 years ago
96217bf36a
Merge pull request #777 from PxT/M114
...
Add whitespace to M114 output
11 years ago
d1c64b9dc4
Fix syntax error introduced in 477b6fa1d
11 years ago
Scott Lahteine