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.2.2

Browse Source
This commit is contained in:
Stefan Kalscheuer
2024-02-13 20:32:22 +01:00
parent e466309bfb
commit 752476dc8f
1367 changed files with 41601 additions and 31124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/src/pins/esp32/env_validate.h
View File

@@ -19,8 +19,11 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
#pragma once
#ifndef ENV_VALIDATE_H
#define ENV_VALIDATE_H
#if NOT_TARGET(ARDUINO_ARCH_ESP32)
#error "Oops! Select an ESP32 board in 'Tools > Board.'"
#endif
#endif

6
Marlin/src/pins/esp32/pins_E4D.h
View File

@@ -30,9 +30,7 @@
#include "env_validate.h"
#if EXTRUDERS > 1 || E_STEPPERS > 1
#error "E4d@box only supports 1 E stepper."
#elif HAS_MULTI_HOTEND
#if HAS_MULTI_HOTEND || E_STEPPERS > 1
#error "E4d@box only supports 1 hotend / E stepper."
#endif
@@ -90,7 +88,7 @@
// Heaters / Fans
//
#define HEATER_0_PIN 2
#define FAN_PIN 0
#define FAN0_PIN 0
#define HEATER_BED_PIN 15
//

12
Marlin/src/pins/esp32/pins_ENWI_ESPNP.h
View File

@@ -34,7 +34,9 @@
//
// I2S (steppers & other output-only pins)
//
#define I2S_STEPPER_STREAM
#ifndef I2S_STEPPER_STREAM
#define I2S_STEPPER_STREAM
#endif
#if ENABLED(I2S_STEPPER_STREAM)
#define I2S_WS 17
#define I2S_BCK 22
@@ -91,7 +93,9 @@
#define K_CS_PIN 159
// Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200
#ifndef TMC_BAUD_RATE
#define TMC_BAUD_RATE 19200
#endif
//
// Temperature Sensors
@@ -101,14 +105,14 @@
// General use mosfets, useful for things like pumps and solenoids
// Shift register pins 128, 129, 130 and 131 are broken out and can be used
#define FAN_PIN 132
#define FAN0_PIN 132
#define FAN1_PIN 134
#define FAN2_PIN 135
#define FAN3_PIN 136
// #define FAN_SOFT_PWM_REQUIRED // check if needed
// Neopixel Rings
// NeoPixel Rings
#define NEOPIXEL_PIN 14
#define NEOPIXEL2_PIN 27

6
Marlin/src/pins/esp32/pins_ESP32.h
View File

@@ -32,7 +32,9 @@
//
// I2S (steppers & other output-only pins)
//
#define I2S_STEPPER_STREAM
#ifndef I2S_STEPPER_STREAM
#define I2S_STEPPER_STREAM
#endif
#if ENABLED(I2S_STEPPER_STREAM)
#define I2S_WS 25
#define I2S_BCK 26
@@ -79,7 +81,7 @@
// Heaters / Fans
//
#define HEATER_0_PIN 2
#define FAN_PIN 13
#define FAN0_PIN 13
#define HEATER_BED_PIN 4
// SPI

2
Marlin/src/pins/esp32/pins_ESPA_common.h
View File

@@ -68,7 +68,7 @@
// Heaters / Fans
//
#define HEATER_0_PIN 2
#define FAN_PIN 13
#define FAN0_PIN 13
#define HEATER_BED_PIN 4
//

4
Marlin/src/pins/esp32/pins_FYSETC_E4.h
View File

@@ -30,9 +30,7 @@
#include "env_validate.h"
#if EXTRUDERS > 1 || E_STEPPERS > 1
#error "FYSETC E4 only supports 1 E stepper."
#elif HAS_MULTI_HOTEND
#if HAS_MULTI_HOTEND || E_STEPPERS > 1
#error "FYSETC E4 only supports 1 hotend / E stepper."
#endif

20
Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
View File

@@ -22,10 +22,8 @@
#pragma once
/**
* MRR ESPE pin assignments
* MRR ESPE is a 3D printer control board based on the ESP32 microcontroller.
* Supports 5 stepper drivers (using I2S stepper stream), heated bed,
* single hotend, and LCD controller.
* MKS TinyBee pin assignments
* https://github.com/makerbase-mks/MKS-TinyBee
*/
#include "env_validate.h"
@@ -58,7 +56,9 @@
//
// Enable I2S stepper stream
//
#define I2S_STEPPER_STREAM
#ifndef I2S_STEPPER_STREAM
#define I2S_STEPPER_STREAM
#endif
#if ENABLED(I2S_STEPPER_STREAM)
#define I2S_WS 26
#define I2S_BCK 25
@@ -104,7 +104,7 @@
//
#define HEATER_0_PIN 145
#define HEATER_1_PIN 146
#define FAN_PIN 147
#define FAN0_PIN 147
#define FAN1_PIN 148
#define HEATER_BED_PIN 144
@@ -121,7 +121,7 @@
* ------ ------
* (BEEPER) 149 | 1 2 | 13 (BTN_ENC) (SPI MISO) 19 | 1 2 | 18 (SPI SCK)
* (LCD_EN) 21 | 3 4 | 4 (LCD_RS) (BTN_EN1) 14 | 3 4 | 5 (SPI CS)
* (LCD_D4) 0 5 6 | 16 (LCD_D5) (BTN_EN2) 12 5 6 | 23 (SPI MOSI)
* (LCD_D4) 0 | 5 6 16 (LCD_D5) (BTN_EN2) 12 | 5 6 23 (SPI MOSI)
* (LCD_D6) 15 | 7 8 | 17 (LCD_D7) (SPI_DET) 34 | 7 8 | RESET
* GND | 9 10 | 5V GND | 9 10 | 3.3V
* ------ ------
@@ -158,7 +158,7 @@
#if HAS_WIRED_LCD
#define BEEPER_PIN EXP1_01_PIN
#define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_EN EXP1_03_PIN
#define LCD_PINS_RS EXP1_04_PIN
#define BTN_ENC EXP1_02_PIN
#define BTN_EN1 EXP2_03_PIN
@@ -171,7 +171,7 @@
#define DOGLCD_A0 EXP1_07_PIN
#define LCD_RESET_PIN -1
#elif ENABLED(FYSETC_MINI_12864_2_1)
// MKS_MINI_12864_V3, BTT_MINI_12864_V1, FYSETC_MINI_12864_2_1
// MKS_MINI_12864_V3, BTT_MINI_12864, FYSETC_MINI_12864_2_1
#define DOGLCD_CS EXP1_03_PIN
#define DOGLCD_A0 EXP1_04_PIN
#define LCD_RESET_PIN EXP1_05_PIN
@@ -179,7 +179,7 @@
#if SD_CONNECTION_IS(ONBOARD)
#define FORCE_SOFT_SPI
#endif
#if BOTH(MKS_MINI_12864_V3, SDSUPPORT)
#if ALL(MKS_MINI_12864_V3, HAS_MEDIA)
#define PAUSE_LCD_FOR_BUSY_SD
#endif
#else

4
Marlin/src/pins/esp32/pins_MRR_ESPA.h
View File

@@ -30,9 +30,7 @@
#include "env_validate.h"
#if EXTRUDERS > 1 || E_STEPPERS > 1
#error "MRR ESPA only supports 1 E stepper."
#elif HAS_MULTI_HOTEND
#if HAS_MULTI_HOTEND || E_STEPPERS > 1
#error "MRR ESPA only supports 1 hotend / E stepper."
#endif

14
Marlin/src/pins/esp32/pins_MRR_ESPE.h
View File

@@ -51,7 +51,9 @@
//
// Enable I2S stepper stream
//
#define I2S_STEPPER_STREAM
#ifndef I2S_STEPPER_STREAM
#define I2S_STEPPER_STREAM
#endif
#if ENABLED(I2S_STEPPER_STREAM)
#define I2S_WS 26
#define I2S_BCK 25
@@ -102,7 +104,7 @@
// Heaters / Fans
//
#define HEATER_0_PIN 145 // 2
#define FAN_PIN 146 // 15
#define FAN0_PIN 146 // 15
#define HEATER_BED_PIN 144 // 4
#define CONTROLLER_FAN_PIN 147
@@ -119,14 +121,14 @@
#define SDSS 5
#define USES_SHARED_SPI // SPI is shared by SD card with TMC SPI drivers
//////////////////////////
// LCDs and Controllers //
//////////////////////////
//
// LCD / Controller
//
#if HAS_WIRED_LCD
#define LCD_PINS_RS 13
#define LCD_PINS_ENABLE 17
#define LCD_PINS_EN 17
#define LCD_PINS_D4 16
#if ENABLED(CR10_STOCKDISPLAY)

4
Marlin/src/pins/esp32/pins_PANDA_M4.h
View File

@@ -27,6 +27,10 @@
#define BOARD_INFO_NAME "Panda_M4"
#if HAS_MULTI_HOTEND || E_STEPPERS > 1
#error "PANDA M4 only supports 1 hotend / E stepper."
#endif
#include "pins_PANDA_common.h"
//

7
Marlin/src/pins/esp32/pins_PANDA_ZHU.h
View File

@@ -27,6 +27,13 @@
#define BOARD_INFO_NAME "Panda_ZHU"
#if E_STEPPERS > 5
#error "PANDA ZHU supports up to 5 E steppers."
#endif
#if HAS_MULTI_HOTEND
#error "PANDA ZHU only supports 1 hotend."
#endif
#include "pins_PANDA_common.h"
//

16
Marlin/src/pins/esp32/pins_PANDA_common.h
View File

@@ -63,10 +63,10 @@
#define TEMP_BED_PIN 36 // Analog Input
#if ENABLED(MAX31856_PANDAPI)
#define MAX31856_CLK_PIN 29
#define MAX31856_MISO_PIN 24
#define MAX31856_MOSI_PIN 28
#define MAX31856_CS_PIN 27
#define TEMP_0_CLK_PIN 29
#define TEMP_0_MISO_PIN 24
#define TEMP_0_MOSI_PIN 28
#define TEMP_0_CS_PIN 27
#endif
//
@@ -74,7 +74,7 @@
//
#define HEATER_0_PIN 108
#define HEATER_BED_PIN 109
#define FAN_PIN 118 // FAN0
#define FAN0_PIN 118 // FAN0
#define FAN1_PIN 119 // FAN1
#ifndef E0_AUTO_FAN_PIN
@@ -86,7 +86,7 @@
* (EN1) 33 | 3 4 | (5 SDSS?) (EN) 26 | 3 4 | 27 (RS)
* (EN2) 32 5 6 | (23 MOSI?) (D4) 14 | 5 6 --
* (SDDET 2?) | 7 8 | (RESET) -- | 7 8 | --
* -- | 9 10 | -- (GND) | 9 10 | (5V)
* -- | 9 10 | -- GND | 9 10 | 5V
* ------ ------
* EXP2 EXP1
*/
@@ -107,7 +107,7 @@
//
// SD Card
//
#if ENABLED(SDSUPPORT)
#if HAS_MEDIA
#define SD_MOSI_PIN EXP2_06_PIN
#define SD_MISO_PIN EXP2_01_PIN
#define SD_SCK_PIN EXP2_02_PIN
@@ -123,6 +123,6 @@
#define BTN_EN2 EXP2_05_PIN
#define LCD_PINS_RS EXP1_04_PIN
#define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_EN EXP1_03_PIN
#define LCD_PINS_D4 EXP1_05_PIN
#endif

4
Marlin/src/pins/esp32/pins_RESP32_CUSTOM.h
View File

@@ -34,4 +34,6 @@
//
// I2S (steppers & other output-only pins)
//
#define I2S_STEPPER_STREAM
#ifndef I2S_STEPPER_STREAM
#define I2S_STEPPER_STREAM
#endif