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
Daid