d197f8504b
clean up and changes from testing
2012-09-17 19:18:50 -05:00
eb06a886c4
missed
2012-09-17 14:23:49 -05:00
04631d2250
cleanup for pull
2012-09-17 14:17:24 -05:00
0a5ad3ab85
move comment to correct place
2012-09-17 08:42:35 -05:00
5bfccab650
readme
2012-09-12 21:52:16 -05:00
9698f4ea64
bed pid
...
Conflicts:
Marlin/Configuration.h
2012-09-12 21:18:59 -05:00
769796ed4c
Merge pull request #240 from ZetaPhoenix/Marlin_v1_bugfix
...
Missing #else in temperature.cpp prevented reading bed temp when TEMP_BE...
2012-09-11 02:10:39 -07:00
e8c92e0a95
Missing #else in temperature.cpp prevented reading bed temp when TEMP_BED_PIN <7. Thanks to Leland Wallace for helping me track this down via "Sesame Street" coding (what is not like the other)
2012-09-09 16:06:02 -07:00
abf0693e8e
Added KILL_PIN -1 to gen7 boards
2012-09-04 08:20:27 +02:00
47319cf64e
Fixed typo in SF arc fix code.
2012-09-03 21:28:31 +02:00
e358a2d7af
Added fix for SF Arc Point fillet procedure
2012-09-02 01:12:49 +02:00
044a64a1fb
Merge pull request #225 from Justblair/Marlin_v1
...
Added PDF file containing Menu Tree for documentation purposes.
2012-09-01 04:41:49 -07:00
cd91e0e3e1
Merge pull request #228 from Drakelive/patch-1
...
Update Marlin/pins.h
2012-08-30 13:39:37 -07:00
d728e35658
Update Marlin/pins.h
2012-08-30 23:36:49 +03:00
dcd3e8a211
Tidy up
2012-08-29 22:53:41 +01:00
ddd9d0cfd4
Added PDF file containing Menu Tree for documentation purposes. Source xlsx document included.
2012-08-29 21:08:41 +01:00
0e58ef6805
Some dialogs are corrected
2012-08-29 21:15:59 +02:00
0e89022cc3
Correct temptable_55 name.
2012-08-28 19:47:22 +02:00
b86336c3f5
Merge pull request #221 from daid/Marlin_v1
...
Long filename support for LCD display
2012-08-22 06:30:35 -07:00
b69e75c89a
Added long filename support.
2012-08-22 14:49:57 +02:00
825adbd67b
Merge pull request #220 from MaikStohn/1d224cc031
...
Implemented support for KILL_PIN / Fixed compilation errors for incomplete/bad translations
2012-08-22 04:33:28 -07:00
1d224cc031
merged with upstream and FIXED AGAIN bad translation commit
...
PLEASE BE MORE CAREFUL WHEN SUBMITTING NEW TRANSLATIONS
When you add new menu items / messages always copy them to ALL
languages (just use english)
2012-08-22 13:05:42 +02:00
06c03fe2f0
new method for message for making KILLED message visible
...
The cli(); at the start of the kill() function also stops the internal
arduino timer which stops updating of millis() which prevents the
display of the "KILLED." message.
The new function updates the display directly without checking any
timers.
2012-08-22 12:44:41 +02:00
87ff61a8a6
Fix for #201
2012-08-22 10:54:55 +02:00
8c94ad0d26
Merge pull request #219 from Justblair/Marlin_v1
...
Added new function to the LCD menu. Preheat settings now adjustable and can be stored
2012-08-21 23:21:11 -07:00
aacbebbebe
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 23:46:10 +01:00
31873ec707
changed int to long to overcome overflow of number display
...
- related bug reports: Issue #201 , Issue #213
2012-08-21 16:47:39 +02:00
de0448343f
added KILL_PIN support / cleaned up manage_inactivity function definition
2012-08-21 14:48:29 +02:00
69961dbba3
fixed incorrect menu messages from last commit...
...
- removed several multiple definitions of same message
- fixed definition of missing messages in german and spanish
- tweaked german translation (a lot)
- added note about changing and testing this file
2012-08-21 14:44:20 +02:00
f67feea093
Merge pull request #217 from Justblair/Marlin_v1
...
Fixed broken Language file and pre-heat ABS and PLA options
2012-08-20 14:34:32 -07:00
6c050b8440
Fixes error introduced at commit aee475aa55 which caused the sketch not to comile for language option 1. Several defines were removed but still referenced in ultralcd.pde
2012-08-20 21:54:47 +01:00
b9f9f8f7d3
The pre-heat ABS and PLA options in the LCD Menu were broken a while back. The pre-heat worked fine, but the cooling fans were not switching on as intended. This is now fixed.
2012-08-20 21:49:37 +01:00
9f7f7354f5
Set default language 1
2012-08-12 21:29:42 +02:00
d3b8edb6a2
Merge pull request #212 from elgambitero/Marlin_v1
...
Spanish language included in the language.h file
2012-08-12 12:27:06 -07:00
aee475aa55
Update Marlin/language.h
...
Spanish language included. It features the LCD screen messages and a small part of the Serial messages.
2012-08-12 21:26:17 +03:00
9083966c22
Do not use feedrate multiiply on Z and E only moves.
2012-08-12 18:13:34 +02:00
5406c533db
Disable FAST_PWM by default. On some systems it does not work ok.
2012-08-11 15:51:04 +02:00
f92dc91c3d
Enable M503 also when eeprom is disabled
2012-08-11 15:49:40 +02:00
35a1dd081f
no message
2012-08-11 15:33:35 +02:00
5131ab19ca
Fixed Retract in LCD Menu
2012-08-11 15:29:40 +02:00
96f4f90cb3
Added pause and retract lcd menu items
2012-08-11 15:29:33 +02:00
e10355500d
Updated Language.h with pause, resume, and retract
2012-08-11 15:29:26 +02:00
a97c006bbf
Merge pull request #195 from kobaan/Marlin_v1
...
Updated german translations in language.h
2012-08-11 01:45:30 -07:00
f062794a0d
Merge pull request #208 from Enchiridion/Marlin_v1
...
Added support for dual Z axis stepper drivers
2012-08-11 01:42:49 -07:00
57468d3c21
Merge pull request #210 from Dabble63/Marlin_v1
...
Add Duty Cycling to the Heater Bed
2012-08-11 01:42:02 -07:00
22aae62ccd
Merge pull request #209 from ijackson/for-upstream
...
M206 fixes, and ancillary improvements
2012-08-11 01:40:50 -07:00
6b45e9f167
Add Duty Cycling to the Heater Bed
2012-08-11 09:17:47 +03:00
adee81170d
M206: save values in eeprom
...
Really, we should have a way to adjust the XYZ homing of a machine in
the eeprom. So as the second stage of this, make the M206 home offset
parameters subject to the M500/M501/M502/M503 eeprom commands.
Bump the eeprom version to "V06".
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2012-08-11 01:43:00 +01:00
1dba212e18
HOMEAXIS: make into a function
...
Replace the large macro HOMEAXIS with a function. This avoids the
compiler generating three copies of largely identical code. The
saving is 724 bytes of program memory.
We make use of XYZ_CONSTS_FROM_CONFIG to provide convenient
array-shaped access to MAX_LENGTH, HOME_RETRACT_MM and HOME_DIR.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2012-08-11 01:43:00 +01:00
7bb326d389
eeprom: provide smaller code for SERIAL_ECHOPAIR
...
SERIAL_ECHOPAIR implies, eventually, two calls to MYSERIAL.print. One
of these has FORCE_INLINE for a per-character loop, and both involve
constructing a method call rather than a simple function call.
Produce better and smaller code by providing three specialised
functions serial_echopair. This saves 672 bytes of program memory
(with EEPROM_SETTINGS and SDSUPPORT enabled).
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2012-08-11 01:42:59 +01:00
Mark Finn