bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
12,373 Commits 1 Branch 4 Tags
81d550754aef02f38ad86b11f219e6b3647ab894
Commit Graph

12373 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
824980e70e Merge pull request #8611 from thinkyhead/bf2_planner_split_first 
[2.0.x] Split first planner move for better chaining
 2017-12-03 01:50:46 -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
Scott Lahteine
98aba6a534 Merge pull request #8624 from thinkyhead/bf2_skew_correction 
[2.0] Skew Correction
 2017-12-02 00:43:48 -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
e3948d8582 Merge pull request #8612 from thinkyhead/bf2_planner_parity 
[2.0.x] Fix some planner bugs
 2017-11-30 17:58:53 -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
bee2b5eea4 Merge pull request #8388 from Tannoo/2.0.x-led_control_menu 
[2.0] led_control_menu
 2017-11-30 00:18:21 -06: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
fd78446b2b Merge pull request #8600 from thinkyhead/bf2_cartesian_segments 
[2.0.x] Segmented mesh moves
 2017-11-29 17:25:36 -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
ca80564a78 Travis platformio hack no longer needed 2017-11-29 15:25:19 -06:00
Scott Lahteine
285b868e9b Tweak planner code style 2017-11-29 15:22:18 -06:00