Scott Lahteine
6c27eaf864
Merge pull request #2101 from thinkyhead/code_style
...
Code style and a dangling "else"
10 years ago
Scott Lahteine
d580a0d186
Use "+=" in plane rotation
10 years ago
Scott Lahteine
2f3a410cb0
Fix a potential hanging "else" bug
10 years ago
Scott Lahteine
b83e3f0905
Combine "Bed X: " strings
10 years ago
Scott Lahteine
7dfb8becdb
Adjust some names and types in Marlin_main.cpp
10 years ago
Scott Lahteine
c966aa26ff
Comments in Marlin_main.cpp
10 years ago
Scott Lahteine
c54a2ea042
Adjust spacing in Marlin_main.cpp and stepper.*
10 years ago
Scott Lahteine
072625ccad
Update headings in Marlin_main.cpp and stepper.cpp
10 years ago
Scott Lahteine
16032f149f
Rename to codenum as a consistency
10 years ago
Scott Lahteine
273a4a253f
Merge pull request #2096 from thinkyhead/cherry_picking3
...
Hide M117 with no LCD
10 years ago
Scott Lahteine
64825a3d1e
Merge pull request #2095 from thinkyhead/cherry_picking2
...
Add gcode_line_error to reduce code size
10 years ago
Scott Lahteine
ca79282eaf
Hide M117 with no LCD
10 years ago
Scott Lahteine
ce218cafdb
Add gcode_line_error to reduce code size
10 years ago
Scott Lahteine
46d59784ad
Rename preocess_command to process_next_command
10 years ago
Scott Lahteine
19166a92e4
Merge pull request #2057 from Wurstnase/serial_wait
...
add plan buffer remaining for 'P' and block buffer remaining 'B'
10 years ago
Scott Lahteine
e97fcafd0e
Merge pull request #2076 from thinkyhead/mendel_inverting
...
Use MSG_OK in M105
10 years ago
Scott Lahteine
0f6cd3640b
Drop extraneous ok_to_send
10 years ago
Scott Lahteine
0ce355d9e7
Use MSG_OK in M105
10 years ago
Scott Lahteine
7b3acfbb6f
Merge pull request #2072 from thinkyhead/better_arc_code
...
Consolidate arc code, remove motion_control.*
10 years ago
Scott Lahteine
68ce419147
Note on segment size
10 years ago
Scott Lahteine
8b92249f18
Bring arc_offset into auto scope
10 years ago
Scott Lahteine
80807b2d71
Consolidate arc code, remove motion_control.*
10 years ago
Scott Lahteine
f65833931d
Formatting tweaks
10 years ago
Scott Lahteine
747fd5801c
Merge pull request #2055 from thinkyhead/thermal_unified
...
Combine thermal runaway and watch-period
10 years ago
Scott Lahteine
6e5572228d
Merge pull request #2064 from thinkyhead/wait_before_g28
...
Split up prepare_move by type
10 years ago
Scott Lahteine
27ad381e25
Allow fractional seconds in G4 and M0
10 years ago
Scott Lahteine
b2bd9aae7c
SCARA_SEGMENTS_PER_SECOND
10 years ago
Scott Lahteine
bd20bd5444
Merge pull request #2063 from chris-bo/autobed_sled
...
improve sled handling
10 years ago
Scott Lahteine
9e95ceb3fc
Split up prepare_move by type
...
- For better encapsulation add inlines for each prepare_move type
- Move controllerFan vars inside the function as statics
- Some formatting cleanup
- Rename `ClearToSend` as `ok_to_send`
10 years ago
Christian Bohn
f48599f172
add pin definition to some motherboards
10 years ago
Scott Lahteine
b5200e184c
Remove extra setup_for_endstop_move
10 years ago
Scott Lahteine
8d814de558
Return void in prevent_dangerous_extrude
10 years ago
Scott Lahteine
367e2eb9f4
Global setup_for_endstop_move
10 years ago
Scott Lahteine
fa951f8a0b
Always do st_synchronize() before G28
10 years ago
Christian Bohn
27a3b1d895
disable sled pin by default
10 years ago
Christian Bohn
fb44b53ae3
sled improvements
...
- create sled pin definition
- G28 Works with sled
10 years ago
Wurstnase
46d1932380
add plan buffer remaining for 'P' and block buffer remaining 'B'
10 years ago
Scott Lahteine
8a0dc4d54a
Merge pull request #1922 from Wurstnase/serial_wait
...
Serial wait
10 years ago
Wurstnase
526ad82d20
activate advanced_ok and no_timeout
10 years ago
Scott Lahteine
2445ae3d3a
Combine thermal runaway and watch-period
...
- Make thermal protection for all hotends and/or bed into simple
switches
- Now enable `WATCH_TEMP_PERIOD` when `THERMAL_PROTECTION_HOTENDS` is
enabled
- Move detailed thermal parameters to `Configuration_adv.h`
- Add sanity checks to warn about old configurations
- Change `WATCH_TEMP_PERIOD` to seconds instead of milliseconds
10 years ago
Scott Lahteine
4097207c75
Merge pull request #2041 from thinkyhead/watch_temp
...
More thermal protection
10 years ago
Scott Lahteine
9b3d4380d3
Only watch the heater that was set
10 years ago
Scott Lahteine
f73f4ce555
Make some z probe and servo code tweaks
10 years ago
Scott Lahteine
54deb9eea3
Enable WATCH_TEMP_PERIOD by default
10 years ago
Wurstnase
0cb87795a3
advanced 'ok'
...
ok N(linenumber) P(bufferremaining)
the host can use this to send the data much faster.
Some pseudo code:
If (bufferremaining > 0) send command
## as long there is free buffer send command
Also
if (linenumber > lastsend - bufferremaining) send command
## as long last linenumber received is bigger than lastsend (host) - last bufferremaining received
10 years ago
Wurstnase
182e0d99c9
Merge remote-tracking branch 'Marlin8bit/Development' into serial_wait
10 years ago
Scott Lahteine
7f3252eea9
Merge pull request #1999 from paclema/Filrunout_configurable_script
...
Added configurable script for filrunout from configuration.h
10 years ago
Scott Lahteine
79633a74ab
Fix MBL compile error
10 years ago
Scott Lahteine
777f2d3820
Merge pull request #2018 from fmalpartida/bugFixing
...
Bug corrected: persistent HOMING message when HOME button pressed for homing.
10 years ago
Scott Lahteine
ecb46de349
Merge pull request #2013 from bq/Fix_lowercase
...
Fixed lowercase change missing on commit a22a228b
.
10 years ago
fmalpartida
150a35eff8
Bug corrected:
...
Persistent homing message.
Message was declared as an alert, therefore it was persistent.
Updated to message.
10 years ago
Gina Häußge
ab246ab032
Reverting changes to error messages on serial console
...
This reverts the changes done to the error message for line number mismatches done in commit d43cc2dd5f
10 years ago
Ivan Galvez Junquera
59529b755d
Fixed lowercase change missing on commit a22a228b
.
...
Servo.cpp and Servo.h were changed to lowercase in Makefile but not their actual filenames.
10 years ago
Scott Lahteine
1f039cde61
Merge pull request #1992 from thinkyhead/too_many_probes
...
Stow Z probe on M402 without extra raise
10 years ago
Scott Lahteine
ca8cec8e8a
Merge pull request #1998 from paclema/Filament_runout_fix
...
Fixed sintaxis error of filament runout
10 years ago
Scott Lahteine
d4c74b8f8c
Don't apply M428 if an error occurs
...
- Also move audio feedback into the command
- Added shorthand for `lcd_buzz` availability
10 years ago
Scott Lahteine
d065d37822
Add M428 to set home_offset logically
10 years ago
paclema
013a09dbe6
Added configurable script for filrunout form configuration.h
10 years ago
paclema
4dcc0fd55a
Fixed sintaxis error of filament runout
10 years ago
Scott Lahteine
ce3caf447b
Tweak how homeaxis deploys and stows
10 years ago
Scott Lahteine
a235dca79c
Stow z on M402 without extra raise
10 years ago
Scott Lahteine
3688256f86
Merge pull request #1974 from thinkyhead/eeprom_in_gcode
...
Make EEPROM reproducible in GCode
10 years ago
Scott Lahteine
31516e2a3b
Merge pull request #1985 from Arengorn/Development
...
Update of servo.h
10 years ago
Scott Lahteine
0f687b5dda
Merge branch 'Development' into eeprom_in_gcode
...
Latest upstream commits
10 years ago
Scott Lahteine
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
Scott Lahteine
71a0b1a5bb
Disable endstops between homing bumps
10 years ago
Scott Lahteine
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
Scott Lahteine
ff178d8cf7
Change M421 to take coordinates
...
This makes `M421` more amenable for irregular matrices
10 years ago
Bernardo
ff67ee73fc
Update Marlin_main.cpp
...
Corrected "servo.h" to "Servo.h" because of the updated filename.
10 years ago
Steve Kelly
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
Scott Lahteine
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
Scott Lahteine
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
Scott Lahteine
a22a228bcc
Rename files to move them in the IDE
10 years ago
Scott Lahteine
0438f0d835
Merge pull request #1924 from thinkyhead/raise_z_for_m401_m402
...
Raise Z for M401 and M402
10 years ago
Scott Lahteine
b275946a52
Merge pull request #1966 from thinkyhead/g4_dwell_message
...
G4 shows status message only if no message is set already
10 years ago
Scott Lahteine
182f2cda35
Minor cleanup of M48
10 years ago
Scott Lahteine
3a6fd912cd
Latest upstream commits, merged
10 years ago
Scott Lahteine
3c9e94e035
Merge pull request #1964 from AnHardt/Max6675again
...
Add variant for MAX6675 in M104
10 years ago
Scott Lahteine
56ff46eb8b
Improve code_has_value test
10 years ago
Scott Lahteine
ce142afdda
G4 shows status message only if no message is set already
...
- Address issue raised in #1961
10 years ago
Scott Lahteine
35e79d56a5
Remove set-coordinate extension of G28
10 years ago
Scott Lahteine
3a74bb5039
Merge pull request #1945 from Wurstnase/max_endstopp
...
Max endstopp
10 years ago
AnHardt
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
Scott Lahteine
588ed70d4a
Latest upstream commits, merged
10 years ago
Scott Lahteine
0165560333
Apply zprobe_zoffset in axis_is_at_home
...
Ensure the probe offset will always be included when homing Z.
10 years ago
Scott Lahteine
075386e7fe
Merge pull request #1959 from thinkyhead/lcd_move_rate
...
Include axis parameter to ultralcd's line_to_current
10 years ago
Scott Lahteine
2558c10c6c
Use the slower feedrate for XY axes
10 years ago
Scott Lahteine
64268f3312
Fixup axis_is_at_home a little
10 years ago
Scott Lahteine
996d0a9185
Squish the code down a little
10 years ago
Scott Lahteine
8534bc376c
Fix homing of YZ with DUAL_X_CARRIAGE
10 years ago
Scott Lahteine
3b97a7d446
Merge pull request #1944 from AnHardt/beep2
...
More Beeper clean up
10 years ago
Wurstnase
be9e4ceddc
fix typo
...
c'n'p ftw :/
10 years ago
unknown
c26d816839
filter any 0
10 years ago
Wurstnase
61ae43f35e
v <-> code_value
10 years ago
Wurstnase
da0d91a79b
max endstopp
...
no user will home to 0 with a max endstopp
10 years ago
AnHardt
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
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