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

519 commits

Author SHA1 Message Date
daid 12de8fff81 Support step motor controllers with active low step pins. 2012-06-29 16:27:47 +02:00
Erik van der Zalm b67dacdc8f Fixed AD595 define 2012-06-11 17:33:42 +02:00
Bernhard d3002ef741 corrected retract 2012-06-03 16:56:40 +02:00
Bernhard 0c123950e9 __ header file replace 2012-06-02 20:44:17 +02:00
Bernhard bf077125b9 added firmware retract. disabled by default 2012-06-02 20:32:28 +02:00
Bernhard 0e5e249ab5 added individual pullup setting option to have finer control in case there is a special z-min sensor, for example 2012-06-02 13:47:50 +02:00
Bernhard Kubicek 6b14f95b3e Merge pull request #170 from linagee/Marlin_v1 
Marlin v1
 2012-06-02 03:46:56 -07:00
Bernhard Kubicek c7ce99d495 Merge pull request #172 from daid/Marlin_v1 
Add M401 - Wait for user to press button on LCD (with optional timeout) minor fix in M115.
 2012-06-02 03:44:03 -07:00
Bernhard Kubicek b7fc14bc65 repaired thermistortable_6 by graphcial fitting of the off-slope values. see issue 179. Erik, I know you asked for no changes, but this file probably is not related and hopefully allright. 2012-05-30 14:14:36 +03:00
ErikZalm 9e1021efbe Fixed SL bug. 2012-05-28 22:32:53 +03:00
Daid e9bec9b6fe Fixed E1_ENABLE pin for Ultimaker. This was wrong for the 1.5.4 and 1.5.3 PCB (I cannot check the 1.5.6) 2012-05-24 18:36:55 +02:00
linagee fbd282b3ba Update Marlin/Configuration.h 2012-05-20 13:19:28 -06:00
linagee 2e8c5049c5 Update Marlin/thermistortables.h 2012-05-20 13:18:45 -06:00
linagee 2d0d8e5272 Small correction. 2012-05-20 11:09:07 -06:00
Daid 4d7fe7115f Changed M401 to M0/M1 as suggested, so they match normal CNC stop commands. 2012-05-20 14:37:30 +02:00
linagee 9e9db65c3f Update Marlin/thermistortables.h 2012-05-20 05:51:29 -06:00
linagee bd966ef389 Update Marlin/thermistortables.h 2012-05-20 05:49:01 -06:00
linagee 775da3f103 Added top ratings and extended to ADC=1 for table 3 and 5. 2012-05-20 05:35:57 -06:00
linagee 96a4baa0be Update Marlin/thermistortables.h 2012-05-20 04:55:22 -06:00
linagee 2aa9f7b131 Update Marlin/thermistortables.h 2012-05-20 04:35:28 -06:00
linagee c4490f5f3d Update Marlin/Configuration.h 2012-05-20 04:27:52 -06:00
linagee dd9144994e Tested May 19 - It works! Verified with separate thermocouple TM-902C also. 2012-05-20 04:13:29 -06:00
linagee 4c37d0d9f1 Extended range above 250C. (Operating range states up to 300C) 2012-05-20 04:01:30 -06:00
Daid b59724e42b Add strigification for extruder amount in M115 report. 2012-05-19 19:01:14 +02:00
Daid 16413bb8f2 Last M401 update, refresh the LCD during an M401 wait. 2012-05-19 18:53:56 +02:00
Daid b3941fce5c Update after testing 2012-05-19 18:48:43 +02:00
Daid d494688565 Do not initialize in the header file. 2012-05-19 17:57:52 +02:00
Daid 516ec90242 Add M401 - Wait for user on LCD button press 2012-05-19 17:54:07 +02:00
Daid 7244aa7eb7 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2012-05-19 17:38:46 +02:00
linagee de2ca3b2e8 Grammar correction. 2012-05-19 07:40:35 -06:00
linagee c2fc466e1b Update Marlin/Configuration.h 2012-05-19 05:56:17 -06:00
linagee 241f5a4c0e Update Marlin/thermistortables.h 2012-05-19 05:52:12 -06:00
linagee 9f9f498491 Update Marlin/Configuration.h 2012-05-19 05:47:30 -06:00
Erik van der Zalm e31bef31ad Limit PID autotune PWM to PID_MAX 2012-05-16 19:32:23 +02:00
ErikZalm b2a9ccdb97 Merge pull request #159 from MaikStohn/Marlin_v1 
Marlin v1 - BUG FIXES / CORRECTIONS
 2012-05-16 12:32:35 -07:00
Erik van der Zalm d459fb41b7 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 2012-05-16 19:22:08 +02:00
ErikZalm 804e0d6117 Merge pull request #164 from guanix/Marlin_v1 
Melzi support
 2012-05-16 12:21:48 -07:00
Erik van der Zalm ba96059203 add additional dropsegments test 2012-05-16 19:21:44 +02:00
zittix fbd91ab0b5 Fixes #153 for bad call to abs() 2012-05-16 18:17:34 +02:00
MaikStohn b51c06e2b3 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2012-05-11 16:57:08 +02:00
MaikStohn 159ae90874 bug fix for scrolling of main menu when using SMALL_DISPLAY (2 lines only) 2012-05-11 15:23:10 +02:00
MaikStohn e48f5aa6a7 fixed typo 2012-05-11 15:22:06 +02:00
MaikStohn 1efe9ab497 changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu 2012-05-11 15:19:09 +02:00
Guan Yang 602c8ee02b Melzi support 2012-05-09 18:37:07 -04:00
Daid 279d00da9f Fixed #if for Ultimaker. 2012-05-09 10:50:44 +02:00
Bernhard Kubicek 451f9cc6d1 Residual in the comments: there are no more mm/minutes but only mm/sec in the planner buffer. 2012-05-09 08:05:13 +03:00
Erik de Bruijn e3fe1f0d00 Made a more granular configuration possible PREVENT_LENGTHY_EXTRUDE. You can now decide to allow/disallow large length of extrusions to be executed. 
Turning off the protection might be beneficial to those who want to do fast and long reversals.
 2012-05-08 17:44:08 +02:00
Erik de Bruijn d88205d89d Suggestion to improve (TODO), no actual code changed 2012-05-08 17:43:57 +02:00
Erik de Bruijn 5aa80e6c05 Made language.h more flexible. Automatically do the right defines based on MOTHERBOARD == 7 ? "Ultimaker" : "Mendel" 2012-05-08 17:43:02 +02:00
MaikStohn b657a18449 Revert "magic PROGMEM defines to avoid hundreds of wrong GCC warnings" 
This reverts commit 3682d9bd5b.
 2012-05-04 12:24:07 +02:00
MaikStohn d188ae4c9d added missing declaration of buttons_init() 
This is required when moving the buttons_init() function to the
lcd_init() function
 2012-05-03 15:48:44 +02:00
MaikStohn 3682d9bd5b magic PROGMEM defines to avoid hundreds of wrong GCC warnings 2012-05-03 15:43:23 +02:00
MaikStohn 032df0b2c6 Moved LCD initialization out of constructor 
Since the class "MainMenu" was used within a static variable the
initialization of the object (constructor call) was done before Arduino
library startup. It always caused a crash when using AVRStudio with
JTAG debugger (caused from calling the LCD initialization / the lot of
I/O work / the stack used during this calls). By moving the LCD_INIT
out of the constructor and using an explicit call inside of Arduino
setup() implementation immediately fixed all problems and the JTAG
debugger runs fine.
 2012-05-03 14:28:17 +02:00
MaikStohn bd1ad7c76a explicit includes to make it compile with AVRStudio/Eclipse 2012-05-03 14:22:43 +02:00
MaikStohn 060b38de5c delete obsolete and wrong code 
"i" runs from 0 to 4 but "add_homeing" array size is 3 only. On the
other hand the calculated value gets overwritten by either one of the
if choice.
 2012-05-03 14:15:46 +02:00
MaikStohn 789ba02d43 fixed typo in comment 2012-05-03 14:13:53 +02:00
Erik van der Zalm 1874cb71a6 Added option to increase the FAN PWM frequency. 2012-05-02 19:26:14 +02:00
Erik van der Zalm 6a5a34e0ff Small cleanup 2012-04-30 13:37:49 +02:00
Erik van der Zalm e3821bd86f Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 2012-04-30 13:36:27 +02:00
Erik van der Zalm 02af69911e Added temperature window to M109. This is needed for systems with no overshoot PID. 2012-04-30 13:36:19 +02:00
ErikZalm e203b8c754 Merge pull request #154 from daid/Marlin_v1 
Added 2nd extruder temperature LCD readout and setting.
 2012-04-28 13:19:55 -07:00
ErikZalm 362ddc4efc Merge pull request #155 from Atntias/patch-1 
adding M120 and 121 for turning on and off the endstops only for homing
 2012-04-28 13:19:19 -07:00
sefi c27081aa4a Fix to allow M120/M121 2012-04-28 17:35:51 +03:00
sefi e11e072eca adding M120 and 121 for turning on and off the endstops only for homing function 2012-04-28 17:31:22 +03:00
Daid 8e68c6cf89 Show proper temperature for extruder 2 2012-04-27 15:00:01 +02:00
Daid 8503b78876 Added support for 2nd extruder temperature to UltraLCD 2012-04-27 14:51:32 +02:00
Logan Bowers 3eacb4c16d Wrap the call to turn off the bed heater in a #if to prevent a compile error on boards that do not have a bed heater 2012-04-25 19:22:38 -07:00
Bernhard e4d2138dbd reinitialize the lcd, if the SD card is inserted or removed. It seems that LCDs can confused by electrical discharges from time to time. 
Since a removal or insert of the sd card takes a long time in firmware, just reinitializing the lcd does not hurt.
actually, it solves a problem with the UltiControlle
 2012-04-22 21:12:17 +02:00
Bernhard 464b755918 added support for the UltiController 2012-04-22 20:55:56 +02:00
Bernhard 44fd8d46d2 fixed quickhome 2012-04-22 20:44:27 +02:00
Bernhard 33bb044d7c fixed catsting to (int)e in serial error messages. 
see https://github.com/ErikZalm/Marlin/issues/148
 2012-04-22 20:04:39 +02:00
ErikZalm c2557abc03 Merge pull request #138 from triffid/fix-makefile 
make should rebuild if configuration or Makefile is changed
 2012-04-15 10:21:46 -07:00
Erik van der Zalm 67cf105bc6 Fixed AUTOTEMP (M109 S215 B260 F1 starts autotemp) 
Changed SLOWDOWN. IF this does not work ok OLD_SLOWDOWN is the old algo.
 2012-04-15 19:17:33 +02:00
Erik van der Zalm 8aee9d51b6 Disabled disable_heater in PID_autotune. 2012-04-12 21:12:31 +02:00
Daid 414408b2d0 Fix for wrong systax in #ifdef. 2012-04-12 14:01:30 +02:00
Michael Moon 77d503fa13 Fix Makefile 2012-04-11 11:39:35 +10:00
Erik van der Zalm cf7c8c458f Fixed MAX6675 2012-04-10 21:57:57 +02:00
grrf 03b0850e63 This breaks temperature readout for pronterface! 2012-04-09 23:37:34 +03:00
tgiphil ad8bc71d3e - Fixed a typo 2012-04-07 20:01:31 -07:00
Erik van der Zalm 46feae79c6 Fixed typo in arc 2012-04-02 17:19:20 +02:00
Erik van der Zalm 4ca2f336f0 Changed default MINIMUM_PLANNER_SPEED -> 0.05 
Fixed small bug in arcs
M105 prints now actual_temp/target_temp
 2012-04-01 16:23:40 +02:00
Erik van der Zalm ae0bf8068b Fixed arc offset. 2012-03-27 19:03:33 +02:00
Erik van der Zalm 0c1b863755 Ignore ":" in comments. 2012-03-25 14:41:26 +02:00
Erik van der Zalm 63aec3c56e Replaced Kill by Stop. If the printer is stopped. Fix the error and use M999 to restart. 
Moved the PID_dT in the Ki and Kd calculation from the configuration.h to temperature.cpp
 2012-03-25 14:36:51 +02:00
ErikZalm 8b785f75a6 Merge pull request #123 from buserror-uk/for-upstream 
For upstream
 2012-03-23 11:54:58 -07:00
Tommy Cheng 520f1a54a8 Fix compilation error when PIDTEMP is undefined and ULTIPANEL is defined. 2012-03-24 02:26:59 +08:00
Michel Pollet 5550e893d5 New board variant, Open Motion Controller 
Open Hardware board currently used by the group build of http://tvrrug.org.uk
The board can be found at http://solderpad.com/folknology/open-motion-controller/

Signed-off-by: Michel Pollet <buserror@gmail.com>
 2012-03-22 13:51:21 +00:00
Michel Pollet aa6e6e914e Makefile: Redone 
+ Removed most explicit pathnames, use the standard make "VPATH" to let
make find the files for itself.

+ Added a "hardware variant" variable that allows compiging Sanguino and
Gen7 as well as "generic" arduino.

+ Allows overriding the MOTHERBOARD define from the Makefile

+ Removed the 'preprocessor' bit that wasn't needed, now just "include" the
files that are needed, since it allows gcc to show the right file/line
when displaying error/warnings.

+ Uses gcc's own dependency generator to generate the .d files, and
and include these instead of self-patching the makefile

Signed-off-by: Michel Pollet <buserror@gmail.com>
 2012-03-22 13:48:10 +00:00
Bernhard 0183e6332a made prepare->autostart independent of current folder. 2012-03-19 20:24:40 +01:00
Bernhard 1532200435 found error in filenames. 
One array was too short. This had nothing to do with long filenames, other than if they were 12 characters exactly, which could only happen if the extension and the text before were filled completely
 2012-03-19 20:06:58 +01:00
Erik van der Zalm b985e4a134 Fixed compile errors in ultralcd when no ultra_lcd is selected. 2012-03-15 22:29:31 +01:00
Erik van der Zalm 2e749d60c3 Added DISABLE_MAX_ENDSTOPS 2012-03-12 20:32:14 +01:00
Erik van der Zalm 33f5697888 PPID tune exports more constants. 2012-03-11 22:18:25 +01:00
Erik van der Zalm b44055cc51 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 2012-03-11 18:03:00 +01:00
Erik van der Zalm f5eae52098 Added more manage_inactivity checks 2012-03-11 17:59:44 +01:00
ErikZalm 19a47dae4a Merge pull request #99 from Justblair/master 
Better pin configuration for rotary encoder in RAMPS boards
 2012-03-11 04:34:59 -07:00
Erik van der Zalm 910f4e77a2 Added 20MHz support. 2012-03-11 12:25:04 +01:00
ErikZalm 7cefad3744 Merge pull request #106 from bgamari/Marlin_v1 
Make F_CPU dependence of stepper.cpp more explicit
 2012-03-11 01:48:30 -08:00
Erik van der Zalm 87ff2f8867 Added CONTROLLERFAN. (Controlling a fan to cool down the steppper drivers) 2012-03-11 10:44:10 +01:00
Erik van der Zalm 387fe51a56 Do not disable steppers when there are moves in the queue. 2012-03-09 20:20:01 +01:00
Erik van der Zalm 421264e58a Fixed typo 2012-03-09 17:49:48 +01:00
Erik van der Zalm 15ad923310 Removed !!!. Stupid arduino bootloader can't handle this. 2012-03-09 17:42:32 +01:00
Erik van der Zalm 61e09e6be2 Added FAN_PIN -1 checks 2012-03-08 22:09:49 +01:00
Erik van der Zalm 87c4e06c24 Corrected active_extruder when autotemp is used. 2012-03-08 22:04:13 +01:00
Erik van der Zalm 7b1e295f34 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 2012-03-08 21:48:06 +01:00
Erik van der Zalm c077316b2b Added PID autotune. (experimental) 
M303 Starts autotune. Wait till the Kp Ki and Kd constants are printed.
Put these values in Configuration.h
 2012-03-08 21:43:21 +01:00
Ben Gamari 49b228c4b3 Add instructions to regenerate speed_lookuptable when changing F_CPU 2012-03-07 18:11:03 -05:00
Ben Gamari 96509494f0 stepper: Clarify comment on timer-counter configuration 2012-03-07 18:11:01 -05:00
Ben Gamari 6d7e6a11fc Add create_speed_lookup 2012-03-07 18:11:01 -05:00
Tommy Cheng ce07c9186d While Waiting for hotbed to warm up via M190, LCD Display and Click Encoder input freeze until target temperature is reached. 2012-03-05 23:12:26 +08:00
Erik van der Zalm 116dc86b8a Fixed type in e-jerk 2012-03-04 23:09:13 +01:00
Blair Thompson 02ee9e3d30 Changed Pin Assignment for the RAMPS motherboard so that LCD and Rotary encoder are all wired to AUX-4 
This simplifies wiring for those with RAMPS 1.3 and 1.4 boards.
 2012-03-04 21:34:20 +00:00
Erik van der Zalm e056bf8081 Added E-Jerk 2012-03-04 16:34:58 +01:00
Erik van der Zalm 4deeffbc88 Added missing defines to the german section. 
Translation still needed.
 2012-03-04 14:08:20 +01:00
Erik van der Zalm 632528aa95 merging with SCUBA82 2012-03-04 13:41:47 +01:00
Erik van der Zalm aac7aa3bf0 Queued fan control. Issue #90 2012-03-04 13:05:26 +01:00
Christian Thalhammer fde51084f3 set SD file delete to M30; switch printime output to M31 2012-03-03 21:58:12 +01:00
Erik van der Zalm 21e2bae063 Changed (corrected?) SD_card comment handling. 2012-03-03 21:28:33 +01:00
Erik van der Zalm e509bbf636 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 2012-03-03 20:41:22 +01:00
Erik van der Zalm 072011a3ef Added current_block = NULL to quickStop() 2012-03-03 20:40:46 +01:00
ErikZalm 2422a857a1 Merge pull request #96 from haxar/Marlin_v1 
make analog2tempBed return a precise celsius reading for BED_USES_THERMISTOR, ...
 2012-03-03 11:24:58 -08:00
Erik van der Zalm f598077af3 Removed vc files 2012-03-03 20:22:42 +01:00
Erik van der Zalm cb0c84e075 Merge remote-tracking branch 'justblair/master' into Marlin_v1 2012-03-03 20:20:55 +01:00
ErikZalm 1d5809d458 Merge pull request #88 from daid/Marlin_v1 
Made plan_buffer_line arguments const...
 2012-03-03 11:18:14 -08:00
Erik van der Zalm ed951b1977 Fixed RAMPS 1.2 support (Found and fixed by rrhb) 2012-03-03 20:15:41 +01:00
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