2ae2ead97bhelp residency not overflow
Michael Moon
2012-01-24 14:24:24 +11:00
71dc82e0b4my local configuration
Michael Moon
2012-01-24 13:19:37 +11:00
5aadc2f5cacardreader needs to include some other files
Michael Moon
2012-01-24 13:19:24 +11:00
8d0916af13allow Marlin to actually compile with Makefile pulled from Sprinter and a few other modifications
Michael Moon
2012-01-24 13:18:54 +11:00
6cc6029d7aM109 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 -08:00
157aa7f2fdm115 eol fix
Bernhard
2012-01-15 20:51:49 +01:00
7aeb45303dsmall mistake
Bernhard
2012-01-15 18:31:21 +01:00
cee5f9020aadded 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 +01:00
3814bbb529made sd code only compile with SDSUPPORT defined. safes 10k of codespace
Bernhard
2011-12-26 09:28:51 +01:00
729cde4475fix autostart failure if in wrong directory
Bernhard
2011-12-26 09:20:33 +01:00
396270a0defix duplicated definition of MOSI MISO pins in case motherboard==33
Bernhard
2011-12-26 09:20:21 +01:00
11f2dafc4eone step closer to a functional makefile..
Bernhard
2011-12-22 16:43:28 +01:00
8463e39a4astarting with sanguino arduino 1.0 compatibility
Bernhard
2011-12-22 16:11:15 +01:00
2bc160a978add 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 +01:00
57f9359a41simplified the includes, makefile now works with arduino23
Bernhard
2011-12-22 14:55:45 +01:00
3c1a4aac2bheader file simplification
Bernhard
2011-12-22 12:38:50 +01:00
212515148eadded m240 photography support. default off
Bernhard
2011-12-22 12:11:39 +01:00
6735025428cooldown
Bernhard
2011-12-22 12:02:33 +01:00
415aadf704lcd panel bed support advance and ultipanel not any more in default config
Bernhard
2011-12-22 11:45:52 +01:00
f312216e97Revert "untestest commit, so I don't loose code.. features runout prevention addons"
Bernhard
2011-12-22 09:22:22 +01:00
651cde8b98untestest commit, so I don't loose code.. features runout prevention addons
Bernhard
2011-12-22 09:20:34 +01:00
554cc1718dFiexed E_ENABLE_PIN errors
Erik van der Zalm
2011-12-15 11:59:07 +01:00
617968ab76G92 fix
Erik van der Zalm
2011-12-12 20:43:47 +01:00
84d9cf7339merging
Erik van der Zalm
2011-12-12 20:35:46 +01:00
e017228569Merged 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 +01:00
3320a5b37dmake autotemp compatile for use without pid
Bernhard
2011-12-11 22:25:52 +01:00
06411d5c9eultralcd can now also stop the wait loop for the hot-end m109 heating when stopping sd prints.
Bernhard
2011-12-11 22:18:50 +01:00
82c99625fainstant stop of sd prints from the panel.
Bernhard
2011-12-11 22:10:06 +01:00
01001b89d2repaired nozzle runout prevention to not collide with automatic stepper disabeling.
Bernhard
2011-12-11 15:42:56 +01:00
88ee053af0heating 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 +01:00
b1d84d879bst_synchronize back to normal..
Bernhard
2011-12-09 16:13:58 +01:00
f6fe7143e4Merge pull request #29 from k-eex/Marlin_v1
Bernhard Kubicek
2011-12-09 06:37:42 -08:00
dde4b40fa9disable steppers in runout prevention
Bernhard
2011-12-09 15:37:24 +01:00
2bc5e7ec9eprevent too long extrudes, or too cold extrudes
Bernhard
2011-12-09 15:09:52 +01:00
aa4f9a6474better values.
Bernhard
2011-12-09 14:07:32 +01:00
87fd249c43made runout prevention independent of tempeorarily set esteps
Bernhard
2011-12-09 13:56:28 +01:00
1ec0c3b68aextruder runout prevention.
Bernhard
2011-12-09 13:39:00 +01:00
5b4625f79cadded 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 +01:00
cc4a9cdb69added autostart procedure trigger to the ultralcd menu
Bernhard
2011-12-09 12:33:00 +01:00
61c943b4bffixed 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 +01:00
bae1e422f6Fix M201 not saving settings in all places, so the changes did not get written into EEPROM
Keegi
2011-12-08 12:25:32 +02:00
754d2d69b2z homing sound fix, for now until the actual cause is found..
Bernhard
2011-12-07 23:08:13 +01:00
986f0ba76cmoved <stdio.h> to more dominant location.
Bernhard
2011-12-07 20:56:47 +01:00
460b788d78repaired homing position setting.
Bernhard
2011-12-07 20:54:34 +01:00
43f5c3e82bMerge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Erik van der Zalm
2011-12-07 19:55:17 +01:00
4fd75dc813Working 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 -05:00
cf50ba140fadded 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 +01:00
89e832c295Update endstops only for homing. (use less resources when not used)
Erik van der Zalm
2011-12-04 21:03:02 +01:00
b99c49ec3bAdd option to only check endstop when homing
Erik van der Zalm
2011-12-04 20:17:21 +01:00
95a0b28acbMerge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Erik van der Zalm
2011-12-04 19:54:43 +01:00
af22e9cd38Some advance modifications
Erik van der Zalm
2011-12-04 19:54:07 +01:00
7714b98da7solved 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 +01:00
dfd240b260overworked autotemp, removed one layer of nesting from the ultralcd.
Bernhard
2011-12-04 09:48:53 +01:00
4f909963e4make QUICKHOME configureable
Bernhard
2011-12-04 09:02:09 +01:00
6b86f15686More 2nd extruder implementation. (Not usable) Advance (not tested)
Erik van der Zalm
2011-12-02 17:45:05 +01:00
0bc9daa4f7make it compile with arduino 1.0 ; function is still untested.
Bernhard
2011-12-01 16:38:01 +01:00
b0c3871750more fixing of the sanguino math round problem
Bernhard
2011-11-30 09:07:56 +01:00
9c57453168removed stream.h referenece from marlinserial.
Bernhard
2011-11-30 08:57:30 +01:00
59205ac5fcpreliminiary 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 +01:00
7a4be21b4fmade 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 +01:00
716e89b87cfirst homing move diagonal towards home switches.
Bernhard
2011-11-29 22:06:31 +01:00
d00b7e5587repaired compiliation in windows
Bernhard
2011-11-28 22:45:40 +01:00
e4ab0e5982more inlines
Bernhard
2011-11-28 22:11:17 +01:00
8cb29921a0possible stepper release after sd printing
Bernhard
2011-11-28 22:09:17 +01:00
b19c8b74b9force inline
Bernhard
2011-11-28 21:51:44 +01:00
6d95644c0dMoved M88 into M84. (M84 E)
Erik van der Zalm
2011-11-28 21:49:54 +01:00
311627141bMerge branch 'smallopt' into Marlin_v1
Bernhard
2011-11-28 21:36:01 +01:00
7216a12856Disabled M88 for boards that don't have seperate enable pins.
Erik van der Zalm
2011-11-28 21:17:06 +01:00
98805c9228Added M88 command. (Request from Action68)
Erik van der Zalm
2011-11-28 20:51:01 +01:00
85da81e673inlineing of small functions in serial
Bernhard
2011-11-28 19:34:42 +01:00
b9ad0bb2ceremoved unecessary indirect register adressing in serial.
Bernhard
2011-11-28 19:28:38 +01:00
dd5ca68c87get rid of indirect ringbuffer calls, made some inlines, removed virtual and streaming class requirements.
Bernhard
2011-11-28 19:13:40 +01:00
dd5296ad4dFixed temperature reading bug. (When using the lower and upper adc input bank)
Erik van der Zalm
2011-11-28 17:42:49 +01:00
f75f426dfaRemoved interrupt nesting in the stepper ISR. Add serial checkRx in stepper ISR. Copied HardwareSerial to MarlinSerial (Needed for checkRx).
Erik van der Zalm
2011-11-27 21:12:55 +01:00
2d9a715655first naive attempt to have a offset in the homeing procedure. Does not enable to move into regions not allowed by endstops.
Bernhard
2011-11-27 17:27:17 +01:00
d2f034ba84lcd message from gcode, m117
Bernhard
2011-11-27 16:53:11 +01:00
6aecf80278add autotemp support to the lcd
Bernhard
2011-11-27 16:45:19 +01:00
b128d25f27overlooked some inlines..
Bernhard
2011-11-27 16:45:00 +01:00
26a1de1e44force inline
Bernhard
2011-11-27 16:04:58 +01:00
f8e170a44bplanner optimization by inline functions
Bernhard
2011-11-27 14:57:12 +01:00
aad4b75b94First parts 2nd extruder
Erik van der Zalm
2011-11-26 17:33:25 +01:00
a0dc66f7bfHome retract distance configureable per axis.
Bernhard
2011-11-26 12:04:06 +01:00
6d6f323535make an option if sd-card stop should release the steppers.
Bernhard
2011-11-26 11:51:38 +01:00
4d6a5c29dfdisable steppers as routine in stepper.cpp
Bernhard
2011-11-26 11:50:23 +01:00
74d0032e25cooldown blocking selectable by #define.
Bernhard
2011-11-26 09:03:12 +01:00
191f36b493slowdown
Bernhard
2011-11-25 23:59:30 +01:00
c54a807824overworked ultralcd a bit
Bernhard
2011-11-25 23:37:08 +01:00
a6823a84e1another typo
Bernhard
2011-11-25 22:36:33 +01:00
57e163e989typo
Bernhard
2011-11-25 22:34:12 +01:00
b58787a367now velocities are also set in mm/sec in gcode.
Bernhard
2011-11-25 22:32:26 +01:00