zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
2747 commits 1 branch 0 tags 156 MiB
Commit graph

2747 commits

This branch
This branch
All branches
Author SHA1 Message Date
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.
 2015-04-01 02:14:55 -05:00
Chris Roadfeldt fdb4ddbdea Merge remote-tracking branch 'MarlinFirmware/Development' into Development 2015-04-01 00:52:08 -05:00
Scott Lahteine 8231fb166d Merge pull request #1758 from AnHardt/MENU_MULTIPLIER_ITEM 
Fix: Audio feedback for MENU_MILTIPLIER_ITEM click
 2015-03-31 19:29:48 -07:00
Scott Lahteine 0b57a2ab8b Merge pull request #1757 from bq/Translation-strings 
Added new trasnslatable labels.
 2015-03-31 18:56:25 -07:00
AnHardt 19b11dfdd7 Fix can't enter MENU_MULTIPLIER_ITEM 2015-03-31 18:29:16 +02:00
Chris Roadfeldt c89b8368ee Merge remote-tracking branch 'MarlinFirmware/Development' into Development 
Conflicts:
	Marlin/Marlin_main.cpp
 2015-03-31 11:08:36 -05:00
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.
 2015-03-31 16:59:43 +02:00
Scott Lahteine be593b600b Merge pull request #1756 from thinkyhead/fixup_config 
Correct XYZ after obtaining plan_bed_level_matrix
 2015-03-31 05:08:41 -07:00
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.
 2015-03-31 04:24:13 -07:00
Scott Lahteine 5f6962dd90 Merge pull request #1755 from thinkyhead/fixup_config 
Raise when not retracting
 2015-03-31 03:47:01 -07:00
Scott Lahteine ae89ccd2c7 Use Z_RAISE_BETWEEN_PROBINGS 2015-03-31 03:45:21 -07:00
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
 2015-03-31 03:38:03 -07:00
Scott Lahteine 6ff1620fcb Merge pull request #1753 from thinkyhead/fix_extruder_offset 
Fix EXTRUDER_OFFSET compiler error
 2015-03-31 03:21:45 -07:00
Scott Lahteine 8a4ed3c241 Merge pull request #1754 from thinkyhead/fixup_config 
Correct the comment about M206
 2015-03-31 03:20:57 -07:00
Scott Lahteine cda4bd4ad9 Correct the comment about M206 2015-03-31 03:20:15 -07:00
Scott Lahteine db4d8e835c Merge pull request #1752 from thinkyhead/fix_lcd_click 
Fix LCD click
 2015-03-31 02:52:17 -07:00
Scott Lahteine 935592cf6a offsets off by default 2015-03-31 02:50:52 -07:00
Scott Lahteine 2a45922afe Restore extruder_offset, init more simply 2015-03-31 02:49:47 -07:00
Scott Lahteine 28792e5731 Fix typo in assignment 2015-03-31 02:10:49 -07:00
Scott Lahteine bb6174524f Fix EXTRUDER_OFFSET compiler error 
- Addressing issue #1741
 2015-03-31 02:08:57 -07:00
Scott Lahteine 571652c49b Fix LCD click 
- Make the default LCD click sound more pleasant
- Fix warnings about bed temperature runaway
 2015-03-31 01:41:24 -07:00
Chris Roadfeldt 45ece5afb1 Merge remote-tracking branch 'MarlinFirmware/Development' into Development 2015-03-31 03:07:57 -05:00
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.
 2015-03-31 02:56:41 -05:00
Scott Lahteine 21ab44cfa7 Merge pull request #1750 from thinkyhead/fixup_config 
Bring all configs up to date
 2015-03-30 23:49:04 -07:00
Scott Lahteine 50145266cd Merge pull request #1748 from thinkyhead/raise_before_homing 
Apply Z_RAISE_BEFORE_HOMING before homing XY
 2015-03-30 23:37:41 -07:00
Scott Lahteine a117b6bff6 Merge pull request #1747 from thinkyhead/progress_bar_tweak 
Fix up LCD_PROGRESS_BAR
 2015-03-30 23:37:28 -07:00
Scott Lahteine 3348b3bf0c Allow SD_FINISHED_RELEASECOMMAND to be undefined 2015-03-30 23:31:48 -07:00
Scott Lahteine 82794fa5f7 Add delta generic not renaming 2015-03-30 23:25:04 -07:00
Scott Lahteine ba2c7cb467 Update configs with all the latest 2015-03-30 23:24:33 -07:00
Chris Roadfeldt ec1d9c0b8f Use Z_PROBE_ENDSTOP_INVERTING when checking pin status. 2015-03-31 01:06:01 -05:00
Chris Roadfeldt 3175c70c79 Manually synching back up with MarlinFirmware/Development. 2015-03-31 00:11:11 -05:00
Chris Roadfeldt faac2af4af Merge remote-tracking branch 'origin/Development' into Development 2015-03-31 00:03:07 -05:00
Chris Roadfeldt 3be00cce6f Merge remote-tracking branch 'MarlinFirmware/Development' into Development 
Conflicts:
	Marlin/Configuration.h
 2015-03-30 23:59:01 -05:00
Chris Roadfeldt e08f8eed05 Revert 06f767d..cba5692 
This rolls back to commit 06f767d608.
 2015-03-30 23:51:36 -05:00
Scott Lahteine 2e7a4bd7db Merge pull request #1749 from thinkyhead/fixup_config 
Restore ENDSTOPPULLUPS in Configuration.h
 2015-03-30 21:15:44 -07:00
Scott Lahteine 5e82ed4f30 Restore ENDSTOPPULLUPS in Configuration.h 2015-03-30 21:15:16 -07:00
Scott Lahteine b8973051c3 Merge pull request #1746 from thinkyhead/power_supply 
Allow POWER_SUPPLY to be 0
 2015-03-30 21:00:40 -07:00
Chris Roadfeldt 992b07ca57 Don't disable Z_RAISE_BEFORE_HOMING when Z_PROBE_AND_ENDSTOP is enabled. 2015-03-30 22:58:10 -05:00
Chris Roadfeldt cba5692673 Merge remote-tracking branch 'MarlinFirmware/Development' into Development 
Conflicts:
	Marlin/Marlin_main.cpp
	Marlin/stepper.cpp
 2015-03-30 22:33:05 -05:00
Scott Lahteine 8500c80b33 Apply Z_RAISE_BEFORE_HOMING before homing XY 2015-03-30 20:22:21 -07:00
Scott Lahteine 92b54aa27e #define HAS_POWER_SWITCH 2015-03-30 19:44:53 -07:00
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.
 2015-03-30 18:00:54 -07:00
Scott Lahteine 6864280803 Use elif and parentheses in conditionals 2015-03-30 16:52:27 -07:00
Scott Lahteine 8c136a5ab5 Conditionals and comments for PS = 0 2015-03-30 16:50:05 -07:00
Scott Lahteine 2faed961ce Allow POWER_SUPPLY 0 for no power switch 2015-03-30 16:39:47 -07:00
Scott Lahteine baa6787393 Merge pull request #1740 from thinkyhead/fixup_homing 
Apply leveling for DELTA
 2015-03-30 15:45:33 -07:00
Scott Lahteine 346c07cc1a Merge pull request #1743 from AnHardt/extrudemultiply 
Replace extrudemultiply by extruder_multiply[active_extruder]
 2015-03-30 15:45:10 -07:00
AnHardt 9ac7dc675e Make filament display on dogm_... same as hitachi... 
Thanks @MagoKimbra.
 2015-03-30 16:56:21 +02:00
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.
 2015-03-30 13:35:03 +02:00
Scott Lahteine e63076504d Merge pull request #1733 from AnHardt/c20 
Get back folder symbols on Hitachi displays
 2015-03-30 01:57:00 -07:00