e5a334b83a
Use SdFatUtil::FreeRam() for freeMemory() if there
2014-12-03 05:19:42 -08:00
1977b4490f
Merge pull request #1159 from thinkyhead/lcd_wait_better
...
M0/M1 Message Fix
2014-11-28 16:44:29 +00:00
7562183efc
Skip over spaces first
2014-11-28 08:09:28 -08:00
5a8b3a84ae
Merge pull request #1155 from thinkyhead/lcd_wait_better
...
M0-M1 Enhancements
2014-11-28 11:01:24 +00:00
1b7c065055
Merge pull request #1158 from elgambitero/patch-2
...
Updated a bit of spanish language
2014-11-28 10:57:50 +00:00
433ac29d31
Updated a bit of spanish language
2014-11-27 22:02:49 +01:00
662fe8288b
kill DEADJOE
2014-11-26 21:07:48 -08:00
aad336eb81
Merge branch 'lcd_wait_better' of https://github.com/thinkyhead/Marlin into lcd_wait_better
2014-11-26 21:06:13 -08:00
5874852501
get latest Marlin_v1 changes
2014-11-26 21:05:11 -08:00
12b51d6060
Ignore S and P if no value >0 is included.
2014-11-26 21:05:11 -08:00
d12b24758a
Clear LCD to welcome_msg if not printing
...
The welcome message is more appropriate than “resuming print” if
nothing is printing.
2014-11-26 21:05:11 -08:00
3f54c9ba33
Relocate click ignore code into info screen
2014-11-26 21:05:10 -08:00
92e21d3ee2
M0-M1 Enhancements
...
Allow M0 and M1 to include a message string. Ignore clicks on “Wait for
user” so that the Info Screen stays up.
2014-11-26 21:05:10 -08:00
5714f64927
get latest Marlin_v1 changes
2014-11-26 21:00:02 -08:00
d407a43ac1
Ignore S and P if no value >0 is included.
2014-11-26 09:21:37 -08:00
7681711e7e
Clear LCD to welcome_msg if not printing
...
The welcome message is more appropriate than “resuming print” if
nothing is printing.
2014-11-24 18:50:11 -08:00
aa4160ba62
Relocate click ignore code into info screen
2014-11-24 17:12:08 -08:00
cd769781a1
M0-M1 Enhancements
...
Allow M0 and M1 to include a message string. Ignore clicks on “Wait for
user” so that the Info Screen stays up.
2014-11-24 16:56:37 -08:00
90eb266139
Merge pull request #1148 from krasin/travis
...
Add Travis CI config to build Marlin firmware.
2014-11-16 08:57:31 -05:00
d078c7c29f
Add Travis CI config to build Marlin firmware.
2014-11-16 01:46:24 -05:00
3dc9e478ad
Merge pull request #1143 from Silly105/Marlin_v1
...
Changed graphic LCD info screen to match the set # of extruders
2014-11-12 17:41:36 -05:00
0d97dec434
Adaption of LCD info screen
...
Here comes a compile-time operation to match the extruder symbols on the
info screen to the set number of extruders in configuration.h.
When only one extruder is selected, the "1" on the symbol will not be
displayed.
2014-11-12 17:10:48 +01:00
4ffdbcbd4e
Merge pull request #1138 from filipmu/Marlin_v1
...
Comment out the FILAMENT_SENSOR define by default in config.
2014-11-09 20:38:30 +01:00
5c8107bcdd
Commented out FILAMENT_SENSOR #define
...
Commented out the FILAMENT_SENSOR define so that it is not enabled by
default. Code does not work on all hardware variants.
2014-11-09 13:26:02 -06:00
b014fd1ad2
Merge pull request #2 from ErikZalm/Marlin_v1
...
Sync up to Marlin
2014-11-09 07:01:57 -06:00
443b648863
Merge pull request #1133 from monkeydave/update_delta_config
...
Updated example configurations for Delta printers
2014-11-03 08:14:54 -05:00
377dfb182f
Updated example configurations for Delta printers
2014-11-02 21:04:54 +00:00
724197454c
Merge pull request #1104 from ch100/Marlin_v1
...
Fixed typo.
2014-10-11 23:10:00 +02:00
058e446531
Merge pull request #1037 from filipmu/Filament-Sensor
...
Support for a filament diameter sensor
2014-10-11 22:56:01 +02:00
110c5dcf23
Fixed typo.
...
Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com >
2014-10-11 00:25:36 +02:00
256c25a843
Merge pull request #1101 from MattStultz/patch-1
...
Fix "add_homeing" to "add_homing" to match changes
2014-10-07 08:20:53 -04:00
ca30aee903
Fix "add_homeing" to "add_homing" to match changes
2014-10-07 00:16:27 -04:00
0733825fb1
Merge pull request #1099 from Fourmi/Marlin_v1
...
Update line 627 ,wrong number on thermistortables
2014-10-06 14:36:00 +02:00
af3e4d7510
Update line 627 ,wrong number on thermistortables
...
Wrong number on line 627 > i change number "12" by the correct number "13"
Soory
2014-10-06 14:21:44 +02:00
aaaf8fe8dd
Merge pull request #1068 from darkjavi/Marlin_v1
...
Added profile for RAMPS with 2 extruders and 1 fan, no heated bed
2014-10-06 13:41:38 +02:00
b360306881
Merge pull request #1073 from WingTangWong/wing-fix-float-delta
...
Wing fix float delta
2014-10-06 13:41:01 +02:00
ce85515428
Merge pull request #1082 from Fourmi/Marlin_v1
...
Add thermistor table
2014-10-06 13:39:36 +02:00
764921bdbf
Merge pull request #1091 from Aldert/patch-1
...
Update motion_control.cpp
2014-10-06 13:37:19 +02:00
c40c7b589b
Merge pull request #1095 from thinkyhead/codeclean
...
Simple code cleanup. Rename "homeing" to homing.
2014-10-06 13:36:48 +02:00
0f2e0525df
Merge pull request #1096 from thinkyhead/set-home
...
Proposed feature: Set Home Offsets
2014-10-06 13:36:11 +02:00
5ae02a361b
Merge pull request #1097 from thinkyhead/round-up-xyz
...
Adjust the Z display to hide float rounding errors
2014-10-06 13:35:00 +02:00
83037542aa
Merge pull request #1098 from mattsch/optional_hotend_lcd
...
Make hotend optional when compiling with lcd support
2014-10-06 13:34:37 +02:00
fb34265d75
Make hotend optional when compiling with lcd support
...
Signed-off-by: Matthew Schick <matthew.schick@gmail.com >
2014-10-06 00:19:07 -04:00
6e343ef2f0
Adjust the Z display to hide float rounding errors
2014-10-05 18:34:54 -07:00
2f6c57eadc
Proposed feature: Set Home Offsets
...
Add an item to the LCD menu that applies the current axis position to
the “add_homeing” offset.
2014-10-05 13:35:45 -07:00
f989bd5435
Simple code cleanup. Rename "homeing" to homing.
2014-10-05 13:20:53 -07:00
d1e4237e1d
Update motion_control.cpp
...
G03 Full circle did not work (G02 is working correct)
2014-10-04 09:24:09 +02:00
a664763e6f
Update thermistortables.h
...
Add another thermistor table (13),it's a cartridge thermistor up to +300°C,use with Hotend "Simple ONE" & "All In ONE"
Thx
2014-09-27 09:05:10 +02:00
b5dc228a7a
Update configuration.h
...
Add another comment for thermistor 13 ,use with Hotend "Simple ONE & All In ONE"
2014-09-27 09:02:58 +02:00
3cbb2f56c6
Update configuration.h
...
Add another comment on configuration.h for the value of thermistor.
I make a pull request on thermistortables.h with my thermistor (12),but y see there is a comment on configuration with number 12 but it's not present on thermistortables.h ?
Thx
2014-09-26 22:01:06 +02:00
