wp/Marlin-2-0-x-Anycubic-i3-MEGA-S
1
0
Fork 0
Code Issues 28 Pull Requests 2 Actions Packages Projects Releases 30 Wiki Activity

Merge upstream changes from Marlin 2.1.1

Browse Source
This commit is contained in:
Stefan Kalscheuer
2022-09-03 09:23:32 +02:00
parent 626283aadb
commit 986e416c7f
1610 changed files with 73839 additions and 40857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/pins/sanguino/pins_AZTEEG_X1.h
View File

@@ -27,4 +27,4 @@
#define BOARD_INFO_NAME "Azteeg X1"
#include "pins_SANGUINOLOLU_12.h"
#include "pins_SANGUINOLOLU_12.h" // ... SANGUINOLOLU_11

4
Marlin/src/pins/sanguino/pins_MELZI.h
View File

@@ -32,7 +32,7 @@
#define IS_MELZI 1
// Alter timing for graphical display
#if ENABLED(U8GLIB_ST7920)
#if IS_U8GLIB_ST7920
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 0
#endif
@@ -44,4 +44,4 @@
#endif
#endif
#include "pins_SANGUINOLOLU_12.h"
#include "pins_SANGUINOLOLU_12.h" // ... SANGUINOLOLU_11

16
Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
View File

@@ -36,13 +36,13 @@
#define BOARD_INFO_NAME "Melzi (Creality)"
// Alter timing for graphical display
#if ENABLED(U8GLIB_ST7920)
#if IS_U8GLIB_ST7920
#define BOARD_ST7920_DELAY_1 125
#define BOARD_ST7920_DELAY_2 125
#define BOARD_ST7920_DELAY_3 125
#endif
#include "pins_MELZI.h"
#include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11
//
// For the stock CR-10 enable CR10_STOCKDISPLAY in Configuration.h
@@ -68,7 +68,7 @@
#if SERVO0_PIN == BEEPER_PIN
#undef BEEPER_PIN
#endif
#elif ENABLED(FILAMENT_RUNOUT_SENSOR)
#elif HAS_FILAMENT_SENSOR
#ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN 27
#endif
@@ -132,10 +132,10 @@
/**
* EXP1 Connector EXP1 as CR10 STOCKDISPLAY
* ------ ------
* PA4 |10 9 | PC0 BEEPER_PIN |10 9 | BTN_ENC
* PD3 | 8 7 | RESET BTN_EN1 | 8 7 | RESET
* PD2 6 5 | PA1 BTN_EN2 6 5 | LCD_PINS_D4 (ST9720 CLK)
* PA3 | 4 3 | PC1 (ST9720 CS) LCD_PINS_RS | 4 3 | LCD_PINS_ENABLE (ST9720 DAT)
* GND | 2 1 | 5V GND | 2 1 | 5V
* PA4 | 1 2 | PC0 BEEPER_PIN | 1 2 | BTN_ENC
* PD3 | 3 4 | RESET BTN_EN1 | 3 4 | RESET
* PD2 5 6 | PA1 BTN_EN2 5 6 | LCD_PINS_D4 (ST9720 CLK)
* PA3 | 7 8 | PC1 (ST9720 CS) LCD_PINS_RS | 7 8 | LCD_PINS_ENABLE (ST9720 DAT)
* GND | 9 10 | 5V GND | 9 10 | 5V
* ------ ------
*/

2
Marlin/src/pins/sanguino/pins_MELZI_MAKR3D.h
View File

@@ -26,4 +26,4 @@
*/
#define BOARD_INFO_NAME "Melzi (ATmega1284)"
#include "pins_MELZI.h"
#include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11

2
Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
View File

@@ -27,7 +27,7 @@
#define BOARD_INFO_NAME "Melzi (Malyan)"
#include "pins_MELZI.h"
#include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11
#undef LCD_SDSS
#undef LCD_PINS_RS

4
Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
View File

@@ -28,13 +28,13 @@
#define BOARD_INFO_NAME "Melzi (Tronxy)"
// Alter timing for graphical display
#if ENABLED(U8GLIB_ST7920)
#if IS_U8GLIB_ST7920
#define BOARD_ST7920_DELAY_1 0
#define BOARD_ST7920_DELAY_2 125
#define BOARD_ST7920_DELAY_3 0
#endif
#include "pins_MELZI.h"
#include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11
#undef Z_ENABLE_PIN
#undef LCD_PINS_RS

4
Marlin/src/pins/sanguino/pins_MELZI_V2.h
View File

@@ -28,10 +28,10 @@
#define BOARD_INFO_NAME "Melzi V2"
// Alter timing for graphical display
#if ENABLED(U8GLIB_ST7920)
#if IS_U8GLIB_ST7920
#define BOARD_ST7920_DELAY_1 0
#define BOARD_ST7920_DELAY_2 400
#define BOARD_ST7920_DELAY_3 0
#endif
#include "pins_MELZI.h"
#include "pins_MELZI.h" // ... SANGUINOLOLU_12 ... SANGUINOLOLU_11

12
Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
View File

@@ -135,7 +135,7 @@
#define LCD_BACKLIGHT_PIN 17 // LCD backlight LED
#endif
#if NONE(SPINDLE_FEATURE, LASER_FEATURE) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(IS_ULTRA_LCD, IS_NEWPANEL) // try to use IO Header
#if !HAS_CUTTER && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(HAS_WIRED_LCD, IS_NEWPANEL) // try to use IO Header
#define CASE_LIGHT_PIN 4 // Hardware PWM - see if IO Header is available
#endif
@@ -165,7 +165,7 @@
#define KILL_PIN 10
#define BEEPER_PIN 27
#elif ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
#elif IS_U8GLIB_ST7920 // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
#if IS_MELZI
#define LCD_PINS_RS 30 // CS chip select /SS chip slave select
@@ -207,11 +207,7 @@
#endif
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_0
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#elif ENABLED(ZONESTAR_LCD) // For the Tronxy Melzi boards
@@ -272,7 +268,7 @@
// M3/M4/M5 - Spindle/Laser Control
//
#if HAS_CUTTER
#if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(IS_ULTRA_LCD, IS_NEWPANEL) // try to use IO Header
#if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(HAS_WIRED_LCD, IS_NEWPANEL) // try to use IO Header
#define SPINDLE_LASER_ENA_PIN 10 // Pullup or pulldown!
#define SPINDLE_LASER_PWM_PIN 4 // Hardware PWM

2
Marlin/src/pins/sanguino/pins_STB_11.h
View File

@@ -27,4 +27,4 @@
#define BOARD_INFO_NAME "STB V1.1"
#include "pins_SANGUINOLOLU_12.h"
#include "pins_SANGUINOLOLU_12.h" // ... SANGUINOLOLU_11

78
Marlin/src/pins/sanguino/pins_ZMIB_V2.h
View File

@@ -146,7 +146,7 @@
#define FAN1_PIN -1
//
//filament run out sensor
// Filament Runout Sensor
//
#if EITHER(Z6S_ZFAULT, Z6BS_ZFAULT)
#define FIL_RUNOUT_PIN 13
@@ -162,32 +162,38 @@
#endif
#define SD_DETECT_PIN -1
/*===================================================
* ZMIB Version 1 - EXP1 Connector
* MOSI(D5) TX1(D11) ENA(D12) ENC(D29/A2) 5V
* SCK(D7) RX1(D10) SCS(D4) ENB(D2) GND
*===================================================
* ZMIB Version 2 - EXP1 Connector
* MOSI(D5) TX1(D11) ENA(D12) ENC(D29/A2) 5V
* SCK(D7) RX1(D10) SCS(D3) ENB(D2) GND
*===================================================
* LCD 128x64
*==================================================*/
/** EXP1
* ------
* (MOSI) D5 | 1 2 | D7 (SCK)
* (CS) D11 | 3 4 | D10 (DC/D4)
* (EN2) D12 5 6 | D4 or D3 (EN/RS)
* (ENC) D29 | 7 8 | D2 (EN1)
* (GND) | 9 10 | (5V)
* ------
*/
#define EXP1_01_PIN 5
#define EXP1_02_PIN 7
#define EXP1_03_PIN 11
#define EXP1_04_PIN 10
#define EXP1_05_PIN 12
#ifndef IS_ZMIB_V2
#define EXP1_06_PIN 4 // ZMIB V1
#else
#define EXP1_06_PIN 3 // ZMIB V2
#endif
#define EXP1_07_PIN 29
#define EXP1_08_PIN 2
#if ENABLED(ZONESTAR_12864LCD)
//
// LCD 128x64
//
#define LCDSCREEN_NAME "ZONESTAR_12864LCD"
#define LCDSCREEN_NAME "ZONESTAR_12864LCD"
#define FORCE_SOFT_SPI
//#define LCD_SDSS 11
#define LCD_PINS_RS 11 // ST7920_CS_PIN LCD_PIN_RS (PIN4 of LCD module)
#ifdef IS_ZMIB_V2
#define LCD_PINS_ENABLE 3 // ST7920_DAT_PIN LCD_PIN_R/W (PIN5 of LCD module)
#else
#define LCD_PINS_ENABLE 4 // ST7920_DAT_PIN LCD_PIN_R/W (PIN5 of LCD module)
#endif
#define LCD_PINS_D4 10 // ST7920_CLK_PIN LCD_PIN_ENABLE (PIN6 of LCD module)
//#define LCD_SDSS EXP1_03_PIN
#define LCD_PINS_RS EXP1_03_PIN // ST7920_CS_PIN (LCD module pin 4)
#define LCD_PINS_ENABLE EXP1_06_PIN // ST7920_DAT_PIN (LCD module pin 5)
#define LCD_PINS_D4 EXP1_04_PIN // ST7920_CLK_PIN (LCD module pin 6)
#define BOARD_ST7920_DELAY_1 DELAY_2_NOP
#define BOARD_ST7920_DELAY_2 DELAY_2_NOP
@@ -199,34 +205,28 @@
//
#define LCDSCREEN_NAME "ZONESTAR 12864OLED"
#define FORCE_SOFT_SPI
#ifdef IS_ZMIB_V2
#define LCD_PINS_RS 3 // RESET
#else
#define LCD_PINS_RS 4 // RESET
#endif
#define LCD_PINS_DC 10 // DC
#define DOGLCD_CS 11 // CS
#define LCD_PINS_RS EXP1_06_PIN
#define LCD_PINS_DC EXP1_04_PIN
#define DOGLCD_CS EXP1_03_PIN
#if ENABLED(OLED_HW_IIC)
#error "Oops! can't choose HW IIC for ZMIB board!!"
#elif ENABLED(OLED_HW_SPI)
// HW SPI
#define DOGLCD_A0 LCD_PINS_DC // A0 = DC
#else
// SW SPI
#define DOGLCD_A0 LCD_PINS_DC // A0 = DC
#define DOGLCD_MOSI AVR_MOSI_PIN // SDA
#define DOGLCD_SCK AVR_SCK_PIN // SCK
#define DOGLCD_A0 LCD_PINS_DC
#if DISABLED(OLED_HW_SPI)
#define DOGLCD_MOSI AVR_MOSI_PIN // Software SPI
#define DOGLCD_SCK AVR_SCK_PIN
#endif
#endif
#endif
//
// All the above are also RRDSC with rotary encoder
//
#if IS_RRD_SC
#define BTN_EN1 2
#define BTN_EN2 12
#define BTN_ENC 29
#define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXP1_05_PIN
#define BTN_ENC EXP1_07_PIN
#define BEEPER_PIN -1
#define KILL_PIN -1
#endif