3d/marlin2_a10m
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Commit graph

  • 7cefad3744 Merge pull request from bgamari/Marlin_v1 ErikZalm 2012-03-11 01:48:30 -08:00
  • 87ff2f8867 Added CONTROLLERFAN. (Controlling a fan to cool down the steppper drivers) Erik van der Zalm 2012-03-11 10:44:10 +01:00
  • 387fe51a56 Do not disable steppers when there are moves in the queue. Erik van der Zalm 2012-03-09 20:20:01 +01:00
  • 421264e58a Fixed typo Erik van der Zalm 2012-03-09 17:49:48 +01:00
  • 15ad923310 Removed !!!. Stupid arduino bootloader can't handle this. Erik van der Zalm 2012-03-09 17:42:32 +01:00
  • 61e09e6be2 Added FAN_PIN -1 checks Erik van der Zalm 2012-03-08 22:09:49 +01:00
  • 87c4e06c24 Corrected active_extruder when autotemp is used. Erik van der Zalm 2012-03-08 22:04:13 +01:00
  • 7b1e295f34 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 Erik van der Zalm 2012-03-08 21:48:06 +01:00
  • c077316b2b Added PID autotune. (experimental) M303 Starts autotune. Wait till the Kp Ki and Kd constants are printed. Put these values in Configuration.h Erik van der Zalm 2012-03-08 21:43:21 +01:00
  • 49b228c4b3 Add instructions to regenerate speed_lookuptable when changing F_CPU Ben Gamari 2012-03-07 18:05:10 -05:00
  • 96509494f0 stepper: Clarify comment on timer-counter configuration Ben Gamari 2012-03-07 17:58:35 -05:00
  • 6d7e6a11fc Add create_speed_lookup Ben Gamari 2012-03-07 17:41:29 -05:00
  • f3095493b0 Merge pull request from tommycheng/patch-1 ErikZalm 2012-03-05 09:56:50 -08:00
  • ce07c9186d While Waiting for hotbed to warm up via M190, LCD Display and Click Encoder input freeze until target temperature is reached. Tommy Cheng 2012-03-05 23:12:26 +08:00
  • 116dc86b8a Fixed type in e-jerk Erik van der Zalm 2012-03-04 23:09:13 +01:00
  • 02ee9e3d30 Changed Pin Assignment for the RAMPS motherboard so that LCD and Rotary encoder are all wired to AUX-4 Blair Thompson 2012-03-04 21:34:20 +00:00
  • e056bf8081 Added E-Jerk Erik van der Zalm 2012-03-04 16:34:58 +01:00
  • 4deeffbc88 Added missing defines to the german section. Translation still needed. Erik van der Zalm 2012-03-04 14:08:20 +01:00
  • 632528aa95 merging with SCUBA82 Erik van der Zalm 2012-03-04 13:41:47 +01:00
  • aac7aa3bf0 Queued fan control. Issue Erik van der Zalm 2012-03-04 13:05:26 +01:00
  • fde51084f3 set SD file delete to M30; switch printime output to M31 Christian Thalhammer 2012-03-03 21:58:12 +01:00
  • 21e2bae063 Changed (corrected?) SD_card comment handling. Erik van der Zalm 2012-03-03 21:28:33 +01:00
  • e509bbf636 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 Erik van der Zalm 2012-03-03 20:41:22 +01:00
  • 072011a3ef Added current_block = NULL to quickStop() Erik van der Zalm 2012-03-03 20:40:46 +01:00
  • 2422a857a1 Merge pull request from haxar/Marlin_v1 ErikZalm 2012-03-03 11:24:58 -08:00
  • f598077af3 Removed vc files Erik van der Zalm 2012-03-03 20:22:42 +01:00
  • cb0c84e075 Merge remote-tracking branch 'justblair/master' into Marlin_v1 Erik van der Zalm 2012-03-03 20:20:55 +01:00
  • 1d5809d458 Merge pull request from daid/Marlin_v1 ErikZalm 2012-03-03 11:18:14 -08:00
  • ed951b1977 Fixed RAMPS 1.2 support (Found and fixed by rrhb) Erik van der Zalm 2012-03-03 20:15:41 +01:00
  • 4879de08e8 The percent complete for the SD file statistic sits squint. Changed "lcd.Setcursor (7,2);" to "lcd.Setcursor (10,2);". Blair Thompson 2012-03-03 16:47:27 +00:00
  • f278e1c00f This is in my opinion a much better way of dealing with SD cards than my previous fix. Blair Thompson 2012-03-03 16:30:31 +00:00
  • 046a8e0039 Added more defines to the language.h file so that nowe most of the text strings are now configured via this file. Still got some hunting down to do to complete this task. Blair Thompson 2012-03-03 15:51:47 +00:00
  • 79a466ca26 make analog2tempBed return a precise celsius reading for BED_USES_THERMISTOR, complementing changes to analog2temp in d15f01e haxar 2012-03-02 17:15:21 -08:00
  • 5f3a422e68 added M31 - delete file from sd card Christian Thalhammer 2012-03-02 21:49:05 +01:00
  • fa2e3a40e9 fixed LCD manual z axis move Feedrate to 70 (was 1700) Christian Thalhammer 2012-03-01 14:38:50 +01:00
  • a92b3afe64 added german translation;Menue should be in english.. sounds better Christian Thalhammer 2012-03-01 14:24:20 +01:00
  • 9fa586bbed fixed languages; Preheat_PLA and Preheat_ABS was not defined for non english Christian Thalhammer 2012-03-01 14:05:40 +01:00
  • 00d33e6b82 Typo fix Daid 2012-02-29 19:01:21 +01:00
  • 7d124478fa Only protect the heater pins for the defined extruders. Changed the way the extruder pins are defined so it doesn't create extra -1 entries in the list. Daid 2012-02-29 15:49:02 +01:00
  • 3d83109028 Fixed general 16x2 LCD build without SD support. Daid 2012-02-29 15:33:23 +01:00
  • cb02914687 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 Christian Thalhammer 2012-02-29 14:51:35 +01:00
  • 10bf2bb8e1 - Christian Thalhammer 2012-02-29 14:51:15 +01:00
  • d47b666630 Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1 Daid 2012-02-29 12:19:20 +01:00
  • 88d289caa1 Made plan_buffer_line arguments const, which optimizes better and fixes the RUNOUT_PREVENTION feature. Daid 2012-02-29 11:38:12 +01:00
  • b4833d55c2 Fixed HOME_POS in combination with G28 X0 or G28 Y0 Erik van der Zalm 2012-02-28 18:20:03 +01:00
  • c6f2ec3c82 remove stop_heating_wait Erik van der Zalm 2012-02-27 18:45:45 +01:00
  • b48d67ce10 Fixed homing Erik van der Zalm 2012-02-27 18:31:40 +01:00
  • 071eec7aa7 Merge pull request from phord/09469add5560ca8a676c42e4bcd499868c33f0dd ErikZalm 2012-02-27 08:38:36 -08:00
  • 1ebe7d1ab6 Merge pull request from phord/tempfix ErikZalm 2012-02-27 08:36:45 -08:00
  • de37b2264a Merge pull request from phord/fix-gen7-build ErikZalm 2012-02-27 08:36:06 -08:00
  • b65ef8d66c Add support for upcoming Gen7 v1.4 Phil Hord 2012-02-26 20:39:49 -05:00
  • 740f0c7690 Add explicit #define for bogus temp override Phil Hord 2012-02-26 18:46:34 -05:00
  • ba8500a236 pins.h: Define Z_MAX_PIN for Gen7 board Phil Hord 2012-02-26 20:15:40 -05:00
  • 09469add55 Add board reset reporting (from Repetier-Firmware) Phil Hord 2012-02-20 02:30:31 -05:00
  • f3101e96d9 Add suitable .gitignore to avoid build noise Phil Hord 2012-02-16 12:06:33 -05:00
  • 245dca4bee Makefile: generic pde=>cpp rule Phil Hord 2012-02-16 12:17:33 -05:00
  • 97d42ca2b2 SDSUPPORT default disabled Erik van der Zalm 2012-02-26 22:05:38 +01:00
  • 2faa0852b9 Merge pull request from changwoo/Marlin_v1 ErikZalm 2012-02-26 13:03:15 -08:00
  • 7b14953c99 Fix build on Sanguino based boards with ATmega1284P Changwoo Ryu 2012-02-27 04:05:33 +09:00
  • 286d5003fa Fixed compiler warning for Sanguino compile Daid 2012-02-26 17:35:01 +01:00
  • 66d50562b6 Merge pull request from iXce/Marlin_v1 ErikZalm 2012-02-26 07:30:51 -08:00
  • 27f595a444 Changed version => RC2 Erik van der Zalm 2012-02-26 16:26:40 +01:00
  • 018c567abf Moved SLOWDOWN function. (jetty840) Included AD595 calibration options. (daid) Erik van der Zalm 2012-02-26 16:23:47 +01:00
  • 4fbda5c3f5 Merge remote-tracking branch 'daid/Marlin_v1' into Test Erik van der Zalm 2012-02-26 16:10:59 +01:00
  • ce714fe306 Fixes in pins.h Erik van der Zalm 2012-02-25 22:55:17 +01:00
  • 35e57bf149 Added gen6 deluxe. Erik van der Zalm 2012-02-25 17:44:45 +01:00
  • 84ea2d61e8 Moved gen7 boards to motherboard type 10, 11 and 12. Split ramps1.3 in Sprinter like config and multiextruder config. Erik van der Zalm 2012-02-24 23:34:41 +01:00
  • adc108d79e Correctly build the produced applet/Marlin.cpp source Guillaume Seguin 2012-02-24 21:21:19 +01:00
  • 5aa9c41ab1 Changed comment mode for detection. Added M221 extuder multiply factor. Erik van der Zalm 2012-02-24 20:42:07 +01:00
  • 00690f7ffd Fix cast warning in Gen7 Erik van der Zalm 2012-02-23 18:50:05 +01:00
  • 01d28c18ab Fixed casting warning in sanguino Erik van der Zalm 2012-02-23 18:45:37 +01:00
  • 2fd8c248fe Added Fan control to the pre-heat settings. Blair Thompson 2012-02-22 23:05:52 +00:00
  • d9f2f509d5 Added new menu items under the prepare submenu. Instead of a single pre-heat, now there is pre-heat ABS and PLA options Added defines to the configuration file to adjust preheat temperatures for both Blair Thompson 2012-02-22 22:51:04 +00:00
  • ae3e7586c6 Added HOME_POS. This adds the posibility to make the center 0 Updated the Xsteps ... settings via the LCD menu Erik van der Zalm 2012-02-22 18:07:56 +01:00
  • df1437bd86 Changed display format for some numbers. Erik van der Zalm 2012-02-21 23:05:43 +01:00
  • 8816ef1c64 Small fixes after merge Erik van der Zalm 2012-02-21 20:36:43 +01:00
  • d298dd121f merged SBUBA82 and Justblair Erik van der Zalm 2012-02-21 20:26:59 +01:00
  • 2cc9a89830 Merge remote-tracking branch 'SCUBA82/Marlin_v1' into Marlin_v1 Erik van der Zalm 2012-02-21 20:17:35 +01:00
  • a0a1f81913 various changes Erik van der Zalm 2012-02-21 20:17:28 +01:00
  • 8a8ea50f33 fixed manual axis movement lcd option Christian Thalhammer 2012-02-21 09:31:28 +01:00
  • b976692d0f Removed VS project files for tidyness stakes Blair Thompson 2012-02-20 22:39:39 +00:00
  • fe940a142d Added a structure that will allow easy translations/modifications to the LCD menu. Blair Thompson 2012-02-20 22:22:46 +00:00
  • b3fb09a20c change preheat to ABS values of nozzle 227 and be 105 �C next try for manual axis movement Christian Thalhammer 2012-02-20 16:07:27 +01:00
  • 6a3f8cf23f Infos about fuses to use; correct fuses in boards.txt Christian Thalhammer 2012-02-20 10:25:51 +01:00
  • a05a261b72 Added a workaround. Ramps SD card does not have sdcarddetect. My temporary solution is to add a momentary swtich that pulls down the SDCARDDETECT pin and mimicking the pull and reinsert ofa a SD card Blair Thompson 2012-02-18 23:56:31 +00:00
  • 1b6765ed12 Updated the pin config for RAMPS 1.3 to include ultimaker new style LCD/Rotary Encoder interface Blair Thompson 2012-02-18 18:25:04 +00:00
  • 1ff99ae25f ATMega1284P support for Arduino IDE replace $ARDUINO_HOME/hardware/tools/avr/etc/arduino.conf with this file Christian Thalhammer 2012-02-17 11:41:47 +01:00
  • 234fe8ea67 added infos for this fork Christian Thalhammer 2012-02-17 11:07:24 +01:00
  • e661578c84 support for GEN7 1.1,1.2 and 1.3 Christian Thalhammer 2012-02-17 10:46:48 +01:00
  • 73344e69c1 Added temperature offset/gain settings for AD595. Daid 2012-02-16 11:03:41 +01:00
  • d309565b56 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 Christian Thalhammer 2012-02-13 13:07:55 +01:00
  • 3f20f37c78 Merge remote branch 'upstream/Marlin_v1' into Marlin_v1 daid 2012-02-13 12:39:00 +01:00
  • 0e3631ff4b smaller changes Christian Thalhammer 2012-02-13 12:31:53 +01:00
  • fa2e1be0ca changed default EXTRUDE_MINTEMP to 170. Erik van der Zalm 2012-02-12 17:38:54 +01:00
  • 7699f250e3 Fixed small merge bug Erik van der Zalm 2012-02-12 14:06:08 +01:00
  • 11518a987f merged with triffid fork Erik van der Zalm 2012-02-12 13:58:36 +01:00
  • b447815de5 removed unused HEATING_EARLY_FINISH_DEG_OFFSET Simplified stepper inactive time Erik van der Zalm 2012-02-12 06:22:16 +08:00
  • bde30b2b48 Corrected e-length calculation in planner Erik van der Zalm 2012-02-12 01:36:42 +08:00
  • 13e185d330 removed unused HEATING_EARLY_FINISH_DEG_OFFSET Simplified stepper inactive time Erik van der Zalm 2012-02-11 23:22:16 +01:00
  • b58eae7657 Corrected e-length calculation in planner Erik van der Zalm 2012-02-11 18:36:42 +01:00