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
ErikZalm
bb499421e9
Merge pull request #166 from zittix/Marlin_v1
...
Fixes #153 for bad call to abs()
2012-05-16 12:00:22 -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
daid
830972ce3c
Merge pull request #1 from ErikDeBruijn/Marlin_v1_Ultimaker-rc3
...
Marlin v1 ultimaker rc3
2012-05-09 01:35:59 -07: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
Bernhard Kubicek
108011085b
futher docu of M500
2012-05-04 08:37:49 +03: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