From 09f0245b89c5fe2dc8b7743b65cd52cf8c2e4211 Mon Sep 17 00:00:00 2001 From: Jakub Fridrich Date: Tue, 17 Nov 2020 23:23:06 +0100 Subject: [PATCH 1/4] Added Longer LK Pro / Alfawise PRO board --- Marlin/src/core/boards.h | 1 + Marlin/src/pins/pins.h | 3 +- Marlin/src/pins/ramps/pins_LONGER3D_LKPRO.h | 51 +++++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 Marlin/src/pins/ramps/pins_LONGER3D_LKPRO.h diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h index b60f73c2dc58..5ad3b66105f3 100644 --- a/Marlin/src/core/boards.h +++ b/Marlin/src/core/boards.h @@ -113,6 +113,7 @@ #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_LKPRO 1160 // Longer LKxxPRO/ Alfawise UxxPro (PRO version) // // RAMBo and derivatives diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index b9e12d823315..9f60f5358e77 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -215,7 +215,8 @@ #include "ramps/pins_RAMPS_S_12.h" // ATmega2560 env:mega2560 #elif MB(RAMPS_S_12_EFFB) #include "ramps/pins_RAMPS_S_12.h" // ATmega2560 env:mega2560 - +#elif MB(RAMPS_LONGER3D_LKPRO) + #include "ramps/pins_LONGER3D_LKPRO.h" // ATmega2560 env:mega2560 // // RAMBo and derivatives // diff --git a/Marlin/src/pins/ramps/pins_LONGER3D_LKPRO.h b/Marlin/src/pins/ramps/pins_LONGER3D_LKPRO.h new file mode 100644 index 000000000000..b4407ecf9a67 --- /dev/null +++ b/Marlin/src/pins/ramps/pins_LONGER3D_LKPRO.h @@ -0,0 +1,51 @@ +/** + * 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 . + * + */ +#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 "Longer-LKPRO" + +#ifdef LGT_ESP + #define Y_MIN_PIN 37 +#endif + +#define SD_DETECT_PIN 49 +#define FIL_RUNOUT_PIN 2 + +#ifdef U20_Pro_AutoBed + #define Z_MIN_PIN 11 + #define Z_MAX_PIN 37 +#else //U30_Pro + #define Z_MIN_PIN 35 + #ifndef LGT_ESP + #define Z_MAX_PIN 37 + #endif // !LGT_ESP +#endif + +// +// Import RAMPS 1.4 pins +// +#include "pins_RAMPS.h" From fceb5299071c22e033f44b8130c85520195a2da8 Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Wed, 18 Nov 2020 22:22:00 -0800 Subject: [PATCH 2/4] Add missing linefeed --- Marlin/src/pins/pins.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index 9f60f5358e77..bf7aa1263869 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -217,6 +217,7 @@ #include "ramps/pins_RAMPS_S_12.h" // ATmega2560 env:mega2560 #elif MB(RAMPS_LONGER3D_LKPRO) #include "ramps/pins_LONGER3D_LKPRO.h" // ATmega2560 env:mega2560 + // // RAMBo and derivatives // From 6072a2160935d89be8c2f56489731512035bd9d4 Mon Sep 17 00:00:00 2001 From: Jakub Fridrich Date: Thu, 19 Nov 2020 18:44:38 +0100 Subject: [PATCH 3/4] Modify board name. Remove test variable. --- Marlin/src/core/boards.h | 2 +- Marlin/src/pins/pins.h | 2 +- ...LONGER3D_LKPRO.h => pins_LONGER3D_LK4PRO.h} | 18 +++--------------- 3 files changed, 5 insertions(+), 17 deletions(-) rename Marlin/src/pins/ramps/{pins_LONGER3D_LKPRO.h => pins_LONGER3D_LK4PRO.h} (72%) diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h index 5ad3b66105f3..e68ba196ee81 100644 --- a/Marlin/src/core/boards.h +++ b/Marlin/src/core/boards.h @@ -113,7 +113,7 @@ #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_LKPRO 1160 // Longer LKxxPRO/ Alfawise UxxPro (PRO version) +#define BOARD_RAMPS_LONGER3D_LK4PRO 1160 // Longer LKxxPRO/ Alfawise UxxPro (PRO version) // // RAMBo and derivatives diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index bf7aa1263869..8614b7ea6920 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -216,7 +216,7 @@ #elif MB(RAMPS_S_12_EFFB) #include "ramps/pins_RAMPS_S_12.h" // ATmega2560 env:mega2560 #elif MB(RAMPS_LONGER3D_LKPRO) - #include "ramps/pins_LONGER3D_LKPRO.h" // ATmega2560 env:mega2560 + #include "ramps/pins_LONGER3D_LK4PRO.h" // ATmega2560 env:mega2560 // // RAMBo and derivatives diff --git a/Marlin/src/pins/ramps/pins_LONGER3D_LKPRO.h b/Marlin/src/pins/ramps/pins_LONGER3D_LK4PRO.h similarity index 72% rename from Marlin/src/pins/ramps/pins_LONGER3D_LKPRO.h rename to Marlin/src/pins/ramps/pins_LONGER3D_LK4PRO.h index b4407ecf9a67..9f11c86304c9 100644 --- a/Marlin/src/pins/ramps/pins_LONGER3D_LKPRO.h +++ b/Marlin/src/pins/ramps/pins_LONGER3D_LK4PRO.h @@ -26,26 +26,14 @@ #error "Longer UI supports only 1 hotend / E-stepper." #endif -#define BOARD_INFO_NAME "Longer-LKPRO" - -#ifdef LGT_ESP - #define Y_MIN_PIN 37 -#endif +#define BOARD_INFO_NAME "LGT_KIT_V1.0" #define SD_DETECT_PIN 49 #define FIL_RUNOUT_PIN 2 -#ifdef U20_Pro_AutoBed - #define Z_MIN_PIN 11 - #define Z_MAX_PIN 37 -#else //U30_Pro - #define Z_MIN_PIN 35 - #ifndef LGT_ESP - #define Z_MAX_PIN 37 - #endif // !LGT_ESP -#endif +#define Z_MIN_PIN 35 // // Import RAMPS 1.4 pins // -#include "pins_RAMPS.h" +#include "pins_RAMPS.h" \ No newline at end of file From e425a39b93a8e6a73a5d96767c5763ebc9f776ca Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 19 Nov 2020 18:24:48 -0600 Subject: [PATCH 4/4] tweak --- Marlin/src/pins/ramps/pins_LONGER3D_LK4PRO.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Marlin/src/pins/ramps/pins_LONGER3D_LK4PRO.h b/Marlin/src/pins/ramps/pins_LONGER3D_LK4PRO.h index 9f11c86304c9..8acf4e2f4f01 100644 --- a/Marlin/src/pins/ramps/pins_LONGER3D_LK4PRO.h +++ b/Marlin/src/pins/ramps/pins_LONGER3D_LK4PRO.h @@ -26,14 +26,13 @@ #error "Longer UI supports only 1 hotend / E-stepper." #endif -#define BOARD_INFO_NAME "LGT_KIT_V1.0" +#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" \ No newline at end of file +#include "pins_RAMPS.h"