Fix some warnings, Melzi pins
This commit is contained in:
Jason Smith
committed by
Scott Lahteine
Scott Lahteine
parent
b310047ded
commit
c305c2cc6b
@ -1,3 +1,26 @@
|
||||
/**
|
||||
* Marlin 3D Printer Firmware
|
||||
* Copyright (c) 2019 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/>.
|
||||
*
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
/**
|
||||
* CartesioV11 pin assignments
|
||||
*/
|
||||
|
||||
@ -1,3 +1,26 @@
|
||||
/**
|
||||
* Marlin 3D Printer Firmware
|
||||
* Copyright (c) 2019 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/>.
|
||||
*
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
/**
|
||||
* CartesioV12 pin assignments
|
||||
*/
|
||||
|
||||
@ -1,3 +1,26 @@
|
||||
/**
|
||||
* Marlin 3D Printer Firmware
|
||||
* Copyright (c) 2019 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/>.
|
||||
*
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
/**
|
||||
* CNControls V15 for HMS434 pin assignments
|
||||
*/
|
||||
@ -64,7 +87,7 @@
|
||||
//
|
||||
// Fans
|
||||
//
|
||||
#define FAN0_PIN 8
|
||||
#define FAN_PIN 8
|
||||
#define ORIG_E0_AUTO_FAN_PIN 30
|
||||
#define ORIG_E1_AUTO_FAN_PIN 30
|
||||
#define ORIG_E2_AUTO_FAN_PIN 30
|
||||
|
||||
@ -508,7 +508,9 @@
|
||||
#ifndef SD_DETECT_PIN
|
||||
#define SD_DETECT_PIN 49
|
||||
#endif
|
||||
#define KILL_PIN 41
|
||||
#ifndef KILL_PIN
|
||||
#define KILL_PIN 41
|
||||
#endif
|
||||
|
||||
#if ENABLED(BQ_LCD_SMART_CONTROLLER)
|
||||
#define LCD_BACKLIGHT_PIN 39
|
||||
|
||||
@ -156,9 +156,21 @@
|
||||
//
|
||||
#if HAS_SPI_LCD
|
||||
|
||||
#define SD_DETECT_PIN -1
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
|
||||
#if ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
|
||||
#if ENABLED(LCD_FOR_MELZI)
|
||||
|
||||
#define LCD_PINS_RS 17
|
||||
#define LCD_PINS_ENABLE 16
|
||||
#define LCD_PINS_D4 11
|
||||
|
||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(0)
|
||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(188)
|
||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(0)
|
||||
|
||||
#elif ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
|
||||
|
||||
#if IS_MELZI
|
||||
#define LCD_PINS_RS 30 // CS chip select /SS chip slave select
|
||||
@ -177,7 +189,7 @@
|
||||
#define LCD_PINS_D7 27
|
||||
#endif
|
||||
|
||||
#else // DOGM SPI LCD Support
|
||||
#else
|
||||
|
||||
#define DOGLCD_A0 30
|
||||
|
||||
@ -201,71 +213,64 @@
|
||||
#endif
|
||||
|
||||
// Uncomment screen orientation
|
||||
#define LCD_SCREEN_ROT_0
|
||||
//#define LCD_SCREEN_ROT_0
|
||||
//#define LCD_SCREEN_ROT_90
|
||||
//#define LCD_SCREEN_ROT_180
|
||||
//#define LCD_SCREEN_ROT_270
|
||||
|
||||
#else // !HAS_GRAPHICAL_LCD
|
||||
#elif ENABLED(ZONESTAR_LCD) // For the Tronxy Melzi boards
|
||||
|
||||
#define LCD_PINS_RS 4
|
||||
#define LCD_PINS_ENABLE 17
|
||||
#define LCD_PINS_D4 30
|
||||
#define LCD_PINS_D5 29
|
||||
#define LCD_PINS_D6 28
|
||||
#define LCD_PINS_D7 27
|
||||
#define LCD_PINS_RS 28
|
||||
#define LCD_PINS_ENABLE 29
|
||||
#define LCD_PINS_D4 10
|
||||
#define LCD_PINS_D5 11
|
||||
#define LCD_PINS_D6 16
|
||||
#define LCD_PINS_D7 17
|
||||
|
||||
#endif // !HAS_GRAPHICAL_LCD
|
||||
#else
|
||||
|
||||
#if ENABLED(LCD_I2C_PANELOLU2)
|
||||
#define LCD_PINS_RS 4
|
||||
#define LCD_PINS_ENABLE 17
|
||||
#define LCD_PINS_D4 30
|
||||
#define LCD_PINS_D5 29
|
||||
#define LCD_PINS_D6 28
|
||||
#define LCD_PINS_D7 27
|
||||
|
||||
#if IS_MELZI
|
||||
#define BTN_ENC 29
|
||||
#define LCD_SDSS 30 // Panelolu2 SD card reader rather than the Melzi
|
||||
#else
|
||||
#define BTN_ENC 30
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#elif ENABLED(LCD_FOR_MELZI)
|
||||
#if ENABLED(LCD_FOR_MELZI)
|
||||
|
||||
#define LCD_PINS_RS 17
|
||||
#define LCD_PINS_ENABLE 16
|
||||
#define LCD_PINS_D4 11
|
||||
#define BTN_ENC 28
|
||||
#define BTN_EN1 29
|
||||
#define BTN_EN2 30
|
||||
|
||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(0)
|
||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(188)
|
||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(0)
|
||||
#define BTN_ENC 28
|
||||
#define BTN_EN1 29
|
||||
#define BTN_EN2 30
|
||||
|
||||
#elif ENABLED(ZONESTAR_LCD) // For the Tronxy Melzi boards
|
||||
|
||||
#define LCD_PINS_RS 28
|
||||
#define LCD_PINS_ENABLE 29
|
||||
#define LCD_PINS_D4 10
|
||||
#define LCD_PINS_D5 11
|
||||
#define LCD_PINS_D6 16
|
||||
#define LCD_PINS_D7 17
|
||||
#define ADC_KEYPAD_PIN 1
|
||||
#define ADC_KEYPAD_PIN 1
|
||||
#define BTN_EN1 -1
|
||||
#define BTN_EN2 -1
|
||||
|
||||
#define BTN_EN1 -1
|
||||
#define BTN_EN2 -1
|
||||
#elif ENABLED(LCD_I2C_PANELOLU2)
|
||||
|
||||
#else // !LCD_I2C_PANELOLU2 && !LCD_FOR_MELZI && !ZONESTAR_LCD
|
||||
#if IS_MELZI
|
||||
#define BTN_ENC 29
|
||||
#define LCD_SDSS 30 // Panelolu2 SD card reader rather than the Melzi
|
||||
#else
|
||||
#define BTN_ENC 30
|
||||
#endif
|
||||
|
||||
#define BTN_ENC 16
|
||||
#define LCD_SDSS 28 // Smart Controller SD card reader rather than the Melzi
|
||||
#else // !LCD_FOR_MELZI && !ZONESTAR_LCD && !LCD_I2C_PANELOLU2
|
||||
|
||||
#define BTN_ENC 16
|
||||
#define LCD_SDSS 28 // Smart Controller SD card reader rather than the Melzi
|
||||
|
||||
#endif
|
||||
|
||||
#if ENABLED(NEWPANEL) && !defined(BTN_EN1)
|
||||
#define BTN_EN1 11
|
||||
#define BTN_EN2 10
|
||||
#define BTN_EN1 11
|
||||
#define BTN_EN2 10
|
||||
#endif
|
||||
|
||||
#define SD_DETECT_PIN -1
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
|
||||
//
|
||||
|
||||
Reference in New Issue
Block a user