bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Commit Graph

  • 4619d80524 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level Edward Patel 2015-03-20 11:45:06 +01:00
  • 199151a4ed Merge pull request #1650 from AnHardt/beautify Scott Lahteine 2015-03-20 03:38:02 -07:00
  • 2424713a8f Merge pull request #1640 from AnHardt/warning6 Scott Lahteine 2015-03-20 02:58:00 -07:00
  • b6d381f863 Divide up Conditionals to get LCD items early Scott Lahteine 2015-03-20 02:50:28 -07:00
  • e85061d20d Added changes to the 'new' Configuration.h s AnHardt 2015-03-20 10:36:29 +01:00
  • 33c7c6e11d Conditionals.h requires Arduino.h Scott Lahteine 2015-03-20 01:27:14 -07:00
  • 8ade04b78e Felix and Hephestos configs Scott Lahteine 2015-03-19 22:25:05 -07:00
  • 670006b919 Remove invariant code from Configurations Scott Lahteine 2015-03-19 22:22:23 -07:00
  • a61f679568 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level Edward Patel 2015-03-20 02:28:35 +01:00
  • c87faa69ed Shortened mesh_plan_buffer_line() Edward Patel 2015-03-19 20:15:38 +01:00
  • 47c1ea72af Merge https://github.com/kieranc/Marlin into PIDdebug AnHardt 2015-03-20 00:07:36 +01:00
  • f1d3d1524d Merge branch 'optimize_menu_code' of https://github.com/thinkyhead/Marlin into beautify AnHardt 2015-03-19 22:51:22 +01:00
  • 0858fba192 Merge pull request #1620 from thinkyhead/optimize_menu_code Scott Lahteine 2015-03-19 14:35:26 -07:00
  • fa889cd6e1 Beautivy statusscreen AnHardt 2015-03-19 22:13:37 +01:00
  • 7279e4f82f Small code tweaks re lcd.print Scott Lahteine 2015-03-19 14:01:33 -07:00
  • 90ba61b9b8 Include indicator for new drawmenu_generic Scott Lahteine 2015-03-19 13:49:06 -07:00
  • 15d29efad5 Pass sel to lcd_implementation_mark_as_selected Scott Lahteine 2015-03-19 13:40:36 -07:00
  • a547dc2148 Merge branch 'Development' into optimize_menu_code Get upstream changes Scott Lahteine 2015-03-19 13:31:37 -07:00
  • 9c1f6e7ac7 Merge remote-tracking branch 'upstream/Development' into Development CONSULitAS 2015-03-19 18:49:34 +01:00
  • e650d4044e Fix "Stop Print" function in the LCD menu alexborro 2015-03-19 14:16:18 -03:00
  • eff6a2bd2e Clean out a warning AnHardt 2015-03-19 12:58:43 +01:00
  • e917477fec Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji AnHardt 2015-03-19 12:35:43 +01:00
  • ae01a6b5f2 Make use of codepos. AnHardt 2015-03-19 09:45:16 +01:00
  • a534ac197a Merge pull request #1621 from AnHardt/remove--6x9-font Scott Lahteine 2015-03-18 23:10:42 -07:00
  • 80e0ee10ca Merge pull request #1631 from AnHardt/iss1593 Scott Lahteine 2015-03-18 19:10:38 -07:00
  • 4ce79920e5 Merge pull request #1635 from AnHardt/warnings1 Scott Lahteine 2015-03-18 19:10:12 -07:00
  • 76127b8a55 Merge pull request #1630 from Wurstnase/fix_g29 Scott Lahteine 2015-03-18 19:09:40 -07:00
  • be3f2dc1d9 Merge pull request #1636 from AnHardt/warning2 Scott Lahteine 2015-03-18 19:09:05 -07:00
  • 8d396584bf Merge pull request #1637 from AnHardt/warning3 Scott Lahteine 2015-03-18 19:08:33 -07:00
  • 8664c6d465 Merge pull request #1638 from AnHardt/warning4 Scott Lahteine 2015-03-18 19:07:55 -07:00
  • 10711ccc6a Merge pull request #1639 from AnHardt/warning5 Scott Lahteine 2015-03-18 19:07:14 -07:00
  • 28c91deb5c EEPROM saving of z_values. Tried to make it a little intelligent. Edward Patel 2015-03-18 21:00:31 +01:00
  • 240b5cfe04 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level Edward Patel 2015-03-18 19:19:46 +01:00
  • 4521f6655b Restore "S" parameter of M204 for retrocompatibility. alexborro 2015-03-18 12:19:30 -03:00
  • 5ddb8d94e2 Update Documentation related to M204 alexborro 2015-03-18 11:08:41 -03:00
  • f8c4d43886 delta[3] is used with SCARA AnHardt 2015-03-18 12:14:49 +01:00
  • 72a9fed4fb codepos not used in gcode_M28() AnHardt 2015-03-18 11:41:14 +01:00
  • b94dd33641 G4 could wait for an undefined time AnHardt 2015-03-18 11:23:41 +01:00
  • e90985a4e8 delta[3] not used when DELTA not defined. AnHardt 2015-03-18 11:11:49 +01:00
  • 5099b86ad4 lcd_autostart_sd() has two conditions. AnHardt 2015-03-18 10:51:13 +01:00
  • 5d81c779cc lcd_control_retract_menu() is conditional. AnHardt 2015-03-18 10:39:59 +01:00
  • 450b89e63c Negative times are unlikly AnHardt 2015-03-18 10:31:34 +01:00
  • d1658eebfc Decrease KILL_DELAY AnHardt 2015-03-18 01:45:42 +01:00
  • 00adb2a6c1 optional parameters must be named when ignoring order Wurstnase 2015-03-18 01:02:29 +01:00
  • 0d43898a22 Remove of mesh_plan_buffer_line parameter reference (e) Edward Patel 2015-03-17 22:55:29 +01:00
  • 8067a985ce Merge branch 'Development' into manual-bed-leveling+mesh-bed-level Edward Patel 2015-03-17 22:48:08 +01:00
  • f5f99c4883 Merge pull request #1626 from Wurstnase/fix_backslash_macro alexborro 2015-03-17 18:34:05 -03:00
  • 05333f61b7 fix macro wurstnase 2015-03-17 12:50:44 +01:00
  • 1883e1bb60 Applied thinkyheads corrections from 2015-03-17 AnHardt 2015-03-17 11:23:44 +01:00
  • be79235ef2 Add new (cleaner) Marlin font AnHardt 2015-03-17 10:33:02 +01:00
  • 89fe77468d Merge pull request #1586 from maverikou/delta_auto_bed_level Scott Lahteine 2015-03-16 18:17:11 -07:00
  • 2b1ddc0413 Merge remote-tracking branch 'upstream/Development' into Development CONSULitAS 2015-03-16 22:12:17 +01:00
  • cb676cdf39 Fix CoreXY homing bug introduced by PR #1606 alexborro 2015-03-16 16:31:25 -03:00
  • 8a29dd4839 Cleaned typo in dogm_lcd_implementation.h AnHardt 2015-03-16 20:18:48 +01:00
  • 7e69f72db6 Moved font directory. Updated README.fonts AnHardt 2015-03-16 17:27:27 +01:00
  • 00b162a993 Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji AnHardt 2015-03-16 17:13:49 +01:00
  • e38dd5f030 Merge remote-tracking branch 'origin/utf' into utf-kanji AnHardt 2015-03-16 17:00:54 +01:00
  • 08e4651ece Corrected cyrillic font again AnHardt 2015-03-16 16:59:14 +01:00
  • 752c804677 remove offset, add minimum scan area Wurstnase 2015-03-16 15:13:16 +01:00
  • 14f0250853 allow negative values Wurstnase 2015-03-16 14:26:59 +01:00
  • e6cb8ee188 Remove 6x9 font AnHardt 2015-03-16 11:18:27 +01:00
  • e93eb3e8d3 Update test maverikou 2015-03-16 09:16:00 +02:00
  • b8ae3feb9e Update test maverikou 2015-03-16 09:03:15 +02:00
  • 3570447ded Fix Z_RAISE_AFTER_PROBING maverikou 2015-03-16 08:35:49 +02:00
  • 8a739b6fba Merge branch 'Development' into delta_auto_bed_level maverikou 2015-03-16 08:24:26 +02:00
  • cbe4496123 Merge pull request #1616 from thinkyhead/topo_map_origin Scott Lahteine 2015-03-15 22:55:54 -07:00
  • 7629c4f05c Cleanup for menu optimization Scott Lahteine 2015-03-15 22:54:54 -07:00
  • 3405f85a6a Reduce size of menu code Scott Lahteine 2015-03-15 22:02:33 -07:00
  • e983a5ab92 Disable option. Enable for use/test. Edward Patel 2015-03-16 02:50:11 +01:00
  • f34b9c83d1 Added comment about MESH_NUM axis points. Edward Patel 2015-03-16 01:48:46 +01:00
  • a686c9878f Move TOPO_ORIGIN define to Configuration.h Scott Lahteine 2015-03-15 15:49:36 -07:00
  • 8005d22c81 Added menu option for bed leveling. Edward Patel 2015-03-15 23:18:11 +01:00
  • 0e51e53813 WIP. Adding bed leveling code. Edward Patel 2015-03-15 10:43:26 +01:00
  • d0d12962e0 Merge pull request #1615 from AnHardt/fix-1611 Scott Lahteine 2015-03-15 15:19:02 -07:00
  • 3f34d9d44e Merge pull request #1614 from AnHardt/fix-1612 Scott Lahteine 2015-03-15 15:18:24 -07:00
  • f0dcea7e14 Fix #1611 AnHardt 2015-03-15 22:52:50 +01:00
  • 28b1c37dea Fix for #1612 AnHardt 2015-03-15 21:35:33 +01:00
  • a8c1bdabd2 Update: readme.md for K8200 example CONSULitAS 2015-03-15 17:25:31 +01:00
  • 2f374f1465 Removed Kanji. AnHardt 2015-03-15 16:44:37 +01:00
  • 5efc798642 Merge pull request #1546 from apollo-ng/pr-felix Scott Lahteine 2015-03-15 07:52:22 -07:00
  • b83e52e50f Merge pull request #1467 from thinkyhead/marlin_configurator Scott Lahteine 2015-03-15 07:49:19 -07:00
  • 7bc77dc134 Merge pull request #1583 from galexander1/m404fix Scott Lahteine 2015-03-15 07:47:30 -07:00
  • 3aadaa7677 Merge pull request #1609 from thinkyhead/fix_fan_pin_issue Scott Lahteine 2015-03-15 07:33:34 -07:00
  • b80ed51fcc Fix controllerFan() code Scott Lahteine 2015-03-15 06:55:31 -07:00
  • 4b50205f11 Merge branch 'Development' into marlin_configurator Latest upstream changes Scott Lahteine 2015-03-15 06:37:32 -07:00
  • bb4cb1b15a Merge pull request #1606 from thinkyhead/cleanup_stepper Scott Lahteine 2015-03-15 06:05:08 -07:00
  • 63f41f56f8 Merge pull request #1607 from chris-bo/Development Scott Lahteine 2015-03-15 01:04:40 -07:00
  • 4eabd80025 Fix babystep for extruder_duplication Scott Lahteine 2015-03-14 18:31:25 -07:00
  • d3259d0dba Merge pull request #1581 from msutas/Development alexborro 2015-03-14 18:35:20 -03:00
  • 25c4f17e5d Corrected Cyrillic fonts. Round II. AnHardt 2015-03-14 15:10:45 +01:00
  • b73ba26b23 Update ultralcd_st7920_u8glib_rrd.h chris-bo 2015-03-14 14:31:00 +01:00
  • 901c3c5392 Merge pull request #1603 from thinkyhead/issue_1523_compiler_error Scott Lahteine 2015-03-14 05:20:18 -07:00
  • c37f7d15c9 - Rename WRITE_E_STEP for consistency Scott Lahteine 2015-03-14 04:28:22 -07:00
  • 44a205d9d9 Corrected Cyrillic fonts. AnHardt 2015-03-14 12:27:47 +01:00
  • 4d878b9bac Fixed path typos in README chrono 2015-03-14 10:18:12 +00:00
  • 12ec557a75 Added DEFAULT_TRAVEL_ACCELERATION chrono 2015-03-14 10:14:13 +00:00
  • 1d25d510bc Upstream Merge Fixes chrono 2015-03-14 09:48:30 +00:00
  • a89d690b77 Merge remote-tracking branch 'upstream/Development' into pr-felix chrono 2015-03-14 09:25:43 +00:00
  • cb57fc727d Declare pid_output for PIDBEDTEMP Scott Lahteine 2015-03-13 20:19:51 -07:00
  • 3d6deb9bdf Simplify manage_heater Scott Lahteine 2015-03-13 19:49:41 -07:00