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

344 commits

Author SHA1 Message Date
Blair Thompson 4879de08e8 The percent complete for the SD file statistic sits squint. Changed "lcd.Setcursor (7,2);" to "lcd.Setcursor (10,2);". 
The percent complete now lines up with the temperatures and Z-axis position figures, nicer to read and nicer to look at IMHO.
 2012-03-03 16:47:27 +00:00
Blair Thompson f278e1c00f This is in my opinion a much better way of dealing with SD cards than my previous fix. 
Instead of adding a momentary switch to fake the insertion of the card I have modified the ultralcd menu item:

Card Menu -> Refresh

to reinitialise the card providing that the SDCARDDETECT pin has been set to -1 in the pins.h file.  This requires one less switch on the front panel and the refresh menu item is in the most relevent place for a user who wishes to inert a card and then print from it.

It also means that the "Card inserted" messages do not bother the users of these card readers (they dont make sense for users without SCCARDDETECT)
 2012-03-03 16:30:31 +00:00
Blair Thompson 046a8e0039 Added more defines to the language.h file so that nowe most of the text strings are now configured via this file. Still got some hunting down to do to complete this task. 2012-03-03 15:51:47 +00:00
haxar 79a466ca26 make analog2tempBed return a precise celsius reading for BED_USES_THERMISTOR, complementing changes to analog2temp in d15f01e 2012-03-02 17:15:21 -08:00
Christian Thalhammer 5f3a422e68 added M31 - delete file from sd card 2012-03-02 21:49:05 +01:00
Christian Thalhammer fa2e3a40e9 fixed LCD manual z axis move Feedrate to 70 (was 1700) 2012-03-01 14:38:50 +01:00
Christian Thalhammer a92b3afe64 added german translation;Menue should be in english.. sounds better 2012-03-01 14:24:20 +01:00
Christian Thalhammer 9fa586bbed fixed languages; Preheat_PLA and Preheat_ABS was not defined for non 
english
 2012-03-01 14:05:40 +01:00
Daid 00d33e6b82 Typo fix 2012-02-29 19:01:21 +01:00
Daid 7d124478fa Only protect the heater pins for the defined extruders. 
Changed the way the extruder pins are defined so it doesn't create extra -1 entries in the list.
 2012-02-29 15:49:02 +01:00
Daid 3d83109028 Fixed general 16x2 LCD build without SD support. 2012-02-29 15:33:23 +01:00
Christian Thalhammer cb02914687 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2012-02-29 14:51:35 +01:00
Christian Thalhammer 10bf2bb8e1 - 2012-02-29 14:51:15 +01:00
Daid d47b666630 Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1 2012-02-29 12:19:20 +01:00
Daid 88d289caa1 Made plan_buffer_line arguments const, which optimizes better and fixes the RUNOUT_PREVENTION feature. 2012-02-29 11:38:12 +01:00
Erik van der Zalm b4833d55c2 Fixed HOME_POS in combination with G28 X0 or G28 Y0 2012-02-28 18:20:03 +01:00
Erik van der Zalm c6f2ec3c82 remove stop_heating_wait 2012-02-27 18:45:45 +01:00
Erik van der Zalm b48d67ce10 Fixed homing 2012-02-27 18:31:40 +01:00
ErikZalm 071eec7aa7 Merge pull request #81 from phord/09469add5560ca8a676c42e4bcd499868c33f0dd 
Clean up and add some trace info
 2012-02-27 08:38:36 -08:00
ErikZalm 1ebe7d1ab6 Merge pull request #83 from phord/tempfix 
Add explicit #define for bogus temp override
 2012-02-27 08:36:45 -08:00
Phil Hord b65ef8d66c Add support for upcoming Gen7 v1.4 
V1.4 moves thermistor power to the always-on 5v line.
The BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE is no longer
needed on this board.  Add a new motherboard type to
support this feature.
 2012-02-26 20:39:49 -05:00
Phil Hord 740f0c7690 Add explicit #define for bogus temp override 
The code to ignore the "bad thermistor reading failsafe"
suicide function depends on the existing of the PS_ON pin
feature.  But in some boards this shouldn't be the case
Fix this by adding an explicit definition to make our
intentions more clear and separable.
 2012-02-26 20:26:16 -05:00
Phil Hord ba8500a236 pins.h: Define Z_MAX_PIN for Gen7 board 
The Z_MAX_PIN value was defined as no-value, but this causes
the compile to fail.  Fix this by setting the Z_MAX_PIN to the
correct value (which happens to be 0 for pin PB0/DIO0/0).
 2012-02-26 20:18:39 -05:00
Phil Hord 09469add55 Add board reset reporting (from Repetier-Firmware) 2012-02-26 18:26:56 -05:00
Phil Hord f3101e96d9 Add suitable .gitignore to avoid build noise 2012-02-26 18:26:56 -05:00
Phil Hord 245dca4bee Makefile: generic pde=>cpp rule 
This adds flexibility to the makefile by allowing different pde
targets to be specified for different needs.
 2012-02-26 18:26:55 -05:00
Erik van der Zalm 97d42ca2b2 SDSUPPORT default disabled 2012-02-26 22:05:38 +01:00
Changwoo Ryu 7b14953c99 Fix build on Sanguino based boards with ATmega1284P 2012-02-27 04:12:55 +09:00
Daid 286d5003fa Fixed compiler warning for Sanguino compile 2012-02-26 17:35:01 +01:00
ErikZalm 66d50562b6 Merge pull request #76 from iXce/Marlin_v1 
Fix Makefile
 2012-02-26 07:30:51 -08:00
Erik van der Zalm 27f595a444 Changed version => RC2 2012-02-26 16:26:40 +01:00
Erik van der Zalm 018c567abf Moved SLOWDOWN function. (jetty840) 
Included AD595 calibration options. (daid)
 2012-02-26 16:23:47 +01:00
Erik van der Zalm 4fbda5c3f5 Merge remote-tracking branch 'daid/Marlin_v1' into Test 2012-02-26 16:10:59 +01:00
Erik van der Zalm ce714fe306 Fixes in pins.h 2012-02-25 22:55:17 +01:00
Erik van der Zalm 35e57bf149 Added gen6 deluxe. 2012-02-25 17:44:45 +01:00
Erik van der Zalm 84ea2d61e8 Moved gen7 boards to motherboard type 10, 11 and 12. 
Split ramps1.3 in Sprinter like config and multiextruder config.
 2012-02-24 23:34:41 +01:00
Guillaume Seguin adc108d79e Correctly build the produced applet/Marlin.cpp source 2012-02-24 21:21:19 +01:00
Erik van der Zalm 5aa9c41ab1 Changed comment mode for detection. 
Added M221 extuder multiply factor.
 2012-02-24 20:42:07 +01:00
Erik van der Zalm 00690f7ffd Fix cast warning in Gen7 2012-02-23 18:50:05 +01:00
Erik van der Zalm 01d28c18ab Fixed casting warning in sanguino 2012-02-23 18:45:37 +01:00
Blair Thompson 2fd8c248fe Added Fan control to the pre-heat settings. 
I find that the PID routine works better when the cooling fan is switched on
at the beginning of a warm up routine.  Otherwise when you enable the fan
just before a print, you have a delay as the PIDre-adjusts.

This should also be safer as most cooling fans are directed at the hot -ends
thermal barrier!
 2012-02-22 23:05:52 +00:00
Blair Thompson 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
 2012-02-22 22:51:04 +00:00
Erik van der Zalm ae3e7586c6 Added HOME_POS. This adds the posibility to make the center 0 
Updated the Xsteps ... settings via the LCD menu
 2012-02-22 18:07:56 +01:00
Erik van der Zalm df1437bd86 Changed display format for some numbers. 2012-02-21 23:05:43 +01:00
Erik van der Zalm 8816ef1c64 Small fixes after merge 2012-02-21 20:36:43 +01:00
Erik van der Zalm d298dd121f merged SBUBA82 and Justblair 2012-02-21 20:26:59 +01:00
Erik van der Zalm 2cc9a89830 Merge remote-tracking branch 'SCUBA82/Marlin_v1' into Marlin_v1 2012-02-21 20:17:35 +01:00
Erik van der Zalm a0a1f81913 various changes 2012-02-21 20:17:28 +01:00
Christian Thalhammer 8a8ea50f33 fixed manual axis movement lcd option 2012-02-21 09:31:28 +01:00
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