Johann Rocholl
|
1f45cb0a51
|
Fix typo in MANUAL_HOME_POSITION (plural S missing) and improve comments.
|
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 |
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 |
daid
|
34b2de4cd8
|
Merge pull request #320 from brupje/patch-1
Fix for keypad
|
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 |
daid
|
b7c8e5bbcf
|
Merge pull request #308 from MStohn/Marlin_v1
FIX: Allow marlin internal 0°C represenation
|
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 |