Commit Graph

2912 Commits (a76fb42ca6c3ca2be28241ce8f7ffd6d40d80f0c)
 

Author SHA1 Message Date
Chris Roadfeldt a57862e29f Cleaning up code in prep for merge with upstream.
Chris Roadfeldt ca40921bf1 Merge branch 'Merge_cleanup' into Development
Chris Roadfeldt 745d9fe1a4 Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup
Conflicts:
	Marlin/Marlin_main.cpp
AnHardt 488666832b Remove the previously introduced ()
Scott Lahteine 443468df8d Merge pull request from AnHardt/iss1770
Added new - changed entries from Fix up LCD_PROGRESS_BAR
Scott Lahteine 9593f09b99 Merge pull request from thinkyhead/probe_leveling
Fix homing and leveling
Scott Lahteine 7bf31cc8a1 Merge pull request from atfield90/atfield90-patch-1
Added support for Atmega 1281 chip
Scott Lahteine 72c7de3570 Cleanup M48
Scott Lahteine 97a258b0b0 Clean up, document home_axis
AnHardt 831016b09f Added new - changed entries from Fix up LCD_PROGRESS_BAR
for when no LCD is defined.
Fix for .
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.
Chris Roadfeldt fdb4ddbdea Merge remote-tracking branch 'MarlinFirmware/Development' into Development
atfield90 d273c90d53 Added support for Atmega 1281 chip
Scott Lahteine 1c7391717e Include sync_plan_position_delta for SCARA also
Scott Lahteine 8231fb166d Merge pull request from AnHardt/MENU_MULTIPLIER_ITEM
Fix: Audio feedback for MENU_MILTIPLIER_ITEM click
Scott Lahteine 0b57a2ab8b Merge pull request from bq/Translation-strings
Added new trasnslatable labels.
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
AnHardt 3f2e863206 Improve conditions for HAS_TEMP
and use them in temperuture.h

Flattened the if structure - the preprocessor is doing the work - not the Arduino. Arduino.
AnHardt 85f8a26ba4 Fix MIN&MAX temperatures again
replaced GE0 with th matching GEX in the second row.
added some ()
AnHardt 19b11dfdd7 Fix can't enter MENU_MULTIPLIER_ITEM
Chris Roadfeldt c89b8368ee Merge remote-tracking branch 'MarlinFirmware/Development' into Development
Conflicts:
	Marlin/Marlin_main.cpp
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.
Scott Lahteine be593b600b Merge pull request from thinkyhead/fixup_config
Correct XYZ after obtaining plan_bed_level_matrix
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.
Scott Lahteine 5f6962dd90 Merge pull request from thinkyhead/fixup_config
Raise when not retracting
Scott Lahteine ae89ccd2c7 Use Z_RAISE_BETWEEN_PROBINGS
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
Scott Lahteine 6ff1620fcb Merge pull request from thinkyhead/fix_extruder_offset
Fix EXTRUDER_OFFSET compiler error
Scott Lahteine 8a4ed3c241 Merge pull request from thinkyhead/fixup_config
Correct the comment about M206
Scott Lahteine cda4bd4ad9 Correct the comment about M206
Scott Lahteine db4d8e835c Merge pull request from thinkyhead/fix_lcd_click
Fix LCD click
Scott Lahteine 935592cf6a offsets off by default
Scott Lahteine 2a45922afe Restore extruder_offset, init more simply
Scott Lahteine 28792e5731 Fix typo in assignment
Scott Lahteine bb6174524f Fix EXTRUDER_OFFSET compiler error
- Addressing issue 
Scott Lahteine 571652c49b Fix LCD click
- Make the default LCD click sound more pleasant
- Fix warnings about bed temperature runaway
Chris Roadfeldt 45ece5afb1 Merge remote-tracking branch 'MarlinFirmware/Development' into Development
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.
Scott Lahteine 21ab44cfa7 Merge pull request from thinkyhead/fixup_config
Bring all configs up to date
Scott Lahteine 50145266cd Merge pull request from thinkyhead/raise_before_homing
Apply Z_RAISE_BEFORE_HOMING before homing XY
Scott Lahteine a117b6bff6 Merge pull request from thinkyhead/progress_bar_tweak
Fix up LCD_PROGRESS_BAR
Scott Lahteine 3348b3bf0c Allow SD_FINISHED_RELEASECOMMAND to be undefined
Scott Lahteine 82794fa5f7 Add delta generic not renaming
Scott Lahteine ba2c7cb467 Update configs with all the latest
Chris Roadfeldt ec1d9c0b8f Use Z_PROBE_ENDSTOP_INVERTING when checking pin status.
Chris Roadfeldt 3175c70c79 Manually synching back up with MarlinFirmware/Development.
Chris Roadfeldt faac2af4af Merge remote-tracking branch 'origin/Development' into Development
Chris Roadfeldt 3be00cce6f Merge remote-tracking branch 'MarlinFirmware/Development' into Development
Conflicts:
	Marlin/Configuration.h
Chris Roadfeldt e08f8eed05 Revert 06f767d..cba5692
This rolls back to commit 06f767d608.
Scott Lahteine 2e7a4bd7db Merge pull request from thinkyhead/fixup_config
Restore ENDSTOPPULLUPS in Configuration.h