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

5576 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine 92757bd7b3 Merge pull request #4339 from esenapaj/Follow-up-the-PR-#4163 
Follow-up the PR #4163 (Mixing and Switching Extruders)
 2016-07-17 18:15:23 -07:00
Scott Lahteine cbf9fa7995 Merge pull request #4338 from thinkyhead/rc_anhardt_58 
Use blocking_move, current_position in G28 homing
 2016-07-17 18:12:40 -07:00
esenapaj 5c8e87a866 Follow-up the PR #4163 (Mixing and Switching Extruders) 
・Update forgotten K8400 files
 2016-07-18 09:48:13 +09:00
Scott Lahteine 86eb5251c5 Fix some debug messages 2016-07-17 17:10:02 -07:00
Scott Lahteine 1e57a6af73 Use blocking_move, current_position in G28 homing 2016-07-17 16:56:13 -07:00
Scott Lahteine f242aea032 Merge pull request #4319 from thinkyhead/rc_feedrates_to_mess_with_you 
Wrangle feed rate variables
 2016-07-17 14:07:52 -07:00
Scott Lahteine 0342661b3f Merge pull request #4335 from thinkyhead/rc_status_pad_jp 
Debug char, fix compile errors for lcd pins
 2016-07-17 14:07:08 -07:00
Scott Lahteine 81e01152bb Merge pull request #4336 from thinkyhead/rc_bltouch_sensor 
BLTouch probe sensor
 2016-07-17 14:06:32 -07:00
Scott Lahteine d8c8d0a6a2 Merge pull request #4337 from thinkyhead/rc_inverts_as_macros 
Endstop invert flags as macros instead of const bool
 2016-07-17 14:06:10 -07:00
Scott Lahteine 1583177ef4 BLTOUCH probe config option 2016-07-17 13:55:38 -07:00
Scott Lahteine 176b9627c7 Some cleanup ahead of BLTOUCH support 2016-07-17 13:55:38 -07:00
Scott Lahteine 39706f3e57 Endstop invert flags as macros instead of const bool 2016-07-17 13:51:02 -07:00
Scott Lahteine 253f843da5 Merge pull request #4306 from thinkyhead/rc_stupid_name_okbai 
ENDSTOPS_ONLY_FOR_HOMING is confusing
 2016-07-17 13:50:19 -07:00
Scott Lahteine 7242d44810 Endstops vars already initialized 2016-07-17 13:38:48 -07:00
Scott Lahteine 5ed1e7a464 codenum => dwell_ms 2016-07-17 13:35:21 -07:00
Scott Lahteine 69d6016941 Revert default state of endstops in M502 2016-07-17 13:35:21 -07:00
Scott Lahteine 0fcd3706dd Replace ENDSTOPS_ONLY_FOR_HOMING with ENDSTOPS_ALWAYS_ON_DEFAULT 2016-07-17 13:35:21 -07:00
Scott Lahteine 671634bf11 Fix spacing after section header 2016-07-17 13:35:21 -07:00
Scott Lahteine f38553b482 fix a debug message 2016-07-17 13:29:42 -07:00
Scott Lahteine 3d78b8f929 Use HYPOT macro instead of hypot function 2016-07-17 13:29:42 -07:00
Scott Lahteine 9f9fe043ba Apply sq macro throughout 2016-07-17 13:29:41 -07:00
Scott Lahteine 93ba5bddd7 Append units to feedrate variables 2016-07-17 13:29:41 -07:00
Scott Lahteine 889570029a Merge pull request #4332 from esenapaj/Update-URL 
Update URL in createTemperatureLookupMarlin.py
 2016-07-17 12:29:55 -07:00
Scott Lahteine 5e3d3918b6 Patch compile error for RAMPS LCD pins 2016-07-17 12:27:37 -07:00
Scott Lahteine 94955a8bf7 pad string in lcd_finishstatus 2016-07-17 12:27:37 -07:00
Scott Lahteine 21ee0612e3 Debug char 2016-07-17 12:27:36 -07:00
Scott Lahteine c3cc24242c Merge pull request #4330 from thinkyhead/rc_debug_g28_more 
Debugging of MBL in G28
 2016-07-17 11:36:19 -07:00
Scott Lahteine 8f24e0a556 Debugging of MBL in G28 2016-07-17 11:08:30 -07:00
Scott Lahteine f8973a7cec Merge pull request #4163 from thinkyhead/rc_new_extruders_diff 
Mixing and Switching Extruders
 2016-07-17 11:05:03 -07:00
Scott Lahteine 05da02f0a2 Implement MIXING_EXTRUDER and SWITCHING_EXTRUDER 2016-07-17 10:53:10 -07:00
esenapaj ce2814ed60 Update URL in createTemperatureLookupMarlin.py 2016-07-17 21:08:09 +09:00
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
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