Commit Graph

Select branches

Hide Pull Requests

master

2.0.5.3_Merge

2.0.7.2_Merge

2.0.7_Merge

2.1.2

Mono Color

• d052a3c6aa Merge pull request #1551 from thinkyhead/redundant_encrot Scott Lahteine 2015-03-04 03:22:24 -08:00
• d8eeddfb93 Updated DUAL Extruder config, added README and enabled NEWPANEL by default chrono 2015-03-04 09:59:58 +00:00
• 81a6e59a82 Merge branch 'Development' of https://github.com/Wurstnase/Marlin into Development Wurstnase 2015-03-03 22:18:14 +01:00
• b423b90c77 Added Configuration_adv.h to examples for LCD/SD Support chrono 2015-03-03 19:09:25 +01:00
• 075507fb9a missed one X_ENABLE_PIN domonoky 2015-03-03 11:09:56 +01:00
• dfb38874f8 Some suggested changes for #1555 Scott Lahteine 2015-03-03 00:48:20 -08:00
• 32eef03b58 Unfelixed README again chrono 2015-03-03 08:12:42 +01:00
• 7f8ea7105f Arrange ProbeAction values bitwise Scott Lahteine 2015-03-02 20:14:37 -08:00
• 7684721977 Enhanced G29 Scott Lahteine 2015-03-02 20:00:17 -08:00
• 874d3d3fc5 Add support for solenoid articulated extruders C-o-r-E 2015-03-02 20:07:12 -05:00
• 7540a81106 Minor fixes chrono 2015-03-02 22:55:00 +01:00
• e363428c54 New attempt at copying the libraries. domonoky 2015-03-02 19:00:02 +01:00
• bcb57f13ea try to fix path to additional libraries. domonoky 2015-03-02 18:55:30 +01:00
• e3d92b9168 Try to fix the travis build, which is failing because conditional includes do not work in .ino files for the ino processor ? domonoky 2015-03-02 18:45:58 +01:00
• c13d81ce15 Merge branch 'Development' into pr-felix chrono 2015-03-02 17:21:39 +00:00
• a375d648c7 Merge remote-tracking branch 'upstream/Development' into Development chrono 2015-03-02 17:21:05 +00:00
• 4a7aca2736 Merge remote-tracking branch 'remotes/upstream/Development' into Development domonoky 2015-03-02 17:52:12 +01:00
• 715104e477 Fix Endstop check for CoreXY bots. alexborro 2015-03-02 13:36:58 -03:00
• e428e8da75 Merge pull request #1552 from thinkyhead/cleanup_cardreader Scott Lahteine 2015-03-02 07:57:26 -08:00
• 20e59dc61e Don't skip files starting with underscores Scott Lahteine 2015-03-02 07:56:11 -08:00
• f171656f8e Cleanup of cardreader.* Scott Lahteine 2015-03-02 07:06:01 -08:00
• f379edca78 Cleanup rotary encoder encrot* defines Scott Lahteine 2015-03-02 06:42:48 -08:00
• c7cdb176c8 Merge branch 'Development' into marlin_configurator Latest upstream changes Scott Lahteine 2015-03-02 06:13:10 -08:00
• 187d336665 Revert default conf and temperature.cpp chrono 2015-03-02 13:56:37 +00:00
• 7f060d7caf Revert "Testing Fix for Arduino 1.6+ compiler issue #1523" chrono 2015-03-02 13:47:35 +00:00
• 49f471a5fc Merge pull request #1541 from thinkyhead/fixup_temperature Scott Lahteine 2015-03-02 05:38:10 -08:00
• f2710e11d1 Optimize initial loading, code cleanup Scott Lahteine 2015-03-02 05:23:36 -08:00
• fb75a9272d Testing Fix for Arduino 1.6+ compiler issue #1523 chrono 2015-03-02 10:45:54 +00:00
• 558c6313f7 Merge branch 'pr-felix' into Marlix chrono 2015-03-02 10:27:58 +00:00
• 08bc723a3c Enable PIDBED chrono 2015-03-02 10:26:42 +00:00
• e487bd642b Updated PR to streamline integration chrono 2015-03-02 09:49:45 +00:00
• 2eeb241b42 Find fields that group together Scott Lahteine 2015-03-02 01:45:53 -08:00
• 9377089c43 Merge pull request #1548 from thinkyhead/issue_1547_bed_leveling Scott Lahteine 2015-03-01 20:01:38 -08:00
• e30bfedce4 Fix undefined *_PROBE_BED_POSITION error Scott Lahteine 2015-03-01 19:57:35 -08:00
• 875812d346 Updated package info chrono 2015-03-01 11:15:17 +01:00
• 3eafea840d Minor fixes in Configuration.h chrono 2015-03-01 11:04:02 +01:00
• c7fb1b70f2 Initial Configuration.h for Felix 2.0/3.0 chrono 2015-03-01 09:54:36 +00:00
• 2e172f38bd Added support for Felix 2.0/3.0 printers chrono 2015-03-01 09:16:55 +00:00
• f994729999 Parse and use dependent groups Scott Lahteine 2015-02-28 22:40:20 -08:00
• b869476e99 Merge pull request #1545 from maverikou/panel_one_encoder Scott Lahteine 2015-02-28 05:32:56 -08:00
• 9b50ec6512 Panel One encoder pins maverikou 2015-02-28 10:46:55 +02:00
• 838a22de64 Fix switch value method, make app global Scott Lahteine 2015-02-27 21:08:09 -08:00
• 8d5839151b Merge branch 'Development' into marlin_configurator Latest upstream changes Scott Lahteine 2015-02-27 20:40:23 -08:00
• 443e7edef4 - Add support for L6470 Drivers. - Both TMC, L6470 and pin-driven drivers work. - All can be mixed and matched as needed. domonoky 2015-02-27 12:43:23 +01:00
• 1db02c2891 Merge branch 'Development' into fixup_temperature Merge upstream changes Scott Lahteine 2015-02-26 17:25:28 -08:00
• a99470fbb0 Merge pull request #1527 from maverikou/panel_one Scott Lahteine 2015-02-26 16:01:13 -08:00
• 5727cb3ed4 Cleanup TMC Stepper a bit. domonoky 2015-02-26 12:57:46 +01:00
• a5bbd402bf Merge pull request #1539 from AnHardt/dummysensor Scott Lahteine 2015-02-26 01:29:14 -08:00
• 1a7b0d9a37 Redo HAS_* macros to fix define error Scott Lahteine 2015-02-26 01:14:59 -08:00
• 864dddc878 Macros to the top, a few HAS_* macros Scott Lahteine 2015-02-26 00:33:30 -08:00
• 227ab8c665 Merge pull request #1503 from MarcelMo/patch-2 alexborro 2015-02-25 13:22:42 -03:00
• fd1ea9d56f Move literal strings to language files Scott Lahteine 2015-02-24 23:03:08 -08:00
• 8742b6bd56 Merge branch 'Development' into panel_one maverikou 2015-02-24 22:24:57 +02:00
• aa9c1f1bed Better name for ADC macro Scott Lahteine 2015-02-24 05:38:10 -08:00
• 9c9726d469 Cleanup of temperature code Scott Lahteine 2015-02-24 04:46:11 -08:00
• c6d2ebe452 Extend the idea of dummy temperature sensors. AnHardt 2015-02-24 11:02:16 +01:00
• e6af82ba2f Merge pull request #1526 from thinkyhead/cleanup_ultralcd Scott Lahteine 2015-02-23 21:22:54 -08:00
• c9a3eb0c1a Spacing in calculate_volumetric_multiplier(s) Scott Lahteine 2015-02-23 20:35:18 -08:00
• 2af559cca3 Shared function for menu_edit_* and menu_edit_callback_* Scott Lahteine 2015-02-23 20:31:28 -08:00
• 7ec391e689 Merge branch 'Development' into marlin_configurator Latest upstream changes Scott Lahteine 2015-02-23 20:21:40 -08:00
• df8c51528f Merge branch 'Development' into cleanup_ultralcd Latest upstream changes Scott Lahteine 2015-02-23 20:13:08 -08:00
• 517f411999 Spacing adjustment to menu_edit* macro Scott Lahteine 2015-02-23 20:11:52 -08:00
• 4938ae5caf Add required backslash for macro expansion Scott Lahteine 2015-02-23 20:10:49 -08:00
• e182cdebf9 Add required backslash for macro expansion Scott Lahteine 2015-02-23 19:54:07 -08:00
• adbb839b16 Merge pull request #1535 from gege2b/Development Scott Lahteine 2015-02-23 19:51:44 -08:00
• fa4c36df68 Fix menu callback issue wrt LCD_CLICKED Scott Lahteine 2015-02-23 19:40:57 -08:00
• 0cf0c20532 Optimize calculate_volumetric_multiplier Scott Lahteine 2015-02-23 18:10:35 -08:00
• 38500165ea First attempt at adding TMC Driver support. May need some cleanup. domonoky 2015-02-23 17:45:29 +01:00
• b55995aae8 Introduce a layer of macro indirection to all stepper pins. This allows other stepper drivers to redefine them, so they can use SPI/I2C instead of direct pin manipulation. domonoky 2015-02-23 16:12:35 +01:00
• b4e9395661 Corrected a typo in ArduinoAddons/Arduino_1.5.x/(...)/avr/boards.txt about Sanguino Gege2B 2015-02-23 16:02:04 +01:00
• 8ccdac9898 Enable PID debugging for heated bed kieranc 2015-02-23 09:42:01 +01:00
• 29097b0ab2 Enable PID debugging for heated bed kieranc 2015-02-23 09:41:25 +01:00
• 21bd4fd6db Enable PID debugging for heated bed kieranc 2015-02-23 09:40:53 +01:00
• fb56aad898 Enable PID debugging for heated bed kieranc 2015-02-23 09:40:29 +01:00
• 08c543f8fb Enable PID debugging for heated bed kieranc 2015-02-23 09:40:06 +01:00
• c89413db1e Enable PID debugging for heated bed kieranc 2015-02-23 09:39:39 +01:00
• 1c71e4751a Enable PID debugging for heated bed kieranc 2015-02-23 09:39:07 +01:00
• a9e15aa503 Updated example configurations maverikou 2015-02-22 20:15:05 +02:00
• 3ba47ea277 Remove test/demo multi=line code menu items Scott Lahteine 2015-02-22 10:10:37 -08:00
• c1240f23dd Merge branch 'Development' into marlin_configurator Latest upstream changes Scott Lahteine 2015-02-22 10:02:25 -08:00
• a57869ba49 Dummy Thermistor Table for testing purposes alexborro 2015-02-22 11:02:04 -03:00
• 2e166f5337 Added support for PanelOne from T3P3. Maverikou 2014-07-29 20:56:55 +03:00
• 40ef472a25 Merge in encoder multiplier Scott Lahteine 2015-02-21 20:18:49 -08:00
• c3c50528e6 Merge pull request #1521 from thinkyhead/fixup_encoder_code Scott Lahteine 2015-02-21 19:44:53 -08:00
• 1c13cd604b Formatting in babysteps defines Scott Lahteine 2015-02-21 18:45:10 -08:00
• 3a26804d80 Adapt to latest PID code and fix typos Scott Lahteine 2015-02-21 18:41:04 -08:00
• 422582da71 Prep formatting for upcoming PR Scott Lahteine 2015-02-21 18:24:16 -08:00
• 27ac3e985d Add options to example_configurations Scott Lahteine 2015-02-21 18:17:37 -08:00
• 0d6a7a2df0 Merge with latest upstream changes Scott Lahteine 2015-02-21 18:13:31 -08:00
• c7a97e18b7 Merge branch 'Development' into cleanup_ultralcd Latest upstream changes Scott Lahteine 2015-02-21 18:04:08 -08:00
• 6d5c13df74 Merge pull request #1520 from thinkyhead/fixup_temperature Scott Lahteine 2015-02-21 17:53:26 -08:00
• 5b9e341222 Merge pull request #1516 from thinkyhead/fixup_ramps Scott Lahteine 2015-02-21 17:51:57 -08:00
• 57bc28b42c Cleanup and fix ultralcd.cpp Scott Lahteine 2015-02-21 17:38:56 -08:00
• 4fcd4b444e Merge pull request #1519 from thinkyhead/fix_recent_issues Scott Lahteine 2015-02-21 16:43:11 -08:00
• 9c35ed149d Merge pull request #1508 from AnHardt/iss1492 Scott Lahteine 2015-02-21 16:26:37 -08:00
• 430c4b6538 Replace missing backslash Scott Lahteine 2015-02-20 02:17:16 -08:00
• 3aa5f98b64 Download all as ZIP, adjust layout on resize Scott Lahteine 2015-02-20 02:12:00 -08:00
• a8939eec28 Readability of MENU_MULTIPLIER_ITEM Scott Lahteine 2015-02-20 02:08:41 -08:00
• 09e09b308e Tweaky spacing adjustments Scott Lahteine 2015-02-20 01:22:56 -08:00
• e3fd3e8fa4 Fix typos in checkExtruderAutoFans Scott Lahteine 2015-02-20 00:08:59 -08:00