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

6721 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine
1e00f5a4bd Merge pull request #5097 from thinkyhead/rc_fix_endstop_issue 
Don't trigger endstops that are actually Z2 or probe
 2016-10-27 08:32:48 -05:00
Scott Lahteine
9a23f73765 Don't trigger endstops that are actually Z2 or probe 2016-10-27 08:12:17 -05:00
Scott Lahteine
c07cc9e3f1 Revert changes made to z dual endstop test 
#3631 broke z dual endstops. Solved by @Nocturnal42 in https://github.com/MarlinFirmware/Marlin/issues/5078#issuecomment-256572248
 2016-10-27 07:41:39 -05:00
Scott Lahteine
c4c53856a4 Merge pull request #5094 from esenapaj/Fix-for-the-PR-#5088 
Fix for the PR #5088 (Handle M108 in M1 also with ULTIPANEL)
 2016-10-26 21:51:18 -05:00
Scott Lahteine
2e3110539b Merge pull request #5095 from thinkyhead/rc_fix_bilinear_math 
Fix bilinear grid constraints
 2016-10-26 21:48:19 -05:00
Scott Lahteine
4ec7ed554d Merge pull request #5093 from esenapaj/Follow-up-the-PR-#5087-etc 
Follow-up the PR #5087 (Fixed SERVO pins on Azteeg X3), etc
 2016-10-26 21:23:34 -05:00
esenapaj
d5a5042d23 Fix for the PR #5088 (Handle M108 in M1 also with ULTIPANEL) 2016-10-27 10:32:20 +09:00
Scott Lahteine
9cbedab91b Use DPM where possible 2016-10-26 18:38:32 -05:00
Scott Lahteine
ad38d91692 Sanity check that auto fan pins can do PWM 2016-10-26 18:38:32 -05:00
Scott Lahteine
95275eb9b3 Predefine auto fan pins in some pins files 2016-10-26 18:38:32 -05:00
Scott Lahteine
3f94b15cef Fix bilinear grid constraints 
Followup to #5090
 2016-10-26 18:11:26 -05:00
Scott Lahteine
d439fb95f7 Sanity check for the renamed options 2016-10-26 17:51:26 -05:00
Scott Lahteine
b6aa894893 Rename auto fan pins and add auto fan flags 2016-10-26 17:51:26 -05:00
Scott Lahteine
ada935de87 Allow TEMP_STAT_LEDS with only one LED defined 2016-10-26 17:51:26 -05:00
Scott Lahteine
4b056d8184 Fix warning in ultralcd.cpp 2016-10-26 17:51:26 -05:00
Scott Lahteine
9dfd029911 Fix bug in fastio.h _GET_TIMER 2016-10-26 17:51:25 -05:00
esenapaj
8b1d90e281 Follow-up the PR #5087 (Fixed SERVO pins on Azteeg X3), etc 
・Add header
・Adjust spacing
 2016-10-27 06:46:03 +09:00
Scott Lahteine
bfd3b3c604 Merge pull request #5087 from Fulg/azteeg-x3-pins 
Fixed SERVO pins on Azteeg X3
 2016-10-26 06:01:16 -05:00
Scott Lahteine
208d720614 Merge pull request #5082 from Fulg/RCBugFix 
Only issue MAXTEMP when heating
 2016-10-26 05:55:33 -05:00
Scott Lahteine
b5d9639dd0 Merge pull request #5090 from thinkyhead/rc_fix_bilinear_math 
Fix for bilinear grid outside bounds
 2016-10-26 05:45:17 -05:00
Scott Lahteine
f0d673561f Fix for bilinear grid outside bounds 2016-10-26 05:00:03 -05:00
Scott Lahteine
24bcea6c02 Merge pull request #5088 from thinkyhead/rc_break_m1_fix 
Handle M108 in M1 also with ULTIPANEL
 2016-10-26 00:44:01 -05:00
Scott Lahteine
1ba1ec0db9 Handle M108 in M1 also with ULTIPANEL 2016-10-25 23:25:47 -05:00
Scott Lahteine
7ad33422e3 Clear dir_t size, not pointer size 2016-10-25 22:59:40 -05:00
Benoit Miller
1c716034ec Fixed SERVO pins on Azteeg X3 2016-10-25 17:11:26 -04:00
Benoit Miller
2aa12d78dc Only issue MAXTEMP when heating 2016-10-24 17:09:29 -04:00
Scott Lahteine
3fcf915808 Fix uninitialized var in reset_acceleration_rates 2016-10-24 11:55:41 -05:00
Scott Lahteine
14f824c3de Merge pull request #5071 from esenapaj/Extend-measuring-range-of-thermocouple 
Extend measuring range of thermocouple for MAX31855
 2016-10-24 02:00:12 -05:00
Scott Lahteine
1097a50694 Merge pull request #5070 from gcormier/rcbugfix 
Fix #4995 - M48/G29 on CoreXY maybe others?
 2016-10-24 00:56:36 -05:00
Scott Lahteine
fed6cfc5f5 Merge pull request #5074 from Sebastianv650/Accel_calc_v2 
Planner acceleration bugfix and speedup v2
 2016-10-23 16:42:57 -05:00
Sebastianv650
c397b9d60a Planner acceleration bugfix and speedup v2 
.) Use already existing inverse_millimeters instead of /
block->millimeters.
.) Prevent overflow during acceleration calculation by checking if float
is necessary. Idea modified from Sailfish.
.) Save two uint32_t or even float multiplications by checking if
step[AXIS] has steps and if max acceleration is lower than accel. If
not, there is no need to check this axis.
 2016-10-23 12:47:46 +02:00
Scott Lahteine
aa99bd8d13 Merge pull request #5068 from esenapaj/Fix-for-PR-#5066 
Fix for the PR #5066 (Updated french translation)
 2016-10-23 02:56:36 -05:00
esenapaj
70e287ca8c Extend measuring range of thermocouple for MAX31855 2016-10-23 10:22:39 +09:00
Greg Cormier
f0aed9dac7 Fix #4995 - M48/G29 on CoreXY maybe others? 2016-10-22 20:45:13 -04:00
esenapaj
e50992694f Fix for the PR #5066 (Updated french translation) 
MSG_INFO_PRINT_TIME is still being used
 2016-10-23 06:09:56 +09:00
Scott Lahteine
483082387c Merge pull request #5022 from esenapaj/Fix-for-the-PR-#4553 
Fix for the PR #4553 (Save bytes for custom chars (Hitachi LCD))
 2016-10-22 13:54:09 -05:00
Scott Lahteine
8b967a9ff0 Merge pull request #5058 from thinkyhead/rc_reverse_arrow_buttons 
Apply encoder reverse options to keypad arrows
 2016-10-22 13:52:35 -05:00
esenapaj
523c7eaa6c Fix for the PR #4553 (Save bytes for custom chars (Hitachi LCD)) 2016-10-23 03:29:00 +09:00
Scott Lahteine
ca48a49fdb Merge pull request #5065 from petrzjunior/transl 
[LANGUAGE] Update Czech (BLTOUCH and DAC strings)
 2016-10-22 12:46:10 -05:00
Scott Lahteine
f0744fc815 Merge pull request #5066 from thinkyhead/rc_french_update 
Updated french translation
 2016-10-22 12:45:51 -05:00
Gege2B
88b7f6eb46 Updated french translation 2016-10-22 12:30:22 -05:00
Scott Lahteine
3544c3632f Merge pull request #5062 from thinkyhead/rc_warnings_fix 
Warnings fixed redux
 2016-10-22 12:21:36 -05:00
Petr Zahradník junior
8323d78ed7 Translated BLTOUCH and DAC strings 2016-10-22 19:12:21 +02:00
Scott Lahteine
e151f952a3 Apply encoder reverse options to keypad arrows 2016-10-22 11:51:33 -05:00
Scott Lahteine
cfb47929ca Merge pull request #5060 from thinkyhead/rc_fix_ugly_code 
Reduce, clean up MINTEMP / MAXTEMP test code
 2016-10-22 11:27:30 -05:00
Josef Pavlik
dca50737f5 fixed warning: ISO C++ forbids compound-literals 2016-10-22 11:23:16 -05:00
Josef Pavlik
0bd66807b2 fixed warning: extra ; 2016-10-22 11:12:29 -05:00
Josef Pavlik
d35dc407a8 fixed warning: ISO C99 requires rest arguments to be used 2016-10-22 11:12:29 -05:00
Josef Pavlik
c2b51af3ba fixed warning: ISO C does not permit named variadic macros 2016-10-22 11:12:29 -05:00
Scott Lahteine
0d3fc7dd89 Merge pull request #5059 from gcormier/fixbaby 
Set defer delay back to false when exiting babystepping.
 2016-10-22 10:59:17 -05:00