bd22405412
Merge pull request #1190 from thinkyhead/sd_sorting
...
Wrap call to flush_presort
2014-12-18 12:50:55 +01:00
49791949af
Wrap call to flush_presort
2014-12-18 03:47:12 -08:00
140ce06692
Merge pull request #1188 from thinkyhead/lcd_longname
...
LCD Long Filename
2014-12-18 09:59:18 +01:00
28c3ad291a
Merge branch 'sd_freemem' of https://github.com/thinkyhead/Marlin into sd_freemem
2014-12-17 23:27:21 -08:00
0450e83fa5
Use SdFatUtil::FreeRam() for freeMemory() if there
2014-12-17 23:26:52 -08:00
f21cce0b28
Rebase to Marlin_v1
2014-12-17 23:07:36 -08:00
39b47ef5b0
Merge branch 'fix_constants' of https://github.com/thinkyhead/Marlin into fix_constants
...
Conflicts:
Marlin/cardreader.h
2014-12-17 23:02:23 -08:00
e4b98011cf
And one more...
2014-12-17 23:01:24 -08:00
60598b4cdd
A few constants where they belong
2014-12-17 23:01:24 -08:00
f074706d2e
And one more...
2014-12-17 20:29:34 -08:00
b726511a3b
A few constants where they belong
2014-12-17 20:22:33 -08:00
4d61287807
Merge pull request #1186 from boelle/Marlin_v1
...
adding hardware files for OMC
2014-12-17 23:28:30 +01:00
b17b8583af
adding hardware files for OMC
...
for ide 1.0.6
2014-12-17 23:01:30 +01:00
280504e2e0
Merge pull request #908 from alromh87/Marlin_v1
...
Support for Gen3 Monolithic electronics
2014-12-17 22:28:07 +01:00
341c7d080d
Merge pull request #996 from cbane/arduino-1.5
...
Add Arduino add-ons for Arduino 1.5
2014-12-17 21:46:18 +01:00
31ca3de72f
Merge pull request #819 from neildarlow/Marlin_v1
...
Activate LiquidTWI2 device detection and space-pad LCD status line.
2014-12-17 21:42:53 +01:00
e83cfc0a62
Merge pull request #1163 from thinkyhead/lcd_abort_message
...
LCD "Abort" Message
2014-12-17 21:30:19 +01:00
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
0b310ab6c5
Merge pull request #1153 from xinfab/negative_values_in_menu
...
Negative values in menu
2014-12-17 20:58:01 +01:00
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
00f279376f
Merge pull request #1173 from boelle/Marlin_v1
...
Adding Melzi board
2014-12-17 20:21:05 +01:00
ab355a90d3
Revert "SD Sort and Buffer"
2014-12-17 14:50:59 -02:00
4297bcc89f
Merge pull request #1154 from thinkyhead/sd_sorting
...
SD Sort and Buffer
2014-12-16 10:17:13 -02:00
d088b5f30f
Remove debug echo
2014-12-13 06:33:12 -08:00
1fad8e6a81
Proper long file name var
2014-12-13 06:17:00 -08:00
467f0ea6b7
Merge branch 'sd_sorting' of https://github.com/thinkyhead/Marlin into sd_sorting
2014-12-13 06:13:18 -08:00
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
6599adc184
Polish up a little...
2014-12-13 06:12:34 -08:00
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
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
b6ffea612a
Expand on More RAM concept, address minor bugs
2014-12-13 06:10:44 -08:00
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
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
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
785143a013
Expand on More RAM concept, address minor bugs
2014-12-13 06:03:39 -08:00
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
af0549bfd2
Merge branch 'sd_freemem' of https://github.com/thinkyhead/Marlin into sd_freemem
2014-12-13 06:03:15 -08:00
ae1a698263
Use SdFatUtil::FreeRam() for freeMemory() if there
2014-12-13 06:03:10 -08:00
600b4f0590
Merge branch 'lcd_abort_message' of https://github.com/thinkyhead/Marlin into lcd_abort_message
2014-12-13 06:01:56 -08:00
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
2ef0669b19
Split do_blocking_move() to XY and Z sections to make sure that the Z homing feedrate is not exceeded
2014-12-07 15:31:46 +00:00
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
599530902d
Polish up a little...
2014-12-06 03:40:39 -08:00
1ba7c31395
Adding Melzi board
...
these are the files needed to support the Melzi board
2014-12-04 23:45:51 +01:00
64139f5e5a
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
2014-12-04 21:09:03 +00:00
2f9ed1777d
Merge pull request #1168 from boelle/Marlin_v1
...
Adding Support for Toshiba Stepper Drivers
2014-12-03 09:32:23 -05:00
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
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
e5a334b83a
Use SdFatUtil::FreeRam() for freeMemory() if there
2014-12-03 05:19:42 -08:00
f05928d886
Merge branch 'sd_sorting' of https://github.com/thinkyhead/Marlin into sd_sorting
2014-11-30 21:38:26 -08:00
