MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
804 Commits 1 Branch 0 Tags 129 MiB
5d3862f9d1
Commit Graph

715 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Marius Kintel
f24f02e212 compile fix: quickStop() needs stepper.h 2013-01-31 10:43:03 -05:00
Bas Spaans
12c41423ad Fixed typo in comment 2013-01-30 22:54:04 +01:00
Bas Spaans
0995eaa492 Chenged LED_PIN for Melzi boards, added comment about broken versions of the Sanguino libraries 2013-01-30 22:25:01 +01:00
Bernhard
1d06b10962 Added a feature to have filament change by gcode or display trigger. 
[default off for now]
syntax: M600  X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]

if enabled, after a M600, the printer will retract by E, lift by Z, move to XY, retract even more filament.
Oh, and it will display "remove filament" and beep like crazy.

You are then supposed to insert a new filament (other color, e.g.) and click the display to continue.
After having the nozzle cleaned manually, aided by the disabled e-steppers.
After clicking, the printer will then go back the whole shebang, and continue printing with a fancy new color.
 2013-01-27 13:21:34 +01:00
daid303
408b349a84 Fixed #368. Commented out the wrong pin definition, but explained why it is there. 2013-01-21 15:46:17 +01:00
Daniele Sdei
9ecb267b63 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-01-14 15:47:40 +01:00
Daniele Sdei
3cf59f6f9a add RepRapPro Huxley thermistor tables 2013-01-14 15:36:08 +01:00
daid
c1730e2b08 Merge pull request #363 from yuroller/sanguino_panelolu 
Panelolu pin assignment for sanguinololu
 2013-01-10 07:19:37 -08:00
Yuri Valentini
86358dd6cd Panelolu pin assignment for sanguinololu from http://reprap.org/wiki/Panelolu 2013-01-10 12:23:20 +01:00
daid303
0f3f5d083d Minor cleanup of the new FAN_KICKSTART code. #334 2013-01-10 11:08:45 +01:00
daid
6ec56fa923 Merge pull request #334 from KevinOConnor/FanKick 
Add feature to briefly run the cooling fan at full speed when it first starts.
 2013-01-09 02:47:59 -08:00
daid
965baf2683 Merge pull request #362 from daid/Marlin_v1 
Finnish language
 2013-01-09 02:42:09 -08:00
Kevin O'Connor
3d91bd486c Add "kick fan" feature - briefly run fan at full speed on start. 
Add a feature to run the cooling fan at full speed for a small period
(default 100ms) when first starting the fan.  Some fans wont reliably
start spinning at low power, and many fans have issue with the PWM at
low power.  However, once the fan starts spinning it can reliably be
set to a wide range of PWM values.
 2013-01-08 18:50:15 -05:00