3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-30 07:17:59 +00:00
Code Issues Releases Wiki Activity
10,019 Commits 21 Branches 81 Tags 1.9 GiB
39b3e4c501
Commit Graph

81 Commits

Author SHA1 Message Date
Scott Lahteine
a83f7f1d25 Turn off DISABLE_INACTIVE_EXTRUDER with SWITCHING_NOZZLE 
Fix #11183
 2018-07-02 17:25:15 -05:00
Scott Lahteine
6f07699ed5 HOTENDS for Switching Extruder with Switching Nozzle 2018-05-29 11:09:29 -05:00
Scott Lahteine
fbeea12026 Correct HOTENDS for SWITCHING_EXTRUDER 2018-05-27 22:55:57 -05:00
Scott Lahteine
9186123676
Fix manual moves for switching tools (#10867) 2018-05-26 18:30:29 -05:00
Scott Lahteine
27c5ede796 Add USE_MARLINSERIAL conditional 2018-05-24 05:51:14 -05:00
Scott Lahteine
ebb839971d Conditionals match 2.0.x indentation 2018-05-24 05:51:14 -05:00
Scott Lahteine
af3a68f81f Add HAS_HOTEND_OFFSET_Z conditional 2018-05-19 17:09:24 -05:00
Scott Lahteine
a847ea625e Don't define unused move_extruder_servo 
For parity with #10772
 2018-05-19 17:09:24 -05:00
Scott Lahteine
039302bf4c
Better handling of DELAY_NS and DELAY_US (#10717) 
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
 2018-05-12 04:22:55 -05:00
Scott Lahteine
1025066ab1 Add NO_LCD_MENUS to display only the Status Screen 2018-04-30 18:39:32 -05:00
Scott Lahteine
e931bc7e72 Reorder some conditionals 2018-04-26 17:55:36 -05:00
Scott Lahteine
be098cd42f Z Endstop Servo => Z Probe Servo 2018-04-01 23:54:47 -05:00
Scott Lahteine
ec46336df7 For MK2_MULTIPLEXER undef DISABLE_INACTIVE_EXTRUDER 
Fix #10098
 2018-03-21 05:41:00 -05:00
Scott Lahteine
6146126b2a Fix SWITCHING_EXTRUDER manual movement 2018-03-16 03:21:56 -05:00
Sebastianv650
9c65890644 [1.1.x] LIN_ADVANCE v1.5 (#9700) 2018-02-23 00:53:41 -06:00
Scott Lahteine
18881e6725 Add 20x4 option for Sainsmart LCD 2018-02-20 20:09:49 -06:00
Scott Lahteine
3c2f735fb8 Conditionals for SWITCHING_EXTRUDER 
In reference to #5367. SWITCHING_EXTRUDER was not fully implemented for EXTRUDERS > 2.
 2018-02-19 10:58:06 -06:00
Scott Lahteine
3137df9ad4 Special override of LCD_WIDTH 2018-02-07 22:16:07 -06:00
Project-J²
ae2476dfdb Add UltiController v2.1 support 
Add compatibility with the original screen bord from Ultimaker 2 printer
(UltiController v2.1 with the PG-2864ALBP I2C display)
 2018-02-05 22:24:08 -06:00
GMagician
f1958ac060 [1.1.x] Simplify bltouch configuration 
When using bltouch Z_MIN_ENDSTOP_INVERTING must match Z_MIN_PROBE_ENDSTOP_INVERTING

since both are redefined latter is just redefined equal to first
 2018-02-05 19:52:41 +01:00
Dan Delaney
df8420aa62 Adding support for using the MKS_12864OLED with the SSD1306 controller 2017-12-16 17:44:34 -06:00
Dan Delaney
5249765508 Adding support for the Tronxy and Zonestar LCD 
Code borrowed and modified from erikkallen/Marlin_tronxy.
Changed the ANET_KEYPAD_LCD to zonestar, since it is the same device.
I kept a define for ANET_KEYPAD_LCD to enable ZONESTAR_LCD.
 2017-12-15 19:13:31 -06:00
Scott Lahteine
172ea8c71c General code/bitmaps cleanup 2017-12-13 17:57:54 -06:00
Scott Lahteine
1d0739d6d1 Patch G33 misuse of PROBE_MANUALLY 2017-11-07 22:28:54 -06:00
Kris Kersey
46c2841904 Added support for Anet LCD on Ramps board. 
Working pin map for Anet LCD display.
Pins 1 and 2 must be swapped on cable.
 2017-11-04 21:30:08 -05:00
Scott Lahteine
4fb3ce4739 Support for SilverGate Board 2017-10-31 15:26:27 -05:00
Scott Lahteine
259cf1b0b2 BQ enables this in the config. Remove here 2017-10-18 23:23:56 -05:00
Slawomir Ciunczyk
167058b61f Different NEOPIXEL types 
Changes to support NEOPIXEL LED strips
- Support for different NEOPIXEL as defined in Adafruit_NeoPixel.h
- ability to setup startup brightness
- ability to define sequential/non-sequential transition of color change during heating-up
- additional parameter to M150 P<brightness>
 2017-10-10 01:58:40 -05:00
Scott Lahteine
381ebc043f Add support for ST7565-64128N 
Based on #7447 by @Bob-the-Kuhn
 2017-10-09 17:39:03 -05:00
jmdearras
c7e0a49c94 Add some new LCD displays 
- Original CR-10
- MKS Mini Display
 2017-10-09 17:39:03 -05:00
Scott Lahteine
067622fcc6 Apply some tweaks based on 2.0.x 2017-10-09 17:39:03 -05:00
Scott Lahteine
8c93295d62 Merge pull request #7873 from thinkyhead/bf1_anet_encoder_pulses 
[1.1.x] Fixing ANET encoder pulses
 2017-10-07 01:21:14 -05:00
Phr3d13
c26242a553 Fixing #7833 2017-10-07 00:07:24 -05:00
Scott Lahteine
b211fa4e1f Remove extra NEWPANEL settings in Conditionals_LCD.h 2017-10-06 17:23:32 -05:00
Scott Lahteine
8a994fb1b1 Fix encoder pulses for G3D_PANEL 2017-09-27 00:12:20 -05:00
GMagician
6127154af3 Fix identation by tab 
There was a tab instead of spaces
 2017-08-18 11:34:55 +02:00
GMagician
405a2132f3 #7529 compile fix 
I made an error in previous fix
 2017-08-17 22:04:28 +02:00
GMagician
869d7f3703 #7504 missing part 
#7504 integration has missed this part.
When more than 1 servo is used with bltouch it's impossible to predefine default servo delay for it.
In my original fix I completely removed this part but maybe this is a better compromise
 2017-08-17 21:43:47 +02:00
GMagician
e9c72978c7 Implement SERVO_DELAY as array 
This modify give SERVO_DELAY x servo basis
 2017-08-15 00:28:47 -05:00
C. Scott Ananian
890e7a16a9 Add support for Printrbot Neopixel RGBW strip. 
Connected as described at http://printrbot.com/shop/led-strip/

Based on patch by Kelly Anderson <kelly@xilka.com> at
http://www.xilka.com/printrbot/marlin/1.1.4/20170707/
 2017-07-22 16:07:55 -05:00
Tannoo
aaacef9441 Corrections (#7231) 
20x4 map integration.    Also some minor changes to the UBL Menu layout.     Both 20x4 LCD's and Graphical LCD panels should have similar functionality now.
 2017-07-07 11:05:08 -05:00
Scott Lahteine
c6d430670a Clear SHOW_BOOTSCREEN with no LCD 2017-07-06 14:21:27 -05:00
Scott Lahteine
232a10410d LCD_FOR_MELZI 2017-07-01 22:32:20 -05:00
Scott Lahteine
abd6ba62b4 Some cleanups for ubl lcd mesh map 2017-07-01 19:47:49 -05:00
Scott Lahteine
5b11b33854 Add support for Průša MK2 Multiplexer 2017-06-27 04:55:30 -05:00
Bob-the-Kuhn
9651d01e1a Add Skynet/ANET A10 support 2017-06-24 19:07:03 -05:00
Scott Lahteine
6c45fa7dcc Apply #elif in LCD conditionals 2017-06-24 13:56:33 -05:00
Scott Lahteine
786cdea124 Ensure REPRAPWORLD_KEYPAD_MOVE_STEP is defined 2017-06-23 14:53:01 -05:00
Bob-the-Kuhn
325f09ea6c Add link to custom LiquidCrystal library by F. Malpartida 2017-06-22 13:07:08 -05:00
Scott Lahteine
445227c807 Fix missing LCD_STR_REFRESH 2017-06-12 01:28:52 -05:00