Johann Rocholl
931a0052ea
Fix typo in MANUAL_HOME_POSITION (plural S missing) and reduce BLOCK_BUFFER_SIZE because 64 wasn't working for some reason.
2012-12-11 01:22:04 -08:00
daid303
46ec4b648c
Added some missing Mxxx comments to M commands. Fixed the unsetting of the timer dividers for the fast PWM fan.
2012-12-11 10:21:44 +01:00
Daid
724f5aa36b
Update on makefile for moved Arduino addons.
2012-12-10 12:06:30 +01:00
daid303
6d9dfa96c3
Move the Arduino related stuff out of the Marlin tree, as they are not directly related to Marlin functionality but addons for the Arduino IDE. Also split up the addons for pre 1.0.0 Arduino and post 1.0.0 Arduino.
2012-12-10 12:02:29 +01:00
daid303
3fb07d9b8d
Add MINTEMP/MAXTEMP error to LCD, and fix temperature bug with more then 1 extruder.
2012-12-10 10:48:46 +01:00
Johann Rocholl
8e2519e88b
Add realtime delta geometry in Marlin_main.cpp.
2012-12-10 01:04:12 -08:00
Johann Rocholl
cec7283b21
Enable QUICK_HOME for deltabot.
2012-12-10 00:43:47 -08:00
Johann Rocholl
2292441f0c
Use X/Y/Z_MAX_PIN instead of X/Y/Z_MIN_PIN for top endstops on deltabot.
2012-12-10 00:43:14 -08:00
Johann Rocholl
c430906d3b
Deltabot settings and configuration adjustments.
2012-12-10 00:10:56 -08:00
daid303
82c8724b33
Fix compile with PID_DEBUG
2012-12-09 23:50:12 +01:00
daid303
9b160972a1
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
2012-12-09 23:46:42 +01:00
daid303
e036750bdf
Use the disable macros on initialization. Which fixes a bug when there is no pin defined for stepper enabled (motherboard 4)
2012-12-09 23:46:25 +01:00
Daid
fcd9de72ef
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
2012-12-09 23:31:07 +01:00
Daid
32d4373e0f
Add printrboard and brainwave to Makefile.
2012-12-09 23:30:55 +01:00
daid
b3ddbcee2a
Merge pull request #329 from jcrocholl/Marlin_v1
...
Add Printrboard and Brainwave to pins.h and fastio.h
2012-12-09 14:29:26 -08:00
Daid
29435dfb4b
Proper avr for Sanguino in Makefile.
2012-12-09 23:02:03 +01:00
daid303
52158dffcc
Big temperature code update. No longer converts back and forwards between temperature and raw sample value. Reducing complexity, removing code. Also named some variables better. While keeping the safety intact and functionality the same.
2012-12-09 23:00:06 +01:00
Daid
ca7acbe6d9
Allow specification of which arduino hardware subvariant in Makefile.
2012-12-09 19:19:57 +01:00
Johann Rocholl
33247733e0
Teensylu and Printrboard use different analog pins for thermistors.
2012-12-09 02:19:13 -08:00
Johann Rocholl
621c24a10f
AT90USB is only defined after pins.h is included.
2012-12-09 01:40:33 -08:00
Johann Rocholl
6cba11f087
Stop redefining MOTHERBOARD and #define AT90USB instead. Also put #ifndef AT90USB around the HardwareSerial_h trick, so now Printrboard / Brainwave support compiles on Arduino 1.0.2 as well.
2012-12-09 01:32:09 -08:00
Johann Rocholl
4d351b4846
Improved formatting and comments for consistency.
2012-12-08 20:15:53 -08:00
Johann Rocholl
a30007caa4
If fastio.h is not messed up then Teensylu and Printrboard are actually using the same pins.
2012-12-08 19:46:42 -08:00
Johann Rocholl
6aa87a7b67
Use the same fastio.h definition for AT90USB1286/7 and AT90USB646/7.
2012-12-08 15:16:38 -08:00
Johann Rocholl
b1c38d4c82
Avoid compiler warnings (redefined MOTHERBOARD) in Arduino 1.0 and greater.
2012-12-08 11:34:18 -08:00
Johann Rocholl
42e21bb06e
Add support for Printrboard (from https://github.com/lincomatic/Marlin ) and Brainwave (from https://github.com/metrix/Sprinter ).
2012-12-08 10:49:01 -08:00
Johann Rocholl
ce4b5bbeaa
Add AT90USB646 support from Sprinter to fastio.h.
2012-12-08 10:45:58 -08:00
Daid
f413aa33b3
Small makefile change, posibility to add defines on the commandline, and fix compiling with watchdog enabled when using the Makefile.
2012-12-08 11:49:53 +01:00
daid303
587154c01b
Fix the WATCHPERIOD implementation. It did not work correctly in a multi extruder setup, it did not work after 32 seconds after startup (int16 used as millies timestamp). And it did not work if you gave an M104 or M109 when the target was already around the target setpoint. So on average, it did not work at all. The new implementation should be robust in detecting a failure to heat up.
2012-12-06 10:36:07 +01:00
daid303
1f27870d41
Fix compiling the watchdog error message when the manual reset watchdog is used.
2012-12-06 10:27:50 +01:00
daid303
c5d4225804
Mistake there, not sure why I did that. My bad.
2012-12-05 20:23:13 +01:00
daid303
529748894c
Minor changes in the temperature code for some cleanup.
2012-12-05 19:54:01 +01:00
daid303
4e26ecc940
The Partial release message (which does not really tell you anything) overwrites the final print time on the LCD, which is a real shame. So I removed the message.
2012-12-05 19:32:26 +01:00
daid303
c421774422
The Partial release message (which does not really tell you anything) overwrites the final print time on the LCD, which is a real shame. So I removed the message.
2012-12-05 19:32:02 +01:00
daid303
16078e47d4
Fixed #325
2012-12-04 16:27:21 +01:00
daid303
6a9bee27cc
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 12:52:00 +01:00
daid303
94ea26ff46
Some minor changes on code style. And a bugfix where the counters for positioning in the stepper where wrong depending on compiler settings. (Caused strange values to reported back with M114 and endstop triggers). Also fixed compiling with FWRETRACT enabled.
2012-12-03 12:13:20 +01:00
daid303
6c51fe5039
Fix the bug where the SD percentage calculation is wrong when the file is larger then 42MB
2012-12-03 11:35:36 +01:00
brupje
57429cb9fe
Fix for keypad
2012-11-29 21:42:19 +01:00
daid303
97fa2a9c30
Few simple fixes that save RAM, as static strings are stored in RAM by default.
2012-11-28 10:30:34 +01:00
Daid
c94ca24adc
Fixed #317
2012-11-24 17:32:30 +01:00
Daid
99e9554edd
Some fixes in the Makefile to support Arduino 1.0.0 or higher and added the Rambo. Still needs some more work for the different arduino hardware variants.
2012-11-24 11:46:31 +01:00
Erik vd Zalm
dbbf050005
More rambo fixes
2012-11-21 20:53:56 +01:00
Erik vd Zalm
f934d0ef5b
Merge remote-tracking branch 'tonokip/Marlin_v1' into Marlin_v1
...
Conflicts:
Marlin/Configuration.h
2012-11-21 20:36:30 +01:00
Erik vd Zalm
e48dfcc2b3
Tmp copy before merge
2012-11-21 20:29:31 +01:00
Erik vd Zalm
b98fb17fe9
Small FREQUENCY_LIMIT changes
2012-11-21 20:17:44 +01:00
daid
bce67ec2c9
Merge pull request #312 from gege2b/Marlin_v1
...
Added french translation
2012-11-18 13:43:07 -08:00
Gege
9b1d2483a0
I hope last changes to french translation
2012-11-18 22:34:56 +01:00
Gege
b1adc567da
Correction to french translation (non-ASCII chars only)
2012-11-18 20:00:41 +01:00
Gege
0807d82af0
Correction to french translation (plain text only)
2012-11-18 19:39:56 +01:00
Erik vd Zalm
5cd7a90b32
Added new temperature lookup table creation tool. This one uses stein hart-hart equations.
...
You need 3 temperature resistance:combinations. This gives a better result then using beta.
2012-11-16 23:51:05 +01:00
gege2b
bb119739b0
Added french translation
2012-11-16 18:38:50 +01:00
daid
df8dd5ac21
Merge pull request #306 from nothinman/Marlin_v1
...
Added automatic build numbering.
2012-11-14 01:59:33 -08:00
MaikStohn
2b7b1e52b1
allow marlin internal 0°C represenation
2012-11-13 14:37:08 +01:00
Martin Lukasik
2f771b3979
Added automatic build numbering.
2012-11-12 21:06:59 +00:00
daid
9bebe9b631
Merge pull request #302 from nothinman/Marlin_v1
...
Added Polish translation. Cosmetic changes to English.
2012-11-12 12:13:30 -08:00
daid303
a2032afa3a
Fixed #303
2012-11-12 21:04:07 +01:00
Martin Lukasik
6a55ca8370
Added Polish translation. Cosmetic changes to English.
2012-11-12 15:54:07 +00:00
daid303
8f20562f49
Fix some of the crowded code style. And fixed the conditional. #300
2012-11-12 15:49:40 +01:00
daid303
43018a48c4
Fix for a few -Wextra warnings.
2012-11-12 15:35:28 +01:00
daid303
72586eb30a
Solved few warnings.
2012-11-12 09:29:12 +01:00
daid303
7a02ba361c
Header multiple include protection should match the filename, not just _ARDUINO_H, which is almost bound to go wrong some day.
2012-11-12 09:24:28 +01:00
daid303
f4a89ec776
SDCARDINSERTED is always defined, and thus we do not need the #ifdefs.
2012-11-12 09:16:27 +01:00
daid303
57834776ad
Made the 2nd speed lookup table condition more explicit.
2012-11-11 12:02:48 +01:00
Daid
caa2b25b40
Fix Gen7 compile if you have avr-libc version 1.7.1 or higher. See http://code.google.com/p/arduino/issues/detail?id=604
2012-11-11 11:17:54 +01:00
daid303
a27fef8750
Store the pre-heat constants outside of the ULTIPANEL define, so we can use them when storing EEPROM in a build without the ULTIPANEL.
2012-11-11 11:06:58 +01:00
daid303
789be03b4f
Update on makefile, should make it easier to compile for different boards without changing the makefile. (Still missing Arduino 1.x.x support).
2012-11-11 11:05:52 +01:00
daid303
40ce057a3e
Fixing issue #297
2012-11-10 14:37:01 +01:00
daid303
625ac81acc
Yes, makes sense, lets NOT use the value directly from the configuration define but modify it before setting it. This will not confuse people (including me) at all!
2012-11-09 22:36:31 +01:00
daid303
ffc69537aa
Update on some comments, make the MOTHERBOARD list complete again.
2012-11-09 09:10:51 +01:00
daid303
71efcfc648
Most likely fixing issue #295 .
2012-11-08 21:08:05 +01:00
daid303
04be9d6001
God damn. Sorry, my mistake, forgot to add this file.
2012-11-07 23:16:43 +01:00
daid303
c17da4b707
Add ConfigurationStore to the Makefile.
2012-11-07 22:43:01 +01:00
daid
ccd9fd0dc3
Merge pull request #292 from jothan/lcdfix
...
Lcd fixes
2012-11-07 13:10:59 -08:00
Jonathan Bastien-Filiatrault
46b9988e26
Search and replace failure.
2012-11-07 16:09:30 -05:00
Jonathan Bastien-Filiatrault
0f73afb0b0
Avoid defining overriding definitions for the RepRapDiscount Smart
...
Controller. Remove common definitions. Harmonize declaration order.
2012-11-07 16:04:28 -05:00
Jonathan Bastien-Filiatrault
36b452c7ac
Remove abbrs.
2012-11-07 15:42:18 -05:00
YanFM
332344bd43
Update Marlin/language.h
...
Included Portuguese language
2012-11-07 09:43:13 -02:00
daid303
e6c1cadea0
Set the watchdog to a 4 second timeout, as with 1 second it can timeout during SD card init.
2012-11-07 12:32:17 +01:00
daid
faea7d72b8
Merge pull request #290 from buildrob/Marlin_v1
...
Clean up special serial port cases
2012-11-07 02:00:26 -08:00
daid303
12a4d60e18
Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template.
2012-11-07 10:02:45 +01:00
Jonathan Bastien-Filiatrault
9606f4d04f
Include Marlin_main.cpp in source files.
2012-11-06 20:32:48 -05:00
Jonathan Bastien-Filiatrault
3cbaad9288
RepRapDiscount Smart Controller pin definitions.
2012-11-06 20:32:13 -05:00
Robert F-C
99692dc99e
Clean up special serial port cases
...
Assume SERIAL_PORT 0 if not defined. Collapse un-numbered register
special case. Clarify comments.
2012-11-07 09:00:21 +11:00
daid303
5a998558a9
Update suggested by Robert F-C. #289
2012-11-06 21:04:29 +01:00
daid303
f6ff0ab767
signed/unsigned fixes.
2012-11-06 15:33:49 +01:00
daid303
5d471e0f34
Also reset the PID values to defaults. Fixes #281
2012-11-06 15:21:00 +01:00
daid303
d3ebc34958
Hopefully also support chips with a single UART in MarlinSerial now.
2012-11-06 14:43:36 +01:00
daid303
b6ff45254e
Better explain the watchdog "problem" and rename the config define so it explains that the feature belongs to the watchdog.
2012-11-06 13:33:00 +01:00
daid303
7e348fcb5f
By mistake enabled the watchdog by default. This should be off by default.
2012-11-06 13:20:08 +01:00
daid303
06b58a9c4f
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 12:06:41 +01:00
daid
539f3b3fe4
Merge pull request #284 from brackendawson/Marlin_v1
...
Use the right pins for Gen7 1.4
2012-11-06 01:06:24 -08:00
Robert F-C
65c9a0728f
Set default serial port back to 0.
2012-11-05 22:15:07 +11:00
Robert F-C
ab9d183024
Make serial port configurable.
...
This change makes the choice of serial port configurable so that
wireless capability can be easily added by connecting Bluetooth modules
(such as BlueSmirf or JY-MCU) to the expansion port pins.
2012-11-05 21:34:27 +11:00
Bracken Dawson
f5631a89e8
Add dummy Emergancy Pin to Gen7 1.4
...
Change required after pulling from ErikZalm.
2012-10-26 22:28:37 +01:00
Bracken Dawson
a4f9e1ebf2
Merge git://github.com/ErikZalm/Marlin into Marlin_v1
2012-10-26 22:20:35 +01:00
Bracken Dawson
2873d67b17
Put bogus temp override back in Gen7 up to 1.3
...
Took out the ifdef when I split 1.4 out and forgot to permanently
define it for <=1.3.
2012-10-26 22:17:26 +01:00
ErikZalm
a7e40b2903
Merge pull request #276 from setar/Marlin_v1
...
Fix num of digits on LCD for E and Z axis.
2012-10-23 09:48:55 -07:00
MaikStohn
6ed02c86be
Fixed wrong code (will not even compile when EXTRUDERS>2)
2012-10-23 18:08:43 +02:00
Sergey Taranenko
2a67363e27
Fix ‘prog_uchar’ definition in LiquidCrystalRus.cpp
2012-10-22 11:05:17 +04:00
Sergey Taranenko
205304ddee
Merge git://github.com/ErikZalm/Marlin into Marlin_v1
2012-10-22 10:59:27 +04:00
Erik vd Zalm
58bca87c72
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
2012-10-21 14:40:06 +02:00
Erik vd Zalm
febeb43197
Revert "fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '"
...
This reverts commit cb02c2f9d8
.
2012-10-21 14:36:31 +02:00
Sergey Taranenko
8178dec4c3
Fix num of digits on LCD for E and Z axis.
...
The number of steps per mm often contains 4 digits before the decimal point and does not require precision greater than 0.1
2012-10-18 17:45:40 +04:00
ErikZalm
70f57a6844
Merge pull request #273 from setar/Marlin_v1
...
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
2012-10-17 04:10:18 -07:00
ErikZalm
ff14199e58
Merge pull request #270 from jothan/Marlin_v1
...
Create an explicit rule for building applet/Marlin.cpp.
2012-10-17 04:09:36 -07:00
Daniele Sdei
695938ba3f
Italian language support
2012-10-17 12:48:26 +02:00
Sergey Taranenko
cb02c2f9d8
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
2012-10-17 10:49:05 +04:00
Jonathan Bastien-Filiatrault
e4a5e333ef
Generalize.
2012-10-15 21:34:33 -04:00
Jonathan Bastien-Filiatrault
e10d3136c8
Create an explicit rule for building applet/Marlin.cpp.
...
It would seem that the pattern matches do not work when the source
file is created when make is running. The result of this is that it is
necessary to run "make" twice to build the firmware.
This adds an explicit rule without a pattern match for building
applet/Marlin.cpp it corrects the make behaviour at the cost of adding
a little redundancy in the Makefile.
2012-10-15 21:16:25 -04:00
ErikZalm
9f089756b7
Merge pull request #265 from setar/Marlin_v1
...
Added Russian translation
2012-10-14 14:11:58 -07:00
brupje
326423719f
Add support for Megatronics
2012-10-14 14:05:57 +03:00
brupje
d07b6e93d5
Add support for Megatronics
2012-10-14 14:05:12 +03:00
Sergey Taranenko
efcc28d347
Fix check for include LiquidCrystalRus.h
2012-10-13 00:29:34 +04:00
Sergey Taranenko
cfc193cdac
Enables support the Cyrillic alphabet for LCD
2012-10-12 19:06:43 +04:00
Sergey Taranenko
24bcc9647d
Added Russian translation
2012-10-12 18:33:05 +04:00
Mark Finn
bf7e453d02
Unwanted artifacts from unclean merge of bed-pid tree
2012-10-09 14:47:35 -05:00
ErikZalm
36a746d7d5
Merge pull request #244 from markfinn/pidbed
...
PID for heated bed
2012-10-08 11:15:16 -07:00
elgambitero
df09e2adce
Spanish updated
2012-09-26 19:14:07 +02:00
elgambitero
ddf6603d81
Spanish language updated. Bug fixes on dialogs.
2012-09-26 19:11:45 +02:00
elgambitero
4bf8b1aeee
fesfas
2012-09-26 19:05:31 +02:00
drakelive
be1e099f1b
Union whit Erick version
2012-09-25 19:17:15 +02:00
elgambitero
7afd202b89
New dialogs translated to spanish. Bug fixes.
...
Dialogs from M119 translated, and "Set Preheat" dialogs adapted to the
screen size.
2012-09-25 19:16:57 +02:00
elgambitero
ebc4601185
Some new dialogs translated to Spanish
2012-09-25 19:08:44 +02:00
drakelive
c8ea9b0e58
Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin
2012-09-25 18:51:20 +02:00
drakelive
ca7ca4572e
primo commit
2012-09-25 18:46:38 +02:00
johnnyr
8016f058bc
fix max endstop pins
2012-09-19 13:15:17 -05:00
Mark Finn
d197f8504b
clean up and changes from testing
2012-09-17 19:18:50 -05:00
Mark Finn
eb06a886c4
missed
2012-09-17 14:23:49 -05:00
Mark Finn
04631d2250
cleanup for pull
2012-09-17 14:17:24 -05:00
Mark Finn
0a5ad3ab85
move comment to correct place
2012-09-17 08:42:35 -05:00
ZetaPhoenix
8ac5b29e02
Changes to M119 response for easier visual comparison
...
Changed to report on individual lines with "TRIGGERED" or "open" instead of "H" or "L" on one line as H&L could be confused with logic levels High and Low which may be wrong if using inverted logic. Added strings to language.h.
Fixed typo "deu" in English language that was fixed in #134 but got added back in via 9f7f7354f5
2012-09-16 14:51:24 -07:00
ZetaPhoenix
c6caa45ae2
Limit Switch locations based on MIN/MAX limits and homing direction
...
fixes #246
Added statements to set the limit switch positions to the maximum travel if homing in the positive direction as well as bed center at (0,0) if defined.
Relocated code based on feedback.
2012-09-15 15:25:49 -07:00
ZetaPhoenix
dc566d654f
fixes #246
...
Added statements to set the limit switch positions to the maximum travel if homing in the positive direction as well as bed center at (0,0) if defined.
2012-09-14 21:48:49 -07:00
ErikZalm
ba898faa7d
Merge pull request #249 from gwelchc/patch-2
...
Slight modification for byte savings
2012-09-14 12:13:36 -07:00
ErikZalm
0152ee71a5
Merge pull request #248 from gwelchc/patch-1
...
Binary representation for characters in ultraldc.pde
2012-09-14 12:10:28 -07:00
G. W. C.
6ccbfeb80c
Update Marlin/Marlin.pde
...
Added function 'setTargetedHotend' that turns into a function an operation repeated 3 times through the M-codes processing.
This modification saves a few bytes that can be used to add support for new commands.
2012-09-14 16:38:54 +03:00
G. W. C.
c433142abf
Update Marlin/ultralcd.pde
...
The joris' char drawins are expressed in binary so to show their content's in a more visual fashion.
This is not a code modification as much as a readibility modification.
2012-09-14 16:29:43 +03:00
andrey-vasilyev
1d389ad3a8
Fix M81 not working reliably on Gen7
...
Some discussion of the issue is here http://forums.reprap.org/read.php?181,118329,page=1
2012-09-13 19:23:48 +04:00
Mark Finn
9698f4ea64
bed pid
...
Conflicts:
Marlin/Configuration.h
2012-09-12 21:18:59 -05:00
drakelive
e5c39b7c2a
commit
2012-09-10 14:25:49 +02:00
ZetaPhoenix
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
drake
bf2071871c
Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin
2012-09-08 23:08:34 +02:00
drake
fc32e20881
first commit
2012-09-08 22:26:23 +02:00
Erik vd Zalm
abf0693e8e
Added KILL_PIN -1 to gen7 boards
2012-09-04 08:20:27 +02:00
Erik vd Zalm
47319cf64e
Fixed typo in SF arc fix code.
2012-09-03 21:28:31 +02:00
Erik vd Zalm
e358a2d7af
Added fix for SF Arc Point fillet procedure
2012-09-02 01:12:49 +02:00
ErikZalm
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
Drakelive
d728e35658
Update Marlin/pins.h
2012-08-30 23:36:49 +03:00
tonokip
1c1fddc7ac
Added support for the Rambo reprap electronics board. Added Mcodes to set
...
motor current and microstepping pins.
2012-08-30 00:16:57 -07:00
Blair Thompson
dcd3e8a211
Tidy up
2012-08-29 22:53:41 +01:00
Blair Thompson
ddd9d0cfd4
Added PDF file containing Menu Tree for documentation purposes. Source xlsx document included.
2012-08-29 21:08:41 +01:00
Erik vd Zalm
0e58ef6805
Some dialogs are corrected
2012-08-29 21:15:59 +02:00
Erik vd Zalm
0e89022cc3
Correct temptable_55 name.
2012-08-28 19:47:22 +02:00
Bracken Dawson
47d4f55bc0
Fix Gen7 1.4 pinout
...
Gen7 1.4 uses very different pin assignments, might as well make a new
section and remove some of the conditionals from each. It's easier to change
your pin assingment this way if like me you don't wire it exactly to plan.
2012-08-22 23:15:46 +01:00
elgambitero
6cd150842f
Update Marlin/language.h
...
Some dialogs corrected and Default language set to 1
2012-08-22 21:46:22 +03:00
elgambitero
299c18596f
Update Marlin/language.h
...
Some dialogs are corrected
2012-08-22 21:44:57 +03:00
ErikZalm
b86336c3f5
Merge pull request #221 from daid/Marlin_v1
...
Long filename support for LCD display
2012-08-22 06:30:35 -07:00
daid
b69e75c89a
Added long filename support.
2012-08-22 14:49:57 +02:00
stohn
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
stohn
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
daid
87ff61a8a6
Fix for #201
2012-08-22 10:54:55 +02:00
Blair Thompson
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
stohn
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
stohn
de0448343f
added KILL_PIN support / cleaned up manage_inactivity function definition
2012-08-21 14:48:29 +02:00
stohn
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
Blair Thompson
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
Blair Thompson
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
elgambitero
d38b96fff1
Update Marlin/language.h
2012-08-12 22:45:11 +03:00
Erik vd Zalm
9f7f7354f5
Set default language 1
2012-08-12 21:29:42 +02:00
elgambitero
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
Erik vd Zalm
9083966c22
Do not use feedrate multiiply on Z and E only moves.
2012-08-12 18:13:34 +02:00
Erik vd Zalm
5406c533db
Disable FAST_PWM by default. On some systems it does not work ok.
2012-08-11 15:51:04 +02:00
Erik vd Zalm
f92dc91c3d
Enable M503 also when eeprom is disabled
2012-08-11 15:49:40 +02:00
James Adams
35a1dd081f
no message
2012-08-11 15:33:35 +02:00
James Adams
5131ab19ca
Fixed Retract in LCD Menu
2012-08-11 15:29:40 +02:00
James Adams
96f4f90cb3
Added pause and retract lcd menu items
2012-08-11 15:29:33 +02:00
James Adams
e10355500d
Updated Language.h with pause, resume, and retract
2012-08-11 15:29:26 +02:00
ErikZalm
a97c006bbf
Merge pull request #195 from kobaan/Marlin_v1
...
Updated german translations in language.h
2012-08-11 01:45:30 -07:00
ErikZalm
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
ErikZalm
57468d3c21
Merge pull request #210 from Dabble63/Marlin_v1
...
Add Duty Cycling to the Heater Bed
2012-08-11 01:42:02 -07:00
Dabble63
6b45e9f167
Add Duty Cycling to the Heater Bed
2012-08-11 09:17:47 +03:00
Ian Jackson
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
Ian Jackson
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
Ian Jackson
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
Ian Jackson
957e966d2d
M206: always use homing ("homeing") offsets
...
Previously the parameters set in M206 would only be used if a G82
command was sent with specific axis home values. This limits its
usefulness.
Really, we should have a way to adjust the XYZ homing of a machine in
the eeprom. So as the first stage of this, make M206 affect every
home command. The values set using M206 are now added to the
configuration variables [XYZ]_HOME_POS.
This is achieved by replacing all uses of [XYZ]_HOME_POS in the code
by a new home_pos[] which includes the adjustment. We also have to
adjust the uses of [XYZ]_{MIN,MAX}_POS similarly - see below.
To allow axis_is_at_home to be written as a function taking an axis
index rather than a macro taking an axis letter, we provide
constant arrays in program memory containing the values of
[XYZ]_{MIN,MAX,HOME}_POS from the compiled-in configuration.
This is done with some helper macros to deal with the declaration
(XYZ_CONSTS_FROM_CONFIG) and definition of the inline function which
does the program memory access.
We also introduce the overloaded function read_pgm_any, whose
instances are produced with DEFINE_PGM_READ_ANY, which allows the
access functions to automatically produce the correct type.
The type- and pointer-massaging code in the access function boils
down, when compiled, to a simple program memory access.
A question arises: if the M206 offset is set, should this adjustment
to the home position shift or change the possible range of movement
permitted by the software endstops ?
The documentation in Configuration.h describes these limits as:
// Travel limits after homing
Since this is a file containing physical limits, and actual suggested
values for these configuration parameters appear to include a certain
amount of slop, I've taken the view that these should be regarded as
nominal physical distances from the limit switches, and that the
permissible travel should be unaffected by M206.
So for example with the (rather unrealistic)
#define X_HOME_DIR -1
#define X_MIN_POS -20
#define X_HOME_POS 0
#define X_MAX_POS 100
no matter the setting of M206 X, the machine would be permitted
to move from 20mm "beyond" the limit switch trigger point in
the negative X direction and 100mm away from the limit switch in
the positive X direction, for a total travel of 120mm.
With M206 X-10 that would be considered to correspond to X coordinates
-30 to +90. With M206 X+10 that would be considered to correspond to
X coordinates -10 to +110.
fixes #200 (in ErikZalm/Marlin).
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2012-08-11 01:35:03 +01:00
Ian Jackson
faccb35850
software_endstops: use *_MIN_POS and *_MAX_POS for arcs
...
If [XYZ]_HOME_POS and [XYZ]_MIN_POS aren't 0, these corrections are
wrong. Use the same logic as in Marlin.pde:prepare_move: ie, clamp to
[XYZ]_{MIN,MAX}_POS.
While we're here, put this cut-and-paste code in a function
clamp_to_software_endstops.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2012-08-10 19:36:30 +01:00
Ian Jackson
3f15b7c7b8
Makefile: Better display of size (device memory usage)
...
Run avr-size with the --mcu=... -C option as well. That reports how
much actual device program and data memory is used along with a
percentage fullness.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2012-08-10 19:36:30 +01:00
Ian Jackson
0c35facc94
Makefile: support V=1
...
Often it can be useful to see the actual commands being run by make.
Other projects (eg, the Linux kernel) support this with a "V=1" make
parameter. Do the same here.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2012-08-10 19:36:29 +01:00
Ian Jackson
71404eef29
.gitignore: Add *~, *.orig, *.rej, move to root directory
...
Move the .gitignore out of the Marlin subdirectory so it applies to
the whole tree, and add some missing patterns.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2012-08-10 19:36:29 +01:00
Ian Jackson
a873541ef6
Marlin.pde: include comment for emacs mode
...
Emacs by default doesn't recognise a ".pde" file as C++ source code.
Add the annotation to the top of the file to make it work.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
2012-08-10 19:36:29 +01:00
Enchiridion
50cde90324
Added support for dual Z axis stepper drivers
2012-08-04 00:32:26 -06:00
kobaan
603a5e25b3
Updated german translations in language.h and eliminated a few double lines.
2012-07-16 14:26:28 +03:00
Chris Palmer
538189cc19
Fixed soft limits when the origin is in the middle.
...
HOME_POS is now always where the endstop is and can be outside the limits.
The limits are now defined by MIN_POS and MAX_POS rather than HOME_POS and MAX_LENGTH.
The Z is axis now homed first if direction is away from the bed.
Saguinololu limit pins change from MIN to MAX according to the homing direction.
2012-07-14 22:24:26 +02:00
ErikZalm
686011a548
Fixed typo
2012-07-14 17:25:35 +03:00
Erik van der Zalm
cd57bf305b
Merge git://github.com/daid/Marlin into Marlin_v1
...
Added invert step pins to corexy code
2012-07-14 15:07:14 +02:00
Erik van der Zalm
ea2c19f978
Added CoreXY support (Thanks Ilan Moyer)
2012-07-14 14:21:53 +02:00
Erik van der Zalm
aa65fe22ed
decoupled axes sucessfully at least on pure x or y jog
2012-07-14 13:43:19 +02:00
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