SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Commit graph

  • 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
  • dde4b40fa9 disable steppers in runout prevention Bernhard 2011-12-09 15:37:24 +0100
  • 2bc5e7ec9e prevent too long extrudes, or too cold extrudes Bernhard 2011-12-09 15:09:52 +0100
  • aa4f9a6474 better values. Bernhard 2011-12-09 14:07:32 +0100
  • 87fd249c43 made runout prevention independent of tempeorarily set esteps Bernhard 2011-12-09 13:56:28 +0100
  • 1ec0c3b68a extruder runout prevention. Bernhard 2011-12-09 13:39:00 +0100
  • 5b4625f79c added a partial release option to "m84" aka "stepper release". If you do tiny layers, you might want to keep the z-axis powered to not loose height positioning after homeing. Bernhard 2011-12-09 12:51:08 +0100
  • cc4a9cdb69 added autostart procedure trigger to the ultralcd menu Bernhard 2011-12-09 12:33:00 +0100
  • 61c943b4bf fixed the st_synchronize. it would have continued if there is only the last move of the buffer being stepped. Bernhard 2011-12-09 12:32:31 +0100
  • bae1e422f6 Fix M201 not saving settings in all places, so the changes did not get written into EEPROM Keegi 2011-12-08 12:25:32 +0200
  • 754d2d69b2 z homing sound fix, for now until the actual cause is found.. Bernhard 2011-12-07 23:08:13 +0100
  • 986f0ba76c moved <stdio.h> to more dominant location. Bernhard 2011-12-07 20:56:47 +0100
  • 460b788d78 repaired homing position setting. Bernhard 2011-12-07 20:54:34 +0100
  • 3664ed6aad Merge branch 'Marlin_v1' of https://github.com/dob71/Marlin into Marlin_v1 Erik van der Zalm 2011-12-07 19:57:39 +0100
  • 43f5c3e82b Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 Erik van der Zalm 2011-12-07 19:55:17 +0100
  • 4fd75dc813 Working version of multiple extruders (up to 3) - The temperature control is pretty much complete (not sure what to do w/ autotemp though) Changed the pins assignment to clearly separate bed and extruder heaters and temp sensors, changed a bit how termistor tables are handled. - The steppers control is rudimentary (only chanages what pins it uses depending on the active_extruder var, but that's enough for switching extruder in the start.gcode in the the profiles) - Tested only w/ RAMPS 1.4 Denis B 2011-12-05 23:33:33 -0500
  • 12e8edcac3 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Bernhard 2011-12-04 22:27:37 +0100
  • cf50ba140f added M503 to display eeprom storage, and renamed eeprom routings. This version is compatible with the qtmarlin eeprom-tab. Bernhard 2011-12-04 22:26:42 +0100
  • 89e832c295 Update endstops only for homing. (use less resources when not used) Erik van der Zalm 2011-12-04 21:03:02 +0100
  • b99c49ec3b Add option to only check endstop when homing Erik van der Zalm 2011-12-04 20:17:21 +0100
  • 95a0b28acb Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 Erik van der Zalm 2011-12-04 19:54:43 +0100
  • af22e9cd38 Some advance modifications Erik van der Zalm 2011-12-04 19:54:07 +0100
  • 7714b98da7 solved some compiler warnings that are now visible in arduino 1.0. Found a couple of unused variables, that I commented. Tried to solve the program memory warning message, and failed. Bernhard 2011-12-04 12:40:18 +0100
  • dfd240b260 overworked autotemp, removed one layer of nesting from the ultralcd. Bernhard 2011-12-04 09:48:53 +0100
  • 4f909963e4 make QUICKHOME configureable Bernhard 2011-12-04 09:02:09 +0100
  • 6b86f15686 More 2nd extruder implementation. (Not usable) Advance (not tested) Erik van der Zalm 2011-12-02 17:45:05 +0100
  • 0bc9daa4f7 make it compile with arduino 1.0 ; function is still untested. Bernhard 2011-12-01 16:38:01 +0100
  • b0c3871750 more fixing of the sanguino math round problem Bernhard 2011-11-30 09:07:56 +0100
  • 9c57453168 removed stream.h referenece from marlinserial. Bernhard 2011-11-30 08:57:30 +0100
  • 59205ac5fc preliminiary implementation for the early heating finish. Might be replaced by something more clever, e.g. by erik, and does not yet support the second extruder or the bed. its kind of not so cool, because you need 6 more ints. Maybe isheating() should use the degrees directly, as it is not used in time-critical anyways. Then it would be much easier. to have the offsets without additional variables. Bernhard 2011-11-30 08:51:46 +0100
  • 7a4be21b4f made it compile if arduino decides to include files in a differnt order. DEC HEX and stuff now defined in MarlinSerial.h Bernhard 2011-11-30 08:32:28 +0100
  • 716e89b87c first homing move diagonal towards home switches. Bernhard 2011-11-29 22:06:31 +0100
  • d00b7e5587 repaired compiliation in windows Bernhard 2011-11-28 22:45:40 +0100
  • e4ab0e5982 more inlines Bernhard 2011-11-28 22:11:17 +0100