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 |
|
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 |
|
daid
|
a394ac9f95
|
Merge pull request #294 from YanFM/patch-1
Update Marlin/language.h
|
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 |
Robert F-C
|
08337e01f7
|
Added change to feature list.
|
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 |