283 Commits (7d124478faea1934db70e3c7a640fbcf441f4eb0)

Author SHA1 Message Date
Erik van der Zalm 11518a987f merged with triffid fork 13 years ago
Erik van der Zalm 13e185d330 removed unused HEATING_EARLY_FINISH_DEG_OFFSET
Simplified stepper inactive time
13 years ago
Erik van der Zalm b58eae7657 Corrected e-length calculation in planner 13 years ago
daid 2a77c84c8f Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0. 13 years ago
Erik van der Zalm d47a3e5950 Changed check i mtion_conrol
if (millimeters_of_travel == 0.0) => if (millimeters_of_travel < 0.001)
(thanks mooselake)
13 years ago
Erik van der Zalm f87c80889f Fixed M109 timer overflow (reported by triffid) 13 years ago
Erik van der Zalm 154de69c02 Print configuration.h version during startup (thanks hairykiwi) 13 years ago
Erik van der Zalm 6ef8459494 Corrected distance calculation. (thanks jv4779) 13 years ago
Erik van der Zalm 598eb1d4f1 Fixed compilation for gcc-4.6.2 with avr-lib-1.8.0 (thanks daid) 13 years ago
Erik van der Zalm 9173a5713b Teensylu support. 13 years ago
Erik van der Zalm da040fd393 Fixed ultimaker heater 1 pins. (Thanks daid) 13 years ago
Erik van der Zalm bdb70c0509 Warning for 10k thermistor 13 years ago
Erik van der Zalm 5113513cb2 RC 1 13 years ago
Erik van der Zalm d8a0c6450f Split the configuration file in two parts.
One for common settings.
One for advanced settings.
13 years ago
Christian Thalhammer 4cc8e37bf1 lcd menue "move_axis" added 13 years ago
Christian Thalhammer b5fae1104b fixed sUICIDE_PIN disable 13 years ago
Erik van der Zalm f9c5333f97 Made "stop heating wait" optional.
Default off.
13 years ago
Erik van der Zalm 292ddd2edb Fix Z_LATE_ENABLE 13 years ago
Christian Thalhammer 25cd8af536 added arduino ide GEN7 support Files 13 years ago
Christian Thalhammer 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.
13 years ago
Christian Thalhammer b51e8bf7e5 -disabled CARDDETECT if PIN is set to -1
- redo disable Beeper if PIN is set to -1
13 years ago
Christian Thalhammer 3183a14755 -added Configuration for GEN7 which worked for me 13 years ago
Christian Thalhammer 5edef148fe -disalbe beeper if BEEPER_PIN = -1 13 years ago
Christian Thalhammer 13e2ad2831 - added info for using GEN7 configuration 13 years ago
Christian Thalhammer 59cc5f889e - added support for ATMega1284P 13 years ago
Christian Thalhammer a11f3b2d2f - Pins for modified GEN7 assigned
- Added support for ATMega1284
13 years ago
Erik van der Zalm abb7e63906 fixed z-disable bug. 13 years ago
Erik van der Zalm 9f139d6e0e Added MAX6675 support. (Thanks to gregfrost)
Needs some work to remove the blocking in read max6675.
13 years ago
Erik van der Zalm 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.

Signed-off-by: Erik van der Zalm <erik@vdzalm.eu>
13 years ago
Michael Moon 9c918a497b more work on Makefile - actually rebuilds if Makefile or Configuration.h are altered, also much cleaner output 13 years ago
Michael Moon ab01658fd2 local configuration stuff- WATCHPERIOD causes breakage, disable. few other misc changes 13 years ago
Michael Moon 42bedb3f60 PROGMEM elements must be const 13 years ago
Michael Moon a991bde523 enable auto-reset before programming, disable afterwards 13 years ago
Michael Moon 3e575533c5 get M81 working 13 years ago
Michael Moon 2ae2ead97b help residency not overflow 13 years ago
Michael Moon 71dc82e0b4 my local configuration 13 years ago
Michael Moon 5aadc2f5ca cardreader needs to include some other files 13 years ago
Michael Moon 8d0916af13 allow Marlin to actually compile with Makefile pulled from Sprinter and a few other modifications 13 years ago
haxar 6cc6029d7a M109 EOL fix when TEMP_RESIDENCY_TIME is undefined; printer interface (pronterface) could not see target extruder heater temperature to continue print 13 years ago
Bernhard 157aa7f2fd m115 eol fix 13 years ago
Bernhard 7aeb45303d small mistake 13 years ago
Bernhard cee5f9020a added suicide pin for a power supply to the arduino that is only active if the arduino is holding high for an output. 13 years ago
Bernhard 3814bbb529 made sd code only compile with SDSUPPORT defined. safes 10k of codespace 13 years ago
Bernhard 729cde4475 fix autostart failure if in wrong directory 13 years ago
Bernhard 396270a0de fix duplicated definition of MOSI MISO pins in case motherboard==33 13 years ago
Bernhard 11f2dafc4e one step closer to a functional makefile.. 13 years ago
Bernhard 8463e39a4a starting with sanguino arduino 1.0 compatibility 13 years ago
Bernhard 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
13 years ago
Bernhard 57f9359a41 simplified the includes, makefile now works with arduino23 13 years ago
Bernhard 3c1a4aac2b header file simplification 13 years ago
Bernhard 212515148e added m240 photography support. default off 13 years ago
Bernhard 6735025428 cooldown 13 years ago
Bernhard 415aadf704 lcd panel bed support
advance and ultipanel not any more in default config
13 years ago
Erik van der Zalm 554cc1718d Fiexed E_ENABLE_PIN errors 13 years ago
Erik van der Zalm 617968ab76 G92 fix 13 years ago
Erik van der Zalm 84d9cf7339 merging 13 years ago
Erik van der Zalm e017228569 Merged multiple extruder support.
Soft PWM. (Sanguinololu can also have PID temperature control)
Interrupt save WRITE for addresses > 0x0FF
13 years ago
Bernhard 3320a5b37d make autotemp compatile for use without pid 13 years ago
Bernhard 06411d5c9e ultralcd can now also stop the wait loop for the hot-end m109 heating when stopping sd prints. 13 years ago
Bernhard 82c99625fa instant stop of sd prints from the panel. 13 years ago
Bernhard 01001b89d2 repaired nozzle runout prevention to not collide with automatic stepper disabeling. 13 years ago
Bernhard 88ee053af0 heating up santity, formarly knows as "watchdog", but renamed due to the existance of the real watchdog, works now. 13 years ago
Bernhard b1d84d879b st_synchronize back to normal.. 13 years ago
Bernhard Kubicek f6fe7143e4 Merge pull request #29 from k-eex/Marlin_v1
Fix M201 not saving settings in all places, so the changes did not get written into EEPROM
13 years ago
Bernhard dde4b40fa9 disable steppers in runout prevention 13 years ago
Bernhard 2bc5e7ec9e prevent too long extrudes, or too cold extrudes 13 years ago
Bernhard aa4f9a6474 better values. 13 years ago
Bernhard 87fd249c43 made runout prevention independent of tempeorarily set esteps 13 years ago
Bernhard 1ec0c3b68a extruder runout prevention. 13 years ago
Bernhard 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. 13 years ago
Bernhard cc4a9cdb69 added autostart procedure trigger to the ultralcd menu 13 years ago
Bernhard 61c943b4bf fixed the st_synchronize. it would have continued if there is only the last move of the buffer being stepped. 13 years ago
Keegi bae1e422f6 Fix M201 not saving settings in all places, so the changes did not get written into EEPROM 13 years ago
Bernhard 754d2d69b2 z homing sound fix, for now until the actual cause is found.. 13 years ago
Bernhard 986f0ba76c moved <stdio.h> to more dominant location. 13 years ago
Bernhard 460b788d78 repaired homing position setting. 13 years ago
Denis B 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
13 years ago
Bernhard 12e8edcac3 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
Bernhard cf50ba140f added M503 to display eeprom storage, and renamed eeprom routings. This version is compatible with the qtmarlin eeprom-tab. 13 years ago
Erik van der Zalm 89e832c295 Update endstops only for homing. (use less resources when not used) 13 years ago
Erik van der Zalm b99c49ec3b Add option to only check endstop when homing 13 years ago
Erik van der Zalm 95a0b28acb Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 13 years ago
Erik van der Zalm af22e9cd38 Some advance modifications 13 years ago
Bernhard 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.
13 years ago
Bernhard dfd240b260 overworked autotemp, removed one layer of nesting from the ultralcd. 13 years ago
Bernhard 4f909963e4 make QUICKHOME configureable 13 years ago
Erik van der Zalm 6b86f15686 More 2nd extruder implementation. (Not usable)
Advance (not tested)
13 years ago
Bernhard 0bc9daa4f7 make it compile with arduino 1.0 ; function is still untested. 13 years ago
Bernhard b0c3871750 more fixing of the sanguino math round problem 13 years ago
Bernhard 9c57453168 removed stream.h referenece from marlinserial. 13 years ago
Bernhard 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.
13 years ago
Bernhard 7a4be21b4f made it compile if arduino decides to include files in a differnt order. DEC HEX and stuff now defined in MarlinSerial.h 13 years ago
Bernhard 716e89b87c first homing move diagonal towards home switches. 13 years ago
Bernhard d00b7e5587 repaired compiliation in windows 13 years ago
Bernhard e4ab0e5982 more inlines 13 years ago
Bernhard 8cb29921a0 possible stepper release after sd printing 13 years ago
Bernhard 044886b4a0 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
Bernhard b19c8b74b9 force inline 13 years ago
Erik van der Zalm 6d95644c0d Moved M88 into M84. (M84 E) 13 years ago
Bernhard 311627141b Merge branch 'smallopt' into Marlin_v1
Conflicts:
	Marlin/temperature.h
13 years ago