3DPrinting/MarlinFirmware
0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-01-22 09:42:34 +00:00
Code Issues Releases Wiki Activity

✨ Mellow/Fly RRF E3 V1.0 (STM32F407VG) (#27466)

Browse source
This commit is contained in:
belge96 2024-11-25 02:45:10 +01:00 committed by GitHub
parent 220cd5a640
commit 61649aa3c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 374 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/HAL/HC32/inc/SanityCheck.h
View file

@ -94,7 +94,7 @@
#error "SERIAL_DMA requires USART_RX_DMA_SUPPORT to be enabled in the arduino core."
#endif
// Before arduino core version 1.2.0, USART_RX_DMA_SUPPORT did not implement
// Before arduino core version 1.2.0, USART_RX_DMA_SUPPORT did not implement
// core_hook_usart_rx_irq, which is required for the emergency parser.
// With 1.2.0, this was fixed (see https://github.com/shadow578/framework-arduino-hc32f46x/pull/25).
#if ENABLED(EMERGENCY_PARSER) && ARDUINO_CORE_VERSION_INT < GET_VERSION_INT(1, 2, 0)

1
Marlin/src/core/boards.h
View file

@ -472,6 +472,7 @@
#define BOARD_MELLOW_FLY_E3_V2 5250 // Mellow Fly E3 V2 (STM32F407VG)
#define BOARD_BLACKBEEZMINI_V1 5251 // BlackBeezMini V1 (STM32F401CCU6)
#define BOARD_XTLW_CLIMBER_8TH 5252 // XTLW Climber-8th (STM32F407VGT6)
#define BOARD_FLY_RRF_E3_V1 5253 // Fly RRF E3 V1.0 (STM32F407VG)
//
// Other ARM Cortex-M4

2
Marlin/src/lcd/sovol_rts/sovol_rts.h
View file

@ -236,7 +236,7 @@ enum SovolPage : uint8_t {
ID_AdvWarn_D = 49, ID_AdvWarn_L = 55 + ID_AdvWarn_D, // Warning when entering advanced settings
ID_KillRunaway_D = 52, ID_KillRunaway_L = 55 + ID_KillRunaway_D, // Thermal runaway
ID_KillHeat_D = 53, ID_KillHeat_L = 55 + ID_KillHeat_D, // Thermistor error
ID_KillBadTemp_D = 54, ID_KillBadTemp_L = 55 + ID_KillBadTemp_D, // Heating failed
ID_KillBadTemp_D = 54, ID_KillBadTemp_L = 55 + ID_KillBadTemp_D, // Heating failed
ID_KillHome_D = 55, ID_KillHome_L = 55 + ID_KillHome_D, // Auto-home failed
ID_Level5_D = 111, ID_Level5_L = 6 + ID_Level5_D, // Leveling screen 0.05mm
ID_DriverError_D = 112, ID_DriverError_L = 6 + ID_DriverError_D, // Driver error

2
Marlin/src/module/motion.cpp
View file

@ -148,7 +148,7 @@ feedRate_t feedrate_mm_s = MMM_TO_MMS(DEFAULT_FEEDRATE_MM_M);
int16_t feedrate_percentage = 100;
#if ENABLED(EDITABLE_HOMING_FEEDRATE)
xyz_feedrate_t homing_feedrate_mm_m = HOMING_FEEDRATE_MM_M;
#endif
#endif
// Cartesian conversion result goes here:
xyz_pos_t cartes;

2
Marlin/src/pins/pins.h
View file

@ -843,6 +843,8 @@
#include "stm32f4/pins_BLACKBEEZMINI.h" // STM32F4 env:BLACKBEEZMINI_V1
#elif MB(XTLW_CLIMBER_8TH)
#include "stm32f4/pins_XTLW_CLIMBER_8TH.h" // STM32F4 env:XTLW_CLIMBER_8TH
#elif MB(FLY_RRF_E3_V1)
#include "stm32f4/pins_FLY_RRF_E3_V1.h" // STM32F4 env:FLY_RRF_E3_V1
//
// Other ARM Cortex-M4

2
Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
View file

@ -33,7 +33,7 @@
#define FLASH_EEPROM_EMULATION
//#define I2C_EEPROM
#endif
//#define E2END 0xFFF // 4K
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
#define HAL_TIMER_RATE F_CPU

8
Marlin/src/pins/stm32f4/pins_BLACKBEEZMINI.h
View file

@ -21,14 +21,12 @@
*/
#pragma once
#if NOT_TARGET(STM32F4)
#error "Oops! Select an STM32F4 board in 'Tools > Board.'"
#elif HOTENDS > 1 || E_STEPPERS > 1
#include "env_validate.h"
#if HOTENDS > 1 || E_STEPPERS > 1
#error "STM32F401CCU6 boards support one hotend / E-steppers only."
#endif
#include "env_validate.h"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "I3DBEE BP_01"
#endif

58
Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
View file

@ -21,9 +21,7 @@
*/
#pragma once
#if NOT_TARGET(STM32F4)
#error "Oops! Select an STM32F4 board in 'Tools > Board.'"
#endif
#include "env_validate.h"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "BTT E3 RRF"
@ -214,33 +212,33 @@
CONTROLLER_WARNING("BTT_E3_RRF", "LCD_FOR_MELZI")
/** LCD_FOR_MELZI display pinout
*
* BTT E3 RRF Display Ribbon
* ------ ------
* (BEEPER) PE8 | 1 2 | PE9 (BTN_ENC) GND |10 9 | 5V
* (BTN_EN1) PE7 | 3 4 | RESET BEEPER | 8 7 | ESTOP (RESET)
* (BTN_EN2) PB2 5 6 | PE10 (LCD_D4) (BTN_ENC) ENC_BTN | 6 5 | LCD_SCLK (LCD_D4)
* (LCD_RS) PB1 | 7 8 | PE11 (LCD_EN) (BTN_EN2) ENC_A | 4 3 | LCD_DATA (LCD_EN)
* GND | 9 10 | 5V (BTN_EN1) ENC_B | 2 1 | LCD_CS (LCD_RS)
* ------ ------
* EXP1 LCD
*
* Needs custom cable:
*
* Board Adapter Display Ribbon (coming from display)
* ----------------------------------
* EXP1-10 ---------- LCD-9 5V
* EXP1-9 ----------- LCD-10 GND
* EXP1-8 ----------- LCD-3 LCD_EN
* EXP1-7 ----------- LCD-1 LCD_RS
* EXP1-6 ----------- LCD-5 LCD_D4
* EXP1-5 ----------- LCD-4 EN2
* EXP1-4 ----------- LCD-7 RESET
* EXP1-3 ----------- LCD-2 EN1
* EXP1-2 ----------- LCD-6 BTN
* EXP1-1 ----------- LCD-8 BEEPER
*/
/** LCD_FOR_MELZI display pinout
*
* BTT E3 RRF Display Ribbon
* ------ ------
* (BEEPER) PE8 | 1 2 | PE9 (BTN_ENC) GND |10 9 | 5V
* (BTN_EN1) PE7 | 3 4 | RESET BEEPER | 8 7 | ESTOP (RESET)
* (BTN_EN2) PB2 5 6 | PE10 (LCD_D4) (BTN_ENC) ENC_BTN | 6 5 | LCD_SCLK (LCD_D4)
* (LCD_RS) PB1 | 7 8 | PE11 (LCD_EN) (BTN_EN2) ENC_A | 4 3 | LCD_DATA (LCD_EN)
* GND | 9 10 | 5V (BTN_EN1) ENC_B | 2 1 | LCD_CS (LCD_RS)
* ------ ------
* EXP1 LCD
*
* Needs custom cable:
*
* Board Adapter Display Ribbon (coming from display)
* ----------------------------------
* EXP1-10 ---------- LCD-9 5V
* EXP1-9 ----------- LCD-10 GND
* EXP1-8 ----------- LCD-3 LCD_EN
* EXP1-7 ----------- LCD-1 LCD_RS
* EXP1-6 ----------- LCD-5 LCD_D4
* EXP1-5 ----------- LCD-4 EN2
* EXP1-4 ----------- LCD-7 RESET
* EXP1-3 ----------- LCD-2 EN1
* EXP1-2 ----------- LCD-6 BTN
* EXP1-1 ----------- LCD-8 BEEPER
*/
#endif

322
Marlin/src/pins/stm32f4/pins_FLY_RRF_E3_V1.h Normal file
View file

@ -0,0 +1,322 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2024 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 <https://www.gnu.org/licenses/>.
*
*/
#pragma once
#include "env_validate.h"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "Fly RRF E3 V1"
#endif
#define USES_DIAG_JUMPERS // Requires Mellow/Fly TMC2209 with DIAG disable dip switch
#if NO_EEPROM_SELECTED
#define FLASH_EEPROM_EMULATION
#endif
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
//
// Servos
//
#define SERVO0_PIN PB0 // SERVOS
//
// Limit Switches
//
#define X_STOP_PIN PA2 // X-STOP
#define Y_STOP_PIN PA1 // Y-STOP
#define Z_STOP_PIN PC5 // Z-STOP
//
// Z Probe must be this pin
//
#define Z_MIN_PROBE_PIN PC4 // PROBE
//
// Steppers
//
#define X_ENABLE_PIN PC15
#define X_STEP_PIN PC13
#define X_DIR_PIN PC14
#define Y_ENABLE_PIN PE5
#define Y_STEP_PIN PE3
#define Y_DIR_PIN PE4
#define Z_ENABLE_PIN PE1
#define Z_STEP_PIN PB9
#define Z_DIR_PIN PE0
#define E0_ENABLE_PIN PB5
#define E0_STEP_PIN PB3
#define E0_DIR_PIN PB4
/**
* TMC2208/TMC2209 stepper drivers
*/
#if HAS_TMC_UART
#define X_SERIAL_TX_PIN PE6
#define Y_SERIAL_TX_PIN PE2
#define Z_SERIAL_TX_PIN PB8
#define E0_SERIAL_TX_PIN PD7
// Reduce baud rate to improve software serial reliability
#ifndef TMC_BAUD_RATE
#define TMC_BAUD_RATE 19200
#endif
#endif // HAS_TMC_UART
//
// Temperature Sensors
//
#define TEMP_BED_PIN PA3 // Analog Input "TB"
#define TEMP_0_PIN PA4 // Analog Input "TH0"
//
// Heaters / Fans
//
#define HEATER_BED_PIN PA0 // "HB"
#define HEATER_0_PIN PA5 // "HE0"
#define FAN0_PIN PA7 // "FAN0"
#ifndef CONTROLLER_FAN_PIN
#define CONTROLLER_FAN_PIN PA6 // "FAN1"
#endif
/**
* ------
* (BEEPER) PE12 | 1 2 | PE11 (BTN_ENC)
* (BTN_EN1) PE10 | 3 4 | RESET
* (BTN_EN2) PE9 5 6 | PE8 (LCD_D4)
* (LCD_RS) PE7 | 7 8 | PB1 (LCD_EN)
* GND | 9 10 | 5V
* ------
* EXP1
*/
#define EXP1_01_PIN PE12
#define EXP1_02_PIN PE11
#define EXP1_03_PIN PE10
#define EXP1_04_PIN -1 // RESET
#define EXP1_05_PIN PE9
#define EXP1_06_PIN PE8
#define EXP1_07_PIN PE7
#define EXP1_08_PIN PB1
#if HAS_WIRED_LCD
#if ANY(CR10_STOCKDISPLAY, LCD_FOR_MELZI)
#define BEEPER_PIN EXP1_01_PIN
#define BTN_ENC EXP1_02_PIN
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_05_PIN
#define LCD_PINS_D4 EXP1_06_PIN
#define LCD_PINS_RS EXP1_07_PIN
#define LCD_PINS_EN EXP1_08_PIN
#if ENABLED(LCD_FOR_MELZI)
CONTROLLER_WARNING("FLY_RRF_E3_V1", "LCD_FOR_MELZI")
/** LCD_FOR_MELZI display pinout
*
* Fly RRF E3 V1 Display Ribbon
* ------ ------
* (BEEPER) PE12 | 1 2 | PE11 (BTN_ENC) GND |10 9 | 5V
* (BTN_EN1) PE10 | 3 4 | RESET BEEPER | 8 7 | ESTOP (RESET)
* (BTN_EN2) PE9 5 6 | PE8 (LCD_D4) (BTN_ENC) ENC_BTN | 6 5 | LCD_SCLK (LCD_D4)
* (LCD_RS) PE7 | 7 8 | PB1 (LCD_EN) (BTN_EN2) ENC_A | 4 3 | LCD_DATA (LCD_EN)
* GND | 9 10 | 5V (BTN_EN1) ENC_B | 2 1 | LCD_CS (LCD_RS)
* ------ ------
* EXP1 LCD
*
* Needs custom cable:
*
* Board Adapter Display Ribbon (coming from display)
* ----------------------------------
* EXP1-10 ---------- LCD-9 5V
* EXP1-9 ----------- LCD-10 GND
* EXP1-8 ----------- LCD-3 LCD_EN
* EXP1-7 ----------- LCD-1 LCD_RS
* EXP1-6 ----------- LCD-5 LCD_D4
* EXP1-5 ----------- LCD-4 EN2
* EXP1-4 ----------- LCD-7 RESET
* EXP1-3 ----------- LCD-2 EN1
* EXP1-2 ----------- LCD-6 BTN
* EXP1-1 ----------- LCD-8 BEEPER
*/
#endif
#elif ENABLED(ZONESTAR_LCD) // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
CONTROLLER_WARNING("FLY_RRF_E3_V1", "ZONESTAR_LCD")
#define LCD_PINS_RS EXP1_06_PIN
#define LCD_PINS_EN EXP1_02_PIN
#define LCD_PINS_D4 EXP1_07_PIN
#define LCD_PINS_D5 EXP1_05_PIN
#define LCD_PINS_D6 EXP1_03_PIN
#define LCD_PINS_D7 EXP1_01_PIN
#define ADC_KEYPAD_PIN PB0 // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
#elif ANY(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
#define BTN_ENC EXP1_02_PIN
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_05_PIN
#define DOGLCD_CS EXP1_07_PIN
#define DOGLCD_A0 EXP1_06_PIN
#define DOGLCD_SCK EXP1_01_PIN
#define DOGLCD_MOSI EXP1_08_PIN
#define FORCE_SOFT_SPI
#define LCD_BACKLIGHT_PIN -1
#elif IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI)
CONTROLLER_WARNING("FLY_RRF_E3_V1", "TFTGLCD_PANEL_SPI")
/**
* TFTGLCD_PANEL_SPI display pinout
*
* Board Display
* ------ ------
* (SD_DET) PE12 | 1 2 | PE11 (BEEPER) 5V |10 9 | GND
* (MOD_RESET) PE10 | 3 4 | RESET -- | 8 7 | (SD_DET)
* (SD_CS) PE9 5 6 | PE8 (MOSI) 6 5 | --
* (LCD_CS) PE7 | 7 8 | PB1 (SD_CS) | 4 3 | (LCD_CS)
* GND | 9 10 | 5V (SCK) | 2 1 | (MISO)
* ------ ------
* EXP1 EXP1
*
* Needs custom cable:
*
* Board Adapter Display
* ----------------------------------
* EXP1-10 ---------- EXP1-10 5V
* EXP1-9 ----------- EXP1-9 GND
* SPI1-4 ----------- EXP1-6 MOSI
* EXP1-7 ----------- n/c
* SPI1-3 ----------- EXP1-2 SCK
* EXP1-5 ----------- EXP1-4 SD_CS
* EXP1-4 ----------- n/c
* EXP1-3 ----------- EXP1-3 LCD_CS
* SPI1-1 ----------- EXP1-1 MISO
* EXP1-1 ----------- EXP1-7 SD_DET
*/
#define TFTGLCD_CS EXP1_03_PIN
#endif
#else
#error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, LCD_FOR_MELZI, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the FLY_RRF_E3_V1."
#endif
// Alter timing for graphical display
#if ENABLED(LCD_FOR_MELZI) // LCD_FOR_MELZI default timing is too fast. This works but may be reduced.
#define BOARD_ST7920_DELAY_1 200
#define BOARD_ST7920_DELAY_2 400
#define BOARD_ST7920_DELAY_3 1200
#elif IS_U8GLIB_ST7920
#define BOARD_ST7920_DELAY_1 96
#define BOARD_ST7920_DELAY_2 48
#define BOARD_ST7920_DELAY_3 600
#endif
#endif // HAS_WIRED_LCD
#if ALL(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
CONTROLLER_WARNING("FLY_RRF_E3_V1", "LCD_FYSETC_TFT81050")
/** FYSETC TFT TFT81050 display pinout
*
* Board Display
* ------ ------
* (SD_DET) PE12 | 1 2 | PE11 (BEEPER) 5V |10 9 | GND
* (MOD_RESET) PE10 | 3 4 | RESET RESET | 8 7 | (SD_DET)
* (SD_CS) PE9 5 6 | PE8 (MOSI) | 6 5 | (LCD_CS)
* (LCD_CS) PE7 | 7 8 | PB1 (SD_CS) | 4 3 | (MOD_RESET)
* GND | 9 10 | 5V (SCK) | 2 1 | (MISO)
* ------ ------
* EXP1 EXP1
*
* Needs custom cable:
*
* Board Adapter Display
* ----------------------------------
* EXP1-10 ---------- EXP1-10 5V
* EXP1-9 ----------- EXP1-9 GND
* SPI1-4 ----------- EXP1-6 MOSI
* EXP1-7 ----------- EXP1-5 LCD_CS
* SPI1-3 ----------- EXP1-2 SCK
* EXP1-5 ----------- EXP1-4 SD_CS
* EXP1-4 ----------- EXP1-8 RESET
* EXP1-3 ----------- EXP1-3 MOD_RST
* SPI1-1 ----------- EXP1-1 MISO
* EXP1-1 ----------- EXP1-7 SD_DET
*/
#define CLCD_SPI_BUS 1 // SPI1 connector
#define BEEPER_PIN EXP1_02_PIN
#define CLCD_MOD_RESET EXP1_03_PIN
#define CLCD_SPI_CS EXP1_07_PIN
#endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050
//
// SD Support
//
#ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD
#endif
#if SD_CONNECTION_IS(ONBOARD)
#define ONBOARD_SDIO // Use SDIO for onboard SD
//#define SDIO_CLOCK 48000000
#define SD_DETECT_PIN PA15
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#error "SD CUSTOM_CABLE is not compatible with Fly RRF E3 V1."
#endif
//
// WIFI
//
#if ENABLED(WIFISUPPORT)
#define ESP_WIFI_MODULE_COM 3 // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this
#define ESP_WIFI_MODULE_BAUDRATE BAUDRATE // Must use same BAUDRATE as SERIAL_PORT & SERIAL_PORT_2
#define ESP_WIFI_MODULE_RESET_PIN PE15
#define ESP_WIFI_MODULE_ENABLE_PIN -1 // EN is constantly pulled up to 3.3V on this board
#define ESP_WIFI_MODULE_GPIO0_PIN PE13
#endif

4
Marlin/src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h
View file

@ -21,9 +21,7 @@
*/
#pragma once
#if NOT_TARGET(STM32F4)
#error "Oops! Select an STM32F4 board in 'Tools > Board.'"
#endif
#include "env_validate.h"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "Mellow Fly E3 V2"

13
ini/stm32f4.ini
View file

@ -194,6 +194,19 @@ build_flags = ${stm32_variant.build_flags}
-DMF_RX_BUFFER_SIZE=255
-DMF_TX_BUFFER_SIZE=255
#
# Mellow/Fly RRF E3 V1 (STM32F407VGT6 ARM Cortex-M4)
#
[env:FLY_RRF_E3_V1]
extends = stm32_variant
board = marlin_STM32F407VGT6_CCM
#board_build.variant = MARLIN_BTT_E3_RRF
board_build.offset = 0x8000
build_flags = ${stm32_variant.build_flags}
-DSTM32F407_5VX
-DMF_RX_BUFFER_SIZE=255
-DMF_TX_BUFFER_SIZE=255
#
# Bigtreetech GTR V1.0 (STM32F407IGT6 ARM Cortex-M4)
#