bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
13,633 Commits 1 Branch 4 Tags
629c039eedcb65adf21e63d55b6ae86aac68c85b
Commit Graph

13633 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tannoo
e43f3ac989 EEPROM init fix 2018-01-03 04:31:01 -06:00
Scott Lahteine
fc67c64b8f Merge pull request #8989 from tcm0116/2.0.x_ubl 
[2.0.x] Fix UBL compilation warnings
 2018-01-02 21:38:45 -06:00
Thomas Moore
8afc4f8d9d Fix UBL compilation warnings 2018-01-02 21:00:06 -06:00
Bob-the-Kuhn
eca5cc8669 Merge pull request #9003 from Bob-the-Kuhn/Due-PINS_DEBUG-&-related 
[2.0.x] add Due PINS_DEBUG support & misc improvements (replaces PR #8990)
 2018-01-02 18:47:53 -06:00
Bob-the-Kuhn
e9fc7bc69c Merge pull request #9000 from Bob-the-Kuhn/2.0-LCD-contrast 
[2.0.x] lcd_contrast type mismatch work around
 2018-01-02 18:46:31 -06:00
Bob-the-Kuhn
448b0a0014 Merge pull request #9004 from Bob-the-Kuhn/PWM-for-any-pin-(LPC1768) 
[2.0.x] LPC1768 - PWM for any pin (replaces PR #8991)
 2018-01-02 11:42:27 -06:00
Bob-the-Kuhn
5574fad69c copy of PR #8991 code 
Formatting tweaks

correct array initialization & remove test code
 2018-01-02 11:17:46 -06:00
Scott Lahteine
d190c702de Add MKS_BASE Microstepping pins 
Based on #9008
 2018-01-01 18:49:21 -06:00
Scott Lahteine
5e01ee8adf Temperature updates for parity with 1.1.x 2018-01-01 18:29:08 -06:00
Bob-the-Kuhn
adb9ecf3cc copy of PR #8990 2018-01-01 16:11:56 -06:00
Roxy-3D
39e5fabfa9 Z BabyStepping should not be dependent on a bed leveling system being active 2018-01-01 14:46:50 -06:00
Bob-the-Kuhn
ef911a2d12 works 2018-01-01 14:35:16 -06:00
Scott Lahteine
d80c4f1a6e Fix typo in delta call to buffer_line 
Fix #8901
 2017-12-31 01:40:07 -06:00
Scott Lahteine
9312ee63b0 Merge pull request #8979 from thinkyhead/bf2_sync_up_configs 
[2.0.x] Synchronize configs with 1.1.x
 2017-12-31 01:15:43 -06:00
Scott Lahteine
41dfb229ec Merge pull request #8978 from thinkyhead/bf2_slimming_option 
[2.0.x] SLIM_LCD_MENUS option
 2017-12-31 00:56:29 -06:00
Scott Lahteine
3dd04736c0 Update M17_M18_M84.cpp 2017-12-31 00:26:45 -06:00
Scott Lahteine
2929c9e56f A specific option to SLIM_LCD_MENUS 2017-12-31 00:11:22 -06:00
Scott Lahteine
10edb469bb Apply SLIM_LCD_MENUS to example configs 2017-12-31 00:11:21 -06:00
Scott Lahteine
5294fd132f Merge pull request #8924 from ejtagle/bugfix-2.0.x 
[2.0.x] Improve SW SPI for DUE a bit more
 2017-12-30 23:32:46 -06:00
Scott Lahteine
0b4a46fa6c Bring configs up to date with 1.1.x 2017-12-30 23:28:53 -06:00
Scott Lahteine
7cc2193bce Add Tronxy X1 example config (#8972) 2017-12-30 17:25:31 -06:00
etagle
729a9f55fc Improved Sw SPI on DUE HAL a bit more. 
Now the USB MSD can transfer at 750k/s. Previously, it was 500k/s. I think this is the maximum achievable speed using Sw SPI.
 2017-12-30 17:24:38 -06:00
Scott Lahteine
2b1e6829b3 Merge pull request #8966 from thinkyhead/bf2_better_no_reentry 
[2.0.x] ultralcd.cpp: Better no_reentry, use in queuing G-code
 2017-12-30 16:33:24 -06:00
Scott Lahteine
615146c069 Enqueue commands better in ultralcd.cpp 2017-12-30 04:44:59 -06:00
Scott Lahteine
9686ffedef Single pause flag also indicates SD print pause 2017-12-30 04:44:59 -06:00
Scott Lahteine
6d94bbf618 Apply some PGM_P pointers 2017-12-30 04:03:17 -06:00
Bob-the-Kuhn
9bfabc1f13 Merge pull request #8955 from Bob-the-Kuhn/bugfix-2.0.x 
[2.0.x] fix include in pins_RAMPS_FD_V2.h
 2017-12-29 10:35:23 -06:00
Bob-the-Kuhn
cba44128d5 fix include 2017-12-29 10:08:30 -06:00
Scott Lahteine
427df8792d Fix Capabilities Report 2017-12-28 21:08:59 -06:00
Scott Lahteine
8274369522 Merge pull request #8945 from thinkyhead/bf2_better_char_lcd 
[2.0.x] Display up to 3 extruders on char LCD
 2017-12-28 20:48:14 -06:00
Scott Lahteine
2526ac6500 Display up to 3 extruders on char LCD 
…and show bed level indicator at the position of the [H] icon, when a heated bed exists.
 2017-12-28 20:17:42 -06:00
Scott Lahteine
db32c185ae Merge pull request #8860 from Bob-the-Kuhn/2.0.x-DUE-RRDFGSC 
[2.0.x] DUE - update for Reprap Discount Full Graphic Smart Controller
 2017-12-27 05:06:49 -06:00
Scott Lahteine
f8156d2d2c Merge pull request #8913 from thinkyhead/bf2_multitool_M600 
[2.0.x] Multi extruder support for M600 / LCD
 2017-12-27 04:40:50 -06:00
Scott Lahteine
9ecdd1f4c7 Multi extruder support for M600 and LCD 2017-12-27 04:33:25 -06:00
Scott Lahteine
a1ce6e8ff4 Clear lcd_clicked immediately on use 2017-12-26 22:26:04 -06:00
Scott Lahteine
5effe1590c Fix NO_VOLUMETRICS bug 2017-12-26 20:04:44 -06:00
Scott Lahteine
fb6966f2b5 Merge pull request #8912 from thinkyhead/bf2_no_vol_fix 
[2.0.x] No sub-menu if NO_VOLUMETRICS
 2017-12-26 18:46:39 -06:00
Scott Lahteine
f163eede78 No sub-menu if NO_VOLUMETRICS 
For parity with #8911
 2017-12-26 18:28:42 -06:00
Scott Lahteine
2c4e03d2cf Indentation of a SW SPI file 2017-12-25 09:34:43 -06:00
Scott Lahteine
1a827d5b68 Opening brace tweaks 2017-12-25 09:34:43 -06:00
Bob-the-Kuhn
a142fab155 Enable RRDFGSC on Due 2017-12-25 09:22:14 -06:00
Scott Lahteine
b259bb4670 Fix tmc_util global vars 2017-12-25 09:05:31 -06:00
Scott Lahteine
4ef965cc40 Fix compiler warnings 2017-12-25 08:53:01 -06:00
Scott Lahteine
95b82ae5e3 Merge pull request #8893 from thinkyhead/bf2_action_on_action 
[2.0.x] Fixes for G29, esp. 3POINT
 2017-12-25 08:45:53 -06:00
Scott Lahteine
9e8008c49c Fixes for G29, esp. 3POINT 2017-12-25 08:37:27 -06:00
Scott Lahteine
026e301307 lcd_map_control deps on ULTIPANEL 2017-12-25 07:46:25 -06:00
Scott Lahteine
68438b0d4e Merge pull request #8889 from thinkyhead/bf2_action_on_action 
[2.0.x] //Actions on Pause / Resume (M600, M125, etc.)
 2017-12-25 07:30:24 -06:00
Scott Lahteine
f2731c9f93 Allow consecutive uses of G29 2017-12-25 06:32:33 -06:00
Scott Lahteine
4b49ea1e92 General cleanup of config-store, reset_bed_level 2017-12-25 05:16:01 -06:00
Scott Lahteine
2925852244 Fix GT2560 A+ servo pin 2017-12-25 02:18:56 -06:00