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

9267 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine 43ea265b78
Merge pull request #8685 from MateuszKrawczuk/patch-3 
Update TEMP_BED_PIN in MIGHTYBOARD_REVE
 2017-12-07 21:50:35 -06:00
Scott Lahteine 9d65e61f39
Merge pull request #8706 from thinkyhead/bf2_multi_probe 
[2.0.x] MULTIPLE_PROBING — Why stop at 2?
 2017-12-07 21:21:38 -06:00
Scott Lahteine ae663a4198 PROBE_DOUBLE_TOUCH => MULTIPLE_PROBING 2017-12-07 16:44:13 -06:00
Scott Lahteine d7800e7975 Apply MULTIPLE_PROBING to example configs 2017-12-07 16:44:12 -06:00
Scott Lahteine 542efda7db
Merge pull request #8698 from thinkyhead/bf2_replace_jerk_code 
[2.0.x] Improved Core-compatible jerk code
 2017-12-07 00:17:00 -06:00
Scott Lahteine 438c21ad5c
Merge pull request #8693 from GMagician/2.x-address-#8644 
[2.x] Address #8644
 2017-12-07 00:05:02 -06:00
Scott Lahteine 3cd7659924 Improved Core-compatible jerk code 2017-12-06 23:57:57 -06:00
GMagician 99fcf60977 [2.x] addressing #8644 
Removed missing include file
 2017-12-06 23:49:30 -06:00
Scott Lahteine 81c0a918af feed_factor => inverse_secs 2017-12-06 23:03:33 -06:00
Scott Lahteine f206b81cf7 Sanity check skew+UBL 2017-12-06 22:56:58 -06:00
Scott Lahteine 60e7951312
Merge pull request #8691 from thinkyhead/bf2_clean_blocks_on_trigger 
[2.0.x] Purge blocks on endstop/probe hit
 2017-12-06 22:39:43 -06:00
Scott Lahteine 9898b96992 No lcd_map_control flag in quick_stop 2017-12-06 22:23:34 -06:00
Scott Lahteine 840289e7cc Use block cleaning instead of split flag 2017-12-06 22:22:58 -06:00
Scott Lahteine d163c4b530
Merge pull request #8695 from thinkyhead/bf2_fixes_DEC6 
[2.0.x] Cleanup, bugfixes, parity with 1.1.x
 2017-12-06 22:22:35 -06:00
Scott Lahteine 90cf6a06be Simplify G26 user_canceled 2017-12-06 22:02:54 -06:00
Scott Lahteine cdfabbc507 Shorten error text in G29 2017-12-06 21:50:54 -06:00
Scott Lahteine c846388a65 Standardize LCD interface code for UBL a little 2017-12-06 21:50:54 -06:00
Scott Lahteine 2fde60da12 Changes for parity with 1.1.x 2017-12-06 21:50:54 -06:00
Scott Lahteine 6040d4080e Cleanup stepper ISR. Allow cleaning for endstops. 2017-12-06 21:23:37 -06:00
Scott Lahteine a4e1d83599 Fix M503 S parameter 2017-12-06 21:23:37 -06:00
Scott Lahteine a3b098b4be Whitespace clean 2017-12-06 14:02:44 -06:00
Scott Lahteine 466f2761cb
Merge pull request #8688 from AnHardt/2_first_move_probing_homing 
[2.0.x] Don't split first_move while homing or probing
 2017-12-06 11:52:50 -06:00
AnHardt a993c5227d Don't split first_move while homing or probing 
While homing or probing it might be bad if the stop/trobe triggers during the first part and the second is still in the buffer.
 2017-12-06 14:13:05 +01:00
Mateusz Krawczuk 5320906b0b
Update TEMP_BED_PIN in MIGHTYBOARD_REVE 
Pin K7 number in fastio1280.h is 69, but it's also ADC15 pin. 
To get correct value from ADC reading it should be set as 15.
 2017-12-06 12:07:20 +01:00
Scott Lahteine aeb5c623c1 Show "Level Bed Corners" with UBL too 
Addressing #8676
 2017-12-05 21:58:43 -06:00
Scott Lahteine 5fbb2f121e Remove skew warning that could crash the planner 2017-12-05 20:27:20 -06:00
Scott Lahteine 1da2b2dd74
Merge pull request #8667 from Wackerbarth/PID_on_bed_only 
[2.0.x] Compilation errors with PIDTEMPBED only
 2017-12-05 20:15:05 -06:00
Richard Wackerbarth c1184552ac Change K1 to required option PID_K1 2017-12-05 19:59:59 -06:00
revilor 9e3fbcf35c fix for #8669 (#8679) 
* fix for #8669

* Update G28.cpp
 2017-12-05 19:40:36 -06:00
Scott Lahteine d8b444c144 Cleanup constextpr in planner.cpp 2017-12-05 18:55:57 -06:00
Scott Lahteine a2372cfab5 Fix SKEW_CORRECTION without leveling 2017-12-05 18:48:34 -06:00
Scott Lahteine 4d3c3d0b73 Some ST7920 parity with 1.1.x 
Possibly more should be brought over? Discussion at #8471
 2017-12-05 02:22:36 -06:00
Scott Lahteine 3748c28924 Fix MBL G29 without LCD 
Addressing https://github.com/MarlinFirmware/Marlin/pull/8575#discussion_r154536617
 2017-12-05 01:57:45 -06:00
Scott Lahteine 772298257b Creality pins spacing, MINIPANEL CS pin 2017-12-05 01:57:45 -06:00
Scott Lahteine b27bc67271 Set initial endstops state 2017-12-05 01:10:31 -06:00
Scott Lahteine cb8b9950af
Merge pull request #8663 from thinkyhead/bf2_rampsplus 
[2.0.x] Support for RAMPS Plus (3DYMY)
 2017-12-05 01:07:25 -06:00
Scott Lahteine b6ba32ce75 Support for RAMPS Plus (3DYMY) 2017-12-05 00:42:21 -06:00
Scott Lahteine 53694ebaa1 Folllwup to planner splitting 2017-12-04 18:55:23 -06:00
Scott Lahteine 37fff608b0
Merge pull request #8652 from fiveangle/bf2_usbcon_xonxoff 
[2.0.x] SERIAL_XON_XOFF not supported on USB-native AVR devices
 2017-12-04 16:46:18 -06:00
Scott Lahteine 02dd621ac7
Merge pull request #8659 from thinkyhead/backup_2_split_first 
[2.0.x] Split first move to planner for better chaining
 2017-12-04 16:17:27 -06:00
Scott Lahteine 4b612f590c Split first move to planner for better chaining 2017-12-04 15:27:47 -06:00
Unknown 91b63f6d69 SERIAL_XON_XOFF not supported on USB-native AVR devices 
User could enable SERIAL_XON_XOFF on USB-native devices and it would not be enabled without warning, but M115 would report the capability as available.
 2017-12-04 03:57:01 -08:00
Bob-the-Kuhn cff886ba12
Merge pull request #8650 from Bob-the-Kuhn/2.0.x-comment 
[2.0.x] LPC1768 - add explanations in spi_pins.h
 2017-12-03 20:56:04 -06:00
Bob-the-Kuhn 57fac33a74 add explanations 
1) add explanations as to why software SPIs are selected

2) remove unused flag/option
 2017-12-03 20:32:22 -06:00
Bob-the-Kuhn 3e2a515d27
Merge pull request #8646 from Bob-the-Kuhn/2.0.x-RRDFGSC-&-MKS-Sbase 
[2.0.x] MKS Sbase support for RepRap Discount Full Graphic Smart Controller
 2017-12-03 20:16:51 -06:00
Bob-the-Kuhn bb23286383 add README & modify spi_pins.h 
still trying to fix file name
 2017-12-03 20:00:56 -06:00
Scott Lahteine f125ba7eb6
Merge pull request #8647 from thinkyhead/bf2_planner_split_first 
[2.0.x] Revert PR #8611 — split first planner move
 2017-12-03 18:15:01 -06:00
Scott Lahteine dd8febca1a Revert "Merge pull request #8611 from thinkyhead/bf2_planner_split_first" 
This reverts commit 824980e70e, reversing
changes made to aa7efb96bf.
 2017-12-03 17:50:19 -06:00
Bob-the-Kuhn fb44f8e50f
Merge pull request #8616 from hg42/bugfix-2.0.x 
[2.0.x][LPC1768][FIX] NUM_DIGITAL_PINS was negative, fixes PWM, arduino io functions, M42, M43, M226, probably also Servo, some LCD, soft spi, SoftwareSerial, ... may be others
 2017-12-03 14:48:00 -06:00
Bob-the-Kuhn 4c5356f77a
Merge pull request #8622 from hg42/implement-LPC1768-GET_TIMER 
[2.0.x][LPC1768][fix] Implement GET_TIMER and other GET_xxx, fixes PWM
 2017-12-03 14:46:22 -06:00