zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Ender 3 V2 DWIN cleanup (#21061)

Browse source
This commit is contained in:
Scott Lahteine 2021-02-12 03:52:21 -06:00 committed by GitHub
parent 42d00b13df
commit 01215f5015
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 346 additions and 268 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

599
Marlin/src/lcd/dwin/e3v2/dwin.cpp
View file

File diff suppressed because it is too large Load diff

7
Marlin/src/lcd/dwin/e3v2/dwin.h
View file

@ -236,7 +236,7 @@ extern millis_t dwin_heat_time;
typedef struct { typedef struct {
TERN_(HAS_HOTEND, int16_t E_Temp = 0); TERN_(HAS_HOTEND, int16_t E_Temp = 0);
TERN_(HAS_HEATED_BED, int16_t Bed_Temp = 0); TERN_(HAS_HEATED_BED, int16_t Bed_Temp = 0);
TERN_(HAS_PREHEAT, int16_t Fan_speed = 0); TERN_(HAS_FAN, int16_t Fan_speed = 0);
int16_t print_speed = 100; int16_t print_speed = 100;
float Max_Feedspeed = 0; float Max_Feedspeed = 0;
float Max_Acceleration = 0; float Max_Acceleration = 0;
@ -270,10 +270,7 @@ typedef struct {
#if HAS_LEVELING #if HAS_LEVELING
bool leveling_offset_flag:1; bool leveling_offset_flag:1;
#endif #endif
#if HAS_FAN AxisEnum feedspeed_axis, acc_axis, jerk_axis, step_axis;
AxisEnum feedspeed_axis;
#endif
AxisEnum acc_axis, jerk_axis, step_axis;
} HMI_Flag_t; } HMI_Flag_t;
extern HMI_value_t HMI_ValueStruct; extern HMI_value_t HMI_ValueStruct;

8
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
View file

@ -132,8 +132,12 @@
#define HEATER_0_PIN PA1 // HEATER1 #define HEATER_0_PIN PA1 // HEATER1
#define HEATER_BED_PIN PA2 // HOT BED #define HEATER_BED_PIN PA2 // HOT BED
#define FAN_PIN PA0 // FAN #ifndef FAN_PIN
#define FAN_SOFT_PWM #define FAN_PIN PA0 // FAN
#endif
#if PIN_EXISTS(FAN)
#define FAN_SOFT_PWM
#endif
// //
// SD Card // SD Card