3f45a1acf9
Aim: Test probes in update_endstops only when activated Changes: Configurations Add define for FIX_MOUNTED_PROBE to handle the situation where formerly ENDSTOPS_ONLY_FOR_HOMING had to be set, or lowering the nozzle below Z_PROBE_OFFSET_FROM_EXTRUDER could give an "endstop hit" message. Add define for Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to indicate a common situation, that we have a probe but it is connected to an endstop pin Add some comments Shift some entries to have related things together. Conditionals.h We have a probe (HAS_Z_MIN_PROBE) if one of the pins is defined AND one of the probes is defined. SanityCheck.h Add some tests if the probe is connected and if we have defined a probe. stepper.cpp Changes to test the probe only when it is deployed (z_probe_is_active). Test update_endstops() when the probe is deployed. MarlinMain.cpp a. set and reset z_probe_is_active in deploy_z_probe(), stow_z_probe() and dock_sled() b. set and reset z_probe_is_active in the case a z-servo is moved to a defined position. The only remaining unhandled servo move is in M280 where we do not end in a defined position. If you want to handle a probe use M401/402 c. skip deploying/stowing when already deployed/stowed in the dedicated deploy/stow functions. d. Handle the new FIX_MOUNTED_PROBE in parallel to a servo driven probe/endstop. To do: In another PR. handle all probes in deploy/stow_z_probe. Sort out SERVO_LEVELING vs. HAS_SERVO_ENDSTOPS. |
||
---|---|---|
ArduinoAddons | ||
Documentation | ||
LinuxAddons/bin | ||
Marlin | ||
PlatformIOAddons | ||
.astylerc | ||
.gitignore | ||
.travis.yml | ||
LICENSE | ||
README.md |
Marlin 3D Printer Firmware
Additional documentation can be found in [our wiki](https://github.com/MarlinFirmware/Marlin/wiki/Main-Page).Release Candidate -- Marlin 1.1.0-RC3 - 01 December 2015
Not for production use – use with caution!
Previously tagged versions of Marlin are not recommended. However, the latest patches to the Marlin 1.0 series can be found in the 1.0.x branch.
This branch, "RC", is our current pre-release candidate.
Future development takes place in the MarlinDev repository.
Recent Changes
RC3 - 01 Dec 2015 A number of language sensitive strings have been revised Formatting of the LCD display has been improved to handle negative coordinates better Various compiler-related issues have been corrected
RC2 - 29 Sep 2015 File styling reverted LCD update frequency reduced
RC1 - 19 Sep 2015 Published for testing
Submitting Patches
Proposed patches should be submitted as a Pull Request against the RCBugFix branch Note: Do not propose added features. Patches to the Release Candidate are limited to corrections of coding errors for the functions that have been implemented. Please follow the proper style. Pull requests containing styling errors will have to be reworked.
Current Status: Testing
Please test this firmware and inform us of any issues where it fails to perform in a manner consistent with the designed functionality.
RepRap.org Wiki Page
Contact
Google Hangout: . Hangout We have a hangout every 2 weeks. Search the issue list for "Hangout" and you will see what time and date the next event is going on.
Credits
The current Marlin dev team consists of:
- Scott Lahteine [@thinkyhead] - English
- [@Wurstnase] - Deutsch, English
- F. Malpartida [@fmalpartida] - English, Spanish
- [@CONSULitAS] - Deutsch, English
- [@maverikou]
- Chris Palmer [@nophead]
- [@paclema]
- Edward Patel [@epatel] - Swedish, English
- Erik van der Zalm [@ErikZalm]
- David Braam [@daid]
- Bernhard Kubicek [@bkubicek]
- Richard Wackerbarth [@Wackerbarth] - English
- Roxanne Neufeld [@Roxy-3DPrintBoard] - English
More features have been added by:
- Alberto Cotronei [@MagoKimbra]
- Lampmaker,
- Bradley Feldman,
- and others...
License
Marlin is published under the GPL license because we believe in open development. The GPL comes with both rights and obligations. Whether you use Marlin firmware as the driver for your open or closed-source product, you must keep Marlin open, and you must provide your compatible Marlin source code to end users upon request. The most straightforward way to comply with the Marlin license is to make a fork of Marlin on Github, perform your modifications, and direct users to your modified fork.
While we can't prevent the use of this code in products (3D printers, CNC, etc.) that are closed source or crippled by a patent, we would prefer that you choose another firmware or, better yet, make your own.