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

5933 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine fef0e8ba86 Merge pull request #4610 from thinkyhead/rc_sd_pause_and_stop 
Fix stopSDPrint so it works when paused
 2016-08-12 04:09:22 -07:00
Scott Lahteine 192ac2dfd7 Squish some CardReader code 2016-08-12 03:32:42 -07:00
Scott Lahteine 61932b859e Fix bug in CardReader::stopSDPrint 
If the SD print is paused, it cannot be stopped
 2016-08-12 03:21:10 -07:00
Scott Lahteine 9e5d5a3b7c Merge pull request #4597 from tnw513/italian_fix 
Added hyphenated strings for full graphic display
 2016-08-12 02:37:53 -07:00
Silvio Didonna f999292eea added hyphenated letters for full graphic display and fixed some strings 2016-08-12 08:57:22 +02:00
Scott Lahteine 11027a56b6 Merge pull request #4606 from thinkyhead/rc_more_i2c_slave 
Add an i2c request handler
 2016-08-11 23:51:56 -07:00
Scott Lahteine 67f119d18b Add an i2c request handler 2016-08-11 18:09:18 -07:00
Scott Lahteine d29a64d4b3 Merge pull request #4603 from thinkyhead/rc_less_MSG_MOVE 
Strip never-translated strings from language files
 2016-08-11 14:21:58 -07:00
Scott Lahteine d6a7ca6553 Merge pull request #4584 from thinkyhead/rc_delta_cal_more 
Use configured feedrates, center in DELTA_CALIBRATION_MENU
 2016-08-11 14:04:05 -07:00
Scott Lahteine 64f15ac451 Merge pull request #4602 from thinkyhead/rc_marlinserial_clean 
Minor cleanup of SdFatUtil.h, MarlinSerial.cpp
 2016-08-11 13:42:16 -07:00
Scott Lahteine d3b432adca Strip never-translated strings from language files 2016-08-11 13:41:07 -07:00
Scott Lahteine 1a558ef486 Tweak MarlinSerial precursor 2016-08-11 12:47:06 -07:00
Scott Lahteine 802818f7ab Cleanup SdFatUtil.h 2016-08-11 12:47:06 -07:00
Scott Lahteine 52560e257f Merge pull request #4595 from thinkyhead/rc_i2c_slave 
Add support for i2c slave address
 2016-08-11 12:39:26 -07:00
Scott Lahteine 432e9a1f50 Use configured feedrates, center for DELTA_CALIBRATION_MENU 2016-08-11 12:05:55 -07:00
Scott Lahteine cd496dd9bd do_blocking_move_to can't be 'inline', takes const ref args 2016-08-11 12:05:55 -07:00
Scott Lahteine dd75fca4d9 Make M155 / M156 a bit more flexible 2016-08-11 00:52:01 -07:00
Scott Lahteine 30afac64c4 Merge pull request #4594 from thinkyhead/rc_fix_serial_output 
Fix serial output for MBL, M303
 2016-08-11 00:05:30 -07:00
Scott Lahteine e3efb04295 Shoehorn EXPERIMENTAL_I2CBUS into Travis test 2016-08-10 23:35:46 -07:00
Scott Lahteine a99ecf71d8 Add support for i2c slave address 2016-08-10 23:30:35 -07:00
Scott Lahteine b63d70b186 Fix serial output for MBL, M303 2016-08-10 18:49:52 -07:00
Scott Lahteine a36a168af2 Use the truly configured middle on Delta 2016-08-10 00:03:22 -07:00
Scott Lahteine 58c8e6cef2 Fixes #4576: Convert filamentUsed to long for display 2016-08-09 23:57:28 -07:00
Scott Lahteine 01f1f779a5 Followup to #4574, specify L for long 2016-08-09 23:43:37 -07:00
Scott Lahteine fa2467a834 Merge pull request #4578 from Kaibob2/patch-2 
Update language_de.h with MSG_MOVE_E1 - E4
 2016-08-09 23:04:15 -07:00
Kaibob2 1c7bd17e60 Update language_de.h with MSG_MOVE_E1 - E4 
MSG_MOVE_E1 was missing
MSG_MOVE_E2 was missing
MSG_MOVE_E3 was missing
MSG_MOVE_E4 was missing

I assigned "0" to "MSG_MOVE_E1", "1" to "MSG_MOVE_E2" and so on, as this is what i assume to be the standard naming for the first (E0) and second (E1) extruder. This would have to be changed inthe other languages too :(
 2016-08-09 20:49:26 +02:00
Scott Lahteine bd8ea21abe Merge pull request #4574 from thinkyhead/rc_graphical_days 
Include days in Graphical LCD print timer
 2016-08-08 23:53:31 -07:00
Scott Lahteine 880cdb553b Include days in Graphical LCD print timer 2016-08-08 23:21:36 -07:00
Scott Lahteine f4ac8c15e3 Merge pull request #4573 from thinkyhead/rc_mintemp_bed_later 
Throw MINTEMP BED error only if heating
 2016-08-08 23:02:42 -07:00
Scott Lahteine b7b5b50a84 Throw bed min temp error only if heating 2016-08-08 22:49:22 -07:00
Scott Lahteine d3ba878f70 Drop intermediate float in HEATER_0_USES_MAX6675 test 2016-08-08 22:49:22 -07:00
Scott Lahteine 3e8f9ecd1c Extend min/max_temp_error for the bed 2016-08-08 22:49:21 -07:00
Scott Lahteine 1f15f0df5f Merge pull request #4572 from thinkyhead/rc_digital_clock_100h 
Show up to 99:59 in digital time
 2016-08-08 22:28:29 -07:00
Scott Lahteine b772172c84 Merge pull request #4571 from thinkyhead/rc_proper_delta_calibration 
Patch command order in delta calibration menu
 2016-08-08 21:50:42 -07:00
Scott Lahteine 8100a4dace Fix a compile error in EMERGENCY_PARSER sanity check 2016-08-08 21:49:57 -07:00
Scott Lahteine 45f67164b6 Simplify the delay in kill() 2016-08-08 21:49:34 -07:00
Scott Lahteine 30b1c731b5 Show up to 99:59 in digital time 2016-08-08 21:26:34 -07:00
Scott Lahteine 3be4511230 Patch command order in delta calibration menu 2016-08-08 21:15:25 -07:00
Scott Lahteine 9afa060ed6 Merge pull request #4570 from thinkyhead/rc_proper_delta_calibration 
Make DELTA_CALIBRATION_MENU more universal
 2016-08-08 21:11:40 -07:00
Scott Lahteine 46c8862635 Merge pull request #4564 from AnHardt/max-spi-setup 
MISO is an input
 2016-08-08 21:01:15 -07:00
Scott Lahteine dad4702e85 Merge pull request #4569 from thinkyhead/rc_disable_slowdown_on_delta 
Always disable SLOWDOWN for DELTA/SCARA
 2016-08-08 20:58:40 -07:00
Scott Lahteine 88540d8ecf Fix: LCD displays SD status at startup 2016-08-08 20:53:18 -07:00
Scott Lahteine b16ea09498 Make DELTA_CALIBRATION_MENU more universal 2016-08-08 20:42:58 -07:00
Scott Lahteine 85c4d5d2b5 Include DELTA_CALIBRATION_MENU in DELTA travis test 2016-08-08 20:35:04 -07:00
Scott Lahteine 3a56836ead Always disable SLOWDOWN for DELTA/SCARA 2016-08-08 18:06:46 -07:00
AnHardt aa9b52b2e7 MISO is an input 2016-08-08 20:09:57 +02:00
Scott Lahteine 67c4acf750 Merge pull request #4562 from thinkyhead/rc_fix_z_dual_endstops 
Fix Z_DUAL_ENDSTOPS with Z MIN Homing
 2016-08-07 19:23:09 -07:00
Scott Lahteine 1edbea0fcb Merge pull request #4563 from thinkyhead/rc_explain_probe_heights 
Explain that Z_PROBE_*_HEIGHT options are nozzle-relative
 2016-08-07 19:22:19 -07:00
Scott Lahteine e113740fa3 Specify that Z_PROBE_*_HEIGHT is nozzle-relative 2016-08-07 17:54:17 -07:00
Scott Lahteine 462e189edd Move pullups after Z_DUAL_ENDSTOPS block 2016-08-07 17:43:02 -07:00