Skip to content

Commit d45baa3

Browse files
thinkyheadthinkyhead
committed
cleanup 2
1 parent 11fa24f commit d45baa3

10 files changed

+76
-89
lines changed

‎Marlin/src/HAL/HC32/inc/SanityCheck.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
#error "SERIAL_DMA requires USART_RX_DMA_SUPPORT to be enabled in the arduino core."
9595
#endif
9696

97-
// Before arduino core version 1.2.0, USART_RX_DMA_SUPPORT did not implement
97+
// Before arduino core version 1.2.0, USART_RX_DMA_SUPPORT did not implement
9898
// core_hook_usart_rx_irq, which is required for the emergency parser.
9999
// With 1.2.0, this was fixed (see https://github.com/shadow578/framework-arduino-hc32f46x/pull/25).
100100
#if ENABLED(EMERGENCY_PARSER) && ARDUINO_CORE_VERSION_INT < GET_VERSION_INT(1, 2, 0)

‎Marlin/src/lcd/sovol_rts/sovol_rts.h

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

‎Marlin/src/module/motion.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ feedRate_t feedrate_mm_s = MMM_TO_MMS(DEFAULT_FEEDRATE_MM_M);
148148
int16_t feedrate_percentage = 100;
149149
#if ENABLED(EDITABLE_HOMING_FEEDRATE)
150150
xyz_feedrate_t homing_feedrate_mm_m = HOMING_FEEDRATE_MM_M;
151-
#endif
151+
#endif
152152

153153
// Cartesian conversion result goes here:
154154
xyz_pos_t cartes;

‎Marlin/src/pins/pins.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@
844844
#elif MB(XTLW_CLIMBER_8TH)
845845
#include "stm32f4/pins_XTLW_CLIMBER_8TH.h" // STM32F4 env:XTLW_CLIMBER_8TH
846846
#elif MB(FLY_RRF_E3_V1)
847-
#include "stm32f4/pins_FLY__RRF_E3_V1.h" // STM32F4 env:FLY_RRF_E3_V1
847+
#include "stm32f4/pins_FLY_RRF_E3_V1.h" // STM32F4 env:FLY_RRF_E3_V1
848848

849849
//
850850
// Other ARM Cortex-M4

‎Marlin/src/pins/stm32f4/pins_ARTILLERY_RUBY.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#define FLASH_EEPROM_EMULATION
3434
//#define I2C_EEPROM
3535
#endif
36-
//#define E2END 0xFFF // 4K
36+
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
3737

3838
#define HAL_TIMER_RATE F_CPU
3939

‎Marlin/src/pins/stm32f4/pins_BLACKBEEZMINI.h

+3-5
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@
2121
*/
2222
#pragma once
2323

24-
#if NOT_TARGET(STM32F4)
25-
#error "Oops! Select an STM32F4 board in 'Tools > Board.'"
26-
#elif HOTENDS > 1 || E_STEPPERS > 1
24+
#include "env_validate.h"
25+
26+
#if HOTENDS > 1 || E_STEPPERS > 1
2727
#error "STM32F401CCU6 boards support one hotend / E-steppers only."
2828
#endif
2929

30-
#include "env_validate.h"
31-
3230
#ifndef BOARD_INFO_NAME
3331
#define BOARD_INFO_NAME "I3DBEE BP_01"
3432
#endif

‎Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h

+28-30
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
*/
2222
#pragma once
2323

24-
#if NOT_TARGET(STM32F4)
25-
#error "Oops! Select an STM32F4 board in 'Tools > Board.'"
26-
#endif
24+
#include "env_validate.h"
2725

2826
#ifndef BOARD_INFO_NAME
2927
#define BOARD_INFO_NAME "BTT E3 RRF"
@@ -225,33 +223,33 @@
225223

226224
CONTROLLER_WARNING("BTT_E3_RRF", "LCD_FOR_MELZI")
227225

228-
/** LCD_FOR_MELZI display pinout
229-
*
230-
* BTT E3 RRF Display Ribbon
231-
* ------ ------
232-
* (BEEPER) PE8 | 1 2 | PE9 (BTN_ENC) GND |10 9 | 5V
233-
* (BTN_EN1) PE7 | 3 4 | RESET BEEPER | 8 7 | ESTOP (RESET)
234-
* (BTN_EN2) PB2 5 6 | PE10 (LCD_D4) (BTN_ENC) ENC_BTN | 6 5 | LCD_SCLK (LCD_D4)
235-
* (LCD_RS) PB1 | 7 8 | PE11 (LCD_EN) (BTN_EN2) ENC_A | 4 3 | LCD_DATA (LCD_EN)
236-
* GND | 9 10 | 5V (BTN_EN1) ENC_B | 2 1 | LCD_CS (LCD_RS)
237-
* ------ ------
238-
* EXP1 LCD
239-
*
240-
* Needs custom cable:
241-
*
242-
* Board Adapter Display Ribbon (coming from display)
243-
* ----------------------------------
244-
* EXP1-10 ---------- LCD-9 5V
245-
* EXP1-9 ----------- LCD-10 GND
246-
* EXP1-8 ----------- LCD-3 LCD_EN
247-
* EXP1-7 ----------- LCD-1 LCD_RS
248-
* EXP1-6 ----------- LCD-5 LCD_D4
249-
* EXP1-5 ----------- LCD-4 EN2
250-
* EXP1-4 ----------- LCD-7 RESET
251-
* EXP1-3 ----------- LCD-2 EN1
252-
* EXP1-2 ----------- LCD-6 BTN
253-
* EXP1-1 ----------- LCD-8 BEEPER
254-
*/
226+
/** LCD_FOR_MELZI display pinout
227+
*
228+
* BTT E3 RRF Display Ribbon
229+
* ------ ------
230+
* (BEEPER) PE8 | 1 2 | PE9 (BTN_ENC) GND |10 9 | 5V
231+
* (BTN_EN1) PE7 | 3 4 | RESET BEEPER | 8 7 | ESTOP (RESET)
232+
* (BTN_EN2) PB2 5 6 | PE10 (LCD_D4) (BTN_ENC) ENC_BTN | 6 5 | LCD_SCLK (LCD_D4)
233+
* (LCD_RS) PB1 | 7 8 | PE11 (LCD_EN) (BTN_EN2) ENC_A | 4 3 | LCD_DATA (LCD_EN)
234+
* GND | 9 10 | 5V (BTN_EN1) ENC_B | 2 1 | LCD_CS (LCD_RS)
235+
* ------ ------
236+
* EXP1 LCD
237+
*
238+
* Needs custom cable:
239+
*
240+
* Board Adapter Display Ribbon (coming from display)
241+
* ----------------------------------
242+
* EXP1-10 ---------- LCD-9 5V
243+
* EXP1-9 ----------- LCD-10 GND
244+
* EXP1-8 ----------- LCD-3 LCD_EN
245+
* EXP1-7 ----------- LCD-1 LCD_RS
246+
* EXP1-6 ----------- LCD-5 LCD_D4
247+
* EXP1-5 ----------- LCD-4 EN2
248+
* EXP1-4 ----------- LCD-7 RESET
249+
* EXP1-3 ----------- LCD-2 EN1
250+
* EXP1-2 ----------- LCD-6 BTN
251+
* EXP1-1 ----------- LCD-8 BEEPER
252+
*/
255253

256254
#endif
257255

‎Marlin/src/pins/stm32f4/pins_FLY__RRF_E3_V1.h ‎Marlin/src/pins/stm32f4/pins_FLY_RRF_E3_V1.h

+37-45
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@
2727
#define BOARD_INFO_NAME "Fly RRF E3 V1"
2828
#endif
2929

30-
#define USES_DIAG_JUMPERS //you need Mellow/Fly's specific TMC2209's because they have a dip switch to turn off DIAG to disable auto home
30+
#define USES_DIAG_JUMPERS // Requires Mellow/Fly TMC2209 with DIAG disable dip switch
3131

32-
// Onboard I2C EEPROM
33-
//#define I2C_EEPROM - this board doesn't have a real eeprom
32+
#if NO_EEPROM_SELECTED
33+
#define FLASH_EEPROM_EMULATION
34+
#endif
3435
#define MARLIN_EEPROM_SIZE 0x1000 // 4K
3536

3637
//
@@ -137,45 +138,41 @@
137138

138139
#if ENABLED(LCD_FOR_MELZI)
139140

140-
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
141-
#error "CAUTION! LCD_FOR_MELZI requires wiring modifications. See 'pins_Fly_RRF_E3_V1.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
142-
#endif
143-
144-
/** LCD_FOR_MELZI display pinout
145-
*
146-
* Fly RRF E3 V1 Display Ribbon
147-
* ------ ------
148-
* (BEEPER) PE12 | 1 2 | PE11 (BTN_ENC) GND |10 9 | 5V
149-
* (BTN_EN1) PE10 | 3 4 | RESET BEEPER | 8 7 | ESTOP (RESET)
150-
* (BTN_EN2) PE9 5 6 | PE8 (LCD_D4) (BTN_ENC) ENC_BTN | 6 5 | LCD_SCLK (LCD_D4)
151-
* (LCD_RS) PE7 | 7 8 | PB1 (LCD_EN) (BTN_EN2) ENC_A | 4 3 | LCD_DATA (LCD_EN)
152-
* GND | 9 10 | 5V (BTN_EN1) ENC_B | 2 1 | LCD_CS (LCD_RS)
153-
* ------ ------
154-
* EXP1 LCD
155-
*
156-
* Needs custom cable:
157-
*
158-
* Board Adapter Display Ribbon (coming from display)
159-
* ----------------------------------
160-
* EXP1-10 ---------- LCD-9 5V
161-
* EXP1-9 ----------- LCD-10 GND
162-
* EXP1-8 ----------- LCD-3 LCD_EN
163-
* EXP1-7 ----------- LCD-1 LCD_RS
164-
* EXP1-6 ----------- LCD-5 LCD_D4
165-
* EXP1-5 ----------- LCD-4 EN2
166-
* EXP1-4 ----------- LCD-7 RESET
167-
* EXP1-3 ----------- LCD-2 EN1
168-
* EXP1-2 ----------- LCD-6 BTN
169-
* EXP1-1 ----------- LCD-8 BEEPER
170-
*/
141+
CONTROLLER_WARNING("FLY_RRF_E3_V1", "LCD_FOR_MELZI")
142+
143+
/** LCD_FOR_MELZI display pinout
144+
*
145+
* Fly RRF E3 V1 Display Ribbon
146+
* ------ ------
147+
* (BEEPER) PE12 | 1 2 | PE11 (BTN_ENC) GND |10 9 | 5V
148+
* (BTN_EN1) PE10 | 3 4 | RESET BEEPER | 8 7 | ESTOP (RESET)
149+
* (BTN_EN2) PE9 5 6 | PE8 (LCD_D4) (BTN_ENC) ENC_BTN | 6 5 | LCD_SCLK (LCD_D4)
150+
* (LCD_RS) PE7 | 7 8 | PB1 (LCD_EN) (BTN_EN2) ENC_A | 4 3 | LCD_DATA (LCD_EN)
151+
* GND | 9 10 | 5V (BTN_EN1) ENC_B | 2 1 | LCD_CS (LCD_RS)
152+
* ------ ------
153+
* EXP1 LCD
154+
*
155+
* Needs custom cable:
156+
*
157+
* Board Adapter Display Ribbon (coming from display)
158+
* ----------------------------------
159+
* EXP1-10 ---------- LCD-9 5V
160+
* EXP1-9 ----------- LCD-10 GND
161+
* EXP1-8 ----------- LCD-3 LCD_EN
162+
* EXP1-7 ----------- LCD-1 LCD_RS
163+
* EXP1-6 ----------- LCD-5 LCD_D4
164+
* EXP1-5 ----------- LCD-4 EN2
165+
* EXP1-4 ----------- LCD-7 RESET
166+
* EXP1-3 ----------- LCD-2 EN1
167+
* EXP1-2 ----------- LCD-6 BTN
168+
* EXP1-1 ----------- LCD-8 BEEPER
169+
*/
171170

172171
#endif
173172

174173
#elif ENABLED(ZONESTAR_LCD) // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
175174

176-
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
177-
#error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_Fly_RRF_E3_V1.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
178-
#endif
175+
CONTROLLER_WARNING("FLY_RRF_E3_V1", "ZONESTAR_LCD")
179176

180177
#define LCD_PINS_RS EXP1_06_PIN
181178
#define LCD_PINS_EN EXP1_02_PIN
@@ -203,9 +200,7 @@
203200

204201
#if ENABLED(TFTGLCD_PANEL_SPI)
205202

206-
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
207-
#error "CAUTION! TFTGLCD_PANEL_SPI requires wiring modifications. See 'pins_Fly_RRF_E3_V1.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
208-
#endif
203+
CONTROLLER_WARNING("FLY_RRF_E3_V1", "TFTGLCD_PANEL_SPI")
209204

210205
/**
211206
* TFTGLCD_PANEL_SPI display pinout
@@ -241,7 +236,7 @@
241236
#endif
242237

243238
#else
244-
#error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, LCD_FOR_MELZI, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the Mellow_RRF_E3_V1."
239+
#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."
245240
#endif
246241

247242
// Alter timing for graphical display
@@ -259,9 +254,7 @@
259254

260255
#if ALL(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
261256

262-
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
263-
#error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_Fly_RRF_E3_V1.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
264-
#endif
257+
CONTROLLER_WARNING("FLY_RRF_E3_V1", "LCD_FYSETC_TFT81050")
265258

266259
/** FYSETC TFT TFT81050 display pinout
267260
*
@@ -275,7 +268,6 @@
275268
* ------ ------
276269
* EXP1 EXP1
277270
*
278-
*
279271
* Needs custom cable:
280272
*
281273
* Board Adapter Display

‎Marlin/src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
*/
2222
#pragma once
2323

24-
#if NOT_TARGET(STM32F4)
25-
#error "Oops! Select an STM32F4 board in 'Tools > Board.'"
26-
#endif
24+
#include "env_validate.h"
2725

2826
#ifndef BOARD_INFO_NAME
2927
#define BOARD_INFO_NAME "Mellow Fly E3 V2"

‎ini/stm32f4.ini

+2-1
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ build_flags = ${stm32_variant.build_flags}
193193
-DSTM32F407_5VX
194194
-DMF_RX_BUFFER_SIZE=255
195195
-DMF_TX_BUFFER_SIZE=255
196+
196197
#
197198
# Mellow/Fly RRF E3 V1 (STM32F407VGT6 ARM Cortex-M4)
198199
#
@@ -205,7 +206,7 @@ build_flags = ${stm32_variant.build_flags}
205206
-DSTM32F407_5VX
206207
-DMF_RX_BUFFER_SIZE=255
207208
-DMF_TX_BUFFER_SIZE=255
208-
209+
209210
#
210211
# Bigtreetech GTR V1.0 (STM32F407IGT6 ARM Cortex-M4)
211212
#

0 commit comments

Comments
 (0)