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

5896 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine 22b4cff423 New extruder type configuration options 2016-07-17 00:13:56 -07:00
Scott Lahteine 9730a9355c Travis test for Mixing and Switching extruders 2016-07-17 00:13:56 -07:00
esenapaj 601015b73e Update Japanese translation 2016-07-17 16:04:12 +09:00
Scott Lahteine 9766e24504 Merge pull request #4277 from thinkyhead/rc_mks_13_viki2 
Support for VIKI2 with MKS 1.3 / 1.4
 2016-07-16 23:49:33 -07:00
Scott Lahteine 02285662f5 Merge pull request #4298 from jbrazio/feature/filament-counter 
Adds filamentUsed and longestPrint stats to PrintCounter
 2016-07-16 23:48:46 -07:00
Scott Lahteine bf16ae5a70 Merge pull request #4299 from jbrazio/feature/g27-park-nozzle 
Implements park nozzle feature
 2016-07-16 23:47:12 -07:00
Scott Lahteine aaa0d298b9 Merge pull request #4326 from thinkyhead/rc_no_static_items_fix 
Suppress compiler warnings in ultralcd.cpp
 2016-07-16 23:38:08 -07:00
Scott Lahteine cc3ef73583 Merge pull request #4327 from thinkyhead/rc_petrzjr_long_print 
LCD Longer print
 2016-07-16 23:37:34 -07:00
Scott Lahteine 77c8fb627f Merge pull request #4329 from thinkyhead/rc_italian_fix 
Added missing Italian translations
 2016-07-16 23:37:15 -07:00
Scott Lahteine b14888501b Merge pull request #4301 from Ingramz/RCBugFix 
Add Cartesio CN Controls V11
 2016-07-16 22:35:07 -07:00
Silvio Didonna 32e0d71729 Added missing translations 2016-07-16 22:26:46 -07:00
Scott Lahteine 0f3232065e Merge pull request #4305 from jbrazio/feature/splash-improvement 
Custom boot screen feature improvement
 2016-07-16 21:59:39 -07:00
Petr Zahradník junior 2d7fe9dc78 LCD Longer print 2016-07-16 18:21:06 -07:00
Scott Lahteine eee903bd4b Format some DAC lines 2016-07-16 17:59:13 -07:00
Scott Lahteine d53dcaa796 Suppress some compiler warnings 2016-07-16 17:59:01 -07:00
João Brázio 9775af0c24 Update travis to handle custom_bootscreen.h files 2016-07-17 01:31:44 +01:00
João Brázio fa4274cf4c Improves the custom bootscreen logo feature 2016-07-17 01:31:44 +01:00
João Brázio 1f3283e3a5 Adds custom boot logos for bq Hephestos 2 and Cartesio 2016-07-17 01:31:36 +01:00
João Brázio dfa1c45075 Adds a notice to vendors about the SHOW_CUSTOM_BOOTSCREEN directive 2016-07-17 01:15:17 +01:00
Scott Lahteine ed468e848f Merge pull request #4321 from esenapaj/Follow-up-the-PR-#4287 
Follow-up and fix the PR #4287 (Allow stopwatch and printcounter to go over 18:12:15)
 2016-07-16 17:14:21 -07:00
João Brázio a8758619ec The safe_delay() is now globaly accessible 2016-07-16 12:28:06 +01:00
João Brázio 9a00108cb6 Adds the WEBSITE_URL as the boot screen line 2 2016-07-16 12:24:37 +01:00
João Brázio f5234b0695 Adds a customizable screen timeout for the default boot screen 2016-07-16 12:24:36 +01:00
João Brázio 2f26bc2153 Adds filamentUsed and longestPrint stats to PrintCounter 2016-07-16 12:12:27 +01:00
João Brázio 336481ea81 Added G27 configuration options to all configs 2016-07-16 12:07:59 +01:00
João Brázio c711701626 Implements a nozzle parking command (G27) 2016-07-16 12:07:59 +01:00
João Brázio 7202383695 Merge pull request #4323 from jbrazio/followup-4320 
Followup for #4320
 2016-07-16 12:07:31 +01:00
João Brázio 5f368d1bc3 Followup for #4320 2016-07-16 11:57:35 +01:00
João Brázio d7c51bc4b9 Merge pull request #4320 from jbrazio/followup/4307 
Moves do_blocking_move_to_xy() out of the HAS_BED_PROBE define
 2016-07-16 11:48:00 +01:00
esenapaj af9b1d79b1 Follow-up and fix the PR #4287 (Allow stopwatch and printcounter to go over 18:12:15) 
・Remove MSG_END_HOUR and MSG_END_MINUTE from all the language files
・Change from MSG_INFO_TOTAL_PRINTS to MSG_INFO_PRINT_COUNT in German
file
 2016-07-16 18:39:22 +09:00
Scott Lahteine e563634a25 Merge pull request #4314 from AnHardt/use-d_b_m_t-in-g28 
Use do_blicking_move_to*() in G28
 2016-07-15 20:22:02 -07:00
Scott Lahteine 59ae1811c2 Merge pull request #4303 from AnHardt/delta-g28 
DELTA: Move out of the clip-zone after G28
 2016-07-15 20:20:22 -07:00
Scott Lahteine ead155399f Merge pull request #4311 from jbrazio/bugfix/print_xyz-overflow 
Fixes an PSTR overflow with print_xyz()
 2016-07-15 20:08:09 -07:00
João Brázio fdea8b6e6a Moves do_blocking_move_to_xy() out of the HAS_BED_PROBE define 2016-07-16 03:59:49 +01:00
AnHardt d2a49c016d DELTA: Move out of the clip-zone after G28 
Move down to a safe height after G28 for DELTAs.
 2016-07-15 15:22:44 +02:00
AnHardt 46994fd17d Use do_blicking_move_to*() in G28 2016-07-15 15:02:15 +02:00
João Brázio ffbb31b235 Fixes an PSTR overflow with print_xyz() 2016-07-15 11:25:34 +01:00
Indrek Ardel ecb23c1b65 Add Cartesio CN Controls V11 board 2016-07-15 12:55:47 +03:00
Indrek Ardel c8f2dd7cd5 Fix CN Controls 12 styling 2016-07-15 09:54:09 +03:00
Scott Lahteine cec7110409 Merge pull request #4308 from thinkyhead/rc_debug_gcode_t 
Added logging related to gcode_T
 2016-07-14 19:46:33 -07:00
Scott Lahteine 6446d3939a Merge pull request #4309 from thinkyhead/rc_static_item_fix_77 
Fix skipping of static items
 2016-07-14 19:28:49 -07:00
Scott Lahteine 84bf58db72 Merge pull request #4307 from jbrazio/feature/movement-unleash 
Remove do_blocking_move_*() dependency on HAS_BED_PROBE
 2016-07-14 19:23:30 -07:00
Scott Lahteine 95ab2fd3ae Fix skipping of static items 2016-07-14 19:16:16 -07:00
Scott Lahteine 166f19251e Add more debugging for leveling 
- Especially in `gcode_T`
- In `update_software_endstops`
- Some tweaks to observe
 2016-07-14 19:04:13 -07:00
Scott Lahteine 7ac0b91a45 Collapsible long comment in gcode_T 2016-07-14 18:28:41 -07:00
João Brázio e71a631f8f do_blocking_move_*() no longer depend on HAS_BED_PROBE 2016-07-15 01:54:14 +01:00
Scott Lahteine 8bf6861af8 Merge pull request #4054 from jbrazio/feature/g12-clean-tool 
Implements clean nozzle feature (Lulzbot's REWIPE)
 2016-07-14 14:38:38 -07:00
Scott Lahteine 75901b616c Merge pull request #4287 from thinkyhead/rc_long_print_times 
Allow stopwatch and printcounter to go over 18:12:15
 2016-07-14 12:14:15 -07:00
Scott Lahteine c5e51f6b96 finished => completed 2016-07-14 11:46:35 -07:00
Scott Lahteine 1618870c84 card.printingHasFinished does print_job_timer.stop 2016-07-14 11:39:58 -07:00