zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
1612 commits 1 branch 0 tags 156 MiB
Commit graph

1356 commits

Author SHA1 Message Date
Scott Lahteine 60598b4cdd A few constants where they belong 2014-12-17 23:01:24 -08:00
Bo Herrmannsen 280504e2e0 Merge pull request #908 from alromh87/Marlin_v1 
Support for Gen3 Monolithic electronics
 2014-12-17 22:28:07 +01:00
Bo Herrmannsen 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
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 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
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 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 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
Neil Darlow 64139f5e5a Merge https://github.com/ErikZalm/Marlin into Marlin_v1 2014-12-04 21:09:03 +00: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
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
elgambitero 433ac29d31 Updated a bit of spanish language 2014-11-27 22:02:49 +01: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
Lionello Lunesu 0d35b1d0b8 Allow negative values in menus 2014-11-25 18:34:02 +08: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 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
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
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
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
Erik van der Zalm 764921bdbf Merge pull request #1091 from Aldert/patch-1 
Update motion_control.cpp
 2014-10-06 13:37:19 +02:00
Erik van der Zalm c40c7b589b Merge pull request #1095 from thinkyhead/codeclean 
Simple code cleanup. Rename "homeing" to homing.
 2014-10-06 13:36:48 +02:00
Erik van der Zalm 0f2e0525df Merge pull request #1096 from thinkyhead/set-home 
Proposed feature: Set Home Offsets
 2014-10-06 13:36:11 +02:00
Erik van der Zalm 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