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

update code base to Marlin 2.0.9.2

Browse Source
This commit is contained in:
Stefan Kalscheuer
2021-10-03 18:57:12 +02:00
parent b9d7ba838e
commit 7077da3591
2617 changed files with 332093 additions and 103438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
Marlin/src/pins/ramps/pins_FYSETC_F6_13.h Executable file → Normal file
View File

@@ -16,7 +16,7 @@
* 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 <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
#pragma once
@@ -25,7 +25,7 @@
// FYSETC F6 1.3 (and 1.4) pin assignments
//
#ifndef __AVR_ATmega2560__
#if NOT_TARGET(__AVR_ATmega2560__)
#error "Oops! Select 'FYSETC F6' in 'Tools > Board.'"
#endif
@@ -34,7 +34,7 @@
#endif
#define RESET_PIN 30
#define SPI_FLASH_CS 83
#define SPI_FLASH_CS_PIN 83
//
// Servos
@@ -124,42 +124,42 @@
* Software serial communication pins.
* At the moment, F6 rx pins are not pc interrupt pins
*/
#ifndef X_SERIAL_RX_PIN
#define X_SERIAL_RX_PIN -1 // 71
#endif
#ifndef X_SERIAL_TX_PIN
#define X_SERIAL_TX_PIN 72
#endif
#ifndef Y_SERIAL_RX_PIN
#define Y_SERIAL_RX_PIN -1 // 73
#ifndef X_SERIAL_RX_PIN
#define X_SERIAL_RX_PIN -1 // 71
#endif
#ifndef Y_SERIAL_TX_PIN
#define Y_SERIAL_TX_PIN 75
#endif
#ifndef Z_SERIAL_RX_PIN
#define Z_SERIAL_RX_PIN -1 // 78
#ifndef Y_SERIAL_RX_PIN
#define Y_SERIAL_RX_PIN -1 // 73
#endif
#ifndef Z_SERIAL_TX_PIN
#define Z_SERIAL_TX_PIN 79
#endif
#ifndef E0_SERIAL_RX_PIN
#define E0_SERIAL_RX_PIN -1 // 76
#ifndef Z_SERIAL_RX_PIN
#define Z_SERIAL_RX_PIN -1 // 78
#endif
#ifndef E0_SERIAL_TX_PIN
#define E0_SERIAL_TX_PIN 77
#endif
#ifndef E1_SERIAL_RX_PIN
#define E1_SERIAL_RX_PIN -1 // 80
#ifndef E0_SERIAL_RX_PIN
#define E0_SERIAL_RX_PIN -1 // 76
#endif
#ifndef E1_SERIAL_TX_PIN
#define E1_SERIAL_TX_PIN 81
#endif
#ifndef E2_SERIAL_RX_PIN
#define E2_SERIAL_RX_PIN -1 // 22
#ifndef E1_SERIAL_RX_PIN
#define E1_SERIAL_RX_PIN -1 // 80
#endif
#ifndef E2_SERIAL_TX_PIN
#define E2_SERIAL_TX_PIN 82
#endif
#ifndef E2_SERIAL_RX_PIN
#define E2_SERIAL_RX_PIN -1 // 22
#endif
#endif
//
@@ -201,7 +201,7 @@
* ----- -----
* 5V/D41 | · · | GND 5V | · · | GND
* RESET | · · | D49 (SD_DETECT) (LCD_D7) D29 | · · | D27 (LCD_D6)
* (MOSI) D51 | · · | D33 (BTN_EN2) (LCD_D5) D25 | · · | D23 (LCD_D4)
* (MOSI) D51 | · · D33 (BTN_EN2) (LCD_D5) D25 | · · D23 (LCD_D4)
* (SD_SS) D53 | · · | D31 (BTN_EN1) (LCD_RS) D16 | · · | D17 (LCD_EN)
* (SCK) D52 | · · | D50 (MISO) (BTN_ENC) D35 | · · | D37 (BEEPER)
* ----- -----
@@ -211,58 +211,80 @@
//
// LCDs and Controllers
//
#define BEEPER_PIN 37
#define SD_DETECT_PIN 49
#if ENABLED(FYSETC_MINI_12864)
//
// See https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
//
#define DOGLCD_A0 16
#define DOGLCD_CS 17
#if ENABLED(FYSETC_GENERIC_12864_1_1)
#define LCD_BACKLIGHT_PIN 27
#endif
#define KILL_PIN 41
#define LCD_RESET_PIN 23 // Must be high or open for LCD to operate normally.
// Seems to work best if left open.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN 25
#endif
#ifndef RGB_LED_G_PIN
#define RGB_LED_G_PIN 27
#endif
#ifndef RGB_LED_B_PIN
#define RGB_LED_B_PIN 29
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
#define NEOPIXEL_PIN 25
#endif
#elif HAS_GRAPHICAL_LCD
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 23
#define LCD_PINS_D5 25
#define LCD_PINS_D6 27
#define LCD_PINS_D7 29
#if ENABLED(MKS_MINI_12864)
#define DOGLCD_CS 25
#define DOGLCD_A0 27
#endif
#endif
#if ENABLED(NEWPANEL)
#define BTN_EN1 31
#define BTN_EN2 33
#if ENABLED(FYSETC_242_OLED_12864)
#define BTN_EN1 37
#define BTN_EN2 29
#define BTN_ENC 35
#define BEEPER_PIN 31
#define LCD_PINS_DC 25
#define LCD_PINS_RS 33
#define DOGLCD_CS 16
#define DOGLCD_MOSI 23
#define DOGLCD_SCK 17
#define DOGLCD_A0 LCD_PINS_DC
#undef KILL_PIN
#define NEOPIXEL_PIN 27
#else
#define BEEPER_PIN 37
#if ENABLED(FYSETC_MINI_12864)
//
// See https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
//
#define DOGLCD_A0 16
#define DOGLCD_CS 17
#if ENABLED(FYSETC_GENERIC_12864_1_1)
#define LCD_BACKLIGHT_PIN 27
#endif
#define LCD_RESET_PIN 23 // Must be high or open for LCD to operate normally.
// Seems to work best if left open.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN 25
#endif
#ifndef RGB_LED_G_PIN
#define RGB_LED_G_PIN 27
#endif
#ifndef RGB_LED_B_PIN
#define RGB_LED_B_PIN 29
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
#define NEOPIXEL_PIN 25
#endif
#elif HAS_MARLINUI_U8GLIB || HAS_MARLINUI_HD44780
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 23
#define LCD_PINS_D5 25
#define LCD_PINS_D6 27
#define LCD_PINS_D7 29
#if ENABLED(MKS_MINI_12864)
#define DOGLCD_CS 25
#define DOGLCD_A0 27
#endif
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif
#endif
#if IS_NEWPANEL
#define BTN_EN1 31
#define BTN_EN2 33
#define BTN_ENC 35
#endif
#endif
#ifndef RGB_LED_R_PIN