From 344ebc3bd2d50921ece2a33ca4c4bce253a85d92 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 12 Jan 2018 01:07:25 -0600 Subject: [PATCH] Create and use pins_MELZI_MALYAN.h for Malyan M150 --- .../examples/Malyan/M150/Configuration.h | 2 +- Marlin/src/core/boards.h | 1 + Marlin/src/pins/pins.h | 2 + Marlin/src/pins/pins_MELZI_MALYAN.h | 50 +++++++++++++++++++ 4 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 Marlin/src/pins/pins_MELZI_MALYAN.h diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration.h b/Marlin/src/config/examples/Malyan/M150/Configuration.h index 420b3bdf13..d2890c05f4 100644 --- a/Marlin/src/config/examples/Malyan/M150/Configuration.h +++ b/Marlin/src/config/examples/Malyan/M150/Configuration.h @@ -133,7 +133,7 @@ // The following define selects which electronics board you have. // Please choose the name from boards.h that matches your setup #ifndef MOTHERBOARD - #define MOTHERBOARD BOARD_MELZI + #define MOTHERBOARD BOARD_MELZI_MALYAN #endif // Optional custom name for your RepStrap or other custom machine diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h index 075ac1e9ea..58395dfe74 100644 --- a/Marlin/src/core/boards.h +++ b/Marlin/src/core/boards.h @@ -114,6 +114,7 @@ #define BOARD_MELZI 63 // Melzi #define BOARD_MELZI_MAKR3D 66 // Melzi with ATmega1284 (MaKr3d version) #define BOARD_MELZI_CREALITY 89 // Melzi Creality3D board (for CR-10 etc) +#define BOARD_MELZI_MALYAN 92 // Melzi Malyan M150 board #define BOARD_STB_11 64 // STB V1.1 #define BOARD_AZTEEG_X1 65 // Azteeg X1 diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index 8bd0d8d333..420f8df740 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -193,6 +193,8 @@ #include "pins_MELZI_MAKR3D.h" // ATmega644P, ATmega1284P #elif MB(MELZI_CREALITY) #include "pins_MELZI_CREALITY.h" // ATmega644P, ATmega1284P +#elif MB(MELZI_MALYAN) + #include "pins_MELZI_MALYAN.h" // ATmega644P, ATmega1284P #elif MB(STB_11) #include "pins_STB_11.h" // ATmega644P, ATmega1284P #elif MB(AZTEEG_X1) diff --git a/Marlin/src/pins/pins_MELZI_MALYAN.h b/Marlin/src/pins/pins_MELZI_MALYAN.h new file mode 100644 index 0000000000..91a182cda1 --- /dev/null +++ b/Marlin/src/pins/pins_MELZI_MALYAN.h @@ -0,0 +1,50 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (C) 2016 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 . + * + */ + +/** + * Melzi (Malyan M150) pin assignments + */ + +#define BOARD_NAME "Melzi (Malyan)" +#define IS_MELZI + +#include "pins_SANGUINOLOLU_12.h" + +#undef LCD_SDSS +#undef LCD_PINS_RS +#undef LCD_PINS_ENABLE +#undef LCD_PINS_D4 +#undef BTN_EN1 +#undef BTN_EN2 +#undef BTN_ENC + +#define LCD_PINS_RS 17 // st9720 CS +#define LCD_PINS_ENABLE 16 // st9720 DAT +#define LCD_PINS_D4 11 // st9720 CLK +#define BTN_EN1 30 +#define BTN_EN2 29 +#define BTN_ENC 28 + +// Alter timing for graphical display +#define ST7920_DELAY_1 DELAY_2_NOP +#define ST7920_DELAY_2 DELAY_2_NOP +#define ST7920_DELAY_3 DELAY_2_NOP