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

2482 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine fad14ae7eb Merge branch 'Development' into marlin_configurator 
Latest upstream changes
 2015-03-05 05:32:31 -08:00
Scott Lahteine 273d00353f Merge pull request #1565 from thinkyhead/gcode_handler_functions 
Gcode handlers to inline functions
 2015-03-05 04:55:46 -08:00
Scott Lahteine cdc38aa783 Move gcode handlers into inline functions 2015-03-05 04:27:24 -08:00
Scott Lahteine 94fd8c7555 Merge pull request #1556 from thinkyhead/enhanced_g29 
Enhanced G29
 2015-03-05 03:54:53 -08:00
Scott Lahteine 6d9e9a6bef Merge branch 'Development' into enhanced_g29 
Latest upstream changes
 2015-03-05 02:49:18 -08:00
Scott Lahteine 4db2179f5c Include 4th extruder support 2015-03-05 02:37:36 -08:00
Scott Lahteine 0e074d4050 Merge pull request #1561 from OhmEye/Development 
Fix autoretract
 2015-03-05 02:14:34 -08:00
OhmEye f90a947e65 Fix autoretract 
Autoretract was broken, looks like it was overlooked when the retracted flag was updated for multi extruders.
 2015-03-04 20:28:08 -10:00
Scott Lahteine 2ef6b3d57a Fix wrong defines, broken syntax 2015-03-04 22:24:44 -08:00
OhmEye f3f04e9fd6 Merge pull request #1 from MarlinFirmware/Development 
Sync with upstream
 2015-03-04 20:23:10 -10:00
Scott Lahteine 08b722b635 Merge pull request #1555 from C-o-r-E/solenoids 
Add support for solenoid articulated extruders
 2015-03-04 21:36:29 -08:00
Scott Lahteine 32744d41a9 Do sanity checking on LRFB values 
- Setting boundaries based on configured limits, contrasting with G28
(which forgets these limits?)
 2015-03-04 21:32:11 -08:00
chrono 0a7d85c20e Minor fixes 2015-03-04 12:35:32 +00:00
chrono 48e3a97a18 Removed extra encoder definitions from pins_FELIX2.h 2015-03-04 12:21:18 +00:00
Scott Lahteine d052a3c6aa Merge pull request #1551 from thinkyhead/redundant_encrot 
Cleanup rotary encoder encrot* defines
 2015-03-04 03:22:24 -08:00
chrono d8eeddfb93 Updated DUAL Extruder config, added README and enabled NEWPANEL by default 2015-03-04 09:59:58 +00:00
Wurstnase 81a6e59a82 Merge branch 'Development' of https://github.com/Wurstnase/Marlin into Development 2015-03-03 22:18:14 +01:00
chrono b423b90c77 Added Configuration_adv.h to examples for LCD/SD Support 2015-03-03 19:09:25 +01:00
domonoky 075507fb9a missed one X_ENABLE_PIN 2015-03-03 11:09:56 +01:00
Scott Lahteine dfb38874f8 Some suggested changes for #1555 2015-03-03 00:48:20 -08:00
chrono 32eef03b58 Unfelixed README again 2015-03-03 08:12:42 +01:00
Scott Lahteine 7f8ea7105f Arrange ProbeAction values bitwise 2015-03-02 20:14:37 -08:00
Scott Lahteine 7684721977 Enhanced G29 
- Adapted “Enhanced G29” code referred to in #1499 and posted at
[3dprintboard.com](http://3dprintboard.com/showthread.php?3105-Auto_Bed_
Leveling-Enhanced-G29-command)
- Compatible with current G29 while adding some new arguments
  - `V` sets the verbose level for serial out
  - `T` (or `V` > 2) send a Topology report to serial out
  - `E` works the same way as before
  - `P` works as before (source used `n` or `U`/`u`)
  - `L`, `R`, `B`, `F` work as before
- Still needs sanity checking for `LRBF`
 2015-03-02 20:00:17 -08:00
C-o-r-E 874d3d3fc5 Add support for solenoid articulated extruders 2015-03-02 20:07:12 -05:00
chrono 7540a81106 Minor fixes 2015-03-02 22:55:00 +01:00
domonoky e363428c54 New attempt at copying the libraries. 2015-03-02 19:00:02 +01:00
domonoky bcb57f13ea try to fix path to additional libraries. 2015-03-02 18:55:30 +01:00
domonoky e3d92b9168 Try to fix the travis build, which is failing because conditional includes do not work in .ino files for the ino processor ? 2015-03-02 18:45:58 +01:00
chrono c13d81ce15 Merge branch 'Development' into pr-felix 2015-03-02 17:21:39 +00:00
chrono a375d648c7 Merge remote-tracking branch 'upstream/Development' into Development 2015-03-02 17:21:05 +00:00
domonoky 4a7aca2736 Merge remote-tracking branch 'remotes/upstream/Development' into Development 2015-03-02 17:52:12 +01:00
alexborro 715104e477 Fix Endstop check for CoreXY bots. 
The X_Axis could not home to min while Y_Max endstop was trigged.
 2015-03-02 13:36:58 -03:00
Scott Lahteine e428e8da75 Merge pull request #1552 from thinkyhead/cleanup_cardreader 
Cleanup of cardreader.*
 2015-03-02 07:57:26 -08:00
Scott Lahteine 20e59dc61e Don't skip files starting with underscores 2015-03-02 07:56:11 -08:00
Scott Lahteine f171656f8e Cleanup of cardreader.* 
- Apply standards to cardreader.*
- Fix minor issues with cardreader.cpp
- Apply standards to some other stale regions
 2015-03-02 07:06:01 -08:00
Scott Lahteine f379edca78 Cleanup rotary encoder encrot* defines 
The encrot values are used in only one place, and don’t vary, so remove
redundant references.
 2015-03-02 06:42:48 -08:00
Scott Lahteine c7cdb176c8 Merge branch 'Development' into marlin_configurator 
Latest upstream changes
 2015-03-02 06:13:10 -08:00
chrono 187d336665 Revert default conf and temperature.cpp 2015-03-02 13:56:37 +00:00
chrono 7f060d7caf Revert "Testing Fix for Arduino 1.6+ compiler issue #1523" 
This reverts commit fb75a9272d.
 2015-03-02 13:47:35 +00:00
Scott Lahteine 49f471a5fc Merge pull request #1541 from thinkyhead/fixup_temperature 
Cleanup of temperature code
 2015-03-02 05:38:10 -08:00
Scott Lahteine f2710e11d1 Optimize initial loading, code cleanup 2015-03-02 05:23:36 -08:00
chrono fb75a9272d Testing Fix for Arduino 1.6+ compiler issue #1523 2015-03-02 10:45:54 +00:00
chrono 558c6313f7 Merge branch 'pr-felix' into Marlix 2015-03-02 10:27:58 +00:00
chrono 08bc723a3c Enable PIDBED 2015-03-02 10:26:42 +00:00
chrono e487bd642b Updated PR to streamline integration 2015-03-02 09:49:45 +00:00
Scott Lahteine 2eeb241b42 Find fields that group together 
- Do field grouping
- Tweak configurations for better grouping
 2015-03-02 01:45:53 -08:00
Scott Lahteine 9377089c43 Merge pull request #1548 from thinkyhead/issue_1547_bed_leveling 
Fix undefined *_PROBE_BED_POSITION error
 2015-03-01 20:01:38 -08:00
Scott Lahteine e30bfedce4 Fix undefined *_PROBE_BED_POSITION error 2015-03-01 19:57:35 -08:00
chrono 875812d346 Updated package info 2015-03-01 11:15:17 +01:00
chrono 3eafea840d Minor fixes in Configuration.h 2015-03-01 11:04:02 +01:00