Commit Graph

  • 0ce3576685 New Feature: Z_DUAL_ENDSTOPS alexborro 2015-03-24 14:06:44 -0300
  • c686069ccd Revert "Remove 6x9 font" AnHardt 2015-03-16 11:18:27 +0100
  • b00a531df8 Revert "Removed now unneded FONT_STATUSMENU" AnHardt 2015-03-24 17:01:56 +0100
  • 9d589cbb2a Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji AnHardt 2015-03-24 16:59:15 +0100
  • 512a0056a9 Merge pull request #1658 from thinkyhead/planner_oh_planner Scott Lahteine 2015-03-23 22:21:27 -0700
  • 8db4fd7177 Merge branch 'Development' into planner_oh_planner Latest upstream commits Scott Lahteine 2015-03-23 22:08:50 -0700
  • c6df5f4d85 small text correction Scott Lahteine 2015-03-23 21:55:03 -0700
  • 8dd94ccf58 Initial list from perusing the commit logs Scott Lahteine 2015-03-23 21:54:06 -0700
  • 4afe50b920 Merge pull request #1651 from thinkyhead/config_testing Scott Lahteine 2015-03-23 21:23:13 -0700
  • 0d81abe1c9 Merge branch 'Development' into config_testing Latest upstream commits Scott Lahteine 2015-03-23 21:13:04 -0700
  • 01740fd9c6 Merge branch 'Development' into planner_oh_planner Latest upstream commits Scott Lahteine 2015-03-23 21:12:36 -0700
  • e2576b1ac5 Merge pull request #1674 from thinkyhead/fix_temperature_minmax Scott Lahteine 2015-03-23 21:10:03 -0700
  • 8b004d26c1 Merge pull request #1681 from thinkyhead/marlin_configurator Scott Lahteine 2015-03-23 21:02:38 -0700
  • fc53e43de6 Don't test raw temp for MAX6675 Scott Lahteine 2015-03-23 20:55:48 -0700
  • 03fa9fae9f Merge branch 'Development' into fix_temperature_minmax Latest upstream commits Scott Lahteine 2015-03-23 20:42:48 -0700
  • b1a7f74ee4 A logo for the Marlin wiki Scott Lahteine 2015-03-23 18:25:31 -0700
  • 2606da9e81 Merge pull request #1678 from Nutz95/Development Scott Lahteine 2015-03-23 15:29:51 -0700
  • 1fac388664 Revert measurement loop Scott Lahteine 2015-03-23 15:18:22 -0700
  • 703f3b38c4 Merge remote-tracking branch 'upstream/Development' into Development CONSULitAS 2015-03-23 17:40:49 +0100
  • 37cde8a191 Report changes from previous PR from old code base including : I've updated the minimum values from the LCD. It has been a while that i want to at least fix this. I have an inductive probe and often i need to set my zOffset to something lower than 0.5. With the current implementation, the default LCD value is set to 0.5 for some reason. On my case i need to be able to set it down to 0.0 as my inductive probe can be lower than 0.5. Before with the LCD we couldn't change this value below 0.5. We had to flash the firmware every time which was painful. Now we are able to change this value down to 0.0 if needed. I've also changed the minimum value for Z min acceleration. In the default configuration it's set to 25 but on the LCD the minimum was 100 which is not coherent. I've changes the minimum to 10. On this axis, depending on the mechanics/motor drivers we might require very low acceleration, so i guess 10 is somehow realistic. nicolas-rambaud 2015-03-23 12:29:12 +0100
  • b26a3ea02c Merge pull request #1662 from josla972/refactor_scara Scott Lahteine 2015-03-23 00:51:18 -0700
  • 36474be8eb Merge pull request #1675 from Wurstnase/Development Scott Lahteine 2015-03-23 00:33:56 -0700
  • e6f6c6e3a1 fix bad insertion config again wurstnase 2015-03-23 08:32:48 +0100
  • 6bdee87be3 Cleanup temperature code Scott Lahteine 2015-03-23 00:27:29 -0700
  • 34a41648ab Merge branch 'Development' into planner_oh_planner Latest upstream commits Scott Lahteine 2015-03-22 23:40:29 -0700
  • 4fbb80567e Get upstream commits Scott Lahteine 2015-03-22 23:07:22 -0700
  • f65f61fa72 Merge pull request #1672 from thinkyhead/fix_probeaction Scott Lahteine 2015-03-22 22:40:52 -0700
  • 7717e1ce33 Fix bad insert in configuration Scott Lahteine 2015-03-22 21:48:46 -0700
  • 146501215f Fix mangled probe_pt calls Scott Lahteine 2015-03-22 21:45:20 -0700
  • e0a42d3f9a Merge pull request #1666 from maverikou/fix_1507 Scott Lahteine 2015-03-22 21:25:05 -0700
  • 15345cc249 Corrected Z_PROBE_ALLEN_KEY behaviour. maverikou 2015-03-22 13:49:52 +0200
  • 0f034dd97e Clean up Z_RAISE_AFTER_PROBING to work the same in all code paths except Z_PROBE_SLED. maverikou 2015-03-22 09:51:43 +0200
  • 6c96f32069 Blind fix for #1507 maverikou 2015-03-21 12:00:04 +0200
  • 379348487e Removed malplaced comment. Josef Larsson 2015-03-22 12:21:31 +0100
  • 8bd6e37b21 Merge pull request #1661 from thinkyhead/G92_no_offset Scott Lahteine 2015-03-21 16:49:06 -0700
  • 88ed5268d2 Merge pull request #1663 from thinkyhead/fix_dual_z_1659 Scott Lahteine 2015-03-21 16:48:08 -0700
  • 582cd780cd Fix compile error with *_DUAL_STEPPER_DRIVERS Scott Lahteine 2015-03-21 16:43:47 -0700
  • 9b3462f73f Refactor SCARA calibration. Save some lines of code and possibly ROM. Josef Larsson 2015-03-22 00:32:22 +0100
  • 691e753cc3 Don't add home offsets in G29 Scott Lahteine 2015-03-21 16:30:02 -0700
  • 88e81a4804 Latest upstream commits, plus fixes Scott Lahteine 2015-03-21 16:12:57 -0700
  • 15eb5d35a2 Merge branch 'Development' into config_testing Latest upstream commits Scott Lahteine 2015-03-21 15:42:45 -0700
  • 19df90622b Include Conditionals.h file in update Scott Lahteine 2015-03-21 15:40:20 -0700
  • 9b639b4135 Merge pull request #1619 from epatel/manual-bed-leveling+mesh-bed-level Scott Lahteine 2015-03-21 15:39:42 -0700
  • 2c9bd15625 Move LCD items to Conditionals.h Scott Lahteine 2015-03-21 15:24:57 -0700
  • a96bfee76a Merge pull request #1660 from thinkyhead/fix_temperature_minmax Scott Lahteine 2015-03-21 15:04:42 -0700
  • 63abeaff38 Merge branch 'Development' into config_testing Latest upstream commits Scott Lahteine 2015-03-21 15:03:06 -0700
  • 3703694e30 Fix temperature min/max test Scott Lahteine 2015-03-21 14:23:43 -0700
  • 3d0a060a7a Added G29 command Edward Patel 2015-03-21 14:50:47 +0100
  • c516747847 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level Edward Patel 2015-03-21 14:49:52 +0100
  • b5970492e2 Merge pull request #1656 from AnHardt/menufix Scott Lahteine 2015-03-20 21:09:26 -0700
  • af14c684b5 Minor optimizations to planner code Scott Lahteine 2015-03-20 20:57:06 -0700
  • 13fbf42d95 Cleanup of planner code Scott Lahteine 2015-03-20 20:42:49 -0700
  • 64e3d33893 Fix shrinked menucode AnHardt 2015-03-20 23:36:14 +0100
  • a7e89d4cfa Merge branch 'Development' into manual-bed-leveling+mesh-bed-level Edward Patel 2015-03-20 15:46:01 +0100
  • 08856d9615 Merge branch 'tm2-utf-minus-kanji' into tm-utf-minus-kanji AnHardt 2015-03-20 14:19:30 +0100
  • 8c5bb38748 Removed now unneded FONT_STATUSMENU AnHardt 2015-03-20 14:12:12 +0100
  • 0d869703ca Merge pull request #1655 from thinkyhead/fix_count_direction_init Scott Lahteine 2015-03-20 05:45:33 -0700
  • 2176a22d42 Fix count_direction initializer Scott Lahteine 2015-03-20 05:45:05 -0700
  • e72cb3e45d Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji AnHardt 2015-03-20 13:35:47 +0100
  • cb6942d4a7 Merge branch 'Development' into config_testing Get upstream commits Scott Lahteine 2015-03-20 05:30:36 -0700
  • 6bfccaf99e Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji AnHardt 2015-03-20 13:08:18 +0100
  • e3f04c876a Merge pull request #1653 from thinkyhead/lcd_menu_hilite Scott Lahteine 2015-03-20 04:37:20 -0700
  • 5644ad6809 Fix hiliting of edit items Scott Lahteine 2015-03-20 04:29:35 -0700
  • 63d5d28085 Merge branch 'Development' into config_testing Latest upstream changes Scott Lahteine 2015-03-20 04:15:18 -0700
  • 526a755a66 Merge pull request #1652 from AnHardt/PIDdebug Scott Lahteine 2015-03-20 04:14:08 -0700
  • a1c240b0a4 Delta supports some auto bed leveling options Scott Lahteine 2015-03-20 04:04:45 -0700
  • 5112cf8422 Added comment for the EEPROM storage Edward Patel 2015-03-20 11:46:47 +0100
  • 4619d80524 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level Edward Patel 2015-03-20 11:45:06 +0100
  • 199151a4ed Merge pull request #1650 from AnHardt/beautify Scott Lahteine 2015-03-20 03:38:02 -0700
  • 2424713a8f Merge pull request #1640 from AnHardt/warning6 Scott Lahteine 2015-03-20 02:58:00 -0700
  • b6d381f863 Divide up Conditionals to get LCD items early Scott Lahteine 2015-03-20 02:50:28 -0700
  • e85061d20d Added changes to the 'new' Configuration.h s AnHardt 2015-03-20 10:36:29 +0100
  • 33c7c6e11d Conditionals.h requires Arduino.h Scott Lahteine 2015-03-20 01:27:14 -0700
  • 8ade04b78e Felix and Hephestos configs Scott Lahteine 2015-03-19 22:25:05 -0700
  • 670006b919 Remove invariant code from Configurations Scott Lahteine 2015-03-19 22:22:23 -0700
  • a61f679568 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level Edward Patel 2015-03-20 02:28:35 +0100
  • c87faa69ed Shortened mesh_plan_buffer_line() Edward Patel 2015-03-19 20:15:38 +0100
  • 47c1ea72af Merge https://github.com/kieranc/Marlin into PIDdebug AnHardt 2015-03-20 00:07:36 +0100
  • f1d3d1524d Merge branch 'optimize_menu_code' of https://github.com/thinkyhead/Marlin into beautify AnHardt 2015-03-19 22:51:22 +0100
  • 0858fba192 Merge pull request #1620 from thinkyhead/optimize_menu_code Scott Lahteine 2015-03-19 14:35:26 -0700
  • fa889cd6e1 Beautivy statusscreen AnHardt 2015-03-19 22:13:37 +0100
  • 7279e4f82f Small code tweaks re lcd.print Scott Lahteine 2015-03-19 14:01:33 -0700
  • 90ba61b9b8 Include indicator for new drawmenu_generic Scott Lahteine 2015-03-19 13:49:06 -0700
  • 15d29efad5 Pass sel to lcd_implementation_mark_as_selected Scott Lahteine 2015-03-19 13:40:36 -0700
  • a547dc2148 Merge branch 'Development' into optimize_menu_code Get upstream changes Scott Lahteine 2015-03-19 13:31:37 -0700
  • 9c1f6e7ac7 Merge remote-tracking branch 'upstream/Development' into Development CONSULitAS 2015-03-19 18:49:34 +0100
  • e650d4044e Fix "Stop Print" function in the LCD menu alexborro 2015-03-19 14:16:18 -0300
  • eff6a2bd2e Clean out a warning AnHardt 2015-03-19 12:58:43 +0100
  • e917477fec Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji AnHardt 2015-03-19 12:35:43 +0100
  • ae01a6b5f2 Make use of codepos. AnHardt 2015-03-19 09:45:16 +0100
  • a534ac197a Merge pull request #1621 from AnHardt/remove--6x9-font Scott Lahteine 2015-03-18 23:10:42 -0700
  • 80e0ee10ca Merge pull request #1631 from AnHardt/iss1593 Scott Lahteine 2015-03-18 19:10:38 -0700
  • 4ce79920e5 Merge pull request #1635 from AnHardt/warnings1 Scott Lahteine 2015-03-18 19:10:12 -0700
  • 76127b8a55 Merge pull request #1630 from Wurstnase/fix_g29 Scott Lahteine 2015-03-18 19:09:40 -0700
  • be3f2dc1d9 Merge pull request #1636 from AnHardt/warning2 Scott Lahteine 2015-03-18 19:09:05 -0700
  • 8d396584bf Merge pull request #1637 from AnHardt/warning3 Scott Lahteine 2015-03-18 19:08:33 -0700
  • 8664c6d465 Merge pull request #1638 from AnHardt/warning4 Scott Lahteine 2015-03-18 19:07:55 -0700
  • 10711ccc6a Merge pull request #1639 from AnHardt/warning5 Scott Lahteine 2015-03-18 19:07:14 -0700
  • 28c91deb5c EEPROM saving of z_values. Tried to make it a little intelligent. Edward Patel 2015-03-18 21:00:31 +0100
  • 240b5cfe04 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level Edward Patel 2015-03-18 19:19:46 +0100