Merge upstream #2
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Now ending in an endless loop. Tidy up the output format. We now get: ERRORTEXT ", system stopped! Heater_ID: " HEATERID Where ERRORTEXT can be: "Heating failed" "Thermal Runaway" "MAXTEMP triggered" "MINTEMP triggered" and soon "Thermal Jump" HEATERID can be 0, 1, 2 ,3 , "bed" This messages are always followed by the common: "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
Minor wording correction.
language.h: update documentation for LANGUAGE_INCLUDE @thinkyhead What do you think? I think there should be a warning like this.
Fixed a couple defines that were not changed or commented out.
No way to fit Marlin into 32K.
transpire -> expire
Remove Duemilanove
language.h: update documentation / URL für K8200
Added the link to the github information about the ELB_FULL_GRAPHIC_CONTROLLER
Updated all the example Configuration.h files for the new display type.
Add ELB_FULL_GRAPHIC_CONTROLLER with ADAFRUIT_ST7565 display.
move dogm font selection to configuration_adv.h
instead of stop(). We really want to require a reset and no chance to set a new temperature.
Makes the output on the LCD adjustable.
in temperature.cpp
Add a string parameter to kill()
Use _temp_error() for all errors thrown by different heater sanity check mechanisms
Switch to Arduino IDE 1.6.4 for Travis testing
here the othe two occourences of `Z_PROBE_OFFSET_FROM_EXTRUDER` are replaced with `zprobe_zoffset`.
BOARD_ULTIMAKER was not the default any more - sed failed to change the board - RAMPS_EFB has no second extruder - ... - Added test for bed Rebased.
Reactivate tests for more extruders in Travis
in Development
Add MagoKimbra to the list of contributors
verified via 1.0.2 tag that compiles by multiple people, credit for the fix goes to paulusjacobus for the initial find and sniffle for the correction so M851 works.
z-probe offset fix
Z-height fix V2b
- Also fix a bug in `M600` where `Z_MAX_ENDSTOP_INVERTING` is being used as the index into the `destination[AxisEnum]` array.
Enable LCD_PIN_RESET if it exists
Replace "target" with "destination" in M600
Sign flipped with #2167. See also comments #2040 (comment) and following.
Correct the sign of zprobe_zoffset for G29
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.