CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 3f455889d0 Merge pull request #769 from Cylindric3D/typofixes_1 nothinman 2014-02-17 11:30:01 +0000
  • 4ddedb3b27 Merge pull request #780 from Cylindric3D/typofixes_2 nothinman 2014-02-17 11:29:18 +0000
  • d4ba23bc28 Merge pull request #770 from josefpavlik/Marlin_v1 nothinman 2014-02-17 11:27:05 +0000
  • bbb424bd2f Merge pull request #779 from MissionSt/makefile-fix-abl nothinman 2014-02-17 11:22:34 +0000
  • 8f0cee2a14 Various typo fixes - only in comments, no code changes. Cylindric 2014-02-17 10:58:36 +0000
  • 08263ae66e Merge branch 'Marlin_v1' into typofixes_1 Cylindric 2014-02-17 10:28:20 +0000
  • 3b193d1b5f Merge pull request #775 from MissionSt/lang-fix/bed nothinman 2014-02-17 10:26:23 +0000
  • 5bd09d26e2 Makefile works with auto bed leveling Gabe Rosenhouse 2014-02-16 23:19:08 -0800
  • b45beeffd6 typo fix in Makefile Gabe Rosenhouse 2014-02-16 23:21:53 -0800
  • 306588925d Add whitespace to M114 output Paul Telford 2014-02-16 21:01:19 -0800
  • c43838bb1e disable auto retract by default whosawhatsis 2014-02-16 19:04:54 -0800
  • 99f0e44864 Move FWRETRACT defaults to configuration_adv.h whosawhatsis 2014-02-16 19:00:28 -0800
  • 66e3869138 Fix autoretract whosawhatsis 2014-02-16 18:59:04 -0800
  • 2f2459c0db Fix G10/G11 Z-lift whosawhatsis 2014-02-16 15:53:01 -0800
  • 8c5675c290 Use language.h instead of English literals for "bed" Gabe Rosenhouse 2014-02-16 17:16:00 -0800
  • a466c8ef68 Merge pull request #774 from MissionSt/cleanup/probe_pt nothinman 2014-02-17 01:08:58 +0000
  • 0f7393a13e Refactor 'accurate' auto bed leveling to use probe_pt() Gabe Rosenhouse 2014-02-16 10:42:29 -0800
  • c4fbb44d6d Refactor 3-point auto bed leveling to use probe_pt() Gabe Rosenhouse 2014-02-16 10:40:36 -0800
  • ad2c6488c7 Add probe_pt(), useful for auto bed leveling Gabe Rosenhouse 2014-02-16 10:38:29 -0800
  • c9c83a4560 Updated gen3+ board pins names to current convention Peter 2014-02-16 00:47:06 +1300
  • ab0d3c4fb3 Various typo fixes - only in comments, no code changes. Mark Hanford 2014-02-14 11:48:24 +0000
  • 477b6fa1df move engaged from lcd console refreshes power off timeout Josef Pavlik 2014-02-03 11:30:12 +0100
  • 831fc2a952 Pt100 and Pt1000 temperature sensors handling Josef Pavlik 2014-02-14 12:15:31 +0100
  • 7dcd350941 A few changes to Russian, changed LCD strings to be <=17 characters. nothinman 2014-02-13 11:58:14 +0000
  • c31bb2b7ad Only show the ZProbe offset when auto-bed-leveling is enabled. daid 2014-02-13 11:48:55 +0100
  • 46f5bea19f Add configurable beep for UltiPanel. daid 2014-02-13 11:17:33 +0100
  • d16a770855 Ultimainboard 2.x does not has a PS_ON pin. daid 2014-02-13 10:57:03 +0100
  • 71bb3a8133 Add comments for Ultimainboard 2.0 configuration. daid 2014-02-13 10:53:46 +0100
  • 9b7d87e885 Remove duplicate contrast define. daid 2014-02-13 10:50:17 +0100
  • 816f0a678a Merge pull request #768 from whosawhatsis/Marlin_v1 daid 2014-02-13 09:14:57 +0100
  • 6e43398509 G10/G11 bugfixes whosawhatsis 2014-02-12 13:01:19 -0800
  • d6c5c503d4 correct feedrate units in comments for M207/M208 whosawhatsis 2014-02-12 12:59:50 -0800
  • 15d6116188 Merge pull request #689 from cajun-rat/tidy nothinman 2014-02-12 16:38:11 +0000
  • 0b9ecf3824 Language cleanup, part 1. Martin Lukasik 2014-02-12 13:21:26 +0000
  • b5ba5c1465 Merge branch 'Marlin_v1' of https://github.com/whosawhatsis/Marlin into Marlin_v1 whosawhatsis 2014-02-11 19:06:03 -0800
  • 78e7654601 Keep FWRETRACT values in terms of millimeters when using M200 whosawhatsis 2014-02-11 19:05:35 -0800
  • 3f6d44d40b Keep FWRETRACT values in terms of millimeters when using M200 for volumetric E units whosawhatsis 2014-02-11 18:50:11 -0800
  • 363dc2f0e8 Merge branch 'Marlin_v1' into update_menu_plan Cylindric 2014-02-12 00:51:16 +0000
  • 5f797ca29f Updated Polish, changed default firmware URL to Marlin. nothinman 2014-02-11 22:38:01 +0000
  • 1a6d21bb60 Merge pull request #761 from Cylindric3D/localisation nothinman 2014-02-11 15:39:18 +0000
  • 0778f5f028 Add missing entries to the new Aragonian language. Mark Hanford 2014-02-11 14:40:53 +0000
  • 54bab3e0d0 Merge branch 'Marlin_v1' into localisation Mark Hanford 2014-02-11 14:35:28 +0000
  • b18b40feff Merge pull request #760 from danielmartinez/aragonese_trans nothinman 2014-02-11 14:28:03 +0000
  • bdd0211aeb Move strings in ultralcd.cpp into language.h. Mark Hanford 2014-02-11 13:54:43 +0000
  • c8e5a82d49 keep English as default lang. Daniel Martinez 2014-02-09 18:24:24 +0100
  • f64592e362 Add Aragonese translation Daniel Martinez 2014-02-09 18:19:37 +0100
  • ac74f45dc0 Merge pull request #752 from MatixYo/patch-3 ErikZalm 2014-02-09 17:52:26 +0100
  • 8ebcc9dc3a Merge pull request #748 from wolfmanjm/add/azteegx3pro ErikZalm 2014-02-09 17:50:15 +0100
  • 19530c9945 Revert "Merge pull request #756 from danielmartinez/aragones" nothinman 2014-02-09 16:21:00 +0000
  • 6f76066ab3 Merge pull request #756 from danielmartinez/aragones nothinman 2014-02-09 13:42:36 +0000
  • 8b67f6f3e8 Add Aragonese translation Daniel Martinez 2014-02-09 12:54:05 +0100
  • 36086d3ca4 Update language.h MatixYo 2014-02-07 19:15:51 +0100
  • 1781031f2d Update LCD Menu Tree with current options, based on ultralcd.cpp and language.h. Cylindric 2014-02-07 01:52:44 +0000
  • d485988bec fix typo Jim Morris 2014-02-05 14:39:45 -0800
  • 8a1fd25363 Default is to not define digipot_i2c Jim Morris 2014-02-05 14:28:23 -0800
  • 5097c57d3a Added pins for Azteeg X3 Pro under motherboard 68 Jim Morris 2014-02-05 14:25:42 -0800
  • b819fc53ca Add Azteeg X3 Pro as motherboard 68 Add digipot i2c control for MCP4451 Allow M907 to set i2c digipot currents in amps Fix Makefile to allow Azteeg motherboards Fix Makefile to allow Wire libraries only Add beeper pin for Azteeg X3 Pro Jim Morris 2014-02-05 01:47:12 -0800
  • e1ae7952eb Merge pull request #743 from Opticalworm/Marlin_v1 ErikZalm 2014-02-03 12:33:10 -0800
  • 1cc9212c05 Merge pull request #744 from drf5n/watts ErikZalm 2014-02-03 12:30:40 -0800
  • a5f53f0cf3 Heater wattage reporting for M105 using EXTRUDER_WATTS and BED_WATTS David Forrest 2014-02-03 14:46:09 -0500
  • c2b3e88787 Changed 1284p fuse setting for Arduino_1.x.x Ronald 2014-02-03 15:35:23 +0000
  • 8d162e5bd7 Improved support for panelolu2 encoder and buzzer Ronald 2014-02-03 07:45:03 +0000
  • 430dcb65a7 Merge pull request #740 from whosawhatsis/M200 ErikZalm 2014-02-02 12:22:01 -0800
  • 3ec0d110bd Merge pull request #741 from Opticalworm/Marlin_v1 ErikZalm 2014-02-02 12:17:22 -0800
  • f303129fb6 Changed 1284p fuse setting for 8, 16 and 20 Mhz Ronald 2014-02-02 13:13:15 +0000
  • b2c11ba980 Change diameter code to 'D' whosawhatsis 2014-02-01 18:49:25 -0800
  • a864d9d4ab Merge pull request #738 from whosawhatsis/Marlin_v1 ErikZalm 2014-02-01 13:03:00 -0800
  • 28aca76c4d Group hardware files for Arduino 1.x.x into hardware folder whosawhatsis 2014-02-01 12:22:37 -0800
  • 61059385a3 Merge pull request #737 from whosawhatsis/M200 ErikZalm 2014-02-01 10:37:49 -0800
  • 856edfcc0d Fixed math whosawhatsis 2014-01-31 08:43:11 -0800
  • 0d81ae77bc Merge pull request #727 from drf5n/oversampling ErikZalm 2014-01-31 07:09:10 -0800
  • 84df13f7d1 Merge pull request #721 from drf5n/lcdOnly ErikZalm 2014-01-31 07:07:12 -0800
  • 4c7e9502ad Merge pull request #718 from drf5n/temptableRes ErikZalm 2014-01-31 07:06:02 -0800
  • 652a0f6b5a Merge pull request #717 from drf5n/tpins2 ErikZalm 2014-01-31 07:05:20 -0800
  • 96a0cdc541 Merge pull request #716 from drf5n/maketeensy ErikZalm 2014-01-31 07:04:29 -0800
  • d24df7af2c M200 implementation whosawhatsis 2014-01-31 00:54:19 -0800
  • f0b8d5ba3d createTemperatureLookupMarlin.py: Change comment to refer to actual program name. David Forrest 2014-01-29 23:34:22 -0500
  • 50f44d9249 createTemperatureLookupMarlin.py: Truncate to short after application of OVERSAMPLENR for improved resolution. David Forrest 2014-01-29 23:23:18 -0500
  • f5b5dd8038 createTemperatureLookupMarlin.py: Add output of Steinhart-Hart coefficients. David Forrest 2014-01-29 22:45:10 -0500
  • 76cf07c3f7 Configuration.h: Use OVERSAMPLENR in dT_PID definition. David Forrest 2014-01-21 23:25:51 -0500
  • 476c7193d8 temperature.cpp: Use OVERSAMPLENR in oversampling calculation. David Forrest 2014-01-21 16:49:03 -0500
  • adbf226de1 Merge pull request #726 from DanLipsitt/patch-1 nothinman 2014-01-21 12:46:47 -0800
  • 5bf73b86ff Format README.md with subsections Dan Lipsitt 2014-01-20 18:04:06 -0800
  • 9b2576e5de Merge pull request #725 from whosawhatsis/Marlin_v1 ErikZalm 2014-01-19 23:44:36 -0800
  • f08bb8bb6a Previous commit borked. whosawhatsis 2014-01-19 22:06:45 -0800
  • b1f8f492c6 Remove previous_millis_cmd update from extruder runout prevention code whosawhatsis 2014-01-19 19:22:08 -0800
  • 8a5eaa3c9b Fix crash after home bug whosawhatsis 2014-01-19 19:11:51 -0800
  • 61a7256d42 Enable basic ULTRA_LCD screen w/o encoders and menus. David Forrest 2014-01-17 17:00:47 -0500
  • c724c762a2 Merge pull request #720 from sourceperl/Marlin_v1 alexborro 2014-01-17 07:15:35 -0800
  • fdac8f6cec Update ConfigurationStore.cpp l.lefebvre 2014-01-17 16:09:58 +0100
  • 05932e4458 Add Z Probe Offset to EEPROM and Ultra LCD Alex Borro 2014-01-16 18:13:46 -0200
  • 7216583b8b createTemperatureLookupMarlin.py: Add resolution comments and format for Marlin. David Forrest 2014-01-16 12:40:15 -0500
  • e8e0697e48 fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/Printrboard compatibility. David Forrest 2014-01-16 11:23:29 -0500
  • 75f39fadfc Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HARDWARE_MOTHERBOARD=={8,81,82,83,84}) David Forrest 2014-01-16 10:58:35 -0500
  • df194f75e1 Added PT100 support for Ultiboard2 daid 2014-01-06 11:20:03 +0100
  • 380144c20f Add Ultiboard2 electronics. With PWM current settings. For the few people that have this new board as experiment in their UM-Original. daid 2014-01-06 11:05:02 +0100
  • 89a304fd98 Merge pull request #673 from fsantini/ErikZalm alexborro 2013-12-23 03:46:31 -0800
  • 6ae7f7870d Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into ErikZalm fsantini 2013-12-23 12:20:32 +0100
  • 17d6d965dc Use C++ initialization list Phil Wise 2013-12-19 21:21:46 +0000
  • 8f195844dd Merge pull request #687 from jrbenito/update_delta_config_examples ErikZalm 2013-12-19 00:15:16 -0800