CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,189 Commits 1 Branch 0 Tags 107 MiB
46cc2e3f6a
Commit Graph

6189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
daid303
72586eb30a Solved few warnings. 2012-11-12 09:29:12 +01:00
daid303
7a02ba361c Header multiple include protection should match the filename, not just _ARDUINO_H, which is almost bound to go wrong some day. 2012-11-12 09:24:28 +01:00
daid303
f4a89ec776 SDCARDINSERTED is always defined, and thus we do not need the #ifdefs. 2012-11-12 09:16:27 +01:00
daid303
57834776ad Made the 2nd speed lookup table condition more explicit. 2012-11-11 12:02:48 +01:00
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 2012-11-11 11:17:54 +01:00
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. 2012-11-11 11:06:58 +01:00
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). 2012-11-11 11:05:52 +01:00
daid303
40ce057a3e Fixing issue #297 2012-11-10 14:37:01 +01:00
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! 2012-11-09 22:36:31 +01:00
daid303
ffc69537aa Update on some comments, make the MOTHERBOARD list complete again. 2012-11-09 09:10:51 +01:00
daid303
71efcfc648 Most likely fixing issue #295. 2012-11-08 21:08:05 +01:00
daid303
04be9d6001 God damn. Sorry, my mistake, forgot to add this file. 2012-11-07 23:16:43 +01:00
daid303
c17da4b707 Add ConfigurationStore to the Makefile. 2012-11-07 22:43:01 +01:00
daid
ccd9fd0dc3 Merge pull request #292 from jothan/lcdfix 
Lcd fixes
 2012-11-07 13:10:59 -08:00
Jonathan Bastien-Filiatrault
46b9988e26 Search and replace failure. 2012-11-07 16:09:30 -05:00
Jonathan Bastien-Filiatrault
0f73afb0b0 Avoid defining overriding definitions for the RepRapDiscount Smart 
Controller. Remove common definitions. Harmonize declaration order.
 2012-11-07 16:04:28 -05:00
Jonathan Bastien-Filiatrault
36b452c7ac Remove abbrs. 2012-11-07 15:42:18 -05:00
daid
a394ac9f95 Merge pull request #294 from YanFM/patch-1 
Update Marlin/language.h
 2012-11-07 06:21:28 -08:00
YanFM
332344bd43 Update Marlin/language.h 
Included Portuguese language
 2012-11-07 09:43:13 -02:00
daid303
e6c1cadea0 Set the watchdog to a 4 second timeout, as with 1 second it can timeout during SD card init. 2012-11-07 12:32:17 +01:00
daid
faea7d72b8 Merge pull request #290 from buildrob/Marlin_v1 
Clean up special serial port cases
 2012-11-07 02:00:26 -08:00
daid303
12a4d60e18 Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template. 2012-11-07 10:02:45 +01:00
Robert F-C
08337e01f7 Added change to feature list. 2012-11-07 17:28:46 +11:00
Jonathan Bastien-Filiatrault
9606f4d04f Include Marlin_main.cpp in source files. 2012-11-06 20:32:48 -05:00
Jonathan Bastien-Filiatrault
3cbaad9288 RepRapDiscount Smart Controller pin definitions. 2012-11-06 20:32:13 -05:00
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.
 2012-11-07 09:00:21 +11:00
daid303
5a998558a9 Update suggested by Robert F-C. #289 2012-11-06 21:04:29 +01:00
daid303
f6ff0ab767 signed/unsigned fixes. 2012-11-06 15:33:49 +01:00
daid303
5d471e0f34 Also reset the PID values to defaults. Fixes #281 2012-11-06 15:21:00 +01:00
daid303
d3ebc34958 Hopefully also support chips with a single UART in MarlinSerial now. 2012-11-06 14:43:36 +01:00
daid303
b6ff45254e Better explain the watchdog "problem" and rename the config define so it explains that the feature belongs to the watchdog. 2012-11-06 13:33:00 +01:00