Dirk Eichel
6c66cae694
GLCD init screen cosmetics
12 years ago
Dirk Eichel
f3e0e5184d
Add include selector between char. LCD and GLCD
12 years ago
Dirk Eichel
5d3862f9d1
Modified u8glib logo on welcome screen
12 years ago
Dirk Eichel
0b320f75e9
Removed debug code, add some comments
12 years ago
Dirk Eichel
5f1cd70122
Add code to lcd_update() for GLCD
...
This code selects between the routines for the GLCD or the char.
display.
12 years ago
Dirk Eichel
a49c09a776
Add variable for animated fan, add float conversion w/o sign
...
A new variable was introduced to allow fan animation on the GLCD.
Add additional float to string conversion routine without sign
character. This is used for the coordinates visualisation on the GLCD.
12 years ago
Dirk Eichel
26d8863111
Add library selection between GLCD and char. LCD
12 years ago
Dirk Eichel
4a141a694f
Marlin code for GLCD display
...
This contains the menues, status screen etc...
12 years ago
Dirk Eichel
83c790a020
Add bitmap graphics for GLCD
...
1. Marlin welcome screen
2. Status screen symbols 3 Extruders, heated bed, animated fan logo 1
3. Status screen symbols 3 Extruders, heated bed, animated fan logo 2
12 years ago
Dirk Eichel
233df9cca0
Add missing LF at the end of the file
12 years ago
Dirk Eichel
bb0de75a92
Removed umwanted HTML code ath the end of the file
...
Sorry for that. This does not lead to compile errors. I removed the
unwanted code to make it clean.
12 years ago
Ryan Turner
7c47e7162d
Adding Maker's Tool Works heated bed thermistor
12 years ago
daid
af78d0cbfa
Merge pull request #1 from illuminarti/Fix_E_Speed
...
Fix step rate bug (especially for retraction)
12 years ago
Dirk Eichel
9a78f321a4
Add pins for Motherboard variant 64
...
These definition contain also the definition for the graphics LCD.
12 years ago
Dirk Eichel
5de25ccd20
Add Motherboard variant 64 - STB V1.1
...
Definition for the graphic LCD are already in it, they will not harm the
configuration as they are only defined constants
12 years ago
daid
d6ce63c49c
Merge pull request #411 from STB3/Marlin_w_STB_Board_support
...
Add STB board support to Marlin (next step towards graphic LCD implementation)
12 years ago
Ketil Froyn
f036be7c4e
Clean up tab/whitespace from last commit
12 years ago
Ketil Froyn
07e11c7cf5
Add command M928 to enable logging to file of received gcode commands
12 years ago
daid
92782f9252
Merge pull request #1 from illuminarti/Fix_E_Speed
...
Fix step rate bug (especially for retraction)
12 years ago
whosawhatsis
6a61a3c0b4
missing comma in last commit
12 years ago
whosawhatsis
f0aee4101a
regenerated thermistor table 7
...
Generated with createTemperatureLookup.py. The old table crapped out at
270C, which was a problem for polycarbonate.
12 years ago
Nicolas Rossi
aba67e2449
No bed config for RAMPS
...
The motherboard 35 is a config without bed with this pins setting :
D8 Extruder
D9 Fan
D10 Controller Fan
12 years ago
Nicolas Rossi
6504e96165
Turn off power supply off-load
...
Disable the high current output and wait a little before to turn off,
because the interrupting capacity of the PSU is unknown.
Could be a function if needed by other.
12 years ago
Nicolas Rossi
86bf911139
Toggle menu for PSU from LCD pannel
...
From the prepare menu, accessible when is not printing, you have the
possibility to turn off the PSU when is on et vice versa.
From the host, you can turn off or turn on the PSU then the menu is
updated accordingly.
From the LCD message, the printer status is reported ready or off
respectively when the PSU is on or off.
12 years ago
Robert F-C
7bad72359c
Support encoder click on PANELOLU2 being read through I2C
...
This change also handles the case where the pause/stop/restart button on
the VIKI is not used. Make LCD I2C buzz sound the same as the normal
buzz (300ms is too long for quick feedback).
12 years ago
Robert F-C
1daf2f3256
Number of extruders is not an advanced configuration - it is a basic property.
12 years ago
Robert F-C
f1263d3f88
Further reduce code by using precompiler logic
12 years ago
Dirk Eichel
140e095c6e
Add pins for Motherboard variant 64
...
These definition contain also the definition for the graphics LCD.
12 years ago
Dirk Eichel
b2c1c64fb1
Add Motherboard variant 64 - STB V1.1
...
Definition for the graphic LCD are already in it, they will not harm the
configuration as they are only defined constants
12 years ago
Dirk Eichel
ceb5ee38af
Replaced corrupted language.h file on local PC with current from ErikZalm/Marlin
12 years ago
Dirk Eichel
8efd4cfd73
fixed merge conflict
12 years ago
Robert F-C
372e12f83f
Implement automatic extruder/cold-end fan control based on temperature
...
This change allows fan outputs to automatically turn on/off when the
associated nozzle temperature of an extruder is above/below a threshold
temperature.
Multiple extruders can be assigned to the same pin in which case the fan
will turn on when any selected extruder is above the threshold.
It also makes the M42 command compatible with the M106/M107 command.
The majority of the logic in this change will be evaluated by the
compiler at build time (i.e, low code space requirements).
12 years ago
Robert F-C
6beb42cdf6
Attempt to address Bernhard's comments
...
Refactor configuration to try to make items clearer (what defines a
panel vs what is user changeable).
12 years ago
Robert F-C
839bef6d5d
Fix Configuration.h file to not define LCDs be default.
...
Also fix compile time check in Marlin.pde
12 years ago
Robert F-C
1292d735ba
Converge all I2C LCD branches (PANELOLU2, VIKI & PCF8575)
...
This includes refactoring the buttons code to remove a large amount of
non-pin dependent duplication from pins.h.
12 years ago
daid303
4eb81a69e6
Only compile the new extruder offset code if you have multiple extruders.
12 years ago
daid
3e9cd334a4
Merge pull request #383 from dob71/jeff
...
Hotend offset handling for multi-extruder machines
12 years ago
MendelMax
67710df9f3
Made i2c mode wok with the hardware I am able to test (ywrobot / sainsmart i2c LCD 2004)
...
Removed incorrect LiquidCrystal_I2C Library
12 years ago
Bob Clough
b6209c86dd
Added import of Wire Library to make I2C LCD support compilable
12 years ago
Bob Clough
2b567d1df5
Added I2C port expander support to HD44780
12 years ago
Bob Clough
06272f463d
Added Config variables for activating I2C LCDs and setting type and address
12 years ago
daid303
de3dec7215
Also show the tune menu when USB printing.
12 years ago
Denis Bakin
73d41c10b9
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into jeff
...
Conflicts:
Marlin/language.h
Marlin/thermistortables.h
12 years ago
daid
63da4dc59a
Merge pull request #398 from DanieleSdei/Marlin_v1
...
Marlin v1, alignment of the Italian language
12 years ago
Daniele Sdei
82e28851bd
Italian language: SD-Card change and SD-Card init
12 years ago
Daniele Sdei
aed5965ad8
Italian language: remove space and some fix
12 years ago
codenamepawel
d360846dd4
Update Marlin/language.h
...
Update Polish language #define MSG_RESUMING "Wznawiam drukowanie"
12 years ago
daid303
2f60e324dc
Fixed #394
12 years ago
daid
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
Dirk Eichel
a0d4e8e78e
Add Messages for SD Card init. & change
12 years ago
mfeherpataky
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
Dirk Eichel
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
mfeherpataky
71ddb8dc60
Update Marlin/ultralcd_implementation_hitachi_HD44780.h
...
Use all available characters in narrow LCDs < 20 characters.
12 years ago
mfeherpataky
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
Denis B
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
Denis B
49b2ddc8c1
Cleaned up non-standard characters
12 years ago
Bernhard Kubicek
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
daid
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
Bas Spaans
19ce90fe02
Added comment about M42 usage (clean)
12 years ago
Bas Spaans
00fed0a703
Revert "Extended comment explaining M42 usage"
...
This reverts commit 01541ee64c
.
12 years ago
Marius Kintel
e06d820909
Also skip .files and _files with long filenames
12 years ago
Bas Spaans
01541ee64c
Extended comment explaining M42 usage
12 years ago
Marius Kintel
f24f02e212
compile fix: quickStop() needs stepper.h
12 years ago
Bas Spaans
12c41423ad
Fixed typo in comment
12 years ago
Bas Spaans
0995eaa492
Chenged LED_PIN for Melzi boards, added comment about broken versions of the Sanguino libraries
12 years ago
Bernhard
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
daid303
408b349a84
Fixed #368 . Commented out the wrong pin definition, but explained why it is there.
12 years ago
Daniele Sdei
9ecb267b63
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
Daniele Sdei
3cf59f6f9a
add RepRapPro Huxley thermistor tables
12 years ago
daid
c1730e2b08
Merge pull request #363 from yuroller/sanguino_panelolu
...
Panelolu pin assignment for sanguinololu
12 years ago
Yuri Valentini
86358dd6cd
Panelolu pin assignment for sanguinololu from http://reprap.org/wiki/Panelolu
12 years ago
daid303
0f3f5d083d
Minor cleanup of the new FAN_KICKSTART code. #334
12 years ago
daid
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
daid
965baf2683
Merge pull request #362 from daid/Marlin_v1
...
Finnish language
12 years ago
Kevin O'Connor
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
Kevin O'Connor
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
Henry Palonen
7f30039d2a
+ Finnish translation
12 years ago
daid303
14e1d495ef
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
daid303
bbe7d3d0fe
Fixed #312
12 years ago
daid
7ce509b9a7
Merge pull request #361 from yuroller/MakefileSanguino
...
Makefile sanguino
12 years ago
Yuri Valentini
9c34c4f05b
fixes for ramps compilation using installed arduino ide
12 years ago
daid303
442ade15a6
Move Gen6 stuff into a proper location.
12 years ago
daid
5fd4582cc8
Merge pull request #242 from Drakelive/Marlin_v1
...
Fixes issues # 216 and # 135 for Gen6 and Gen6 Deluxe board
12 years ago
daid303
8b88e3b386
Fixed #345 , Fixed #267 .
12 years ago
daid
27843388c6
Merge pull request #360 from njprossi/Marlin_v1
...
Power signal control definitions for other power supplies
12 years ago
daid303
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
Yuri Valentini
7d20ec706e
Added libraries from Arduino 1.0.3 for sanguino build
12 years ago
Nicolas Rossi
437eb3bafc
Initialize PS_ON at startup
12 years ago
Nicolas Rossi
f3c1fc70a9
Power signal control definitions for ATX and others
12 years ago
Yuri Valentini
dad7691df9
makefile for sanguino standalone compilation
12 years ago
Erik vd Zalm
6752cb2d9c
PID now per extruder. Fixed typo
12 years ago
Erik vd Zalm
0ac452e252
Disable is now multi extruder compatible. M84 got a T option.
12 years ago
Johann Rocholl
9e7b5056a0
{X,Y,Z}_{MIN,MAX}_POS are actually in Gcode coordinates.
12 years ago
Daniele Sdei
5f82f03ff3
Add italian MSG_RESUMING.
12 years ago
daid303
5e3873c8db
Add german MSG_RESUMING.
12 years ago
daid303
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
daid303
b69cb9fbd9
Change the end of SD cart print message from minutes/seconds to hours/minutes.
12 years ago
daid
30254e3388
Merge pull request #350 from jcrocholl/Marlin_v1
...
Automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR.
12 years ago
daid303
38ee395ac7
Replace the 1ms delay for 2 nops to get a 100ns delay. #259
12 years ago
daid303
5df5e4c4a2
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
daid303
a95dcd74e7
Fix some of the duplicated PSTRs, saving 500bytes of flash with LCD on.
12 years ago
Johann Rocholl
8caf5d252d
Remove bogus blank line.
12 years ago
Johann Rocholl
1c2ecddae4
Fix typo (# missing before define).
12 years ago
Johann Rocholl
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
Johann Rocholl
3b2e5027e5
Merged updates from Marlin_v1.
12 years ago
Johann Rocholl
b39f5d614a
For boards with only one endstop per axis, automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR.
12 years ago
oni303
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
Sergey Taranenko
5697451c72
fix lcd class
12 years ago
Sergey Taranenko
58e806f3fa
Fix the russial translation.
12 years ago
Sergey Taranenko
50a5ce1dc4
deduplicate messages
12 years ago
daid303
6123a00e64
Fix the german translation.
12 years ago
daid303
7c21716886
Fixed #341
12 years ago
daid303
ae1bc83350
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
daid303
596a7e1904
Fix compiling for Arduin < 1.0.0
12 years ago
Daid
b264317fa0
Reverted the patch by KevinOConnor, as it crashes some versions of avr-gcc and caused linking issues.
12 years ago
Daid
673577a31b
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
Daid
23022f1a82
Updates to Makefile to compile for Teensy.
12 years ago
daid
96e9db8919
Merge pull request #339 from KevinOConnor/CompilerFlags
...
Add additional optimization flags to Makefile
12 years ago
daid303
08356361ac
Fixing a problem with heated beds not working without PID and BED_LIMIT_SWITCHING
12 years ago
daid303
047d037f8c
#ifdef fix for #326
12 years ago
Kevin O'Connor
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
Kevin O'Connor
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
daid303
f30b46b2a8
One more fix for #338 , I really should get a heated bed to test with.
12 years ago
daid303
65c3f1ffcd
Most likely fixing #338
12 years ago
daid303
7577717b59
Fixed #336
12 years ago
daid303
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
daid303
6731c094ee
Fix compiling with just an 16x2 LCD and no buttons.
12 years ago
daid303
b99a928a80
Fix the M117 (display message on LCD) when used over USB with checksums.
12 years ago
daid303
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
daid303
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
daid303
8b58edc70e
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
daid
d0319d45af
Merge pull request #335 from jcrocholl/Marlin_v1
...
Fix endstop pins for Printrboard
12 years ago
Johann Rocholl
ca409e5531
Fix X/Y/Z_MIN_PIN for Printrboard.
12 years ago
Johann Rocholl
1f45cb0a51
Fix typo in MANUAL_HOME_POSITION (plural S missing) and improve comments.
12 years ago
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.
12 years ago
daid303
46ec4b648c
Added some missing Mxxx comments to M commands. Fixed the unsetting of the timer dividers for the fast PWM fan.
12 years ago
Daid
724f5aa36b
Update on makefile for moved Arduino addons.
12 years ago
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.
12 years ago
daid303
3fb07d9b8d
Add MINTEMP/MAXTEMP error to LCD, and fix temperature bug with more then 1 extruder.
12 years ago
Johann Rocholl
8e2519e88b
Add realtime delta geometry in Marlin_main.cpp.
12 years ago
Johann Rocholl
cec7283b21
Enable QUICK_HOME for deltabot.
12 years ago
Johann Rocholl
2292441f0c
Use X/Y/Z_MAX_PIN instead of X/Y/Z_MIN_PIN for top endstops on deltabot.
12 years ago
Johann Rocholl
c430906d3b
Deltabot settings and configuration adjustments.
12 years ago
daid303
82c8724b33
Fix compile with PID_DEBUG
12 years ago
daid303
9b160972a1
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
daid303
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
Daid
fcd9de72ef
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
Daid
32d4373e0f
Add printrboard and brainwave to Makefile.
12 years ago
daid
b3ddbcee2a
Merge pull request #329 from jcrocholl/Marlin_v1
...
Add Printrboard and Brainwave to pins.h and fastio.h
12 years ago
Daid
29435dfb4b
Proper avr for Sanguino in Makefile.
12 years ago
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.
12 years ago
Daid
ca7acbe6d9
Allow specification of which arduino hardware subvariant in Makefile.
12 years ago
Johann Rocholl
33247733e0
Teensylu and Printrboard use different analog pins for thermistors.
12 years ago
Johann Rocholl
621c24a10f
AT90USB is only defined after pins.h is included.
12 years ago
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.
12 years ago
Johann Rocholl
4d351b4846
Improved formatting and comments for consistency.
12 years ago
Johann Rocholl
a30007caa4
If fastio.h is not messed up then Teensylu and Printrboard are actually using the same pins.
12 years ago
Johann Rocholl
6aa87a7b67
Use the same fastio.h definition for AT90USB1286/7 and AT90USB646/7.
12 years ago
Johann Rocholl
b1c38d4c82
Avoid compiler warnings (redefined MOTHERBOARD) in Arduino 1.0 and greater.
12 years ago
Johann Rocholl
42e21bb06e
Add support for Printrboard (from https://github.com/lincomatic/Marlin ) and Brainwave (from https://github.com/metrix/Sprinter ).
12 years ago
Johann Rocholl
ce4b5bbeaa
Add AT90USB646 support from Sprinter to fastio.h.
12 years ago
Daid
f413aa33b3
Small makefile change, posibility to add defines on the commandline, and fix compiling with watchdog enabled when using the Makefile.
12 years ago
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.
12 years ago
daid303
1f27870d41
Fix compiling the watchdog error message when the manual reset watchdog is used.
12 years ago
daid303
c5d4225804
Mistake there, not sure why I did that. My bad.
12 years ago
daid303
529748894c
Minor changes in the temperature code for some cleanup.
12 years ago
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.
12 years ago
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.
12 years ago
daid303
16078e47d4
Fixed #325
12 years ago
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.
12 years ago
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.
12 years ago
daid303
6c51fe5039
Fix the bug where the SD percentage calculation is wrong when the file is larger then 42MB
12 years ago
brupje
57429cb9fe
Fix for keypad
12 years ago
daid303
97fa2a9c30
Few simple fixes that save RAM, as static strings are stored in RAM by default.
12 years ago
Daid
c94ca24adc
Fixed #317
12 years ago
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.
12 years ago
Erik vd Zalm
dbbf050005
More rambo fixes
12 years ago
Erik vd Zalm
f934d0ef5b
Merge remote-tracking branch 'tonokip/Marlin_v1' into Marlin_v1
...
Conflicts:
Marlin/Configuration.h
12 years ago
Erik vd Zalm
e48dfcc2b3
Tmp copy before merge
12 years ago
Erik vd Zalm
b98fb17fe9
Small FREQUENCY_LIMIT changes
12 years ago
daid
bce67ec2c9
Merge pull request #312 from gege2b/Marlin_v1
...
Added french translation
12 years ago
Gege
9b1d2483a0
I hope last changes to french translation
12 years ago
Gege
b1adc567da
Correction to french translation (non-ASCII chars only)
12 years ago
Gege
0807d82af0
Correction to french translation (plain text only)
12 years ago
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.
12 years ago
gege2b
bb119739b0
Added french translation
12 years ago
daid
df8dd5ac21
Merge pull request #306 from nothinman/Marlin_v1
...
Added automatic build numbering.
12 years ago
MaikStohn
2b7b1e52b1
allow marlin internal 0°C represenation
12 years ago
Martin Lukasik
2f771b3979
Added automatic build numbering.
12 years ago
daid
9bebe9b631
Merge pull request #302 from nothinman/Marlin_v1
...
Added Polish translation. Cosmetic changes to English.
12 years ago
daid303
a2032afa3a
Fixed #303
12 years ago
Martin Lukasik
6a55ca8370
Added Polish translation. Cosmetic changes to English.
12 years ago
daid303
8f20562f49
Fix some of the crowded code style. And fixed the conditional. #300
12 years ago
daid303
43018a48c4
Fix for a few -Wextra warnings.
12 years ago
daid303
72586eb30a
Solved few warnings.
12 years ago
daid303
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
daid303
f4a89ec776
SDCARDINSERTED is always defined, and thus we do not need the #ifdefs.
12 years ago
daid303
57834776ad
Made the 2nd speed lookup table condition more explicit.
12 years ago
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
12 years ago
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.
12 years ago
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).
12 years ago
daid303
40ce057a3e
Fixing issue #297
12 years ago
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!
12 years ago
daid303
ffc69537aa
Update on some comments, make the MOTHERBOARD list complete again.
12 years ago
daid303
71efcfc648
Most likely fixing issue #295 .
12 years ago
daid303
04be9d6001
God damn. Sorry, my mistake, forgot to add this file.
12 years ago
daid303
c17da4b707
Add ConfigurationStore to the Makefile.
12 years ago
daid
ccd9fd0dc3
Merge pull request #292 from jothan/lcdfix
...
Lcd fixes
12 years ago
Jonathan Bastien-Filiatrault
46b9988e26
Search and replace failure.
12 years ago
Jonathan Bastien-Filiatrault
0f73afb0b0
Avoid defining overriding definitions for the RepRapDiscount Smart
...
Controller. Remove common definitions. Harmonize declaration order.
12 years ago
Jonathan Bastien-Filiatrault
36b452c7ac
Remove abbrs.
12 years ago
YanFM
332344bd43
Update Marlin/language.h
...
Included Portuguese language
12 years ago
daid303
e6c1cadea0
Set the watchdog to a 4 second timeout, as with 1 second it can timeout during SD card init.
12 years ago
daid
faea7d72b8
Merge pull request #290 from buildrob/Marlin_v1
...
Clean up special serial port cases
12 years ago
daid303
12a4d60e18
Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template.
12 years ago
Jonathan Bastien-Filiatrault
9606f4d04f
Include Marlin_main.cpp in source files.
12 years ago
Jonathan Bastien-Filiatrault
3cbaad9288
RepRapDiscount Smart Controller pin definitions.
12 years ago
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.
12 years ago
daid303
5a998558a9
Update suggested by Robert F-C. #289
12 years ago
daid303
f6ff0ab767
signed/unsigned fixes.
12 years ago
daid303
5d471e0f34
Also reset the PID values to defaults. Fixes #281
12 years ago
daid303
d3ebc34958
Hopefully also support chips with a single UART in MarlinSerial now.
12 years ago
daid303
b6ff45254e
Better explain the watchdog "problem" and rename the config define so it explains that the feature belongs to the watchdog.
12 years ago
daid303
7e348fcb5f
By mistake enabled the watchdog by default. This should be off by default.
12 years ago
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.
12 years ago
daid
539f3b3fe4
Merge pull request #284 from brackendawson/Marlin_v1
...
Use the right pins for Gen7 1.4
12 years ago
Robert F-C
65c9a0728f
Set default serial port back to 0.
12 years ago
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.
12 years ago
Bracken Dawson
f5631a89e8
Add dummy Emergancy Pin to Gen7 1.4
...
Change required after pulling from ErikZalm.
12 years ago
Bracken Dawson
a4f9e1ebf2
Merge git://github.com/ErikZalm/Marlin into Marlin_v1
12 years ago
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.
12 years ago
ErikZalm
a7e40b2903
Merge pull request #276 from setar/Marlin_v1
...
Fix num of digits on LCD for E and Z axis.
12 years ago
MaikStohn
6ed02c86be
Fixed wrong code (will not even compile when EXTRUDERS>2)
12 years ago
Sergey Taranenko
2a67363e27
Fix ‘prog_uchar’ definition in LiquidCrystalRus.cpp
12 years ago
Sergey Taranenko
205304ddee
Merge git://github.com/ErikZalm/Marlin into Marlin_v1
12 years ago
Erik vd Zalm
58bca87c72
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
12 years ago
Erik vd Zalm
febeb43197
Revert "fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '"
...
This reverts commit cb02c2f9d8
.
12 years ago
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
12 years ago
ErikZalm
70f57a6844
Merge pull request #273 from setar/Marlin_v1
...
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
12 years ago
ErikZalm
ff14199e58
Merge pull request #270 from jothan/Marlin_v1
...
Create an explicit rule for building applet/Marlin.cpp.
12 years ago
Daniele Sdei
695938ba3f
Italian language support
12 years ago
Sergey Taranenko
cb02c2f9d8
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
12 years ago
Jonathan Bastien-Filiatrault
e4a5e333ef
Generalize.
12 years ago
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.
12 years ago
ErikZalm
9f089756b7
Merge pull request #265 from setar/Marlin_v1
...
Added Russian translation
12 years ago
brupje
326423719f
Add support for Megatronics
12 years ago
brupje
d07b6e93d5
Add support for Megatronics
12 years ago
Sergey Taranenko
efcc28d347
Fix check for include LiquidCrystalRus.h
12 years ago
Sergey Taranenko
cfc193cdac
Enables support the Cyrillic alphabet for LCD
12 years ago
Sergey Taranenko
24bcc9647d
Added Russian translation
12 years ago