Commit graph

1585 commits

Author SHA1 Message Date
Bo Herrmannsen e83cfc0a62 Merge pull request #1163 from thinkyhead/lcd_abort_message
LCD "Abort" Message
2014-12-17 21:30:19 +01:00
Bo Herrmannsen 3ac8bd8de7 Merge pull request #1013 from mattrobbo10/Marlin_v1
Proposing adding gen7-dist from gen7 electronics repo - marlin now compiles for gen7
2014-12-17 21:21:18 +01:00
Bo Herrmannsen 0b310ab6c5 Merge pull request #1153 from xinfab/negative_values_in_menu
Negative values in menu
2014-12-17 20:58:01 +01:00
Bo Herrmannsen 91d740e128 Merge pull request #1141 from filipmu/Filament-Sensor
Display filament sensor data on a 20x4 LCD or Graphical LCD
2014-12-17 20:38:30 +01:00
Bo Herrmannsen 00f279376f Merge pull request #1173 from boelle/Marlin_v1
Adding Melzi board
2014-12-17 20:21:05 +01:00
alexborro 4297bcc89f Merge pull request #1154 from thinkyhead/sd_sorting
SD Sort and Buffer
2014-12-16 10:17:13 -02:00
Scott Lahteine d088b5f30f Remove debug echo 2014-12-13 06:33:12 -08:00
Scott Lahteine 1fad8e6a81 Proper long file name var 2014-12-13 06:17:00 -08:00
Scott Lahteine 467f0ea6b7 Merge branch 'sd_sorting' of https://github.com/thinkyhead/Marlin into sd_sorting 2014-12-13 06:13:18 -08:00
Scott Lahteine 29e854c535 Disable SDCARD_SORT_ALPHA by default
For legacy boards it’s better if this option is disabled.
2014-12-13 06:12:34 -08:00
Scott Lahteine 6599adc184 Polish up a little... 2014-12-13 06:12:34 -08:00
Scott Lahteine a12eec33e2 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-12-13 06:12:34 -08:00
Scott Lahteine c9486ebb85 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-12-13 06:12:33 -08:00
Scott Lahteine b6ffea612a Expand on More RAM concept, address minor bugs 2014-12-13 06:10:44 -08:00
Scott Lahteine 8196b36ad9 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-12-13 06:07:52 -08:00
Scott Lahteine cf749dbeda 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-12-13 06:03:39 -08:00
Scott Lahteine ae081d0fe0 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-12-13 06:03:39 -08:00
Scott Lahteine 785143a013 Expand on More RAM concept, address minor bugs 2014-12-13 06:03:39 -08:00
Scott Lahteine 0cbbba08bd 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-12-13 06:03:39 -08:00
Scott Lahteine 600b4f0590 Merge branch 'lcd_abort_message' of https://github.com/thinkyhead/Marlin into lcd_abort_message 2014-12-13 06:01:56 -08:00
Scott Lahteine 3ebfd29312 Print a message when printing is aborted
Messages in gcode files like “M117 Printing…” were not being cleared on
Stop Print.
2014-12-13 06:01:46 -08:00
Scott Lahteine 485ca10bc3 Disable SDCARD_SORT_ALPHA by default
For legacy boards it’s better if this option is disabled.
2014-12-06 04:16:45 -08:00
Scott Lahteine 599530902d Polish up a little... 2014-12-06 03:40:39 -08:00
Bo Herrmannsen 1ba7c31395 Adding Melzi board
these are the files needed to support the Melzi board
2014-12-04 23:45:51 +01:00
galexander1 2f9ed1777d Merge pull request #1168 from boelle/Marlin_v1
Adding Support for Toshiba Stepper Drivers
2014-12-03 09:32:23 -05:00
Bo Herrmannsen edfcf3b527 Toshiba Stepper Driver support
Tosh stepper drivers need to be driven slower, so the stepper code
was interleaved to separate the pin HIGH from the pin LOW. This adds
enough instructions to make it work, without needing nops.
2014-12-03 15:01:52 +01:00
Bo Herrmannsen c429a4b3ec Toshiba Stepper Driver support
Tosh stepper drivers need to be driven slower, so the stepper code
was interleaved to separate the pin HIGH from the pin LOW. This adds
enough instructions to make it work, without needing nops.
2014-12-03 14:37:16 +01:00
Scott Lahteine f05928d886 Merge branch 'sd_sorting' of https://github.com/thinkyhead/Marlin into sd_sorting 2014-11-30 21:38:26 -08:00
Scott Lahteine b4e287fe8e 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-30 21:37:10 -08:00
Scott Lahteine de725bd408 # This is a combination of 4 commits.
# The first commit's message is:
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.

# This is the 2nd commit message:

Expand on More RAM concept, address minor bugs

# This is the 3rd commit message:

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.

# This is the 4th commit message:

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-30 21:25:30 -08:00
Scott Lahteine 061c1fcd93 Merge branch 'lcd_abort_message' of https://github.com/thinkyhead/Marlin into lcd_abort_message 2014-11-30 19:58:10 -08:00
Scott Lahteine 181e487f13 Print a message when printing is aborted
Messages in gcode files like “M117 Printing…” were not being cleared on
Stop Print.
2014-11-30 19:57:52 -08:00
Scott Lahteine ff38d7c293 Print a message when printing is aborted
Messages in gcode files like “M117 Printing…” were not being cleared on
Stop Print.
2014-11-30 19:56:06 -08:00
nothinman 1977b4490f Merge pull request #1159 from thinkyhead/lcd_wait_better
M0/M1 Message Fix
2014-11-28 16:44:29 +00:00
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