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

111 commits

Author SHA1 Message Date
wgm4321 cb12161191 Add Filament menu and add Filament/Retract settings to config store. 2014-12-28 20:43:14 -05:00
fmalpartida ec33df0554 Merge branch 'SAV-MkI_merge' into Development 
Tested for SAV MKI and SAV 3D LCD on lewihe.
 2014-12-28 19:54:06 +01:00
Bo Herrmannsen c9f60183a9 Merge pull request #1233 from NarimaanV/Development 
Fixed BABYSTEPPING feature
 2014-12-28 10:13:21 +01:00
Scott Lahteine 2f467e2797 LCD Progress Bar 2014-12-27 22:26:14 -08:00
NarimaanV 7667949aca Fixed BABYSTEPPING feature 
Moved PSTR() macro to correct place which was causing the " initializer fails to determine size of '__c' " when attempting to compile with BABYSTEPPING enabled.
 2014-12-23 12:49:54 -05:00
daid 17de96ace7 Merge branch 'Marlin_v1' into revert-1154-sd_sorting 
Conflicts:
	Marlin/cardreader.cpp
	Marlin/cardreader.h
 2014-12-18 23:13:50 +01:00
Bo Herrmannsen a9c334e8bc Merge pull request #1191 from thinkyhead/code_shrink 
Shrink and Optimize
 2014-12-18 17:23:11 +01:00
Scott Lahteine 1857e611d3 Other small tweaks 2014-12-18 07:49:16 -08:00
Scott Lahteine 63e1665fa9 Reduce ultralcd.cpp redundancies 2014-12-18 07:30:05 -08:00
Scott Lahteine e4b98011cf And one more... 2014-12-17 23:01:24 -08: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
alexborro ab355a90d3 Revert "SD Sort and Buffer" 2014-12-17 14:50:59 -02: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 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
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
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
Neil Darlow b81021f475 Merge https://github.com/ErikZalm/Marlin into Marlin_v1 2014-10-21 12:06:56 +01: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 0f2e0525df Merge pull request #1096 from thinkyhead/set-home 
Proposed feature: Set Home Offsets
 2014-10-06 13:36:11 +02:00
Matthew Schick 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
Scott Lahteine 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
Neil Darlow 1632e5e38a Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-09-04 12:21:35 +01:00
Erik van der Zalm 018b68a5c4 Merge pull request #976 from cocktailyogi/SCARA_by_Yogi 
Implemented SCARA-Maths
 2014-08-28 16:32:52 +02:00
Erik van der Zalm dde61d8886 Merge pull request #977 from OskarLinde/Marlin_v1 
Fix lcd itostr3() to handle negative numbers
 2014-08-28 16:31:53 +02:00
Neil Darlow 3cd7dbcc45 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-07-30 13:01:52 +01:00
cocktailyogi 2f4a20257c imported last Marlin changes 2014-07-20 13:49:26 +02:00
daid aacff0d361 Merge pull request #948 from Dim3nsioneer/Marlin_v1 
Implementation of FW extruder change retract
 2014-07-18 16:10:15 +02:00
Neil Darlow 3f2c771d90 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-07-07 18:17:15 +01:00
Pablo Clemente 2242a84218 Changed the declaration of the variable to Marlin_main.cpp to fix issue on commit #965 2014-07-01 16:45:03 +02:00
Neil Darlow 6e3406d228 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-07-01 10:27:39 +01:00
Pablo Clemente d86c3cf43c Changed the type of variable to bool, the name to "cancel_heatup", flags implementation and added this fix to M190 gcode too. 2014-06-30 15:12:13 +02:00
Oskar Linde 269a068032 Fix lcd itostr3() to handle negative numbers 2014-06-24 14:31:15 +02:00
cocktailyogi 512f2a3136 restore Branch from Backup 
sorry for that
 2014-06-23 17:09:57 +02:00
Pablo Clemente cd3220d055 Inverted state logic for forced_heating_stop variable 2014-06-13 08:39:58 +02:00
Pablo Clemente 86b4b805d2 Fixed stop print LCD function on M104 2014-06-12 18:43:16 +02:00
Dim3nsioneer 3c927901a4 Implementation of FW extruder change retract 
FW retraction is extended onto swap retraction invoked by 'G10 S1'.
Bookkeeping of the retract state of all extruders allows for having one
extruder fw standard retracted while another extruder is swap retracted.
An LCD menu item for the swap retract and recover length was added.
 2014-06-02 17:02:10 +02:00
Neil Darlow e541323741 Merge https://github.com/ErikZalm/Marlin into Marlin_v1 2014-05-09 15:02:50 +01:00
daid 2acd3792fc Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 2014-05-01 12:03:47 +02:00
daid 8b4c4aa5c3 Add feature to check&retry CRC read errors on SD. 2014-05-01 12:03:41 +02:00
neildarlow bbe8fbe13d Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-03-21 18:27:14 +00:00
Dim3nsioneer 944ced87c5 Extended Preheat options 
Preheat LCD menus base on code by D-Base
 2014-03-17 18:37:46 +01:00
Dim3nsioneer 3906f27c46 Individual extruder flow rate 
Extension of M221, Tune menu
 2014-03-15 18:09:46 +01:00