Dirk Eichel
443aaa30bf
Removed GIT fragments
...
Seems that there was something wrong while merging
2013-03-30 23:26:42 +01:00
ErikZalm
7f622467fc
Merge pull request #425 from kefir-/m928_logging
...
M928 logging
2013-03-30 08:50:34 -07:00
ErikZalm
86867928ac
Merge pull request #434 from DDRBoxman/Marlin_v1
...
Add support for M300: Play beep sound
2013-03-30 08:49:54 -07:00
ErikZalm
9a38cad6f0
Merge pull request #430 from STB3/GLCD_128x64_dots
...
Final task of the 128x64dots GLCD implementation
2013-03-30 08:49:14 -07:00
ErikZalm
7a5c474d91
Update Configuration.h
2013-03-28 21:27:50 +01:00
Dirk Eichel
4e448b700a
Merged fetched files from Marlin_v1 branch
...
Pull requests: #414 #433 #432 #428
2013-03-26 21:43:04 +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
Colin Edwards
0d075378d5
Add LARGE_FLASH define and enable it for some of the beefier boards
...
The LARGE_FLASH flag allows superfluous features to be excluded
on boards with less memory
2013-03-25 10:42:27 -05:00
Colin Edwards
9a1c90471f
Ignore unused beeper pins
2013-03-25 10:28:15 -05:00
Colin Edwards
1a0f889803
Add support for M300: Play beep sound
2013-03-24 23:35:05 -05: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
Dirk Eichel
6c66cae694
GLCD init screen cosmetics
2013-03-19 21:25:11 +01:00
Dirk Eichel
f3e0e5184d
Add include selector between char. LCD and GLCD
2013-03-19 20:59:21 +01:00
Dirk Eichel
5d3862f9d1
Modified u8glib logo on welcome screen
2013-03-19 20:32:23 +01:00
Dirk Eichel
0b320f75e9
Removed debug code, add some comments
2013-03-19 20:29:25 +01:00
Dirk Eichel
5f1cd70122
Add code to lcd_update() for GLCD
...
This code selects between the routines for the GLCD or the char.
display.
2013-03-19 20:19:16 +01:00
Dirk Eichel
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.
2013-03-19 20:13:23 +01:00
Dirk Eichel
26d8863111
Add library selection between GLCD and char. LCD
2013-03-19 20:03:47 +01:00
Dirk Eichel
4a141a694f
Marlin code for GLCD display
...
This contains the menues, status screen etc...
2013-03-19 19:59:56 +01:00
Dirk Eichel
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
2013-03-19 19:57:35 +01:00
Dirk Eichel
233df9cca0
Add missing LF at the end of the file
2013-03-19 19:12:33 +01:00
Dirk Eichel
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.
2013-03-19 06:46:05 +01:00
Ryan Turner
7c47e7162d
Adding Maker's Tool Works heated bed thermistor
2013-03-18 22:53:37 -05:00
daid
af78d0cbfa
Merge pull request #1 from illuminarti/Fix_E_Speed
...
Fix step rate bug (especially for retraction)
2013-03-18 23:36:11 +01:00
Dirk Eichel
9a78f321a4
Add pins for Motherboard variant 64
...
These definition contain also the definition for the graphics LCD.
2013-03-18 23:36:11 +01:00
Dirk Eichel
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
2013-03-18 23:36:10 +01: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
Ketil Froyn
f036be7c4e
Clean up tab/whitespace from last commit
2013-03-16 23:11:58 +01:00
Ketil Froyn
07e11c7cf5
Add command M928 to enable logging to file of received gcode commands
2013-03-16 23:02:57 +01: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
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
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
