Merge pull request #9572 from thinkyhead/bf2_tronxy_x5s

[2.0.x] Tronxy X5S
This commit is contained in:
Scott Lahteine 2018-02-10 15:43:58 -06:00 committed by GitHub
commit 0749ce92b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 1891 additions and 12 deletions

File diff suppressed because it is too large Load Diff

View File

@ -117,6 +117,7 @@
#define BOARD_MELZI_CREALITY 89 // Melzi Creality3D board (for CR-10 etc)
#define BOARD_MELZI_MALYAN 92 // Melzi Malyan M150 board
#define BOARD_CREALITY_ENDER 601 // Creality Ender
#define BOARD_MELZI_TRONXY 505 // Tronxy X5S
#define BOARD_STB_11 64 // STB V1.1
#define BOARD_AZTEEG_X1 65 // Azteeg X1

View File

@ -199,6 +199,8 @@
#include "pins_MELZI_MALYAN.h" // ATmega644P, ATmega1284P
#elif MB(CREALITY_ENDER)
#include "pins_CREALITY_ENDER.h" // ATmega1284P
#elif MB(MELZI_TRONXY)
#include "pins_MELZI_TRONXY.h" // ATmega644P, ATmega1284P
#elif MB(STB_11)
#include "pins_STB_11.h" // ATmega644P, ATmega1284P
#elif MB(AZTEEG_X1)
@ -525,6 +527,9 @@
#ifndef SDPOWER
#define SDPOWER -1
#endif
#ifndef SDSS
#define SDSS -1
#endif
#ifndef LED_PIN
#define LED_PIN -1
#endif

View File

@ -24,6 +24,9 @@
* Melzi pin assignments
*/
#define BOARD_NAME "Melzi"
#ifndef BOARD_NAME
#define BOARD_NAME "Melzi"
#endif
#define IS_MELZI
#include "pins_SANGUINOLOLU_12.h"

View File

@ -31,9 +31,8 @@
*/
#define BOARD_NAME "Melzi (Creality)"
#define IS_MELZI
#include "pins_SANGUINOLOLU_12.h"
#include "pins_MELZI.h"
// For the stock CR-10 use the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
// option for the display in Configuration.h

View File

@ -25,5 +25,4 @@
*/
#define BOARD_NAME "Melzi (ATmega1284)"
#define IS_MELZI
#include "pins_SANGUINOLOLU_12.h"
#include "pins_MELZI.h"

View File

@ -25,9 +25,7 @@
*/
#define BOARD_NAME "Melzi (Malyan)"
#define IS_MELZI
#include "pins_SANGUINOLOLU_12.h"
#include "pins_MELZI.h"
#undef LCD_SDSS
#undef LCD_PINS_RS

View File

@ -0,0 +1,55 @@
/**
* 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 pin assignments
*/
#define BOARD_NAME "Melzi (Tronxy)"
#include "pins_MELZI.h"
#undef Z_ENABLE_PIN
#undef LCD_PINS_RS
#undef LCD_PINS_ENABLE
#undef LCD_PINS_D4
#undef LCD_PINS_D5
#undef LCD_PINS_D6
#undef LCD_PINS_D7
#undef BTN_EN1
#undef BTN_EN2
#undef BTN_ENC
#undef LCD_SDSS
#define Z_ENABLE_PIN 14
#define LCD_PINS_RS 30
#define LCD_PINS_ENABLE 28
#define LCD_PINS_D4 16
#define LCD_PINS_D5 17
#define LCD_PINS_D6 27
#define LCD_PINS_D7 29
#define BTN_EN1 10
#define BTN_EN2 11
#define BTN_ENC 26
#define ST7920_DELAY_1 DELAY_0_NOP
#define ST7920_DELAY_2 DELAY_2_NOP
#define ST7920_DELAY_3 DELAY_0_NOP

View File

@ -72,9 +72,9 @@ lib_deps = ${common.lib_deps}
src_filter = ${common.default_src_filter}
#
# Anet 1.0 - Melzi clone (ATmega1284p)
# Melzi and clones (ATmega1284p)
#
[env:anet10]
[env:melzi]
platform = atmelavr
framework = arduino
board = sanguino_atmega1284p
@ -84,9 +84,9 @@ lib_deps = ${common.lib_deps}
src_filter = ${common.default_src_filter}
#
# Anet 1.0 (Optiboot bootloader)
# Melzi and clones (Optiboot bootloader)
#
[env:anet10_optiboot]
[env:melzi_optiboot]
platform = atmelavr
framework = arduino
board = sanguino_atmega1284p