Commit Graph

2271 Commits

Author SHA1 Message Date
Scott Lahteine
7562183efc Skip over spaces first 2014-11-28 08:09:28 -08:00
nothinman
5a8b3a84ae Merge pull request #1155 from thinkyhead/lcd_wait_better
M0-M1 Enhancements
2014-11-28 11:01:24 +00:00
nothinman
1b7c065055 Merge pull request #1158 from elgambitero/patch-2
Updated a bit of spanish language
2014-11-28 10:57:50 +00:00
elgambitero
433ac29d31 Updated a bit of spanish language 2014-11-27 22:02:49 +01:00
Scott Lahteine
2427d0b683 Merge branch 'sd_sorting' of https://github.com/thinkyhead/Marlin into sd_sorting 2014-11-26 21:09:09 -08:00
Scott Lahteine
8ebefe6d35 Completed SORT_USES_MORE_RAM implementation
For the MORE_RAM option we need to buffer both the short and long
names, even though long names are sometimes redundant. Worst case, all
the names are max length. We can save some RAM by not storing these. We
could save more RAM by only storing the visible part of the long name.
2014-11-26 21:08:56 -08:00
Scott Lahteine
725ba8d01e Improvements, more SORT_USES_MORE_RAM
With this option, always keeps the dir in RAM, doubling as a cache for
getfilename. A board with only 8K of SRAM is cutting it very close.
2014-11-26 21:08:56 -08:00
Scott Lahteine
2b54eeb897 Expand on More RAM concept, address minor bugs 2014-11-26 21:08:56 -08:00
Scott Lahteine
14187dae6c SD Card Alpha Sorting
First iteration of alphabetical sorting for SD cards, both
slow+efficient and fast+rammy. Option for folders to sort first, last,
or not at all.
2014-11-26 21:08:56 -08:00
Scott Lahteine
662fe8288b kill DEADJOE 2014-11-26 21:07:48 -08:00
Scott Lahteine
aad336eb81 Merge branch 'lcd_wait_better' of https://github.com/thinkyhead/Marlin into lcd_wait_better 2014-11-26 21:06:13 -08:00
Scott Lahteine
5874852501 get latest Marlin_v1 changes 2014-11-26 21:05:11 -08:00
Scott Lahteine
12b51d6060 Ignore S and P if no value >0 is included. 2014-11-26 21:05:11 -08:00
Scott Lahteine
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
Scott Lahteine
3f54c9ba33 Relocate click ignore code into info screen 2014-11-26 21:05:10 -08:00
Scott Lahteine
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
Scott Lahteine
5714f64927 get latest Marlin_v1 changes 2014-11-26 21:00:02 -08:00
Scott Lahteine
d407a43ac1 Ignore S and P if no value >0 is included. 2014-11-26 09:21:37 -08:00
Scott Lahteine
eaa788e076 Completed SORT_USES_MORE_RAM implementation
For the MORE_RAM option we need to buffer both the short and long
names, even though long names are sometimes redundant. Worst case, all
the names are max length. We can save some RAM by not storing these. We
could save more RAM by only storing the visible part of the long name.
2014-11-26 08:51:31 -08:00
Scott Lahteine
6901445592 Improvements, more SORT_USES_MORE_RAM
With this option, always keeps the dir in RAM, doubling as a cache for
getfilename. A board with only 8K of SRAM is cutting it very close.
2014-11-26 07:17:47 -08:00
Lionello Lunesu
0d35b1d0b8 Allow negative values in menus 2014-11-25 18:34:02 +08:00
Scott Lahteine
87fc00c182 Expand on More RAM concept, address minor bugs 2014-11-24 20:26:27 -08:00
Scott Lahteine
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
Scott Lahteine
aa4160ba62 Relocate click ignore code into info screen 2014-11-24 17:12:08 -08:00
Scott Lahteine
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
Scott Lahteine
f40cff59f3 SD Card Alpha Sorting
First iteration of alphabetical sorting for SD cards, both
slow+efficient and fast+rammy. Option for folders to sort first, last,
or not at all.
2014-11-24 14:03:20 -08:00
galexander1
90eb266139 Merge pull request #1148 from krasin/travis
Add Travis CI config to build Marlin firmware.
2014-11-16 08:57:31 -05:00
Ivan Krasin
d078c7c29f Add Travis CI config to build Marlin firmware. 2014-11-16 01:46:24 -05:00
galexander1
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
Jonas
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
Filip Mulier
1651ccc0cc Added Filament Sensor to the README
Added some background on the filament sensor to explain it better.
2014-11-10 22:05:20 -06:00
Filip Mulier
3b1ab84536 Display Filament Sensor data on graphic LCD
Added support to show the filament width on the status line of the
graphic LCD.  The status will show for 5 sec and then switch over to
data.  Status can be seen by clicking the button.
2014-11-10 21:46:37 -06:00
Filip Mulier
d84934d8c5 Display Filament Sensor data on 20x4 LCD
Changes to support displaying the real-time filament width and the
volume factor on a 20x4 LCD.  The data is displayed on the 4th line.
First the status message is displayed for 5 seconds, and then the
filament data is displayed.  The status message can be seen by
re-selecting the info screen in the menu.
2014-11-10 21:43:58 -06:00
Bernhard Kubicek
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
Filip Mulier
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
filipmu
df7c80335a Merge pull request #3 from filipmu/Marlin_v1
Sync up from my Marlin_v1 to Filament-sensor
2014-11-09 07:07:26 -06:00
filipmu
b014fd1ad2 Merge pull request #2 from ErikZalm/Marlin_v1
Sync up to Marlin
2014-11-09 07:01:57 -06:00
galexander1
443b648863 Merge pull request #1133 from monkeydave/update_delta_config
Updated example configurations for Delta printers
2014-11-03 08:14:54 -05:00
David
377dfb182f Updated example configurations for Delta printers 2014-11-02 21:04:54 +00:00
Neil Darlow
b81021f475 Merge https://github.com/ErikZalm/Marlin into Marlin_v1 2014-10-21 12:06:56 +01:00
Erik van der Zalm
724197454c Merge pull request #1104 from ch100/Marlin_v1
Fixed typo.
2014-10-11 23:10:00 +02:00
Erik van der Zalm
058e446531 Merge pull request #1037 from filipmu/Filament-Sensor
Support for a filament diameter sensor
2014-10-11 22:56:01 +02:00
Christian Inci
110c5dcf23 Fixed typo.
Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
2014-10-11 00:25:36 +02:00
galexander1
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
Matt Stultz
ca30aee903 Fix "add_homeing" to "add_homing" to match changes 2014-10-07 00:16:27 -04:00
Erik van der Zalm
0733825fb1 Merge pull request #1099 from Fourmi/Marlin_v1
Update line 627 ,wrong number on thermistortables
2014-10-06 14:36:00 +02:00
Fourmi
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
Erik van der Zalm
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
Erik van der Zalm
b360306881 Merge pull request #1073 from WingTangWong/wing-fix-float-delta
Wing fix float delta
2014-10-06 13:41:01 +02:00
Erik van der Zalm
ce85515428 Merge pull request #1082 from Fourmi/Marlin_v1
Add thermistor table
2014-10-06 13:39:36 +02:00