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

Commit Graph

  • 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
  • 2ae2ead97b help residency not overflow Michael Moon 2012-01-24 14:24:24 +1100
  • 71dc82e0b4 my local configuration Michael Moon 2012-01-24 13:19:37 +1100
  • 5aadc2f5ca cardreader needs to include some other files Michael Moon 2012-01-24 13:19:24 +1100
  • 8d0916af13 allow Marlin to actually compile with Makefile pulled from Sprinter and a few other modifications Michael Moon 2012-01-24 13:18:54 +1100
  • 6cc6029d7a M109 EOL fix when TEMP_RESIDENCY_TIME is undefined; printer interface (pronterface) could not see target extruder heater temperature to continue print haxar 2012-01-22 03:25:56 -0800
  • 157aa7f2fd m115 eol fix Bernhard 2012-01-15 20:51:49 +0100
  • 7aeb45303d small mistake Bernhard 2012-01-15 18:31:21 +0100
  • cee5f9020a added suicide pin for a power supply to the arduino that is only active if the arduino is holding high for an output. Bernhard 2012-01-15 17:06:10 +0100
  • 3814bbb529 made sd code only compile with SDSUPPORT defined. safes 10k of codespace Bernhard 2011-12-26 09:28:51 +0100
  • 729cde4475 fix autostart failure if in wrong directory Bernhard 2011-12-26 09:20:33 +0100
  • 396270a0de fix duplicated definition of MOSI MISO pins in case motherboard==33 Bernhard 2011-12-26 09:20:21 +0100
  • 11f2dafc4e one step closer to a functional makefile.. Bernhard 2011-12-22 16:43:28 +0100
  • 8463e39a4a starting with sanguino arduino 1.0 compatibility Bernhard 2011-12-22 16:11:15 +0100
  • 2bc160a978 add wiring.h, that can be used to overwrite: arduino-0023/hardware/arduino/cores/arduino/wiring.h this is necessary if the avr libraries are recent, but arduino is old. Alternative: newer arduino Bernhard 2011-12-22 14:57:28 +0100
  • 57f9359a41 simplified the includes, makefile now works with arduino23 Bernhard 2011-12-22 14:55:45 +0100
  • 3c1a4aac2b header file simplification Bernhard 2011-12-22 12:38:50 +0100
  • 212515148e added m240 photography support. default off Bernhard 2011-12-22 12:11:39 +0100
  • 6735025428 cooldown Bernhard 2011-12-22 12:02:33 +0100
  • 415aadf704 lcd panel bed support advance and ultipanel not any more in default config Bernhard 2011-12-22 11:45:52 +0100
  • 4bababf5b0 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Bernhard 2011-12-22 09:22:39 +0100
  • f312216e97 Revert "untestest commit, so I don't loose code.. features runout prevention addons" Bernhard 2011-12-22 09:22:22 +0100
  • 651cde8b98 untestest commit, so I don't loose code.. features runout prevention addons Bernhard 2011-12-22 09:20:34 +0100
  • 554cc1718d Fiexed E_ENABLE_PIN errors Erik van der Zalm 2011-12-15 11:59:07 +0100
  • 617968ab76 G92 fix Erik van der Zalm 2011-12-12 20:43:47 +0100
  • 84d9cf7339 merging Erik van der Zalm 2011-12-12 20:35:46 +0100
  • e017228569 Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF Erik van der Zalm 2011-12-12 19:34:37 +0100
  • 3320a5b37d make autotemp compatile for use without pid Bernhard 2011-12-11 22:25:52 +0100
  • 06411d5c9e ultralcd can now also stop the wait loop for the hot-end m109 heating when stopping sd prints. Bernhard 2011-12-11 22:18:50 +0100
  • 82c99625fa instant stop of sd prints from the panel. Bernhard 2011-12-11 22:10:06 +0100
  • 01001b89d2 repaired nozzle runout prevention to not collide with automatic stepper disabeling. Bernhard 2011-12-11 15:42:56 +0100
  • 88ee053af0 heating up santity, formarly knows as "watchdog", but renamed due to the existance of the real watchdog, works now. Bernhard 2011-12-09 17:06:56 +0100
  • b1d84d879b st_synchronize back to normal.. Bernhard 2011-12-09 16:13:58 +0100
  • f6fe7143e4 Merge pull request #29 from k-eex/Marlin_v1 Bernhard Kubicek 2011-12-09 06:37:42 -0800