73d41c10b9
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into jeff
...
Conflicts:
Marlin/language.h
Marlin/thermistortables.h
12 years ago
63da4dc59a
Merge pull request #398 from DanieleSdei/Marlin_v1
...
Marlin v1, alignment of the Italian language
12 years ago
82e28851bd
Italian language: SD-Card change and SD-Card init
12 years ago
aed5965ad8
Italian language: remove space and some fix
12 years ago
d360846dd4
Update Marlin/language.h
...
Update Polish language #define MSG_RESUMING "Wznawiam drukowanie"
12 years ago
2f60e324dc
Fixed #394
12 years ago
5e2abfcdcd
Merge pull request #391 from STB3/Marlin_with_SD-Card_Change_Menu
...
Add SD-Card change and SD-Card init. for electronics equipped with LCD Display
12 years ago
a0d4e8e78e
Add Messages for SD Card init. & change
12 years ago
bbf0cc1379
Update Marlin/ultralcd_implementation_hitachi_HD44780.h
...
Fix to a bug that I just introduced - sorry. Forgot about offset of string length.
12 years ago
c8f1fbd9d8
Add SD-Card change and SD-Card init.
...
Add SD-Card change and SD-Card init. for reprap electronics without
SD-Chard change detect pin.
12 years ago
71ddb8dc60
Update Marlin/ultralcd_implementation_hitachi_HD44780.h
...
Use all available characters in narrow LCDs < 20 characters.
12 years ago
d2c547c407
Update Marlin/ultralcd_implementation_hitachi_HD44780.h
...
Fix to a minor bug with hardcoded LCD_WIDTH that draws edited values outside of the 16 characters width LCDs.
12 years ago
70871715e4
Added support for extruder offset handling
...
The extruder offset can be specified in the configuration
file or adjusted on the fly using the "M218 T# X# Y#" command.
The EEPROM support is not yet merged in.
The "T#" command can take option "F#" that specifies the feedrate
at which the printing head should be re-positioned. If not
specified the re-positioning move is not preformed immediately,
but the coordinates are adjusted for the printer to properly
position the head when the next movement happens.
12 years ago
49b2ddc8c1
Cleaned up non-standard characters
12 years ago
f8876a7958
Merge pull request #376 from kintel/skip_longfilenames
...
Also skip .files and _files with long filenames. I think its better than before. If somebody dislikes it, or wants additional configuration, it can be done in a future step. Thanks, Marius, and nice to have you helping!
12 years ago
18fcc367d2
Merge pull request #371 from Banjer/Melzi_LED_PIN
...
Chenged LED_PIN for Melzi boards, added comment about broken versions of...
12 years ago
19ce90fe02
Added comment about M42 usage (clean)
12 years ago
00fed0a703
Revert "Extended comment explaining M42 usage"
...
This reverts commit 01541ee64c
12 years ago
e06d820909
Also skip .files and _files with long filenames
12 years ago
01541ee64c
Extended comment explaining M42 usage
12 years ago
f24f02e212
compile fix: quickStop() needs stepper.h
12 years ago
12c41423ad
Fixed typo in comment
12 years ago
0995eaa492
Chenged LED_PIN for Melzi boards, added comment about broken versions of the Sanguino libraries
12 years ago
1d06b10962
Added a feature to have filament change by gcode or display trigger.
...
[default off for now]
syntax: M600 X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]
if enabled, after a M600, the printer will retract by E, lift by Z, move to XY, retract even more filament.
Oh, and it will display "remove filament" and beep like crazy.
You are then supposed to insert a new filament (other color, e.g.) and click the display to continue.
After having the nozzle cleaned manually, aided by the disabled e-steppers.
After clicking, the printer will then go back the whole shebang, and continue printing with a fancy new color.
12 years ago
408b349a84
Fixed #368 . Commented out the wrong pin definition, but explained why it is there.
12 years ago
9ecb267b63
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
3cf59f6f9a
add RepRapPro Huxley thermistor tables
12 years ago
c1730e2b08
Merge pull request #363 from yuroller/sanguino_panelolu
...
Panelolu pin assignment for sanguinololu
12 years ago
86358dd6cd
Panelolu pin assignment for sanguinololu from http://reprap.org/wiki/Panelolu
12 years ago
0f3f5d083d
Minor cleanup of the new FAN_KICKSTART code. #334
12 years ago
6ec56fa923
Merge pull request #334 from KevinOConnor/FanKick
...
Add feature to briefly run the cooling fan at full speed when it first starts.
12 years ago
965baf2683
Merge pull request #362 from daid/Marlin_v1
...
Finnish language
12 years ago
3d91bd486c
Add "kick fan" feature - briefly run fan at full speed on start.
...
Add a feature to run the cooling fan at full speed for a small period
(default 100ms) when first starting the fan. Some fans wont reliably
start spinning at low power, and many fans have issue with the PWM at
low power. However, once the fan starts spinning it can reliably be
set to a wide range of PWM values.
12 years ago
3f2f94ef28
Be consistent in setting of the fan PWM.
...
Always set the FAN PWM value in check_axes_activity() and always use
the value of the active move if a move is active.
12 years ago
7f30039d2a
+ Finnish translation
12 years ago
14e1d495ef
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
bbe7d3d0fe
Fixed #312
12 years ago
7ce509b9a7
Merge pull request #361 from yuroller/MakefileSanguino
...
Makefile sanguino
12 years ago
9c34c4f05b
fixes for ramps compilation using installed arduino ide
12 years ago
442ade15a6
Move Gen6 stuff into a proper location.
12 years ago
5fd4582cc8
Merge pull request #242 from Drakelive/Marlin_v1
...
Fixes issues # 216 and # 135 for Gen6 and Gen6 Deluxe board
12 years ago
8b88e3b386
Fixed #345 , Fixed #267 .
12 years ago
27843388c6
Merge pull request #360 from njprossi/Marlin_v1
...
Power signal control definitions for other power supplies
12 years ago
921273baa0
Added optional feature to stop printing when an endstop is hit. Made the Z display on the LCD in 3.2 format instead of 3.1. Added LCD message when and endstop is hit.
12 years ago
7d20ec706e
Added libraries from Arduino 1.0.3 for sanguino build
12 years ago
437eb3bafc
Initialize PS_ON at startup
12 years ago
f3c1fc70a9
Power signal control definitions for ATX and others
12 years ago
dad7691df9
makefile for sanguino standalone compilation
12 years ago
6752cb2d9c
PID now per extruder. Fixed typo
12 years ago
0ac452e252
Disable is now multi extruder compatible. M84 got a T option.
12 years ago
9e7b5056a0
{X,Y,Z}_{MIN,MAX}_POS are actually in Gcode coordinates.
12 years ago
5f82f03ff3
Add italian MSG_RESUMING.
12 years ago
5e3873c8db
Add german MSG_RESUMING.
12 years ago
01aac2a142
Small changes on the LCD panel, let the speed control work better, line up the parameter edit the same as the menu, remove some unused defines, and remove the Z from the 10mm move menu.
12 years ago
b69cb9fbd9
Change the end of SD cart print message from minutes/seconds to hours/minutes.
12 years ago
30254e3388
Merge pull request #350 from jcrocholl/Marlin_v1
...
Automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR.
12 years ago
38ee395ac7
Replace the 1ms delay for 2 nops to get a 100ns delay. #259
12 years ago
5df5e4c4a2
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
a95dcd74e7
Fix some of the duplicated PSTRs, saving 500bytes of flash with LCD on.
12 years ago
8caf5d252d
Remove bogus blank line.
12 years ago
1c2ecddae4
Fix typo (# missing before define).
12 years ago
6dfb8a2187
Fix home_all_axis to make QUICK_HOME work with Repetier-Host which sends G28 X0 Y0 Z0 instead of G28. Thanks to Matt Schoenholz for reporting this issue.
12 years ago
3b2e5027e5
Merged updates from Marlin_v1.
12 years ago
b39f5d614a
For boards with only one endstop per axis, automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR.
12 years ago
ab09fa4bbf
fixed pwm generation at pin D12 and D13 when one of them is used as FAN_PIN on Sanguino, added soft pwm entry for FAN_PIN in temperature.cpp
12 years ago
5697451c72
fix lcd class
12 years ago
58e806f3fa
Fix the russial translation.
12 years ago
50a5ce1dc4
deduplicate messages
12 years ago
6123a00e64
Fix the german translation.
12 years ago
7c21716886
Fixed #341
12 years ago
ae1bc83350
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
596a7e1904
Fix compiling for Arduin < 1.0.0
12 years ago
b264317fa0
Reverted the patch by KevinOConnor, as it crashes some versions of avr-gcc and caused linking issues.
12 years ago
673577a31b
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
23022f1a82
Updates to Makefile to compile for Teensy.
12 years ago
96e9db8919
Merge pull request #339 from KevinOConnor/CompilerFlags
...
Add additional optimization flags to Makefile
12 years ago
08356361ac
Fixing a problem with heated beds not working without PID and BED_LIMIT_SWITCHING
12 years ago
047d037f8c
#ifdef fix for #326
12 years ago
0908458381
Use gcc "-fwhole-program" optimization.
...
Use "whole program" and "link time optimization" features of gcc. The
whole-program optimization enables the compiler to evaluate the entire
firmware for optimization instead of just one code file at a time.
This leads to better overall optimizations.
12 years ago
16fbb455ef
Use linker "--relax" option.
...
The "relax" option enables the linker to convert certain "call"
instructions to the smaller "rcall" instruction. This reduces the
size of the resulting binary.
12 years ago
f30b46b2a8
One more fix for #338 , I really should get a heated bed to test with.
12 years ago
65c3f1ffcd
Most likely fixing #338
12 years ago
7577717b59
Fixed #336
12 years ago
1a8f54cea1
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
12 years ago
6731c094ee
Fix compiling with just an 16x2 LCD and no buttons.
12 years ago
b99a928a80
Fix the M117 (display message on LCD) when used over USB with checksums.
12 years ago
55ba90ac19
Add PID functional range setting. With high powered heaters the current functional range of 10 degrees causes high overshoots as the PID needs to kick in before the temperature hits 10 degrees below target.
12 years ago
5ff5cee8ce
Fix the sensitive pin definitions, there where analogue numbers in the digital pin list. Also made M42 without a P function on the LED_PIN (which was otherwise a useless pin definition)
12 years ago
8b58edc70e
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
d0319d45af
Merge pull request #335 from jcrocholl/Marlin_v1
...
Fix endstop pins for Printrboard
12 years ago
ca409e5531
Fix X/Y/Z_MIN_PIN for Printrboard.
12 years ago
1f45cb0a51
Fix typo in MANUAL_HOME_POSITION (plural S missing) and improve comments.
12 years ago
931a0052ea
Fix typo in MANUAL_HOME_POSITION (plural S missing) and reduce BLOCK_BUFFER_SIZE because 64 wasn't working for some reason.
12 years ago
46ec4b648c
Added some missing Mxxx comments to M commands. Fixed the unsetting of the timer dividers for the fast PWM fan.
12 years ago
724f5aa36b
Update on makefile for moved Arduino addons.
12 years ago
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.
12 years ago
3fb07d9b8d
Add MINTEMP/MAXTEMP error to LCD, and fix temperature bug with more then 1 extruder.
12 years ago
8e2519e88b
Add realtime delta geometry in Marlin_main.cpp.
12 years ago
cec7283b21
Enable QUICK_HOME for deltabot.
12 years ago
2292441f0c
Use X/Y/Z_MAX_PIN instead of X/Y/Z_MIN_PIN for top endstops on deltabot.
12 years ago
c430906d3b
Deltabot settings and configuration adjustments.
12 years ago
82c8724b33
Fix compile with PID_DEBUG
12 years ago
9b160972a1
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
e036750bdf
Use the disable macros on initialization. Which fixes a bug when there is no pin defined for stepper enabled (motherboard 4)
12 years ago
fcd9de72ef
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
32d4373e0f
Add printrboard and brainwave to Makefile.
12 years ago
b3ddbcee2a
Merge pull request #329 from jcrocholl/Marlin_v1
...
Add Printrboard and Brainwave to pins.h and fastio.h
12 years ago
29435dfb4b
Proper avr for Sanguino in Makefile.
12 years ago
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.
12 years ago
ca7acbe6d9
Allow specification of which arduino hardware subvariant in Makefile.
12 years ago
33247733e0
Teensylu and Printrboard use different analog pins for thermistors.
12 years ago
621c24a10f
AT90USB is only defined after pins.h is included.
12 years ago
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.
12 years ago
4d351b4846
Improved formatting and comments for consistency.
12 years ago
a30007caa4
If fastio.h is not messed up then Teensylu and Printrboard are actually using the same pins.
12 years ago
6aa87a7b67
Use the same fastio.h definition for AT90USB1286/7 and AT90USB646/7.
12 years ago
b1c38d4c82
Avoid compiler warnings (redefined MOTHERBOARD) in Arduino 1.0 and greater.
12 years ago
42e21bb06e
Add support for Printrboard (from https://github.com/lincomatic/Marlin ) and Brainwave (from https://github.com/metrix/Sprinter ).
12 years ago
ce4b5bbeaa
Add AT90USB646 support from Sprinter to fastio.h.
12 years ago
f413aa33b3
Small makefile change, posibility to add defines on the commandline, and fix compiling with watchdog enabled when using the Makefile.
12 years ago
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.
12 years ago
1f27870d41
Fix compiling the watchdog error message when the manual reset watchdog is used.
12 years ago
c5d4225804
Mistake there, not sure why I did that. My bad.
12 years ago
529748894c
Minor changes in the temperature code for some cleanup.
12 years ago
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.
12 years ago
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.
12 years ago
16078e47d4
Fixed #325
12 years ago
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.
12 years ago
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.
12 years ago
6c51fe5039
Fix the bug where the SD percentage calculation is wrong when the file is larger then 42MB
12 years ago
57429cb9fe
Fix for keypad
12 years ago
97fa2a9c30
Few simple fixes that save RAM, as static strings are stored in RAM by default.
12 years ago
c94ca24adc
Fixed #317
12 years ago
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.
12 years ago
dbbf050005
More rambo fixes
12 years ago
f934d0ef5b
Merge remote-tracking branch 'tonokip/Marlin_v1' into Marlin_v1
...
Conflicts:
Marlin/Configuration.h
12 years ago
e48dfcc2b3
Tmp copy before merge
12 years ago
b98fb17fe9
Small FREQUENCY_LIMIT changes
12 years ago
bce67ec2c9
Merge pull request #312 from gege2b/Marlin_v1
...
Added french translation
12 years ago
9b1d2483a0
I hope last changes to french translation
12 years ago
b1adc567da
Correction to french translation (non-ASCII chars only)
12 years ago
0807d82af0
Correction to french translation (plain text only)
12 years ago
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.
12 years ago
bb119739b0
Added french translation
12 years ago
df8dd5ac21
Merge pull request #306 from nothinman/Marlin_v1
...
Added automatic build numbering.
12 years ago
2b7b1e52b1
allow marlin internal 0°C represenation
12 years ago
2f771b3979
Added automatic build numbering.
12 years ago
9bebe9b631
Merge pull request #302 from nothinman/Marlin_v1
...
Added Polish translation. Cosmetic changes to English.
12 years ago
a2032afa3a
Fixed #303
12 years ago
6a55ca8370
Added Polish translation. Cosmetic changes to English.
12 years ago
8f20562f49
Fix some of the crowded code style. And fixed the conditional. #300
12 years ago
43018a48c4
Fix for a few -Wextra warnings.
12 years ago
72586eb30a
Solved few warnings.
12 years ago
7a02ba361c
Header multiple include protection should match the filename, not just _ARDUINO_H, which is almost bound to go wrong some day.
12 years ago
f4a89ec776
SDCARDINSERTED is always defined, and thus we do not need the #ifdefs.
12 years ago
57834776ad
Made the 2nd speed lookup table condition more explicit.
12 years ago
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
12 years ago
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.
12 years ago
789be03b4f
Update on makefile, should make it easier to compile for different boards without changing the makefile. (Still missing Arduino 1.x.x support).
12 years ago
40ce057a3e
Fixing issue #297
12 years ago
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!
12 years ago
ffc69537aa
Update on some comments, make the MOTHERBOARD list complete again.
12 years ago
71efcfc648
Most likely fixing issue #295 .
12 years ago
04be9d6001
God damn. Sorry, my mistake, forgot to add this file.
12 years ago
c17da4b707
Add ConfigurationStore to the Makefile.
12 years ago
ccd9fd0dc3
Merge pull request #292 from jothan/lcdfix
...
Lcd fixes
12 years ago
46b9988e26
Search and replace failure.
12 years ago
0f73afb0b0
Avoid defining overriding definitions for the RepRapDiscount Smart
...
Controller. Remove common definitions. Harmonize declaration order.
12 years ago
36b452c7ac
Remove abbrs.
12 years ago
332344bd43
Update Marlin/language.h
...
Included Portuguese language
12 years ago
e6c1cadea0
Set the watchdog to a 4 second timeout, as with 1 second it can timeout during SD card init.
12 years ago
faea7d72b8
Merge pull request #290 from buildrob/Marlin_v1
...
Clean up special serial port cases
12 years ago
12a4d60e18
Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template.
12 years ago
9606f4d04f
Include Marlin_main.cpp in source files.
12 years ago
3cbaad9288
RepRapDiscount Smart Controller pin definitions.
12 years ago
99692dc99e
Clean up special serial port cases
...
Assume SERIAL_PORT 0 if not defined. Collapse un-numbered register
special case. Clarify comments.
12 years ago
5a998558a9
Update suggested by Robert F-C. #289
12 years ago
f6ff0ab767
signed/unsigned fixes.
12 years ago
5d471e0f34
Also reset the PID values to defaults. Fixes #281
12 years ago
d3ebc34958
Hopefully also support chips with a single UART in MarlinSerial now.
12 years ago
b6ff45254e
Better explain the watchdog "problem" and rename the config define so it explains that the feature belongs to the watchdog.
12 years ago
7e348fcb5f
By mistake enabled the watchdog by default. This should be off by default.
12 years ago
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.
12 years ago
539f3b3fe4
Merge pull request #284 from brackendawson/Marlin_v1
...
Use the right pins for Gen7 1.4
12 years ago
65c9a0728f
Set default serial port back to 0.
12 years ago
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.
12 years ago
f5631a89e8
Add dummy Emergancy Pin to Gen7 1.4
...
Change required after pulling from ErikZalm.
12 years ago
a4f9e1ebf2
Merge git://github.com/ErikZalm/Marlin into Marlin_v1
12 years ago
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.
12 years ago
a7e40b2903
Merge pull request #276 from setar/Marlin_v1
...
Fix num of digits on LCD for E and Z axis.
12 years ago
6ed02c86be
Fixed wrong code (will not even compile when EXTRUDERS>2)
12 years ago
2a67363e27
Fix ‘prog_uchar’ definition in LiquidCrystalRus.cpp
12 years ago
205304ddee
Merge git://github.com/ErikZalm/Marlin into Marlin_v1
12 years ago
58bca87c72
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
12 years ago
febeb43197
Revert "fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '"
...
This reverts commit cb02c2f9d8
12 years ago
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
12 years ago
70f57a6844
Merge pull request #273 from setar/Marlin_v1
...
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
12 years ago
ff14199e58
Merge pull request #270 from jothan/Marlin_v1
...
Create an explicit rule for building applet/Marlin.cpp.
12 years ago
695938ba3f
Italian language support
12 years ago
cb02c2f9d8
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
12 years ago
e4a5e333ef
Generalize.
12 years ago
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.
12 years ago
9f089756b7
Merge pull request #265 from setar/Marlin_v1
...
Added Russian translation
12 years ago
326423719f
Add support for Megatronics
12 years ago
d07b6e93d5
Add support for Megatronics
12 years ago
efcc28d347
Fix check for include LiquidCrystalRus.h
12 years ago
cfc193cdac
Enables support the Cyrillic alphabet for LCD
12 years ago
24bcc9647d
Added Russian translation
12 years ago
bf7e453d02
Unwanted artifacts from unclean merge of bed-pid tree
12 years ago
36a746d7d5
Merge pull request #244 from markfinn/pidbed
...
PID for heated bed
12 years ago
df09e2adce
Spanish updated
12 years ago
ddf6603d81
Spanish language updated. Bug fixes on dialogs.
12 years ago
4bf8b1aeee
fesfas
12 years ago
be1e099f1b
Union whit Erick version
12 years ago
7afd202b89
New dialogs translated to spanish. Bug fixes.
...
Dialogs from M119 translated, and "Set Preheat" dialogs adapted to the
screen size.
12 years ago
ebc4601185
Some new dialogs translated to Spanish
12 years ago
c8ea9b0e58
Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin
12 years ago
ca7ca4572e
primo commit
12 years ago
8016f058bc
fix max endstop pins
12 years ago
d197f8504b
clean up and changes from testing
12 years ago
eb06a886c4
missed
12 years ago
04631d2250
cleanup for pull
12 years ago
0a5ad3ab85
move comment to correct place
12 years ago
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
12 years ago
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.
12 years ago
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.
12 years ago
ba898faa7d
Merge pull request #249 from gwelchc/patch-2
...
Slight modification for byte savings
12 years ago
0152ee71a5
Merge pull request #248 from gwelchc/patch-1
...
Binary representation for characters in ultraldc.pde
12 years ago
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.
12 years ago
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.
12 years ago
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
12 years ago
9698f4ea64
bed pid
...
Conflicts:
Marlin/Configuration.h
12 years ago
e5c39b7c2a
commit
12 years ago
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)
12 years ago
bf2071871c
Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin
12 years ago
fc32e20881
first commit
12 years ago
abf0693e8e
Added KILL_PIN -1 to gen7 boards
12 years ago
47319cf64e
Fixed typo in SF arc fix code.
12 years ago
e358a2d7af
Added fix for SF Arc Point fillet procedure
12 years ago
044a64a1fb
Merge pull request #225 from Justblair/Marlin_v1
...
Added PDF file containing Menu Tree for documentation purposes.
12 years ago
d728e35658
Update Marlin/pins.h
12 years ago
1c1fddc7ac
Added support for the Rambo reprap electronics board. Added Mcodes to set
...
motor current and microstepping pins.
12 years ago
dcd3e8a211
Tidy up
12 years ago
ddd9d0cfd4
Added PDF file containing Menu Tree for documentation purposes. Source xlsx document included.
12 years ago
0e58ef6805
Some dialogs are corrected
12 years ago
0e89022cc3
Correct temptable_55 name.
12 years ago
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.
12 years ago
6cd150842f
Update Marlin/language.h
...
Some dialogs corrected and Default language set to 1
12 years ago
299c18596f
Update Marlin/language.h
...
Some dialogs are corrected
12 years ago
b86336c3f5
Merge pull request #221 from daid/Marlin_v1
...
Long filename support for LCD display
12 years ago
b69e75c89a
Added long filename support.
12 years ago
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)
12 years ago
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.
12 years ago
87ff61a8a6
Fix for #201
12 years ago
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.
12 years ago
31873ec707
changed int to long to overcome overflow of number display
...
- related bug reports: Issue #201 , Issue #213
12 years ago
de0448343f
added KILL_PIN support / cleaned up manage_inactivity function definition
12 years ago
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
12 years ago
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
12 years ago
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.
12 years ago
d38b96fff1
Update Marlin/language.h
12 years ago
9f7f7354f5
Set default language 1
12 years ago
aee475aa55
Update Marlin/language.h
...
Spanish language included. It features the LCD screen messages and a small part of the Serial messages.
12 years ago
9083966c22
Do not use feedrate multiiply on Z and E only moves.
12 years ago
5406c533db
Disable FAST_PWM by default. On some systems it does not work ok.
12 years ago
f92dc91c3d
Enable M503 also when eeprom is disabled
12 years ago
35a1dd081f
no message
12 years ago
5131ab19ca
Fixed Retract in LCD Menu
12 years ago
96f4f90cb3
Added pause and retract lcd menu items
12 years ago
e10355500d
Updated Language.h with pause, resume, and retract
12 years ago
a97c006bbf
Merge pull request #195 from kobaan/Marlin_v1
...
Updated german translations in language.h
12 years ago
f062794a0d
Merge pull request #208 from Enchiridion/Marlin_v1
...
Added support for dual Z axis stepper drivers
12 years ago
57468d3c21
Merge pull request #210 from Dabble63/Marlin_v1
...
Add Duty Cycling to the Heater Bed
12 years ago
6b45e9f167
Add Duty Cycling to the Heater Bed
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
50cde90324
Added support for dual Z axis stepper drivers
12 years ago
603a5e25b3
Updated german translations in language.h and eliminated a few double lines.
13 years ago
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.
13 years ago
686011a548
Fixed typo
13 years ago
cd57bf305b
Merge git://github.com/daid/Marlin into Marlin_v1
...
Added invert step pins to corexy code
13 years ago
ea2c19f978
Added CoreXY support (Thanks Ilan Moyer)
13 years ago
aa65fe22ed
decoupled axes sucessfully at least on pure x or y jog
13 years ago
12de8fff81
Support step motor controllers with active low step pins.
13 years ago
b67dacdc8f
Fixed AD595 define
13 years ago
d3002ef741
corrected retract
13 years ago
0c123950e9
__ header file replace
13 years ago
bf077125b9
added firmware retract. disabled by default
13 years ago
0e5e249ab5
added individual pullup setting option to have finer control in case there is a special z-min sensor, for example
13 years ago
6b14f95b3e
Merge pull request #170 from linagee/Marlin_v1
...
Marlin v1
13 years ago
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.
13 years ago
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.
13 years ago
9e1021efbe
Fixed SL bug.
13 years ago
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)
13 years ago
fbd282b3ba
Update Marlin/Configuration.h
13 years ago
2e8c5049c5
Update Marlin/thermistortables.h
13 years ago
2d0d8e5272
Small correction.
13 years ago
4d7fe7115f
Changed M401 to M0/M1 as suggested, so they match normal CNC stop commands.
13 years ago
9e9db65c3f
Update Marlin/thermistortables.h
13 years ago
bd966ef389
Update Marlin/thermistortables.h
13 years ago
775da3f103
Added top ratings and extended to ADC=1 for table 3 and 5.
13 years ago
96a4baa0be
Update Marlin/thermistortables.h
13 years ago
2aa9f7b131
Update Marlin/thermistortables.h
13 years ago
c4490f5f3d
Update Marlin/Configuration.h
13 years ago
dd9144994e
Tested May 19 - It works! Verified with separate thermocouple TM-902C also.
13 years ago
4c37d0d9f1
Extended range above 250C. (Operating range states up to 300C)
13 years ago
b59724e42b
Add strigification for extruder amount in M115 report.
13 years ago
16413bb8f2
Last M401 update, refresh the LCD during an M401 wait.
13 years ago
b3941fce5c
Update after testing
13 years ago
d494688565
Do not initialize in the header file.
13 years ago
516ec90242
Add M401 - Wait for user on LCD button press
13 years ago
7244aa7eb7
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
de2ca3b2e8
Grammar correction.
13 years ago
c2fc466e1b
Update Marlin/Configuration.h
13 years ago
241f5a4c0e
Update Marlin/thermistortables.h
13 years ago
9f9f498491
Update Marlin/Configuration.h
13 years ago
e31bef31ad
Limit PID autotune PWM to PID_MAX
13 years ago
b2a9ccdb97
Merge pull request #159 from MaikStohn/Marlin_v1
...
Marlin v1 - BUG FIXES / CORRECTIONS
13 years ago
d459fb41b7
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
13 years ago
804e0d6117
Merge pull request #164 from guanix/Marlin_v1
...
Melzi support
13 years ago
ba96059203
add additional dropsegments test
13 years ago
fbd91ab0b5
Fixes #153 for bad call to abs()
13 years ago
b51c06e2b3
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
159ae90874
bug fix for scrolling of main menu when using SMALL_DISPLAY (2 lines only)
13 years ago
e48f5aa6a7
fixed typo
13 years ago
1efe9ab497
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
13 years ago
602c8ee02b
Melzi support
13 years ago
279d00da9f
Fixed #if for Ultimaker.
13 years ago
451f9cc6d1
Residual in the comments: there are no more mm/minutes but only mm/sec in the planner buffer.
13 years ago
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.
13 years ago
d88205d89d
Suggestion to improve (TODO), no actual code changed
13 years ago
5aa80e6c05
Made language.h more flexible. Automatically do the right defines based on MOTHERBOARD == 7 ? "Ultimaker" : "Mendel"
13 years ago
b657a18449
Revert "magic PROGMEM defines to avoid hundreds of wrong GCC warnings"
...
This reverts commit 3682d9bd5b
13 years ago
d188ae4c9d
added missing declaration of buttons_init()
...
This is required when moving the buttons_init() function to the
lcd_init() function
13 years ago
3682d9bd5b
magic PROGMEM defines to avoid hundreds of wrong GCC warnings
13 years ago
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.
13 years ago
bd1ad7c76a
explicit includes to make it compile with AVRStudio/Eclipse
13 years ago
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.
13 years ago
789ba02d43
fixed typo in comment
13 years ago
1874cb71a6
Added option to increase the FAN PWM frequency.
13 years ago
6a5a34e0ff
Small cleanup
13 years ago
e3821bd86f
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
13 years ago
02af69911e
Added temperature window to M109. This is needed for systems with no overshoot PID.
13 years ago
e203b8c754
Merge pull request #154 from daid/Marlin_v1
...
Added 2nd extruder temperature LCD readout and setting.
13 years ago
362ddc4efc
Merge pull request #155 from Atntias/patch-1
...
adding M120 and 121 for turning on and off the endstops only for homing
13 years ago
c27081aa4a
Fix to allow M120/M121
13 years ago
e11e072eca
adding M120 and 121 for turning on and off the endstops only for homing function
13 years ago
8e68c6cf89
Show proper temperature for extruder 2
13 years ago
8503b78876
Added support for 2nd extruder temperature to UltraLCD
13 years ago
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
13 years ago
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
13 years ago
464b755918
added support for the UltiController
13 years ago
44fd8d46d2
fixed quickhome
13 years ago
33bb044d7c
fixed catsting to (int)e in serial error messages.
...
see https://github.com/ErikZalm/Marlin/issues/148
13 years ago
c2557abc03
Merge pull request #138 from triffid/fix-makefile
...
make should rebuild if configuration or Makefile is changed
13 years ago
67cf105bc6
Fixed AUTOTEMP (M109 S215 B260 F1 starts autotemp)
...
Changed SLOWDOWN. IF this does not work ok OLD_SLOWDOWN is the old algo.
13 years ago
8aee9d51b6
Disabled disable_heater in PID_autotune.
13 years ago
414408b2d0
Fix for wrong systax in #ifdef.
13 years ago
77d503fa13
Fix Makefile
13 years ago
cf7c8c458f
Fixed MAX6675
13 years ago
03b0850e63
This breaks temperature readout for pronterface!
13 years ago
ad8bc71d3e
- Fixed a typo
13 years ago
46feae79c6
Fixed typo in arc
13 years ago
4ca2f336f0
Changed default MINIMUM_PLANNER_SPEED -> 0.05
...
Fixed small bug in arcs
M105 prints now actual_temp/target_temp
13 years ago
ae0bf8068b
Fixed arc offset.
13 years ago
0c1b863755
Ignore ":" in comments.
13 years ago
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
13 years ago
8b785f75a6
Merge pull request #123 from buserror-uk/for-upstream
...
For upstream
13 years ago
520f1a54a8
Fix compilation error when PIDTEMP is undefined and ULTIPANEL is defined.
13 years ago
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>
13 years ago
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>
13 years ago
0183e6332a
made prepare->autostart independent of current folder.
13 years ago
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
13 years ago
b985e4a134
Fixed compile errors in ultralcd when no ultra_lcd is selected.
13 years ago
2e749d60c3
Added DISABLE_MAX_ENDSTOPS
13 years ago
33f5697888
PPID tune exports more constants.
13 years ago
b44055cc51
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
13 years ago
f5eae52098
Added more manage_inactivity checks
13 years ago
19a47dae4a
Merge pull request #99 from Justblair/master
...
Better pin configuration for rotary encoder in RAMPS boards
13 years ago
910f4e77a2
Added 20MHz support.
13 years ago
7cefad3744
Merge pull request #106 from bgamari/Marlin_v1
...
Make F_CPU dependence of stepper.cpp more explicit
13 years ago
87ff2f8867
Added CONTROLLERFAN. (Controlling a fan to cool down the steppper drivers)
13 years ago
387fe51a56
Do not disable steppers when there are moves in the queue.
13 years ago
421264e58a
Fixed typo
13 years ago
15ad923310
Removed !!!. Stupid arduino bootloader can't handle this.
13 years ago
61e09e6be2
Added FAN_PIN -1 checks
13 years ago
87c4e06c24
Corrected active_extruder when autotemp is used.
13 years ago
7b1e295f34
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
13 years ago
c077316b2b
Added PID autotune. (experimental)
...
M303 Starts autotune. Wait till the Kp Ki and Kd constants are printed.
Put these values in Configuration.h
13 years ago
49b228c4b3
Add instructions to regenerate speed_lookuptable when changing F_CPU
13 years ago
96509494f0
stepper: Clarify comment on timer-counter configuration
13 years ago
6d7e6a11fc
Add create_speed_lookup
13 years ago
ce07c9186d
While Waiting for hotbed to warm up via M190, LCD Display and Click Encoder input freeze until target temperature is reached.
13 years ago
116dc86b8a
Fixed type in e-jerk
13 years ago
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.
13 years ago
e056bf8081
Added E-Jerk
13 years ago
4deeffbc88
Added missing defines to the german section.
...
Translation still needed.
13 years ago
632528aa95
merging with SCUBA82
13 years ago
aac7aa3bf0
Queued fan control. Issue #90
13 years ago
fde51084f3
set SD file delete to M30; switch printime output to M31
13 years ago
21e2bae063
Changed (corrected?) SD_card comment handling.
13 years ago
e509bbf636
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
13 years ago
072011a3ef
Added current_block = NULL to quickStop()
13 years ago
2422a857a1
Merge pull request #96 from haxar/Marlin_v1
...
make analog2tempBed return a precise celsius reading for BED_USES_THERMISTOR, ...
13 years ago
f598077af3
Removed vc files
13 years ago
cb0c84e075
Merge remote-tracking branch 'justblair/master' into Marlin_v1
13 years ago
1d5809d458
Merge pull request #88 from daid/Marlin_v1
...
Made plan_buffer_line arguments const...
13 years ago
ed951b1977
Fixed RAMPS 1.2 support (Found and fixed by rrhb)
13 years ago
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.
13 years ago
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)
13 years ago
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.
13 years ago
79a466ca26
make analog2tempBed return a precise celsius reading for BED_USES_THERMISTOR, complementing changes to analog2temp in d15f01e
13 years ago
5f3a422e68
added M31 - delete file from sd card
13 years ago
fa2e3a40e9
fixed LCD manual z axis move Feedrate to 70 (was 1700)
13 years ago
a92b3afe64
added german translation;Menue should be in english.. sounds better
13 years ago
9fa586bbed
fixed languages; Preheat_PLA and Preheat_ABS was not defined for non
...
english
13 years ago
00d33e6b82
Typo fix
13 years ago
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.
13 years ago
3d83109028
Fixed general 16x2 LCD build without SD support.
13 years ago
cb02914687
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
13 years ago
10bf2bb8e1
-
13 years ago
d47b666630
Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
88d289caa1
Made plan_buffer_line arguments const, which optimizes better and fixes the RUNOUT_PREVENTION feature.
13 years ago
b4833d55c2
Fixed HOME_POS in combination with G28 X0 or G28 Y0
13 years ago
c6f2ec3c82
remove stop_heating_wait
13 years ago
b48d67ce10
Fixed homing
13 years ago
071eec7aa7
Merge pull request #81 from phord/09469add5560ca8a676c42e4bcd499868c33f0dd
...
Clean up and add some trace info
13 years ago
1ebe7d1ab6
Merge pull request #83 from phord/tempfix
...
Add explicit #define for bogus temp override
13 years ago
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.
13 years ago
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.
13 years ago
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).
13 years ago
09469add55
Add board reset reporting (from Repetier-Firmware)
13 years ago
f3101e96d9
Add suitable .gitignore to avoid build noise
13 years ago
245dca4bee
Makefile: generic pde=>cpp rule
...
This adds flexibility to the makefile by allowing different pde
targets to be specified for different needs.
13 years ago
97d42ca2b2
SDSUPPORT default disabled
13 years ago
7b14953c99
Fix build on Sanguino based boards with ATmega1284P
13 years ago
286d5003fa
Fixed compiler warning for Sanguino compile
13 years ago
66d50562b6
Merge pull request #76 from iXce/Marlin_v1
...
Fix Makefile
13 years ago
27f595a444
Changed version => RC2
13 years ago
018c567abf
Moved SLOWDOWN function. (jetty840)
...
Included AD595 calibration options. (daid)
13 years ago
4fbda5c3f5
Merge remote-tracking branch 'daid/Marlin_v1' into Test
13 years ago
ce714fe306
Fixes in pins.h
13 years ago
35e57bf149
Added gen6 deluxe.
13 years ago
Denis Bakin