Add Lerdge S,X,K (#18302)

This commit is contained in:
J.C. Nelson
2020-07-06 15:08:52 -07:00
committed by GitHub
parent af8be58d92
commit 6f14d2d37f
29 changed files with 1775 additions and 157 deletions

View File

@ -586,8 +586,10 @@
#include "stm32f4/pins_BTT_BTT002_V1_0.h" // STM32F4 env:BIGTREE_BTT002
#elif MB(LERDGE_K)
#include "stm32f4/pins_LERDGE_K.h" // STM32F4 env:STM32F4
#elif MB(LERDGE_S)
#include "stm32f4/pins_LERDGE_S.h" // STM32F4 env:LERDGE_S
#elif MB(LERDGE_X)
#include "stm32f4/pins_LERDGE_X.h" // STM32F4 env:STM32F4
#include "stm32f4/pins_LERDGE_X.h" // STM32F4 env:LERDGE_X
#elif MB(VAKE403D)
#include "stm32f4/pins_VAKE403D.h" // STM32F4 env:STM32F4
#elif MB(FYSETC_S6)

View File

@ -29,13 +29,10 @@
#define I2C_EEPROM
// Ignore temp readings during develpment.
//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
//
// Servos
//
//#define SERVO0_PIN PD12
//#define SERVO0_PIN PB11
//
// Limit Switches
@ -48,14 +45,14 @@
// Z Probe (when not Z_MIN_PIN)
//
//#ifndef Z_MIN_PROBE_PIN
// #define Z_MIN_PROBE_PIN PB15
// #define Z_MIN_PROBE_PIN PG6
//#endif
//
// Filament runout
//
#define FIL_RUNOUT_PIN PE6
#define FIL_RUNOUT2_PIN PE7
#define FIL_RUNOUT_PIN PE5
#define FIL_RUNOUT2_PIN PE6
//
// Steppers
@ -64,35 +61,35 @@
#define X_DIR_PIN PB10
#define X_ENABLE_PIN PG0
//#ifndef X_CS_PIN
// #define X_CS_PIN PE0
// #define X_CS_PIN PE0
//#endif
#define Y_STEP_PIN PF14
#define Y_DIR_PIN PF15
#define Y_ENABLE_PIN PF13
//#ifndef Y_CS_PIN
// #define Y_CS_PIN PE1
// #define Y_CS_PIN PE1
//#endif
#define Z_STEP_PIN PF11
#define Z_DIR_PIN PF12
#define Z_ENABLE_PIN PC5
//#ifndef Z_CS_PIN
// #define Z_CS_PIN PE2
// #define Z_CS_PIN PE2
//#endif
#define E0_STEP_PIN PC14
#define E0_DIR_PIN PC13
#define E0_ENABLE_PIN PC15
//#ifndef E0_CS_PIN
// #define E0_CS_PIN PE3
// #define E0_CS_PIN PE3
//#endif
#define E1_STEP_PIN PF1
#define E1_DIR_PIN PF0
#define E1_ENABLE_PIN PF2
//#ifndef E1_CS_PIN
// #define E1_CS_PIN PE4
// #define E1_CS_PIN PE4
//#endif
//
@ -102,6 +99,12 @@
#define TEMP_1_PIN PC2 // Analog Input
#define TEMP_BED_PIN PC0 // Analog Input
// Lergde-K can choose thermocouple/thermistor mode in software.
// For use with thermistors, these pins must be OUT/LOW.
// This is done automatically.
#define TEMP_0_TR_ENABLE_PIN PF10
#define TEMP_1_TR_ENABLE_PIN PF9
//
// Heaters / Fans
//
@ -110,10 +113,10 @@
#define HEATER_BED_PIN PA2
#ifndef FAN_PIN
#define FAN_PIN PC15
#define FAN_PIN PF7
#endif
#define FAN1_PIN PF6
#define FAN2_PIN PF7
#define FAN2_PIN PF8
#ifndef E0_AUTO_FAN_PIN
#define E0_AUTO_FAN_PIN PF6
@ -125,12 +128,15 @@
//#define CASE_LIGHT_PIN_CI -1
//#define CASE_LIGHT_PIN_DO -1
//#define NEOPIXEL_PIN -1
//
// Prusa i3 MK2 Multi-Material Multiplexer Support
//
//#define E_MUX0_PIN -1
//#define E_MUX1_PIN -1
#ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN PB7
#endif
#ifndef RGB_LED_G_PIN
#define RGB_LED_G_PIN PB8
#endif
#ifndef RGB_LED_B_PIN
#define RGB_LED_B_PIN PB9
#endif
//
// SD support
@ -141,45 +147,34 @@
// Misc. Functions
//
#define SDSS PC11
#define LED_PIN PC7 // Alive
#define LED_PIN PA15 // Alive
#define PS_ON_PIN -1
#define KILL_PIN -1
#define POWER_LOSS_PIN -1 // Power-loss / nAC_FAULT
#define POWER_LOSS_PIN PA4 // Power-loss / nAC_FAULT
#define SCK_PIN PC12
#define MISO_PIN PC8
#define MOSI_PIN PD2
#define SS_PIN PC11
#define SD_DETECT_PIN PA8
#define BEEPER_PIN PC7
//
// LCD / Controller
//
// TODO: Replace these with the correct FSMC pins, once known
#define SD_DETECT_PIN -1
#define BEEPER_PIN PD12
#define LCD_PINS_RS -1
#define LCD_PINS_ENABLE -1
#define LCD_PINS_D4 -1
#define LCD_PINS_D5 -1
#define LCD_PINS_D6 -1
#define LCD_PINS_D7 -1
#define TFT_RESET_PIN PD6
#define TFT_BACKLIGHT_PIN PD3
#define BTN_EN1 PE3
#define BTN_EN2 PE4
#define BTN_ENC PE2
#define TFT_CS_PIN PD7
#define TFT_RS_PIN PD11
//
// ST7920 Delays
//
#if HAS_GRAPHICAL_LCD
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(96)
#endif
#ifndef BOARD_ST7920_DELAY_2
#define BOARD_ST7920_DELAY_2 DELAY_NS(48)
#endif
#ifndef BOARD_ST7920_DELAY_3
#define BOARD_ST7920_DELAY_3 DELAY_NS(715)
#endif
#endif
#define TOUCH_CS_PIN PG15
#define TOUCH_SCK_PIN PB3
#define TOUCH_MOSI_PIN PB5
#define TOUCH_MISO_PIN PB4
#define BTN_EN1 PG10
#define BTN_EN2 PG11
#define BTN_ENC PG9

View File

@ -0,0 +1,208 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* 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
#if !defined(STM32F4) && !defined(STM32F4xx)
#error "Oops! Select an STM32F4 board in 'Tools > Board.'"
#elif HOTENDS > 2 || E_STEPPERS > 2
#error "LERDGE S supports up to 2 hotends / E-steppers."
#endif
#define BOARD_INFO_NAME "Lerdge S"
#define DEFAULT_MACHINE_NAME "LERDGE"
#define STEP_TIMER 4
#define TEMP_TIMER 2
//#define I2C_EEPROM
//
// Servos
//
#define SERVO0_PIN PD12 //confirmed
//#define SERVO1_PIN -1
//
// Limit Switches
//
#define X_MIN_PIN PG9 //confirmed
#define Y_MIN_PIN PG10 //confirmed
#define Z_MIN_PIN PG11 //confirmed
#define X_MAX_PIN PG12 //confirmed
#define Y_MAX_PIN PG13 //confirmed
#define Z_MAX_PIN PG14 //confirmed
//
// Filament runout
//
#define FIL_RUNOUT_PIN PC5 //confirmed
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
#define Z_MIN_PROBE_PIN PG8 //confirmed
#endif
//
// Steppers
//
#define X_STEP_PIN PF7 //confirmed
#define X_DIR_PIN PF8 //confirmed
#define X_ENABLE_PIN PF6 //confirmed
#define Y_STEP_PIN PF10 //confirmed
#define Y_DIR_PIN PF11 //confirmed
#define Y_ENABLE_PIN PF9 //confirmed
#define Z_STEP_PIN PF13 //confirmed
#define Z_DIR_PIN PF14 //confirmed
#define Z_ENABLE_PIN PF12 //confirmed
#define E0_STEP_PIN PG0 //confirmed
#define E0_DIR_PIN PG1 //confirmed
#define E0_ENABLE_PIN PF15 //confirmed
#define E1_STEP_PIN PG3 //confirmed
#define E1_DIR_PIN PG4 //confirmed
#define E1_ENABLE_PIN PG2 //confirmed
//
// Temperature Sensors
//
#define TEMP_0_PIN PC0 // See below for activation of thermistor readings
#define TEMP_1_PIN PC1 // See below for activation of thermistor readings
#define TEMP_BED_PIN PC3 //confirmed
// Lergde-S can choose thermocouple/thermistor mode in software.
// For use with thermistors, these pins must be OUT/LOW.
// This is done automatically.
#define TEMP_0_TR_ENABLE_PIN PF3
#define TEMP_1_TR_ENABLE_PIN PF4
// MAX6675 Cold-Junction-Compensated K-Thermocouple to Digital Converter (0°C to +1024°C)
// https://datasheets.maximintegrated.com/en/ds/MAX6675.pdf
#define MAX6675_SCK_PIN PB3 // max6675 datasheet: SCK pin, found with multimeter, not tested
#define MAX6675_DO_PIN PB4 // max6675 datasheet: SO pin, found with multimeter, not tested
#define MAX6675_SS_PIN PC4 // max6675 datasheet: /CS pin, found with multimeter, not tested and likely wrong
// Expansion board with second max6675
// Warning: Some boards leave the slot unpopulated.
//#define MAX6675_SCK2_PIN PB3 // max6675 datasheet: SCK pin, found with multimeter, not tested
//#define MAX6675_DO2_PIN PB4 // max6675 datasheet: SO pin, found with multimeter, not tested
//#define MAX6675_SS2_PIN PF1 // max6675 datasheet: /CS pin, found with multimeter, not tested
//
// Heaters / Fans
//
#define HEATER_0_PIN PA0 //confirmed
#define HEATER_1_PIN PA1 //confirmed
#define HEATER_BED_PIN PA3 //confirmed
#define FAN_PIN PA15 // heater 0 fan 1 //confirmed
#define FAN1_PIN PB10 // heater 1 fan 2 //confirmed
#define FAN2_PIN PF5 // heater 0 fan 2 and heater 1 fan 1 (two sockets, switched together) //confirmed
#ifndef E0_AUTO_FAN_PIN
#define E0_AUTO_FAN_PIN PF5
#endif
//
// Prusa i3 MK2 Multi Material Multiplexer Support
//
//#define E_MUX0_PIN -1
//#define E_MUX1_PIN -1
//
// LED / Lighting
//
//Lerdge-S board has two LED connectors (this is the one on the mainboard)
#define CASE_LIGHT_PIN PC7 //confirmed
//on the dual extrusion addon board is a RGB connector
#define RGB_LED_R_PIN PC7 // Shared with the mainboard LED light connector (CASE_LIGHT_PIN), confirmed
#define RGB_LED_G_PIN PB0 //confirmed
#define RGB_LED_B_PIN PB1 //confirmed
//
// Misc. Functions
//
#define SDSS PC11 // SD is working using SDIO, not sure if this definition is needed?
#define LED_PIN PC6 // Mainboard soldered green LED, confirmed
#define PS_ON_PIN PB2 // Board has a power module connector, confirmed
#define KILL_PIN -1 // There is no reset button on the LCD
#define POWER_LOSS_PIN -1 // PB2 could be used for this as well
//
// SD support
//
#define SDIO_SUPPORT
#define SCK_PIN PC12 //confirmed working
#define MISO_PIN PC8 //confirmed working
#define MOSI_PIN PD2 //confirmed working
#define SS_PIN PC11 //confirmed working
#define SD_DETECT_PIN PG15 //confirmed
//
// Persistent Storage
// If no option is selected below the SD Card will be used
// (this section modelled after pins_LONGER3D_LK.h)
// Warning: Not tested yet! Pins traced with multimeter, mistakes are possible
//#define SPI_EEPROM
#if ENABLED(SPI_EEPROM)
// Lerdge has an SPI EEPROM Winbond W25Q128 (128Mbits) https://www.pjrc.com/teensy/W25Q128FV.pdf
#define SPI_CHAN_EEPROM1 1
#define SPI_EEPROM1_CS PB12 // datasheet: /CS pin, found with multimeter, not tested
#define EEPROM_SCK PB13 // datasheet: CLK pin, found with multimeter, not tested
#define EEPROM_MISO PB14 // datasheet: DO pin, found with multimeter, not tested
#define EEPROM_MOSI PB15 // datasheet: DI pin, found with multimeter, not tested
#define EEPROM_PAGE_SIZE 0x1000U // 4KB (from datasheet)
#define MARLIN_EEPROM_SIZE 16UL * (EEPROM_PAGE_SIZE) // Limit to 64KB for now...
#else
#define MARLIN_EEPROM_SIZE 0x800U // On SD, Limit to 2KB, require this amount of RAM
#endif
//
// LCD / Controller
//
// The LCD is initialized in FSMC mode
#define BEEPER_PIN PD13 //confirmed
#define BTN_EN1 PC14 //confirmed
#define BTN_EN2 PC15 //confirmed
#define BTN_ENC PC13 //confirmed
#define TFT_RESET_PIN PD6 //confirmed
#define TFT_BACKLIGHT_PIN PD3 //confirmed
#define TFT_CS_PIN PD7 // TFT works
#define TFT_RS_PIN PD11 // TFT works
// There is touch, but calibration is off
#define TOUCH_CS_PIN PB6
#define TOUCH_SCK_PIN PB3
#define TOUCH_MOSI_PIN PB5
#define TOUCH_MISO_PIN PB4

View File

@ -20,20 +20,22 @@
#if !defined(STM32F4) && !defined(STM32F4xx)
#error "Oops! Select an STM32F4 board in 'Tools > Board.'"
#elif HOTENDS > 2 || E_STEPPERS > 2
#error "LERDGE X supports up to 2 hotends / E-steppers."
#elif HOTENDS > 1 || E_STEPPERS > 1
#error "LERDGE X supports only one hotend / E-steppers"
#endif
#define BOARD_INFO_NAME "Lerdge X"
#define DEFAULT_MACHINE_NAME "LERDGE"
//#define I2C_EEPROM
#define STEP_TIMER 4
#define TEMP_TIMER 2
#define I2C_EEPROM
//
// Servos
//
//#define SERVO0_PIN PD12
//#define SERVO1_PIN -1
//#define SERVO0_PIN PD13
//
// Limit Switches
@ -51,7 +53,7 @@
// Z Probe (when not Z_MIN_PIN)
//
//#ifndef Z_MIN_PROBE_PIN
// #define Z_MIN_PROBE_PIN PB15
// #define Z_MIN_PROBE_PIN PB15
//#endif
//
@ -60,37 +62,18 @@
#define X_STEP_PIN PB10
#define X_DIR_PIN PB2
#define X_ENABLE_PIN PB11
//#ifndef X_CS_PIN
// #define X_CS_PIN PD1
//#endif
#define Y_STEP_PIN PB0
#define Y_DIR_PIN PC5
#define Y_ENABLE_PIN PB1
//#ifndef Y_CS_PIN
// #define Y_CS_PIN PE12
//#endif
#define Z_STEP_PIN PA7
#define Z_DIR_PIN PA6
#define Z_ENABLE_PIN PC4
//#ifndef Z_CS_PIN
// #define Z_CS_PIN PD5
//#endif
#define E0_STEP_PIN PA4
#define E0_DIR_PIN PA3
#define E0_ENABLE_PIN PA5
//#ifndef E0_CS_PIN
// #define E0_CS_PIN PB4
//#endif
#define E1_STEP_PIN -1
#define E1_DIR_PIN -1
#define E1_ENABLE_PIN -1
//#ifndef E1_CS_PIN
// #define E1_CS_PIN PE5
//#endif
//
// Temperature Sensors
@ -106,9 +89,9 @@
#define HEATER_1_PIN -1
#define HEATER_BED_PIN PA2
#ifndef FAN_PIN
//#define FAN_PIN PC15
#endif
//#ifndef FAN_PIN
// #define FAN_PIN PC15
//#endif
#define FAN1_PIN PC15
#define FAN2_PIN PA0
@ -116,12 +99,6 @@
#define E0_AUTO_FAN_PIN PC15 // FAN1_PIN
#endif
//
// Prusa i3 MK2 Multi Material Multiplexer Support
//
//#define E_MUX0_PIN -1
//#define E_MUX1_PIN -1
//
// LED / Lighting
//
@ -136,7 +113,9 @@
#define LED_PIN PC7 // Alive
#define PS_ON_PIN -1
#define KILL_PIN -1
#define POWER_LOSS_PIN -1 // Power-loss / nAC_FAULT
// Lerdge supports auto-power off and power loss sense through a single pin.
#define POWER_LOSS_PIN PC14 // Power-loss / nAC_FAULT
#define SCK_PIN PC12
#define MISO_PIN PC8
@ -147,36 +126,26 @@
// SD support
//
#define SDIO_SUPPORT
#define SD_DETECT_PIN PA8
//
// LCD / Controller
//
// The LCD is initialized in FSMC mode
#define SD_DETECT_PIN -1
#define BEEPER_PIN PD12
#define BTN_EN1 PE3
#define BTN_EN2 PE4
#define BTN_ENC PE2
#define LCD_RESET_PIN PD6
#define LCD_BACKLIGHT_PIN PD3
#define FSMC_CS_PIN PD4
#define FSMC_RS_PIN PD11
#define TOUCH_CS PB6
#define TFT_RESET_PIN PD6
#define TFT_BACKLIGHT_PIN PD3
//
// ST7920 Delays
//
#if HAS_GRAPHICAL_LCD
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(96)
#endif
#ifndef BOARD_ST7920_DELAY_2
#define BOARD_ST7920_DELAY_2 DELAY_NS(48)
#endif
#ifndef BOARD_ST7920_DELAY_3
#define BOARD_ST7920_DELAY_3 DELAY_NS(715)
#endif
#endif
#define TFT_CS_PIN PD7
#define TFT_RS_PIN PD11
#define TOUCH_CS_PIN PB6
#define TOUCH_SCK_PIN PB3
#define TOUCH_MOSI_PIN PB5
#define TOUCH_MISO_PIN PB4