Daid
|
fcd9de72ef
|
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
|
2012-12-09 23:31:07 +01:00 |
|
Daid
|
32d4373e0f
|
Add printrboard and brainwave to Makefile.
|
2012-12-09 23:30:55 +01:00 |
|
daid
|
b3ddbcee2a
|
Merge pull request #329 from jcrocholl/Marlin_v1
Add Printrboard and Brainwave to pins.h and fastio.h
|
2012-12-09 14:29:26 -08:00 |
|
Daid
|
29435dfb4b
|
Proper avr for Sanguino in Makefile.
|
2012-12-09 23:02:03 +01:00 |
|
daid303
|
52158dffcc
|
Big temperature code update. No longer converts back and forwards between temperature and raw sample value. Reducing complexity, removing code. Also named some variables better. While keeping the safety intact and functionality the same.
|
2012-12-09 23:00:06 +01:00 |
|
Daid
|
ca7acbe6d9
|
Allow specification of which arduino hardware subvariant in Makefile.
|
2012-12-09 19:19:57 +01:00 |
|
Johann Rocholl
|
33247733e0
|
Teensylu and Printrboard use different analog pins for thermistors.
|
2012-12-09 02:19:13 -08:00 |
|
Johann Rocholl
|
621c24a10f
|
AT90USB is only defined after pins.h is included.
|
2012-12-09 01:40:33 -08:00 |
|
Johann Rocholl
|
6cba11f087
|
Stop redefining MOTHERBOARD and #define AT90USB instead. Also put #ifndef AT90USB around the HardwareSerial_h trick, so now Printrboard / Brainwave support compiles on Arduino 1.0.2 as well.
|
2012-12-09 01:32:09 -08:00 |
|
Johann Rocholl
|
4d351b4846
|
Improved formatting and comments for consistency.
|
2012-12-08 20:15:53 -08:00 |
|
Johann Rocholl
|
a30007caa4
|
If fastio.h is not messed up then Teensylu and Printrboard are actually using the same pins.
|
2012-12-08 19:46:42 -08:00 |
|
Johann Rocholl
|
6aa87a7b67
|
Use the same fastio.h definition for AT90USB1286/7 and AT90USB646/7.
|
2012-12-08 15:16:38 -08:00 |
|
Johann Rocholl
|
b1c38d4c82
|
Avoid compiler warnings (redefined MOTHERBOARD) in Arduino 1.0 and greater.
|
2012-12-08 11:34:18 -08:00 |
|
Johann Rocholl
|
42e21bb06e
|
Add support for Printrboard (from https://github.com/lincomatic/Marlin) and Brainwave (from https://github.com/metrix/Sprinter).
|
2012-12-08 10:49:01 -08:00 |
|
Johann Rocholl
|
ce4b5bbeaa
|
Add AT90USB646 support from Sprinter to fastio.h.
|
2012-12-08 10:45:58 -08:00 |
|
Daid
|
f413aa33b3
|
Small makefile change, posibility to add defines on the commandline, and fix compiling with watchdog enabled when using the Makefile.
|
2012-12-08 11:49:53 +01:00 |
|
daid303
|
587154c01b
|
Fix the WATCHPERIOD implementation. It did not work correctly in a multi extruder setup, it did not work after 32 seconds after startup (int16 used as millies timestamp). And it did not work if you gave an M104 or M109 when the target was already around the target setpoint. So on average, it did not work at all. The new implementation should be robust in detecting a failure to heat up.
|
2012-12-06 10:36:07 +01:00 |
|
daid303
|
1f27870d41
|
Fix compiling the watchdog error message when the manual reset watchdog is used.
|
2012-12-06 10:27:50 +01:00 |
|
daid303
|
c5d4225804
|
Mistake there, not sure why I did that. My bad.
|
2012-12-05 20:23:13 +01:00 |
|
daid303
|
529748894c
|
Minor changes in the temperature code for some cleanup.
|
2012-12-05 19:54:01 +01:00 |
|
daid303
|
4e26ecc940
|
The Partial release message (which does not really tell you anything) overwrites the final print time on the LCD, which is a real shame. So I removed the message.
|
2012-12-05 19:32:26 +01:00 |
|
daid303
|
c421774422
|
The Partial release message (which does not really tell you anything) overwrites the final print time on the LCD, which is a real shame. So I removed the message.
|
2012-12-05 19:32:02 +01:00 |
|
daid303
|
16078e47d4
|
Fixed #325
|
2012-12-04 16:27:21 +01:00 |
|
daid303
|
6a9bee27cc
|
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
|
2012-12-03 12:52:00 +01:00 |
|
daid303
|
94ea26ff46
|
Some minor changes on code style. And a bugfix where the counters for positioning in the stepper where wrong depending on compiler settings. (Caused strange values to reported back with M114 and endstop triggers). Also fixed compiling with FWRETRACT enabled.
|
2012-12-03 12:13:20 +01:00 |
|
daid303
|
6c51fe5039
|
Fix the bug where the SD percentage calculation is wrong when the file is larger then 42MB
|
2012-12-03 11:35:36 +01:00 |
|
daid
|
34b2de4cd8
|
Merge pull request #320 from brupje/patch-1
Fix for keypad
|
2012-12-01 01:02:32 -08:00 |
|
brupje
|
57429cb9fe
|
Fix for keypad
|
2012-11-29 21:42:19 +01:00 |
|
daid303
|
97fa2a9c30
|
Few simple fixes that save RAM, as static strings are stored in RAM by default.
|
2012-11-28 10:30:34 +01:00 |
|
Daid
|
c94ca24adc
|
Fixed #317
|
2012-11-24 17:32:30 +01:00 |
|
Daid
|
99e9554edd
|
Some fixes in the Makefile to support Arduino 1.0.0 or higher and added the Rambo. Still needs some more work for the different arduino hardware variants.
|
2012-11-24 11:46:31 +01:00 |
|
Erik vd Zalm
|
dbbf050005
|
More rambo fixes
|
2012-11-21 20:53:56 +01:00 |
|
Erik vd Zalm
|
f934d0ef5b
|
Merge remote-tracking branch 'tonokip/Marlin_v1' into Marlin_v1
Conflicts:
Marlin/Configuration.h
|
2012-11-21 20:36:30 +01:00 |
|
Erik vd Zalm
|
e48dfcc2b3
|
Tmp copy before merge
|
2012-11-21 20:29:31 +01:00 |
|
Erik vd Zalm
|
b98fb17fe9
|
Small FREQUENCY_LIMIT changes
|
2012-11-21 20:17:44 +01:00 |
|
daid
|
bce67ec2c9
|
Merge pull request #312 from gege2b/Marlin_v1
Added french translation
|
2012-11-18 13:43:07 -08:00 |
|
Gege
|
9b1d2483a0
|
I hope last changes to french translation
|
2012-11-18 22:34:56 +01:00 |
|
Gege
|
b1adc567da
|
Correction to french translation (non-ASCII chars only)
|
2012-11-18 20:00:41 +01:00 |
|
Gege
|
0807d82af0
|
Correction to french translation (plain text only)
|
2012-11-18 19:39:56 +01:00 |
|
Erik vd Zalm
|
5cd7a90b32
|
Added new temperature lookup table creation tool. This one uses stein hart-hart equations.
You need 3 temperature resistance:combinations. This gives a better result then using beta.
|
2012-11-16 23:51:05 +01:00 |
|
gege2b
|
bb119739b0
|
Added french translation
|
2012-11-16 18:38:50 +01:00 |
|
daid
|
df8dd5ac21
|
Merge pull request #306 from nothinman/Marlin_v1
Added automatic build numbering.
|
2012-11-14 01:59:33 -08:00 |
|
daid
|
b7c8e5bbcf
|
Merge pull request #308 from MStohn/Marlin_v1
FIX: Allow marlin internal 0°C represenation
|
2012-11-13 05:53:58 -08:00 |
|
MaikStohn
|
2b7b1e52b1
|
allow marlin internal 0°C represenation
|
2012-11-13 14:37:08 +01:00 |
|
Martin Lukasik
|
2f771b3979
|
Added automatic build numbering.
|
2012-11-12 21:06:59 +00:00 |
|
daid
|
9bebe9b631
|
Merge pull request #302 from nothinman/Marlin_v1
Added Polish translation. Cosmetic changes to English.
|
2012-11-12 12:13:30 -08:00 |
|
daid303
|
a2032afa3a
|
Fixed #303
|
2012-11-12 21:04:07 +01:00 |
|
Martin Lukasik
|
6a55ca8370
|
Added Polish translation. Cosmetic changes to English.
|
2012-11-12 15:54:07 +00:00 |
|
daid303
|
8f20562f49
|
Fix some of the crowded code style. And fixed the conditional. #300
|
2012-11-12 15:49:40 +01:00 |
|
daid303
|
43018a48c4
|
Fix for a few -Wextra warnings.
|
2012-11-12 15:35:28 +01:00 |
|