Kaynağa Gözat

Ender 3 V2 DWIN cleanup (#21061)

Scott Lahteine 4 yıl önce
ebeveyn
işleme
01215f5015
No account linked to committer's email address

+ 294
- 217
Marlin/src/lcd/dwin/e3v2/dwin.cpp
Dosya farkı çok büyük olduğundan ihmal edildi
Dosyayı Görüntüle


+ 2
- 5
Marlin/src/lcd/dwin/e3v2/dwin.h Dosyayı Görüntüle

236
 typedef struct {
236
 typedef struct {
237
   TERN_(HAS_HOTEND,     int16_t E_Temp    = 0);
237
   TERN_(HAS_HOTEND,     int16_t E_Temp    = 0);
238
   TERN_(HAS_HEATED_BED, int16_t Bed_Temp  = 0);
238
   TERN_(HAS_HEATED_BED, int16_t Bed_Temp  = 0);
239
-  TERN_(HAS_PREHEAT,    int16_t Fan_speed = 0);
239
+  TERN_(HAS_FAN,        int16_t Fan_speed = 0);
240
   int16_t print_speed     = 100;
240
   int16_t print_speed     = 100;
241
   float Max_Feedspeed     = 0;
241
   float Max_Feedspeed     = 0;
242
   float Max_Acceleration  = 0;
242
   float Max_Acceleration  = 0;
270
   #if HAS_LEVELING
270
   #if HAS_LEVELING
271
     bool leveling_offset_flag:1;
271
     bool leveling_offset_flag:1;
272
   #endif
272
   #endif
273
-  #if HAS_FAN
274
-    AxisEnum feedspeed_axis;
275
-  #endif
276
-  AxisEnum acc_axis, jerk_axis, step_axis;
273
+  AxisEnum feedspeed_axis, acc_axis, jerk_axis, step_axis;
277
 } HMI_Flag_t;
274
 } HMI_Flag_t;
278
 
275
 
279
 extern HMI_value_t HMI_ValueStruct;
276
 extern HMI_value_t HMI_ValueStruct;

+ 6
- 2
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h Dosyayı Görüntüle

132
 #define HEATER_0_PIN                        PA1   // HEATER1
132
 #define HEATER_0_PIN                        PA1   // HEATER1
133
 #define HEATER_BED_PIN                      PA2   // HOT BED
133
 #define HEATER_BED_PIN                      PA2   // HOT BED
134
 
134
 
135
-#define FAN_PIN                             PA0   // FAN
136
-#define FAN_SOFT_PWM
135
+#ifndef FAN_PIN
136
+  #define FAN_PIN                           PA0   // FAN
137
+#endif
138
+#if PIN_EXISTS(FAN)
139
+  #define FAN_SOFT_PWM
140
+#endif
137
 
141
 
138
 //
142
 //
139
 // SD Card
143
 // SD Card

Loading…
İptal
Kaydet