Skip to content

Commit 137b887

Browse files
LCh-77LCh-77
committed
Fix full Marlin bugfix_2.1 merge
1 parent 313ff9a commit 137b887

26 files changed

+90
-83
lines changed

‎Marlin/src/gcode/calibrate/G28.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
* Move the Z probe (or just the nozzle) to the safe homing point
119119
* (Z is already at the right height)
120120
*/
121-
constexpr xy_float_t safe_homing_xy = { Z_SAFE_HOMING_X_POINT, Z_SAFE_HOMING_Y_POINT };
121+
TERN(JYENHANCED, , constexpr) xy_float_t safe_homing_xy = { Z_SAFE_HOMING_X_POINT, Z_SAFE_HOMING_Y_POINT };
122122
#if HAS_HOME_OFFSET
123123
xy_float_t okay_homing_xy = safe_homing_xy;
124124
okay_homing_xy -= home_offset;

‎Marlin/src/gcode/gcode.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ GcodeSuite gcode;
7171

7272
#include "../MarlinCore.h" // for idle, kill
7373

74+
#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
75+
#include "../lcd/e3v2/jyersui/dwin.h"
76+
#endif
77+
7478
// Inactivity shutdown
7579
millis_t GcodeSuite::previous_move_ms = 0,
7680
GcodeSuite::max_inactive_time = 0;
@@ -1097,6 +1101,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
10971101
case 'S': case 'P': case 'R': break; // Invalid S, P, R commands already filtered
10981102
#endif
10991103

1104+
#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
1105+
case 'C' : CrealityDWIN.DWIN_Gcode(parser.codenum); break; // JyersUI Cn: Custom Gcodes
1106+
#endif
1107+
11001108
default:
11011109
#if ENABLED(WIFI_CUSTOM_COMMAND)
11021110
if (wifi_custom_command(parser.command_ptr)) break;

‎Marlin/src/gcode/parser.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ void GCodeParser::parse(char *p) {
173173
* With Motion Modes enabled any axis letter can come first.
174174
*/
175175
switch (letter) {
176-
case 'G': case 'M': case 'T': TERN_(MARLIN_DEV_MODE, case 'D':) {
176+
case 'G': case 'M': case 'T': TERN_(MARLIN_DEV_MODE, case 'D':) TERN_(DWIN_CREALITY_LCD_JYERSUI, case 'C':) {
177177
// Skip spaces to get the numeric part
178178
while (*p == ' ') p++;
179179

‎Marlin/src/inc/MarlinConfigPre.h

+5
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,8 @@
6060
#ifndef __MARLIN_DEPS__
6161
#include HAL_PATH(../HAL, inc/Conditionals_adv.h)
6262
#endif
63+
64+
// JYersUI Enhanced special definition file
65+
#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
66+
#include "../lcd/e3v2/jyersui/dwin_defines.h"
67+
#endif

‎Marlin/src/inc/SanityCheck.h

+9-5
Original file line numberDiff line numberDiff line change
@@ -811,8 +811,10 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
811811
/**
812812
* Validate that the bed size fits
813813
*/
814-
static_assert(X_MAX_LENGTH >= X_BED_SIZE, "Movement bounds (X_MIN_POS, X_MAX_POS) are too narrow to contain X_BED_SIZE.");
815-
static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS) are too narrow to contain Y_BED_SIZE.");
814+
#if !JYENHANCED
815+
static_assert(X_MAX_LENGTH >= X_BED_SIZE, "Movement bounds (X_MIN_POS, X_MAX_POS) are too narrow to contain X_BED_SIZE.");
816+
static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS) are too narrow to contain Y_BED_SIZE.");
817+
#endif
816818

817819
/**
818820
* Granular software endstops (Marlin >= 1.1.7)
@@ -1087,7 +1089,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
10871089
#endif
10881090
#endif
10891091

1090-
#if ENABLED(NOZZLE_PARK_FEATURE)
1092+
#if ENABLED(NOZZLE_PARK_FEATURE) && !JYENHANCED
10911093
constexpr float npp[] = NOZZLE_PARK_POINT;
10921094
static_assert(COUNT(npp) == XYZ, "NOZZLE_PARK_POINT requires X, Y, and Z values.");
10931095
constexpr xyz_pos_t npp_xyz = NOZZLE_PARK_POINT;
@@ -1811,21 +1813,23 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
18111813
#if ENABLED(NOZZLE_AS_PROBE)
18121814
static_assert(sanity_nozzle_to_probe_offset.x == 0 && sanity_nozzle_to_probe_offset.y == 0,
18131815
"NOZZLE_AS_PROBE requires the XY offsets in NOZZLE_TO_PROBE_OFFSET to both be 0.");
1814-
#elif !IS_KINEMATIC
1816+
#elif !(IS_KINEMATIC || JYENHANCED)
18151817
static_assert(PROBING_MARGIN >= 0, "PROBING_MARGIN must be >= 0.");
18161818
static_assert(PROBING_MARGIN_BACK >= 0, "PROBING_MARGIN_BACK must be >= 0.");
18171819
static_assert(PROBING_MARGIN_FRONT >= 0, "PROBING_MARGIN_FRONT must be >= 0.");
18181820
static_assert(PROBING_MARGIN_LEFT >= 0, "PROBING_MARGIN_LEFT must be >= 0.");
18191821
static_assert(PROBING_MARGIN_RIGHT >= 0, "PROBING_MARGIN_RIGHT must be >= 0.");
18201822
#endif
18211823

1824+
#if !JYENHANCED
18221825
#define _MARGIN(A) TERN(IS_SCARA, SCARA_PRINTABLE_RADIUS, TERN(DELTA, DELTA_PRINTABLE_RADIUS, ((A##_BED_SIZE) / 2)))
18231826
static_assert(PROBING_MARGIN < _MARGIN(X), "PROBING_MARGIN is too large.");
18241827
static_assert(PROBING_MARGIN_BACK < _MARGIN(Y), "PROBING_MARGIN_BACK is too large.");
18251828
static_assert(PROBING_MARGIN_FRONT < _MARGIN(Y), "PROBING_MARGIN_FRONT is too large.");
18261829
static_assert(PROBING_MARGIN_LEFT < _MARGIN(X), "PROBING_MARGIN_LEFT is too large.");
18271830
static_assert(PROBING_MARGIN_RIGHT < _MARGIN(X), "PROBING_MARGIN_RIGHT is too large.");
18281831
#undef _MARGIN
1832+
#endif
18291833

18301834
/**
18311835
* Make sure Z raise values are set
@@ -2063,7 +2067,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
20632067
/**
20642068
* Make sure Z_SAFE_HOMING point is reachable
20652069
*/
2066-
#if ENABLED(Z_SAFE_HOMING)
2070+
#if ENABLED(Z_SAFE_HOMING) && !JYENHANCED
20672071
static_assert(WITHIN(Z_SAFE_HOMING_X_POINT, X_MIN_POS, X_MAX_POS), "Z_SAFE_HOMING_X_POINT can't be reached by the nozzle.");
20682072
static_assert(WITHIN(Z_SAFE_HOMING_Y_POINT, Y_MIN_POS, Y_MAX_POS), "Z_SAFE_HOMING_Y_POINT can't be reached by the nozzle.");
20692073
#endif

‎Marlin/src/lcd/TFTGLCD/lcdprint_TFTGLCD.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
#include <string.h>
4747

48-
int lcd_glyph_height() { return 1; }
48+
int lcd_glyph_height(void) { return 1; }
4949

5050
typedef struct _TFTGLCD_charmap_t {
5151
lchar_t uchar; // the unicode char
@@ -1119,7 +1119,7 @@ int lcd_put_u8str_max_P(PGM_P utf8_pstr, const pixel_len_t max_length) {
11191119
return 0;
11201120
}
11211121

1122-
int test_TFTGLCD_charmap_all() {
1122+
int test_TFTGLCD_charmap_all(void) {
11231123
int flg_error = 0;
11241124
if (test_TFTGLCD_charmap(g_TFTGLCD_charmap_device, COUNT(g_TFTGLCD_charmap_device), "g_TFTGLCD_charmap_device", 0) < 0) {
11251125
flg_error = 1;

‎Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ void TFTGLCD::setContrast(uint16_t contrast) {
265265
extern volatile int8_t encoderDiff;
266266

267267
// Read buttons and encoder states
268-
uint8_t MarlinUI::read_slow_buttons() {
268+
uint8_t MarlinUI::read_slow_buttons(void) {
269269
if (!PanelDetected) return 0;
270270
#if ENABLED(TFTGLCD_PANEL_SPI)
271271
uint8_t b = 0;

‎Marlin/src/lcd/e3v2/common/dwin_set.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@
2525
#define Language_English 1
2626
#define Language_Chinese 2
2727

28-
//#define USE_STOCK_DWIN_SET // Use the Creality stock DWIN_SET instead of Marlin's unified DWIN_SET by The-EG & thinkyhead
29-
// Yeah no thanks, the stock should be the default
28+
#define USE_STOCK_DWIN_SET // Use the Creality stock DWIN_SET instead of Marlin's unified DWIN_SET by The-EG & thinkyhead
3029
#ifdef USE_STOCK_DWIN_SET
3130
#define ICON 9 // 9.ICO
3231
#else
33-
#define ICON 9
32+
#define ICON 7 // 7.ICO
3433
#endif
3534

3635
#ifndef CORP_WEBSITE

‎Marlin/src/lcd/e3v2/common/encoder.cpp

+3-9
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,9 @@ EncoderState Encoder_ReceiveAnalyze() {
9090
//LED_Action();
9191
#endif
9292
if (!ui.backlight) ui.refresh_brightness();
93-
else {
94-
#if ENABLED(DWIN_CREALITY_LCD_JYERSUI)
95-
return ENCODER_DIFF_ENTER;
96-
#else
97-
const bool was_waiting = wait_for_user;
98-
wait_for_user = false;
99-
return was_waiting ? ENCODER_DIFF_NO : ENCODER_DIFF_ENTER;
100-
#endif
101-
}
93+
const bool was_waiting = wait_for_user;
94+
wait_for_user = false;
95+
return was_waiting ? ENCODER_DIFF_NO : ENCODER_DIFF_ENTER;
10296
}
10397
else return ENCODER_DIFF_NO;
10498
}

‎Marlin/src/lcd/extui/anycubic_i3mega/anycubic_i3mega_lcd.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ char AnycubicTFTClass::SelectedDirectory[30];
6363
char AnycubicTFTClass::SelectedFile[FILENAME_LENGTH];
6464

6565
// Serial helpers
66-
static void sendNewLine() { LCD_SERIAL.write('\r'); LCD_SERIAL.write('\n'); }
66+
static void sendNewLine(void) { LCD_SERIAL.write('\r'); LCD_SERIAL.write('\n'); }
6767
static void send(const char *str) { LCD_SERIAL.print(str); }
6868
static void send_P(PGM_P str) {
6969
while (const char c = pgm_read_byte(str++))

‎Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ class DGUSScreenHandlerMKS : public DGUSScreenHandler {
5656
static void DGUS_LanguageDisplay(uint8_t var);
5757
static void TMC_ChangeConfig(DGUS_VP_Variable &var, void *val_ptr);
5858
static void GetTurnOffCtrl(DGUS_VP_Variable &var, void *val_ptr);
59-
static void LanguagePInit();
60-
static void DGUS_Runout_Idle();
61-
static void DGUS_RunoutInit();
62-
static void DGUS_ExtrudeLoadInit();
59+
static void LanguagePInit(void);
60+
static void DGUS_Runout_Idle(void);
61+
static void DGUS_RunoutInit(void);
62+
static void DGUS_ExtrudeLoadInit(void);
6363
static void LCD_BLK_Adjust(DGUS_VP_Variable &var, void *val_ptr);
6464
static void SD_FileBack(DGUS_VP_Variable &var, void *val_ptr);
6565

‎Marlin/src/lcd/extui/dgus_reloaded/DGUSDisplay.cpp

+8-5
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ void DGUSDisplay::ProcessRx() {
318318
gcode.reset_stepper_timeout();
319319

320320
if (!vp.size) {
321-
DEBUG_EOL();
321+
DEBUG_ECHOLN();
322322
vp.rx_handler(vp, nullptr);
323323

324324
rx_datagram_state = DGUS_IDLE;
@@ -330,15 +330,18 @@ void DGUSDisplay::ProcessRx() {
330330
memset(buffer, 0, vp.size);
331331

332332
for (uint8_t i = 0; i < dlen; i++) {
333-
if (i >= vp.size) break;
333+
if (i >= vp.size) {
334+
break;
335+
}
334336

335-
if (i + 1 < dlen && tmp[i + 3] == 0xFF && tmp[i + 4] == 0xFF)
337+
if (i + 1 < dlen && tmp[i + 3] == 0xFF && tmp[i + 4] == 0xFF) {
336338
break;
339+
}
337340

338341
buffer[i] = tmp[i + 3];
339342
}
340343

341-
DEBUG_EOL();
344+
DEBUG_ECHOLN();
342345
vp.rx_handler(vp, buffer);
343346

344347
rx_datagram_state = DGUS_IDLE;
@@ -351,7 +354,7 @@ void DGUSDisplay::ProcessRx() {
351354
break;
352355
}
353356

354-
DEBUG_EOL();
357+
DEBUG_ECHOLN();
355358
vp.rx_handler(vp, &tmp[3]);
356359

357360
rx_datagram_state = DGUS_IDLE;

‎Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@ class WifiSerial {
3939
void begin(uint32_t baud);
4040
void begin(uint32_t baud, uint8_t config);
4141
void end();
42-
int available();
43-
int read();
42+
int available(void);
43+
int read(void);
4444
int write(uint8_t);
4545

4646
// Interrupt handlers
4747
static int _tx_complete_irq(serial_t *obj);
4848
static void _rx_complete_irq(serial_t *obj);
4949

50-
void flush();
51-
bool isHalfDuplex() const;
52-
void enableHalfDuplexRx();
50+
void flush(void);
51+
bool isHalfDuplex(void) const;
52+
void enableHalfDuplexRx(void);
5353

5454
private:
5555
void setRx(uint32_t _rx);

‎Marlin/src/lcd/menu/menu_item.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ DEFINE_MENU_EDIT_ITEM_TYPE(float43 ,float ,ftostr43sign ,1000 );
154154
DEFINE_MENU_EDIT_ITEM_TYPE(float4 ,float ,ftostr4sign , 1 ); // 1234 right-justified
155155
DEFINE_MENU_EDIT_ITEM_TYPE(float5 ,float ,ftostr5rj , 1 ); // 12345 right-justified
156156
DEFINE_MENU_EDIT_ITEM_TYPE(float5_25 ,float ,ftostr5rj , 0.04f ); // 12345 right-justified (25 increment)
157-
DEFINE_MENU_EDIT_ITEM_TYPE(float51 ,float ,ftostr51rj , 10 ); // 1234.5 right-justified
157+
DEFINE_MENU_EDIT_ITEM_TYPE(float61 ,float ,ftostr61rj , 10 ); // 12345.6 right-justified
158158
DEFINE_MENU_EDIT_ITEM_TYPE(float31sign ,float ,ftostr31sign , 10 ); // +12.3
159159
DEFINE_MENU_EDIT_ITEM_TYPE(float41sign ,float ,ftostr41sign , 10 ); // +123.4
160160
DEFINE_MENU_EDIT_ITEM_TYPE(float51sign ,float ,ftostr51sign , 10 ); // +1234.5

‎Marlin/src/libs/W25Qxx.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ uint16_t W25QXXFlash::W25QXX_ReadID(void) {
133133
return Temp;
134134
}
135135

136-
void W25QXXFlash::SPI_FLASH_WriteEnable() {
136+
void W25QXXFlash::SPI_FLASH_WriteEnable(void) {
137137
// Select the FLASH: Chip Select low
138138
SPI_FLASH_CS_L();
139139
// Send "Write Enable" instruction
@@ -151,7 +151,7 @@ void W25QXXFlash::SPI_FLASH_WriteEnable() {
151151
* Output : None
152152
* Return : None
153153
*******************************************************************************/
154-
void W25QXXFlash::SPI_FLASH_WaitForWriteEnd() {
154+
void W25QXXFlash::SPI_FLASH_WaitForWriteEnd(void) {
155155
uint8_t FLASH_Status = 0;
156156

157157
// Select the FLASH: Chip Select low
@@ -216,7 +216,7 @@ void W25QXXFlash::SPI_FLASH_BlockErase(uint32_t BlockAddr) {
216216
* Output : None
217217
* Return : None
218218
*******************************************************************************/
219-
void W25QXXFlash::SPI_FLASH_BulkErase() {
219+
void W25QXXFlash::SPI_FLASH_BulkErase(void) {
220220
// Send write enable instruction
221221
SPI_FLASH_WriteEnable();
222222

‎Marlin/src/libs/W25Qxx.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ class W25QXXFlash {
6161
static void spi_flash_Send(uint8_t b);
6262
static void spi_flash_SendBlock(uint8_t token, const uint8_t *buf);
6363
static uint16_t W25QXX_ReadID(void);
64-
static void SPI_FLASH_WriteEnable();
65-
static void SPI_FLASH_WaitForWriteEnd();
64+
static void SPI_FLASH_WriteEnable(void);
65+
static void SPI_FLASH_WaitForWriteEnd(void);
6666
static void SPI_FLASH_SectorErase(uint32_t SectorAddr);
6767
static void SPI_FLASH_BlockErase(uint32_t BlockAddr);
68-
static void SPI_FLASH_BulkErase();
68+
static void SPI_FLASH_BulkErase(void);
6969
static void SPI_FLASH_PageWrite(uint8_t *pBuffer, uint32_t WriteAddr, uint16_t NumByteToWrite);
7070
static void SPI_FLASH_BufferWrite(uint8_t *pBuffer, uint32_t WriteAddr, uint16_t NumByteToWrite);
7171
static void SPI_FLASH_BufferRead(uint8_t *pBuffer, uint32_t ReadAddr, uint16_t NumByteToRead);

‎Marlin/src/libs/numtostr.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -377,10 +377,10 @@ const char* ftostr53sign(const_float_t f) {
377377
return conv;
378378
}
379379

380-
// Convert unsigned float to string with ____4.5, __34.5, _234.5, 1234.5 format
381-
const char* ftostr51rj(const_float_t f) {
380+
// Convert unsigned float to string with ____5.6, ___45.6, __345.6, _2345.6, 12345.6 format
381+
const char* ftostr61rj(const_float_t f) {
382382
const long i = UINTFLOAT(f, 1);
383-
conv[0] = ' ';
383+
conv[0] = RJDIGIT(i, 100000);
384384
conv[1] = RJDIGIT(i, 10000);
385385
conv[2] = RJDIGIT(i, 1000);
386386
conv[3] = RJDIGIT(i, 100);

‎Marlin/src/libs/numtostr.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ const char* ftostr52sign(const_float_t x);
113113
// Convert signed float to string with +12.345 format
114114
const char* ftostr53sign(const_float_t f);
115115

116-
// Convert unsigned float to string with 1234.5 format omitting trailing zeros
117-
const char* ftostr51rj(const_float_t x);
116+
// Convert unsigned float to string with 12345.6 format omitting trailing zeros
117+
const char* ftostr61rj(const_float_t x);
118118

119119
// Convert float to rj string with 123 or -12 format
120120
FORCE_INLINE const char* ftostr3(const_float_t x) { return i16tostr3rj(int16_t(x + (x < 0 ? -0.5f : 0.5f))); }

‎Marlin/src/module/motion.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ int16_t feedrate_percentage = 100;
134134
// Cartesian conversion result goes here:
135135
xyz_pos_t cartes;
136136

137+
#if BOTH(HAS_BED_PROBE, JYENHANCED)
138+
feedRate_t z_probe_fast_mm_s = MMM_TO_MMS(Z_PROBE_FEEDRATE_FAST);
139+
#endif
140+
137141
#if IS_KINEMATIC
138142

139143
abce_pos_t delta;

‎Marlin/src/module/motion.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,11 @@ extern xyz_pos_t cartes;
6666
#endif
6767

6868
#if HAS_BED_PROBE
69-
constexpr feedRate_t z_probe_fast_mm_s = MMM_TO_MMS(Z_PROBE_FEEDRATE_FAST);
69+
#if JYENHANCED
70+
extern feedRate_t z_probe_fast_mm_s;
71+
#else
72+
constexpr feedRate_t z_probe_fast_mm_s = MMM_TO_MMS(Z_PROBE_FEEDRATE_FAST);
73+
#endif
7074
#endif
7175

7276
/**

‎Marlin/src/module/planner.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1594,7 +1594,7 @@ void Planner::check_axes_activity() {
15941594

15951595
#if HAS_LEVELING
15961596

1597-
constexpr xy_pos_t level_fulcrum = {
1597+
TERN(JYENHANCED, ,constexpr) xy_pos_t level_fulcrum = {
15981598
TERN(Z_SAFE_HOMING, Z_SAFE_HOMING_X_POINT, X_HOME_POS),
15991599
TERN(Z_SAFE_HOMING, Z_SAFE_HOMING_Y_POINT, Y_HOME_POS)
16001600
};

‎Marlin/src/module/probe.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ float Probe::run_z_probe(const bool sanity_check/*=true*/) {
732732
// Raise to give the probe clearance
733733
do_blocking_move_to_z(current_position.z + Z_CLEARANCE_MULTI_PROBE, z_probe_fast_mm_s);
734734

735-
#elif Z_PROBE_FEEDRATE_FAST != Z_PROBE_FEEDRATE_SLOW
735+
#elif TERN(JYENHANCED, 1, Z_PROBE_FEEDRATE_FAST != Z_PROBE_FEEDRATE_SLOW)
736736

737737
// If the nozzle is well over the travel height then
738738
// move down quickly before doing the slow probe

‎Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@
3030
//
3131
// Heaters / Fans
3232
//
33-
34-
// Power outputs EFBF or EFBE
35-
#define MOSFET_D_PIN 7
33+
#define MOSFET_B_PIN 7 // For HEATER_1_PIN ("EEF" or "EEB")
34+
#define FAN_PIN 9
3635

3736
#define FIL_RUNOUT_PIN 2
3837
#if NUM_RUNOUT_SENSORS >= 2

0 commit comments

Comments
 (0)