SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
800 commits 1 branch 0 tags 119 MiB
Commit graph

800 commits

This branch
This branch
All branches
Author SHA1 Message Date
ErikZalm
7a5c474d91 Update Configuration.h 2013-03-28 21:27:50 +01:00
ErikZalm
9f2862ce48 Merge pull request #414 from whosawhatsis/Marlin_v1 
regenerated thermistor table 7
 2013-03-25 13:14:49 -07:00
ErikZalm
9fb8bd5685 Merge pull request #433 from whosawhatsis/bang-mode 
Separate PID_MAX from BANG_MAX
 2013-03-25 13:11:34 -07:00
ErikZalm
aa816ee81c Merge pull request #432 from blddk/Marlin_v1 
HTML removed, Rumba added
 2013-03-25 13:06:25 -07:00
whosawhatsis
fd5b7e0cec Separate PID_MAX from BANG_MAX 
This allows PID_FUNCTIONAL_RANGE to use a maximum duty cycle higher
than PID_MAX. This is useful for powerful heaters to heat quickly in
bang-bang mode, but use a lower duty cycle that is easier to stabilize
in PID mode.
 2013-03-22 18:16:26 -07:00
blddk
e5a853a3d0 Added automated extruder fan function 2013-03-22 18:49:05 +01:00
blddk
72419f69a9 Added rumba 2013-03-22 18:41:54 +01:00
blddk
91bea43332 Added rumba pinout 2013-03-22 18:29:47 +01:00
blddk
d2b00fe486 Removed html and added rumba 
Found some unwanted html at the bottom of the file which caused it to not be able to compile.
Also added rumba as machine.
 2013-03-22 18:28:16 +01:00
ErikZalm
590225be25 Merge pull request #428 from ryanturner/Marlin_v1 
Adding Maker's Tool Works heated bed thermistor
 2013-03-19 11:32:47 -07:00
Ryan Turner
7c47e7162d Adding Maker's Tool Works heated bed thermistor 2013-03-18 22:53:37 -05:00
daid
d6ce63c49c Merge pull request #411 from STB3/Marlin_w_STB_Board_support 
Add STB board support to Marlin (next step towards graphic LCD implementation)
 2013-03-18 07:57:39 -07:00
daid
92782f9252 Merge pull request #1 from illuminarti/Fix_E_Speed 
Fix step rate bug (especially for retraction)
 2013-03-15 09:07:34 +01:00
whosawhatsis
6a61a3c0b4 missing comma in last commit 2013-03-08 16:15:49 -08:00
whosawhatsis
f0aee4101a regenerated thermistor table 7 
Generated with createTemperatureLookup.py. The old table crapped out at
270C, which was a problem for polycarbonate.
 2013-03-08 13:41:49 -08:00
Dirk Eichel
140e095c6e Add pins for Motherboard variant 64 
These definition contain also the definition for the graphics LCD.
 2013-03-01 17:47:32 +01:00
Dirk Eichel
b2c1c64fb1 Add Motherboard variant 64 - STB V1.1 
Definition for the graphic LCD are already in it, they will not harm the
configuration as they are only defined constants
 2013-03-01 17:39:54 +01:00
Dirk Eichel
ceb5ee38af Replaced corrupted language.h file on local PC with current from ErikZalm/Marlin 2013-03-01 17:27:57 +01:00
Dirk Eichel
8efd4cfd73 fixed merge conflict 2013-03-01 16:27:35 +01:00
daid
b3ebb71704 Merge pull request #408 from STB3/Marlin_with_ATmega1284p_Sanguino_on_023_support 
Marlin with ATmega1284p sanguino support under Arduino 023
 2013-03-01 06:08:18 -08:00
Dirk Eichel
f991bf23b2 Add bootloader files for ATmega1284/Sanguino 
Added the optiboot bootloader, uses only 512kB of FLASH
Includes .hex file is for 20MHz µC Clock and serial speed of 57k6
 2013-02-27 22:34:36 +01:00
Dirk Eichel
5bfba7720e Switched to Sanguino 0023r4 
This is the actual Sanguino release for Arduino 023.
It has full ATmega1284p support.

Reference:
https://code.google.com/p/sanguino/downloads/detail?name=Sanguino-0023r4.zip&can=2&q=
 2013-02-27 22:29:46 +01:00
Dirk Eichel
a069d30a4b Add additional Sanguino bard versions to boards.txt 
ATmega644P 16MHz, ATmega1284p 8, 16, 20MHz
 2013-02-27 22:17:42 +01:00
daid303
4eb81a69e6 Only compile the new extruder offset code if you have multiple extruders. 2013-02-27 12:32:07 +01:00
daid
3e9cd334a4 Merge pull request #383 from dob71/jeff 
Hotend offset handling for multi-extruder machines
 2013-02-27 03:10:18 -08:00
daid303
de3dec7215 Also show the tune menu when USB printing. 2013-02-20 00:54:44 +01:00
Denis Bakin
73d41c10b9 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into jeff 
Conflicts:
	Marlin/language.h
	Marlin/thermistortables.h
 2013-02-18 12:10:52 -05:00
daid
63da4dc59a Merge pull request #398 from DanieleSdei/Marlin_v1 
Marlin v1, alignment of the Italian language
 2013-02-16 15:41:43 -08:00
daid
7eb9811958 Merge pull request #397 from codenamepawel/patch-1 
Update Marlin/language.h
 2013-02-16 15:41:07 -08:00
Daniele Sdei
82e28851bd Italian language: SD-Card change and SD-Card init 2013-02-16 12:17:29 +01:00
Daniele Sdei
aed5965ad8 Italian language: remove space and some fix 2013-02-16 12:14:50 +01:00
codenamepawel
d360846dd4 Update Marlin/language.h 
Update Polish language 	#define MSG_RESUMING "Wznawiam drukowanie"
 2013-02-16 03:42:53 +01:00
daid303
2f60e324dc Fixed #394 2013-02-14 14:04:26 +01:00
daid
5e2abfcdcd Merge pull request #391 from STB3/Marlin_with_SD-Card_Change_Menu 
Add SD-Card change and SD-Card init. for electronics equipped with LCD Display
 2013-02-13 08:56:00 -08:00
daid
fa5c45f515 Merge pull request #392 from mfeherpataky/Marlin_v1 
Update Marlin/ultralcd_implementation_hitachi_HD44780.h
 2013-02-13 08:54:58 -08:00
Dirk Eichel
a0d4e8e78e Add Messages for SD Card init. & change 2013-02-13 10:05:18 +01:00
mfeherpataky
bbf0cc1379 Update Marlin/ultralcd_implementation_hitachi_HD44780.h 
Fix to a bug that I just introduced - sorry. Forgot about offset of string length.
 2013-02-12 20:06:51 +01:00
Dirk Eichel
c8f1fbd9d8 Add SD-Card change and SD-Card init. 
Add SD-Card change and SD-Card init. for reprap electronics without
SD-Chard change detect pin.
 2013-02-12 17:35:46 +01:00
daid
be91fb9b47 Merge pull request #389 from mfeherpataky/Marlin_v1 
Update Marlin/ultralcd_implementation_hitachi_HD44780.h
 2013-02-12 07:56:15 -08:00
mfeherpataky
71ddb8dc60 Update Marlin/ultralcd_implementation_hitachi_HD44780.h 
Use all available characters in narrow LCDs < 20 characters.
 2013-02-12 00:03:40 +01:00
mfeherpataky
d2c547c407 Update Marlin/ultralcd_implementation_hitachi_HD44780.h 
Fix to a minor bug with hardcoded LCD_WIDTH that draws edited values outside of the 16 characters width LCDs.
 2013-02-11 23:25:24 +01:00
Denis B
70871715e4 Added support for extruder offset handling 
The extruder offset can be specified in the configuration
file or adjusted on the fly using the "M218 T# X# Y#" command.
The EEPROM support is not yet merged in.
The "T#" command can take option "F#" that specifies the feedrate
at which the printing head should be re-positioned. If not
specified the re-positioning move is not preformed immediately,
but the coordinates are adjusted for the printer to properly
position the head when the next movement happens.
 2013-02-04 23:05:45 -05:00
Denis B
49b2ddc8c1 Cleaned up non-standard characters 2013-02-04 01:41:40 -05:00
Bernhard Kubicek
f8876a7958 Merge pull request #376 from kintel/skip_longfilenames 
Also skip .files and _files with long filenames. I think its better than before. If somebody dislikes it, or wants additional configuration, it can be done in a future step. Thanks, Marius, and nice to have you helping!
 2013-02-03 03:05:31 -08:00
daid
18fcc367d2 Merge pull request #371 from Banjer/Melzi_LED_PIN 
Chenged LED_PIN for Melzi boards, added comment about broken versions of...
 2013-02-02 03:23:43 -08:00
daid
6b78edf7c5 Merge pull request #374 from kintel/quickstop 
compile fix: quickStop() needs stepper.h
 2013-02-01 13:54:12 -08:00
Bas Spaans
19ce90fe02 Added comment about M42 usage (clean) 2013-01-31 18:20:23 +01:00
Bas Spaans
00fed0a703 Revert "Extended comment explaining M42 usage" 
This reverts commit 01541ee64c.
 2013-01-31 18:11:13 +01:00
Marius Kintel
e06d820909 Also skip .files and _files with long filenames 2013-01-31 12:07:42 -05:00
Bas Spaans
01541ee64c Extended comment explaining M42 usage 2013-01-31 18:00:25 +01:00