4e448b700a
Merged fetched files from Marlin_v1 branch
...
Pull requests: #414 #433 #432 #428
12 years ago
fa58be3cb8
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
9f2862ce48
Merge pull request #414 from whosawhatsis/Marlin_v1
...
regenerated thermistor table 7
12 years ago
9fb8bd5685
Merge pull request #433 from whosawhatsis/bang-mode
...
Separate PID_MAX from BANG_MAX
12 years ago
aa816ee81c
Merge pull request #432 from blddk/Marlin_v1
...
HTML removed, Rumba added
12 years ago
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.
12 years ago
e5a853a3d0
Added automated extruder fan function
12 years ago
72419f69a9
Added rumba
12 years ago
91bea43332
Added rumba pinout
12 years ago
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.
12 years ago
6c66cae694
GLCD init screen cosmetics
12 years ago
f3e0e5184d
Add include selector between char. LCD and GLCD
12 years ago
5d3862f9d1
Modified u8glib logo on welcome screen
12 years ago
0b320f75e9
Removed debug code, add some comments
12 years ago
5f1cd70122
Add code to lcd_update() for GLCD
...
This code selects between the routines for the GLCD or the char.
display.
12 years ago
a49c09a776
Add variable for animated fan, add float conversion w/o sign
...
A new variable was introduced to allow fan animation on the GLCD.
Add additional float to string conversion routine without sign
character. This is used for the coordinates visualisation on the GLCD.
12 years ago
26d8863111
Add library selection between GLCD and char. LCD
12 years ago
4a141a694f
Marlin code for GLCD display
...
This contains the menues, status screen etc...
12 years ago
83c790a020
Add bitmap graphics for GLCD
...
1. Marlin welcome screen
2. Status screen symbols 3 Extruders, heated bed, animated fan logo 1
3. Status screen symbols 3 Extruders, heated bed, animated fan logo 2
12 years ago
c28e71a1bf
Reduced u8glib SPI speed to fosc/8
...
Makes the lib compatible with most LCDs
12 years ago
ee8feb9dee
Add Marlin (reprap) specific fonts 6x10, 6x9
...
Font size 6x10 with feedrate symbol & Font size 6x9.
12 years ago
c8e2f44087
Add u8glib library supporting dot matrix displays
...
https://code.google.com/p/u8glib/
Universal Graphics Library for 8 Bit Embedded Systems
12 years ago
7417423691
Merge remote-tracking branch 'origin/Marlin_language_file_fix' into GLCD_128x64_dots
12 years ago
590225be25
Merge pull request #428 from ryanturner/Marlin_v1
...
Adding Maker's Tool Works heated bed thermistor
12 years ago
a0e41c0970
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
233df9cca0
Add missing LF at the end of the file
12 years ago
bb0de75a92
Removed umwanted HTML code ath the end of the file
...
Sorry for that. This does not lead to compile errors. I removed the
unwanted code to make it clean.
12 years ago
7c47e7162d
Adding Maker's Tool Works heated bed thermistor
12 years ago
af78d0cbfa
Merge pull request #1 from illuminarti/Fix_E_Speed
...
Fix step rate bug (especially for retraction)
12 years ago
9a78f321a4
Add pins for Motherboard variant 64
...
These definition contain also the definition for the graphics LCD.
12 years ago
5de25ccd20
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
12 years ago
d6ce63c49c
Merge pull request #411 from STB3/Marlin_w_STB_Board_support
...
Add STB board support to Marlin (next step towards graphic LCD implementation)
12 years ago
92782f9252
Merge pull request #1 from illuminarti/Fix_E_Speed
...
Fix step rate bug (especially for retraction)
12 years ago
6a61a3c0b4
missing comma in last commit
12 years ago
f0aee4101a
regenerated thermistor table 7
...
Generated with createTemperatureLookup.py. The old table crapped out at
270C, which was a problem for polycarbonate.
12 years ago
140e095c6e
Add pins for Motherboard variant 64
...
These definition contain also the definition for the graphics LCD.
12 years ago
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
12 years ago
ceb5ee38af
Replaced corrupted language.h file on local PC with current from ErikZalm/Marlin
12 years ago
8efd4cfd73
fixed merge conflict
12 years ago
b3ebb71704
Merge pull request #408 from STB3/Marlin_with_ATmega1284p_Sanguino_on_023_support
...
Marlin with ATmega1284p sanguino support under Arduino 023
12 years ago
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
12 years ago
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=
12 years ago
a069d30a4b
Add additional Sanguino bard versions to boards.txt
...
ATmega644P 16MHz, ATmega1284p 8, 16, 20MHz
12 years ago
4eb81a69e6
Only compile the new extruder offset code if you have multiple extruders.
12 years ago
3e9cd334a4
Merge pull request #383 from dob71/jeff
...
Hotend offset handling for multi-extruder machines
12 years ago
de3dec7215
Also show the tune menu when USB printing.
12 years ago
73d41c10b9
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into jeff
...
Conflicts:
Marlin/language.h
Marlin/thermistortables.h
12 years ago
63da4dc59a
Merge pull request #398 from DanieleSdei/Marlin_v1
...
Marlin v1, alignment of the Italian language
12 years ago
7eb9811958
Merge pull request #397 from codenamepawel/patch-1
...
Update Marlin/language.h
12 years ago
82e28851bd
Italian language: SD-Card change and SD-Card init
12 years ago
Dirk Eichel