zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
380 commits 1 branch 0 tags 156 MiB
Commit graph

345 commits

Author SHA1 Message Date
Blair Thompson b976692d0f Removed VS project files for tidyness stakes 2012-02-20 22:39:39 +00:00
Blair Thompson fe940a142d Added a structure that will allow easy translations/modifications to the LCD menu. 
Signed-off-by: Blair Thompson <mail@justblair.co.uk>
 2012-02-20 22:22:46 +00:00
Christian Thalhammer b3fb09a20c change preheat to ABS values of nozzle 227 and be 105 °C 
next try for manual axis movement
 2012-02-20 16:07:27 +01:00
Blair Thompson 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
 2012-02-18 23:56:31 +00:00
Blair Thompson 1b6765ed12 Updated the pin config for RAMPS 1.3 to include ultimaker new style LCD/Rotary Encoder interface 2012-02-18 18:25:04 +00:00
Christian Thalhammer 1ff99ae25f ATMega1284P support for Arduino IDE 
replace $ARDUINO_HOME/hardware/tools/avr/etc/arduino.conf with this file
 2012-02-17 11:41:47 +01:00
Christian Thalhammer e661578c84 support for GEN7 1.1,1.2 and 1.3 2012-02-17 10:46:48 +01:00
Daid 73344e69c1 Added temperature offset/gain settings for AD595. 2012-02-16 11:05:08 +01:00
Christian Thalhammer d309565b56 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 
Conflicts:
	Marlin/Configuration.h
 2012-02-13 13:07:55 +01:00
Christian Thalhammer 0e3631ff4b smaller changes 2012-02-13 12:31:53 +01:00
Erik van der Zalm fa2e1be0ca changed default EXTRUDE_MINTEMP to 170. 2012-02-12 17:38:54 +01:00
Erik van der Zalm 7699f250e3 Fixed small merge bug 2012-02-12 14:06:08 +01:00
Erik van der Zalm 11518a987f merged with triffid fork 2012-02-12 13:58:36 +01:00
Erik van der Zalm 13e185d330 removed unused HEATING_EARLY_FINISH_DEG_OFFSET 
Simplified stepper inactive time
 2012-02-11 23:22:16 +01:00
Erik van der Zalm b58eae7657 Corrected e-length calculation in planner 2012-02-11 18:36:42 +01:00
daid 2a77c84c8f Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0. 2012-02-11 16:02:47 +01:00
Erik van der Zalm d47a3e5950 Changed check i mtion_conrol 
if (millimeters_of_travel == 0.0) => if (millimeters_of_travel < 0.001)
(thanks mooselake)
 2012-02-09 21:02:01 +01:00
Erik van der Zalm f87c80889f Fixed M109 timer overflow (reported by triffid) 2012-02-09 20:54:49 +01:00
Erik van der Zalm 154de69c02 Print configuration.h version during startup (thanks hairykiwi) 2012-02-09 20:26:17 +01:00
Erik van der Zalm 6ef8459494 Corrected distance calculation. (thanks jv4779) 2012-02-09 19:53:06 +01:00
Erik van der Zalm 598eb1d4f1 Fixed compilation for gcc-4.6.2 with avr-lib-1.8.0 (thanks daid) 2012-02-09 19:38:53 +01:00
Erik van der Zalm 9173a5713b Teensylu support. 2012-02-09 19:27:45 +01:00
Erik van der Zalm da040fd393 Fixed ultimaker heater 1 pins. (Thanks daid) 2012-02-09 17:19:45 +01:00
Erik van der Zalm bdb70c0509 Warning for 10k thermistor 2012-02-08 18:38:45 +01:00
Erik van der Zalm 5113513cb2 RC 1 2012-02-08 18:28:54 +01:00
Erik van der Zalm d8a0c6450f Split the configuration file in two parts. 
One for common settings.
One for advanced settings.
 2012-02-07 20:23:43 +01:00
Christian Thalhammer 4cc8e37bf1 lcd menue "move_axis" added 2012-02-07 12:58:05 +01:00
Christian Thalhammer b5fae1104b fixed sUICIDE_PIN disable 2012-02-07 08:50:26 +01:00
Erik van der Zalm f9c5333f97 Made "stop heating wait" optional. 
Default off.
 2012-02-06 20:13:44 +01:00
Erik van der Zalm 292ddd2edb Fix Z_LATE_ENABLE 2012-02-06 17:38:16 +01:00
Christian Thalhammer 25cd8af536 added arduino ide GEN7 support Files 2012-02-06 14:11:25 +01:00
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.
 2012-02-06 12:28:33 +01:00
Christian Thalhammer b51e8bf7e5 -disabled CARDDETECT if PIN is set to -1 
- redo disable Beeper if PIN is set to -1
 2012-02-06 12:22:44 +01:00
Christian Thalhammer 3183a14755 -added Configuration for GEN7 which worked for me 2012-02-06 12:12:18 +01:00
Christian Thalhammer 5edef148fe -disalbe beeper if BEEPER_PIN = -1 2012-02-06 12:10:32 +01:00
Christian Thalhammer 13e2ad2831 - added info for using GEN7 configuration 2012-02-06 11:58:52 +01:00
Christian Thalhammer 59cc5f889e - added support for ATMega1284P 2012-02-06 11:55:56 +01:00
Christian Thalhammer a11f3b2d2f - Pins for modified GEN7 assigned 
- Added support for ATMega1284
 2012-02-06 11:49:23 +01:00
Erik van der Zalm abb7e63906 fixed z-disable bug. 2012-02-05 21:14:55 +01:00
Erik van der Zalm 9f139d6e0e Added MAX6675 support. (Thanks to gregfrost) 
Needs some work to remove the blocking in read max6675.
 2012-02-05 13:05:07 +01:00
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>
 2012-02-05 12:42:15 +01:00
Michael Moon 9c918a497b more work on Makefile - actually rebuilds if Makefile or Configuration.h are altered, also much cleaner output 2012-01-25 20:46:27 +11:00
Michael Moon ab01658fd2 local configuration stuff- WATCHPERIOD causes breakage, disable. few other misc changes 2012-01-24 17:02:45 +11:00
Michael Moon 42bedb3f60 PROGMEM elements must be const 2012-01-24 15:57:42 +11:00
Michael Moon a991bde523 enable auto-reset before programming, disable afterwards 2012-01-24 14:25:28 +11:00
Michael Moon 3e575533c5 get M81 working 2012-01-24 14:24:41 +11:00
Michael Moon 2ae2ead97b help residency not overflow 2012-01-24 14:24:24 +11:00
Michael Moon 71dc82e0b4 my local configuration 2012-01-24 13:19:37 +11:00
Michael Moon 5aadc2f5ca cardreader needs to include some other files 2012-01-24 13:19:24 +11:00
Michael Moon 8d0916af13 allow Marlin to actually compile with Makefile pulled from Sprinter and a few other modifications 2012-01-24 13:18:54 +11:00
haxar 6cc6029d7a M109 EOL fix when TEMP_RESIDENCY_TIME is undefined; printer interface (pronterface) could not see target extruder heater temperature to continue print 2012-01-22 03:25:56 -08:00
Bernhard 157aa7f2fd m115 eol fix 2012-01-15 20:51:49 +01:00
Bernhard 7aeb45303d small mistake 2012-01-15 18:31:21 +01:00
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. 2012-01-15 17:06:10 +01:00
Bernhard 3814bbb529 made sd code only compile with SDSUPPORT defined. safes 10k of codespace 2011-12-26 09:28:51 +01:00
Bernhard 729cde4475 fix autostart failure if in wrong directory 2011-12-26 09:20:53 +01:00
Bernhard 396270a0de fix duplicated definition of MOSI MISO pins in case motherboard==33 2011-12-26 09:20:21 +01:00
Bernhard 11f2dafc4e one step closer to a functional makefile.. 2011-12-22 16:43:28 +01:00
Bernhard 8463e39a4a starting with sanguino arduino 1.0 compatibility 2011-12-22 16:11:15 +01:00
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
 2011-12-22 14:57:28 +01:00
Bernhard 57f9359a41 simplified the includes, makefile now works with arduino23 2011-12-22 14:55:45 +01:00
Bernhard 3c1a4aac2b header file simplification 2011-12-22 12:38:50 +01:00
Bernhard 212515148e added m240 photography support. default off 2011-12-22 12:11:39 +01:00
Bernhard 6735025428 cooldown 2011-12-22 12:02:33 +01:00
Bernhard 415aadf704 lcd panel bed support 
advance and ultipanel not any more in default config
 2011-12-22 11:45:52 +01:00
Erik van der Zalm 554cc1718d Fiexed E_ENABLE_PIN errors 2011-12-15 11:59:07 +01:00
Erik van der Zalm 617968ab76 G92 fix 2011-12-12 20:43:47 +01:00
Erik van der Zalm 84d9cf7339 merging 2011-12-12 20:35:46 +01:00
Erik van der Zalm e017228569 Merged multiple extruder support. 
Soft PWM. (Sanguinololu can also have PID temperature control)
Interrupt save WRITE for addresses > 0x0FF
 2011-12-12 19:34:37 +01:00
Bernhard 3320a5b37d make autotemp compatile for use without pid 2011-12-11 22:25:52 +01:00
Bernhard 06411d5c9e ultralcd can now also stop the wait loop for the hot-end m109 heating when stopping sd prints. 2011-12-11 22:18:50 +01:00
Bernhard 82c99625fa instant stop of sd prints from the panel. 2011-12-11 22:10:06 +01:00
Bernhard 01001b89d2 repaired nozzle runout prevention to not collide with automatic stepper disabeling. 2011-12-11 15:42:56 +01:00
Bernhard 88ee053af0 heating up santity, formarly knows as "watchdog", but renamed due to the existance of the real watchdog, works now. 2011-12-09 17:07:44 +01:00
Bernhard b1d84d879b st_synchronize back to normal.. 2011-12-09 16:13:58 +01:00
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
 2011-12-09 06:37:42 -08:00
Bernhard dde4b40fa9 disable steppers in runout prevention 2011-12-09 15:37:24 +01:00
Bernhard 2bc5e7ec9e prevent too long extrudes, or too cold extrudes 2011-12-09 15:09:52 +01:00
Bernhard aa4f9a6474 better values. 2011-12-09 14:09:34 +01:00
Bernhard 87fd249c43 made runout prevention independent of tempeorarily set esteps 2011-12-09 13:56:28 +01:00
Bernhard 1ec0c3b68a extruder runout prevention. 2011-12-09 13:39:00 +01:00
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. 2011-12-09 12:51:08 +01:00
Bernhard cc4a9cdb69 added autostart procedure trigger to the ultralcd menu 2011-12-09 12:33:00 +01:00
Bernhard 61c943b4bf fixed the st_synchronize. it would have continued if there is only the last move of the buffer being stepped. 2011-12-09 12:32:31 +01:00
Keegi bae1e422f6 Fix M201 not saving settings in all places, so the changes did not get written into EEPROM 2011-12-08 12:25:32 +02:00
Bernhard 754d2d69b2 z homing sound fix, for now until the actual cause is found.. 2011-12-07 23:08:13 +01:00
Bernhard 986f0ba76c moved <stdio.h> to more dominant location. 2011-12-07 20:56:47 +01:00
Bernhard 460b788d78 repaired homing position setting. 2011-12-07 20:54:34 +01:00
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
 2011-12-06 00:09:16 -05:00
Bernhard 12e8edcac3 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2011-12-04 22:27:37 +01:00
Bernhard cf50ba140f added M503 to display eeprom storage, and renamed eeprom routings. This version is compatible with the qtmarlin eeprom-tab. 2011-12-04 22:26:42 +01:00
Erik van der Zalm 89e832c295 Update endstops only for homing. (use less resources when not used) 2011-12-04 21:03:02 +01:00
Erik van der Zalm b99c49ec3b Add option to only check endstop when homing 2011-12-04 20:17:21 +01:00
Erik van der Zalm 95a0b28acb Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-12-04 19:54:43 +01:00
Erik van der Zalm af22e9cd38 Some advance modifications 2011-12-04 19:54:07 +01:00
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.
 2011-12-04 12:40:18 +01:00
Bernhard dfd240b260 overworked autotemp, removed one layer of nesting from the ultralcd. 2011-12-04 09:48:53 +01:00
Bernhard 4f909963e4 make QUICKHOME configureable 2011-12-04 09:02:09 +01:00
Erik van der Zalm 6b86f15686 More 2nd extruder implementation. (Not usable) 
Advance (not tested)
 2011-12-02 17:45:05 +01:00
Bernhard 0bc9daa4f7 make it compile with arduino 1.0 ; function is still untested. 2011-12-01 16:38:01 +01:00
Bernhard b0c3871750 more fixing of the sanguino math round problem 2011-11-30 09:07:56 +01:00
Bernhard 9c57453168 removed stream.h referenece from marlinserial. 2011-11-30 08:57:30 +01:00
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.
 2011-11-30 08:51:46 +01:00
Bernhard 7a4be21b4f made it compile if arduino decides to include files in a differnt order. DEC HEX and stuff now defined in MarlinSerial.h 2011-11-30 08:32:28 +01:00
Bernhard 716e89b87c first homing move diagonal towards home switches. 2011-11-29 22:11:45 +01:00
Bernhard d00b7e5587 repaired compiliation in windows 2011-11-28 22:45:40 +01:00
Bernhard e4ab0e5982 more inlines 2011-11-28 22:11:17 +01:00
Bernhard 8cb29921a0 possible stepper release after sd printing 2011-11-28 22:09:17 +01:00
Bernhard 044886b4a0 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2011-11-28 21:52:16 +01:00
Bernhard b19c8b74b9 force inline 2011-11-28 21:51:44 +01:00
Erik van der Zalm 6d95644c0d Moved M88 into M84. (M84 E) 2011-11-28 21:49:54 +01:00
Bernhard 311627141b Merge branch 'smallopt' into Marlin_v1 
Conflicts:
	Marlin/temperature.h
 2011-11-28 21:36:01 +01:00
Erik van der Zalm 7216a12856 Disabled M88 for boards that don't have seperate enable pins. 2011-11-28 21:17:06 +01:00
Erik van der Zalm 98805c9228 Added M88 command. (Request from Action68) 2011-11-28 20:51:01 +01:00
Bernhard 85da81e673 inlineing of small functions in serial 2011-11-28 19:34:42 +01:00
Bernhard b9ad0bb2ce removed unecessary indirect register adressing in serial. 2011-11-28 19:28:38 +01:00
Bernhard dd5ca68c87 get rid of indirect ringbuffer calls, made some inlines, removed virtual and streaming class requirements. 2011-11-28 19:13:40 +01:00
Erik van der Zalm dd5296ad4d Fixed temperature reading bug. 
(When using the lower and upper adc input bank)
 2011-11-28 17:42:49 +01:00
Erik van der Zalm f75f426dfa Removed interrupt nesting in the stepper ISR. 
Add serial checkRx in stepper ISR.
Copied HardwareSerial to MarlinSerial (Needed for checkRx).
 2011-11-27 21:12:55 +01:00
Bernhard 2d9a715655 first naive attempt to have a offset in the homeing procedure. Does not enable to move into regions not allowed by endstops. 2011-11-27 17:27:17 +01:00
Bernhard d2f034ba84 lcd message from gcode, m117 2011-11-27 16:53:11 +01:00
Bernhard 6aecf80278 add autotemp support to the lcd 2011-11-27 16:45:19 +01:00
Bernhard b128d25f27 overlooked some inlines.. 2011-11-27 16:45:00 +01:00
Bernhard 26a1de1e44 force inline 2011-11-27 16:04:58 +01:00
Bernhard f8e170a44b planner optimization by inline functions 2011-11-27 14:57:12 +01:00
Erik van der Zalm aad4b75b94 First parts 2nd extruder 2011-11-26 17:33:25 +01:00
Bernhard a0dc66f7bf Home retract distance configureable per axis. 2011-11-26 12:04:06 +01:00
Bernhard 6d6f323535 make an option if sd-card stop should release the steppers. 2011-11-26 11:51:38 +01:00
Bernhard 4d6a5c29df disable steppers as routine in stepper.cpp 2011-11-26 11:50:23 +01:00
Bernhard 74d0032e25 cooldown blocking selectable by #define. 2011-11-26 09:03:12 +01:00
Bernhard 191f36b493 slowdown 2011-11-25 23:59:30 +01:00
Bernhard c54a807824 overworked ultralcd a bit 2011-11-25 23:37:08 +01:00
Bernhard a6823a84e1 another typo 2011-11-25 22:36:33 +01:00
Bernhard 57e163e989 typo 2011-11-25 22:34:12 +01:00
Bernhard b58787a367 now velocities are also set in mm/sec in gcode. 2011-11-25 22:32:26 +01:00
Bernhard 71ca78982b Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2011-11-25 22:14:36 +01:00
Bernhard 235051253a overworked lcd+eeprom to have only mm/sec and PID including pid_dt 2011-11-25 22:14:29 +01:00
Erik van der Zalm 27654bfe69 Fixed variable (removed 0x) 2011-11-25 22:10:06 +01:00
Erik van der Zalm cdf0bd4e63 Fixed config bug when EEPROM was disabled 2011-11-25 20:07:30 +01:00
Erik van der Zalm 6ac9b2e761 Fixed residency time bug. (Thanks to Sound :-) ) 2011-11-25 19:34:36 +01:00
Erik van der Zalm ac8adabb2b Small nominal speed improvement. 2011-11-25 15:32:50 +01:00
Erik van der Zalm 0e0e4945d8 Removed ISR overtaken message from ISR routine 2011-11-25 13:59:58 +01:00
Erik van der Zalm c0f8c9fd72 Seperate ENDSTOP_INVERTING for X Y and Z 
Added simple endstop filter.
Corrected M114 count display.
 2011-11-25 13:43:06 +01:00
Bernhard Kubicek 5535e51bf6 Yes, thats the beta. 2011-11-20 17:04:57 +01:00
Bernhard Kubicek 8b14a8ad34 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2011-11-20 16:39:39 +01:00
Bernhard Kubicek 924bab1a03 less lcd flickering 2011-11-20 16:37:01 +01:00
Bernhard Kubicek 379ea642e1 make tuneing sub-menu. 2011-11-20 16:05:42 +01:00
Erik van der Zalm 959d82e81e Small temperature disable bug. 2011-11-20 15:03:35 +01:00
Erik van der Zalm 15bb3f284e Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-20 14:51:40 +01:00
Erik van der Zalm 4e5becfc51 Added endstop reporting 2011-11-20 14:50:08 +01:00