2536 Commits (01cc97a3c36f9cfde39cb2a7075d89aeec650383)
 

Author SHA1 Message Date
Corey C ba27f90e36 Merge pull request #1 from foosel/C-o-r-E-escape_fix
10 years ago
Gina Häußge 63b62d8d4e Fixed in-line comments and escaping
10 years ago
C-o-r-E 99fb1bc3e8 Attempt to resolve #1568 and add basic escape character support
10 years ago
Wurstnase 92ebb7f4c8 Merge pull request #1 from MarlinFirmware/Development
10 years ago
Scott Lahteine fad14ae7eb Merge branch 'Development' into marlin_configurator
10 years ago
Scott Lahteine 273d00353f Merge pull request #1565 from thinkyhead/gcode_handler_functions
10 years ago
Scott Lahteine cdc38aa783 Move gcode handlers into inline functions
10 years ago
Scott Lahteine 94fd8c7555 Merge pull request #1556 from thinkyhead/enhanced_g29
10 years ago
Scott Lahteine 6d9e9a6bef Merge branch 'Development' into enhanced_g29
10 years ago
Scott Lahteine 4db2179f5c Include 4th extruder support
10 years ago
Scott Lahteine 0e074d4050 Merge pull request #1561 from OhmEye/Development
10 years ago
OhmEye f90a947e65 Fix autoretract
10 years ago
Scott Lahteine 2ef6b3d57a Fix wrong defines, broken syntax
10 years ago
OhmEye f3f04e9fd6 Merge pull request #1 from MarlinFirmware/Development
10 years ago
Scott Lahteine 08b722b635 Merge pull request #1555 from C-o-r-E/solenoids
10 years ago
Scott Lahteine 32744d41a9 Do sanity checking on LRFB values
10 years ago
chrono 0a7d85c20e Minor fixes
10 years ago
chrono 48e3a97a18 Removed extra encoder definitions from pins_FELIX2.h
10 years ago
Scott Lahteine d052a3c6aa Merge pull request #1551 from thinkyhead/redundant_encrot
10 years ago
chrono d8eeddfb93 Updated DUAL Extruder config, added README and enabled NEWPANEL by default
10 years ago
Wurstnase 81a6e59a82 Merge branch 'Development' of https://github.com/Wurstnase/Marlin into Development
10 years ago
chrono b423b90c77 Added Configuration_adv.h to examples for LCD/SD Support
10 years ago
domonoky 075507fb9a missed one X_ENABLE_PIN
10 years ago
Scott Lahteine dfb38874f8 Some suggested changes for #1555
10 years ago
chrono 32eef03b58 Unfelixed README again
10 years ago
Scott Lahteine 7f8ea7105f Arrange ProbeAction values bitwise
10 years ago
Scott Lahteine 7684721977 Enhanced G29
10 years ago
C-o-r-E 874d3d3fc5 Add support for solenoid articulated extruders
10 years ago
chrono 7540a81106 Minor fixes
10 years ago
domonoky e363428c54 New attempt at copying the libraries.
10 years ago
domonoky bcb57f13ea try to fix path to additional libraries.
10 years ago
domonoky e3d92b9168 Try to fix the travis build, which is failing because conditional includes do not work in .ino files for the ino processor ?
10 years ago
chrono c13d81ce15 Merge branch 'Development' into pr-felix
10 years ago
chrono a375d648c7 Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
domonoky 4a7aca2736 Merge remote-tracking branch 'remotes/upstream/Development' into Development
10 years ago
alexborro 715104e477 Fix Endstop check for CoreXY bots.
10 years ago
Scott Lahteine e428e8da75 Merge pull request #1552 from thinkyhead/cleanup_cardreader
10 years ago
Scott Lahteine 20e59dc61e Don't skip files starting with underscores
10 years ago
Scott Lahteine f171656f8e Cleanup of cardreader.*
10 years ago
Scott Lahteine f379edca78 Cleanup rotary encoder encrot* defines
10 years ago
Scott Lahteine c7cdb176c8 Merge branch 'Development' into marlin_configurator
10 years ago
chrono 187d336665 Revert default conf and temperature.cpp
10 years ago
chrono 7f060d7caf Revert "Testing Fix for Arduino 1.6+ compiler issue #1523"
10 years ago
Scott Lahteine 49f471a5fc Merge pull request #1541 from thinkyhead/fixup_temperature
10 years ago
Scott Lahteine f2710e11d1 Optimize initial loading, code cleanup
10 years ago
chrono fb75a9272d Testing Fix for Arduino 1.6+ compiler issue #1523
10 years ago
chrono 558c6313f7 Merge branch 'pr-felix' into Marlix
10 years ago
chrono 08bc723a3c Enable PIDBED
10 years ago
chrono e487bd642b Updated PR to streamline integration
10 years ago
Scott Lahteine 2eeb241b42 Find fields that group together
10 years ago