ca40921bf1
Merge branch 'Merge_cleanup' into Development
9 years ago
745d9fe1a4
Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup
Conflicts:
Marlin/Marlin_main.cpp
9 years ago
488666832b
Remove the previously introduced ()
9 years ago
443468df8d
Merge pull request #1771 from AnHardt/iss1770
Added new - changed entries from Fix up LCD_PROGRESS_BAR
9 years ago
9593f09b99
Merge pull request #1764 from thinkyhead/probe_leveling
Fix homing and leveling
9 years ago
7bf31cc8a1
Merge pull request #1768 from atfield90/atfield90-patch-1
Added support for Atmega 1281 chip
9 years ago
72c7de3570
Cleanup M48
9 years ago
97a258b0b0
Clean up, document home_axis
9 years ago
831016b09f
Added new - changed entries from Fix up LCD_PROGRESS_BAR
for when no LCD is defined.
Fix for #1770 .
9 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.
9 years ago
fdb4ddbdea
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
9 years ago
d273c90d53
Added support for Atmega 1281 chip
9 years ago
1c7391717e
Include sync_plan_position_delta for SCARA also
9 years ago
8231fb166d
Merge pull request #1758 from AnHardt/MENU_MULTIPLIER_ITEM
Fix: Audio feedback for MENU_MILTIPLIER_ITEM click
9 years ago
0b57a2ab8b
Merge pull request #1757 from bq/Translation-strings
Added new trasnslatable labels.
9 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
9 years ago
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.
9 years ago
85f8a26ba4
Fix MIN&MAX temperatures again
replaced GE0 with th matching GEX in the second row.
added some ()
9 years ago
19b11dfdd7
Fix can't enter MENU_MULTIPLIER_ITEM
9 years ago
c89b8368ee
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
Conflicts:
Marlin/Marlin_main.cpp
9 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.
9 years ago
be593b600b
Merge pull request #1756 from thinkyhead/fixup_config
Correct XYZ after obtaining plan_bed_level_matrix
9 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.
9 years ago
5f6962dd90
Merge pull request #1755 from thinkyhead/fixup_config
Raise when not retracting
9 years ago
ae89ccd2c7
Use Z_RAISE_BETWEEN_PROBINGS
9 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
9 years ago
6ff1620fcb
Merge pull request #1753 from thinkyhead/fix_extruder_offset
Fix EXTRUDER_OFFSET compiler error
9 years ago
8a4ed3c241
Merge pull request #1754 from thinkyhead/fixup_config
Correct the comment about M206
9 years ago
cda4bd4ad9
Correct the comment about M206
9 years ago
db4d8e835c
Merge pull request #1752 from thinkyhead/fix_lcd_click
Fix LCD click
9 years ago
935592cf6a
offsets off by default
9 years ago
2a45922afe
Restore extruder_offset, init more simply
9 years ago
28792e5731
Fix typo in assignment
9 years ago
bb6174524f
Fix EXTRUDER_OFFSET compiler error
- Addressing issue #1741
9 years ago
571652c49b
Fix LCD click
- Make the default LCD click sound more pleasant
- Fix warnings about bed temperature runaway
9 years ago
45ece5afb1
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
9 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.
9 years ago
21ab44cfa7
Merge pull request #1750 from thinkyhead/fixup_config
Bring all configs up to date
9 years ago
50145266cd
Merge pull request #1748 from thinkyhead/raise_before_homing
Apply Z_RAISE_BEFORE_HOMING before homing XY
9 years ago
a117b6bff6
Merge pull request #1747 from thinkyhead/progress_bar_tweak
Fix up LCD_PROGRESS_BAR
9 years ago
3348b3bf0c
Allow SD_FINISHED_RELEASECOMMAND to be undefined
9 years ago
82794fa5f7
Add delta generic not renaming
9 years ago
ba2c7cb467
Update configs with all the latest
9 years ago
ec1d9c0b8f
Use Z_PROBE_ENDSTOP_INVERTING when checking pin status.
9 years ago
3175c70c79
Manually synching back up with MarlinFirmware/Development.
9 years ago
faac2af4af
Merge remote-tracking branch 'origin/Development' into Development
9 years ago
3be00cce6f
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
Conflicts:
Marlin/Configuration.h
9 years ago
e08f8eed05
Revert 06f767d..cba5692
This rolls back to commit 06f767d608
9 years ago
2e7a4bd7db
Merge pull request #1749 from thinkyhead/fixup_config
Restore ENDSTOPPULLUPS in Configuration.h
9 years ago
5e82ed4f30
Restore ENDSTOPPULLUPS in Configuration.h
9 years ago
Chris Roadfeldt
AnHardt
Scott Lahteine
Scott Lahteine
atfield90
Ivan Galvez Junquera