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 |
|
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 |
|
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 |