SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
5966 commits 1 branch 0 tags 118 MiB
Commit graph

5966 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine 733453569b Merge pull request #4650 from thinkyhead/rc_percent_is_percent 
extruder_multiplier => flow_percentage
 2016-08-19 04:38:18 -05:00
Scott Lahteine 628dcbc764 extruder_multiplier => flow_percentage 2016-08-18 22:13:47 -05:00
Scott Lahteine 6970c24ee6 Merge pull request #4642 from zenmetsu/ru-Lang 
Ru lang updated
 2016-08-18 17:11:46 -05:00
Jason Westervelt d222ee4de2 Update language_ru.h 
Updated missing translations.  Caught up on change to MSG_HOME.
 2016-08-17 13:55:44 -07:00
Scott Lahteine 464d594450 Merge pull request #4608 from thinkyhead/rc_more_twibus_tweaks 
Additional details for I2C_SLAVE_ADDRESS
 2016-08-15 19:37:03 -07:00
Scott Lahteine d63b8e2b2b Additional details for I2C_SLAVE_ADDRESS 2016-08-15 19:27:53 -07:00
Scott Lahteine 7427290d3a Merge pull request #4634 from thinkyhead/rc_lang_disp_char 
Set language display charset in language.h
 2016-08-15 19:25:56 -07:00
Scott Lahteine aa30550b21 Keep SIMULATE_ROMFONT only language.h 2016-08-15 19:11:31 -07:00
Scott Lahteine cec61c350d Set language display charset in language.h 2016-08-15 19:01:12 -07:00
Scott Lahteine 165d7abb1b Merge pull request #4625 from thinkyhead/rc_i2c_request_capture_flush 
Add request, capture, flush to TWIBus
 2016-08-15 18:15:43 -07:00
Scott Lahteine 0e6b41a34a Merge pull request #4624 from RicardoGA/RCBugFix 
Update Spanish Lenguage
 2016-08-15 18:15:23 -07:00
RicardoGA 507784b846 Fix Messages length 2016-08-15 10:30:51 -05:00
Scott Lahteine bd928a69ec Add request, capture, flush to TWIBus 2016-08-15 00:04:20 -07:00
RicardoGA 7b7f319ed5 Update Spanish Lenguage 
Adds missing messages
 2016-08-14 23:30:43 -05:00
Scott Lahteine 132322e4d9 Fix #4614: currentScreen only defined with ULTIPANEL 2016-08-14 00:29:46 -07:00
Scott Lahteine dcd26b0403 Merge pull request #4621 from thinkyhead/rc_fan_set_output 
Init PWM-able AUTO_FAN pins with SET_OUTPUT
 2016-08-13 21:22:27 -07:00
Scott Lahteine 79ba983782 Allow reply() to use const string with no warning 2016-08-13 21:05:44 -07:00
Scott Lahteine 27570c08ba Merge pull request #4620 from thinkyhead/rc_twibus_further 
Further refinements of TWIBus
 2016-08-13 20:56:09 -07:00
Scott Lahteine 3a0a94b21a Always init configured fan pins 2016-08-13 20:38:40 -07:00
Scott Lahteine c63003ed3e Use matching auto-fan flags 2016-08-13 20:38:40 -07:00
Scott Lahteine 3475fd7b0f Init PWM-able auto fan pins with SET_OUTPUT 2016-08-13 20:38:40 -07:00
Scott Lahteine abf9696db1 Loop fan-pins based on array size 2016-08-13 20:05:32 -07:00
Scott Lahteine e88575c8ec Init next_auto_fan_check_ms to zero 2016-08-13 20:05:32 -07:00
Scott Lahteine 7272ec5608 Update HAS_FAN flags for 4 auto fans 2016-08-13 20:05:32 -07:00
Scott Lahteine 7b21811a9a Flags for matching auto-fans 2016-08-13 20:05:32 -07:00
Scott Lahteine 97e0aed304 Further refinements of TWIBus 2016-08-13 18:32:41 -07:00
Scott Lahteine 38fa1b1939 Merge pull request #4196 from cimbalo/Platformio_support 
Add working PlatformIO support
 2016-08-12 17:32:09 -07:00
Scott Lahteine d7edc039af Merge pull request #4605 from thinkyhead/rc_3drag_fan_is_8 
Fixup 3DRAG pins based on updated RAMPS pins
 2016-08-12 17:30:27 -07:00
Scott Lahteine 7147c86e9f Merge pull request #4611 from tnw513/patch-2 
Fix acceleration and feedrate following bq/Marlin
 2016-08-12 17:30:02 -07:00
Silvio 923388e0c7 Fix acceleration and feedrate following bq/Marlin 2016-08-12 15:42:20 +02:00
Scott Lahteine 405afec393 Include decimeters in filamentUsed display 2016-08-12 05:16:43 -07:00
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 2d3db5b5bd Fixup pins_3DRAG based on updated RAMPS pins 2016-08-11 15:49:47 -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