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

7701 commits

Author SHA1 Message Date
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
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
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 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 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 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 bb23286383 add README & modify spi_pins.h 
still trying to fix file name
 2017-12-03 20:00:56 -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
Harald Gutsche f5b4e1ef4f as a workaround enable PWM for any pin, see PR #8622 2017-12-03 20:37:02 +01:00
Scott Lahteine 6e944a413c
Merge pull request #8607 from benlye/patch-1 
[2.0.x] Fix M49 so that it does not hang the terminal console
 2017-12-03 03:41:33 -06:00
Scott Lahteine 967522b95e
Merge pull request #8615 from dot-bob/Duplicator_6-2.0.x 
[2.0.x] Example configurations for Wanhao Duplicator 6
 2017-12-03 03:37:48 -06:00
Scott Lahteine f4b16a3bac
Update M49.cpp 2017-12-03 03:34:56 -06:00
Scott Lahteine f9327534f8
Merge pull request #8634 from fiveangle/bf2_report_xonxoff 
[2.0.x] Report SERIAL_XON_XOFF in M115
 2017-12-03 02:18:50 -06:00
Scott Lahteine da9f140829
Merge pull request #8637 from thinkyhead/bf2_ubl_uses_LSL 
[2.0.x] Use custom segment length for UBL Cartesian
 2017-12-03 01:57:49 -06:00
Scott Lahteine 3a97de52ef Split first move to planner for better chaining 
Address #8573, #8595
 2017-12-03 01:27:14 -06:00
Scott Lahteine 24437de591 Use custom segment length for UBL Cartesian 2017-12-03 00:10:54 -06:00
Unknown 4c5ffd2349 [2.0.x] Report SERIAL_XON_XOFF in M115 
-Report SERIAL_XON_XOFF in Extended Capabilites M115 report for hosts
-Remove outdated 256 size limitation from comments on RX_BUFFER_SIZE defines
-Update error message conditions
 2017-12-02 21:08:06 -08:00
Scott Lahteine aa7efb96bf Bring configurations up to date 2017-12-02 21:50:51 -06:00
Scott Lahteine 63a91cd37a Fix a homing comment 2017-12-02 21:02:37 -06:00
Scott Lahteine 8056120195 Rename inverse_mm_s => inverse_secs 2017-12-02 20:28:09 -06:00
Scott Lahteine 23557f8e77 Remove obsolete de_float 2017-12-02 20:23:10 -06:00
Jonathan Barchi 05f8e98c4a Fix for issue #8629 - mismatch between number of stored and loaded dummy items on non-delta machines. (#8631) 2017-12-02 19:04:58 -06:00
Roxy-3D 48fb4e0932
Get Bi-Linear to work with G26 
More corrections to make that happen...
 2017-12-02 14:14:24 -06:00
Roxy-3D 0850b38b45
Get Bi-Linear working with G26 
G26 uses logic that looks like:
```
ex = _GET_MESH_X(i + 1) - (SIZE_OF_INTERSECTION_CIRCLES - (SIZE_OF_CROSSHAIRS));
```
The Bi-Linear macros need parenthesis to work correctly.
 2017-12-02 14:10:30 -06:00
Scott Lahteine 000b3b3117 Comment/cleanup of motion code 2017-12-02 01:09:55 -06:00
Scott Lahteine 046a1ad331
Merge pull request #8625 from tcm0116/2.0.x-G33 
[2.0.x] Fix missing return values in G33_auto_tune
 2017-12-02 00:51:19 -06:00
Thomas Moore b35c3b5eb8 Fix missing return values in G33_auto_tune 2017-12-01 21:29:16 -06:00
Scott Lahteine 45c2388a58 Apply const to thermal_runaway_protection args 2017-12-01 19:42:44 -06:00
Scott Lahteine 0154e3480c New feature: BED_SKEW_CORRECTION 2017-12-01 19:39:49 -06:00
Scott Lahteine 082ab8fcab Add SKEW_CORRECTION to example configs 2017-12-01 19:22:27 -06:00
Unknown d1f11e9c10 fix missing GET_TIMER (used by PWM for Ex_AUTO_FAN) 2017-12-01 22:28:55 +01:00
Harald Gutsche dd1b503f64 fix NUM_DIGITAL_PINS being negative for more than 127 digital pins 2017-12-01 07:39:46 +01:00
dot-bob bd45d0363d Add default configurations for the Wanhao Duplicator 6. 2017-11-30 23:24:33 -07:00
Scott Lahteine 91fb6231b2 Fix EEPROM V45 header, layout 2017-11-30 22:45:17 -06:00
Roxy-3D 94e6b2976e
Restore correct G26 values for gMax 1.5+ printer 2017-11-30 18:12:17 -06:00
Scott Lahteine dd3ce40826 Drop Planner::position_float, use int types 2017-11-30 17:43:31 -06:00
Scott Lahteine ec6ca37ed3 Fix (un)apply_leveling fade bug 2017-11-30 17:25:44 -06:00
Scott Lahteine a52fec6ac4 Planner class parity with 1.1.x 2017-11-30 15:55:08 -06:00
Ben Lye 1f3ad461bc
Update M49.cpp 
Fix M49 so that it does not hang the terminal console.
 2017-11-30 20:17:44 +00:00
Scott Lahteine e37dd64548 Apply LEDColor, language fixes 2017-11-29 23:58:12 -06:00
Scott Lahteine 8f90642eea LED_CONTROL_MENU config changes 2017-11-29 21:02:56 -06:00
Tannoo cf0f78336b New Feature: LED_CONTROL_MENU 2017-11-29 21:02:55 -06:00
Scott Lahteine 23e45fa3c4 Apply const to some planner vars 2017-11-29 21:02:55 -06:00
Scott Lahteine 7c61bcb058 Apply SEGMENT_LEVELED_MOVES to example configs 2017-11-29 16:57:31 -06:00
Scott Lahteine ef2531558c Add an option to segment leveled moves 2017-11-29 16:57:30 -06:00
Scott Lahteine 285b868e9b Tweak planner code style 2017-11-29 15:22:18 -06:00
Scott Lahteine 1f2acc33bc Tweaks for check_axes_activity 2017-11-28 18:41:13 -06:00
Vitaliy Sapyanov 7f88334aa3 Done cleanup and removed duplicates in pins_RuRAMPS4D.h (#8582) 
Remove duplicates, with followup fixes
 2017-11-28 18:33:12 -06:00
Scott Lahteine a8aa43ce2d
Merge pull request #8587 from AnHardt/2_Fix_WDTO_during_long_DELTA_moves 
[2.0.x] Fix WDTO during long delta moves
 2017-11-28 17:29:18 -06:00
Scott Lahteine 4793c34c53 Fix M290 boolval bug 
Fix #8577
 2017-11-28 17:21:33 -06:00
Scott Lahteine 16baa48699 Fix #8579 
Fan speed code fell into a curly brace
 2017-11-28 16:12:14 -06:00
AnHardt 02aa93a6ad Fix Watchdog time out during long lasting DELTA moves 
During long lasting moves of a delta machine neither the temperatures are maintained nor buttons checked nor ... .
The fix is to call 'manage_heater()' and 'idle()' every now and then in the loop where the move is segmented. 
The code is abot the same as in G2_G3 wher we had the same problem with too large circles lasting too long.
Fixing #7510
 2017-11-28 17:03:51 +01:00
Scott Lahteine fadf9eb2d7 Simplify midpos calculation 2017-11-27 14:00:35 -06:00
Scott Lahteine 0880031e8e Satisfy M702 dependencies 2017-11-27 13:39:59 -06:00
Scott Lahteine 0786b61ce7 Followup to #8575 2017-11-27 12:58:40 -06:00
Scott Lahteine 276271e72f Make MBL work more like PROBE_MANUALLY 2017-11-27 02:12:29 -06:00
Scott Lahteine 94cb412e45 Allow override of probe bounds 2017-11-26 20:55:27 -06:00
Scott Lahteine c8718aa111 Spacing, macros in LPC1768_PWM 2017-11-26 20:20:05 -06:00
Scott Lahteine a67cf78c6b Clean up whitespace, spacing 2017-11-26 20:18:52 -06:00
Scott Lahteine f0dd4e3fa0 Bootscreen parity with 1.1.x 2017-11-26 20:07:17 -06:00
Scott Lahteine b634bfe1b1 Tweak to readDir code 2017-11-26 18:25:00 -06:00
Scott Lahteine 7be4857ab9 Tweak BLOCK_BUFFER_SIZE description 2017-11-26 17:36:40 -06:00
Bob-the-Kuhn 7d8b66e207
Merge pull request #8570 from Bob-the-Kuhn/Sbase-PWM 
[2.0.x] MKS Sbase - add servo pin definitions and add directly controlled PWM
 2017-11-26 09:36:18 -06:00
Bob-the-Kuhn 59b32c25b5 MKS Sbase changes 2017-11-26 07:47:06 -06:00
Scott Lahteine f90c075d1f SD Menu patches 2017-11-26 01:14:18 -06:00
Scott Lahteine 9b64be0bc5 Fixes for leveling sub-menus 2017-11-26 00:05:36 -06:00
Scott Lahteine 25674da90c Tweaks to do_blocking_move 2017-11-25 23:31:16 -06:00
Scott Lahteine 22b897e77d Show M211 output with workspace offset 2017-11-25 20:48:20 -06:00
Scott Lahteine d06e29846d Loosen HAS_BED_PROBE definition 2017-11-25 20:11:21 -06:00
Roxy-3D e48fcad615 change G26 and G29 bit function names to avoid HAL collision 2017-11-25 19:58:45 -06:00
Scott Lahteine 41ec449960 Fix G26 error return 2017-11-25 19:53:14 -06:00
Scott Lahteine 9badf5dc0d Fix Micromake C1 config 2017-11-25 18:41:07 -06:00
Scott Lahteine 7576ad7fc2
Merge pull request #8554 from tcm0116/2.0.x-cleanup 
[2.0.x] Fix for #8525 and other cleanup
 2017-11-25 18:19:54 -06:00
Scott Lahteine 27c5692b13 Syntax tweaks 2017-11-25 18:13:36 -06:00
Scott Lahteine d18d40e1d6 M290 report on change, P0 to leave Probe Z Offset alone 2017-11-25 16:47:39 -06:00
LVD-AC 65f365333f [2.0.x] G33 probe error handling 2017-11-25 16:19:10 -06:00
Bob-the-Kuhn 8c69adba8b
Merge pull request #8553 from Bob-the-Kuhn/2.0.x-U8Glib-follow-up 
[2.0.X] U8Glib follow up
 2017-11-25 14:26:32 -06:00
Scott Lahteine be00e421a7 Patch up M290, M851 2017-11-25 14:11:57 -06:00
Bob-the-Kuhn fc40d56131 fixed error, updated defaults, added notes 
Travis fix - only allow ultralcd_st7920_u8glib_rrd_AVR.cpp to compile when ST7920 selected
 2017-11-25 12:35:03 -06:00
Roxy-3D d29cb646e3
Fix erroneous reference to temperature in time calculations 
Travis is having problems at:  https://github.com/MarlinFirmware/Marlin/pull/8560   

So...   doing a direct commit to get things correct.   Bugfix_v1.1.x does not have this bug.  Nothing needs to be done to that branch.
 2017-11-25 10:40:56 -06:00
Thomas Moore 7bb1721f35 Fix _BV already defined warnings for Teensy 2017-11-24 22:34:39 -06:00
Thomas Moore 5f9592a523 Cleanup narrowing warning in pin_is_protected 2017-11-24 22:15:56 -06:00
Thomas Moore 34eaaab5fb Fix _BV already defined warnings 2017-11-24 21:59:31 -06:00
Thomas Moore 2ea779e560 Allow bed probe sanity checks to run 2017-11-24 21:59:01 -06:00
Scott Lahteine d24b1190bd Don't use Z_MIN_PROBE_ENDSTOP on DELTA 2017-11-24 18:24:22 -06:00
Scott Lahteine e34c6827ea Init MIXING virtual tools as switching 2017-11-24 18:02:09 -06:00
Scott Lahteine a9ecb975b2 Apply LINEAR_UNIT to M503 output for M200 2017-11-24 17:32:48 -06:00
Scott Lahteine d95ee0f003
Merge pull request #8551 from revilor/bugfix-2.0.x 
MK2_MULTIPLEXER does not require E2/E3 stepper pins
 2017-11-24 17:16:23 -06:00
Scott Lahteine 80ada58818 One fewer function call in probe_pt 2017-11-24 17:10:38 -06:00
oliver 92a0dc552a MK2_MULTIPLEXER does not require E2/E3 stepper pins 2017-11-24 23:56:39 +01:00
Scott Lahteine b49acce035 Tweaks for lcd_external_control 2017-11-24 15:53:25 -06:00
Scott Lahteine 1ef1052ae1 Phatter arrows for Z offset overlay 2017-11-24 15:53:25 -06:00
Scott Lahteine 5926c9c97b Followup for MESH_EDIT_GFX_OVERLAY 2017-11-24 15:53:25 -06:00
Scott Lahteine ab03a31cc9 Patch G0/G1 for NANODLP_Z_SYNC 2017-11-24 14:11:12 -06:00
Scott Lahteine a766dfb3b1
Merge pull request #8536 from thinkyhead/bf2_nanodlp_z_move_sync 
[2.0.x] Implement NANODLP_Z_SYNC for 2.0.x
 2017-11-24 13:11:14 -06:00
Scott Lahteine 01e207213f Fix MK2_MULTIPLEXER stepper indirection 2017-11-24 12:49:28 -06:00
Roxy-3D ec04cf27d3
Fix the G26 out of scope identifiers in the v2.0.0 branch (#8543) 
These changes may need to be warmed over.  I tried to fix things with
the least amount of disruption.   I just wanted to get the bugfix_v2.0.0
branch working for people again.
 2017-11-24 10:39:56 -06:00
Scott Lahteine dc82babe8e Implement NANODLP_Z_SYNC for 2.0.x 2017-11-24 00:28:06 -06:00
Scott Lahteine c6b0c104bb Adapt G26 to work for all meshes 2017-11-23 22:31:37 -06:00
Scott Lahteine 5ce7f23afa Config option G26_MESH_VALIDATION for all meshes 2017-11-23 21:43:23 -06:00
Scott Lahteine c19eb33408 Move G26 to gcode sub-folder 2017-11-23 21:43:23 -06:00
Scott Lahteine a03f93bab4 Fix fan kickstart 2017-11-23 21:42:45 -06:00
Scott Lahteine 9e3c41f9e8 Tweak fan kickstart / speed code 2017-11-23 15:20:35 -06:00
GMagician 118ac61e59 [2.0.x] Tool change bad behaviour fix 
Previous fix did not work as expected when axeis not homed. It raise Z but never return to original position
 2017-11-22 20:24:03 -06:00
Scott Lahteine c35d27f77c
Merge pull request #8299 from tcm0116/2.0.x-BIQU_BQ111-A4 
[2.0.x] Add BIQU BQ111-A4 board
 2017-11-22 19:16:04 -06:00
Scott Lahteine 1685cd193b Tweak char_mode init 2017-11-22 19:12:08 -06:00
Scott Lahteine 9406c87a97 Fix up LCD init / charset 2017-11-22 18:22:55 -06:00
Thomas Moore fa577392b2 Add BIQU BQ111-A4 board 2017-11-22 16:34:59 -06:00
Scott Lahteine c2fc78c3a8 #ifndef => #if !PIN_EXISTS 2017-11-22 16:28:52 -06:00
Scott Lahteine c613a1ed38 Fix indentation, stepper.h dependency, etc. 2017-11-22 14:55:30 -06:00
teemuatlut f011a32771 Board definitions for Ultratronics Pro v1.0 2017-11-22 14:55:24 -06:00
Bob-the-Kuhn 9dad534f02 fixed 2017-11-21 21:37:20 -06:00
Scott Lahteine 4371345cbe
Don't re-init graphical LCD after boot screen 
Followup to 13a3fb1acc
 2017-11-21 18:23:39 -06:00
Scott Lahteine 56c02b7f59 Shift register buttons question 
Can LCD shift registers keep up with faster MCUs?
 2017-11-21 16:12:40 -06:00
Scott Lahteine 3994d3b935 General cosmetic LCD 2017-11-21 16:12:40 -06:00
Scott Lahteine 617993d0ea Patch for !!TEST (was _BV once?) 2017-11-21 16:12:08 -06:00
Scott Lahteine 3269d8dd62 Tweak M42 var 2017-11-21 16:12:08 -06:00
Mateusz Krawczuk bb1a6eea88
Remove pin count check for MIGTHYBOARD_REVE 
Remove assert and unused code since it is implemented in pinsDebug_plus_70.h
 2017-11-21 14:38:02 +01:00
Scott Lahteine 1ce0fb336b Patch Max7219_LED_Set input args 2017-11-20 21:15:15 -06:00
GMagician a61127a421 [2.0.x] tool change bad behaviours 
This will solve 2 issues on tool change.
1) when no home is done ("no_move" is set) tool change should never move X & Y because... I don't know where I am...only Z should be adjusted to avoid bed collision if other nozzle is lower than current.
Since no move no bed level matrix should be applied
2) When SWITCHING_NOZZLE is enabled and system is homed there are two movements to go to destination, but first can move Z to older position and then crash on the bed
 2017-11-20 16:34:55 -06:00
Vitaliy Sapyanov e2724c68ab Update pins_RURAMPS4D.h 
Add and bugfix pins
 2017-11-20 15:36:13 -06:00
Scott Lahteine 9770062309
Merge pull request #8463 from thinkyhead/bf2_32bit_M42 
[2.0.x] Updates to Anet A8 configurations
 2017-11-20 15:12:30 -06:00
Scott Lahteine 3066655727 Try port*100+pin, fix config dependency 2017-11-20 13:58:23 -06:00
Scott Lahteine ba8bc7ea80 Cosmetic tweaks 2017-11-20 13:58:02 -06:00
Scott Lahteine f409147116 Fix P2_04, P2_05 2017-11-20 13:58:02 -06:00
Bob-the-Kuhn a28ccabe2a M42 P1.20 fix 2017-11-20 13:58:02 -06:00
Unknown 33912fa7e8 Update Temperature::setPwmFrequency prototype to match source 
Introduced with #8446
 2017-11-20 01:50:41 -08:00
Scott Lahteine b9327a4d16 Misc. general cleanup 2017-11-19 15:43:39 -06:00
Scott Lahteine 8836623e0f Fix sq/min/max macros after platform headers 2017-11-19 15:43:39 -06:00
Scott Lahteine fe4f009fdd 32-bit unless… 2017-11-19 15:43:38 -06:00
Scott Lahteine 25af9decfe Remove enum.h include of MarlinConfig.h 2017-11-19 15:43:38 -06:00