felix/Marlin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • d485988bec fix typo Jim Morris 2014-02-05 14:39:45 -08:00
  • 8a1fd25363 Default is to not define digipot_i2c Jim Morris 2014-02-05 14:28:23 -08:00
  • 5097c57d3a Added pins for Azteeg X3 Pro under motherboard 68 Jim Morris 2014-02-05 14:25:42 -08:00
  • 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 -08:00
  • e1ae7952eb Merge pull request #743 from Opticalworm/Marlin_v1 ErikZalm 2014-02-03 12:33:10 -08:00
  • 1cc9212c05 Merge pull request #744 from drf5n/watts ErikZalm 2014-02-03 12:30:40 -08:00
  • a5f53f0cf3 Heater wattage reporting for M105 using EXTRUDER_WATTS and BED_WATTS David Forrest 2014-02-03 14:46:09 -05:00
  • c2b3e88787 Changed 1284p fuse setting for Arduino_1.x.x Ronald 2014-02-03 15:35:23 +00:00
  • 8d162e5bd7 Improved support for panelolu2 encoder and buzzer Ronald 2014-02-03 07:45:03 +00:00
  • 430dcb65a7 Merge pull request #740 from whosawhatsis/M200 ErikZalm 2014-02-02 12:22:01 -08:00
  • 3ec0d110bd Merge pull request #741 from Opticalworm/Marlin_v1 ErikZalm 2014-02-02 12:17:22 -08:00
  • f303129fb6 Changed 1284p fuse setting for 8, 16 and 20 Mhz Ronald 2014-02-02 13:13:15 +00:00
  • b2c11ba980 Change diameter code to 'D' whosawhatsis 2014-02-01 18:49:25 -08:00
  • a864d9d4ab Merge pull request #738 from whosawhatsis/Marlin_v1 ErikZalm 2014-02-01 13:03:00 -08:00
  • 28aca76c4d Group hardware files for Arduino 1.x.x into hardware folder whosawhatsis 2014-02-01 12:22:37 -08:00
  • 61059385a3 Merge pull request #737 from whosawhatsis/M200 ErikZalm 2014-02-01 10:37:49 -08:00
  • 856edfcc0d Fixed math whosawhatsis 2014-01-31 08:43:11 -08:00
  • 0d81ae77bc Merge pull request #727 from drf5n/oversampling ErikZalm 2014-01-31 07:09:10 -08:00
  • 84df13f7d1 Merge pull request #721 from drf5n/lcdOnly ErikZalm 2014-01-31 07:07:12 -08:00
  • 4c7e9502ad Merge pull request #718 from drf5n/temptableRes ErikZalm 2014-01-31 07:06:02 -08:00
  • 652a0f6b5a Merge pull request #717 from drf5n/tpins2 ErikZalm 2014-01-31 07:05:20 -08:00
  • 96a0cdc541 Merge pull request #716 from drf5n/maketeensy ErikZalm 2014-01-31 07:04:29 -08:00
  • d24df7af2c M200 implementation whosawhatsis 2014-01-31 00:54:19 -08:00
  • f0b8d5ba3d createTemperatureLookupMarlin.py: Change comment to refer to actual program name. David Forrest 2014-01-29 23:34:22 -05:00
  • 50f44d9249 createTemperatureLookupMarlin.py: Truncate to short after application of OVERSAMPLENR for improved resolution. David Forrest 2014-01-29 23:23:18 -05:00
  • f5b5dd8038 createTemperatureLookupMarlin.py: Add output of Steinhart-Hart coefficients. David Forrest 2014-01-29 22:45:10 -05:00
  • 76cf07c3f7 Configuration.h: Use OVERSAMPLENR in dT_PID definition. David Forrest 2014-01-21 23:25:51 -05:00
  • 476c7193d8 temperature.cpp: Use OVERSAMPLENR in oversampling calculation. David Forrest 2014-01-21 16:49:03 -05:00
  • adbf226de1 Merge pull request #726 from DanLipsitt/patch-1 nothinman 2014-01-21 12:46:47 -08:00
  • 5bf73b86ff Format README.md with subsections Dan Lipsitt 2014-01-20 18:04:06 -08:00
  • 9b2576e5de Merge pull request #725 from whosawhatsis/Marlin_v1 ErikZalm 2014-01-19 23:44:36 -08:00
  • f08bb8bb6a Previous commit borked. whosawhatsis 2014-01-19 22:06:45 -08:00
  • b1f8f492c6 Remove previous_millis_cmd update from extruder runout prevention code whosawhatsis 2014-01-19 19:22:08 -08:00
  • 8a5eaa3c9b Fix crash after home bug whosawhatsis 2014-01-19 19:11:51 -08:00
  • 61a7256d42 Enable basic ULTRA_LCD screen w/o encoders and menus. David Forrest 2014-01-17 17:00:47 -05:00
  • c724c762a2 Merge pull request #720 from sourceperl/Marlin_v1 alexborro 2014-01-17 07:15:35 -08:00
  • fdac8f6cec Update ConfigurationStore.cpp l.lefebvre 2014-01-17 16:09:58 +01:00
  • 05932e4458 Add Z Probe Offset to EEPROM and Ultra LCD Alex Borro 2014-01-16 18:13:46 -02:00
  • 7216583b8b createTemperatureLookupMarlin.py: Add resolution comments and format for Marlin. David Forrest 2014-01-16 12:40:15 -05:00
  • e8e0697e48 fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/Printrboard compatibility. David Forrest 2014-01-16 11:23:29 -05:00
  • 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 -05:00
  • df194f75e1 Added PT100 support for Ultiboard2 daid 2014-01-06 11:20:03 +01:00
  • 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 +01:00
  • 89a304fd98 Merge pull request #673 from fsantini/ErikZalm alexborro 2013-12-23 03:46:31 -08:00
  • 6ae7f7870d Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into ErikZalm fsantini 2013-12-23 12:20:32 +01:00
  • 17d6d965dc Use C++ initialization list Phil Wise 2013-12-19 21:21:46 +00:00
  • 8f195844dd Merge pull request #687 from jrbenito/update_delta_config_examples ErikZalm 2013-12-19 00:15:16 -08:00
  • ce8b9c4fc5 Correct missing parameter from last upmerge Joseivaldo Benito Junior 2013-12-19 00:50:44 -02:00
  • 000b710c5f Merge pull request #684 from jrbenito/update_delta_config_examples ErikZalm 2013-12-18 00:01:24 -08:00
  • 8e48e24c7f Update Delta example files Joseivaldo Benito Junior 2013-12-17 23:57:01 -02:00
  • 46d2443c7d Merge pull request #676 from IVI053/Marlin_v1 ErikZalm 2013-12-17 02:28:28 -08:00
  • eed053dffb Revert "Made numbering of heat bed thermistor more logical as D8 is bed, D9 is Extruder 2 and D10 is Extruder 1, so T0 should be E1, T1 E1 and T2 bed to be sequential as MOSFET-Outputs" - 2013-12-16 12:22:06 +01:00
  • 3e568efe67 Merge pull request #657 from hcker2000/patch-1 ErikZalm 2013-12-16 02:53:49 -08:00
  • 8349fc89a4 Fixed planner bug Erik van der Zalm 2013-12-16 11:40:23 +01:00
  • da2a6f9a31 Accurate bed leveling: x loop inside y and zigzag motion Francesco Santini 2013-12-13 10:31:19 +01:00
  • 532289e851 Merge pull request #677 from RicardoGA/patch-1 ErikZalm 2013-12-11 12:52:39 -08:00
  • d29615dc0c Z and Y dual stepper drivers error RicardoGA 2013-12-11 14:37:43 -06:00
  • 5bde7fcb28 Minor code and comment polishing fsantini 2013-12-11 21:27:43 +01:00
  • 20faff5935 Incorporate PS_DEFAULT_OFF for starting state on LCD menu entry - 2013-12-08 21:35:57 +01:00
  • e5d3044801 Added posibility to set ENCODER_STEPS_PER_MENU_ITEM in Configuration.h like ENCODER_PULSES_PER_STEP as it depends on it for usability - 2013-12-08 21:34:56 +01:00
  • b7eadb9f37 Made numbering of heat bed thermistor more logical as D8 is bed, D9 is Extruder 2 and D10 is Extruder 1, so T0 should be E1, T1 E1 and T2 bed to be sequential as MOSFET-Outputs - 2013-12-08 21:30:42 +01:00
  • e016a720f4 Merge pull request #675 from forrestg/master ErikZalm 2013-12-07 05:56:24 -08:00
  • e8786bf110 Added support for Cheaptronic v1 electronic Michal Dyntar 2013-12-07 13:29:47 +01:00
  • cc2925b705 Implemented a least squares fit of the bed equation for auto bed leveling. fsantini 2013-12-06 21:46:25 +01:00
  • b64661070e Fixed the plane vector equation to a simpler one (only dependent on the normal) fsantini 2013-12-06 21:32:21 +01:00
  • 5c44f6c434 Bed Heater monitoring in Controller Fan Alex Borro 2013-11-27 23:23:06 -02:00
  • b33375d438 Z Axis Safe Homing when using Z Probe Alex Borro 2013-11-27 22:37:35 -02:00
  • 35905ea4f9 Allow heaters to stay full On when PWM=127 Alex Borro 2013-11-27 18:13:38 -02:00
  • ad588e8990 Added new board for those of us with sanguinololu boards with ceramic resonators hcker2000 2013-11-18 15:49:36 -05:00
  • a94e588765 Changed slow buttons behavior. Erik van der Zalm 2013-11-17 17:41:30 +01:00
  • 69af392554 Added HEATERS_PARALLEL (Request from reifsnyderb) This allows a hot end with two heaters and a FET for each heater. This is useful if the FET is not capable of heating two heaters. Erik van der Zalm 2013-11-17 13:29:02 +01:00
  • 48a185d004 Fixed compile errors from bad commits. Erik van der Zalm 2013-11-10 16:36:37 +01:00
  • 24d1f480b6 Merge pull request #647 from shaggythesheep/newfeature-M226 ErikZalm 2013-11-10 07:27:01 -08:00
  • 95b41413e6 Merge pull request #641 from hugokernel/master ErikZalm 2013-11-10 07:26:35 -08:00
  • 59b96e323e Merge pull request #640 from fmalpartida/SAV-MkI ErikZalm 2013-11-10 07:26:08 -08:00
  • 2433ee6fc8 Merge pull request #637 from justuswilhelm/Marlin_v1 ErikZalm 2013-11-10 07:22:12 -08:00
  • 3455a2bac2 Merge pull request #636 from PrintToPeer/Marlin_v1 ErikZalm 2013-11-10 07:21:46 -08:00
  • ec1cf6e7f8 Merge pull request #635 from dbenamy/Marlin_v1 ErikZalm 2013-11-10 07:20:49 -08:00
  • dc887ef99b Implement M226 - GCode Initiated Pause Richard Miles 2013-11-09 00:55:23 +00:00
  • c244eb860c If you have a switch on suicide pin, this is useful if you want to start another print with suicide feature after a print without suicide... Charles R 2013-11-04 12:04:04 +01:00
  • 7b556d2e96 Added BT support on AT90USB devices fmalpartida 2013-11-03 19:57:06 +01:00
  • a5e8575829 Add UUID support to M115 responses. Kaz Walker 2013-11-01 14:51:50 -06:00
  • cab84e0e5b Add (correct) missing pin definitions for Y2 Daniel Benamy 2013-10-30 22:44:20 -04:00
  • 5b3f60ea2e Corrected LCD only error fmalpartida 2013-10-30 21:52:46 +01:00
  • 62d0b79023 Fix servo control for Melzi Justus Perlwitz 2013-10-30 20:58:38 +01:00
  • c184f808f7 Merge pull request #632 from dbenamy/Marlin_v1 ErikZalm 2013-10-30 10:47:11 -07:00
  • c886f5cb13 Made instructions more clear. Daniel Benamy 2013-10-30 13:26:49 -04:00
  • b5a964fcc5 Initial SAV MkI (RepRap CloneWars board) integration. fmalpartida 2013-10-30 11:45:32 +01:00
  • 4382068f92 Merge pull request #630 from dumle29/Marlin_v1 ErikZalm 2013-10-29 10:57:12 -07:00
  • f941203172 PS_ON configurable boot state dumle29 2013-10-29 18:44:56 +01:00
  • 47854ff5ce Merge pull request #629 from whosawhatsis/Marlin_v1 Bernhard Kubicek 2013-10-24 20:48:16 -07:00
  • c79e3967b3 Make G11 not horribly broken whosawhatsis 2013-10-24 18:58:42 -07:00
  • 5b8b939a1f Add comments about RAMPS 5V rail for servos. alexborro 2013-10-22 10:38:33 -02:00
  • d69822ed51 Fix '#' since it can occure in comments. bkubicek 2013-10-22 10:34:51 +02:00
  • 2fb2a0a119 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 bkubicek 2013-10-22 10:08:21 +02:00
  • 39d88bcccb preparation for hibernation bkubicek 2013-10-22 10:04:08 +02:00
  • ab965376ff Sub-file calls. by overloading M32 it is now possible to execute gcode files from other gcode files, with a fixed recursion level. This can be used e.g. for having a real start.g and end.g somewhere on the sd card, which are then called from the normal print file. Another usecase would be to have macro-files for nozzle-change and layerchange. I have not tested the speedwise performance. The testing was done with pronterface. bkubicek 2013-10-22 10:02:18 +02:00
  • b2cc27e5ea Added a magic character for sd buffering. if a '#' is read now the buffer will be emptied before reading ahead. This is so one can execute files from within gcode files, without messing the buffer with preread characters from the caller file. # can not occure in sd files imho, because it should only occure within checksums in ther serial communication. Yes, thats a lame argument. If you have a better idea please tell me. It has to be a character that one can type on a keyboard manually. bkubicek 2013-10-22 09:54:13 +02:00
  • 8a08cca0f2 Added temperature status less. Hopefully fixed viky button handling without braking other boards Erik van der Zalm 2013-10-20 12:12:35 +02:00
  • 667d278f54 Revert "Fix for Viki display" Erik van der Zalm 2013-10-20 10:16:46 +02:00