Merge pull request #7257 from thinkyhead/bf_Creality_CR10

Support for Creality CR-10

Marlin/boards.h

@@ -54,9 +54,10 @@
 #define BOARD_SANGUINOLOLU_11   6    // Sanguinololu < 1.2
 #define BOARD_SANGUINOLOLU_12   62   // Sanguinololu 1.2 and above
 #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_STB_11            64   // STB V1.1
 #define BOARD_AZTEEG_X1         65   // Azteeg X1
-#define BOARD_MELZI_MAKR3D      66   // Melzi with ATmega1284 (MaKr3d version)
 #define BOARD_AZTEEG_X3         67   // Azteeg X3
 #define BOARD_AZTEEG_X3_PRO     68   // Azteeg X3 Pro
 #define BOARD_ANET_10           69   // Anet 1.0 (Melzi clone)

Marlin/pins.h

@@ -97,12 +97,14 @@
   #include "pins_SANGUINOLOLU_12.h"
 #elif MB(MELZI)
   #include "pins_MELZI.h"
+#elif MB(MELZI_MAKR3D)
+  #include "pins_MELZI_MAKR3D.h"
+#elif MB(MELZI_CREALITY)
+  #include "pins_MELZI_CREALITY.h"
 #elif MB(STB_11)
   #include "pins_STB_11.h"
 #elif MB(AZTEEG_X1)
   #include "pins_AZTEEG_X1.h"
-#elif MB(MELZI_MAKR3D)
-  #include "pins_MELZI_MAKR3D.h"
 #elif MB(AZTEEG_X3)
   #include "pins_AZTEEG_X3.h"
 #elif MB(AZTEEG_X3_PRO)

Marlin/pins_MELZI_CREALITY.h

@@ -0,0 +1,100 @@
+/**
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Melzi (Creality) pin assignments
+ */
+
+#define BOARD_NAME "Melzi Creality"
+
+#ifdef __AVR_ATmega1284P__
+  #define LARGE_FLASH true
+#endif
+
+// For the stock CR-10 use the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
+//   option for the display in Configuration.h
+
+#define SANGUINOLOLU_V_1_2
+#include "pins_SANGUINOLOLU_11.h"
+
+#undef LCD_SDSS
+#undef LED_PIN
+
+#undef LCD_PINS_RS
+#undef LCD_PINS_ENABLE
+
+#define LCD_PINS_RS     28 // st9720 CS
+#define LCD_PINS_ENABLE 17 // st9720 DAT
+
+#undef LCD_PINS_D4
+#undef LCD_PINS_D5
+#undef LCD_PINS_D6
+#undef LCD_PINS_D7
+
+#define LCD_PINS_D4     30 // st9720 CLK
+
+/**
+  PIN:   0   Port: B0        E0_DIR_PIN                  protected
+  PIN:   1   Port: B1        E0_STEP_PIN                 protected
+  PIN:   2   Port: B2        Z_DIR_PIN                   protected
+  PIN:   3   Port: B3        Z_STEP_PIN                  protected
+  PIN:   4   Port: B4        AVR_SS_PIN                  protected
+  .                          FAN_PIN                     protected
+  .                          SS_PIN                      protected
+  PIN:   5   Port: B5        AVR_MOSI_PIN                Output = 1
+  .                          MOSI_PIN                    Output = 1
+  PIN:   6   Port: B6        AVR_MISO_PIN                Input  = 0    TIMER3A   PWM:     0    WGM: 1    COM3A: 0    CS: 3    TCCR3A: 1    TCCR3B: 3    TIMSK3: 0
+  .                          MISO_PIN                    Input  = 0
+  PIN:   7   Port: B7        AVR_SCK_PIN                 Output = 0    TIMER3B   PWM:     0    WGM: 1    COM3B: 0    CS: 3    TCCR3A: 1    TCCR3B: 3    TIMSK3: 0
+  .                          SCK_PIN                     Output = 0
+  PIN:   8   Port: D0        RXD                         Input  = 1
+  PIN:   9   Port: D1        TXD                         Input  = 0
+  PIN:  10   Port: D2        BTN_EN2                     Input  = 1
+  PIN:  11   Port: D3        BTN_EN1                     Input  = 1
+  PIN:  12   Port: D4        HEATER_BED_PIN              protected
+  PIN:  13   Port: D5        HEATER_0_PIN                protected
+  PIN:  14   Port: D6        E0_ENABLE_PIN               protected
+  .                          X_ENABLE_PIN                protected
+  .                          Y_ENABLE_PIN                protected
+  PIN:  15   Port: D7        X_STEP_PIN                  protected
+  PIN:  16   Port: C0        BTN_ENC                     Input  = 1
+  .                          SCL                         Input  = 1
+  PIN:  17   Port: C1        LCD_PINS_ENABLE             Output = 0
+  .                          SDA                         Output = 0
+  PIN:  18   Port: C2        X_MIN_PIN                   protected
+  .                          X_STOP_PIN                  protected
+  PIN:  19   Port: C3        Y_MIN_PIN                   protected
+  .                          Y_STOP_PIN                  protected
+  PIN:  20   Port: C4        Z_MIN_PIN                   protected
+  .                          Z_STOP_PIN                  protected
+  PIN:  21   Port: C5        X_DIR_PIN                   protected
+  PIN:  22   Port: C6        Y_STEP_PIN                  protected
+  PIN:  23   Port: C7        Y_DIR_PIN                   protected
+  PIN:  24   Port: A7        TEMP_0_PIN                  protected
+  PIN:  25   Port: A6        TEMP_BED_PIN                protected
+  PIN:  26   Port: A5        Z_ENABLE_PIN                protected
+  PIN:  27   Port: A4        BEEPER_PIN                  Output = 0
+  PIN:  28   Port: A3        LCD_PINS_RS                 Output = 0
+  PIN:  29   Port: A2        <unused/unknown>            Input  = 0
+  PIN:  30   Port: A1        LCD_PINS_D4                 Output = 1
+  PIN:  31   Port: A0        SDSS                        Output = 1
+*/

Marlin/pins_SANGUINOLOLU_11.h

@@ -59,7 +59,7 @@
   #define BOARD_NAME "Sanguinololu <1.2"
 #endif
 
-#define IS_MELZI (MB(MELZI) || MB(MELZI_MAKR3D))
+#define IS_MELZI (MB(MELZI) || MB(MELZI_MAKR3D) || MB(MELZI_CREALITY))
 
 //
 // Limit Switches