Improved Longer3D LKx Pro board (#20372)

Co-authored-by: mrv96 <marione96@live.it>
2020-12-04 23:56:20 -06:00 · 2020-12-04 23:56:20 -06:00 · a09d096b87
commit a09d096b87
parent c88a7935d6
4 changed files with 126 additions and 41 deletions
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@ -113,7 +113,8 @@
 #define BOARD_RAMPS_S_12_EEFB         1157  // Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Fan, Bed)
 #define BOARD_RAMPS_S_12_EEEB         1158  // Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Hotend2, Bed)
 #define BOARD_RAMPS_S_12_EFFB         1159  // Ramps S 1.2 by Sakul.cz (Power outputs: Hotend, Fan0, Fan1, Bed)
-#define BOARD_RAMPS_LONGER3D_LK4PRO   1160  // Longer LKxxPRO/ Alfawise UxxPro (PRO version)
+#define BOARD_LONGER3D_LK1_PRO        1160  // Longer LK1 PRO / Alfawise U20 Pro (PRO version)
+#define BOARD_LONGER3D_LKx_PRO        1161  // Longer LKx PRO / Alfawise Uxx Pro (PRO version)

 //
 // RAMBo and derivatives
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@ -190,8 +190,8 @@
  #include "ramps/pins_MKS_GEN_L_V21.h"         // ATmega2560                             env:mega2560
 #elif MB(RAMPS_S_12_EEFB, RAMPS_S_12_EEEB, RAMPS_S_12_EFFB)
  #include "ramps/pins_RAMPS_S_12.h"            // ATmega2560                             env:mega2560
-#elif MB(RAMPS_LONGER3D_LKPRO)
-  #include "ramps/pins_LONGER3D_LK4PRO.h"       // ATmega2560                             env:mega2560
+#elif MB(LONGER3D_LK1_PRO, LONGER3D_LKx_PRO)
+  #include "ramps/pins_LONGER3D_LKx_PRO.h"      // ATmega2560                             env:mega2560

 //
 // RAMBo and derivatives
@ -663,6 +663,7 @@
  #define BOARD_RUMBA32                 -1018
  #define BOARD_RUMBA32_AUS3D           -1019
  #define BOARD_RAMPS_DAGOMA            -1020
+  #define BOARD_RAMPS_LONGER3D_LK4PRO   -1021

  #if MB(MKS_13)
    #error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration."
@ -708,6 +709,8 @@
    #error "BOARD_RUMBA32_AUS3D is now BOARD_RUMBA32_V1_0. Please update your configuration."
  #elif MB(RAMPS_DAGOMA)
    #error "BOARD_RAMPS_DAGOMA is now BOARD_DAGOMA_F5. Please update your configuration."
+  #elif MB(RAMPS_LONGER3D_LK4PRO)
+    #error "BOARD_RAMPS_LONGER3D_LK4PRO is now BOARD_LONGER3D_LKx_PRO. Please update your configuration."
  #else
    #error "Unknown MOTHERBOARD value set in Configuration.h"
  #endif
@ -733,6 +736,7 @@
  #undef BOARD_RUMBA32
  #undef BOARD_RUMBA32_AUS3D
  #undef BOARD_RAMPS_DAGOMA
+  #undef BOARD_RAMPS_LONGER3D_LK4PRO

 #endif

--- a/Marlin/src/pins/ramps/pins_LONGER3D_LK4PRO.h
+++ b/Marlin/src/pins/ramps/pins_LONGER3D_LK4PRO.h
@ -1,38 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 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/>.
- *
- */
-#pragma once
-
-// Longer UI assumptions
-#if HOTENDS > 1 || E_STEPPERS > 1
-  #error "Longer UI supports only 1 hotend / E-stepper."
-#endif
-
-#define BOARD_INFO_NAME "LGT Kit 1.0"
-
-#define SD_DETECT_PIN                         49
-#define FIL_RUNOUT_PIN                         2
-#define Z_MIN_PIN                             35
-
-//
-// Import RAMPS 1.4 pins
-//
-#include "pins_RAMPS.h"
--- a/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
+++ b/Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
@ -0,0 +1,118 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 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/>.
+ *
+ */
+#pragma once
+
+/**
+ * Longer3D LK1/LK4/LK5 Pro board pin assignments
+ */
+
+#if NOT_TARGET(__AVR_ATmega2560__)
+  #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
+#elif HOTENDS > 1 || E_STEPPERS > 1
+  #error "Longer3D LGT KIT V1.0 board only supports 1 hotend / E-stepper. Comment out this line to continue."
+#endif
+
+#if SERIAL_PORT == 1 || SERIAL_PORT_2 == 1
+  #warning "Serial 1 is originally reserved to DGUS LCD."
+#endif
+#if SERIAL_PORT == 2 || SERIAL_PORT_2 == 2
+  #warning "Serial 2 has no connector. Hardware changes may be required to use it."
+#endif
+#if SERIAL_PORT == 3 || SERIAL_PORT_2 == 3
+  #define CHANGE_Y_LIMIT_PINS
+  #warning "Serial 3 is originally reserved to Y limit switches. Hardware changes are required to use it."
+#endif
+
+// Custom flags and defines for the build
+//#define BOARD_CUSTOM_BUILD_FLAGS -D__FOO__
+
+#define BOARD_INFO_NAME "LGT KIT V1.0"
+
+//
+// Servos
+//
+#if !MB(LONGER3D_LK1_PRO)
+  #define SERVO0_PIN                           7
+#endif
+#define SERVO1_PIN -1
+#define SERVO2_PIN -1
+#define SERVO3_PIN -1
+
+//
+// Limit Switches
+//
+#define X_STOP_PIN                             3
+
+#ifdef CHANGE_Y_LIMIT_PINS
+  #define Y_STOP_PIN                          37
+#else
+  #define Y_MIN_PIN                           14
+  #define Y_MAX_PIN                           15
+#endif
+
+#if !MB(LONGER3D_LK1_PRO)
+  #ifdef CHANGE_Y_LIMIT_PINS
+    #define Z_STOP_PIN                        35
+  #else
+    #define Z_MIN_PIN                         35
+    #define Z_MAX_PIN                         37
+  #endif
+#else
+  #define Z_MIN_PIN                           11
+  #define Z_MAX_PIN                           37
+#endif
+
+//
+// Z Probe (when not Z_MIN_PIN)
+//
+#define Z_MIN_PROBE_PIN                       -1
+
+//
+// Misc. Functions
+//
+#define SD_DETECT_PIN                         49
+#define FIL_RUNOUT_PIN                         2
+
+//
+// Other RAMPS 1.3 pins
+//
+#define IS_RAMPS_EFB                              // Override autodetection. Bed will be undefined.
+#include "pins_RAMPS_13.h"
+
+//
+// Steppers
+//
+#undef E1_STEP_PIN
+#undef E1_DIR_PIN
+#undef E1_ENABLE_PIN
+#undef E1_CS_PIN
+
+//
+// Temperature Sensors
+//
+#undef TEMP_1_PIN
+
+//
+// Průša i3 MK2 Multiplexer Support
+//
+#undef E_MUX2_PIN
+#undef CHANGE_Y_LIMIT_PINS