Commit Graph

  • fa2e3a40e9 fixed LCD manual z axis move Feedrate to 70 (was 1700) Christian Thalhammer 2012-03-01 14:38:50 +0100
  • a92b3afe64 added german translation;Menue should be in english.. sounds better Christian Thalhammer 2012-03-01 14:24:20 +0100
  • 9fa586bbed fixed languages; Preheat_PLA and Preheat_ABS was not defined for non english Christian Thalhammer 2012-03-01 14:05:40 +0100
  • 00d33e6b82 Typo fix Daid 2012-02-29 19:01:21 +0100
  • 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 +0100
  • 3d83109028 Fixed general 16x2 LCD build without SD support. Daid 2012-02-29 15:33:23 +0100
  • cb02914687 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 Christian Thalhammer 2012-02-29 14:51:35 +0100
  • 10bf2bb8e1 - Christian Thalhammer 2012-02-29 14:51:15 +0100
  • d47b666630 Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1 Daid 2012-02-29 12:19:20 +0100
  • 88d289caa1 Made plan_buffer_line arguments const, which optimizes better and fixes the RUNOUT_PREVENTION feature. Daid 2012-02-29 11:38:12 +0100
  • b4833d55c2 Fixed HOME_POS in combination with G28 X0 or G28 Y0 Erik van der Zalm 2012-02-28 18:20:03 +0100
  • c6f2ec3c82 remove stop_heating_wait Erik van der Zalm 2012-02-27 18:45:45 +0100
  • b48d67ce10 Fixed homing Erik van der Zalm 2012-02-27 18:31:40 +0100
  • 071eec7aa7 Merge pull request #81 from phord/09469add5560ca8a676c42e4bcd499868c33f0dd ErikZalm 2012-02-27 08:38:36 -0800
  • 1ebe7d1ab6 Merge pull request #83 from phord/tempfix ErikZalm 2012-02-27 08:36:45 -0800
  • de37b2264a Merge pull request #82 from phord/fix-gen7-build ErikZalm 2012-02-27 08:36:06 -0800
  • b65ef8d66c Add support for upcoming Gen7 v1.4 Phil Hord 2012-02-26 20:39:49 -0500
  • 740f0c7690 Add explicit #define for bogus temp override Phil Hord 2012-02-26 18:46:34 -0500
  • ba8500a236 pins.h: Define Z_MAX_PIN for Gen7 board Phil Hord 2012-02-26 20:15:40 -0500
  • 09469add55 Add board reset reporting (from Repetier-Firmware) Phil Hord 2012-02-20 02:30:31 -0500
  • f3101e96d9 Add suitable .gitignore to avoid build noise Phil Hord 2012-02-16 12:06:33 -0500
  • 245dca4bee Makefile: generic pde=>cpp rule Phil Hord 2012-02-16 12:17:33 -0500
  • 97d42ca2b2 SDSUPPORT default disabled Erik van der Zalm 2012-02-26 22:05:38 +0100
  • 2faa0852b9 Merge pull request #79 from changwoo/Marlin_v1 ErikZalm 2012-02-26 13:03:15 -0800
  • 7b14953c99 Fix build on Sanguino based boards with ATmega1284P Changwoo Ryu 2012-02-27 04:05:33 +0900
  • 286d5003fa Fixed compiler warning for Sanguino compile Daid 2012-02-26 17:35:01 +0100
  • 66d50562b6 Merge pull request #76 from iXce/Marlin_v1 ErikZalm 2012-02-26 07:30:51 -0800
  • 27f595a444 Changed version => RC2 Erik van der Zalm 2012-02-26 16:26:40 +0100
  • 018c567abf Moved SLOWDOWN function. (jetty840) Included AD595 calibration options. (daid) Erik van der Zalm 2012-02-26 16:23:47 +0100
  • 4fbda5c3f5 Merge remote-tracking branch 'daid/Marlin_v1' into Test Erik van der Zalm 2012-02-26 16:10:59 +0100
  • ce714fe306 Fixes in pins.h Erik van der Zalm 2012-02-25 22:55:17 +0100
  • 35e57bf149 Added gen6 deluxe. Erik van der Zalm 2012-02-25 17:44:45 +0100
  • 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 +0100
  • adc108d79e Correctly build the produced applet/Marlin.cpp source Guillaume Seguin 2012-02-24 21:21:19 +0100
  • 5aa9c41ab1 Changed comment mode for detection. Added M221 extuder multiply factor. Erik van der Zalm 2012-02-24 20:42:07 +0100
  • 00690f7ffd Fix cast warning in Gen7 Erik van der Zalm 2012-02-23 18:50:05 +0100
  • 01d28c18ab Fixed casting warning in sanguino Erik van der Zalm 2012-02-23 18:45:37 +0100
  • 2fd8c248fe Added Fan control to the pre-heat settings. Blair Thompson 2012-02-22 23:05:52 +0000
  • 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 +0000
  • 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 +0100
  • df1437bd86 Changed display format for some numbers. Erik van der Zalm 2012-02-21 23:05:43 +0100
  • 8816ef1c64 Small fixes after merge Erik van der Zalm 2012-02-21 20:36:43 +0100
  • d298dd121f merged SBUBA82 and Justblair Erik van der Zalm 2012-02-21 20:26:59 +0100
  • 2cc9a89830 Merge remote-tracking branch 'SCUBA82/Marlin_v1' into Marlin_v1 Erik van der Zalm 2012-02-21 20:17:35 +0100
  • a0a1f81913 various changes Erik van der Zalm 2012-02-21 20:17:28 +0100
  • 8a8ea50f33 fixed manual axis movement lcd option Christian Thalhammer 2012-02-21 09:31:28 +0100
  • b976692d0f Removed VS project files for tidyness stakes Blair Thompson 2012-02-20 22:39:39 +0000
  • fe940a142d Added a structure that will allow easy translations/modifications to the LCD menu. Blair Thompson 2012-02-20 22:22:46 +0000
  • 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 +0100
  • 6a3f8cf23f Infos about fuses to use; correct fuses in boards.txt Christian Thalhammer 2012-02-20 10:25:51 +0100
  • 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 +0000
  • 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 +0000
  • 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 +0100
  • 234fe8ea67 added infos for this fork Christian Thalhammer 2012-02-17 11:07:24 +0100
  • e661578c84 support for GEN7 1.1,1.2 and 1.3 Christian Thalhammer 2012-02-17 10:46:48 +0100
  • 73344e69c1 Added temperature offset/gain settings for AD595. Daid 2012-02-16 11:03:41 +0100
  • d309565b56 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 Christian Thalhammer 2012-02-13 13:07:55 +0100
  • 3f20f37c78 Merge remote branch 'upstream/Marlin_v1' into Marlin_v1 daid 2012-02-13 12:39:00 +0100
  • 0e3631ff4b smaller changes Christian Thalhammer 2012-02-13 12:31:53 +0100
  • fa2e1be0ca changed default EXTRUDE_MINTEMP to 170. Erik van der Zalm 2012-02-12 17:38:54 +0100
  • 7699f250e3 Fixed small merge bug Erik van der Zalm 2012-02-12 14:06:08 +0100
  • 11518a987f merged with triffid fork Erik van der Zalm 2012-02-12 13:58:36 +0100
  • b447815de5 removed unused HEATING_EARLY_FINISH_DEG_OFFSET Simplified stepper inactive time Erik van der Zalm 2012-02-12 06:22:16 +0800
  • bde30b2b48 Corrected e-length calculation in planner Erik van der Zalm 2012-02-12 01:36:42 +0800
  • 13e185d330 removed unused HEATING_EARLY_FINISH_DEG_OFFSET Simplified stepper inactive time Erik van der Zalm 2012-02-11 23:22:16 +0100
  • b58eae7657 Corrected e-length calculation in planner Erik van der Zalm 2012-02-11 18:36:42 +0100
  • 3e7fcb813e Merge pull request #61 from daid/Marlin_v1 ErikZalm 2012-02-11 07:36:24 -0800
  • 2a77c84c8f Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0. daid 2012-02-11 16:02:47 +0100
  • d47a3e5950 Changed check i mtion_conrol if (millimeters_of_travel == 0.0) => if (millimeters_of_travel < 0.001) (thanks mooselake) Erik van der Zalm 2012-02-09 21:02:01 +0100
  • f87c80889f Fixed M109 timer overflow (reported by triffid) Erik van der Zalm 2012-02-09 20:54:49 +0100
  • 154de69c02 Print configuration.h version during startup (thanks hairykiwi) Erik van der Zalm 2012-02-09 20:26:17 +0100
  • 6ef8459494 Corrected distance calculation. (thanks jv4779) Erik van der Zalm 2012-02-09 19:53:06 +0100
  • 598eb1d4f1 Fixed compilation for gcc-4.6.2 with avr-lib-1.8.0 (thanks daid) Erik van der Zalm 2012-02-09 19:38:53 +0100
  • 9173a5713b Teensylu support. Erik van der Zalm 2012-02-09 19:27:45 +0100
  • da040fd393 Fixed ultimaker heater 1 pins. (Thanks daid) Erik van der Zalm 2012-02-09 17:19:45 +0100
  • bdb70c0509 Warning for 10k thermistor Erik van der Zalm 2012-02-08 18:38:45 +0100
  • 5113513cb2 RC 1 Erik van der Zalm 2012-02-08 18:28:54 +0100
  • d8a0c6450f Split the configuration file in two parts. One for common settings. One for advanced settings. Erik van der Zalm 2012-02-07 20:23:43 +0100
  • 4cc8e37bf1 lcd menue "move_axis" added Christian Thalhammer 2012-02-07 12:58:05 +0100
  • b5fae1104b fixed sUICIDE_PIN disable Christian Thalhammer 2012-02-07 08:50:26 +0100
  • f9c5333f97 Made "stop heating wait" optional. Default off. Erik van der Zalm 2012-02-06 20:13:44 +0100
  • 292ddd2edb Fix Z_LATE_ENABLE Erik van der Zalm 2012-02-06 17:38:16 +0100
  • 25cd8af536 added arduino ide GEN7 support Files Christian Thalhammer 2012-02-06 14:11:25 +0100
  • 14702089ee -disable TEMP Min MAX Kill while using PS_ON Pin ON GEN7 there is no temperature reading when power is off.. so Marlin would kill itself. There seems to be an update from "Traumflug" on GEN7 using standby VCC for thermistors. Christian Thalhammer 2012-02-06 12:28:33 +0100
  • b51e8bf7e5 -disabled CARDDETECT if PIN is set to -1 - redo disable Beeper if PIN is set to -1 Christian Thalhammer 2012-02-06 12:22:44 +0100
  • 3183a14755 -added Configuration for GEN7 which worked for me Christian Thalhammer 2012-02-06 12:12:18 +0100
  • 5edef148fe -disalbe beeper if BEEPER_PIN = -1 Christian Thalhammer 2012-02-06 12:10:32 +0100
  • 13e2ad2831 - added info for using GEN7 configuration Christian Thalhammer 2012-02-06 11:58:52 +0100
  • 59cc5f889e - added support for ATMega1284P Christian Thalhammer 2012-02-06 11:55:56 +0100
  • a11f3b2d2f - Pins for modified GEN7 assigned - Added support for ATMega1284 Christian Thalhammer 2012-02-06 11:49:23 +0100
  • b0070a244a Merge remote-tracking branch 'upstream/master' into Marlin_v1 Christian Thalhammer 2012-02-06 11:37:07 +0100
  • abb7e63906 fixed z-disable bug. Erik van der Zalm 2012-02-05 21:14:55 +0100
  • 9f139d6e0e Added MAX6675 support. (Thanks to gregfrost) Needs some work to remove the blocking in read max6675. Erik van der Zalm 2012-02-05 13:05:07 +0100
  • e45e5c68bb Added support for Gen3+ (Pins file only) Added late z enable. (blddk request) Only calculate look ahead if >2 moves in buffer. Removed some FORCE_INLINE to save memory. Erik van der Zalm 2012-02-05 12:42:15 +0100
  • 7c6141ebc4 Merge pull request #54 from haxar/patch-1 ErikZalm 2012-02-05 02:19:35 -0800
  • 9c918a497b more work on Makefile - actually rebuilds if Makefile or Configuration.h are altered, also much cleaner output Michael Moon 2012-01-25 20:46:27 +1100
  • ab01658fd2 local configuration stuff- WATCHPERIOD causes breakage, disable. few other misc changes Michael Moon 2012-01-24 17:02:45 +1100
  • 42bedb3f60 PROGMEM elements must be const Michael Moon 2012-01-24 15:57:42 +1100
  • a991bde523 enable auto-reset before programming, disable afterwards Michael Moon 2012-01-24 14:25:28 +1100
  • 3e575533c5 get M81 working Michael Moon 2012-01-24 14:24:41 +1100