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

21
Marlin/src/pins/mega/pins_CNCONTROLS_11.h
View File

@@ -135,17 +135,20 @@
//
// LCD / Controller
//
#define BEEPER_PIN 6
#if HAS_WIRED_LCD
#define BEEPER_PIN 6
// Pins for DOGM SPI LCD Support
#define DOGLCD_A0 26
#define DOGLCD_CS 24
#define DOGLCD_MOSI -1 // Prevent auto-define by Conditionals_post.h
#define DOGLCD_SCK -1
#define BTN_EN1 23
#define BTN_EN2 25
#define BTN_ENC 27
#define BTN_EN1 23
#define BTN_EN2 25
#define BTN_ENC 27
#if HAS_MARLINUI_U8GLIB
#define DOGLCD_A0 26
#define DOGLCD_CS 24
#define DOGLCD_MOSI -1 // Prevent auto-define by Conditionals_post.h
#define DOGLCD_SCK -1
#endif
#endif
// Hardware buttons for manual movement of XYZ
#define SHIFT_OUT_PIN 19

25
Marlin/src/pins/mega/pins_CNCONTROLS_12.h
View File

@@ -140,19 +140,20 @@
//
// LCD / Controller
//
#define BEEPER_PIN 16
#if HAS_WIRED_LCD
#define BEEPER_PIN 16
// Pins for DOGM SPI LCD Support
#define DOGLCD_A0 39
#define DOGLCD_CS 35
#define DOGLCD_MOSI 48
#define DOGLCD_SCK 49
#define LCD_SCREEN_ROT_180
#define BTN_EN1 36
#define BTN_EN2 34
#define BTN_ENC 38
// The encoder and click button
#define BTN_EN1 36
#define BTN_EN2 34
#define BTN_ENC 38
#if HAS_MARLINUI_U8GLIB
#define DOGLCD_A0 39
#define DOGLCD_CS 35
#define DOGLCD_MOSI 48
#define DOGLCD_SCK 49
#endif
#endif
// Hardware buttons for manual movement of XYZ
#define SHIFT_OUT_PIN 42
@@ -164,3 +165,5 @@
#define STAT_LED_BLUE_PIN -1
#define STAT_LED_RED_PIN 10 // TOOL_0_PWM_PIN
#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270

2
Marlin/src/pins/mega/pins_GT2560_REV_A.h
View File

@@ -127,7 +127,7 @@
#define LCD_RESET_PIN 16
#define DEFAULT_LCD_CONTRAST 220
#define LCD_CONTRAST_INIT 220
#define LCD_BACKLIGHT_PIN -1
#else

8
Marlin/src/pins/mega/pins_GT2560_V3_MC2.h
View File

@@ -27,9 +27,9 @@
#define BOARD_INFO_NAME "GT2560 V3.0 (MC2)"
#define X_MIN_PIN 22
#define X_MAX_PIN 24
#define Y_MIN_PIN 26
#define Y_MAX_PIN 28
#define X_MIN_PIN 22
#define X_MAX_PIN 24
#define Y_MIN_PIN 26
#define Y_MAX_PIN 28
#include "pins_GT2560_V3.h"

4
Marlin/src/pins/mega/pins_HJC2560C_REV2.h
View File

@@ -112,7 +112,7 @@
//
// M3/M4/M5 - Spindle/Laser Control
//
#if EITHER(SPINDLE_FEATURE, LASER_FEATURE)
#if HAS_CUTTER
#define SPINDLE_DIR_PIN 16
#define SPINDLE_LASER_ENA_PIN 17 // Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 9 // Hardware PWM
@@ -134,7 +134,7 @@
#if ENABLED(HJC_LCD_SMART_CONTROLLER)
#define LCD_BACKLIGHT_PIN 5 // LCD_Backlight
//#ifndef LCD_CONTRAST_PIN
// #define LCD_CONTRAST_PIN 5 // LCD_Contrast
// #define LCD_CONTRAST_PIN 5 // LCD_Contrast
//#endif
#ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN 24 // Filament runout

2
Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h
View File

@@ -84,7 +84,7 @@
#define E1_ENABLE_PIN 33
//
// Filament runout
// Filament Runout Sensor
//
#define FIL_RUNOUT_PIN 42 // ROT2 Connector
#define FIL_RUNOUT2_PIN 44 // ROT1 Connector

13
Marlin/src/pins/mega/pins_MEGACONTROLLER.h
View File

@@ -26,7 +26,7 @@
*/
#if HOTENDS > 2 || E_STEPPERS > 2
#error "Mega Controller supports up to 2 hotends / E-steppers. Comment out this line to continue."
#error "Mega Controller supports up to 2 hotends / E steppers."
#endif
#include "env_validate.h"
@@ -121,7 +121,7 @@
#define CONTROLLER_FAN_PIN FAN2_PIN
#endif
#define FAN_SOFT_PWM
#define FAN_SOFT_PWM_REQUIRED
//
// Misc. Functions
@@ -139,17 +139,12 @@
#if ENABLED(MINIPANEL)
#define BEEPER_PIN 46
// Pins for DOGM SPI LCD Support
#define DOGLCD_A0 47
#define DOGLCD_CS 45
#define LCD_BACKLIGHT_PIN 44 // backlight LED on PA3
#define KILL_PIN 12
// GLCD features
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
#define BTN_EN1 48
#define BTN_EN2 11
@@ -157,6 +152,8 @@
#define SD_DETECT_PIN 49
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#endif // MINIPANEL
//

4
Marlin/src/pins/mega/pins_MEGATRONICS.h
View File

@@ -106,7 +106,7 @@
//
#define BEEPER_PIN 33
#if IS_ULTRA_LCD && IS_NEWPANEL
#if HAS_WIRED_LCD && IS_NEWPANEL
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17
@@ -122,7 +122,7 @@
#define SD_DETECT_PIN -1 // RAMPS doesn't use this
#endif // IS_ULTRA_LCD && IS_NEWPANEL
#endif // HAS_WIRED_LCD && IS_NEWPANEL
//
// M3/M4/M5 - Spindle/Laser Control

73
Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
View File

@@ -69,7 +69,7 @@
#endif
//
// Filament Runout Pins
// Filament Runout Sensor
//
#ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN 49
@@ -144,61 +144,39 @@
//#define TEMP_1_MOSI_PIN TEMP_0_MOSI_PIN
//
// Augmentation for auto-assigning plugs
//
// Two thermocouple connectors allows for either
// 2 extruders or 1 extruder and a heated bed.
// With no heated bed, an additional 24V fan is possible.
// FET Pin Mapping - FET 1 is closest to the input power connector
//
// Labels from the schematic:
#define EX1_HEAT_PIN 6 // H3
#define EX1_FAN_PIN 7 // H4
#define EX2_HEAT_PIN 11 // B5
#define EX2_FAN_PIN 12 // B6
#define HBP_PIN 45 // L4
#define EXTRA_FET_PIN 44 // L5
#if HAS_MULTI_HOTEND
#if TEMP_SENSOR_BED
#define IS_EEB
#else
#define IS_EEF
#endif
#elif TEMP_SENSOR_BED
#define IS_EFB
#else
#define IS_EFF
#endif
#define MOSFET_1_PIN 6 // Plug EX1 Pin 1-2 -> PH3 #15 -> Logical 06
#define MOSFET_2_PIN 7 // Plug EX1 Pin 3-4 -> PH4 #16 -> Logical 07
#define MOSFET_3_PIN 11 // Plug EX2 1-2 -> PB5 #24 -> Logical 11
#define MOSFET_4_PIN 12 // Plug EX2 3-4 -> PB6 #25 -> Logical 12
#define MOSFET_5_PIN 45 // Plug HBD 1-2 -> PL4 #39 -> Logical 45
#define MOSFET_6_PIN 44 // Plug Extra 1-2 -> PL5 #40 -> Logical 44 (FET not soldered in all boards)
//
// Heaters / Fans (24V)
//
#define HEATER_0_PIN EX1_HEAT_PIN
#if ENABLED(IS_EFB) // Hotend, Fan, Bed
#define HEATER_BED_PIN HBP_PIN
#elif ENABLED(IS_EEF) // Hotend, Hotend, Fan
#define HEATER_1_PIN EX2_HEAT_PIN
#elif ENABLED(IS_EEB) // Hotend, Hotend, Bed
#define HEATER_1_PIN EX2_HEAT_PIN
#define HEATER_BED_PIN HBP_PIN
#elif ENABLED(IS_EFF) // Hotend, Fan, Fan
#define FAN1_PIN HBP_PIN
#endif
#define HEATER_0_PIN MOSFET_1_PIN // EX1
#define HEATER_1_PIN MOSFET_3_PIN // EX2
#define HEATER_BED_PIN MOSFET_5_PIN // HBP
#ifndef FAN_PIN
#if EITHER(IS_EFB, IS_EFF) // Hotend, Fan, Bed or Hotend, Fan, Fan
#define FAN_PIN EX2_HEAT_PIN
#elif EITHER(IS_EEF, IS_SF) // Hotend, Hotend, Fan or Spindle, Fan
#define FAN_PIN HBP_PIN
#else
#define FAN_PIN EXTRA_FET_PIN
// EX1 FAN (Automatic Fans are disabled by default in Configuration_adv.h - comment that out for auto fans)
#ifndef E0_AUTO_FAN_PIN
#define E0_AUTO_FAN_PIN MOSFET_2_PIN
#else
#ifndef FAN_PIN
#define FAN_PIN MOSFET_2_PIN
#endif
#endif
#ifndef CONTROLLER_FAN_PIN
#define CONTROLLER_FAN_PIN EX2_FAN_PIN
// EX2 FAN (Automatic Fans are disabled by default in Configuration_adv.h - comment that out for auto fans)
#ifndef E1_AUTO_FAN_PIN
#define E1_AUTO_FAN_PIN MOSFET_4_PIN
#else
#ifndef FAN1_PIN
#define FAN1_PIN MOSFET_4_PIN
#endif
#endif
//
@@ -268,9 +246,6 @@
#define SDSS 53 // B0
#define SD_DETECT_PIN 9 // H6
//
// TMC 220x
//
#if HAS_TMC_UART
/**
* TMC220x stepper drivers

2
Marlin/src/pins/mega/pins_MINITRONICS.h
View File

@@ -34,7 +34,7 @@
#if NOT_TARGET(__AVR_ATmega1281__)
#error "Oops! Select 'Minitronics' in 'Tools > Board.'"
#elif HOTENDS > 2 || E_STEPPERS > 2
#error "Minitronics supports up to 2 hotends / E-steppers. Comment out this line to continue."
#error "Minitronics supports up to 2 hotends / E steppers."
#endif
#define BOARD_INFO_NAME "Minitronics v1.0/1.1"

4
Marlin/src/pins/mega/pins_OVERLORD.h
View File

@@ -26,7 +26,7 @@
*/
#if HOTENDS > 2 || E_STEPPERS > 2
#error "Overlord Controller supports up to 2 hotends / E-steppers. Comment out this line to continue."
#error "Overlord supports up to 2 hotends / E steppers."
#endif
#include "env_validate.h"
@@ -49,7 +49,7 @@
#define Z_MIN_PROBE_PIN 46 // JP4, Tfeed1
#endif
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
#ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN 44 // JP3, Tfeed2
#endif

1
Marlin/src/pins/mega/pins_PICA.h
View File

@@ -51,6 +51,7 @@
#define SERVO0_PIN 3
#define SERVO1_PIN 4
#define SERVO2_PIN 5
//
// Limit Switches
//

2
Marlin/src/pins/mega/pins_SILVER_GATE.h
View File

@@ -73,7 +73,7 @@
#define TEMP_BED_PIN 6
#if HAS_WIRED_LCD
#if ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920
#if IS_U8GLIB_ST7920 // SPI GLCD 12864 ST7920
#define LCD_PINS_RS 30
#define LCD_PINS_ENABLE 20
#define LCD_PINS_D4 25

106
Marlin/src/pins/mega/pins_WEEDO_62A.h Normal file
View File

@@ -0,0 +1,106 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
/**
* Based on WEEDO 62A pin configuration
* Copyright (c) 2019 WEEDO3D Perron
*/
#pragma once
#include "env_validate.h"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "WEEDO 62A"
#endif
//
// Limit Switches
//
#define X_MIN_PIN 3
#define X_MAX_PIN 2
#define Y_MIN_PIN 40
#define Y_MAX_PIN 41
#define Z_MIN_PIN 18
#define Z_MAX_PIN 19
//
// Steppers
//
#define X_STEP_PIN 26
#define X_DIR_PIN 28
#define X_ENABLE_PIN 24
#define Y_STEP_PIN 60
#define Y_DIR_PIN 61
#define Y_ENABLE_PIN 56
#define Z_STEP_PIN 46
#define Z_DIR_PIN 48
#define Z_ENABLE_PIN 62
#define E0_STEP_PIN 54
#define E0_DIR_PIN 55
#define E0_ENABLE_PIN 38
//
// Temperature Sensors
//
#define TEMP_0_PIN 13 // ANALOG NUMBERING
#define TEMP_BED_PIN 14 // ANALOG NUMBERING
//
// Heaters / Fans
//
#define HEATER_0_PIN 10 // EXTRUDER 1
#define HEATER_BED_PIN 8 // BED
#define FAN_PIN 4 // IO pin. Buffer needed
//
// Misc. Functions
//
#define PS_ON_PIN 12
#define LED_PIN 13
//
// SD Support
//
#if ENABLED(SDSUPPORT)
#define SDSS 53
#define SD_DETECT_PIN 49
#endif
//
// LCD / Controller
//
#if HAS_WIRED_LCD
#define BEEPER_PIN 37
#define DOGLCD_A0 27
#define DOGLCD_CS 29
#define LCD_RESET_PIN 25
#define LCD_CONTRAST_INIT 255
#define BTN_EN1 33
#define BTN_EN2 31
#define BTN_ENC 35
#endif