Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 15 commits into from
Nov 25, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
773a7f3
Update stm32f4.ini
belge96 Oct 9, 2024
54aadf7
Added pins.h for Mellow/Fly RRF E3 V1
belge96 Oct 9, 2024
9297641
Update pins.h
belge96 Oct 9, 2024
ac6f2a8
Update boards.h
belge96 Oct 9, 2024
706b11a
Update pins_Fly_RRF_E3_V1.h
belge96 Oct 10, 2024
8bf670f
reformat pins_Fly_RRF_E3_V1.h
ellensp Oct 12, 2024
a9c3102
Merge 'bugfix-2.1.x' into pr/27466
thinkyhead Nov 3, 2024
11fa24f
cleanup 1
thinkyhead Nov 3, 2024
7e60a74
🔧 Automatic Trinamic TX pins
thinkyhead Nov 3, 2024
d45baa3
cleanup 2
thinkyhead Nov 3, 2024
4830b1c
✨ M820 Report temporary M810-M819 macros (#27458)
fmuntean Nov 3, 2024
283ab70
Merge 'bugfix-2.1.x' into pr/27466
thinkyhead Nov 3, 2024
de8d42f
Merge branch 'bugfix-2.1.x' into pr/27466
thinkyhead Nov 3, 2024
5ca1412
Merge branch 'bugfix-2.1.x' into pr/27466
thinkyhead Nov 3, 2024
731c8f5
generic marlin_STM32F407VGT6_CCM
thinkyhead Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HC32/inc/SanityCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions Marlin/src/core/boards.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/sovol_rts/sovol_rts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/module/motion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions Marlin/src/pins/pins.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 3 additions & 5 deletions Marlin/src/pins/stm32f4/pins_BLACKBEEZMINI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
58 changes: 28 additions & 30 deletions Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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

Expand Down
Loading
Loading